diff --git a/pentoo/pentoo-system/Manifest b/pentoo/pentoo-system/Manifest
index afb3fbb0d..52fd277fe 100644
--- a/pentoo/pentoo-system/Manifest
+++ b/pentoo/pentoo-system/Manifest
@@ -1,3 +1,2 @@
-EBUILD pentoo-system-2013.0-r1.ebuild 1560 SHA256 37e34e225e1fc251650d2ed4230034d97c789313e81c396a2e1779d4ab37322a SHA512 7ffa9deec39faa71772f8630417165c7e8328c1995d50daa0199e4ffdcd5fa981cf91dd1d5c860a34b17624d46b709facb19261ddc8dc338ae687b437453f1b9 WHIRLPOOL 3753a0eaac026a821db8cb438b0f665dea6a5efd589fb820f0d7631d29ca393d286495d798b68fef687448fd1ea8aec0528954a3651c8bcfe2f49ca0255063df
-EBUILD pentoo-system-2013.0-r2.ebuild 1594 SHA256 ab16636e504586dc8cc67e783d39c766d1124d5ecd7159d894eb9184fbd471cf SHA512 f162287c94b525b332db6404d33eb0b85a50ec9b7cc63aec37c0e242adcdad7d1ce751d66688c024c6f86a5450bd920111c425c36f9add9483dcffd9a91b8db7 WHIRLPOOL af45603914d2b395d327a7d267aea84b983f5c8145b03e17496b4f7dadfcc99a9dbcc060de156337a589a0038459571bfbcb5740f3245dfe14a6fa8c7647d0c5
-EBUILD pentoo-system-9999.ebuild 1594 SHA256 ab16636e504586dc8cc67e783d39c766d1124d5ecd7159d894eb9184fbd471cf SHA512 f162287c94b525b332db6404d33eb0b85a50ec9b7cc63aec37c0e242adcdad7d1ce751d66688c024c6f86a5450bd920111c425c36f9add9483dcffd9a91b8db7 WHIRLPOOL af45603914d2b395d327a7d267aea84b983f5c8145b03e17496b4f7dadfcc99a9dbcc060de156337a589a0038459571bfbcb5740f3245dfe14a6fa8c7647d0c5
+EBUILD pentoo-system-2013.0-r3.ebuild 1708 SHA256 2cf7f4fe2f1cf4a09298219907a2a0ec09293449b7f6a125290ee68e3d1daa90 SHA512 2c4a0a6fa88ca4fa7099012102bce49da960e498034fb579d7242156016f12627462ac5a9abe872491505d05a14353a90ac827338062dbc8e488f2d618f4d3f4 WHIRLPOOL af5b27727677d786f6f36844e2024226016242f45d287edf5c8a206de87c97a73be6be3b1d7a4d1242a3da3e10d64e226b7bde749d9866230b762b7cbd143968
+EBUILD pentoo-system-9999.ebuild 1699 SHA256 f68f4d48a1cca4639566394c3a9fac5b960639cff0de11e213a588da651064b0 SHA512 9ec90b6e6fdd1b91b9eecf24e9e1dba499352a8ee50576d7c13501321476df28c6e7d93c728e3a29e45a66c2f71c2f9e5eb98be76fa1e5a7fe4a2af51b666cc8 WHIRLPOOL c7033a2e4df85da5485163d627d26d031fc846999d45335b9da18d734af19b5853aa4777656b1df1f35eb46f8e4bfdfdf4535204c81c3507f2e133032d497e94
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r2.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r2.ebuild
deleted file mode 100644
index 4e161c3f3..000000000
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-KEYWORDS=""
-DESCRIPTION="Pentoo meta ebuild to install system"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL"
-IUSE="+drivers livecd livecd-stage1 +windows-compat"
-
-S="${WORKDIR}"
-
-#things needed for a running pentoo system
-RDEPEND="${RDEPEND}
-	!livecd? ( app-portage/portage-utils
-		|| ( app-admin/syslog-ng virtual/logger )
-		|| ( sys-process/fcron virtual/cron ) )
-	sys-apps/gptfdisk
-	sys-apps/pcmciautils
-	!arm? ( !livecd-stage1? ( sys-kernel/genkernel
-		|| ( sys-boot/grub:0 sys-boot/grub-static )
-		sys-boot/grub:2 ) )
-	app-arch/unrar
-	app-arch/unzip
-	app-portage/gentoolkit
-	app-portage/eix
-	app-portage/porthole
-	windows-compat? ( app-emulation/wine
-		amd64? ( dev-lang/mono ) )
-	sys-apps/pciutils
-	sys-apps/mlocate
-	sys-apps/usb_modeswitch
-	!arm? ( sys-apps/microcode-data
-		sys-firmware/amd-ucode
-		sys-boot/syslinux )
-	net-fs/curlftpfs
-	sys-fs/sshfs-fuse
-	sys-kernel/linux-firmware
-	sys-libs/gpm
-	!arm? ( sys-power/acpid[pentoo] )
-	sys-power/cpufrequtils
-	sys-power/hibernate-script
-	sys-power/powertop
-	sys-process/htop
-	sys-process/iotop
-	sys-boot/unetbootin
-	sys-apps/openrc[pentoo]
-	app-arch/sharutils
-	app-crypt/gnupg
-	app-shells/bash-completion
-	sys-apps/hdparm
-	sys-boot/efibootmgr
-	sys-fs/cryptsetup
-	dev-libs/icu
-	sys-process/lsof
-	!arm? ( sys-kernel/pentoo-sources )
-	app-portage/mirrorselect
-	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
-	|| ( mail-client/thunderbird-bin mail-client/thunderbird )
-	drivers? ( sys-kernel/ax88179_178a )
-"
diff --git a/pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild b/pentoo/pentoo-system/pentoo-system-2013.0-r3.ebuild
similarity index 86%
rename from pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild
rename to pentoo/pentoo-system/pentoo-system-2013.0-r3.ebuild
index 92b4b2e43..0900e98c7 100644
--- a/pentoo/pentoo-system/pentoo-system-2013.0-r1.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2013.0-r3.ebuild
@@ -3,17 +3,18 @@
 # $Header: $
 
 EAPI="5"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 x86"
 DESCRIPTION="Pentoo meta ebuild to install system"
 HOMEPAGE="http://www.pentoo.ch"
 SLOT="0"
 LICENSE="GPL"
-IUSE="livecd livecd-stage1 +windows-compat"
+IUSE="+drivers livecd livecd-stage1 +windows-compat video_cards_vmware"
 
 S="${WORKDIR}"
 
 #things needed for a running pentoo system
-RDEPEND="${RDEPEND}
+PDEPEND="${PDEPEND}
+	!livecd-stage1? ( video_cards_vmware? ( app-emulation/open-vm-tools ) )
 	!livecd? ( app-portage/portage-utils
 		|| ( app-admin/syslog-ng virtual/logger )
 		|| ( sys-process/fcron virtual/cron ) )
@@ -60,3 +61,5 @@ RDEPEND="${RDEPEND}
 	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
 	|| ( mail-client/thunderbird-bin mail-client/thunderbird )
 "
+	#no buildy
+	#drivers? ( sys-kernel/ax88179_178a )
diff --git a/pentoo/pentoo-system/pentoo-system-9999.ebuild b/pentoo/pentoo-system/pentoo-system-9999.ebuild
index 4e161c3f3..51d35ce37 100644
--- a/pentoo/pentoo-system/pentoo-system-9999.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-9999.ebuild
@@ -8,12 +8,13 @@ DESCRIPTION="Pentoo meta ebuild to install system"
 HOMEPAGE="http://www.pentoo.ch"
 SLOT="0"
 LICENSE="GPL"
-IUSE="+drivers livecd livecd-stage1 +windows-compat"
+IUSE="+drivers livecd livecd-stage1 +windows-compat video_cards_vmware"
 
 S="${WORKDIR}"
 
 #things needed for a running pentoo system
-RDEPEND="${RDEPEND}
+PDEPEND="${PDEPEND}
+	!livecd-stage1? ( video_cards_vmware? ( app-emulation/open-vm-tools ) )
 	!livecd? ( app-portage/portage-utils
 		|| ( app-admin/syslog-ng virtual/logger )
 		|| ( sys-process/fcron virtual/cron ) )
@@ -59,5 +60,6 @@ RDEPEND="${RDEPEND}
 	app-portage/mirrorselect
 	!livecd-stage1? ( amd64? ( sys-fs/zfs ) )
 	|| ( mail-client/thunderbird-bin mail-client/thunderbird )
-	drivers? ( sys-kernel/ax88179_178a )
 "
+	#no buildy
+	#drivers? ( sys-kernel/ax88179_178a )
diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest
index 4581ff2a6..5931ad1a3 100644
--- a/pentoo/pentoo/Manifest
+++ b/pentoo/pentoo/Manifest
@@ -20,4 +20,4 @@ AUX pentoo-release-2012.1-rc2 34 SHA256 31e6bd2df90dca4c5483de8ce197bbf39a658179
 AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
 AUX tux-winfly-killah.1600x1200.jpg 360183 SHA256 af7c84386a634e573fbd65884c49c716a4f92369b2f228c68672acc96f4a9879 SHA512 ed81ce83997a7ccc4eeb0fc08d09b98bedd6de8f27b9cfce2cb734ca4f4283c3e44154d7cfa73f94742c627ed67fb3ad520019ad8cbd9286cd8e2ceffc8677e7 WHIRLPOOL a8b2d4b51dc261362c4d9fca225ac9c02defc3903b6e9ecc8a7401a2155135efc2c7d62afba8727de37126ec425936ab08727455a68fd922192ec46a428ebd17
 AUX xfce4-desktop.xml 378 SHA256 97b1cb040f9819c0fe904537adf0e51fa3dbb35b8a34050d674a08dfb69c11d0 SHA512 ae84b11c4a5e833ff0b6e36e0619c5dab0e3dcab0e859fdc59dcbfed91e140d165677e2293b0c83bbf8ccaa3fcc5b5262888942a598b3e3de666b0dcdd7b2bc9 WHIRLPOOL b1bf73e6b0e577e411c0043603930fe920bd01326d4f3994661141e77c23983e61084d458ba0dd972330b13c2e0c2cd77ece37c6a3295a732879f0ae88df638b
-EBUILD pentoo-2013.0-r3.ebuild 6684 SHA256 901b3f3f097e49576288cc2ca575d8855f8f13da22a3657d3ebac6636d657f04 SHA512 afde67f46a0c5e7ce44efbc88d31fbdbbe27812aa7c83722a62a8aefa8034d9e2abcf8b05e914691baf2a2321d7e738ed7c7b3395dadbb734e951dc35154e86f WHIRLPOOL b6ac037f2968fe7c8224c1976e73c175374cc09b67032ddb6e06c00c1de3e1899fbc65cfe890b8b6f8533609cfe5deedd57766b2e3186fa6767aa76a6813a2ca
+EBUILD pentoo-2013.0-r3.ebuild 6665 SHA256 3da28fbba6618222056a664f61390583cf50436e7936d8441e5b46737bb3425b SHA512 21812758b796983f6a4170af6cb325d19b1e3ae80afaa8cb0b3c16d9f421ba6ca0e983e8d75072ae9946efcd6856f9178448d0899c6d2c774fbc933588c484ab WHIRLPOOL bf2141ba7300e931f34f9a99e62f28218db4b4ac6caadab2f77e9244028ca9a3669f990c82ef147b24b779fb6b7a78b96c9e3bedd60de5f6430a10f556f925fe
diff --git a/pentoo/pentoo/pentoo-2013.0-r3.ebuild b/pentoo/pentoo/pentoo-2013.0-r3.ebuild
index 7673d1658..214debe53 100644
--- a/pentoo/pentoo/pentoo-2013.0-r3.ebuild
+++ b/pentoo/pentoo/pentoo-2013.0-r3.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Pentoo meta ebuild to install all apps"
 HOMEPAGE="http://www.pentoo.ch"
 SLOT="0"
 LICENSE="GPL"
-IUSE="livecd livecd-stage1 +analyzer bindist +bluetooth +cracking +database enlightenment +exploit +footprint +forensics +forging +fuzzers -kde +mitm +mobile +proxies qemu -gnome pentoo +radio +rce +scanner video_cards_vmware +voip +wireless +xfce X"
+IUSE="livecd livecd-stage1 +analyzer bindist +bluetooth +cracking +database enlightenment +exploit +footprint +forensics +forging +fuzzers -kde +mitm +mobile +proxies qemu -gnome pentoo +radio +rce +scanner +voip +wireless +xfce X"
 
 S="${WORKDIR}"