diff --git a/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list
index 68ed628..1bb50df 100644
--- a/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list
+++ b/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list
@@ -1,21 +1,16 @@
 gnome-terminal.desktop
-nautilus.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
 yelp.desktop
-gateway-arm.desktop
+gateway-firewall30default.desktop
+gateway-firewall50user.desktop
+gateway-torrc.desktop
+gateway-torrcexamples.desktop
 gateway-firewall30default.desktop
 gateway-firewall50user.desktop
 gateway-firsttimesetup.desktop
-gateway-reloadfirewall.desktop
-gateway-reloadtor.desktop
-gateway-restarttor.desktop
-gateway-stoptor.desktop
 gateway-torrc.desktop
 gateway-torrcexamples.desktop
-timesync.desktop
-whonixcheck.desktop
 whonix_repository.desktop
-dolphin.desktop
-Help.desktop
-ksystemlog.desktop
-kwrite.desktop
-
diff --git a/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list
index 68ed628..ba57bde 100644
--- a/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list
+++ b/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list
@@ -2,20 +2,9 @@ gnome-terminal.desktop
 nautilus.desktop
 yelp.desktop
 gateway-arm.desktop
-gateway-firewall30default.desktop
-gateway-firewall50user.desktop
-gateway-firsttimesetup.desktop
 gateway-reloadfirewall.desktop
 gateway-reloadtor.desktop
 gateway-restarttor.desktop
 gateway-stoptor.desktop
-gateway-torrc.desktop
-gateway-torrcexamples.desktop
 timesync.desktop
 whonixcheck.desktop
-whonix_repository.desktop
-dolphin.desktop
-Help.desktop
-ksystemlog.desktop
-kwrite.desktop
-
diff --git a/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list b/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list
index 25df4f2..1bb50df 100644
--- a/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list
+++ b/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list
@@ -8,4 +8,9 @@ gateway-firewall30default.desktop
 gateway-firewall50user.desktop
 gateway-torrc.desktop
 gateway-torrcexamples.desktop
-kwrite.desktop
+gateway-firewall30default.desktop
+gateway-firewall50user.desktop
+gateway-firsttimesetup.desktop
+gateway-torrc.desktop
+gateway-torrcexamples.desktop
+whonix_repository.desktop
diff --git a/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list
index 4371561..5bd390a 100644
--- a/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list
+++ b/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list
@@ -1,12 +1,8 @@
 gnome-terminal.desktop
 nautilus.desktop
 yelp.desktop
-
 anondist-torbrowser.desktop
-anondist-torbrowser_update.desktop
-gateway-firsttimesetup.desktop
 timesync.desktop
-vlc.desktop
 whonixcheck.desktop
 whonix-contribute.desktop
 whonix-documentation.desktop
@@ -16,12 +12,3 @@ whonix-forum.desktop
 whonix-importantblog.desktop
 whonix-irc-chat-support.desktop
 whonix-mailinglist.desktop
-whonix_repository.desktop
-xchat.desktop
-x-www-browser.desktop
-dolphin.desktop
-Help.desktop
-kcalc.desktop
-kgpg.desktop
-kwrite.desktop
-
diff --git a/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list
index c9b6f00..cf2ba64 100644
--- a/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list
+++ b/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list
@@ -4,93 +4,9 @@ gpk-update-viewer.desktop
 gpk-prefs.desktop
 gpk-log.desktop
 yelp.desktop
-
-
-anondist-torbrowser.desktop
+gnome-panel.desktop
+gnome-printers-panel.desktop
+gnome-system-log.desktop
+tracker-preferences.desktop
 anondist-torbrowser_update.desktop
-bluetooth-sendto.desktop
-bluetooth-wizard.desktop
-brasero.desktop
-brasero-nautilus.desktop
-display.im6.desktop
-fpm2.desktop
-gateway-firsttimesetup.desktop
-gcr-prompter.desktop
-gcr-viewer.desktop
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-dbus-service.desktop
-gpk-install-catalog.desktop
-gpk-install-local-file.desktop
-gpk-log.desktop
-gpk-prefs.desktop
-gpk-service-pack.desktop
-gpk-update-viewer.desktop
-iceweasel.desktop
-kde4
-mat.desktop
-mimeinfo.cache
-nact.desktop
-nautilus-autorun-software.desktop
-nautilus.desktop
-nm-applet.desktop
-nm-connection-editor.desktop
-python2.7.desktop
-timesync.desktop
-vlc.desktop
-whonixcheck.desktop
-whonix-contribute.desktop
-whonix-documentation.desktop
-whonix-donate.desktop
-whonix-featureblog.desktop
-whonix-forum.desktop
-whonix-importantblog.desktop
-whonix-irc-chat-support.desktop
-whonix-mailinglist.desktop
 whonix_repository.desktop
-xchat.desktop
-x-www-browser.desktop
-yelp.desktop
-
-
-akonaditray.desktop
--rw-r--r-- 1 root root  5000 Jun 22  2012 ark.desktop
-dolphin.desktop
-gwenview.desktop
-Help.desktop
-jovieapp.desktop
-kcalc.desktop
-kdepasswd.desktop
-kdesystemsettings.desktop
-keditbookmarks.desktop
-kfind.desktop
-kfontview.desktop
-kgpg.desktop
-klipper.desktop
-kmag.desktop
-kmailservice.desktop
-kmix.desktop
-kmousetool.desktop
-kmouth.desktop
-konsole.desktop
-krandrtray.desktop
-ksysguard.desktop
-ksystemlog.desktop
--rw-r--r-- 1 root root  1766 Jun  6  2012 ktelnetservice.desktop
-kvkbd.desktop
-kwrite.desktop
-nepomukbackup.desktop
-nepomukcontroller.desktop
-okularApplication_comicbook.desktop
-okularApplication_dvi.desktop
-okularApplication_fax.desktop
-okularApplication_fb.desktop
-okularApplication_ghostview.desktop
-okularApplication_kimgio.desktop
-okularApplication_ooo.desktop
-okularApplication_pdf.desktop
-okularApplication_plucker.desktop
-okularApplication_xps.desktop
-okular.desktop
-systemsettings.desktop
-
diff --git a/appmenus_wheezy_whonix-workstation_gnome/netvm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation_gnome/netvm-whitelisted-appmenus.list
new file mode 100644
index 0000000..4b744f7
--- /dev/null
+++ b/appmenus_wheezy_whonix-workstation_gnome/netvm-whitelisted-appmenus.list
@@ -0,0 +1 @@
+gnome-terminal.desktop
diff --git a/appmenus_wheezy_whonix-workstation_gnome/vm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation_gnome/vm-whitelisted-appmenus.list
new file mode 100644
index 0000000..501abce
--- /dev/null
+++ b/appmenus_wheezy_whonix-workstation_gnome/vm-whitelisted-appmenus.list
@@ -0,0 +1,22 @@
+gnome-terminal.desktop
+nautilus.desktop
+gcalctool.desktop
+evolution.desktop
+libreoffice-startcenter.desktop
+gimp.desktop
+eog.desktop
+totem.desktop
+shotwell.desktop
+rhythmbox.desktop
+anondist-torbrowser.desktop
+timesync.desktop
+whonixcheck.desktop
+whonix-contribute.desktop
+whonix-documentation.desktop
+whonix-donate.desktop
+whonix-featureblog.desktop
+whonix-forum.desktop
+whonix-importantblog.desktop
+whonix-irc-chat-support.desktop
+whonix-mailinglist.desktop
+yelp.desktop
diff --git a/appmenus_wheezy_whonix-workstation_gnome/whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation_gnome/whitelisted-appmenus.list
new file mode 100644
index 0000000..ab251b6
--- /dev/null
+++ b/appmenus_wheezy_whonix-workstation_gnome/whitelisted-appmenus.list
@@ -0,0 +1,14 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gnome-panel.desktop
+gnome-printers-panel.desktop
+gnome-system-log.desktop
+tracker-preferences.desktop
+anondist-torbrowser_update.desktop
+yelp.desktop