diff --git a/pentoo/pentoo/Manifest b/pentoo/pentoo/Manifest
index 23ef3f01c..e8fb19e18 100644
--- a/pentoo/pentoo/Manifest
+++ b/pentoo/pentoo/Manifest
@@ -19,3 +19,4 @@ AUX pentoo.xpm.gz 59047 SHA256 4adb6d0d305b599e35bed9a835b6aa3531cce71c0b05e293a
 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-r17.ebuild 4311 SHA256 67e83877972c4377054c5e29c899827751b94e6759c2592880313660cd1c4df7 SHA512 0de28a38f35f075ad479f1c7f16d65b9f2fcb0c2e33ff9e08b2b21525f626021e85be838fef602e616ca6c79c99fbaf6ac408f80a1dde40b8ab8e00584e0a2fd WHIRLPOOL d1b86985b9f6ce518d5acd9eebe7f69e64f08c6f094de82c418ab468f6fb37898cd5bdd6c3ea7c8394aaf0bbb45a97998f2fb6ade8158105d6287913e28d5751
+EBUILD pentoo-2013.0-r18.ebuild 4320 SHA256 fd0a10dde9c1b8d938db1c1d5911b4d78b95dc0fba3cafbbbf4600c96ff87c47 SHA512 12f3fabf190438ce0f06bae8d0db59ff50495b80540699ef49c4dffe21a7eaf153adbd1e8aca404a7a5f1cc5c0b27fecc535d8cacf87d401a9b5a162c4f469c4 WHIRLPOOL 5cb7c9462270be01f3ff1c07142a0be50bf2a9d803118f4b1551f248b2141e7dee5941d9c8e727a7131dc8494bcd674772296051f635c9c0e275359361be17e0
diff --git a/pentoo/pentoo/pentoo-2013.0-r18.ebuild b/pentoo/pentoo/pentoo-2013.0-r18.ebuild
new file mode 100644
index 000000000..0854eac86
--- /dev/null
+++ b/pentoo/pentoo/pentoo-2013.0-r18.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+KEYWORDS="amd64 arm x86"
+DESCRIPTION="Pentoo meta ebuild to install all apps"
+HOMEPAGE="http://www.pentoo.ch"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="livecd livecd-stage1 +analyzer bindist +bluetooth cdr +cracking +database +enlightenment +exploit +footprint +forensics +forging +fuzzers -kde +misc +mitm +mobile +proxies +qemu -gnome pentoo +radio +rce +scanner +voip +wireless +xfce X"
+
+S="${WORKDIR}"
+
+DEPEND="!pentoo/pentoo-etc-portage"
+
+# Things needed for a running system and not for livecd
+PDEPEND="!livecd? ( !pentoo/pentoo-livecd
+		!app-misc/livecd-tools )"
+
+# Pentoo tools
+# Install pentoo-system first, temporary workaround for #165
+PDEPEND="${PDEPEND}
+	pentoo? ( pentoo/pentoo-system )
+	analyzer? ( pentoo/pentoo-analyzer )
+	bluetooth? ( pentoo/pentoo-bluetooth )
+	cracking? ( pentoo/pentoo-cracking )
+	database? ( pentoo/pentoo-database )
+	exploit? ( pentoo/pentoo-exploit )
+	footprint? ( pentoo/pentoo-footprint )
+	forensics? ( pentoo/pentoo-forensics )
+	forging? ( pentoo/pentoo-forging )
+	fuzzers? ( pentoo/pentoo-fuzzers )
+	livecd? ( pentoo/pentoo-livecd )
+	misc? ( pentoo/pentoo-misc )
+	mitm? ( pentoo/pentoo-mitm )
+	mobile? ( pentoo/pentoo-mobile )
+	proxies? ( pentoo/pentoo-proxies )
+	radio? ( pentoo/pentoo-radio )
+	rce? ( pentoo/pentoo-rce )
+	scanner? ( pentoo/pentoo-scanner )
+	voip? ( pentoo/pentoo-voip )
+	wireless? ( pentoo/pentoo-wireless )"
+
+# Window makers
+PDEPEND="${PDEPEND}
+	enlightenment? ( x11-wm/enlightenment:0.17
+		x11-terms/terminology
+		gnome-base/gnome-menus
+		=x11-plugins/extramenu-9999
+	)
+	gnome? ( pentoo/pentoo-gnome )
+	kde? ( kde-base/kdebase-meta
+		kde-base/kate
+		kde-base/kcalc
+		kde-base/kgpg
+		kde-base/kmix
+		kde-base/ksnapshot
+		kde-misc/networkmanagement
+		net-misc/smb4k )
+	xfce? ( xfce-base/xfce4-meta
+		cdr? ( app-cdr/xfburn )
+		app-editors/leafpad
+		media-gfx/geeqie
+		x11-themes/tango-icon-theme
+		xfce-base/thunar
+		xfce-extra/thunar-volman
+		xfce-extra/tumbler
+		xfce-extra/xfce4-power-manager
+		xfce-extra/xfce4-screenshooter
+		x11-terms/xfce4-terminal
+	)"
+
+#X windows stuff
+PDEPEND="${PDEPEND}
+	X? (
+		!livecd-stage1? ( || ( x11-base/xorg-server dev-libs/wayland ) )
+		x11-apps/setxkbmap
+		x11-apps/xbacklight
+		x11-apps/xdm
+		x11-apps/xinit
+		x11-apps/xinput
+		x11-misc/arandr
+		x11-apps/xrandr
+		x11-libs/gksu
+		x11-misc/slim
+		x11-proto/dri2proto
+		x11-terms/rxvt-unicode
+		x11-themes/gtk-theme-switch
+		app-text/evince
+		media-sound/pavucontrol
+		media-sound/pulseaudio
+		net-misc/rdesktop
+		net-misc/tightvnc
+		!arm? ( || ( www-client/chromium www-client/google-chrome:stable www-client/google-chrome ) )
+		|| ( www-client/firefox www-client/firefox-bin )
+		www-plugins/hackplugins-meta
+	)"
+
+# Basic systems
+PDEPEND="${PDEPEND}
+	qemu? ( !livecd-stage1? ( app-emulation/virt-manager sys-apps/usermode-utilities ) )
+	app-admin/genmenu
+"
+
+
+src_install() {
+	##here is where we merge in things from root_overlay which make sense
+	exeinto /root
+	newexe "${FILESDIR}"/b43-commercial-2012.1 b43-commercial
+	insinto /root
+	newins "${FILESDIR}"/motd-2013.0-r3 motd
+
+	#/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
+	doins pentoo-release
+
+        dodir /etc/env.d
+        use kde && echo 'XSESSION="KDE-4"' > "${ED}"/etc/env.d/90xsession
+        use xfce && echo 'XSESSION="Xfce4"' > "${ED}"/etc/env.d/90xsession
+
+	#/etc/portage/postsync.d
+	exeinto /etc/portage/postsync.d
+	doexe "${FILESDIR}"/layman-sync
+
+	dodir /root
+	use xfce && echo "exec startxfce4 --with-ck-launch" > "${ED}"/root/.xinitrc
+
+	insinto /usr/share/${PN}/wallpaper
+	doins "${FILESDIR}"/domo-roolz.jpg
+	doins "${FILESDIR}"/tux-winfly-killah.1600x1200.jpg
+	doins "${FILESDIR}"/xfce4-desktop.xml
+	dosym /usr/share/${PN}/wallpaper/domo-roolz.jpg /usr/share/backgrounds/xfce/domo-roolz.jpg
+	dosym /usr/share/${PN}/wallpaper/tux-winfly-killah.1600x1200.jpg /usr/share/backgrounds/xfce/tux-winfly-killah.1600x1200.jpg
+
+	if [ ! -e "${EROOT}/etc/env.d/02locale" ]
+	then
+		doenvd "${FILESDIR}"/02locale
+	fi
+
+	insinto /etc/fonts
+	doins "${FILESDIR}"/local.conf
+}
diff --git a/profiles/pentoo/arch/arm/package.accept_keywords/X b/profiles/pentoo/arch/arm/package.accept_keywords/X
index 338521110..87e42f93d 100644
--- a/profiles/pentoo/arch/arm/package.accept_keywords/X
+++ b/profiles/pentoo/arch/arm/package.accept_keywords/X
@@ -1,23 +1,25 @@
-~net-libs/wvstreams-4.6.1-r3 **
-~www-plugins/noscript-2.6.6.2 **
-~www-plugins/exif_viewer-2.00-r2 **
-~www-plugins/status_4_evar-2013.02.16.23-r1 **
-~www-plugins/sql-inject-me-0.4.6-r2 **
-~www-plugins/foxyproxy-4.1.4 **
-~x11-themes/gtk-theme-switch-2.1.0 **
-~www-plugins/user-agent-switcher-0.7.3-r2 **
-~x11-misc/arandr-0.1.6 **
-~www-plugins/proxy_selector-0.80.7-r2 **
 ~media-sound/pavucontrol-1.0 **
-~www-plugins/downthemall-2.0.16 **
-~www-plugins/showip-2.0-r1 **
-~www-plugins/live-http-headers-0.17-r2 **
-~www-plugins/firebug-1.11.4 **
-~www-plugins/adblock_plus-2.2.4 **
-~www-plugins/httpfox-0.8.11-r2 **
-~www-plugins/web_developer-1.2.5 **
-~www-plugins/hackbar-1.6.2-r1 **
-~www-plugins/multi_links-3.0.0.19-r1 **
-~www-plugins/xss-me-0.4.6-r2 **
+~net-libs/wvstreams-4.6.1-r3 **
 ~net-misc/rdesktop-1.7.1 ~arm
+~www-plugins/adblock_plus-2.2.4 **
+~www-plugins/downthemall-2.0.16 **
+~www-plugins/exif_viewer-2.00-r2 **
+~www-plugins/firebug-1.11.4 **
 ~www-plugins/firecat-2.1 **
+~www-plugins/foxyproxy-4.1.4 **
+~www-plugins/hackbar-1.6.2-r1 **
+~www-plugins/hackplugins-meta
+~www-plugins/httpfox-0.8.11-r2 **
+~www-plugins/live-http-headers-0.17-r2 **
+~www-plugins/multi_links-3.0.0.19-r1 **
+~www-plugins/noscript-2.6.6.2 **
+~www-plugins/proxy_selector-0.80.7-r2 **
+=www-plugins/ringleader-0.3_pre* **
+~www-plugins/showip-2.0-r1 **
+~www-plugins/sql-inject-me-0.4.6-r2 **
+~www-plugins/status_4_evar-2013.02.16.23-r1 **
+~www-plugins/user-agent-switcher-0.7.3-r2 **
+~www-plugins/web_developer-1.2.5 **
+~www-plugins/xss-me-0.4.6-r2 **
+~x11-misc/arandr-0.1.6 **
+~x11-themes/gtk-theme-switch-2.1.0 **
diff --git a/www-plugins/hackplugins-meta/Manifest b/www-plugins/hackplugins-meta/Manifest
new file mode 100644
index 000000000..11774bc25
--- /dev/null
+++ b/www-plugins/hackplugins-meta/Manifest
@@ -0,0 +1 @@
+EBUILD hackplugins-meta-1.0.ebuild 800 SHA256 0530ebfc8232800054afd20123918a4c3c1036ca76d58ff52bf63cb13f844505 SHA512 7d625a32cde867343724f17ffeef3f3d51a0ed941bcb3c454d38d4ac1c3b2ef215dee0d6f04b3ad5246e4c4fa85cc1f8c02b596d325acac85b9551739f836bbe WHIRLPOOL c2ce55ca7afae2e292a9788ef6cef529317833dd9066f2daccd24c039723df99db90b14409fed0bd9001b5394b92b9b3923e3ac3621667672b47c88be446336e
diff --git a/www-plugins/hackplugins-meta/hackplugins-meta-1.0.ebuild b/www-plugins/hackplugins-meta/hackplugins-meta-1.0.ebuild
new file mode 100644
index 000000000..bc0dfb53c
--- /dev/null
+++ b/www-plugins/hackplugins-meta/hackplugins-meta-1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: blshkv$
+
+EAPI="5"
+
+DESCRIPTION="Collection of browser's plugins for application security testing"
+HOMEPAGE="http://pentoo.ch"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+firefox"
+
+RDEPEND="
+	firefox? (
+		www-plugins/firebug
+		www-plugins/foxyproxy
+		www-plugins/noscript
+		www-plugins/ringleader
+		www-plugins/sql-inject-me
+		www-plugins/user-agent-switcher
+		www-plugins/xss-me
+		)
+	"
+#	www-plugins/adblock_plus
+#	www-plugins/downthemall
+#	www-plugins/exif_viewer
+#	www-plugins/hackbar
+#	www-plugins/httpfox
+#	www-plugins/live-http-headers
+#	www-plugins/multi_links
+#	www-plugins/proxy_selector
+#	www-plugins/showip
+#	www-plugins/status_4_evar
+#	www-plugins/web_developer