diff --git a/core_functions_ub1604.sh b/core_functions.sh
similarity index 100%
rename from core_functions_ub1604.sh
rename to core_functions.sh
diff --git a/core_functions_ub1804.sh b/core_functions_ub1804.sh
deleted file mode 100644
index 50a1a4e..0000000
--- a/core_functions_ub1804.sh
+++ /dev/null
@@ -1,661 +0,0 @@
-#-----------------------------------------------------------------------------#
-# Yggdrasil NG                                                                #
-#    compatibility : see documentation or man pages                           #
-#    author : Francois B. (Makotosan/Shakasan)                                #
-#    licence : GPLv3                                                          #
-#    website : https://makotonoblog.be/                                       #
-#-----------------------------------------------------------------------------#
-
-#-----------------------------------------------------------------------------#
-#                                                                             #
-# Ubuntu 18.04 / Linux Mint 19                                                #
-#                                                                             #
-#-----------------------------------------------------------------------------#
-
-#-----------------------------------------------------------------------------#
-# core functions                                                              #
-#-----------------------------------------------------------------------------#
-
-#
-# display a simple message + CR
-#
-function smsgn () {
-    printf "$*\n"
-}
-
-#
-# display a simple message
-#
-function smsg () {
-    printf "$*"
-}
-
-#
-# display a message + notification
-#
-function msg () {
-  printf "\n"
-  printf $JAUNE
-  if [ "$#" -gt "0" ]; then
-    printf "$*\n"
-    /usr/bin/notify-send -t 7000 "$*"
-  fi
-  printf $NORMAL
-}
-
-#
-# display a message between [ ] depending of the ret_code
-#
-function retCode () {
-  typeset ret_code="$1"
-  if [ $ret_code == 0 ]; then
-    printf "[ "$BOLDVERT"OK"$NORMAL" ] "
-  else
-    printf "[ "$BOLDROUGE"!!"$NORMAL" ] "
-  fi
-  printf "\n"
-}
-
-#
-# run a shell command and display a message between [ ] depending on the ret_code
-#
-function runCmd () {
-  typeset cmd="$1"
-  typeset txt="$2"
-  typeset ret_code
-
-  printf "[CMD] $txt "
-  printf "\n[CMD] $txt : $cmd\n" &>> $logFile
-  eval $cmd" &>> $logFile"
-  ret_code=$?
-  retCode $ret_code
-}
-
-#
-# display a message + notification + ask to push a key to continue
-#
-function pressKey () {
-  printf "$*\n"
-  if which mpg123 >/dev/null; then
-    mpg123 -q /opt/yggdrasil/notify.mp3 &
-  fi
-  printf $INV
-  read -p "Press <Enter> key to continue ..."
-  printf $NORMAL
-}
-
-#
-# check if OS is Mint
-#
-function isMint () {
-  OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'`
-  if [[ $OS == *"Linux Mint 18"* ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-#
-# check if DE is Mate
-#
-function isMate () {
-  if [[ $DESKTOP_SESSION == *"mate"* ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-#
-# check and install required dependencies for Yggdrasil
-#
-function yggInit () {
-  typeset ret_code
-
-  printf "[INIT]"
-  runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \
-         "apply settings for science-config pkg"
-
-  if ! dpkg --print-foreign-architectures | grep -qi i386; then
-    printf "[INIT]"
-    runCmd "sudo dpkg --add-architecture i386" \
-           "adding i386 architecture"
-  else
-    printf "[INIT] i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-
-  printf "[INIT]"
-  addPPA ppa:ubuntu-desktop/ubuntu-make
-
-  printf "[INIT][APT] update "
-  printf "\n[INIT][APT] update\n" &>> $logFile
-  sudo apt-get update &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-
-  printf "[INIT]"
-  installPackage apt "apt-transport-https"
-
-  if ! which umake >/dev/null; then
-    printf "[INIT][UMAKE] not found, installing...\n"
-    printf "\n[INIT][UMAKE] not found, installing...\n" &>> $logFile
-    installPackage apt "ubuntu-make"
-  else
-    printf "[INIT][UMAKE] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-
-  if ! which gem >/dev/null; then
-    printf "[INIT][GEM] not found, installing...\n"
-    printf "\n[INIT][GEM] not found, installing...\n" &>> $logFile
-    installPackage apt "ruby-dev"
-  else
-    printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-
-  if ! which snap >/dev/null; then
-    printf "[INIT][SNAP] not found, installing...\n"
-    printf "\n[INIT][SNAP] not found, installing...\n" &>> $logFile
-    installPackage apt "snapd"
-  else
-    printf "[INIT][SNAP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-
-  if ! which npm >/dev/null; then
-    printf "[INIT][NPM] not found, installing...\n"
-    printf "\n[INIT][NPM] not found, installing...\n" &>> $logFile
-    installPackage apt "nodejs"
-  else
-    printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-
-  if ! which pip3 >/dev/null; then
-    printf "[INIT][PIP] not found, installing...\n"
-    printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile
-    printf "[INIT]"
-    installPackage apt "python3-pip"
-    printf "[INIT]"
-    installPackage pip "pip"
-    printf "[INIT]"
-    installPackage pip "setuptools"
-  else
-    printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
-    printf "[INIT]"
-    installPackage pip "pip"
-    printf "[INIT]"
-    installPackage pip "setuptools"
-  fi
-}
-
-#
-# update kernel to the latest version
-#
-function kernelUpdate () {
-  checkAndInstallDep apt ukuu ukuu \
-  && runCmd "sudo ukuu --install-latest --yes" \
-            "installing latest kernel"
-}
-
-#
-# system update
-#TODO: add pip, npm (yarn?), gem
-#
-function updateSystem () {
-  typeset ret_code
-
-  printf "[APT] update "
-  printf "\n[APT] update\n" &>> $logFile
-  sudo apt-get update &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-
-  printf "[APT] upgrade "
-  printf "\n[APT] upgrade\n" &>> $logFile
-  sudo apt-get -y upgrade &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-
-  printf "[APT] dist-upgrade "
-  printf "\n[APT] dist-upgrade\n" &>> $logFile
-  sudo apt-get -y dist-upgrade &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-
-  if which snap >/dev/null; then
-    printf "[SNAP] refresh "
-    printf "\n[SNAP] refresh\n" &>> $logFile
-    sudo snap refresh &>> $logFile
-    ret_code=$?
-    retCode $ret_code
-  fi
-
-  repoAdded=0
-}
-
-#
-# add ppa
-# input : ppa name
-#
-function addPPA () {
-  typeset ret_code
-
-  prefix="ppa:"
-  str="$*"
-  str2search=${str#$prefix}
-
-  if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ${str2search}; then
-    printf "[PPA] adding : $* "
-    printf "\n[PPA] adding $*\n" &>> $logFile
-    sudo add-apt-repository -y $* &>> $logFile
-    ret_code=$?
-    retCode $ret_code
-  else
-    printf "[PPA] PPA already added [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-}
-
-#
-# add repo's key
-# input : file's url OR keyserver + key
-#
-function addKey () {
-  typeset ret_code
-
-  case $# in
-    "1")
-      printf "[REPO] adding key from file : $1 "
-      printf "\n[REPO] adding key from file $1\n" &>> $logFile
-      wget -qO - $1 | sudo apt-key add - &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-      ;;
-    "2")
-      printf "[REPO] adding key $2 from $1 "
-      printf "\n[REPO] adding key $2 from $1\n" &>> $logFile
-      gpg --keyserver $1 --recv-keys $2 &>> $logFile \
-      && gpg -a --export $2 | sudo apt-key add - &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-      ;;
-  esac
-}
-
-#
-# create new entry in /etc/apt/source.list.d/
-# input : filename, repo, src repo
-#
-function addRepo () {
-  typeset ret_code
-  printf "[REPO] adding : $2 in $1 "
-  printf "\n[REPO] adding $2 in $1\n" &>> $logFile
-  echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-  if [ "$#" -eq 3 ]; then
-    printf "[REPO] adding : $3 in $1 "
-    printf "\n[REPO] adding $3 in $1\n" &>> $logFile
-    echo $3 | sudo tee -a /etc/apt/sources.list.d/$1 &>> $logFile
-    ret_code=$?
-    retCode $ret_code
-  fi
-}
-
-#
-# install package manually
-# input : url of package, package name, menu mode
-#
-function installPackageDpkg () {
-  printf "[PKG] Installing $2 from $1 "
-  printf "\n[PKG] installing $2 from $1\n" &>> $logFile
-  cd /tmp \
-  && wget -q -O $2 $1 &>> $logFile \
-  && sudo dpkg -i $2 &>> $logFile
-  sudo apt-get install -fy &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-  if [ "$3" == "yes" ]; then
-    pressKey
-  fi
-}
-
-#
-# install package from repositories
-# input : package manager, package name
-# package manager available : apt, pip, npm, gem, snap
-# TODO: add apm, flatpak, umake?, use yarn instead of npm ?
-#
-function installPackage () {
-  typeset pkg="$2"
-  typeset ret_code
-
-  case $1 in
-  "apt")
-    printf "[APT] Installing $pkg "
-    printf "\n[APT] installing $pkg\n" &>> $logFile
-    sudo apt-get install -fy $pkg &>> $logFile
-    ret_code=$?
-    retCode $ret_code
-    ;;
-  "pip")
-    if which pip3 >/dev/null; then
-      printf "[PIP] Installing $pkg "
-      printf "\n[PIP] installing $pkg\n" &>> $logFile
-      sudo -H pip3 install --upgrade $pkg &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-    fi
-    ;;
-  "npm")
-    if which npm >/dev/null; then
-      printf "[NPM] Installing $pkg "
-      printf "\n[NPM] installing $pkg\n" &>> $logFile
-      sudo npm install -g $pkg &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-    fi
-    ;;
-  "gem")
-    if which gem >/dev/null; then
-      printf "[GEM] Installing $pkg "
-      printf "\n[GEM] installing $pkg\n" &>> $logFile
-      sudo gem install $pkg &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-    fi
-    ;;
-  "snap")
-    if which snap >/dev/null; then
-      printf "[SNAP] Installing $pkg "
-      printf "\n[SNAP] installing $pkg\n" &>> $logFile
-      sudo snap install $pkg --classic &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-    fi
-    ;;
-  esac
-}
-
-#
-# check dependency and install it if necessary
-# input : package manager, package name, cmd/bin to check
-#
-function checkAndInstallDep () {
-  if ! which $3 >/dev/null; then
-    printf "[DEP] dependency $2 not found [ "$BOLDROUGE"!!"$NORMAL" ]\n"
-    printf "[DEP] dependency $2 not found\n" &>> $logFile
-    case $1 in
-      "apt")
-        installPackage apt $2
-        ;;
-      "npm")
-        installPackage npm $2
-        ;;
-      "pip")
-        installPackage pip $2
-        ;;
-      "gem")
-        installPackage gem $2
-        ;;
-      "snap")
-        installPackage snap $2
-        ;;
-    esac
-  fi
-}
-
-#
-# add specific repository for a given package
-# input : unique ID, apt cache update yes/no
-#
-function addSpecificRepoFct () {
-  for i in $AppsRepo; do
-    appRepo=(${i//;/ })
-    if [ "${appRepo[0]}" == "$1" ]; then
-      printf "[ADD] package -- $1 -- repo/ppa "
-      printf "added by function -- ${appRepo[1]}\n"
-      eval "${appRepo[1]}"
-      repoAdded=$(($repoAdded+1))
-    fi
-  done
-  if [ "$2" == "yes" ]; then
-    updateSystem
-  fi
-  unset i
-  unset appRepo
-}
-
-#
-# find and execute Pre/Post install functions for a specific app
-# input : unique ID
-#
-function processAppTrtFct () {
-  for i in $AppsTrtFct; do
-    appTrtFct=(${i//;/ })
-    if [ "${appTrtFct[0]}" == "$1" ]; then
-      printf "[TRT] package -- $1 -- "
-      printf "post install processed by -- ${appTrtFct[1]}\n"
-      eval "${appTrtFct[1]}"
-    fi
-  done
-}
-
-#
-# install all about a specific category from Apps array app list (headless)
-# input : category name
-#
-function installAppsFromList () {
-  msg "Installing apps from $1 category"
-  for i in $Apps; do
-    app=(${i//;/ })
-    if [ "${app[2]}" == "$1" ]; then
-      addSpecificRepoFct ${app[3]}
-    fi
-  done
-  unset i
-  unset app
-  if [ "$repoAdded" -gt "0" ]; then
-    updateSystem
-  fi
-  for i in $Apps; do
-    app=(${i//;/ })
-    if [ "${app[2]}" == "$1" ]; then
-      installPackage ${app[1]} ${app[0]}
-      processAppTrtFct ${app[3]}
-    fi
-  done
-}
-
-#
-# generate install apps menu about a specific category from Apps array app list (Menu)
-# input : category name
-#
-function installAppsFromListMenu () {
-  for i in $Apps; do
-    app=(${i//;/ })
-    if [ "${app[2]}" == "$1" ]; then
-      list+=("${app[3]}" "${app[3]}" "ON")
-    fi
-  done
-
-  pkg=$(whiptail \
-  --title "Yggdrasil $version - App Install ($1)" \
-  --checklist \
-  "Select app to install and press OK" 25 80 19 \
-  "${list[@]}" 3>&1 1>&2 2>&3)
-
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    for pkgToInstall in $pkg; do
-      for i in $Apps; do
-        app=(${i//;/ })
-        if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then
-          addSpecificRepoFct ${app[3]}
-        fi
-      done
-    done
-    unset i
-    unset app
-    unset pkgToInstall
-    if [ "$repoAdded" -gt "0" ]; then
-      updateSystem
-    fi
-    for pkgToInstall in $pkg; do
-      for i in $Apps; do
-        app=(${i//;/ })
-        if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then
-          installPackage ${app[1]} ${app[0]}
-          processAppTrtFct ${app[3]}
-        fi
-      done
-    done
-  fi
-  unset list
-  pressKey
-}
-
-#
-# create app shortcut
-# inputs : bin to exec, icon path, category, name, local/global, start w/ session
-#
-function createAppShortcut () {
-  typeset ret_code
-
-  shortcut='[Desktop Entry]\n'
-  shortcut+='Encoding=UTF-8\n'
-  shortcut+='Terminal=0\n'
-  shortcut+='Exec='$1'\n'
-  shortcut+='Icon='$2'\n'
-  shortcut+='Type=Application\n'
-  if [ "$6" == "start" ]; then
-    shortcut+='X-MATE-Autostart-enabled=true\n\n'
-  else
-    shortcut+='Categories='$3';\n'
-  fi
-  shortcut+='StartupNotify=true\n'
-  shortcut+='Name='$4'\n'
-  shortcut+='GenericName='$4'\n'
-  shortcut+='Comment='
-
-  if [ "$5" == "global" ]; then
-    smsg "creating shortcut for $4 "
-    echo -e $shortcut > /usr/share/applications/"$4".desktop
-    ret_code=$?
-    retCode $ret_code
-  else
-    mkdir -p /home/$myHomedir/.local/share/applications
-    smsg "creating shortcut for $4 "
-    echo -e $shortcut > /home/"$myHomedir"/.local/share/applications/"$4".desktop
-    ret_code=$?
-    retCode $ret_code
-  fi
-}
-
-#
-# show Yggdrasil logo
-#
-function dispLogo () {
-  printf "\n"
-  printf $BOLDJAUNE
-  printf "██╗   ██╗ ██████╗  ██████╗ ██████╗ ██████╗  █████╗ ███████╗██╗██╗     \n"
-  printf "╚██╗ ██╔╝██╔════╝ ██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██╔════╝██║██║     \n"
-  printf " ╚████╔╝ ██║  ███╗██║  ███╗██║  ██║██████╔╝███████║███████╗██║██║     \n"
-  printf "  ╚██╔╝  ██║   ██║██║   ██║██║  ██║██╔══██╗██╔══██║╚════██║██║██║     \n"
-  printf "   ██║   ╚██████╔╝╚██████╔╝██████╔╝██║  ██║██║  ██║███████║██║███████╗\n"
-  printf "   ╚═╝    ╚═════╝  ╚═════╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝╚═╝╚══════╝\n"
-  printf "$BOLDROUGE                 Customize Linux Mint & Ubuntu derivatives made easier\n"
-  printf "$BOLDBLANC         ver "$version" - GPLv3 - Francois B. (Makotosan) - makotonoblog.be\n"
-	printf "\n"
-}
-
-#
-# show usage for headless mode
-#
-function usage () {
-  dispLogo
-  dispSysInfos
-  printf "\n"
-	printf $NORMAL
-	printf "Usage : yggdrasil [options]\n\n"
-  printf " "$BOLDVERT"-f"$NORMAL" : install everything (see man pages for more details)(a+c+d+q)\n"
-  printf " "$BOLDVERT"-a"$NORMAL" : install all apps\n"
-  printf " "$BOLDVERT"-c"$NORMAL" : install Themes and Icons\n"
-  printf " "$BOLDVERT"-w"$NORMAL" : install Nitrogen + remove desktop management from caja\n"
-  printf " "$BOLDVERT"-d"$NORMAL" : install DNS Cache Unbound\n"
-  printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\n"
-  printf " "$BOLDVERT"-s"$NORMAL" : install Solaar for Logitech Unifying devices\n"
-  printf " "$BOLDVERT"-t"$NORMAL" : install TLP for Laptops and low energy usage\n"
-  printf " "$BOLDVERT"-n"$NORMAL" : install lastest Nvidia graphic drivers\n"
-  printf " "$BOLDVERT"-g"$NORMAL" : install lastest free graphic drivers (nouveau, amdgpu, ati, intel), mesa, ...\n"
-  printf " "$BOLDVERT"-k"$NORMAL" : update system to the latest kernel\n"
-  printf " "$BOLDVERT"-u"$NORMAL" : update system (apt,snap,...)\n"
-  printf " "$BOLDVERT"-p"$NORMAL" : clean useless packages\n"
-	printf " "$BOLDVERT"-v"$NORMAL" : show verison number\n"
-  printf " "$BOLDVERT"-h"$NORMAL" : show help & informations\n"
-  printf "\n"
-}
-
-function dispSysInfos () {
-  # CPU Architecture
-  printf $BOLDVERT"Architecture : "$NORMAL
-  uname -m
-
-  # Current user homedir
-  printf $BOLDVERT"User (userdir) :"$NORMAL" $myHomedir\n"
-
-  # Linux Distro Name
-  printf $BOLDVERT"OS : "$NORMAL
-  lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'
-
-  # Kernel version
-  printf $BOLDVERT"Kernel : "$NORMAL
-  uname -r
-
-  # Desktop Name
-  printf $BOLDVERT"Desktop : "$NORMAL
-  case $XDG_CURRENT_DESKTOP in
-    "ENLIGHTENMENT")
-      printf "Enlightenment"
-      printf "\n"
-      ;;
-    "GNOME")
-      printf "Gnome"
-      printf "\n"
-      ;;
-    "KDE")
-      printf "KDE"
-      printf "\n"
-      ;;
-    "LXDE")
-      printf "LXDE"
-      printf "\n"
-      ;;
-    "MATE")
-      printf "Mate"
-      printf "\n"
-      ;;
-    "XFCE")
-      printf "XFCE"
-      printf "\n"
-      ;;
-    "X-Cinnamon")
-      printf "Cinnamon"
-      printf "\n"
-      ;;
-    "Unity")
-      printf "Unity"
-      printf "\n"
-      ;;
-  esac
-
-  # Screen Resolution
-  printf $BOLDVERT"Screen resolution : "$NORMAL
-  xdpyinfo | sed -n 's/.*dim.* \([0-9]*x[0-9]*\) .*/\1/pg' | tr '\n' ' '
-  printf "\n"
-
-  # Type of Shell
-  printf $BOLDVERT"Shell : "$NORMAL
-	shellType=$(ps -p $PPID -o cmd --no-heading)
-  shellType=${shellType/-}
-  shellType=${shellType//*\/}
-  printf $shellType"\n"
-}
diff --git a/tools_functions_ub1604.sh b/tools_functions.sh
similarity index 100%
rename from tools_functions_ub1604.sh
rename to tools_functions.sh
diff --git a/tools_functions_ub1804.sh b/tools_functions_ub1804.sh
deleted file mode 100644
index d6f5a76..0000000
--- a/tools_functions_ub1804.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#-----------------------------------------------------------------------------#
-# Yggdrasil NG                                                                #
-#    compatibility : see documentation or man pages                           #
-#    author : Francois B. (Makotosan/Shakasan)                                #
-#    licence : GPLv3                                                          #
-#    website : https://makotonoblog.be/                                       #
-#-----------------------------------------------------------------------------#
-
-#-----------------------------------------------------------------------------#
-#                                                                             #
-# Ubuntu 18.04 / Linux Mint 19                                                #
-#                                                                             #
-#-----------------------------------------------------------------------------#
-
-#-----------------------------------------------------------------------------#
-# tools and config functions                                                  #
-#-----------------------------------------------------------------------------#
-
-#
-# enable ufw at boot time and add rules for installed apps
-#
-function enableUFW () {
-  runCmd "sudo ufw enable"\
-         "enabling UFW at boot"
-
-  if which syncthing >/dev/null; then
-    runCmd "sudo ufw allow syncthing" \
-           "adding UFW rules for Syncthing"
-  fi
-}
-
-#
-# enable numlock by default on LightDM
-#
-function enableNumLockX () {
-  checkAndInstallDep apt numlockx numlockx
-  if which lightdm >/dev/null; then
-    runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \
-           "backing up lightdm original config file"
-    runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \
-           "enabling numlockx on in lightdm at boot"
-  fi
-}
-
-#
-# /tmp in RAM by modifying /etc/fstab
-#TODO: add possibily to choose amount of ram
-function enableTmpRAM () {
-  runCmd "echo 'tmpfs /tmp tmpfs defaults,size=2g 0 0' | sudo tee -a /etc/fstab" \
-         "enabling /tmp in RAM by modifying /etc/fstab"
-  if (whiptail --title "/tmp in RAM - Reboot" --yesno "Reboot required, proceed now ?" 10 60) then
-    sudo reboot
-  fi
-}
-
-#
-# add screenfetch exec in .bashrc
-#
-function addScreenfetchBashrc () {
-  checkAndInstallDep apt screenfetch screenfetch
-  runCmd "touch /home/$myHomedir/.bashrc" \
-         "creating .bashrc file if necessary" \
-  runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \
-         "adding screenfetch to .bashrc"
-}
-
-#
-# cli history cmd timestamp enable
-#
-function enableHistoryTS () {
-  typeset ret_code
-  printf "enabling CLI History TimeStamp "
-  echo "export HISTTIMEFORMAT='%F %T  '" | tee -a /home/$myHomedir/.bashrc &>> $logFile
-  ret_code=$?
-  retCode $ret_code
-}
-
-#
-# install/enable auto install of security updates
-#
-function installUnattendedUpgrades () {
-  installPackage apt unattended-upgrades
-}
-
-#
-# display useful system/hardware informations
-#
-function toolInxi () {
-  checkAndInstallDep apt inxi inxi \
-  && inxi -F
-}
-
-#
-# check bandwith and latency of the internet connection
-#
-function toolSpeedtestCli () {
-  checkAndInstallDep pip speedtest-cli speedtest-cli \
-  && speedtest-cli
-}
-
-#
-# check for packet loss
-#
-function toolPacketLoss () {
-  ping -q -c 10 google.com
-}
-
-#
-# Optimization of SQLite databases of Firefox and Firefox Nightly
-#
-function toolOptimizeFirefox () {
-  if (whiptail --title "Firefox SQLite DB Optimization" --yesno "Terminate Firefox and proceed ?" 10 60) then
-    if which firefox >/dev/null; then
-      printf "Optimizing Firefox"
-      pkill -9 firefox
-      for f in ~/.mozilla/firefox/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done
-      printf "\n"
-    fi
-    if which firefox-trunk >/dev/null; then
-      printf "Optimizing Firefox Nightly"
-      pkill -9 firefox-trunk
-      for f in ~/.mozilla/firefox-trunk/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done
-      printf "\n"
-    fi
-  fi
-}
-
-#
-# remove useless packages (depedencies)
-#
-function toolAutoremove () {
-  runCmd "sudo apt-get -y autoremove" \
-         "removing not necessary dependencies"
-}
-
-#
-# remove old versions of installed kernels
-#
-function toolClearOldKernels () {
-  checkAndInstallDep apt ukuu ukuu \
-  && runCmd "sudo ukuu --purge-old-kernels --yes" \
-            "removing old kernels"
-}
-
-#
-# force soundcards detection
-#
-function toolSoundCardsDetection () {
-  runCmd "sudo alsa force-reload" \
-         "detecting ALSA sound cards"
-}
\ No newline at end of file
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 567ab97..976b536 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -14,24 +14,28 @@ dir=$(dirname $0)
 source /opt/yggdrasil/vars.sh
 
 OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'`
-if [[ $OS == *"Linux Mint 18"* ]]; then
-  source /opt/yggdrasil/core_functions_ub1604.sh
-  source /opt/yggdrasil/repo_functions_ub1604.sh
-  source /opt/yggdrasil/install_functions_ub1604.sh
-  source /opt/yggdrasil/menus_functions_ub1604.sh
-  source /opt/yggdrasil/tools_functions_ub1604.sh
-elif [[ $OS == *"Ubuntu 18.04 LTS"* ]]; then
-  source /opt/yggdrasil/core_functions_ub1804.sh
-  source /opt/yggdrasil/repo_functions_ub1804.sh
-  source /opt/yggdrasil/install_functions_ub1804.sh
-  source /opt/yggdrasil/menus_functions_ub1804.sh
-  source /opt/yggdrasil/tools_functions_ub1804.sh
-else
-  printf "\n"
-  printf $BOLDROUGE"Distribution non supportée/testée"$NORMAL
-  printf "\n\n"
-  exit
-fi
+
+case $OS in
+  *"Ubuntu 18.04 LTS"* | *"Linux Mint 18"*)
+    source /opt/yggdrasil/core_functions_ub1604.sh
+    source /opt/yggdrasil/repo_functions_ub1604.sh
+    source /opt/yggdrasil/install_functions_ub1604.sh
+    source /opt/yggdrasil/menus_functions_ub1604.sh
+    source /opt/yggdrasil/tools_functions_ub1604.sh
+    ;;
+  *"Ubuntu 18.04 LTS"* | *"Linux Mint 19"*)
+    source /opt/yggdrasil/core_functions_ub1804.sh
+    source /opt/yggdrasil/repo_functions_ub1804.sh
+    source /opt/yggdrasil/install_functions_ub1804.sh
+    source /opt/yggdrasil/menus_functions_ub1804.sh
+    source /opt/yggdrasil/tools_functions_ub1804.sh
+    ;;
+  *)
+    printf "\n"
+    printf $BOLDROUGE"Distribution non supportée/testée"$NORMAL
+    printf "\n\n"
+    ;;
+esac
 
 #
 # check if the script is running in root/sudo