diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh
index 493c079..03e8247 100644
--- a/install_functions_ub1604.sh
+++ b/install_functions_ub1604.sh
@@ -10,76 +10,6 @@
 # install functions                                                           #
 #-----------------------------------------------------------------------------#
 
-#
-# install Base Apps (headless)
-#
-function installBase () {
-  installAppsFromList base
-}
-
-#
-# install Base Apps (Menu)
-#
-function installBaseMenu () {
-  installAppsFromListMenu base
-}
-
-#
-# install Office Apps (headless)
-#
-function installOffice () {
-  installAppsFromList office
-}
-
-#
-# install Office Apps (Menu)
-#
-function installOfficeMenu () {
-  installAppsFromListMenu office
-}
-
-#
-# install Multimedia Apps (headless)
-#
-function installMultimedia () {
-  installAppsFromList multimedia
-}
-
-#
-# install Multimedia Apps (Menu)
-#
-function installMultimediaMenu () {
-  installAppsFromListMenu multimedia
-}
-
-#
-# install eBook Apps (headless)
-#
-function installEbook () {
-  installAppsFromList ebook
-}
-
-#
-# install eBook Apps (Menu)
-#
-function installEbookMenu () {
-  installAppsFromListMenu ebook
-}
-
-#
-# install Internet Apps (headless)
-#
-function installInternet () {
-  installAppsFromList internet
-}
-
-#
-# install Internet Apps (Menu)
-#
-function installInternetMenu () {
-  installAppsFromListMenu internet
-}
-
 #
 # Viber (headless)
 #
@@ -134,272 +64,6 @@ function installSlackMenu () {
                      yes
 }
 
-#
-# install Misc Utilities Apps (headless)
-#
-function installMiscUtilities () {
-  installAppsFromList utilities
-}
-
-#
-# install Misc Utilities Apps (Menu)
-#
-function installMiscUtilitiesMenu () {
-  installAppsFromListMenu utilities
-}
-
-#
-# install Wine Build (headless)
-#
-function installWine () {
-  installAppsFromList wine
-}
-
-#
-# install Wine Build (Menu)
-#
-function installWineMenu () {
-  installAppsFromListMenu wine
-}
-
-#
-# install Game Apps (headless)
-#
-function installGames () {
-  installAppsFromList games
-}
-
-#
-# install Game Apps (Menu)
-#
-function installGamesMenu () {
-  installAppsFromListMenu games
-}
-
-#
-# Steam (headless)
-#
-function installSteam () {
-  installAppsFromList steam
-}
-
-#
-# Steam (Menu)
-#
-function installSteamMenu () {
-  installAppsFromListMenu steam
-}
-
-#
-# install Burning Apps (headless)
-#
-function installBurningTools () {
-  installAppsFromList burningtools
-}
-
-#
-# install Burning Apps (Menu)
-#
-function installBurningToolsMenu () {
-  installAppsFromListMenu burningtools
-}
-
-#
-# install Network Apps (headless)
-#
-function installNetTools () {
-  installAppsFromList nettools
-}
-
-#
-# install Network Apps (Menu)
-#
-function installNetToolsMenu () {
-  installAppsFromListMenu nettools
-}
-
-#
-# install Caja Plugins (headless)
-#
-function installCajaPlugins () {
-  installAppsFromList cajaplugins
-}
-
-#
-# install Caja Plugins (Menu)
-#
-function installCajaPluginsMenu () {
-  installAppsFromListMenu cajaplugins
-}
-
-#
-# install Nautilus Apps + plugins (headless)
-#
-function installNautilusAndPlugins () {
-  installAppsFromList nautilus
-}
-
-#
-# install Nautilus Apps + plugins (Menu)
-#
-function installNautilusAndPluginsMenu () {
-  installAppsFromListMenu nautilus
-}
-
-#
-# install Thunar + Plugins (headless)
-#
-function installThunar () {
-  installAppsFromList thunar
-}
-
-#
-# install Thunar + Plugins (Menu)
-#
-function installThunarMenu () {
-  installAppsFromListMenu thunar
-}
-
-#
-# install Gimp plugins (headless)
-#
-function installGimpPlugins () {
-  installAppsFromList gimp
-}
-
-#
-# install Gimp plugins (Menu)
-#
-function installGimpPluginsMenu () {
-  installAppsFromListMenu gimp
-}
-
-#
-# install RhythmBox plugins (headless)
-#
-function installRhythmBoxPlugins () {
-  installAppsFromList rhythmbox
-}
-
-#
-# install RhythmBox plugins (Menu)
-#
-function installRhythmBoxPluginsMenu () {
-  installAppsFromListMenu rhythmbox
-}
-
-#
-# install Pidgin plugins (headless)
-#
-function installPidginPlugins () {
-  installAppsFromList pidgin
-}
-
-#
-# install Pidgin plugins (Menu)
-#
-function installPidginPluginsMenu () {
-  installAppsFromListMenu pidgin
-}
-
-#
-# install Nitrogen app (headless)
-#
-function installNitrogen () {
-  installAppsFromList nitrogen
-}
-
-#
-# install Nitrogen app (Menu)
-#
-function installNitrogenMenu () {
-  installAppsFromListMenu nitrogen
-}
-
-#
-# install Beta Apps (headless)
-#
-function installBeta () {
-  installAppsFromList beta
-}
-
-#
-# install Beta Apps (Menu)
-#
-function installBetaMenu () {
-  installAppsFromListMenu beta
-}
-
-#
-# install Nightly Apps (headless)
-#
-function installNightly () {
-  installAppsFromList nightly
-}
-
-#
-# install Nightly Apps (Menu)
-#
-function installNightlyMenu () {
-  installAppsFromListMenu nightly
-}
-
-#
-# install GTK Themes (headless)
-#
-function installThemes () {
-  installAppsFromList gtkthemes
-}
-
-#
-# install GTK Themes (Menu)
-#
-function installThemesMenu () {
-  installAppsFromListMenu gtkthemes
-}
-
-#
-# install Icon Themes (headless)
-#
-function installIcons () {
-  installAppsFromList icons
-}
-
-#
-# install Icon Themes (Menu)
-#
-function installIconsMenu () {
-  installAppsFromListMenu icons
-}
-
-#
-# install Solaar App (headless)
-#
-function installSolaar () {
-  installAppsFromList solaar
-}
-
-#
-# install Solaar App (Menu)
-#
-function installSolaarMenu () {
-  installAppsFromListMenu solaar
-}
-
-#
-# install CardReader Apps (headless)
-#
-function installCardReader () {
-  installAppsFromList cardreader
-}
-
-#
-# install CardReader Apps (Menu)
-#
-function installCardReaderMenu () {
-  installAppsFromListMenu cardreader
-}
-
 #
 # update AMD/Intel CPU Microcode
 #
@@ -434,160 +98,6 @@ function fixWirelessIntel6320 () {
   printf "\n"
 }
 
-#
-# install Webcam Apps (headless)
-#
-function installWebcam () {
-  installAppsFromList webcam
-}
-
-#
-# install Webcam Apps (Menu)
-#
-function installWebcamMenu () {
-  installAppsFromListMenu webcam
-}
-
-#
-# install latest versions of graphic drivers, mesa, .... (headless)
-#
-function installOibaf () {
-  addRepo_Oibaf
-}
-
-#
-# install latest versions of graphic drivers, mesa, .... (Menu)
-#
-function installOibafMenu () {
-  addRepo_Oibaf
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia370 () {
-  installAppsFromList nvidia-370
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia370Menu () {
-  installAppsFromListMenu nvidia-370
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia375 () {
-  installAppsFromList nvidia-375
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia375Menu () {
-  installAppsFromListMenu nvidia-375
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia378 () {
-  installAppsFromList nvidia-378
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia378Menu () {
-  installAppsFromListMenu nvidia-378
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia381 () {
-  installAppsFromList nvidia-381
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia381Menu () {
-  installAppsFromListMenu nvidia-381
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia384 () {
-  installAppsFromList nvidia-384
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia384Menu () {
-  installAppsFromListMenu nvidia-384
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia387 () {
-  installAppsFromList nvidia-387
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia387Menu () {
-  installAppsFromListMenu nvidia-387
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia390 () {
-  installAppsFromList nvidia-390
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia390Menu () {
-  installAppsFromListMenu nvidia-390
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia396 () {
-  installAppsFromList nvidia-396
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia396Menu () {
-  installAppsFromListMenu nvidia-396
-}
-
-#
-# install TLP App (headless)
-#
-function installTLP () {
-  installAppsFromList tlp
-}
-
-#
-# install TLP App (Menu)
-#
-function installTLPMenu () {
-  installAppsFromListMenu tlp
-}
-
 #
 # Key-ID USB Fido U2F device udev rules
 #
@@ -611,310 +121,6 @@ EOF
          "restarting UDEV service"
 }
 
-#
-# install Dev Apps (headless)
-#
-function installDevApps () {
-  installAppsFromList dev
-}
-
-#
-# install Dev Apps (Menu)
-#
-function installDevAppsMenu () {
-  installAppsFromListMenu dev
-}
-
-
-#
-# install Javascript env (headless)
-#
-function installJavascript () {
-  installAppsFromList javascript
-}
-
-#
-# install Javascript env (Menu)
-#
-function installJavascriptMenu () {
-  installAppsFromListMenu javascript
-}
-
-#
-# install JAVA 10 (headless)
-#
-function installJava10 () {
-  installAppsFromList java10
-}
-
-#
-# install JAVA 10 (Menu)
-#
-function installJava10Menu () {
-  installAppsFromListMenu java10
-}
-
-#
-# install Mongo DB 3 CE (headless)
-#
-function installMongo3CE () {
-  installAppsFromList mongodb
-}
-
-#
-# install Mongo DB 3 CE (Menu)
-#
-function installMongo3CEMenu () {
-  installAppsFromListMenu mongodb
-}
-
-#
-# install Python Apps (headless)
-#
-function installPython () {
-  installAppsFromList python
-}
-
-#
-# install Python Apps (Menu)
-#
-function installPythonMenu () {
-  installAppsFromListMenu python
-}
-
-#
-# install PHP Apps (headless)
-#
-function installPHP () {
-  installAppsFromList php
-}
-
-#
-# install PHP Apps (Menu)
-#
-function installPHPMenu () {
-  installAppsFromListMenu php
-}
-
-#
-# install QT Apps/tools (headless)
-#
-function installQT () {
-  installAppsFromList qt
-}
-
-#
-# install QT Apps/tools (Menu)
-#
-function installQTMenu () {
-  installAppsFromListMenu qt
-}
-
-#
-# install LUA Apps (headless)
-#
-function installLUA () {
-  installAppsFromList lua
-}
-
-#
-# install LUA Apps (Menu)
-#
-function installLUAMenu () {
-  installAppsFromListMenu lua
-}
-
-#
-# install Ruby Apps (headless)
-#
-function installRuby () {
-  installAppsFromList ruby
-}
-
-#
-# install Ruby Apps (Menu)
-#
-function installRubyMenu () {
-  installAppsFromListMenu ruby
-}
-
-#TODO:
-function installAndroidEnv () {
-  msg="Installing Android environment"
-
-  runCmd "touch /home/$myHomedir/.bashrc" \
-         "creating .bashrc file if necessary"
-  sh -c "echo '\n\nexport PATH=${PATH}:/home/'$myHomedir'/Android/Sdk/tools:/home/'$myHomedir'/Android/Sdk/platform-tools' >> /home/$myHomedir/.bashrc"
-}
-
-#
-# install Atom App (headless)
-#
-function installAtom () {
-  installAppsFromList atom
-}
-
-#
-# install Atom App (menu)
-#
-function installAtomMenu () {
-  installAppsFromListMenu atom
-}
-
-#
-# install Anjuta Apps (headless)
-#
-function installAnjuta () {
-  installAppsFromList anjuta
-}
-
-#
-# install Anjuta Apps (Menu)
-#
-function installAnjutaMenu () {
-  installAppsFromListMenu anjuta
-}
-
-#
-# install Brackets Apps (headless)
-#
-function installBrackets () {
-  installAppsFromList brackets
-}
-
-#
-# install Brackets Apps (Menu)
-#
-function installBracketsMenu () {
-  installAppsFromListMenu brackets
-}
-
-#
-# install CodeBlocks Apps (headless)
-#
-function installCodeBlocks () {
-  installAppsFromList codeblocks
-}
-
-#
-# install CodeBlocks Apps (Menu)
-#
-function installCodeBlocksMenu () {
-  installAppsFromListMenu codeblocks
-}
-
-#
-# install Geany Apps (headless)
-#
-function installGeany () {
-  installAppsFromList geany
-}
-
-#
-# install Geany Apps (Menu)
-#
-function installGeanyMenu () {
-  installAppsFromListMenu geany
-}
-
-#
-# install IDEA Apps (headless)
-#
-function installIdea () {
-  installAppsFromList idea
-}
-
-#
-# install IDEA Apps (Menu)
-#
-function installIdeaMenu () {
-  installAppsFromListMenu idea
-}
-
-#
-# install Eclipse Apps (headless)
-#
-function installEclipse () {
-  installAppsFromList eclipse
-}
-
-#
-# install Eclipse Apps (Menu)
-#
-function installEclipseMenu () {
-  installAppsFromListMenu eclipse
-}
-
-#
-# install Pycharm Apps (headless)
-#
-function installPyCharm () {
-  installAppsFromList pycharm
-}
-
-#
-# install Pycharm Apps (Menu)
-#
-function installPyCharmMenu () {
-  installAppsFromListMenu pycharm
-}
-
-#
-# install Visual Studio Code Apps (headless)
-#
-function installVisualStudioCode () {
-  installAppsFromList code
-}
-
-#
-# install Visual Studio Code Apps (Menu)
-#
-function installVisualStudioCodeMenu () {
-  installAppsFromListMenu code
-}
-
-#
-# install Android-Studio Apps (headless)
-#
-function installAndroidStudio () {
-  installAppsFromList androidstudio
-}
-
-#
-# install Android-Studio Apps (Menu)
-#
-function installAndroidStudioMenu () {
-  installAppsFromListMenu androidstudio
-}
-
-#
-# install SublimeText Apps (headless)
-#
-function installSublimeText() {
-  installAppsFromList sublime-text
-}
-
-#
-# install SublimeText Apps (Menu)
-#
-function installSublimeTextMenu() {
-  installAppsFromListMenu sublime-text
-}
-
-#
-# install CAD Apps (headless)
-#
-function installCAD () {
-  installAppsFromList cad
-}
-
-#
-# install CAD Apps (Menu)
-#
-function installCADMenu () {
-  installAppsFromListMenu cad
-}
-
 #
 # install Teamviewer 13 (headless)
 #
@@ -969,9 +175,3 @@ function installCompassMenu () {
                      yes
 }
 
-#
-# install/enable Unboud (headless)
-#
-function installUnbound () {
-  installAppsFromList unbound
-}
diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh
index ca36874..05453fd 100644
--- a/install_functions_ub1804.sh
+++ b/install_functions_ub1804.sh
@@ -16,76 +16,6 @@
 # install functions                                                           #
 #-----------------------------------------------------------------------------#
 
-#
-# install Base Apps (headless)
-#
-function installBase () {
-  installAppsFromList base
-}
-
-#
-# install Base Apps (Menu)
-#
-function installBaseMenu () {
-  installAppsFromListMenu base
-}
-
-#
-# install Office Apps (headless)
-#
-function installOffice () {
-  installAppsFromList office
-}
-
-#
-# install Office Apps (Menu)
-#
-function installOfficeMenu () {
-  installAppsFromListMenu office
-}
-
-#
-# install Multimedia Apps (headless)
-#
-function installMultimedia () {
-  installAppsFromList multimedia
-}
-
-#
-# install Multimedia Apps (Menu)
-#
-function installMultimediaMenu () {
-  installAppsFromListMenu multimedia
-}
-
-#
-# install eBook Apps (headless)
-#
-function installEbook () {
-  installAppsFromList ebook
-}
-
-#
-# install eBook Apps (Menu)
-#
-function installEbookMenu () {
-  installAppsFromListMenu ebook
-}
-
-#
-# install Internet Apps (headless)
-#
-function installInternet () {
-  installAppsFromList internet
-}
-
-#
-# install Internet Apps (Menu)
-#
-function installInternetMenu () {
-  installAppsFromListMenu internet
-}
-
 #
 # Viber (headless)
 #
@@ -158,272 +88,6 @@ function installXnViewMPMenu () {
                      yes
 }
 
-#
-# install Misc Utilities Apps (headless)
-#
-function installMiscUtilities () {
-  installAppsFromList utilities
-}
-
-#
-# install Misc Utilities Apps (Menu)
-#
-function installMiscUtilitiesMenu () {
-  installAppsFromListMenu utilities
-}
-
-#
-# install Wine Build (headless)
-#
-function installWine () {
-  installAppsFromList wine
-}
-
-#
-# install Wine Build (Menu)
-#
-function installWineMenu () {
-  installAppsFromListMenu wine
-}
-
-#
-# install Game Apps (headless)
-#
-function installGames () {
-  installAppsFromList games
-}
-
-#
-# install Game Apps (Menu)
-#
-function installGamesMenu () {
-  installAppsFromListMenu games
-}
-
-#
-# Steam (headless)
-#
-function installSteam () {
-  installAppsFromList steam
-}
-
-#
-# Steam (Menu)
-#
-function installSteamMenu () {
-  installAppsFromListMenu steam
-}
-
-#
-# install Burning Apps (headless)
-#
-function installBurningTools () {
-  installAppsFromList burningtools
-}
-
-#
-# install Burning Apps (Menu)
-#
-function installBurningToolsMenu () {
-  installAppsFromListMenu burningtools
-}
-
-#
-# install Network Apps (headless)
-#
-function installNetTools () {
-  installAppsFromList nettools
-}
-
-#
-# install Network Apps (Menu)
-#
-function installNetToolsMenu () {
-  installAppsFromListMenu nettools
-}
-
-#
-# install Caja Plugins (headless)
-#
-function installCajaPlugins () {
-  installAppsFromList cajaplugins
-}
-
-#
-# install Caja Plugins (Menu)
-#
-function installCajaPluginsMenu () {
-  installAppsFromListMenu cajaplugins
-}
-
-#
-# install Nautilus Apps + plugins (headless)
-#
-function installNautilusAndPlugins () {
-  installAppsFromList nautilus
-}
-
-#
-# install Nautilus Apps + plugins (Menu)
-#
-function installNautilusAndPluginsMenu () {
-  installAppsFromListMenu nautilus
-}
-
-#
-# install Thunar + Plugins (headless)
-#
-function installThunar () {
-  installAppsFromList thunar
-}
-
-#
-# install Thunar + Plugins (Menu)
-#
-function installThunarMenu () {
-  installAppsFromListMenu thunar
-}
-
-#
-# install Gimp plugins (headless)
-#
-function installGimpPlugins () {
-  installAppsFromList gimp
-}
-
-#
-# install Gimp plugins (Menu)
-#
-function installGimpPluginsMenu () {
-  installAppsFromListMenu gimp
-}
-
-#
-# install RhythmBox plugins (headless)
-#
-function installRhythmBoxPlugins () {
-  installAppsFromList rhythmbox
-}
-
-#
-# install RhythmBox plugins (Menu)
-#
-function installRhythmBoxPluginsMenu () {
-  installAppsFromListMenu rhythmbox
-}
-
-#
-# install Pidgin plugins (headless)
-#
-function installPidginPlugins () {
-  installAppsFromList pidgin
-}
-
-#
-# install Pidgin plugins (Menu)
-#
-function installPidginPluginsMenu () {
-  installAppsFromListMenu pidgin
-}
-
-#
-# install Nitrogen app (headless)
-#
-function installNitrogen () {
-  installAppsFromList nitrogen
-}
-
-#
-# install Nitrogen app (Menu)
-#
-function installNitrogenMenu () {
-  installAppsFromListMenu nitrogen
-}
-
-#
-# install Beta Apps (headless)
-#
-function installBeta () {
-  installAppsFromList beta
-}
-
-#
-# install Beta Apps (Menu)
-#
-function installBetaMenu () {
-  installAppsFromListMenu beta
-}
-
-#
-# install Nightly Apps (headless)
-#
-function installNightly () {
-  installAppsFromList nightly
-}
-
-#
-# install Nightly Apps (Menu)
-#
-function installNightlyMenu () {
-  installAppsFromListMenu nightly
-}
-
-#
-# install GTK Themes (headless)
-#
-function installThemes () {
-  installAppsFromList gtkthemes
-}
-
-#
-# install GTK Themes (Menu)
-#
-function installThemesMenu () {
-  installAppsFromListMenu gtkthemes
-}
-
-#
-# install Icon Themes (headless)
-#
-function installIcons () {
-  installAppsFromList icons
-}
-
-#
-# install Icon Themes (Menu)
-#
-function installIconsMenu () {
-  installAppsFromListMenu icons
-}
-
-#
-# install Solaar App (headless)
-#
-function installSolaar () {
-  installAppsFromList solaar
-}
-
-#
-# install Solaar App (Menu)
-#
-function installSolaarMenu () {
-  installAppsFromListMenu solaar
-}
-
-#
-# install CardReader Apps (headless)
-#
-function installCardReader () {
-  installAppsFromList cardreader
-}
-
-#
-# install CardReader Apps (Menu)
-#
-function installCardReaderMenu () {
-  installAppsFromListMenu cardreader
-}
-
 #
 # update AMD/Intel CPU Microcode
 #
@@ -458,104 +122,6 @@ function fixWirelessIntel6320 () {
   printf "\n"
 }
 
-#
-# install Webcam Apps (headless)
-#
-function installWebcam () {
-  installAppsFromList webcam
-}
-
-#
-# install Webcam Apps (Menu)
-#
-function installWebcamMenu () {
-  installAppsFromListMenu webcam
-}
-
-#
-# install latest versions of graphic drivers, mesa, .... (headless)
-#
-function installOibaf () {
-  addRepo_Oibaf
-}
-
-#
-# install latest versions of graphic drivers, mesa, .... (Menu)
-#
-function installOibafMenu () {
-  addRepo_Oibaf
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia384 () {
-  installAppsFromList nvidia-384
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia384Menu () {
-  installAppsFromListMenu nvidia-384
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia387 () {
-  installAppsFromList nvidia-387
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia387Menu () {
-  installAppsFromListMenu nvidia-387
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia390 () {
-  installAppsFromList nvidia-390
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia390Menu () {
-  installAppsFromListMenu nvidia-390
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia396 () {
-  installAppsFromList nvidia-driver-396
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia396Menu () {
-  installAppsFromListMenu nvidia-driver-396
-}
-
-#
-# install TLP App (headless)
-#
-function installTLP () {
-  installAppsFromList tlp
-}
-
-#
-# install TLP App (Menu)
-#
-function installTLPMenu () {
-  installAppsFromListMenu tlp
-}
-
 #
 # Key-ID USB Fido U2F device udev rules
 #
@@ -579,301 +145,6 @@ EOF
          "restarting UDEV service"
 }
 
-#
-# install Dev Apps (headless)
-#
-function installDevApps () {
-  installAppsFromList dev
-}
-
-#
-# install Dev Apps (Menu)
-#
-function installDevAppsMenu () {
-  installAppsFromListMenu dev
-}
-
-
-#
-# install Javascript env (headless)
-#
-function installJavascript () {
-  installAppsFromList javascript
-}
-
-#
-# install Javascript env (Menu)
-#
-function installJavascriptMenu () {
-  installAppsFromListMenu javascript
-}
-
-#
-# install JAVA 10 (headless)
-#
-function installJava10 () {
-  installAppsFromList java10
-}
-
-#
-# install JAVA 10 (Menu)
-#
-function installJava10Menu () {
-  installAppsFromListMenu java10
-}
-
-#
-# install Mongo DB 3 CE (headless)
-#
-function installMongo3CE () {
-  installAppsFromList mongodb
-}
-
-#
-# install Mongo DB 3 CE (Menu)
-#
-function installMongo3CEMenu () {
-  installAppsFromListMenu mongodb
-}
-
-#
-# install Python Apps (headless)
-#
-function installPython () {
-  installAppsFromList python
-}
-
-#
-# install Python Apps (Menu)
-#
-function installPythonMenu () {
-  installAppsFromListMenu python
-}
-
-#
-# install PHP Apps (headless)
-#
-function installPHP () {
-  installAppsFromList php
-}
-
-#
-# install PHP Apps (Menu)
-#
-function installPHPMenu () {
-  installAppsFromListMenu php
-}
-
-#
-# install QT Apps/tools (headless)
-#
-function installQT () {
-  installAppsFromList qt
-}
-
-#
-# install QT Apps/tools (Menu)
-#
-function installQTMenu () {
-  installAppsFromListMenu qt
-}
-
-#
-# install LUA Apps (headless)
-#
-function installLUA () {
-  installAppsFromList lua
-}
-
-#
-# install LUA Apps (Menu)
-#
-function installLUAMenu () {
-  installAppsFromListMenu lua
-}
-
-#
-# install Ruby Apps (headless)
-#
-function installRuby () {
-  installAppsFromList ruby
-}
-
-#
-# install Ruby Apps (Menu)
-#
-function installRubyMenu () {
-  installAppsFromListMenu ruby
-}
-
-#
-# install Atom App (headless)
-#
-function installAtom () {
-  installAppsFromList atom
-}
-
-#
-# install Atom App (menu)
-#
-function installAtomMenu () {
-  installAppsFromListMenu atom
-}
-
-#
-# install Anjuta Apps (headless)
-#
-function installAnjuta () {
-  installAppsFromList anjuta
-}
-
-#
-# install Anjuta Apps (Menu)
-#
-function installAnjutaMenu () {
-  installAppsFromListMenu anjuta
-}
-
-#
-# install Brackets Apps (headless)
-#
-function installBrackets () {
-  installAppsFromList brackets
-}
-
-#
-# install Brackets Apps (Menu)
-#
-function installBracketsMenu () {
-  installAppsFromListMenu brackets
-}
-
-#
-# install CodeBlocks Apps (headless)
-#
-function installCodeBlocks () {
-  installAppsFromList codeblocks
-}
-
-#
-# install CodeBlocks Apps (Menu)
-#
-function installCodeBlocksMenu () {
-  installAppsFromListMenu codeblocks
-}
-
-#
-# install Geany Apps (headless)
-#
-function installGeany () {
-  installAppsFromList geany
-}
-
-#
-# install Geany Apps (Menu)
-#
-function installGeanyMenu () {
-  installAppsFromListMenu geany
-}
-
-#
-# install IDEA Apps (headless)
-#
-function installIdea () {
-  installAppsFromList idea
-}
-
-#
-# install IDEA Apps (Menu)
-#
-function installIdeaMenu () {
-  installAppsFromListMenu idea
-}
-
-#
-# install Eclipse Apps (headless)
-#
-function installEclipse () {
-  installAppsFromList eclipse
-}
-
-#
-# install Eclipse Apps (Menu)
-#
-function installEclipseMenu () {
-  installAppsFromListMenu eclipse
-}
-
-#
-# install Pycharm Apps (headless)
-#
-function installPyCharm () {
-  installAppsFromList pycharm
-}
-
-#
-# install Pycharm Apps (Menu)
-#
-function installPyCharmMenu () {
-  installAppsFromListMenu pycharm
-}
-
-#
-# install Visual Studio Code Apps (headless)
-#
-function installVisualStudioCode () {
-  installAppsFromList code
-}
-
-#
-# install Visual Studio Code Apps (Menu)
-#
-function installVisualStudioCodeMenu () {
-  installAppsFromListMenu code
-}
-
-#
-# install Android-Studio Apps (headless)
-#
-function installAndroidStudio () {
-  installAppsFromList androidstudio
-}
-
-#
-# install Android-Studio Apps (Menu)
-#
-function installAndroidStudioMenu () {
-  installAppsFromListMenu androidstudio
-}
-
-#
-# install SublimeText Apps (headless)
-#
-function installSublimeText() {
-  installAppsFromList sublime-text
-}
-
-#
-# install SublimeText Apps (Menu)
-#
-function installSublimeTextMenu() {
-  installAppsFromListMenu sublime-text
-}
-
-#
-# install CAD Apps (headless)
-#
-function installCAD () {
-  installAppsFromList cad
-}
-
-#
-# install CAD Apps (Menu)
-#
-function installCADMenu () {
-  installAppsFromListMenu cad
-}
-
 #
 # install Teamviewer 13 (headless)
 #
@@ -927,10 +198,3 @@ function installBoostnotesMenu () {
                      boostnotes.deb \
                      yes
 }
-
-#
-# install/enable Unboud (headless)
-#
-function installUnbound () {
-  installAppsFromList unbound
-}
diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh
index 731ae05..c96bd0a 100644
--- a/menus_functions_ub1604.sh
+++ b/menus_functions_ub1604.sh
@@ -98,7 +98,7 @@ function showConfigMenu () {
         ;;
       "Unbound")
         clear
-        installUnbound
+        installAppsFromList unbound
         pressKey
         ;;
       "Back")
@@ -174,10 +174,10 @@ function showThemesInstallMenu () {
 
     case $themesInstallMenuOptions in
       "themes")
-        installThemesMenu
+        installAppsFromListMenu gtkthemes
         ;;
       "icons")
-        installIconsMenu
+        installAppsFromListMenu icons
         ;;
       "Back")
         break
@@ -225,67 +225,67 @@ function showDevInstallMenu () {
 
     case $devInstallMenuOptions in
       "devbase")
-        installDevAppsMenu
+        installAppsFromListMenu dev
         ;;
       "java10")
-        installJava10
+        installAppsFromListMenu java10
         ;;
       "javascript")
-        installJavascriptMenu
+        installAppsFromListMenu javascript
         ;;
       "mongodb3ce")
-        installMongo3CEMenu
+        installAppsFromListMenu mongodb
         ;;
       "php")
-        installPHPMenu
+        installAppsFromListMenu php
         ;;
       "lua")
-        installLUAMenu
+        installAppsFromListMenu lua
         ;;
       "ruby")
-        installRubyMenu
+        installAppsFromListMenu ruby
         ;;
       "qt")
-        installQTMenu
+        installAppsFromListMenu qt
         ;;
       "python")
-        installPythonMenu
+        installAppsFromListMenu python
         ;;
       "atom")
-        installAtomMenu
+        installAppsFromListMenu atom
         ;;
       "anjuta")
-        installAnjutaMenu
+        installAppsFromListMenu anjuta
         ;;
       "brackets")
-        installBracketsMenu
+        installAppsFromListMenu brackets
         ;;
       "codeblocks")
-        installCodeBlocksMenu
+        installAppsFromListMenu codeblocks
         ;;
       "geany")
-        installGeanyMenu
+        installAppsFromListMenu geany
         ;;
       "idea")
-        installIdeaMenu
+        installAppsFromListMenu idea
         ;;
       "eclipse")
-        installEclipseMenu
+        installAppsFromListMenu eclipse
         ;;
       "pycharm")
-        installPyCharmMenu
+        installAppsFromListMenu pycharm
         ;;
       "vsc")
-        installVisualStudioCodeMenu
+        installAppsFromListMenu code
         ;;
       "androidstudio")
-        installAndroidStudioMenu
+        installAppsFromListMenu androidstudio
         ;;
       "sublimetext")
-        installSublimeTextMenu
+        installAppsFromListMenu sublime-text
         ;;
       "cad")
-        installCADMenu
+        installAppsFromListMenu cad
         ;;
       "teamviewer13")
         installTeamViewer13Menu
@@ -317,9 +317,11 @@ function showAppInstallMenu () {
     "base" "Base Apps" \
     "office" "Office Apps" \
     "multimedia" "Multimedia Apps" \
+    "ebook" "eBook Apps" \
     "internet" "Internet Apps" \
     "utilities" "Misc Utilities" \
     "games" "Games & tools" \
+    "steam" "Steam" \
     "burningtools" "Disc Burning and tools" \
     "nettools" "Network tools" \
     "cajaplugins" "Caja Plugins" \
@@ -337,52 +339,58 @@ function showAppInstallMenu () {
 
     case $appsInstallMenuOptions in
       "base")
-        installBaseMenu
+        installAppsFromListMenu base
         ;;
       "office")
-        installOfficeMenu
+        installAppsFromListMenu office
         ;;
       "multimedia")
-        installMultimediaMenu
+        installAppsFromListMenu multimedia
+        ;;
+      "ebook")
+        installAppsFromListMenu ebook
         ;;
       "internet")
-        installInternetMenu
+        installAppsFromListMenu internet
         ;;
       "utilities")
-        installMiscUtilitiesMenu
+        installAppsFromListMenu utilities
         ;;
       "games")
-        installGamesMenu
+        installAppsFromListMenu games
+        ;;
+      "steam")
+        installAppsFromListMenu steam
         ;;
       "burningtools")
-        installBurningToolsMenu
+        installAppsFromListMenu burningtools
         ;;
       "nettools")
-        installNetToolsMenu
+        installAppsFromListMenu nettools
         ;;
       "cajaplugins")
-        installCajaPluginsMenu
+        installAppsFromListMenu cajaplugins
         ;;
       "nautilus")
         installNautilusAndPluginsMenu
         ;;
       "thunar")
-        installThunarMenu
+        installAppsFromListMenu thunar
         ;;
       "gimp")
-        installGimpPluginsMenu
+        installAppsFromListMenu gimp
         ;;
       "rhythmbox")
-        installRhythmBoxPluginsMenu
+        installAppsFromListMenu rhythmbox
         ;;
       "pidgin")
-        installPidginPluginsMenu
+        installAppsFromListMenu pidgin
         ;;
       "nitrogen")
-        installNitrogenMenu
+        installAppsFromListMenu nitrogen
         ;;
       "wine")
-        installWineMenu
+        installAppsFromListMenu wine
         ;;
       "viber")
         installViberMenu
@@ -444,43 +452,43 @@ function showHardwareMenu () {
 
     case $hardwareMenuOptions in
       "cardreader")
-        installCardReaderMenu
+        installAppsFromListMenu cardreader
         ;;
       "solaar")
-        installAppsFromListMenu
+        installAppsFromListMenu solaar
         ;;
       "webcam")
-        installWebcamMenu
+        installAppsFromListMenu webcam
         ;;
       "microcode")
         updateMicrocode
         ;;
       "nvidia370")
-        installNvidia370Menu
+        installAppsFromListMenu nvidia-370
         ;;
       "nvidia375")
-        installNvidia375Menu
+        installAppsFromListMenu nvidia-375
         ;;
       "nvidia378")
-        installNvidia378Menu
+        installAppsFromListMenu nvidia-378
         ;;
       "nvidia381")
-        installNvidia381Menu
+        installAppsFromListMenu nvidia-381
         ;;
       "nvidia384")
-        installNvidia384Menu
+        installAppsFromListMenu nvidia-384
         ;;
       "nvidia387")
-        installNvidia387Menu
+        installAppsFromListMenu nvidia-387
         ;;
       "nvidia390")
-        installNvidia390Menu
+        installAppsFromListMenu nvidia-390
         ;;
       "nvidia396")
-        installNvidia396Menu
+        installAppsFromListMenu nvidia-396
         ;;
       "tlp")
-        installTLPMenu
+        installAppsFromListMenu tlp
         ;;
       "keyid")
         installKeyIDuDev
diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index 1776902..0f7d63f 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -98,7 +98,7 @@ function showConfigMenu () {
         ;;
       "Unbound")
         clear
-        installUnbound
+        installAppsFromList unbound
         pressKey
         ;;
       "Back")
@@ -174,10 +174,10 @@ function showThemesInstallMenu () {
 
     case $themesInstallMenuOptions in
       "themes")
-        installThemesMenu
+        installAppsFromListMenu gtkthemes
         ;;
       "icons")
-        installIconsMenu
+        installAppsFromListMenu icons
         ;;
       "Back")
         break
@@ -225,67 +225,67 @@ function showDevInstallMenu () {
 
     case $devInstallMenuOptions in
       "devbase")
-        installDevAppsMenu
+        installAppsFromListMenu dev
         ;;
       "java10")
-        installJava10
+        installAppsFromListMenu java10
         ;;
       "javascript")
-        installJavascriptMenu
+        installAppsFromListMenu javascript
         ;;
       "mongodb3ce")
-        installMongo3CEMenu
+        installAppsFromListMenu mongodb
         ;;
       "php")
-        installPHPMenu
+        installAppsFromListMenu php
         ;;
       "lua")
-        installLUAMenu
+        installAppsFromListMenu lua
         ;;
       "ruby")
-        installRubyMenu
+        installAppsFromListMenu ruby
         ;;
       "qt")
-        installQTMenu
+        installAppsFromListMenu qt
         ;;
       "python")
-        installPythonMenu
+        installAppsFromListMenu python
         ;;
       "atom")
-        installAtomMenu
+        installAppsFromListMenu atom
         ;;
       "anjuta")
-        installAnjutaMenu
+        installAppsFromListMenu anjuta
         ;;
       "brackets")
-        installBracketsMenu
+        installAppsFromListMenu brackets
         ;;
       "codeblocks")
-        installCodeBlocksMenu
+        installAppsFromListMenu codeblocks
         ;;
       "geany")
-        installGeanyMenu
+        installAppsFromListMenu geany
         ;;
       "idea")
-        installIdeaMenu
+        installAppsFromListMenu idea
         ;;
       "eclipse")
-        installEclipseMenu
+        installAppsFromListMenu eclipse
         ;;
       "pycharm")
-        installPyCharmMenu
+        installAppsFromListMenu pycharm
         ;;
       "vsc")
-        installVisualStudioCodeMenu
+        installAppsFromListMenu code
         ;;
       "androidstudio")
-        installAndroidStudioMenu
+        installAppsFromListMenu androidstudio
         ;;
       "sublimetext")
-        installSublimeTextMenu
+        installAppsFromListMenu sublime-text
         ;;
       "cad")
-        installCADMenu
+        installAppsFromListMenu cad
         ;;
       "teamviewer13")
         installTeamViewer13Menu
@@ -317,9 +317,11 @@ function showAppInstallMenu () {
     "base" "Base Apps" \
     "office" "Office Apps" \
     "multimedia" "Multimedia Apps" \
+    "ebook" "eBook Apps" \
     "internet" "Internet Apps" \
     "utilities" "Misc Utilities" \
     "games" "Games & tools" \
+    "steam" "Steam" \
     "burningtools" "Disc Burning and tools" \
     "nettools" "Network tools" \
     "cajaplugins" "Caja Plugins" \
@@ -337,52 +339,58 @@ function showAppInstallMenu () {
 
     case $appsInstallMenuOptions in
       "base")
-        installBaseMenu
+        installAppsFromListMenu base
         ;;
       "office")
-        installOfficeMenu
+        installAppsFromListMenu office
         ;;
       "multimedia")
-        installMultimediaMenu
+        installAppsFromListMenu multimedia
+        ;;
+      "ebook")
+        installAppsFromListMenu ebook
         ;;
       "internet")
-        installInternetMenu
+        installAppsFromListMenu internet
         ;;
       "utilities")
-        installMiscUtilitiesMenu
+        installAppsFromListMenu utilities
         ;;
       "games")
-        installGamesMenu
+        installAppsFromListMenu games
+        ;;
+      "steam")
+        installAppsFromListMenu steam
         ;;
       "burningtools")
-        installBurningToolsMenu
+        installAppsFromListMenu burningtools
         ;;
       "nettools")
-        installNetToolsMenu
+        installAppsFromListMenu nettools
         ;;
       "cajaplugins")
-        installCajaPluginsMenu
+        installAppsFromListMenu cajaplugins
         ;;
       "nautilus")
         installNautilusAndPluginsMenu
         ;;
       "thunar")
-        installThunarMenu
+        installAppsFromListMenu thunar
         ;;
       "gimp")
-        installGimpPluginsMenu
+        installAppsFromListMenu gimp
         ;;
       "rhythmbox")
-        installRhythmBoxPluginsMenu
+        installAppsFromListMenu rhythmbox
         ;;
       "pidgin")
-        installPidginPluginsMenu
+        installAppsFromListMenu pidgin
         ;;
       "nitrogen")
-        installNitrogenMenu
+        installAppsFromListMenu nitrogen
         ;;
       "wine")
-        installWineMenu
+        installAppsFromListMenu wine
         ;;
       "viber")
         installViberMenu
@@ -440,31 +448,31 @@ function showHardwareMenu () {
 
     case $hardwareMenuOptions in
       "cardreader")
-        installCardReaderMenu
+        installAppsFromListMenu cardreader
         ;;
       "solaar")
-        installAppsFromListMenu
+        installAppsFromListMenu solaar
         ;;
       "webcam")
-        installWebcamMenu
+        installAppsFromListMenu webcam
         ;;
       "microcode")
         updateMicrocode
         ;;
       "nvidia384")
-        installNvidia384Menu
+        installAppsFromListMenu nvidia-384
         ;;
       "nvidia387")
-        installNvidia387Menu
+        installAppsFromListMenu nvidia-387
         ;;
       "nvidia390")
-        installNvidia390Menu
+        installAppsFromListMenu nvidia-390
         ;;
       "nvidia396")
-        installNvidia396Menu
+        installAppsFromListMenu nvidia-driver-396
         ;;
       "tlp")
-        installTLPMenu
+        installAppsFromListMenu tlp
         ;;
       "keyid")
         installKeyIDuDev
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 1552aff..d6764db 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -71,26 +71,26 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing Apps"
-      installBase
-      installOffice
+      installAppsFromList base
+      installAppsFromList office
       installBurningTools
-      installEbook
-      installGames
-      installSteam
-      installInternet
+      installAppsFromList ebook
+      installAppsFromList games
+      installAppsFromList steam
+      installAppsFromList internet
       installJava10
-      installMiscUtilities
-      installMultimedia
-      installNetTools
-      installWine
-      installCajaPlugins
-      installNautilusAndPlugins
-      installThunar
-      installGimpPlugins
-      installPidginPlugins
-      installRhythmBoxPlugins
+      installAppsFromList utilities
+      installAppsFromList multimedia
+      installAppsFromList nettools
+      installAppsFromList wine
+      installAppsFromList cajaplugins
+      installAppsFromList nautilus
+      installAppsFromList thunar
+      installAppsFromList gimp
+      installAppsFromList pidgin
+      installAppsFromList rhythmbox
       msg "Installing HW related"
-      installWebcam
+      installAppsFromList webcam
       updateMicrocode
       msg "Applying system customizations"
       enableUFW
@@ -114,28 +114,28 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing Apps"
-      installBase
-      installOffice
+      installAppsFromList base
+      installAppsFromList office
       installBurningTools
-      installEbook
-      installGames
-      installSteam
-      installInternet
+      installAppsFromList ebook
+      installAppsFromList games
+      installAppsFromList steam
+      installAppsFromList internet
       installJava10
-      installMiscUtilities
-      installMultimedia
-      installNetTools
-      installWine
-      installCajaPlugins
-      installNautilusAndPlugins
-      installThunar
-      installGimpPlugins
-      installPidginPlugins
-      installRhythmBoxPlugins
+      installAppsFromList utilities
+      installAppsFromList multimedia
+      installAppsFromList nettools
+      installAppsFromList wine
+      installAppsFromList cajaplugins
+      installAppsFromList nautilus
+      installAppsFromList thunar
+      installAppsFromList gimp
+      installAppsFromList pidgin
+      installAppsFromList rhythmbox
       msg "Installing HW related"
-      installWebcam
+      installAppsFromList webcam
       updateMicrocode
-      installCardReader
+      installAppsFromList cardreader
       msg "Applying system customizations"
       enableUFW
       enableNumLockX
@@ -144,8 +144,8 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
       installUnattendedUpgrades
       enableUnbound
       msg "Installing additional themes/icons"
-      installIcons
-      installThemes
+      installAppsFromList icons
+      installAppsFromList gtkthemes
       msg "Installing external apps"
       installViber
       installFranz
@@ -162,8 +162,8 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing Icons/Themes"
-      installIcons
-      installThemes
+      installAppsFromList icons
+      installAppsFromList gtkthemes
       ;;
     w) # nitrogen
       if [ $ygginitCount = false ]; then
@@ -174,7 +174,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing Nitrogen"
-      installNitrogen
+      installAppsFromList nitrogen
       ;;
     d) # install Unbound DNS Cache
       if [ $ygginitCount = false ]; then
@@ -196,7 +196,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing Card Readers Apps"
-      installCardReader
+      installAppsFromList cardreader
       ;;
     s) # solaar for logitech devices
       if [ $ygginitCount = false ]; then
@@ -207,7 +207,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing Solaar"
-      installSolaar
+      installAppsFromList solaar
       ;;
     t) # tlp (laptop or low energy usage)
       if [ $ygginitCount = false ]; then
@@ -218,7 +218,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         ygginitCount=true
       fi
       msg "Installing TLP"
-      installTLP
+      installAppsFromList tlp
       ;;
     n) # latest nvidia driver (see menus if need older version)
       if [ $ygginitCount = false ]; then
@@ -228,8 +228,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do
         updateSystem
         ygginitCount=true
       fi
-      msg "Installing Nvidia Latest Driver"
-      installNvidia396
+      installAppsFromList nvidia-driver-396
       ;;
     k)
       if [ $ygginitCount = false ]; then
@@ -330,10 +329,10 @@ case $mainMenuOptions in
     showAppInstallMenu
     ;;
   "3")
-    showAppBetaInstallMenu
+    installAppsFromListMenu beta
     ;;
   "4")
-    showAppNightlyInstallMenu
+    installAppsFromListMenu nightly
     ;;
   "5")
     showThemesInstallMenu