diff --git a/common/autostart b/common/autostart
index 33223b4..f273ffc 100755
--- a/common/autostart
+++ b/common/autostart
@@ -39,8 +39,6 @@ xcape -e 'Super_L=Super_L|space'
 ## Optionally disable touchpad
 #/usr/bin/synclient TouchpadOff=1 &
 
-## Betterlockscreen setup
-betterlockscreen_setup &
 
 ## Mabox scripts - DO NOT DISABLE 
 (sleep 1s && mabox-obstart startopenbox) &
diff --git a/common/rc.xml b/common/rc.xml
index 485e976..35cf950 100644
--- a/common/rc.xml
+++ b/common/rc.xml
@@ -381,7 +381,7 @@
     </keybind>
     <keybind key="W-l">
       <action name="Execute">
-        <command>betterlockscreen -l dim</command>
+        <command>mbscreenlocker</command>
       </action>
     </keybind>
     <keybind key="Print">
@@ -447,6 +447,16 @@
         <command>jghistory-pipe -s</command>
       </action>
     </keybind>
+    <keybind key="W-A-w">
+      <action name="Execute">
+        <command>jgwallpaperchanger -s</command>
+      </action>
+    </keybind>
+    <keybind key="W-A-m">
+      <action name="Execute">
+        <command>jgmenusettings-pipe -s</command>
+      </action>
+    </keybind>
     <keybind key="W-A-t">
       <action name="Execute">
         <command>jgtile</command>
diff --git a/lang/en/.config/mabox/mbhelper.csv b/lang/en/.config/mabox/mbhelper.csv
index 44fae6a..a568d31 100644
--- a/lang/en/.config/mabox/mbhelper.csv
+++ b/lang/en/.config/mabox/mbhelper.csv
@@ -37,6 +37,8 @@
 <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-w  </tt></b> <i> Configure Wallpaper and ScreenLocker</i>,jgwallpaperchanger -s
+<b><tt>         W-A-m  </tt></b> <i> Configure Menu/Sidepanels</i>,jgmenusettings-pipe -s
 ^sep(Openbox),,,,#openbox#ob
 <b><tt>      </tt></b> Obconf,obconf,,,#openbox#ob
 <b><tt>      </tt></b> Edit <b>rc.xml</b> OpenBox config file,geany ~/.config/openbox/rc.xml,,,#openbox#ob
@@ -47,7 +49,7 @@
 <b><tt>      </tt></b> Edit <b>Autostart</b> config file,geany ~/.config/openbox/autostart,,,#autostart#config#openbox#ob
 
 ^sep(Wallpaper),,,,#wallpapers
-<b><tt>      </tt></b> Set random wallpaper,chwp -o,,,#wallpaper
-<b><tt>      </tt></b> Run wallpaper slideshow,chwp,,,#wallpaper
-<b><tt>      </tt></b> Choose Wallpaper...,chwp -c,,,#wallpaper
-<b><tt>      </tt></b>
+<b><tt>      </tt></b> Set random wallpaper,mbwallpaper -o,,,#wallpaper
+<b><tt>      </tt></b> Run wallpaper slideshow,run_wallpaperslideshow,,,#wallpaper
+<b><tt>      </tt></b> Choose Wallpaper...,mbwallpaper -c,,,#wallpaper
+
diff --git a/lang/pl/.config/mabox/mbhelper.csv b/lang/pl/.config/mabox/mbhelper.csv
index 44fae6a..a568d31 100644
--- a/lang/pl/.config/mabox/mbhelper.csv
+++ b/lang/pl/.config/mabox/mbhelper.csv
@@ -37,6 +37,8 @@
 <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-w  </tt></b> <i> Configure Wallpaper and ScreenLocker</i>,jgwallpaperchanger -s
+<b><tt>         W-A-m  </tt></b> <i> Configure Menu/Sidepanels</i>,jgmenusettings-pipe -s
 ^sep(Openbox),,,,#openbox#ob
 <b><tt>      </tt></b> Obconf,obconf,,,#openbox#ob
 <b><tt>      </tt></b> Edit <b>rc.xml</b> OpenBox config file,geany ~/.config/openbox/rc.xml,,,#openbox#ob
@@ -47,7 +49,7 @@
 <b><tt>      </tt></b> Edit <b>Autostart</b> config file,geany ~/.config/openbox/autostart,,,#autostart#config#openbox#ob
 
 ^sep(Wallpaper),,,,#wallpapers
-<b><tt>      </tt></b> Set random wallpaper,chwp -o,,,#wallpaper
-<b><tt>      </tt></b> Run wallpaper slideshow,chwp,,,#wallpaper
-<b><tt>      </tt></b> Choose Wallpaper...,chwp -c,,,#wallpaper
-<b><tt>      </tt></b>
+<b><tt>      </tt></b> Set random wallpaper,mbwallpaper -o,,,#wallpaper
+<b><tt>      </tt></b> Run wallpaper slideshow,run_wallpaperslideshow,,,#wallpaper
+<b><tt>      </tt></b> Choose Wallpaper...,mbwallpaper -c,,,#wallpaper
+