diff --git a/app-misc/devify/devify-1.1.ebuild b/app-misc/devify/devify-1.1.ebuild
index c30e1bb..5d29094 100644
--- a/app-misc/devify/devify-1.1.ebuild
+++ b/app-misc/devify/devify-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,13 +7,7 @@ inherit udev
 
 DESCRIPTION="Device notification system using udev rules for monitoring connections"
 HOMEPAGE="https://github.com/pog102/devify"
-# if [[ ${PV} == 9999 ]] ; then
-# 	EGIT_REPO_URI="https://github.com/pog102/devify.git"
-# 	EGIT_BRANCH="main"
-# 	inherit git-r3
-# else
 SRC_URI="https://github.com/pog102/devify/archive/refs/tags/V${PV}.tar.gz"
-# fi
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-misc/mangal/mangal-9999.ebuild b/app-misc/mangal/mangal-9999.ebuild
index 92cac01..2392e1a 100644
--- a/app-misc/mangal/mangal-9999.ebuild
+++ b/app-misc/mangal/mangal-9999.ebuild
@@ -11,9 +11,10 @@ HOMEPAGE="https://github.com/metafates/mangal"
 
 EGIT_REPO_URI="${HOMEPAGE}.git"
 EGIT_BRANCH="main"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+EGIT_SUBMODULES=( '*' )
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-misc/spicetify-community-themes/spicetify-community-themes-9999.ebuild b/app-misc/spicetify-community-themes/spicetify-community-themes-9999.ebuild
index a5a6017..7d70b16 100644
--- a/app-misc/spicetify-community-themes/spicetify-community-themes-9999.ebuild
+++ b/app-misc/spicetify-community-themes/spicetify-community-themes-9999.ebuild
@@ -8,13 +8,16 @@ inherit git-r3
 DESCRIPTION="A community-driven collection of themes for customizing Spotify through Spicetify"
 HOMEPAGE="https://github.com/spicetify/spicetify-themes"
 EGIT_REPO_URI="${HOMEPAGE}.git"
+EGIT_BRANCH="master"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+EGIT_SUBMODULES=( '*' )
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="man"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${PN}"
 INSTALLDIR="/opt/spicetify-cli"
 
 DEPEND="
diff --git a/app-misc/swhkd/swhkd-9999.ebuild b/app-misc/swhkd/swhkd-9999.ebuild
index 3a40f29..b02301f 100644
--- a/app-misc/swhkd/swhkd-9999.ebuild
+++ b/app-misc/swhkd/swhkd-9999.ebuild
@@ -8,13 +8,16 @@ inherit linux-info cargo git-r3 systemd
 DESCRIPTION="Simple Wayland HotKey Daemon"
 HOMEPAGE="https://github.com/waycrate/swhkd"
 EGIT_REPO_URI="${HOMEPAGE}.git"
+EGIT_BRANCH="main"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+EGIT_SUBMODULES=( '*' )
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="man systemd openrc"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${PN}"
 
 CONFIG_CHECK="
 	INPUT_EVDEV
diff --git a/gui-apps/shikane/shikane-9999.ebuild b/gui-apps/shikane/shikane-9999.ebuild
index f3b6c1f..4ad475e 100644
--- a/gui-apps/shikane/shikane-9999.ebuild
+++ b/gui-apps/shikane/shikane-9999.ebuild
@@ -8,13 +8,16 @@ inherit cargo git-r3
 DESCRIPTION="A deterministic dynamic output configuration tool that automatically detects and configures connected outputs based on a set of profiles"
 HOMEPAGE="https://gitlab.com/w0lff/shikane"
 EGIT_REPO_URI="${HOMEPAGE}.git"
+EGIT_BRANCH="master"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+EGIT_SUBMODULES=( '*' )
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="man"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${PN}"
 
 BDEPEND="
 	man? (
diff --git a/x11-themes/breeze-hacked-cursor-theme/breeze-hacked-cursor-theme-9999.ebuild b/x11-themes/breeze-hacked-cursor-theme/breeze-hacked-cursor-theme-9999.ebuild
index d899eb9..15a91d7 100644
--- a/x11-themes/breeze-hacked-cursor-theme/breeze-hacked-cursor-theme-9999.ebuild
+++ b/x11-themes/breeze-hacked-cursor-theme/breeze-hacked-cursor-theme-9999.ebuild
@@ -9,12 +9,17 @@ inherit git-r3 xdg
 DESCRIPTION="Breeze cursor theme with hacked style"
 HOMEPAGE="https://github.com/codejamninja/breeze-hacked-cursor-theme"
 EGIT_REPO_URI="${HOMEPAGE}.git"
+EGIT_BRANCH="main"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+EGIT_SUBMODULES=( '*' )
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 KEYWORDS="~amd64"
 
+S="${WORKDIR}/${PN}"
+
 DEPEND="media-gfx/inkscape
 	x11-apps/xcursorgen"