diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common
index e23d41e..7080409 100644
--- a/molecules/forensicxfce.common
+++ b/molecules/forensicxfce.common
@@ -49,14 +49,9 @@ packages_to_remove:
 	app-dicts/myspell-es,
 	app-dicts/myspell-fr,
 	app-dicts/myspell-it,
-	app-dicts/myspell-nl,
-	net-p2p/transmission-base,
-	net-p2p/transmission-gtk,
-	www-client/midori,
+	app-dicts/myspell-nl,	
 	x11-wm/fluxbox,
 	media-gfx/shotwell,
-	net-firewall/ufw,
-	net-firewall/ufw-frontends,
 	games-misc/cowsay,
 	app-editors/gedit
 
@@ -91,6 +86,7 @@ packages_to_add:
 	dev-util/geany,
 	dev-util/geany-plugins,
 	gnome-extra/nm-applet,
+	gnome-base/nautilus,
 	dev-vcs/git,
 	net-analyzer/ettercap,
 	net-analyzer/traceroute,
@@ -98,6 +94,7 @@ packages_to_add:
 	net-libs/libnet,
 	net-libs/netwib,
 	net-misc/knock,
+	net-vpn/tor,
 	media-fonts/droid,
 	media-gfx/pqstego,
 	media-sound/pavucontrol,
@@ -121,6 +118,7 @@ packages_to_add:
 	x11-libs/xcb-util-image,
 	x11-libs/xcb-util-keysyms,
 	x11-libs/xcb-util-wm,
+	x11-terms/gnome-terminal,
 	x11-terms/terminator,
 	x11-misc/pcmanfm,
 	x11-wm/awesome,