diff --git a/dev-python/base58/base58-2.0.1.ebuild b/dev-python/base58/base58-2.0.1.ebuild
index 18eb08f870..18bb05a98c 100644
--- a/dev-python/base58/base58-2.0.1.ebuild
+++ b/dev-python/base58/base58-2.0.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="test? ( dev-python/pyhamcrest[${PYTHON_USEDEP}] )"
-BDEPEND=""
+RDEPEND=""
+BDEPEND="test? ( dev-python/pyhamcrest[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
diff --git a/x11-misc/gammy/Manifest b/x11-misc/gammy/Manifest
new file mode 100644
index 0000000000..f0d51f1bab
--- /dev/null
+++ b/x11-misc/gammy/Manifest
@@ -0,0 +1 @@
+DIST gammy-0.9.58a.tar.gz 208411 BLAKE2B 1681f5bbe49d8645a5f55be338c82fe6728bd2b643d5cff1343a3c3bc00ba06c7a903a1c4c6d8ca21f1e2e2991ecec79c392f17aeacb75f1b17f0994cc05b1f6 SHA512 fced7b742e15a70933146901dc07c8375bd7fffc6e000e8fa323029366e09d090c9c9c3e5d783fc5ad923259abf798649652af40e1a9bc83f6c60cbb81ee53a8
diff --git a/x11-misc/gammy/gammy-0.9.58a.ebuild b/x11-misc/gammy/gammy-0.9.58a.ebuild
new file mode 100644
index 0000000000..9e6fa88bb6
--- /dev/null
+++ b/x11-misc/gammy/gammy-0.9.58a.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils qmake-utils xdg
+
+DESCRIPTION="Adaptive screen brightness/temperature"
+HOMEPAGE="https://getgammy.com/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Fushko/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Fushko/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	x11-libs/libXxf86vm
+"
+DEPEND="
+	${RDEPEND}
+	media-gfx/imagemagick
+"
+
+src_configure() {
+	eqmake5 PREFIX="${D}/usr"
+}
+
+src_install() {
+	default
+
+	local sizes="
+	128
+	16
+	32
+	64
+	"
+	cd ./icons || die
+	for size in ${sizes}; do
+		convert "${size}x${size}ball.ico" "${size}x${size}ball.png" || die
+		newicon -s "${size}" "${size}x${size}ball.png" "${PN}.png"
+	done
+
+	make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gammy/gammy-9999.ebuild b/x11-misc/gammy/gammy-9999.ebuild
new file mode 100644
index 0000000000..9e6fa88bb6
--- /dev/null
+++ b/x11-misc/gammy/gammy-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils qmake-utils xdg
+
+DESCRIPTION="Adaptive screen brightness/temperature"
+HOMEPAGE="https://getgammy.com/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Fushko/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Fushko/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	x11-libs/libXxf86vm
+"
+DEPEND="
+	${RDEPEND}
+	media-gfx/imagemagick
+"
+
+src_configure() {
+	eqmake5 PREFIX="${D}/usr"
+}
+
+src_install() {
+	default
+
+	local sizes="
+	128
+	16
+	32
+	64
+	"
+	cd ./icons || die
+	for size in ${sizes}; do
+		convert "${size}x${size}ball.ico" "${size}x${size}ball.png" || die
+		newicon -s "${size}" "${size}x${size}ball.png" "${PN}.png"
+	done
+
+	make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gammy/metadata.xml b/x11-misc/gammy/metadata.xml
new file mode 100644
index 0000000000..a68db4e716
--- /dev/null
+++ b/x11-misc/gammy/metadata.xml
@@ -0,0 +1,16 @@
+<?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="github">Fushko/gammy</remote-id>
+    </upstream>
+    <longdescription>
+        Gammy is a GUI tool for adjusting pixel brightness/temperature automatically or manually.
+        It can dim the screen if its content is too bright, or brighten it otherwise. This can help your eyes adjust when switching between dark and light windows, especially at night or in suboptimal lighting conditions.
+        Screenshots available on its website.
+    </longdescription>
+</pkgmetadata>
diff --git a/x11-themes/obsidian-icon-theme/Manifest b/x11-themes/obsidian-icon-theme/Manifest
index d191a2cbcf..cff1c00969 100644
--- a/x11-themes/obsidian-icon-theme/Manifest
+++ b/x11-themes/obsidian-icon-theme/Manifest
@@ -1 +1 @@
-DIST obsidian-icon-theme-4.12.tar.gz 70303616 BLAKE2B e10370c09364d3d2784fa55811189f2ef3969ee1e633bea213461f5d4387ea26a9978c2b7956d02ed472e849a45a16e4346f81b6c65de2a9e1a860d82baffb7c SHA512 b041e688cbd1a247c81251f58494f701ded5cf5adaebb9f76383330fbc8a82d9a50ca67497c4743f6e95739c995c447913e9384a8dde1a72fb39ee20aa355b8a
+DIST obsidian-icon-theme-4.13.tar.gz 70927780 BLAKE2B 001c40ae73d5e31b85343257d383f086072c72ac6d2452070361ca8853ae60f48ab3b853020519247052f9a22d18ec8c008d46dd67b3c4a2b24b14462644e644 SHA512 fecd0cbb921fef630dafe151ab8d7fa551dbd22e77e65cf602f97765fdb701739e812cabc664de3a0f2283938666b93af07090ea658dc41b6424495d423beeed
diff --git a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.12.ebuild b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.13.ebuild
similarity index 100%
rename from x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.12.ebuild
rename to x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.13.ebuild