diff --git a/core_functions.sh b/core_functions.sh
index f67b564..c385550 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -175,6 +175,8 @@ function yggInit () {
   else
     printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
     printf "[INIT]"
+    installPackage apt "python3-distutils"
+    printf "[INIT]"
     installPackage pip "pip"
     printf "[INIT]"
     installPackage pip "setuptools"
@@ -280,17 +282,21 @@ function addKey () {
 #
 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
+  if [ ! -f /etc/apt/sources.list.d/$1 ]; then
+    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
+  else
+    printf "[REPO] already added [ "$BOLDVERT"OK"$NORMAL" ]  "
   fi
 }
 
@@ -461,7 +467,7 @@ function installAppsFromList () {
   for i in $Apps; do
     app=(${i//;/ })
     if [ "${app[2]}" == "$1" ]; then
-      processAppTrtFct ${app[3]} post
+      processAppTrtFct ${app[3]} pre
       installPackage ${app[1]} ${app[0]}
       processAppTrtFct ${app[3]} post
     fi
diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh
index 08866e5..97a2fda 100644
--- a/repo_functions_ub1604.sh
+++ b/repo_functions_ub1604.sh
@@ -133,7 +133,6 @@ corebird;apt;internet;corebird
 telegram;apt;internet;telegram
 skypeforlinux;apt;internet;skypeforlinux
 nextcloud-client;apt;internet;nextcloud-client
-nextcloud-client-caja;apt;internet;nextcloud-client-caja
 deluge-gtk;apt;internet;deluge-gtk
 deluge-torrent;apt;internet;deluge-torrent
 vivaldi-stable;apt;internet;vivaldi-stable
@@ -224,6 +223,7 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper
 caja-sendto;apt;cajaplugins;caka-sendto
 caja-image-converter;apt;cajaplugins;caja-image-converter
 insync-caja;apt;cajaplugins;insync-caja
+nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja
 nautilus;apt;nautilus;nautilus
 file-roller;apt;nautilus;file-roller
 nautilus-terminal;apt;nautilus;nautilus-terminal
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index b6d4cb8..7c3854b 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -93,7 +93,6 @@ entangle;apt;multimedia;entangle
 krita;apt;multimedia;krita
 soundconverter;apt;multimedia;soundconverter
 gimp;apt;multimedia;gimp
-gcolor2;apt;multimedia;gcolor2
 vidcutter;apt;multimedia;vidcutter
 green-recorder;apt;multimedia;green-recorder
 radiotray;apt;multimedia;radiotray
@@ -120,7 +119,6 @@ corebird;apt;internet;corebird
 telegram;apt;internet;telegram
 skypeforlinux;apt;internet;skypeforlinux
 nextcloud-client;apt;internet;nextcloud-client
-nextcloud-client-caja;apt;internet;nextcloud-client-caja
 deluge-gtk;apt;internet;deluge-gtk
 deluge-torrent;apt;internet;deluge-torrent
 vivaldi-stable;apt;internet;vivaldi-stable
@@ -204,6 +202,7 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper
 caja-sendto;apt;cajaplugins;caka-sendto
 caja-image-converter;apt;cajaplugins;caja-image-converter
 insync-caja;apt;cajaplugins;insync-caja
+nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja
 nautilus;apt;nautilus;nautilus
 file-roller;apt;nautilus;file-roller
 nautilus-emblems;apt;nautilus;nautilus-emblems
@@ -219,7 +218,6 @@ nautilus-ideviceinfo;apt;nautilus;nautilus-ideviceinfo
 ooo-thumbnailer;apt;nautilus;ooo-thumbnailer
 nautilus-dropbox;apt;nautilus;nautilus-dropbox
 nautilus-script-manager;apt;nautilus;nautilus-script-manager
-nautilus-columns;apt;nautilus;nautilus-columns
 insync-nautilus;apt;nautilus;insync-nautilus
 gtkam-gimp;apt;gimp;gtkam-gimp
 gimp-gluas;apt;gimp;gimp-gluas
@@ -262,7 +260,6 @@ purple-facebook;apt;pidgin;purple-facebook
 unbound;apt;unbound;unbound
 arc-theme;apt;gtkthemes;arc-theme
 numix-gtk-theme;apt;gtkthemes;numix-gtk-theme
-arc-icons;apt;icons;arc-icons
 faenza-icon-theme;apt;icons;faenza-icon-theme
 numix-icon-theme;apt;icons;numix-icon-theme
 numix-icon-theme-circle;apt;icons;numix-icon-theme-circle
diff --git a/tools_functions.sh b/tools_functions.sh
index a399e7c..3c93c3a 100644
--- a/tools_functions.sh
+++ b/tools_functions.sh
@@ -65,7 +65,7 @@ function addScreenfetchBashrc () {
 #
 function enableHistoryTS () {
   typeset ret_code
-  printf "enabling CLI History TimeStamp "
+  printf "[CMD] enabling CLI History TimeStamp "
   echo "export HISTTIMEFORMAT='%F %T  '" | tee -a /home/$myHomedir/.bashrc &>> $logFile
   ret_code=$?
   retCode $ret_code
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 19fa66b..6933a49 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -102,7 +102,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do
       installFranz
       installTeamViewer13
       installXnViewMP
-      toolAutoremove
       ;;
     f) # full install
       if [ "$ygginitCount" -eq "0" ]; then
@@ -149,7 +148,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do
       installFranz
       installTeamViewer13
       installXnViewMP
-      toolAutoremove
       ;;
     c) # install themes and icons
       if [ "$ygginitCount" -eq "0" ]; then