diff --git a/README.html b/README.html
index 4f4ebbe..8c68ecb 100644
--- a/README.html
+++ b/README.html
@@ -7,7 +7,7 @@
 <li>A reason to add my overlay (optional)</li>
 </ul>
 <h2 id="to-add-with-eselect-repository-">To add with eselect-repository:</h2>
-<p><code>eselect repository add speedie-overlay git https://codeberg.org/speedie/speedie-overlay/raw/branch/main/overlay.xml</code></p>
+<p><code>eselect repository add speedie-overlay git https://codeberg.org/speedie/speedie-overlay</code></p>
 <p><code>eselect repository list</code></p>
 <p><code>eselect repsitory enable &lt;num&gt;</code></p>
 <h2 id="to-add-with-layman-">To add with layman:</h2>
@@ -18,12 +18,13 @@
 <h2 id="usage-adding-with-eselect-repository-">Usage adding with eselect-repository:</h2>
 <p><code>emerge --sync</code></p>
 <p>The advantage of using eselect-repository is that Gentoo treats it as a regular repository and will be updated along with the official Gentoo repository. This could also be a disadvantage for various reasons, but you can probably disable this feature!</p>
-<h2 id="short-link">Short link</h2>
+<h2 id="short-link-for-layman-">Short link (for layman)</h2>
 <p>It may be difficult to memorize this link. You may choose to add the <a href="https://speedie.gq/overlay.xml">https://speedie.gq/overlay.xml</a> link instead. This is much easier to memorize. This overlay.xml file should always lead to the latest repository anyway!</p>
 <h2 id="license">License</h2>
 <p>The ebuilds are liensed under the GPLv2-only license due to Gentoo&#39;s licensing. I choose to respect that, despite preferring GPLv3!</p>
 <h2 id="list-of-all-ebuilds">List of all ebuilds</h2>
 <ul>
+<li><a href="./LICENSE">LICENSE</a></li>
 <li><a href="./app-misc">app-misc</a><ul>
 <li><a href="./app-misc/pywal">pywal</a><ul>
 <li><a href="./app-misc/pywal/pywal-3.3.0.ebuild">pywal-3.3.0.ebuild</a></li>
@@ -34,16 +35,19 @@
 <li><a href="./app-misc/pywal16/pywal16-9999.ebuild">pywal16-9999.ebuild</a></li>
 </ul>
 </li>
-<li><a href="./app-misc/smatrix">smatrix</a></li>
+<li><a href="./app-misc/smatrix">smatrix</a><ul>
 <li><a href="./app-misc/smatrix/smatrix-9999.ebuild">smatrix-9999.ebuild</a></li>
 </ul>
 </li>
+<li><a href="./app-misc/vifm-ueberzug">vifm-ueberzug</a></li>
+<li><a href="./app-misc/vifm-ueberzug/vifm-ueberzug-9999.ebuild">vifm-ueberzug-9999.ebuild</a></li>
+</ul>
+</li>
 <li><a href="./gui-libs">gui-libs</a><ul>
 <li><a href="./gui-libs/dragon">dragon</a></li>
 <li><a href="./gui-libs/dragon/dragon-1.2.0.ebuild">dragon-1.2.0.ebuild</a></li>
 </ul>
 </li>
-<li><a href="./LICENSE">LICENSE</a></li>
 <li><a href="./media-fonts">media-fonts</a><ul>
 <li><a href="./media-fonts/dejavu-sans-code">dejavu-sans-code</a></li>
 <li><a href="./media-fonts/dejavu-sans-code/dejavu-sans-code-1.2.2.ebuild">dejavu-sans-code-1.2.2.ebuild</a></li>
diff --git a/README.md b/README.md
index 697f882..e72e693 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ speedie's Gentoo GNU/Linux overlay!
 
 ## To add with eselect-repository:
 
-`eselect repository add speedie-overlay git https://codeberg.org/speedie/speedie-overlay/raw/branch/main/overlay.xml`
+`eselect repository add speedie-overlay git https://codeberg.org/speedie/speedie-overlay`
 
 `eselect repository list`
 
@@ -30,7 +30,7 @@ NOTE: With layman, you need to run this command manually every time you want to
 
 The advantage of using eselect-repository is that Gentoo treats it as a regular repository and will be updated along with the official Gentoo repository. This could also be a disadvantage for various reasons, but you can probably disable this feature!
 
-## Short link
+## Short link (for layman)
 It may be difficult to memorize this link. You may choose to add the [https://speedie.gq/overlay.xml](https://speedie.gq/overlay.xml) link instead. This is much easier to memorize. This overlay.xml file should always lead to the latest repository anyway!
 
 ## License
@@ -39,6 +39,7 @@ The ebuilds are liensed under the GPLv2-only license due to Gentoo's licensing.
 
 
 ## List of all ebuilds
+ * [LICENSE](./LICENSE)
  * [app-misc](./app-misc)
    * [pywal](./app-misc/pywal)
      * [pywal-3.3.0.ebuild](./app-misc/pywal/pywal-3.3.0.ebuild)
@@ -46,11 +47,12 @@ The ebuilds are liensed under the GPLv2-only license due to Gentoo's licensing.
    * [pywal16](./app-misc/pywal16)
      * [pywal16-9999.ebuild](./app-misc/pywal16/pywal16-9999.ebuild)
    * [smatrix](./app-misc/smatrix)
-   * [smatrix-9999.ebuild](./app-misc/smatrix/smatrix-9999.ebuild)
+     * [smatrix-9999.ebuild](./app-misc/smatrix/smatrix-9999.ebuild)
+   * [vifm-ueberzug](./app-misc/vifm-ueberzug)
+   * [vifm-ueberzug-9999.ebuild](./app-misc/vifm-ueberzug/vifm-ueberzug-9999.ebuild)
  * [gui-libs](./gui-libs)
    * [dragon](./gui-libs/dragon)
    * [dragon-1.2.0.ebuild](./gui-libs/dragon/dragon-1.2.0.ebuild)
- * [LICENSE](./LICENSE)
  * [media-fonts](./media-fonts)
    * [dejavu-sans-code](./media-fonts/dejavu-sans-code)
    * [dejavu-sans-code-1.2.2.ebuild](./media-fonts/dejavu-sans-code/dejavu-sans-code-1.2.2.ebuild)
diff --git a/app-misc/pywal/pywal-3.3.0.ebuild b/app-misc/pywal/pywal-3.3.0.ebuild
index f037bbb..656a623 100644
--- a/app-misc/pywal/pywal-3.3.0.ebuild
+++ b/app-misc/pywal/pywal-3.3.0.ebuild
@@ -3,12 +3,17 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
-#EGIT_REPO_URI="https://github.com/dylanaraps/${PN}.git"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}.tar.gz"
 inherit distutils-r1
 DESCRIPTION="Generate and change color-schemes on the fly"
 HOMEPAGE="https://github.com/dylanaraps/${PN}"
-KEYWORDS="~amd64 ~x86"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/dylanaraps/pywal/archive/refs/tags/${PV}.tar.gz"
+fi
 RESTRICT="test"
 
 LICENSE="MIT"
diff --git a/app-misc/pywal/pywal-9999.ebuild b/app-misc/pywal/pywal-9999.ebuild
index 8ed3fd1..0ed2a67 100644
--- a/app-misc/pywal/pywal-9999.ebuild
+++ b/app-misc/pywal/pywal-9999.ebuild
@@ -3,11 +3,18 @@
 
 EAPI=8
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
-EGIT_REPO_URI="https://github.com/dylanaraps/${PN}.git"
-inherit distutils-r1 git-r3
+inherit distutils-r1
 DESCRIPTION="Generate and change color-schemes on the fly"
 HOMEPAGE="https://github.com/dylanaraps/${PN}"
-#KEYWORDS="~amd64 ~x86"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/dylanaraps/pywal/archive/refs/tags/${PV}.tar.gz"
+fi
+
 RESTRICT="test"
 
 LICENSE="MIT"
diff --git a/app-misc/vifm-ueberzug/vifm-ueberzug-9999.ebuild b/app-misc/vifm-ueberzug/vifm-ueberzug-9999.ebuild
new file mode 100644
index 0000000..b1a7ae4
--- /dev/null
+++ b/app-misc/vifm-ueberzug/vifm-ueberzug-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Ueberzug support for vifm based on https://github.com/cirala/vifmimg"
+HOMEPAGE="https://codeberg.org/speedie/vifm-ueberzug"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+else
+	die
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+IUSE="+audio +video +pdf djvu"
+
+DEPEND="app-shells/bash
+		sys-apps/sed
+		media-gfx/ueberzug
+		app-misc/vifm
+		audio? ( media-video/ffmpeg )
+		pdf? ( app-text/poppler )
+		djvu? ( app-text/djvu )
+		video? ( media-video/ffmpegthumbnailer media-video/ffmpeg )"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+}
+
+src_install() {
+	newbin "${WORKDIR}/${P}/vifmrun" vifmrun
+	newbin "${WORKDIR}/${P}/vifmimg" vifmimg
+
+	elog "Note: You must add fileviewer entries to your vifmrc."
+	elog "For notes on how to do this, see https://codeberg.org/speedie/vifm-ueberzug"
+}
diff --git a/net-misc/iron/iron-1.1.ebuild b/net-misc/iron/iron-1.1.ebuild
index 437bf86..f968b57 100644
--- a/net-misc/iron/iron-1.1.ebuild
+++ b/net-misc/iron/iron-1.1.ebuild
@@ -5,11 +5,18 @@ EAPI=8
 
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds with support for the new JSON API."
 HOMEPAGE="https://speedie.gq/iron"
-SRC_URI="https://codeberg.org/speedie/iron/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	SRC_URI="https://codeberg.org/speedie/iron/releases/download/${PV}/${P}.tar.gz"
+fi
+
 IUSE=""
 
 DEPEND="app-shells/bash sys-apps/sed net-misc/curl app-misc/jq sys-devel/make"
diff --git a/net-misc/iron/iron-1.2.ebuild b/net-misc/iron/iron-1.2.ebuild
index 437bf86..f968b57 100644
--- a/net-misc/iron/iron-1.2.ebuild
+++ b/net-misc/iron/iron-1.2.ebuild
@@ -5,11 +5,18 @@ EAPI=8
 
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds with support for the new JSON API."
 HOMEPAGE="https://speedie.gq/iron"
-SRC_URI="https://codeberg.org/speedie/iron/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	SRC_URI="https://codeberg.org/speedie/iron/releases/download/${PV}/${P}.tar.gz"
+fi
+
 IUSE=""
 
 DEPEND="app-shells/bash sys-apps/sed net-misc/curl app-misc/jq sys-devel/make"
diff --git a/net-misc/iron/iron-9999.ebuild b/net-misc/iron/iron-9999.ebuild
index cb4a2b4..f968b57 100644
--- a/net-misc/iron/iron-9999.ebuild
+++ b/net-misc/iron/iron-9999.ebuild
@@ -5,13 +5,18 @@ EAPI=8
 
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds with support for the new JSON API."
 HOMEPAGE="https://speedie.gq/iron"
-inherit git-r3
-#SRC_URI="https://codeberg.org/speedie/iron/releases/download/${PV}/${P}.tar.gz"
-EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	SRC_URI="https://codeberg.org/speedie/iron/releases/download/${PV}/${P}.tar.gz"
+fi
+
 IUSE=""
 
 DEPEND="app-shells/bash sys-apps/sed net-misc/curl app-misc/jq sys-devel/make"
diff --git a/net-misc/rchat/rchat-0.3.ebuild b/net-misc/rchat/rchat-0.3.ebuild
index 4a4b2b8..fe4a243 100644
--- a/net-misc/rchat/rchat-0.3.ebuild
+++ b/net-misc/rchat/rchat-0.3.ebuild
@@ -5,11 +5,17 @@ EAPI=8
 
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds."
 HOMEPAGE="https://speedie.gq/rchat"
-SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
+fi
 
 LICENSE="GPLv3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
 
 DEPEND="
 	app-shells/bash
diff --git a/net-misc/rchat/rchat-0.4.ebuild b/net-misc/rchat/rchat-0.4.ebuild
index 4a4b2b8..fe4a243 100644
--- a/net-misc/rchat/rchat-0.4.ebuild
+++ b/net-misc/rchat/rchat-0.4.ebuild
@@ -5,11 +5,17 @@ EAPI=8
 
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds."
 HOMEPAGE="https://speedie.gq/rchat"
-SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
+fi
 
 LICENSE="GPLv3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
 
 DEPEND="
 	app-shells/bash
diff --git a/net-misc/rchat/rchat-0.5.ebuild b/net-misc/rchat/rchat-0.5.ebuild
index 4a4b2b8..fe4a243 100644
--- a/net-misc/rchat/rchat-0.5.ebuild
+++ b/net-misc/rchat/rchat-0.5.ebuild
@@ -5,11 +5,17 @@ EAPI=8
 
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds."
 HOMEPAGE="https://speedie.gq/rchat"
-SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
+fi
 
 LICENSE="GPLv3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
 
 DEPEND="
 	app-shells/bash
diff --git a/net-misc/rchat/rchat-9999.ebuild b/net-misc/rchat/rchat-9999.ebuild
index 7f0d394..fe4a243 100644
--- a/net-misc/rchat/rchat-9999.ebuild
+++ b/net-misc/rchat/rchat-9999.ebuild
@@ -6,14 +6,16 @@ EAPI=8
 DESCRIPTION="Minimal rautafarmi client with Vim keybinds."
 HOMEPAGE="https://speedie.gq/rchat"
 
-inherit git-r3
-
-#SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
-EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/speedie/${PN}.git"
+else
+	SRC_URI="https://raw.githubusercontent.com/speediegq/rchat/tarball/${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
+fi
 
 LICENSE="GPLv3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~~riscv ~x86"
 
 DEPEND="
 	app-shells/bash
diff --git a/x11-misc/spde/spde-9999.ebuild b/x11-misc/spde/spde-9999.ebuild
index 70d8582..d96cefe 100644
--- a/x11-misc/spde/spde-9999.ebuild
+++ b/x11-misc/spde/spde-9999.ebuild
@@ -12,15 +12,13 @@ KEYWORDS="~amd64 ~x86 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 USE="+server +pywal +shells +fonts +editor +wm +terminal +runlauncher +locker +filemanager +email +temp +visualizer +pdf +music +video +flac +mixer +volumeicon +network +wifi +bluetooth +pipewire +compositor +image +irc +rss +torrent +browser +notification +xdg +locker +clipboard +accessibility +screenshot"
 IUSE="${USE}"
 
-DEPEND="wm? ( x11-wm/speedwm )
-		wm? ( x11-wm/speedwm-extras )
+DEPEND="wm? ( x11-wm/speedwm x11-wm/speedwm-extras )
 		terminal? ( x11-terms/st-spde )
 		runlauncher? ( x11-misc/dmenu-spde )
 		locker? ( x11-misc/slock-spde )
 		runlauncher? ( x11-misc/j4-dmenu-desktop-spde )
 		editor? ( app-editors/neovim )
 		app-misc/tmux
-		filemanager? ( app-misc/vifm )
 		shells? ( app-shells/dash )
 		shells? ( app-shells/zsh )
 		shells? ( app-shells/gentoo-zsh-completions )
@@ -28,13 +26,9 @@ DEPEND="wm? ( x11-wm/speedwm )
 		pdf? ( app-text/zathura-pdf-poppler )
 		dev-vcs/git
 		email? ( mail-client/aerc )
-		fonts? ( media-fonts/dejavu )
-		fonts? ( media-fonts/fontawesome )
-		fonts? ( media-fonts/noto )
-		fonts? ( media-fonts/noto-cjk )
-		fonts? ( media-fonts/noto-emoji )
+		fonts? ( media-fonts/dejavu media-fonts/fontawesome media-fonts/noto media-fonts/noto-cjk media-fonts/noto-emoji )
 		screenshot? ( media-gfx/maim )
-		filemanager? ( media-gfx/ueberzug )
+		filemanager? ( media-gfx/ueberzug app-misc/vifm app-misc/vifm-ueberzug )
 		image? ( media-gfx/nsxiv )
 		pywal? ( media-sound/cli-visualizer-pywal )
 		visualizer? ( media-sound/cli-visualizer )
@@ -54,7 +48,7 @@ DEPEND="wm? ( x11-wm/speedwm )
 		sys-apps/exa
 		temp? ( sys-apps/lm-sensors )
 		sys-process/htop
-		browser? ( www-client/icecat-bin )
+		browser? ( www-client/qutebrowser )
 		x11-apps/xdpyinfo
 		x11-apps/xrdb
 		server? ( x11-apps/xinit )