diff --git a/x11-themes/gtk-engines-equinox/Manifest b/x11-themes/gtk-engines-equinox/Manifest
index d3f8b605..0bdbdcb7 100644
--- a/x11-themes/gtk-engines-equinox/Manifest
+++ b/x11-themes/gtk-engines-equinox/Manifest
@@ -1,3 +1,3 @@
 AUX gtk-engines-equinox-1.50-dont-include-glib-gtimer-h.patch 276 SHA256 fb94e988d2d3862caa4462f36f40256cc67532127bb3f9ab292546c76dce13c1 SHA512 22b71ca05229c4beb90a7491fdc1d8261640ec762c6ad7fd5ce23fe0e5610012cbbb71b9c7ad89cc32129cbd3a21a6804269281a264fb65ca0e69bed7776f718 WHIRLPOOL a3ca3dca4eb6b680b6821d6aac0fa21c24aa6eba91daad107cc0ee97099429b95b7ee3b457b0b4d7b8402365c199af3374ec630ae2f4e429a04fd947a5f5328d
-DIST gtk-engines-equinox-1.50.tar.gz 360957 SHA256 0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227 SHA512 67f73b204b2b0ad483a606f6c165998504d797f3dc06d44779ba21be39535531a13771ca4e8fe559ab51e6e7cb2ff2a562b2ddc5fe6d4018248adb0402d19d80 WHIRLPOOL 2a9a15db4644d8ad3e7e67bb901bf2020d27501a992af27d352ccea677fd993bdfe08f8bd68b6af6341a1285947890569c33076a74f2ca0de83cd97e9c9c382b
-EBUILD gtk-engines-equinox-1.50-r1.ebuild 803 SHA256 742097dd77f466b0d7cd32792686503e8fbc15c5adc1b56e5371bbcdf74cb9ba SHA512 6782b3dc7d0e4fe2bef75bfd026000b91125b5aa276f6b13318013abefe204c0467fdbce7ba3018d6576851e184e7925265f62ed9ece02f54db0e2747e1bc5ce WHIRLPOOL 1398b4073bb322b6c0733488286004633cba563e5ff73dac8f70e29e16dd5f2cc9d08bf9dfa89c886de11f650d56bc21fe165bf091f3b10aaf9b9ff807bbe58f
+DIST gtk-engines-equinox-1.30.tar.bz2 616171 SHA256 1fea28bb08e89c63bdcb9ba8ee612b4e8fd9bea56a715efe6d7d8bcd7848013f SHA512 38889ce5be02ff5b2229e5c0e0a8bbed612ad93b26e469a80164b9f4470c7c027e13744371aa4ec04cbfb7fb7fc99d3f3a4ec439c6adef255a2bd8d813402d68 WHIRLPOOL eb35a81fe1b0082bcdd50c24004ba936a91b2b17ecc5c97dcbe053d0b0b36c98254c8aecc195428b3cce874f33f65956bb6f22a4a6ac03d0833e75b892e98a9d
+EBUILD gtk-engines-equinox-1.30.ebuild 1186 SHA256 70e683a7aa95b78109004341da2ad188c3fce5abfaa03c1d0577a570ee94514f SHA512 9ec0439d252f11ce330a3b19f02bc843e3ee1f6800b8256a43ca597ba70f19b0094df418942b26c64f8fca3bceb68e8f682a09ba89ac48c0ceae78da7c9d26d5 WHIRLPOOL 10dbf04fb73bb9f67fdb67418c17cde6f218c4d598ebbfbaf6d357e5d6f8c22f270128e72c5fb1c0be3edfb8da16a23779dfd9a71e2518480b35eab5795e4a56
diff --git a/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r1.ebuild b/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.30.ebuild
similarity index 53%
rename from x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r1.ebuild
rename to x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.30.ebuild
index 4fffa863..308f408e 100644
--- a/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.50-r1.ebuild
+++ b/x11-themes/gtk-engines-equinox/gtk-engines-equinox-1.30.ebuild
@@ -1,34 +1,45 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=2
 
-inherit eutils
-
 MY_P=${P/gtk-engines-}
 
+inherit eutils
+
 DESCRIPTION="A heavily modified version of the Aurora engine"
 HOMEPAGE="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881"
-SRC_URI="http://gnome-look.org/CONTENT/content-files/121881-${MY_P}.tar.gz
-				-> ${P}.tar.gz"
+SRC_URI="http://gnome-look.org/CONTENT/content-files/121881-${MY_P}.tar.bz2
+				-> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+icons"
 
-RDEPEND="x11-libs/gtk+:2"
+RDEPEND="x11-libs/gtk+:2
+	icons? ( x11-themes/faenza-icon-theme )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	epatch "${FILESDIR}"/gtk-engines-equinox-1.50-dont-include-glib-gtimer-h.patch
 }
 
-src_prepare() {
-    epatch "${FILESDIR}/${P}-dont-include-glib-gtimer-h.patch" || die
+src_unpack() {
+	unpack ${A}
+
+	echo Untarring engine files...
+	tar xpf "${WORKDIR}/equinox-gtk-engine.tar.gz" || die
+	cd "${S}"
+
+	echo Untarring themes files...
+	mkdir themes
+	cd themes
+	tar xpf "${WORKDIR}"/equinox-themes.tar.gz || die
 }
 
 src_configure() {
@@ -38,4 +49,9 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS
+
+	echo Installing themes...
+	dodir /usr/share/themes/
+	insinto /usr/share/themes/
+	doins -r themes/* || die
 }