diff --git a/pentoo/pentoo-analyzer/pentoo-analyzer-2019.1-r2.ebuild b/pentoo/pentoo-analyzer/pentoo-analyzer-2019.2.ebuild
similarity index 92%
rename from pentoo/pentoo-analyzer/pentoo-analyzer-2019.1-r2.ebuild
rename to pentoo/pentoo-analyzer/pentoo-analyzer-2019.2.ebuild
index cd663b756..2ec506bd7 100644
--- a/pentoo/pentoo-analyzer/pentoo-analyzer-2019.1-r2.ebuild
+++ b/pentoo/pentoo-analyzer/pentoo-analyzer-2019.2.ebuild
@@ -9,11 +9,10 @@ HOMEPAGE="http://www.pentoo.ch"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 java gnome ldap pentoo-full"
+IUSE="ipv6 java gnome ldap pentoo-extra pentoo-full"
 
 PDEPEND="
 	|| ( net-analyzer/openbsd-netcat net-analyzer/netcat )
-	net-analyzer/net-snmp
 	net-analyzer/scapy
 	net-analyzer/tcpdump
 	net-analyzer/tcptraceroute
@@ -27,12 +26,11 @@ PDEPEND="
 			net-analyzer/ipv6toolkit )
 		java? ( ldap? ( net-nds/jxplorer ) )
 		x86? ( net-analyzer/angst )
-		net-analyzer/arpwatch
+		net-analyzer/net-snmp
 		net-analyzer/chaosreader
 		net-analyzer/cloudshark
 		net-analyzer/dnsa
 		net-analyzer/dnstracer
-		net-analyzer/etherape
 		net-analyzer/ftester
 		net-analyzer/gnome-nettool
 		net-analyzer/mbrowse
@@ -46,6 +44,10 @@ PDEPEND="
 		net-analyzer/tcpreplay
 		net-analyzer/thcrut
 		net-misc/socat
+	)
+	pentoo-extra? (
+		net-analyzer/arpwatch
+		net-analyzer/etherape
 	)"
 
 #	net-nds/lat depends on mono
diff --git a/pentoo/pentoo-bluetooth/pentoo-bluetooth-2018.2-r2.ebuild b/pentoo/pentoo-bluetooth/pentoo-bluetooth-2019.2.ebuild
similarity index 91%
rename from pentoo/pentoo-bluetooth/pentoo-bluetooth-2018.2-r2.ebuild
rename to pentoo/pentoo-bluetooth/pentoo-bluetooth-2019.2.ebuild
index bd728e036..33f615932 100644
--- a/pentoo/pentoo-bluetooth/pentoo-bluetooth-2018.2-r2.ebuild
+++ b/pentoo/pentoo-bluetooth/pentoo-bluetooth-2019.2.ebuild
@@ -8,13 +8,15 @@ HOMEPAGE="http://www.pentoo.ch"
 KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="pentoo-full"
+IUSE="pentoo-extra pentoo-full"
 
 PDEPEND="
-	pentoo-full? (
+	pentoo-extra? (
 		app-fuzz/bss
 		net-wireless/bt-audit
 		net-wireless/btscanner
+	)
+	pentoo-full? (
 		net-wireless/crackle
 		)
 	net-wireless/blue_hydra
diff --git a/pentoo/pentoo-cracking/pentoo-cracking-2019.0.ebuild b/pentoo/pentoo-cracking/pentoo-cracking-2019.2.ebuild
similarity index 96%
rename from pentoo/pentoo-cracking/pentoo-cracking-2019.0.ebuild
rename to pentoo/pentoo-cracking/pentoo-cracking-2019.2.ebuild
index 8707703a8..9ffd062aa 100644
--- a/pentoo/pentoo-cracking/pentoo-cracking-2019.0.ebuild
+++ b/pentoo/pentoo-cracking/pentoo-cracking-2019.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pentoo.ch"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE_VIDEO_CARDS="video_cards_fglrx video_cards_nvidia"
-IUSE="cuda opencl +dict ${IUSE_VIDEO_CARDS} livecd-stage1 pentoo-full"
+IUSE="cuda opencl +dict ${IUSE_VIDEO_CARDS} livecd-stage1 pentoo-extra pentoo-full"
 KEYWORDS="~amd64 ~arm ~x86"
 
 PDEPEND="
@@ -21,14 +21,16 @@ PDEPEND="
 		dev-libs/ocl-icd[khronos-headers(-)]
 		net-wireless/hcxkeys ) ) )
 
+	pentoo-extra? (
+		app-crypt/ophcrack
+		net-misc/rdesktop-brute
+	)
 	pentoo-full? (
 		dict? ( app-dicts/raft-wordlists
 			app-dicts/seclists
 			app-misc/crunch )
-		app-crypt/ophcrack
 		app-text/cewl
 		app-crypt/SIPcrack
-		net-misc/rdesktop-brute
 	)"
 
 #removed from stage1? because it doesn't build for me
diff --git a/pentoo/pentoo-exploit/pentoo-exploit-2019.0-r1.ebuild b/pentoo/pentoo-exploit/pentoo-exploit-2019.2.ebuild
similarity index 97%
rename from pentoo/pentoo-exploit/pentoo-exploit-2019.0-r1.ebuild
rename to pentoo/pentoo-exploit/pentoo-exploit-2019.2.ebuild
index f01c517ef..b9a289349 100644
--- a/pentoo/pentoo-exploit/pentoo-exploit-2019.0-r1.ebuild
+++ b/pentoo/pentoo-exploit/pentoo-exploit-2019.2.ebuild
@@ -24,6 +24,9 @@ PDEPEND="net-analyzer/metasploit
 	net-analyzer/crackmapexec
 	net-analyzer/responder
 
+	pentoo-extra? (
+		java? ( || ( net-analyzer/armitage net-analyzer/armitage-bin ) )
+	)
 	pentoo-full? (
 		app-exploits/routersploit
 		app-exploits/weevely
@@ -32,7 +35,6 @@ PDEPEND="net-analyzer/metasploit
 		net-analyzer/davtest
 		net-analyzer/yersinia
 		www-apps/beef
-		java? ( || ( net-analyzer/armitage net-analyzer/armitage-bin ) )
 	)
 	!app-exploits/shellstorm"
 
diff --git a/pentoo/pentoo-forensics/pentoo-forensics-2018.2-r1.ebuild b/pentoo/pentoo-forensics/pentoo-forensics-2019.2.ebuild
similarity index 96%
rename from pentoo/pentoo-forensics/pentoo-forensics-2018.2-r1.ebuild
rename to pentoo/pentoo-forensics/pentoo-forensics-2019.2.ebuild
index f0a172b17..3fc2afc25 100644
--- a/pentoo/pentoo-forensics/pentoo-forensics-2018.2-r1.ebuild
+++ b/pentoo/pentoo-forensics/pentoo-forensics-2019.2.ebuild
@@ -13,7 +13,6 @@ KEYWORDS="~amd64 ~x86"
 
 PDEPEND="
 	app-admin/testdisk
-	app-forensics/inception
 	app-forensics/sleuthkit
 	app-forensics/volatility
 	sys-fs/ddrescue
@@ -23,6 +22,7 @@ PDEPEND="
 		!arm? ( app-forensics/cmospwd )
 		app-forensics/foremost
 		app-forensics/galleta
+		app-forensics/inception
 		app-forensics/libvshadow
 		app-forensics/make-pdf
 		app-forensics/memdump
diff --git a/pentoo/pentoo-forging/pentoo-forging-2018.2-r1.ebuild b/pentoo/pentoo-forging/pentoo-forging-2019.2.ebuild
similarity index 90%
rename from pentoo/pentoo-forging/pentoo-forging-2018.2-r1.ebuild
rename to pentoo/pentoo-forging/pentoo-forging-2019.2.ebuild
index 58ac8f73f..4c304a6b4 100644
--- a/pentoo/pentoo-forging/pentoo-forging-2018.2-r1.ebuild
+++ b/pentoo/pentoo-forging/pentoo-forging-2019.2.ebuild
@@ -8,19 +8,21 @@ HOMEPAGE="http://www.pentoo.ch"
 
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="pentoo-full"
+IUSE="pentoo-extra pentoo-full"
 KEYWORDS="~amd64 ~arm ~x86"
 
 PDEPEND="
 	net-analyzer/hping
 	net-analyzer/macchanger
-	pentoo-full? (
-		net-analyzer/fragroute
+	pentoo-extra? (
 		net-analyzer/gspoof
-		net-analyzer/hyenae
 		net-analyzer/isic
 		net-analyzer/netwag
 		net-analyzer/packit
 		net-analyzer/rain
+	)
+	pentoo-full? (
+		net-analyzer/fragroute
+		net-analyzer/hyenae
 		net-misc/ipsorcery
 	)"
diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2019.0-r1.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2019.2.ebuild
similarity index 97%
rename from pentoo/pentoo-livecd/pentoo-livecd-2019.0-r1.ebuild
rename to pentoo/pentoo-livecd/pentoo-livecd-2019.2.ebuild
index 63f44fe65..6365bcbc6 100644
--- a/pentoo/pentoo-livecd/pentoo-livecd-2019.0-r1.ebuild
+++ b/pentoo/pentoo-livecd/pentoo-livecd-2019.2.ebuild
@@ -22,8 +22,6 @@ PDEPEND="livecd? ( pentoo/pentoo-installer
 		virtual/eject
 		sys-apps/hwsetup
 		sys-block/disktype
-		sys-boot/shim
-		sys-boot/mokutil
 		x11-misc/mkxf86config
 		sys-apps/gentoo-functions
 		net-wireless/b43-fwcutter
diff --git a/pentoo/pentoo-misc/pentoo-misc-2019.1-r1.ebuild b/pentoo/pentoo-misc/pentoo-misc-2019.2.ebuild
similarity index 89%
rename from pentoo/pentoo-misc/pentoo-misc-2019.1-r1.ebuild
rename to pentoo/pentoo-misc/pentoo-misc-2019.2.ebuild
index b27c85c68..e51f3c16c 100644
--- a/pentoo/pentoo-misc/pentoo-misc-2019.1-r1.ebuild
+++ b/pentoo/pentoo-misc/pentoo-misc-2019.2.ebuild
@@ -8,10 +8,12 @@ HOMEPAGE="http://www.pentoo.ch"
 KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-3"
-IUSE="+accessibility +atm gtk java +office X pentoo-full"
+IUSE="+accessibility +atm gtk java +office X pentoo-extra pentoo-full"
 
 PDEPEND="
 	app-arch/p7zip
+	app-text/dos2unix
+	app-text/wgetpaste
 	net-dns/bind-tools
 	net-misc/curl
 	net-misc/openssh
@@ -25,8 +27,18 @@ PDEPEND="
 
 	X? ( office? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) )
 
+	pentoo-extra? (
+		atm? ( net-dialup/linux-atm )
+		X? ( gtk? ( media-video/gtk-recordmydesktop )
+			|| ( mail-client/thunderbird-bin mail-client/thunderbird )
+		)
+		app-misc/mc
+		net-irc/irssi
+		net-misc/netkit-fingerd
+		net-misc/netkit-rsh
+	)
+
 	pentoo-full? (
-		gtk? ( media-video/gtk-recordmydesktop )
 		X? ( app-editors/gedit
 			app-editors/ghex
 			app-editors/sublime-text
@@ -38,15 +50,10 @@ PDEPEND="
 			sys-block/gparted
 			net-misc/remmina[rdp]
 			net-irc/hexchat
-			|| ( mail-client/thunderbird-bin mail-client/thunderbird )
 		)
-		app-misc/mc
 		!arm? ( sys-boot/unetbootin )
-		atm? ( net-dialup/linux-atm )
 		app-editors/hexedit
-		app-text/dos2unix
 		app-text/uudeview
-		app-text/wgetpaste
 		media-gfx/fbgrab
 		media-gfx/scrot
 		media-sound/sox
@@ -58,13 +65,10 @@ PDEPEND="
 		net-ftp/ftp
 		net-ftp/oftpd
 		net-ftp/tftp-hpa
-		net-irc/irssi
 		net-misc/axel
 		net-misc/ifenslave
 		net-misc/iperf
 		net-misc/iputils
-		net-misc/netkit-fingerd
-		net-misc/netkit-rsh
 		net-misc/netsed
 		|| ( net-misc/ntpsec net-misc/ntp )
 		net-vpn/openvpn
diff --git a/pentoo/pentoo-mitm/pentoo-mitm-2019.1-r1.ebuild b/pentoo/pentoo-mitm/pentoo-mitm-2019.2.ebuild
similarity index 93%
rename from pentoo/pentoo-mitm/pentoo-mitm-2019.1-r1.ebuild
rename to pentoo/pentoo-mitm/pentoo-mitm-2019.2.ebuild
index dfbad0fc8..98bdd0500 100644
--- a/pentoo/pentoo-mitm/pentoo-mitm-2019.1-r1.ebuild
+++ b/pentoo/pentoo-mitm/pentoo-mitm-2019.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pentoo.ch"
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="pentoo-full wireless"
+IUSE="pentoo-full"
 
 PDEPEND="
 	net-analyzer/ettercap
diff --git a/pentoo/pentoo-nfc/pentoo-nfc-2015.3.ebuild b/pentoo/pentoo-nfc/pentoo-nfc-2019.2.ebuild
similarity index 90%
rename from pentoo/pentoo-nfc/pentoo-nfc-2015.3.ebuild
rename to pentoo/pentoo-nfc/pentoo-nfc-2019.2.ebuild
index 8b43a45d3..814db60e6 100644
--- a/pentoo/pentoo-nfc/pentoo-nfc-2015.3.ebuild
+++ b/pentoo/pentoo-nfc/pentoo-nfc-2019.2.ebuild
@@ -14,5 +14,6 @@ KEYWORDS="amd64 arm x86"
 IUSE=""
 
 PDEPEND="net-wireless/mfoc
+	amd64? ( net-wireless/proxmark3 )
 	net-wireless/rfidler"
 	#app-crypt/acsccid
diff --git a/pentoo/pentoo-radio/pentoo-radio-2019.2.ebuild b/pentoo/pentoo-radio/pentoo-radio-2019.2-r1.ebuild
similarity index 97%
rename from pentoo/pentoo-radio/pentoo-radio-2019.2.ebuild
rename to pentoo/pentoo-radio/pentoo-radio-2019.2-r1.ebuild
index 5daeb8816..80806a6fa 100644
--- a/pentoo/pentoo-radio/pentoo-radio-2019.2.ebuild
+++ b/pentoo/pentoo-radio/pentoo-radio-2019.2-r1.ebuild
@@ -41,12 +41,12 @@ PDEPEND="net-wireless/gnuradio
 			net-wireless/portapack-firmware
 			net-wireless/portapack-havoc
 			)
-		amd64? ( net-wireless/proxmark3 )
 		net-wireless/qspectrumanalyzer
 		net-wireless/rx_tools
 		net-wireless/uhd
 		net-wireless/urh
 		net-wireless/yatebts
 		net-wireless/mousejack
+		net-wireless/mjackit
 		net-wireless/jackit
 	)"
diff --git a/pentoo/pentoo-system/pentoo-system-2019.1-r3.ebuild b/pentoo/pentoo-system/pentoo-system-2019.2.ebuild
similarity index 98%
rename from pentoo/pentoo-system/pentoo-system-2019.1-r3.ebuild
rename to pentoo/pentoo-system/pentoo-system-2019.2.ebuild
index db2e7e943..a4cc0d9f7 100644
--- a/pentoo/pentoo-system/pentoo-system-2019.1-r3.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2019.2.ebuild
@@ -95,7 +95,15 @@ PDEPEND="${PDEPEND}
 	sys-apps/sysvinit
 	sys-devel/gettext
 	livecd? ( sys-fs/squashfs-tools sys-fs/btrfs-progs )
-	pentoo-full? ( sys-apps/pcmciautils
+	pentoo-extra? (
+		sys-apps/pcmciautils
+		sys-fs/jfsutils
+		sys-fs/reiser4progs
+		sys-fs/reiserfsprogs
+		sys-process/atop
+		x11-libs/libdlo
+	)
+	pentoo-full? (
 		app-arch/unrar
 		app-arch/unzip
 		app-arch/sharutils
@@ -118,17 +126,12 @@ PDEPEND="${PDEPEND}
 		net-dialup/lrzsz
 		|| ( net-fs/cifs-utils net-fs/samba )
 		amd64? ( sys-apps/fwts )
-		sys-devel/crossdev
-		sys-fs/jfsutils
-		sys-fs/reiser4progs
-		sys-fs/reiserfsprogs
+		x86? ( sys-devel/crossdev )
 		sys-fs/squashfs-tools
 		sys-fs/exfat-utils
 		sys-fs/f2fs-tools
 		sys-fs/fuse-exfat
 		sys-fs/btrfs-progs
-		sys-process/atop
-		x11-libs/libdlo
 		)
 "
 
diff --git a/pentoo/pentoo-wireless/pentoo-wireless-2019.0-r1.ebuild b/pentoo/pentoo-wireless/pentoo-wireless-2019.2.ebuild
similarity index 91%
rename from pentoo/pentoo-wireless/pentoo-wireless-2019.0-r1.ebuild
rename to pentoo/pentoo-wireless/pentoo-wireless-2019.2.ebuild
index 2a5f73868..126d9d039 100644
--- a/pentoo/pentoo-wireless/pentoo-wireless-2019.0-r1.ebuild
+++ b/pentoo/pentoo-wireless/pentoo-wireless-2019.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pentoo.ch"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cuda gps +drivers livecd-stage1 pentoo-full opencl +wpe"
+IUSE="cuda gps +drivers livecd-stage1 pentoo-extra pentoo-full opencl +wpe"
 
 #util-linux has rfkill now
 PDEPEND="
@@ -27,16 +27,18 @@ PDEPEND="
 	gps? ( sci-geosciences/gpsd )
 	|| ( net-wireless/reaver-wps-fork-t6x net-wireless/reaver )
 
+	pentoo-extra? (
+		net-wireless/airsnort
+		net-wireless/n4p
+		net-wireless/spectools
+		net-wireless/wepattack
+	)
 	pentoo-full? (
 		app-crypt/asleap
-		net-wireless/airsnort
 		net-wireless/bully
 		net-wireless/cowpatty
 		net-wireless/kismetdb
 		net-wireless/kismetmobiledashboard
-		net-wireless/spectools
-		net-wireless/wepattack
-		net-wireless/n4p
 		net-wireless/hcxtools
 		net-wireless/hcxdumptool
 		net-wireless/hcxtools