diff --git a/appmenus/netvm-whitelisted-appmenus.list b/appmenus_generic/netvm-whitelisted-appmenus.list
similarity index 100%
rename from appmenus/netvm-whitelisted-appmenus.list
rename to appmenus_generic/netvm-whitelisted-appmenus.list
diff --git a/appmenus/vm-whitelisted-appmenus.list b/appmenus_generic/vm-whitelisted-appmenus.list
similarity index 100%
rename from appmenus/vm-whitelisted-appmenus.list
rename to appmenus_generic/vm-whitelisted-appmenus.list
diff --git a/appmenus/whitelisted-appmenus.list b/appmenus_generic/whitelisted-appmenus.list
similarity index 100%
rename from appmenus/whitelisted-appmenus.list
rename to appmenus_generic/whitelisted-appmenus.list
diff --git a/appmenus/convert_app2template.sh b/convert_app2template.sh
similarity index 100%
rename from appmenus/convert_app2template.sh
rename to convert_app2template.sh
diff --git a/create_apps_templates.sh b/create_apps_templates.sh
index 732f450..c669c57 100755
--- a/create_apps_templates.sh
+++ b/create_apps_templates.sh
@@ -9,4 +9,4 @@ fi
 
 rm -f $APPSTMPL/*
 mkdir -p $APPSTMPL
-find $APPSORIG -name "*.desktop" -exec appmenus/convert_app2template.sh {} $APPSTMPL \;
+find $APPSORIG -name "*.desktop" -exec ./convert_app2template.sh {} $APPSTMPL \;
diff --git a/qubeize_image b/qubeize_image
index 41a1c49..56c5b77 100755
--- a/qubeize_image
+++ b/qubeize_image
@@ -48,9 +48,17 @@ APPSTEMPL=qubeized_images/$NAME-apps.templates
 mkdir -p $APPSORIG
 cp -r $(pwd)/mnt/usr/share/applications/* $APPSORIG
 
-echo "--> Createing the Apps Menu templates..."
+echo "--> Creating the Apps Menu templates..."
 ./create_apps_templates.sh $APPSORIG $APPSTEMPL
 
+echo "--> Choosing appmenus whitelists..."
+rm -f appmenus
+if [ -d "appmenus_$DIST" ]; then
+    ln -s "appmenus_$DIST" appmenus
+else
+    ln -s "appmenus_generic" appmenus
+fi
+
 echo "--> Installing 3rd party apps"
 ./add_3rd_party_software.sh