diff --git a/bin/mb-jgtools b/bin/mb-jgtools
index 335d37a..9b522e3 100755
--- a/bin/mb-jgtools
+++ b/bin/mb-jgtools
@@ -510,7 +510,8 @@ case $LANG in
         DESKMNGR="Desktop Session Manager"
         DESKTOPS="Pulpity i Okna"
         DESKGRID="DesktopGrid"
-        WALLCHANGER="Tapeta i Blokada Ekranu"
+        WALLCHANGER="Tapeta"
+        LOCKSCREEN="Blokada Ekranu"
         MBHELPER="Paleta komend <b>W-F1</b>"
         ;;
     es*)
@@ -528,7 +529,8 @@ case $LANG in
         DESKMNGR="Desktop Session Manager"
         DESKTOPS="Desktops and Windows"
         DESKGRID="Desktop Grid"
-        WALLCHANGER="Wallpaper and ScreenLocker"
+        WALLCHANGER="Wallpaper"
+        LOCKSCREEN="Screen Locker"
         MBHELPER="Cmd palette (search and run) <b>W-F1</b>"
         ;;
     *)
@@ -546,7 +548,8 @@ case $LANG in
         DESKMNGR="Desktop Session Manager"
         DESKTOPS="Desktops and Windows"
         DESKGRID="DesktopGrid"
-        WALLCHANGER="Wallpaper and ScreenLocker"
+        WALLCHANGER="Wallpaper"
+        LOCKSCREEN="Screen Locker"
         MBHELPER="Cmd palette (search and run) <b>W-F1</b>"
       ;;
 esac
@@ -609,6 +612,7 @@ fi
 [[ $places_jgdesktops == true || -z ${places_jgdesktops} ]] && jgdesktops="<big></big> $DESKTOPS,^pipe(jgdesktops -r)" && pipesep="^sep($PIPEMENUS)"
 [[ $places_jgdeskgrid == true || -z ${places_jgdeskgrid} ]] && jgdeskgrid="<big></big> $DESKGRID,^pipe(jgdeskgrid -r)" && pipesep="^sep($PIPEMENUS)"
 [[ $places_jgwallpaperchanger == true || -z ${places_jgwallpaperchanger} ]] && jgwallpaperchanger="<big></big> $WALLCHANGER,^pipe(jgwallpaperchanger -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_jglockscreen == true || -z ${places_jglockscreen} ]] && jglockscreen="<big></big> $LOCKSCREEN,^pipe(jglockscreen -r)" && pipesep="^sep($PIPEMENUS)"
 
 # VBOXES
 [[ $places_vboxes == true ]] && vboxes=". $HOME/.config/mabox/vboxes.csv" || vboxes=""
@@ -631,6 +635,7 @@ $pipesep
 <big></big> $MBHELPER,mbhelper -s
 $menusettingspipe
 $jgwallpaperchanger
+$jglockscreen
 $jgdesktops
 $jgdeskmngr
 $jgdeskgrid
diff --git a/mb-jgtools/userguide.csv b/mb-jgtools/userguide.csv
index b691e67..c8826aa 100644
--- a/mb-jgtools/userguide.csv
+++ b/mb-jgtools/userguide.csv
@@ -1,15 +1,11 @@
 ^sep(Mabox User Guide)
-Table of contents,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/,distributor-logo-mabox
-1. First run,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/first-run/,distributor-logo-mabox
-2. Introduction to Mabox Linux Desktop,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/introduction-to-mabox-linux-desktop/,distributor-logo-mabox
-3. Software Management,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/software-management/,distributor-logo-mabox
-4. Keyboard shortcuts,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/keyboard-shortcuts-windows-pseudo-tiling/,distributor-logo-mabox
-5. Default/Preferred Apllications,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/default-preferred-apllications/,distributor-logo-mabox
-6. PCManFM - file manager,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/file-manager-pcmanfm/,distributor-logo-mabox
-7. Terminator - terminal emulator,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/terminal-emulator-terminator/,distributor-logo-mabox
-8. Mabox Control Center,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/mabox-control-center/,distributor-logo-mabox
-9. Theme Manager,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/theme-manager/,distributor-logo-mabox
+1. Introduction to Mabox Linux Desktop,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/getting-started/intro-desktop/,distributor-logo-mabox
+2. Software Management,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/getting-started/software-management/,distributor-logo-mabox
+3. Keyboard shortcuts,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/getting-started/keyboard-shortcuts/,distributor-logo-mabox
+4. Default/Preferred Apllications,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/apps/preferred-apps/,distributor-logo-mabox
+5. PCManFM - file manager,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/apps/pcmanfm/,distributor-logo-mabox
+6. Terminator - terminal emulator,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/apps/terminator/,distributor-logo-mabox
+7. Mabox Control Center,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/configuration/mcc/,distributor-logo-mabox
+8. Theme Manager,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/configuration/theme-manager/,distributor-logo-mabox
 ^sep(More...)
-"""Rolling-release, kernels and stability""",exo-open --launch WebBrowser https://maboxlinux.org/users-guide/kernels-and-stability/,distributor-logo-mabox
-Autostart,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/autostart/,distributor-logo-mabox
-Yay helper,exo-open --launch WebBrowser https://maboxlinux.org/users-guide/yay-helper/,distributor-logo-mabox
+Autostart,exo-open --launch WebBrowser https://manual.maboxlinux.org/mabox-doc-en/configuration/autostart/,distributor-logo-mabox