diff --git a/x11-themes/solus-backgrounds/Manifest b/x11-themes/solus-backgrounds/Manifest
deleted file mode 100644
index 0ebaab0..0000000
--- a/x11-themes/solus-backgrounds/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST solus-backgrounds-15.tar.xz 51495228 SHA256 ee0762eb83067ce8358fec0dc6bf650907a7b46dbbb36eaf9c83d705b4d3a809 SHA512 b6e5b03d38bc9ba06e2bbae3350cfcb080f1ca4aa83a5cd292cfcde9b6278084d542e1dc8aab69090baa3b7293c4215fbf38f59f38a643dcef38fde910535d99 WHIRLPOOL 0ff4d5533f58f97ab57c731bb8434453fb52299991b6b6bd771a14b6d3fda5957c0d373533e6fd4c5b104d9dc171b958b4c374ad7cbd2be7587a5f3f3d6bdd45
-EBUILD solus-backgrounds-15.ebuild 806 SHA256 9c3e4759d0525cdba577ea158df2880e257f4afd92a57986ef1d64133937c568 SHA512 ff3efea3112fa0fe56bb2488d2fd0a7eb2d77c901dcba917a86f2f4eb1eb0225dd930e31ab45bfef41be7ae0fc2f0f4fad3c86a50b069771c235453b4d939450 WHIRLPOOL 7f28ed0801dc2811cd790950ea1c45a8a2182704af37108d05b548c825c74c547bac6fc7309b68e4355ba48630d0d22147fcd183011a7c0b4070bf2bf9f4ac15
-EBUILD solus-backgrounds-9999.ebuild 805 SHA256 7557c8a4f4d6a59be811715df2d034aae9b87e3b298fac497c88330f8615e074 SHA512 c6ec4c6eacdebbb57d1f6d7f20e9aa5f09a0bac10b566d91b323af48a12f6c9a3e77a69abfb52a6e082e91c851b31511dcf949a65b93cf845ad1e5fbf8e980c5 WHIRLPOOL d93d2f8ed21505a3e223760ed811dc7e1b000ae6f861db7cd418c8a86f245c3d2ec9d29476a23c647c10a414e45d53a658a60edf794021d29df3554091d10761
diff --git a/x11-themes/solus-backgrounds/solus-backgrounds-15.ebuild b/x11-themes/solus-backgrounds/solus-backgrounds-15.ebuild
deleted file mode 100644
index 409a4f8..0000000
--- a/x11-themes/solus-backgrounds/solus-backgrounds-15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit gnome2
-
-DESCRIPTION="Solus Project Artwork"
-HOMEPAGE="https://github.com/solus-project/artwork"
-
-MY_PN=${PN/backgrounds/artwork}
-
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/solus-project/${MY_PN##*-}.git"
-    SRC_URI=""
-    KEYWORDS=""
-    inherit git-r3 autotools
-else
-    SRC_URI="https://github.com/solus-project/${MY_PN##*-}/releases/download/v${PV}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
-    S="${WORKDIR}/${MY_PN}-${PV}"
-    KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-
-    if [[ ${PV} == "9999" ]] ; then
-        eautoreconf
-    else
-        default_src_prepare
-    fi
-}
diff --git a/x11-themes/solus-backgrounds/solus-backgrounds-9999.ebuild b/x11-themes/solus-backgrounds/solus-backgrounds-9999.ebuild
deleted file mode 100644
index d49fa5a..0000000
--- a/x11-themes/solus-backgrounds/solus-backgrounds-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit gnome2
-
-DESCRIPTION="Solus Project Artwork"
-HOMEPAGE="https://github.com/solus-project/artwork"
-
-MY_PN=${PN/backgrounds/artwork}
-
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/solus-project/${MY_PN##*-}.git"
-    SRC_URI=""
-    KEYWORDS=""
-    inherit git-r3 autotools
-else
-    SRC_URI="https://github.com/solus-project/${MY_PN##*-}/releases/download/v${PV}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
-    S="${WORKDIR}/${MY_PN}-${PV}"
-    KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-    if [[ ${PV} == "9999" ]] ; then
-        eautoreconf
-    else
-        default_src_prepare
-    fi
-}
diff --git a/x11-wm/budgie-desktop/Manifest b/x11-wm/budgie-desktop/Manifest
deleted file mode 100644
index 0dc3098..0000000
--- a/x11-wm/budgie-desktop/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST budgie-desktop-10.2.8.tar.xz 922372 SHA256 d30f573429e6ce853f0770d9959a6a82ee56925a854d96991f625e14faf98019 SHA512 98a38af0bd632b0dde216385c2977c4c26652c0744e4fbe5d4c7852c845b75e72d64f6499d21782c024f93359e6a226fd438e53fe7bb433eb28089f2dba28780 WHIRLPOOL 3d2a9365606b8c5deb6d70081a28b57a9bb34a7459f730f16afe60a3f4133ef8b49f2658534c8ba08727be981dc33ecbb1800a5029579e494b5f72115f9f29fb
-DIST budgie-desktop-10.2.9.tar.xz 932344 SHA256 80c49c462dffbc1af7e1264be5add7e11ff23909c715adeb0aa22129ac524c48 SHA512 f7cd973e8410c155447aa6acb9210e3e9c01444ef3ad56befd91c68769a854e454977d94ba46efbd5f72e92cce6540d08a4307fe83753674afc473e47b16bccc WHIRLPOOL b4df8a20a08954b6f852a05d11c2f618715b7c943472cd28773e29142682677ff9dc2d5e97cab98ff637504cb5765213e1fa0888c5e79e9cf3a7939ddb072d44
-EBUILD budgie-desktop-10.2.8.ebuild 1567 SHA256 13d2664dc106657e4c00c9038d02ed444877c146dc5bd905b221bb82c3d29f2a SHA512 285edb6962c1785c9de9931e2e5cfb965ef7534c7fd191dfdd9fca616ba819ff503a35a3225e5d49e1eb2f2d4811aa7023dfeb37f56dd978431530fde286ffdf WHIRLPOOL a41f73510e13e914fde2664352e8a85f331b05301626241c25ef9b73acfbf1309fd80f84587871cdcf48d5b18ac5c33416f0f3f804d5a5066581e053f86b35cf
-EBUILD budgie-desktop-10.2.9.ebuild 1567 SHA256 13d2664dc106657e4c00c9038d02ed444877c146dc5bd905b221bb82c3d29f2a SHA512 285edb6962c1785c9de9931e2e5cfb965ef7534c7fd191dfdd9fca616ba819ff503a35a3225e5d49e1eb2f2d4811aa7023dfeb37f56dd978431530fde286ffdf WHIRLPOOL a41f73510e13e914fde2664352e8a85f331b05301626241c25ef9b73acfbf1309fd80f84587871cdcf48d5b18ac5c33416f0f3f804d5a5066581e053f86b35cf
-EBUILD budgie-desktop-9999.ebuild 1567 SHA256 13d2664dc106657e4c00c9038d02ed444877c146dc5bd905b221bb82c3d29f2a SHA512 285edb6962c1785c9de9931e2e5cfb965ef7534c7fd191dfdd9fca616ba819ff503a35a3225e5d49e1eb2f2d4811aa7023dfeb37f56dd978431530fde286ffdf WHIRLPOOL a41f73510e13e914fde2664352e8a85f331b05301626241c25ef9b73acfbf1309fd80f84587871cdcf48d5b18ac5c33416f0f3f804d5a5066581e053f86b35cf
diff --git a/x11-wm/budgie-desktop/budgie-desktop-10.2.8.ebuild b/x11-wm/budgie-desktop/budgie-desktop-10.2.8.ebuild
deleted file mode 100644
index 77ad67b..0000000
--- a/x11-wm/budgie-desktop/budgie-desktop-10.2.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
-
-VALA_MIN_API_VERSION="0.28"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="Solus Project's desktop"
-HOMEPAGE="https://solus-project.com/budgie/"
-
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/solus-project/${PN}.git"
-    SRC_URI=""
-    KEYWORDS=""
-    inherit git-r3 autotools
-else
-    SRC_URI="https://github.com/solus-project/${PN}/releases/download/v${PV}/${P}.tar.xz -> ${P}.tar.xz"
-    KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0
-	>=x11-libs/gtk+-3.16.0:3
-	>=dev-libs/libpeas-1.0[gtk]
-	>=gnome-base/gnome-menus-3.10.1
-	>=dev-libs/gobject-introspection-1.44.0
-	>=media-sound/pulseaudio-4.0[glib]
-	>=x11-wm/mutter-3.18.0
-	>=gnome-base/gnome-desktop-3.18.0
-	>=gnome-base/gsettings-desktop-schemas-3.18.0
-	>=x11-libs/libwnck-3.14.0
-	>=app-i18n/ibus-1.5.13
-	>=sys-power/upower-0.9.20[introspection]"
-
-if [[ ${PV} == "9999" ]] ; then
-	RDEPEND="${RDEPEND}
-	gnome-base/gnome-common:3"
-fi
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-    if [[ ${PV} == "9999" ]] ; then
-        git-r3_src_unpack
-    else
-        default_src_unpack
-    fi
-}
-
-src_prepare() {
-    if [[ ${PV} == "9999" ]] ; then
-        eautoreconf
-    else
-        default_src_prepare
-    fi
-}
-
-src_configure() {
-    gnome2_src_configure \
-        VALAC=$(type -P true)
-}
-
-src_compile() {
-    local valaver="$(vala_best_api_version)"
-    emake VALAC="$(type -p valac-${valaver})"
-}
diff --git a/x11-wm/budgie-desktop/budgie-desktop-10.2.9.ebuild b/x11-wm/budgie-desktop/budgie-desktop-10.2.9.ebuild
deleted file mode 100644
index 77ad67b..0000000
--- a/x11-wm/budgie-desktop/budgie-desktop-10.2.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
-
-VALA_MIN_API_VERSION="0.28"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="Solus Project's desktop"
-HOMEPAGE="https://solus-project.com/budgie/"
-
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/solus-project/${PN}.git"
-    SRC_URI=""
-    KEYWORDS=""
-    inherit git-r3 autotools
-else
-    SRC_URI="https://github.com/solus-project/${PN}/releases/download/v${PV}/${P}.tar.xz -> ${P}.tar.xz"
-    KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0
-	>=x11-libs/gtk+-3.16.0:3
-	>=dev-libs/libpeas-1.0[gtk]
-	>=gnome-base/gnome-menus-3.10.1
-	>=dev-libs/gobject-introspection-1.44.0
-	>=media-sound/pulseaudio-4.0[glib]
-	>=x11-wm/mutter-3.18.0
-	>=gnome-base/gnome-desktop-3.18.0
-	>=gnome-base/gsettings-desktop-schemas-3.18.0
-	>=x11-libs/libwnck-3.14.0
-	>=app-i18n/ibus-1.5.13
-	>=sys-power/upower-0.9.20[introspection]"
-
-if [[ ${PV} == "9999" ]] ; then
-	RDEPEND="${RDEPEND}
-	gnome-base/gnome-common:3"
-fi
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-    if [[ ${PV} == "9999" ]] ; then
-        git-r3_src_unpack
-    else
-        default_src_unpack
-    fi
-}
-
-src_prepare() {
-    if [[ ${PV} == "9999" ]] ; then
-        eautoreconf
-    else
-        default_src_prepare
-    fi
-}
-
-src_configure() {
-    gnome2_src_configure \
-        VALAC=$(type -P true)
-}
-
-src_compile() {
-    local valaver="$(vala_best_api_version)"
-    emake VALAC="$(type -p valac-${valaver})"
-}
diff --git a/x11-wm/budgie-desktop/budgie-desktop-9999.ebuild b/x11-wm/budgie-desktop/budgie-desktop-9999.ebuild
deleted file mode 100644
index 77ad67b..0000000
--- a/x11-wm/budgie-desktop/budgie-desktop-9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
-
-VALA_MIN_API_VERSION="0.28"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="Solus Project's desktop"
-HOMEPAGE="https://solus-project.com/budgie/"
-
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/solus-project/${PN}.git"
-    SRC_URI=""
-    KEYWORDS=""
-    inherit git-r3 autotools
-else
-    SRC_URI="https://github.com/solus-project/${PN}/releases/download/v${PV}/${P}.tar.xz -> ${P}.tar.xz"
-    KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0
-	>=x11-libs/gtk+-3.16.0:3
-	>=dev-libs/libpeas-1.0[gtk]
-	>=gnome-base/gnome-menus-3.10.1
-	>=dev-libs/gobject-introspection-1.44.0
-	>=media-sound/pulseaudio-4.0[glib]
-	>=x11-wm/mutter-3.18.0
-	>=gnome-base/gnome-desktop-3.18.0
-	>=gnome-base/gsettings-desktop-schemas-3.18.0
-	>=x11-libs/libwnck-3.14.0
-	>=app-i18n/ibus-1.5.13
-	>=sys-power/upower-0.9.20[introspection]"
-
-if [[ ${PV} == "9999" ]] ; then
-	RDEPEND="${RDEPEND}
-	gnome-base/gnome-common:3"
-fi
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-    if [[ ${PV} == "9999" ]] ; then
-        git-r3_src_unpack
-    else
-        default_src_unpack
-    fi
-}
-
-src_prepare() {
-    if [[ ${PV} == "9999" ]] ; then
-        eautoreconf
-    else
-        default_src_prepare
-    fi
-}
-
-src_configure() {
-    gnome2_src_configure \
-        VALAC=$(type -P true)
-}
-
-src_compile() {
-    local valaver="$(vala_best_api_version)"
-    emake VALAC="$(type -p valac-${valaver})"
-}