diff --git a/core_functions.sh b/core_functions.sh
index dbce40d..771d26b 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -419,6 +419,9 @@ function checkAndInstallDep () {
       "snap")
         installPackage snap $2
         ;;
+      "flatpak")
+        installPackage flatpak $2
+        ;;
     esac
   fi
 }
@@ -617,6 +620,7 @@ function usage () {
   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"-k"$NORMAL" : install HWE (Ubuntu's Hardware Enablement Stack)(newer kernel+xorg)\n"
+  printf " "$BOLDVERT"-g"$NORMAL" : install/unlock SNAP + Store (not recommanded ;-))\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"
diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index 6a63cfc..d43dfac 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -336,6 +336,7 @@ function showAppInstallMenu () {
     "pidgin" "Pidgin plugins" \
     "nitrogen" "Nitrogen WP Manager" \
     "wine" "Wine Builds" \
+    "snap" "Unlock/Install SNAP + Store" \
     "viber" "Viber IM desktop app" \
     "slack" "Slack App" \
     "appimagelauncher" "AppImage Launcher" \
@@ -397,6 +398,9 @@ function showAppInstallMenu () {
       "wine")
         installAppsFromListMenu wine
         ;;
+      "snap")
+        installAppsFromListMenu snap
+        ;;
       "viber")
         installViberMenu
         ;;
diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh
index 9a7c081..4f0524d 100644
--- a/menus_functions_ub2004.sh
+++ b/menus_functions_ub2004.sh
@@ -336,6 +336,7 @@ function showAppInstallMenu () {
     "pidgin" "Pidgin plugins" \
     "nitrogen" "Nitrogen WP Manager" \
     "wine" "Wine Builds" \
+    "snap" "Unlock/Install SNAP + Store" \
     "viber" "Viber IM desktop app" \
     "slack" "Slack App" \
     "appimagelauncher" "AppImage Launcher" \
@@ -397,6 +398,9 @@ function showAppInstallMenu () {
       "wine")
         installAppsFromListMenu wine
         ;;
+      "snap")
+        installAppsFromListMenu snap
+        ;;
       "viber")
         installViberMenu
         ;;
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index d12a67c..139c8f5 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -20,9 +20,10 @@
 # List of packages available
 # fields : package name, package manager, category, unique ID for external functions
 #
-Apps="apt-transport-https;apt;init;apt-transport-https
+Apps="snapd;apt;snap;snapd
+snap-store;snap;snap;snap-store
+apt-transport-https;apt;init;apt-transport-https
 flatpak;apt;init;flatpak
-snapd;apt;init;snapd
 ubuntu-make;apt;init;ubuntu-make
 gcc-8 g++-8;apt;init;gcc8
 ruby-dev;apt;init;ruby-dev
@@ -106,6 +107,7 @@ org.entangle_photo.Manager;flatpak;multimedia;entangle
 krita;apt;multimedia;krita
 soundconverter;apt;multimedia;soundconverter
 gimp;apt;multimedia;gimp
+gimp-help-fr;apt;multimedia;gimp
 vidcutter;apt;multimedia;vidcutter
 green-recorder;apt;multimedia;green-recorder
 radiotray;apt;multimedia;radiotray
@@ -366,8 +368,6 @@ codeblocks;apt;codeblocks;codeblocks
 codeblocks-contrib;apt;codeblocks;codeblocks-contrib
 geany;apt;geany;geany
 geany-plugins;apt;geany;geany-plugins
-pycharm-community;snap;pycharm-community;pycharm-community
-pycharm-professional;snap;pycharm-professional;pycharm-professional
 sublime-text;apt;sublime-text;sublime-text
 kicad;apt;cad;kicad
 kicad-locale-fr;apt;cad;kicad-locale-fr
@@ -395,7 +395,6 @@ qttools5-doc-html;apt;qt;qttools5-doc-html
 fbreader;apt;ebook;fbreader
 calibre;apt;ebook;calibre
 android-studio;apt;androidstudio;androidstudio
-intellij-idea-community;snap;idea;idea
 com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
 xserver-xorg-hwe-18.04;apt;hwe;xserver-xorg-hwe-18.04
 xserver-xorg-video-all-hwe-18.04;apt;hwe;xserver-xorg-video-all-hwe-18.04
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index 8454ed6..61893e1 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -20,9 +20,10 @@
 # List of packages available
 # fields : package name, package manager, category, unique ID for external functions
 #
-Apps="apt-transport-https;apt;init;apt-transport-https
+Apps="snapd;apt;snap;snapd
+snap-store;snap;snap;snap-store
+apt-transport-https;apt;init;apt-transport-https
 flatpak;apt;init;flatpak
-snapd;apt;init;snapd
 ubuntu-make;apt;init;ubuntu-make
 ruby-dev;apt;init;ruby-dev
 nodejs;apt;init;nodejslts
@@ -96,6 +97,7 @@ org.entangle_photo.Manager;flatpak;multimedia;entangle
 krita;apt;multimedia;krita
 soundconverter;apt;multimedia;soundconverter
 gimp;apt;multimedia;gimp
+gimp-help-fr;apt;multimedia;gimp
 quodlibet;apt;multimedia;quodlibet
 peek;apt;multimedia;peek
 bino;apt;multimedia;bino
@@ -340,8 +342,6 @@ codeblocks-contrib;apt;codeblocks;codeblocks-contrib
 geany;apt;geany;geany
 geany-plugins;apt;geany;geany-plugins
 io.brackets.Brackets;flatpak;brackets;brackets
-pycharm-community;snap;pycharm-community;pycharm-community
-pycharm-professional;snap;pycharm-professional;pycharm-professional
 sublime-text;apt;sublime-text;sublime-text
 kicad;apt;cad;kicad
 librecad;apt;cad;librecad
@@ -365,7 +365,6 @@ qttools5-doc-html;apt;qt;qttools5-doc-html
 fbreader;apt;ebook;fbreader
 calibre;apt;ebook;calibre
 android-studio;apt;androidstudio;androidstudio
-intellij-idea-community;snap;idea;idea
 com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
 linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04"
 
diff --git a/vars.sh b/vars.sh
index 06a26f5..13f88f3 100644
--- a/vars.sh
+++ b/vars.sh
@@ -13,7 +13,7 @@
 #
 # app version number
 #
-version="0.6.0-b9"
+version="0.6.1-b1"
 
 #
 # myHomedir is used in full paths to the homedir
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 2375f90..563311d 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -67,7 +67,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
 #
 # arguments/options management with getopts
 
-while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do
+while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,k,p" option; do
   case "$option" in
     a) # install all apps
       if [ $ygginitCount = false ]; then
@@ -238,6 +238,17 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do
       msg "Installing HWE (newer kernel+xorg)"
       installAppsFromList hwe
       ;;
+    g) # Unlock+Install SNAP + Store
+      if [ $ygginitCount = false ]; then
+        msg "Initializing"
+        yggInit
+        msg "Updating the system"
+        updateSystem
+        ygginitCount=true
+      fi
+      msg "Unlock/Install SNAP + Store"
+      installAppsFromList snap
+      ;;
     u)
       msg "Initializing"
       yggInit