diff --git a/lang/en/.config/jgmenu/append.csv b/lang/en/.config/jgmenu/append.csv
index 0cde8a2..570ebdd 100644
--- a/lang/en/.config/jgmenu/append.csv
+++ b/lang/en/.config/jgmenu/append.csv
@@ -8,7 +8,7 @@ Keybindings, ^pipe(jgkeys-pipe),key_bindings
 Screenshot,mb-jgtools screenshot,emblem-photos
 
 ^sep()
-Lock screen,betterlockscreen -l dim -t "Type password to unlock...",system-lock-screen
+Lock screen,mbscreenlocker,system-lock-screen
 
 ^sep()
 Exit...,mb-jgtools mblogout,system-shutdown
diff --git a/lang/en/.config/jgmenu/sub-append.csv b/lang/en/.config/jgmenu/sub-append.csv
index 0cde8a2..570ebdd 100644
--- a/lang/en/.config/jgmenu/sub-append.csv
+++ b/lang/en/.config/jgmenu/sub-append.csv
@@ -8,7 +8,7 @@ Keybindings, ^pipe(jgkeys-pipe),key_bindings
 Screenshot,mb-jgtools screenshot,emblem-photos
 
 ^sep()
-Lock screen,betterlockscreen -l dim -t "Type password to unlock...",system-lock-screen
+Lock screen,mbscreenlocker,system-lock-screen
 
 ^sep()
 Exit...,mb-jgtools mblogout,system-shutdown
diff --git a/lang/en/.config/mabox/mbhelper.csv b/lang/en/.config/mabox/mbhelper.csv
index a03e4a8..8540e43 100644
--- a/lang/en/.config/mabox/mbhelper.csv
+++ b/lang/en/.config/mabox/mbhelper.csv
@@ -11,20 +11,20 @@
 <b><tt>           W-v  </tt></b> <i> Volume control</i>,pavucontrol
 <b><tt>           W-c  </tt></b> <i> toggle Picom</i>,compton_toggle
 <b><tt>         W-A-c  </tt></b> <i> toggle Conky</i>,conky_toggle
-<b><tt>           W-l  </tt></b> <i> ScreenLocker</i>,betterlockscreen -l
+<b><tt>           W-l  </tt></b> <i> ScreenLocker</i>,mbscreenlocker
 <b><tt>           W-x  </tt></b> <i> Logout dialog</i>,mb-jgtools mblogout
 ^sep(Menu/Sidepanels),,,,#menu#sidepanel
 <b><tt>             W  </tt></b> <i> Main menu</i>,mb-jgtools main,,,#menu
 <b><tt>           W-s  </tt></b> <i> Settings Menu</i>,mb-jgtools settings,,,#menu
-<b><tt>      C-W-Left  </tt></b> <i> Left sidepanel</i>,mb-jgtools places,,,#sidepanel
-<b><tt>     C-W-Right  </tt></b> <i> Right sidepanel </i>,mb-jgtools right,,,#sidepanel
+<b><tt>      C-W-Left  </tt></b> <i> Left sidepanel</i>,mb-jgtools places,,,#sidepanel#menu
+<b><tt>     C-W-Right  </tt></b> <i> Right sidepanel </i>,mb-jgtools right,,,#sidepanel#menu
 <b><tt>         W-A-d  </tt></b> <i> Toggle Dock AutoHide (if you use Gkrellm in dock)</i>,xdotool key Super+Alt+d,,,#sidepanel
 
 ^sep(Windows move),,,,#windows#move
 <b><tt>           W-d  </tt></b> <i> Show desktop</i>,show_desktop,,,#windows#move
 <b><tt>      W-Arrows  </tt></b> <i> Half screen</i>,,,,#windows#move
 <b><tt>   F11/W-Enter  </tt></b> <i> Fullscreen</i>,,,,#windows#move
-^sep(DeskGrid),,,,#deskgrid
+^sep(DesktopGrid),,,,#deskgrid
 <b><tt>      C-S-KP_7  </tt></b> <small>[on grid]</small> move/resize window topleft ,snapwin topleft,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_8  </tt></b> <small>[on grid]</small> move/resize window top,snapwin top,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_9  </tt></b> <small>[on grid]</small> move/resize window topright,snapwin topright,,,#deskgrid#windows#move
@@ -34,16 +34,17 @@
 <b><tt>      C-S-KP_1  </tt></b> <small>[on grid]</small> move/resize window bottomleft,snapwin bottomleft,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_2  </tt></b> <small>[on grid]</small> move/resize window bottom,snapwin bottom,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_3  </tt></b> <small>[on grid]</small> move/resize window bottomright,snapwin bottomright,,,#deskgrid#windows#move
-<b><tt>      </tt></b> DeskGrid - show image helper,drawgrid,,,#deskgrid#windows#move
-<b><tt>      </tt></b> Edit <b>DeskGrid</b> config file ,geany ~/.config/deskgrid/deskgrid.cfg,,,#deskgrid#config
+<b><tt>      </tt></b> DesktopGrid - show image helper,drawgrid,,,#deskgrid#windows#move
+<b><tt>      </tt></b> Edit <b>DesktopGrid</b> config file ,geany ~/.config/deskgrid/deskgrid.cfg,,,#deskgrid#config
 ^sep(Helpers)
-<b><tt>         W-A-t  </tt></b> <i> Tile helper</i>,jgtile
-<b><tt>         W-A-h  </tt></b> <i> History helper</i>,jghistory-pipe -s
-<b><tt>         W-A-e  </tt></b> <i> Espanso - text expander</i>,jgespanso-pipe -s
-<b><tt>         W-A-m  </tt></b> <i> Configure Menu/Sidepanels</i>,jgmenusettings-pipe -s
-<b><tt>         W-A-w  </tt></b> <i> Configure Wallpaper and ScreenLocker</i>,jgwallpaperchanger -s
-<b><tt>         W-A-k  </tt></b> <i> Configure Conky</i>,jgconky-pipe -s
-<b><tt>         W-A-p  </tt></b> <i> Configure Tint2 panel</i>,jgtint2-pipe -s
+<b><tt>         W-A-t  </tt></b> <i> Tile helper</i>,jgtile,,,#pipemenu
+<b><tt>         W-A-h  </tt></b> <i> History helper</i>,jghistory-pipe -s,,,#pipemenu
+<b><tt>         W-A-e  </tt></b> <i> Espanso - text expander</i>,jgespanso-pipe -s,,,#pipemenu
+<b><tt>         W-A-m  </tt></b> <i> Configure Menu/Sidepanels</i>,jgmenusettings-pipe -s,,,#pipemenu
+<b><tt>         W-A-w  </tt></b> <i> Configure Wallpaper and ScreenLocker</i>,jgwallpaperchanger -s,,,#pipemenu
+<b><tt>         W-A-k  </tt></b> <i> Configure Conky</i>,jgconky-pipe -s,,,#pipemenu
+<b><tt>         W-A-p  </tt></b> <i> Configure Tint2 panel</i>,jgtint2-pipe -s,,,#pipemenu
+<b><tt>                </tt></b> <i> SSH Connections</i>,jgssh -s,,,#pipemenu
 ^sep(Openbox),,,,#openbox#ob
 <b><tt>      </tt></b> Obconf - Openbox configuration manager,obconf,,,#openbox#ob
 <b><tt>      </tt></b> Edit <b>rc.xml</b> OpenBox config file,geany ~/.config/openbox/rc.xml,,,#openbox#ob
diff --git a/lang/es/.config/jgmenu/append.csv b/lang/es/.config/jgmenu/append.csv
index 6d45524..1082c98 100644
--- a/lang/es/.config/jgmenu/append.csv
+++ b/lang/es/.config/jgmenu/append.csv
@@ -6,7 +6,7 @@ Atajos del teclado, ^pipe(jgkeys-pipe),key_bindings
 Capturar Pantalla,mb-jgtools screenshot,emblem-photos
 
 ^sep()
-Bloquear pantalla,betterlockscreen -l dim,system-lock-screen
+Bloquear pantalla,mbscreenlocker,system-lock-screen
 
 ^sep()
 Salir...,mb-jgtools mblogout,system-shutdown
diff --git a/lang/es/.config/jgmenu/sub-append.csv b/lang/es/.config/jgmenu/sub-append.csv
index 6d45524..1082c98 100644
--- a/lang/es/.config/jgmenu/sub-append.csv
+++ b/lang/es/.config/jgmenu/sub-append.csv
@@ -6,7 +6,7 @@ Atajos del teclado, ^pipe(jgkeys-pipe),key_bindings
 Capturar Pantalla,mb-jgtools screenshot,emblem-photos
 
 ^sep()
-Bloquear pantalla,betterlockscreen -l dim,system-lock-screen
+Bloquear pantalla,mbscreenlocker,system-lock-screen
 
 ^sep()
 Salir...,mb-jgtools mblogout,system-shutdown
diff --git a/lang/pl/.config/jgmenu/append.csv b/lang/pl/.config/jgmenu/append.csv
index 1aa340b..1a636df 100644
--- a/lang/pl/.config/jgmenu/append.csv
+++ b/lang/pl/.config/jgmenu/append.csv
@@ -9,7 +9,7 @@ Skróty klawiszowe, ^pipe(jgkeys-pipe),key_bindings
 Zrzut ekranu,mb-jgtools screenshot,emblem-photos
 ^sep()
 
-Zablokuj ekran,betterlockscreen -l dim,system-lock-screen
+Zablokuj ekran,mbscreenlocker,system-lock-screen
 
 ^sep()
 Wyjście...,mb-jgtools mblogout,system-shutdown
diff --git a/lang/pl/.config/jgmenu/sub-append.csv b/lang/pl/.config/jgmenu/sub-append.csv
index 1aa340b..1a636df 100644
--- a/lang/pl/.config/jgmenu/sub-append.csv
+++ b/lang/pl/.config/jgmenu/sub-append.csv
@@ -9,7 +9,7 @@ Skróty klawiszowe, ^pipe(jgkeys-pipe),key_bindings
 Zrzut ekranu,mb-jgtools screenshot,emblem-photos
 ^sep()
 
-Zablokuj ekran,betterlockscreen -l dim,system-lock-screen
+Zablokuj ekran,mbscreenlocker,system-lock-screen
 
 ^sep()
 Wyjście...,mb-jgtools mblogout,system-shutdown
diff --git a/lang/pl/.config/mabox/mbhelper.csv b/lang/pl/.config/mabox/mbhelper.csv
index a03e4a8..8540e43 100644
--- a/lang/pl/.config/mabox/mbhelper.csv
+++ b/lang/pl/.config/mabox/mbhelper.csv
@@ -11,20 +11,20 @@
 <b><tt>           W-v  </tt></b> <i> Volume control</i>,pavucontrol
 <b><tt>           W-c  </tt></b> <i> toggle Picom</i>,compton_toggle
 <b><tt>         W-A-c  </tt></b> <i> toggle Conky</i>,conky_toggle
-<b><tt>           W-l  </tt></b> <i> ScreenLocker</i>,betterlockscreen -l
+<b><tt>           W-l  </tt></b> <i> ScreenLocker</i>,mbscreenlocker
 <b><tt>           W-x  </tt></b> <i> Logout dialog</i>,mb-jgtools mblogout
 ^sep(Menu/Sidepanels),,,,#menu#sidepanel
 <b><tt>             W  </tt></b> <i> Main menu</i>,mb-jgtools main,,,#menu
 <b><tt>           W-s  </tt></b> <i> Settings Menu</i>,mb-jgtools settings,,,#menu
-<b><tt>      C-W-Left  </tt></b> <i> Left sidepanel</i>,mb-jgtools places,,,#sidepanel
-<b><tt>     C-W-Right  </tt></b> <i> Right sidepanel </i>,mb-jgtools right,,,#sidepanel
+<b><tt>      C-W-Left  </tt></b> <i> Left sidepanel</i>,mb-jgtools places,,,#sidepanel#menu
+<b><tt>     C-W-Right  </tt></b> <i> Right sidepanel </i>,mb-jgtools right,,,#sidepanel#menu
 <b><tt>         W-A-d  </tt></b> <i> Toggle Dock AutoHide (if you use Gkrellm in dock)</i>,xdotool key Super+Alt+d,,,#sidepanel
 
 ^sep(Windows move),,,,#windows#move
 <b><tt>           W-d  </tt></b> <i> Show desktop</i>,show_desktop,,,#windows#move
 <b><tt>      W-Arrows  </tt></b> <i> Half screen</i>,,,,#windows#move
 <b><tt>   F11/W-Enter  </tt></b> <i> Fullscreen</i>,,,,#windows#move
-^sep(DeskGrid),,,,#deskgrid
+^sep(DesktopGrid),,,,#deskgrid
 <b><tt>      C-S-KP_7  </tt></b> <small>[on grid]</small> move/resize window topleft ,snapwin topleft,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_8  </tt></b> <small>[on grid]</small> move/resize window top,snapwin top,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_9  </tt></b> <small>[on grid]</small> move/resize window topright,snapwin topright,,,#deskgrid#windows#move
@@ -34,16 +34,17 @@
 <b><tt>      C-S-KP_1  </tt></b> <small>[on grid]</small> move/resize window bottomleft,snapwin bottomleft,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_2  </tt></b> <small>[on grid]</small> move/resize window bottom,snapwin bottom,,,#deskgrid#windows#move
 <b><tt>      C-S-KP_3  </tt></b> <small>[on grid]</small> move/resize window bottomright,snapwin bottomright,,,#deskgrid#windows#move
-<b><tt>      </tt></b> DeskGrid - show image helper,drawgrid,,,#deskgrid#windows#move
-<b><tt>      </tt></b> Edit <b>DeskGrid</b> config file ,geany ~/.config/deskgrid/deskgrid.cfg,,,#deskgrid#config
+<b><tt>      </tt></b> DesktopGrid - show image helper,drawgrid,,,#deskgrid#windows#move
+<b><tt>      </tt></b> Edit <b>DesktopGrid</b> config file ,geany ~/.config/deskgrid/deskgrid.cfg,,,#deskgrid#config
 ^sep(Helpers)
-<b><tt>         W-A-t  </tt></b> <i> Tile helper</i>,jgtile
-<b><tt>         W-A-h  </tt></b> <i> History helper</i>,jghistory-pipe -s
-<b><tt>         W-A-e  </tt></b> <i> Espanso - text expander</i>,jgespanso-pipe -s
-<b><tt>         W-A-m  </tt></b> <i> Configure Menu/Sidepanels</i>,jgmenusettings-pipe -s
-<b><tt>         W-A-w  </tt></b> <i> Configure Wallpaper and ScreenLocker</i>,jgwallpaperchanger -s
-<b><tt>         W-A-k  </tt></b> <i> Configure Conky</i>,jgconky-pipe -s
-<b><tt>         W-A-p  </tt></b> <i> Configure Tint2 panel</i>,jgtint2-pipe -s
+<b><tt>         W-A-t  </tt></b> <i> Tile helper</i>,jgtile,,,#pipemenu
+<b><tt>         W-A-h  </tt></b> <i> History helper</i>,jghistory-pipe -s,,,#pipemenu
+<b><tt>         W-A-e  </tt></b> <i> Espanso - text expander</i>,jgespanso-pipe -s,,,#pipemenu
+<b><tt>         W-A-m  </tt></b> <i> Configure Menu/Sidepanels</i>,jgmenusettings-pipe -s,,,#pipemenu
+<b><tt>         W-A-w  </tt></b> <i> Configure Wallpaper and ScreenLocker</i>,jgwallpaperchanger -s,,,#pipemenu
+<b><tt>         W-A-k  </tt></b> <i> Configure Conky</i>,jgconky-pipe -s,,,#pipemenu
+<b><tt>         W-A-p  </tt></b> <i> Configure Tint2 panel</i>,jgtint2-pipe -s,,,#pipemenu
+<b><tt>                </tt></b> <i> SSH Connections</i>,jgssh -s,,,#pipemenu
 ^sep(Openbox),,,,#openbox#ob
 <b><tt>      </tt></b> Obconf - Openbox configuration manager,obconf,,,#openbox#ob
 <b><tt>      </tt></b> Edit <b>rc.xml</b> OpenBox config file,geany ~/.config/openbox/rc.xml,,,#openbox#ob