diff --git a/sdist/gentoo/illogical-impulse-widgets/quickshell-9999.ebuild b/sdist/gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r1.ebuild
similarity index 90%
rename from sdist/gentoo/illogical-impulse-widgets/quickshell-9999.ebuild
rename to sdist/gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r1.ebuild
index 89a092516..d5106355a 100644
--- a/sdist/gentoo/illogical-impulse-widgets/quickshell-9999.ebuild
+++ b/sdist/gentoo/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-9999-r1.ebuild
@@ -3,21 +3,17 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake git-r3
 
 DESCRIPTION="Toolkit for building desktop widgets using QtQuick"
 HOMEPAGE="https://quickshell.org/"
 
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quickshell-mirror/${PN^}.git"
-else
-	SRC_URI="https://github.com/quickshell-mirror/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
+EGIT_REPO_URI="https://github.com/quickshell-mirror/quickshell.git"
+EGIT_COMMIT="00858812f25b748d08b075a0d284093685fa3ffd"
 
+KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
 # Upstream recommends leaving all build options enabled by default
 IUSE="+breakpad +jemalloc +sockets +wayland +layer-shell +session-lock +toplevel-management +screencopy +X +pipewire +tray +mpris +pam +hyprland +hyprland-global-shortcuts +hyprland-focus-grab +i3 +i3-ipc +bluetooth"
 
@@ -38,21 +34,27 @@ RDEPEND="
 	mpris? ( dev-qt/qtdbus )
 	pam? ( sys-libs/pam )
 	bluetooth? ( net-wireless/bluez )
+
+
+
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	|| ( >=sys-devel/gcc-14:* >=llvm-core/clang-17:* )
-	dev-build/cmake
-	dev-build/ninja
-	virtual/pkgconfig
-	dev-cpp/cli11
+
 	dev-util/spirv-tools
 	dev-qt/qtshadertools:6
-	breakpad? ( dev-util/breakpad )
 	wayland? (
 		dev-util/wayland-scanner
 		dev-libs/wayland-protocols
 	)
+	dev-cpp/cli11
+	dev-build/ninja
+	dev-build/cmake
+	dev-vcs/git
+	virtual/pkgconfig
+	breakpad? ( dev-util/breakpad )
+
 "
 
 src_configure(){
diff --git a/sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r1.ebuild b/sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild
similarity index 82%
rename from sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r1.ebuild
rename to sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild
index e2b878a74..fe6109223 100644
--- a/sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r1.ebuild
+++ b/sdist/gentoo/illogical-impulse-widgets/illogical-impulse-widgets-1.0-r2.ebuild
@@ -15,8 +15,11 @@ DEPEND=""
 RDEPEND="
 	gui-apps/fuzzel
 	dev-libs/glib
-	gui-apps/quickshell
+	media-gfx/imagemagick
+	gui-apps/hypridle
+	gui-libs/hyprutils
+	gui-apps/hyprlock
+	gui-apps/hyprpicker
 	app-i18n/translate-shell
 	gui-apps/wlogout
-	media-gfx/imagemagick
 "
diff --git a/sdist/gentoo/install-deps.sh b/sdist/gentoo/install-deps.sh
index 949bbf8eb..7be8f30a9 100644
--- a/sdist/gentoo/install-deps.sh
+++ b/sdist/gentoo/install-deps.sh
@@ -37,7 +37,7 @@ fi
 arch=$(portageq envvar ACCEPT_KEYWORDS)
 
 # Exclude hyprland, will deal with that separately
-metapkgs=(illogical-impulse-{audio,backlight,basic,bibata-modern-classic-bin,fonts-themes,hyprland,kde,microtex-git,oneui4-icons-git,portal,python,screencapture,toolkit,widgets})
+metapkgs=(illogical-impulse-{audio,backlight,basic,bibata-modern-classic-bin,fonts-themes,hyprland,kde,microtex-git,oneui4-icons-git,portal,python,quickshell-git,screencapture,toolkit,widgets})
 
 ebuild_dir="/var/db/repos/localrepo"
 
diff --git a/sdist/gentoo/keywords b/sdist/gentoo/keywords
index 9716ace7a..e6043f0f7 100644
--- a/sdist/gentoo/keywords
+++ b/sdist/gentoo/keywords
@@ -9,6 +9,7 @@ app-misc/illogical-impulse-microtex-git
 app-misc/illogical-impulse-oneui4-icons-git
 app-misc/illogical-impulse-portal
 app-misc/illogical-impulse-python
+gui-misc/illogical-impulse-quickshell-git
 app-misc/illogical-impulse-screencapture
 app-misc/illogical-impulse-toolkit
 app-misc/illogical-impulse-widgets
@@ -39,3 +40,6 @@ gui-libs/hyprland-qt-support **
 gui-libs/hyprland-qtutils **
 gui-wm/hyprland **
 x11-libs/libxkbcommon
+dev-util/breakpad
+dev-libs/linux-syscall-support
+dev-embedded/libdisasm
diff --git a/sdist/gentoo/useflags b/sdist/gentoo/useflags
index c3e12ed8e..e7c9755fc 100644
--- a/sdist/gentoo/useflags
+++ b/sdist/gentoo/useflags
@@ -111,7 +111,7 @@ sys-power/upower introspection
 gui-apps/fuzzel png svg
 dev-libs/glib dbus elf introspection mime xattr
 # ngl idk about nm-connection-editor. Works fine without
-gui-apps/quickshell -X -i3 -i3-ipc -breakpad bluetooth hyprland hyprland-focus-grab hyprland-global-shortcuts jemalloc layer-shell mpris pam pipewire screencopy session-lock sockets toplevel-management tray wayland
+gui-apps/quickshell -X -i3 -i3-ipc breakpad bluetooth hyprland hyprland-focus-grab hyprland-global-shortcuts jemalloc layer-shell mpris pam pipewire screencopy session-lock sockets toplevel-management tray wayland
 #app-i18n/translate-shell (nothing needed)
 #gui-apps/wlogout (no use flags)
 media-gfx/imagemagick xml