diff --git a/app-portage/euscan-ng/euscan-ng-9999.ebuild b/app-portage/euscan-ng/euscan-ng-9999.ebuild
index aa2fe52..5709ed9 100644
--- a/app-portage/euscan-ng/euscan-ng-9999.ebuild
+++ b/app-portage/euscan-ng/euscan-ng-9999.ebuild
@@ -41,7 +41,7 @@ IUSE=""
 # Right now euscan-ng and euscan can't be both installed on the same system
 
 DEPEND="
-	!app-portage/euscan-ng
+	!app-portage/euscan
 	>=dev-python/beautifulsoup-4.8.2[${PYTHON_USEDEP}]
 "
 RDEPEND="
diff --git a/app-portage/gen-pkgs/gen-pkgs-9999.ebuild b/app-portage/gen-pkgs/gen-pkgs-9999.ebuild
new file mode 100644
index 0000000..0398ec8
--- /dev/null
+++ b/app-portage/gen-pkgs/gen-pkgs-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Create HTML page based off of a given overlay URL"
+HOMEPAGE="https://gitlab.com/src_prepare/gen-pkgs"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/src_prepare/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://gitlab.com/src_prepare/${PN}/-/archive/${PV}/${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-portage/euscan-ng
+	app-portage/gentoolkit
+	app-portage/repoman
+	sys-apps/busybox
+"
+
+src_install() {
+	default
+
+	newbin gen-pkgs.sh gen-pkgs
+}
diff --git a/app-portage/gen-pkgs/metadata.xml b/app-portage/gen-pkgs/metadata.xml
new file mode 100644
index 0000000..59a581c
--- /dev/null
+++ b/app-portage/gen-pkgs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="gitlab">src_prepare/gen-pkgs</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/media-gfx/drawing/Manifest b/media-gfx/drawing/Manifest
new file mode 100644
index 0000000..d45af94
--- /dev/null
+++ b/media-gfx/drawing/Manifest
@@ -0,0 +1 @@
+DIST drawing-0.6.1.tar.gz 7708597 BLAKE2B a4fc09c10d2666feb1aa013aec06c7a34fbe2e8422027f157b5d792c8b894a1b2b12cf175c4d9f8f28b7a70b5f3063388b65a02b8d672017c7b59018e934e51c SHA512 7da3329ecb009a7fff32c0c76d9211ef264a6f7f80399835e51b2f08495d84bd5fbaf418fcf4e0c1b0d92fd64cdc07cf962754332896df46bfe04f72244c9d16
diff --git a/media-gfx/drawing/drawing-0.6.1.ebuild b/media-gfx/drawing/drawing-0.6.1.ebuild
new file mode 100644
index 0000000..d158abe
--- /dev/null
+++ b/media-gfx/drawing/drawing-0.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A drawing application for the GNOME desktop"
+HOMEPAGE="https://github.com/maoschanz/drawing"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/maoschanz/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/maoschanz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="
+	mirror
+	test
+"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib
+	dev-python/pygobject[cairo]
+	dev-util/desktop-file-utils
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/drawing/drawing-9999.ebuild b/media-gfx/drawing/drawing-9999.ebuild
new file mode 100644
index 0000000..d158abe
--- /dev/null
+++ b/media-gfx/drawing/drawing-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="A drawing application for the GNOME desktop"
+HOMEPAGE="https://github.com/maoschanz/drawing"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/maoschanz/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/maoschanz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="
+	mirror
+	test
+"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib
+	dev-python/pygobject[cairo]
+	dev-util/desktop-file-utils
+"
+RDEPEND="
+	${DEPEND}
+"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/drawing/metadata.xml b/media-gfx/drawing/metadata.xml
new file mode 100644
index 0000000..3adc794
--- /dev/null
+++ b/media-gfx/drawing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@protonmail.com</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gitlab">maoschanz/drawing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-im/mirage/Manifest b/net-im/mirage/Manifest
index 3a177ab..e8c1eab 100644
--- a/net-im/mirage/Manifest
+++ b/net-im/mirage/Manifest
@@ -1,6 +1,2 @@
-DIST RadialBarDemo-ec3af1a087a0c4c0c31709ed94b7e939d3e51400.tar.gz 6287 BLAKE2B 307e873cd294cb16e8ee1b8d3e54b71b2e81f930df317f377454587997e0d927040c13d5daeca58e5ffe07be8dcdcd3bbe89021371d2262b3d6e4748e7f8cea8 SHA512 d4f2fcc91e3542299ffde8c6981131d3dd8c168954c6b43929b675f153c3424a29ef2a2e5f1445b8500aca97f3674eed40f7cabf242fd210ea67f5028567552d
-DIST SortFilterProxyModel-36befddf5d57faad990e72c88c5844794f274145.tar.gz 52369 BLAKE2B 02e2a85c5df7a173b1ec27f126474db0d1ddf2c5858d41b904d463277d134f6f301e25597fd71d61d4a512207eb739e094b44a6af7d9bb7deb65823ab6836691 SHA512 bfb7af36abd5ded014549042e760c1ec6779f46dd6c30e672ada21decc7a1b1a631ada1cc2c57d62d0daca4cccff9640077345b3661ef73021d5e2ee8058ae9b
-DIST gel-0e796aacc16388a164bab0bb0ce9dabc885ed7fa.tar.gz 9878 BLAKE2B 319ec5f76ace441e78f563e596b3e46baada15716e7642d71e9dce56241b7f37f58c79863e944e6710fcbe634da6538d77fa8e6c897d35e695a81ca1cd37c8ec SHA512 540549882494007219d7e5be6d4502869bf02db16046547a623a20c17be729645ccd7611fa8ecd16e8f2fe545569be29240dabbefc8cb8f9c2b333355caab480
 DIST hsluv-c-9e9be32d6010cad484a7b12b1a3d19c6cf4c1353.tar.gz 1073542 BLAKE2B d798c71be3d3f7ad4248650f08bbb477b43b27edafa8519ddb9ac2873a1da99767f6f6668280fc9fa8abce7ab8347a9fe040a9b80c189f4e13465b5747e07adc SHA512 ecd8c9afa9e22c6a0093435ce89b5d5b1882207359d02a65f6e62952fa4b57fc5b3e1aaa07527553a7e86c350173409b21d41b3da5235a7fb5f96b61944be839
 DIST mirage-v0.6.4.tar.gz 3130527 BLAKE2B eec48e6afc0e0cc609b0ebad2799c2e9defea564a271251e98c41ca2176e1c98bd3c228f4bcfb5719e993b5c71ed964e61939eaf0f4f104315fda79cc80d3db3 SHA512 1780e5e9da7a31b2310d3e07d6b52a7be8cfe97262fef34ef470fd3d92621e554596858168d1d555d7dcf6f506853e0260b744a7725e70c9a34cf399be2394e0
-DIST qsyncable-f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711.tar.gz 116316 BLAKE2B f0492e8a76485f24c0b6fe5c0c0fe7ec4e308722f2bc1d868bd27a53f8bb0354b4ead10a4ceb08d35b1441a0b9dae538c14826fe31a57b80294e3b6f5396b69e SHA512 b7187b3a87b21b6ff3dde00aee55c5cc1721ee8d228eab91cc78a7b5de68457999015ef601542a69c9bed424ffcd375e7314bd451d6d7eaee5a827962c83a3a7
diff --git a/net-im/mirage/mirage-0.6.4.ebuild b/net-im/mirage/mirage-0.6.4.ebuild
index 5acc242..87aa8be 100644
--- a/net-im/mirage/mirage-0.6.4.ebuild
+++ b/net-im/mirage/mirage-0.6.4.ebuild
@@ -9,33 +9,23 @@ inherit qmake-utils python-single-r1 xdg
 DESCRIPTION="A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client."
 HOMEPAGE="https://github.com/mirukana/mirage"
 
+# Currently only one submodule needed for the build, but keeping the capacity to add more submodules for the future.
 SUBMODULE_COMMITS=(
-	"ec3af1a087a0c4c0c31709ed94b7e939d3e51400"
-	"36befddf5d57faad990e72c88c5844794f274145"
-	"0e796aacc16388a164bab0bb0ce9dabc885ed7fa"
 	"9e9be32d6010cad484a7b12b1a3d19c6cf4c1353"
-	"f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711"
 )
 
-#[0] mirukana/RadialBarDemo
-#[1] oKcerG/SortFilterProxyModel
-#[2] Cutehacks/gel
-#[3] hsluv/hsluv-c
-#[4] benlau/qsyncable
+#[0] hsluv/hsluv-c
 
 if [[ "${PV}" == "9999" ]]
 then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mirukana/mirage.git"
-	EGIT_SUBMODULES=( '*' )
+	EGIT_BRANCH="dev"
+	EGIT_SUBMODULES=( submodules/hsluv-c )
 else
 	SRC_URI="
 		https://github.com/mirukana/"${PN}"/archive/v"${PV}".tar.gz -> "${PN}"-v"${PV}".tar.gz
-		https://github.com/mirukana/RadialBarDemo/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> RadialBarDemo-"${SUBMODULE_COMMITS[0]}".tar.gz
-		https://github.com/oKcerG/SortFilterProxyModel/archive/"${SUBMODULE_COMMITS[1]}".tar.gz -> SortFilterProxyModel-"${SUBMODULE_COMMITS[1]}".tar.gz
-		https://github.com/Cutehacks/gel/archive/"${SUBMODULE_COMMITS[2]}".tar.gz -> gel-"${SUBMODULE_COMMITS[2]}".tar.gz
-		https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[3]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[3]}".tar.gz
-		https://github.com/benlau/qsyncable/archive/"${SUBMODULE_COMMITS[4]}".tar.gz -> qsyncable-"${SUBMODULE_COMMITS[4]}".tar.gz
+		https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[0]}".tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -98,7 +88,7 @@ src_prepare() {
 		mv ""${WORKDIR}"/"${IN_DIR}""*/* ""${S}"/"${OUT_DIR}"" || die
 	}
 	if [ "${PV}" != "9999" ]; then
-		local submodules_libs="RadialBarDemo SortFilterProxyModel gel hsluv-c qsyncable"
+		local submodules_libs="hsluv-c"
 		for submodules_lib in ${submodules_libs} ; do
 			move_lib "${submodules_lib}" submodules
 		done
diff --git a/net-im/mirage/mirage-9999.ebuild b/net-im/mirage/mirage-9999.ebuild
index b551b31..6d8276a 100644
--- a/net-im/mirage/mirage-9999.ebuild
+++ b/net-im/mirage/mirage-9999.ebuild
@@ -9,34 +9,23 @@ inherit qmake-utils python-single-r1 xdg
 DESCRIPTION="A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client."
 HOMEPAGE="https://github.com/mirukana/mirage"
 
+# Currently only one submodule needed for the build, but keeping the capacity to add more submodules for the future.
 SUBMODULE_COMMITS=(
-	"ec3af1a087a0c4c0c31709ed94b7e939d3e51400"
-	"36befddf5d57faad990e72c88c5844794f274145"
-	"0e796aacc16388a164bab0bb0ce9dabc885ed7fa"
 	"9e9be32d6010cad484a7b12b1a3d19c6cf4c1353"
-	"f5ca07b71cecda685d0dd4b3c74d2fb2ca71f711"
 )
 
-#[0] mirukana/RadialBarDemo
-#[1] oKcerG/SortFilterProxyModel
-#[2] Cutehacks/gel
-#[3] hsluv/hsluv-c
-#[4] benlau/qsyncable
+#[0] hsluv/hsluv-c
 
 if [[ "${PV}" == "9999" ]]
 then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mirukana/mirage.git"
 	EGIT_BRANCH="dev"
-	EGIT_SUBMODULES=( '*' )
+	EGIT_SUBMODULES=( submodules/hsluv-c )
 else
 	SRC_URI="
 		https://github.com/mirukana/"${PN}"/archive/v"${PV}".tar.gz -> "${PN}"-v"${PV}".tar.gz
-		https://github.com/mirukana/RadialBarDemo/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> RadialBarDemo-"${SUBMODULE_COMMITS[0]}".tar.gz
-		https://github.com/oKcerG/SortFilterProxyModel/archive/"${SUBMODULE_COMMITS[1]}".tar.gz -> SortFilterProxyModel-"${SUBMODULE_COMMITS[1]}".tar.gz
-		https://github.com/Cutehacks/gel/archive/"${SUBMODULE_COMMITS[2]}".tar.gz -> gel-"${SUBMODULE_COMMITS[2]}".tar.gz
-		https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[3]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[3]}".tar.gz
-		https://github.com/benlau/qsyncable/archive/"${SUBMODULE_COMMITS[4]}".tar.gz -> qsyncable-"${SUBMODULE_COMMITS[4]}".tar.gz
+		https://github.com/hsluv/hsluv-c/archive/"${SUBMODULE_COMMITS[0]}".tar.gz -> hsluv-c-"${SUBMODULE_COMMITS[0]}".tar.gz
 	"
 	KEYWORDS="~amd64"
 fi
@@ -100,7 +89,7 @@ src_prepare() {
 		mv ""${WORKDIR}"/"${IN_DIR}""*/* ""${S}"/"${OUT_DIR}"" || die
 	}
 	if [ "${PV}" != "9999" ]; then
-		local submodules_libs="RadialBarDemo SortFilterProxyModel gel hsluv-c qsyncable"
+		local submodules_libs="hsluv-c"
 		for submodules_lib in ${submodules_libs} ; do
 			move_lib "${submodules_lib}" submodules
 		done