diff --git a/pentoo/pentoo-livecd/Manifest b/pentoo/pentoo-livecd/Manifest
index 2c203c861..a3e0a90c3 100644
--- a/pentoo/pentoo-livecd/Manifest
+++ b/pentoo/pentoo-livecd/Manifest
@@ -1,2 +1,4 @@
-AUX binary-driver-handler.sh-2014.3 2163 SHA256 fadb41f618912472e4cac4b148cc114190ec138ccb0b67e57ad80a2b8da8783c SHA512 879e6e39de0d3a7957326f0238901926b185b0945370f5f4a4cf6ec93839a15ed158427f442bb19ebe8e87bfe9985284a42739b20662ad1cf0f2786a15192a41 WHIRLPOOL 79691464c40ee441c1c35c1c90132220829c49f1b578a76cf5e15a863ea351870a7d0351ca66067c9f536f425f5a7fd3ffbb105f4ff37e00e3a7a0eec9704787
-EBUILD pentoo-livecd-2014.3.ebuild 761 SHA256 88fa99db67e3ec6c27081e6ca006c7e5cdd2c10898cb51cfc50f1d229474f30e SHA512 54a0ae5ffb9c854e07306bd08883310fdf0009673246a4d53e53da398398cea4e7dfb7cd0d6de4f51ff7bf23101d3b0e9889647d617ac98501cd960c4e3f65bd WHIRLPOOL 8c0ad8a165f5e75ab439310c2bfaa550ea0d5719d7d18b29692d8b5916042a7f17ee00c5d16de026f2c2b7ccbba74020b0ccfe2db555fd4502414f113e8c7b26
+AUX binary-driver-handler.sh-2014.3-r1 2175 SHA256 f7cf514e1e6c39045df48ae654ff9b1cad7a57d17e537083967b5f9a1ee5b716 SHA512 c2361e954aa5c8b49e6d790443ec6292b291d9de7c48e6b2663197a7b50cb1bcba757f85f1e3bd2f0fc8d3ab9061b221c842c4ea2ba3edcca643d5fc1b28849b WHIRLPOOL 4b6c6e8d69dc274462ad75bfb80e1a4e5b5f45ad093caf2253ce2ea74ecc2e18644aebcc24bbbff996ae6b733947afd8a1b4a6179d5f7b27b410b140e39875f4
+AUX flushchanges-2014.3-r1 1518 SHA256 5c50dc0cac43f6656d735da65f500703dade1153411dd744641584efcca84e18 SHA512 7cc8a8311f3141d753231220a1eb1317617cfbc5da358bcd079d282129669b7347d94d62057194d402101629722aa9f670dbed5336fc8fa5455a1a321ab01681 WHIRLPOOL 0daf3dcf510c0b64e42e5f98821ada9678baa172fef9c6d557bd21acbe83a3dc43dc866d4e9842852b66f3ebebb7aac6595d65cff84170d9d1aa497a01572f0f
+AUX makemo-2014.3-r1 1516 SHA256 e62f6e4dd52284a23667174dac480e4f624f153032b501604829f111802ec1ef SHA512 b3b67f19b8597a48ca6d44c2490474c6c3cb8c83a5188d1aa4f1c6bb00db1035cdebd40d6d4d387844dbfb218b21db2c2bf5e87f19bdc42e14ac8bb98591a6d9 WHIRLPOOL 493ed98fb906468c6bb5499f28151d6c1fe5b851f2e6903905cbbebe7d754aee55abe4fa41e5ae317fae374a9d8b0e87a314545e9a66615f9b9aee57a6331583
+EBUILD pentoo-livecd-2014.3-r1.ebuild 957 SHA256 54e747042d466670b5db8066e02573917e8b4ef4b12aafd05483faec38856b4b SHA512 5c4e7c86a38161d7c336535bff903a9da4ada56fc01b6fad05e3ca8fd71523ff739d462a0739b4faeebca02b7b03de7eb2a6de6b65a4b48e2b5b3553f33d52de WHIRLPOOL 1253ee0181ed77ad7190e7d20850442773e9a2e7d7a9f8b4366de6310dc802ca85c0b7838179dc0a4e922384174e7cbda3a43c6718085deab36ea7e2971415f2
diff --git a/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.3 b/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.3-r1
similarity index 95%
rename from pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.3
rename to pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.3-r1
index aea88ec39..1c2089066 100644
--- a/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.3
+++ b/pentoo/pentoo-livecd/files/binary-driver-handler.sh-2014.3-r1
@@ -1,8 +1,6 @@
 #!/bin/sh
 #seriously, fuck you AMD and Nvidia. Write a sane license that permits redistribution, we just want your shitty hardware to work
 
-#radeon nouveau
-
 if [ "$(grep nobindrivers /proc/cmdline)" ]; then
 	NOBINDRIVERS=1
 else
@@ -10,7 +8,7 @@ else
 fi
 
 set -e
-source /lib/rc/sh/functions.sh
+source /lib/gentoo/functions.sh
 
 handle_nvidia(){
 	einfo "Detected: nvidia gpu, please stand by..."
@@ -70,13 +68,12 @@ handle_amd(){
 if $(lspci | grep VGA | grep -iq NVIDIA); then
 	if [ ! -f /lib/modules/$(uname -r)/video/nvidia.ko ]; then
 		handle_nvidia
+		eselect opengl set xorg-x11
 	fi
 elif $(lspci | grep VGA | grep -iq Radeon); then
 	if [ ! -f /lib/modules/$(uname -r)/video/fglrx.ko ]; then
 		handle_amd
+		eselect opengl set xorg-x11
 	fi
 fi
 
-eselect opengl set xorg-x11
-
-fi
diff --git a/pentoo/pentoo-system/files/flushchanges-2014.3 b/pentoo/pentoo-livecd/files/flushchanges-2014.3-r1
similarity index 92%
rename from pentoo/pentoo-system/files/flushchanges-2014.3
rename to pentoo/pentoo-livecd/files/flushchanges-2014.3-r1
index dec76afee..28efe6dbf 100755
--- a/pentoo/pentoo-system/files/flushchanges-2014.3
+++ b/pentoo/pentoo-livecd/files/flushchanges-2014.3-r1
@@ -3,9 +3,9 @@
 # allowing for some more space
 
 DST="/mnt/cdrom/modules"
-CHANGESDIR="/.unions/memory/aufs_changes/default/"
+CHANGESDIR="/.unions/memory/aufs-rw-branch/default/"
 
-[ -e /lib/rc/sh/functions.sh ] && . /lib/rc/sh/functions.sh
+[ -e /lib/gentoo/functions.sh ] && . /lib/gentoo/functions.sh
 
 usage ()
 {
diff --git a/pentoo/pentoo-system/files/makemo-2014.3 b/pentoo/pentoo-livecd/files/makemo-2014.3-r1
similarity index 97%
rename from pentoo/pentoo-system/files/makemo-2014.3
rename to pentoo/pentoo-livecd/files/makemo-2014.3-r1
index 47012ce01..cb367f620 100644
--- a/pentoo/pentoo-system/files/makemo-2014.3
+++ b/pentoo/pentoo-livecd/files/makemo-2014.3-r1
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-source /lib/rc/sh/functions.sh
+source /lib/gentoo/functions.sh
 
 einfo "Pentoo AUFS module creator version 1.0 running..."
 
diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2014.3.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2014.3-r1.ebuild
similarity index 75%
rename from pentoo/pentoo-livecd/pentoo-livecd-2014.3.ebuild
rename to pentoo/pentoo-livecd/pentoo-livecd-2014.3-r1.ebuild
index 27d160bfb..0f4be4537 100644
--- a/pentoo/pentoo-livecd/pentoo-livecd-2014.3.ebuild
+++ b/pentoo/pentoo-livecd/pentoo-livecd-2014.3-r1.ebuild
@@ -16,12 +16,14 @@ IUSE="livecd"
 S="${WORKDIR}"
 
 DEPEND=""
-RDEPEND="livecd? ( pentoo/pentoo-installer
+RDEPEND="!<pentoo/pentoo-system-2014.3-r4
+	livecd? ( pentoo/pentoo-installer
         	app-misc/livecd-tools
                 virtual/eject
                 sys-apps/hwsetup
                 sys-block/disktype
                 x11-misc/mkxf86config
+		sys-apps/gentoo-functions
 	)"
 
 pkg_setup() {
@@ -29,6 +31,10 @@ pkg_setup() {
 }
 
 src_install() {
+        #/usr/sbin
+        newsbin "${FILESDIR}"/flushchanges-${PVR} flushchanges
+        newsbin "${FILESDIR}"/makemo-${PVR} makemo
+
 	exeinto /etc/local.d
 	newexe "${FILESDIR}"/binary-driver-handler.sh-${PVR} 01-binary-driver-handler.sh
 }
diff --git a/pentoo/pentoo-system/Manifest b/pentoo/pentoo-system/Manifest
index 63cd29132..eb5a3f4d8 100644
--- a/pentoo/pentoo-system/Manifest
+++ b/pentoo/pentoo-system/Manifest
@@ -4,10 +4,8 @@ AUX 02locale 19 SHA256 6908ed1fdb7829167265e379e83e5f41c84c8ae34be5d85e2369a7648
 AUX 99-power_saving.start-r1 3306 SHA256 209e2ebedef6af10cd3cf3547b6a80289be34107d8beeaeb3d58d25b2a3cafbc SHA512 fa405e1fe49dcba1a3b41f02c6100b5e1fec88cf15a7d9fde871bd26dd7138a9eee6daaf7ee097c91e2af6cab66adf894579c7a2470dac28da6a470dc9c8a68f WHIRLPOOL 7322884020664cb9d539ed732c87fc9d15e840a2267ae16ffeaabb65f8cc3405dd9799a96ff4026e934483bc287bf1e0a820a75ea2a99ebc1121b5a3fc7b94e0
 AUX b43-commercial-2012.1 305 SHA256 b9a147fc4a41f4d45e5bd8dd790154293bb3a59fd8e9e560c9db5c5b54857ddc SHA512 821f6a904018a17f5a235c51988b7331a4efe7c2209d1e01f2b10f40c986b3acf4d4c9d4b9bcfc12c4feecd58a160bec8eb720cc9e28d9679e5d24900623fd92 WHIRLPOOL bf61b390ecedc9a29ef31c7f6ecdc35c415244aecedad7dddf1a57e971bed736ecb8047008f7c8f659f67b6d62413c22c743626a0f507e3ebeff641277bf4980
 AUX dokeybindings-2012.1 265 SHA256 ea323401cfaf10a37f04771541390b1c037a255c5583a5030ea6acbce5b5a409 SHA512 0765034bdb44fea5833be31f41bf1791866221c5f4148e639c172cbfb937a8090ada0c4fa62b5e96dded7501285a8a2f758d59397468d339782652ca18770aac WHIRLPOOL b0b272f7a7ece9930241c89bbe1fe7a3999baf853f547ef4f35770e42f0f49c2e12318ca8ab3fb001ddbbbb87b099e9f6545d897205464d245b5d057c287a431
-AUX flushchanges-2014.3 1514 SHA256 b9b543bc7e9dd1ef56cba5a0be8ffae3077de4072446af9d8d522bdcd1cf3d2b SHA512 adb4bad6fd2cf4d8815f397e417f4449323c1599e48d11bac4aa6d197d65700b74fb8f62ba39e753dec87f4696d48d14570dcb63bd6ab16a86da2e84507b7466 WHIRLPOOL 420a002377cb9517db69d867f6b4cd3e53ed943ef00e16c3b0bf730d5737c4bda5265f859346b4f7ab07eceb21c354ceea3436c94737e6365417ea26e16d9b0b
 AUX layman-sync 56 SHA256 3d8376566a509d4cfdcee8df55bdaf48fcdaf62c4dd46649c8bf3341b1c522aa SHA512 c7a49c4e0025958800a05d8c06ce1a01621d30358bdce829ea1187bde0d8a41c6d44c284037ee3c5bcc1bca3b319cd28b2350005eb1a2bbcfa0a1534eaaceb84 WHIRLPOOL 819df69d22ff0c82924b1d765ca4b3bf6a70be3243d5a4deea45b0d069e6abddd514cdca35ba91f3de54e15b16afb3a267153c6908b714ce281e781db1790379
 AUX local.conf 524 SHA256 f0854a36ace98318a20772448aae5e5d465eba5d1f1517292a86a5f2b46c55d8 SHA512 b3f4f7590b532e8db7db5586dad6c54cd5ce2e040b16bbfa8a3fa74445028b3411cf087b254b71866ea12d42c7f8740cfbfe64e269a8675a729315b9415546d9 WHIRLPOOL 8a7322d2593e3f3a4cfeea2af1ed9f0a226af5e8037808b49e195fe2210d35f8a314a962215507f0bde303d601afb917a3f0fc7fd181be2d7a34f958de9bd3c2
-AUX makemo-2014.3 1515 SHA256 af2e61ed5a20ad0c5d27e6ff9708d4caf2c540ca0f754ddde1fee5ca14a0f11c SHA512 438c49e6fbe5ffb66fa40c61ec24ce2e53b1a18837e4cef78fca0403c6f220467ac9f1559bb8a9552d03e7208440265425fd3f02719e214359d3c413d65d881f WHIRLPOOL afcb067bad1395086a7ea204c41b28f83ba6e2d33e9b8aaf0173353a9131effed9dbffd5e88468ae82f5e82c666cc7aedb6d13291dd8500dbe64835b306db014
 AUX motd-2014.3 2465 SHA256 fca3eac222030f0990b735a6e7c3165d672de6e3058205f7b1fe02a689753a69 SHA512 a5fb74aa7d06863cddb6a21b027add72b41fc8b465efce46bdc3aaf052fde5c1320a68fb9b18bcb4956992e60fa9584ca05c859f701c82ca979fad642f8659cc WHIRLPOOL 039006f7ecca9136b0c32dc0cfd2f2fac398093147601fae0a6cd34bde19ddd6bf712efbf0aa5e817c320434fc749eaf7aa55fc73380df6246e82022851dd156
 AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293adb3197cac4c09e0 SHA512 a6a2f152861e63c33afdda9997b9be25bd735f0624c946d61d0088210264743f842f103026eeb7cf63ef94b873131b072b61c55fba1922e9830318bcacd7a074 WHIRLPOOL a3b937b810f02f1fa6ebcdc58cada7a71e778f370b3355a08670a7f524d8e370ba29bdaf408d0bdd14753a129734d80a952937f3e009a69e87bed90995a2aaaf
-EBUILD pentoo-system-2014.3-r3.ebuild 5769 SHA256 62061d86aedcbc80feeec5a8b7b5ebfb24cd78b64bf4cd3be57756cdf0a920d2 SHA512 f7be43e84daba89a3b6e921376a224fb1589fdb3142f44e6f6a770a3b6f17db16578e959198827f6b6613bfed584036f22acec1c30bb25062a934d1bad265c11 WHIRLPOOL 8d28642f0cc2dcb03f9854216f08017b9388f502a306f9202444efabbd50ddc5f5d46ef741fd521ceb5ab39bdef0cc54e7ba5a9d05405891369ae9cd0dea5f08
+EBUILD pentoo-system-2014.3-r4.ebuild 5658 SHA256 ef0278057985493acecb91db0de5ae844e66453ebc6445ed01af34427123b366 SHA512 3b4ce5489ff19ca9a30932340559ac88a0036c438e95247ec38a1956ae63985f527995a40a3d2305a365ae2601d87e9ddd87fa99672f67a9b2e60bffeb91b03b WHIRLPOOL 11f8c0261708a0fcdf63f375dbe8e5cbc3fc423a2f0fd1ace5ecad52b52e8071d4905a775a4655dec0de9931c4cc5567e3747939fe63c4b5009a1d37cb2b9cd5
diff --git a/pentoo/pentoo-system/pentoo-system-2014.3-r3.ebuild b/pentoo/pentoo-system/pentoo-system-2014.3-r4.ebuild
similarity index 98%
rename from pentoo/pentoo-system/pentoo-system-2014.3-r3.ebuild
rename to pentoo/pentoo-system/pentoo-system-2014.3-r4.ebuild
index 1a0a424e9..42763d512 100644
--- a/pentoo/pentoo-system/pentoo-system-2014.3-r3.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2014.3-r4.ebuild
@@ -119,10 +119,6 @@ src_install() {
 	#/usr/bin
 	use enlightenment && newbin "${FILESDIR}"/dokeybindings-2012.1 dokeybindings
 
-	#/usr/sbin
-	newsbin "${FILESDIR}"/flushchanges-${PV} flushchanges
-	newsbin "${FILESDIR}"/makemo-${PV} makemo
-
 	#/etc
 	insinto /etc
 	echo "Pentoo Release ${PV}" > pentoo-release