diff --git a/.config/awesome/mymainmenu.lua b/.config/awesome/mymainmenu.lua
index f7fdc628..de7b1681 100644
--- a/.config/awesome/mymainmenu.lua
+++ b/.config/awesome/mymainmenu.lua
@@ -27,7 +27,6 @@ dbmenu = {
 developmentmenu = {
     { "anjuta", "/usr/bin/anjuta", "/usr/share/icons/hicolor/48x48/apps/anjuta.png" },
     { "bluegriffon", "/usr/bin/bluegriffon", "/usr/share/icons/hicolor/48x48/apps/bluegriffon.png" },
-    { "code", "/usr/bin/code", "/usr/share/pixmaps/code-oss.png" },
     { "codeblocks", "/usr/bin/codeblocks", "/usr/share/icons/matefaenza/apps/48/codeblocks.png" },
     { "ddd", "/usr/bin/ddd", "/usr/share/pixmaps/ddd.xpm" },
     { "fluid", "/usr/bin/fluid", "/usr/share/icons/hicolor/48x48/apps/fluid.png" },
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 39b2dc83..fcf922a3 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -295,9 +295,11 @@ globalkeys = gears.table.join(
                                           end),
     
     -- Disable xautolock (win+alt#y)
-    awful.key({ modkey, "Mod1"    }, "y", function() awful.util.spawn("/usr/bin/killall xautolock") end),
+    --awful.key({ modkey, "Mod1"    }, "y", function() awful.util.spawn("/usr/bin/killall xautolock") end),
+    awful.key({ modkey, "Mod1"    }, "y", function() awful.util.spawn("/usr/bin/xscreensaver-command -exit") end),
     -- Enable xautolock (win+alt#x)
-    awful.key({ modkey, "Mod1"    }, "x", function() awful.util.spawn("/usr/bin/xautolock -locker slock -time 5") end),
+    --awful.key({ modkey, "Mod1"    }, "x", function() awful.util.spawn("/usr/bin/xautolock -locker slock -time 5") end),
+    awful.key({ modkey, "Mod1"    }, "x", function() awful.util.spawn("/usr/bin/xscreensaver") end),
 
     -- Some Application shortcuts
     awful.key({ modkey            }, "e", function() awful.util.spawn("/usr/bin/emulationstation") end),