diff --git a/awesome/awesome.configdir/rc.lua b/awesome/awesome.configdir/rc.lua
index 12070b0..348d51a 100644
--- a/awesome/awesome.configdir/rc.lua
+++ b/awesome/awesome.configdir/rc.lua
@@ -3,38 +3,46 @@ local gears = require("gears")
 local awful = require("awful")
 awful.rules = require("awful.rules")
 require("awful.autofocus")
+
 -- Widget and layout library
 local wibox = require("wibox")
+
 -- Theme handling library
 local beautiful = require("beautiful")
+
 -- Notification library
 local naughty = require("naughty")
 local menubar = require("menubar")
 
- require('freedesktop.utils')
-  require('freedesktop.menu')
-  -- require("debian.menu")
+-- Freedesktop utilities
+local freedesktoputils = require('freedesktop.utils')
+local freedesktopmenu = require('freedesktop.menu')
 
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
-    naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
+    naughty.notify({ 
+        preset = naughty.config.presets.critical,
+        title = "Oops, there were errors during startup!",
+        text = awesome.startup_errors 
+    })
 end
 
 -- Handle runtime errors after startup
 do
-    local in_error = false
-    awesome.connect_signal("debug::error", function (err)
+local in_error = false
+awesome.connect_signal("debug::error", 
+    function (err)
         -- Make sure we don't go into an endless error loop
         if in_error then return end
         in_error = true
 
-        naughty.notify({ preset = naughty.config.presets.critical,
-                         title = "Oops, an error happened!",
-                         text = err })
+        naughty.notify({ 
+            preset = naughty.config.presets.critical,
+            title = "Oops, an error happened!",
+            text = err 
+        })
         in_error = false
     end)
 end
@@ -49,8 +57,10 @@ terminal = "terminology"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 
-  freedesktop.utils.terminal = terminal  -- default: "xterm"
-  freedesktop.utils.icon_theme = 'gnome' -- look inside /usr/share/icons/, default: nil (don't use icon theme)
+-- For freedesktop menu
+freedesktop.utils.terminal = terminal  -- default: "xterm"
+freedesktop.utils.icon_theme = 'gnome' -- look inside /usr/share/icons/, default: nil (don't use icon theme)
+freedesktop.utils.app_folders = { "/usr/share/applications/", "~/.local/share/applications/" }
 
 -- Default modkey.
 -- Usually, Mod4 is the key with a logo between Control and Alt.
@@ -97,25 +107,23 @@ end
 -- {{{ Menu
 -- Create a laucher widget and a main menu
 myawesomemenu = {
-   { "manual", terminal .. " -e man awesome" },
-   { "edit config", editor_cmd .. " " .. awesome.conffile },
-   { "restart", awesome.restart },
-   { "quit", awesome.quit }
+    { "manual", terminal .. " -e man awesome" },
+    { "edit config", editor_cmd .. " " .. awesome.conffile },
+    { "restart", awesome.restart },
+    { "quit", awesome.quit }
 }
 
+-- Add freedesktop menu 
 menu_items = freedesktop.menu.new()
 table.insert(menu_items, { "awesome", myawesomemenu, beautiful.awesome_icon })
 table.insert(menu_items, { "open terminal", terminal })
 
 mymainmenu = awful.menu({ items = menu_items })
 
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
-                                     menu = mymainmenu })
-
--- Menubar configuration
-menubar.utils.terminal = terminal -- Set the terminal for applications that require it
-menubar.app_folders = { "/usr/share/applications/", "~/.local/share/applications/" }
-
+mylauncher = awful.widget.launcher({ 
+    image = beautiful.awesome_icon,
+    menu = mymainmenu 
+})
 
 -- }}}
 
@@ -129,47 +137,48 @@ mypromptbox = {}
 mylayoutbox = {}
 mytaglist = {}
 mytaglist.buttons = awful.util.table.join(
-                    awful.button({ }, 1, awful.tag.viewonly),
-                    awful.button({ modkey }, 1, awful.client.movetotag),
-                    awful.button({ }, 3, awful.tag.viewtoggle),
-                    awful.button({ modkey }, 3, awful.client.toggletag),
-                    awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
-                    awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
-                    )
+    awful.button({ }, 1, awful.tag.viewonly),
+    awful.button({ modkey }, 1, awful.client.movetotag),
+    awful.button({ }, 3, awful.tag.viewtoggle),
+    awful.button({ modkey }, 3, awful.client.toggletag),
+    awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
+    awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
+)
 mytasklist = {}
 mytasklist.buttons = awful.util.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if c == client.focus then
-                                                  c.minimized = true
-                                              else
-                                                  -- Without this, the following
-                                                  -- :isvisible() makes no sense
-                                                  c.minimized = false
-                                                  if not c:isvisible() then
-                                                      awful.tag.viewonly(c:tags()[1])
-                                                  end
-                                                  -- This will also un-minimize
-                                                  -- the client, if needed
-                                                  client.focus = c
-                                                  c:raise()
-                                              end
-                                          end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
-                                              else
-                                                  instance = awful.menu.clients({ width=250 })
-                                              end
-                                          end),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                              if client.focus then client.focus:raise() end
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                              if client.focus then client.focus:raise() end
-                                          end))
+    awful.button({ }, 1, function (c)
+        if c == client.focus then
+            c.minimized = true
+        else
+            -- Without this, the following
+            -- :isvisible() makes no sense
+            c.minimized = false
+            if not c:isvisible() then
+              awful.tag.viewonly(c:tags()[1])
+            end
+            -- This will also un-minimize
+            -- the client, if needed
+            client.focus = c
+            c:raise()
+        end
+    end),
+awful.button({ }, 3, function ()
+    if instance then
+        instance:hide()
+        instance = nil
+    else
+        instance = awful.menu.clients({ width=250 })
+    end
+end),
+awful.button({ }, 4, function ()
+    awful.client.focus.byidx(1)
+    if client.focus then client.focus:raise() end
+end),
+ 
+awful.button({ }, 5, function ()
+    awful.client.focus.byidx(-1)
+    if client.focus then client.focus:raise() end
+end))
 
 for s = 1, screen.count() do
     -- Create a promptbox for each screen
@@ -178,10 +187,10 @@ for s = 1, screen.count() do
     -- We need one layoutbox per screen.
     mylayoutbox[s] = awful.widget.layoutbox(s)
     mylayoutbox[s]:buttons(awful.util.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
-                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
+        awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
+        awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
+        awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
+        awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
     -- Create a taglist widget
     mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
 
@@ -191,41 +200,52 @@ for s = 1, screen.count() do
     -- Create the wibox
     mywibox[s] = awful.wibox({ position = "top", screen = s })
 
-batterywidget = wibox.widget.textbox()    
-batterywidget:set_text("Battery | ")    
-batterywidgettimer = timer({ timeout = 5 })    
-batterywidgettimer:connect_signal("timeout",    
-  function()    
-    fh = assert(io.popen("cat /sys/class/power_supply/BAT1/capacity", "r"))    
-    batterywidget:set_text(fh:read("*l") .. "% | ")    
-    fh:close()    
-  end    
-)    
-batterywidgettimer:start()
+    -- Only create sysmon stuff for one screen
+    if s == 1 then
+        batterywidget = wibox.widget.textbox()    
+        batterywidget:set_text("No battery | ")    
+        batterywidgettimer = timer({ timeout = 5 })    
+        batterywidgettimer:connect_signal("timeout",    
+          function()    
+            fh = assert(io.popen("cat /sys/class/power_supply/BAT1/capacity", "r"))
+            battery = fh:read("*l")
+            if battery then
+                batterywidget:set_text(battery .. "% | ")    
+            end
+            fh:close()    
+        end)    
+        batterywidgettimer:start()
 
-memorywidget = wibox.widget.textbox()    
-memorywidget:set_text("Memory | ")    
-memorywidgettimer = timer({ timeout = 5 })    
-memorywidgettimer:connect_signal("timeout",    
-  function()    
-    fh = assert(io.popen("free -m | grep '-' | awk '{print $4}'", "r"))    
-    memorywidget:set_text(fh:read("*l") .. " MB | ")    
-    fh:close()    
-  end    
-)    
-memorywidgettimer:start()
+        memorywidget = wibox.widget.textbox()    
+        memorywidget:set_text("Memory | ")    
+        memorywidgettimer = timer({ timeout = 5 })    
+        memorywidgettimer:connect_signal("timeout",    
+          function()    
+            fh = assert(io.popen("free -m | grep '-' | awk '{print $4}'", "r"))    
+            memory = fh:read("*l")
+            if memory then
+                memorywidget:set_text(memory .. " MB | ")    
+            end
+            fh:close()    
+        end)    
+        memorywidgettimer:start()
+
+        loadwidget = wibox.widget.textbox()    
+        loadwidget:set_text("Load | ")    
+        loadwidgettimer = timer({ timeout = 5 })    
+        loadwidgettimer:connect_signal("timeout",    
+          function()    
+            fh = assert(io.popen("uptime | sed -e 's/.*average: //' | sed -e 's/,.*//'", "r"))    
+            loadavg = fh:read("*l")
+            if loadavg then
+                loadwidget:set_text(loadavg .. " | ")    
+            end
+            fh:close()    
+        end    
+        )    
+        loadwidgettimer:start()
+    end
 
-loadwidget = wibox.widget.textbox()    
-loadwidget:set_text("Load | ")    
-loadwidgettimer = timer({ timeout = 5 })    
-loadwidgettimer:connect_signal("timeout",    
-  function()    
-    fh = assert(io.popen("uptime | sed -e 's/.*average: //' | sed -e 's/,.*//'", "r"))    
-    loadwidget:set_text(fh:read("*l") .. " | ")    
-    fh:close()    
-  end    
-)    
-loadwidgettimer:start()
     -- Widgets that are aligned to the left
     local left_layout = wibox.layout.fixed.horizontal()
     left_layout:add(mylauncher)
@@ -237,11 +257,13 @@ loadwidgettimer:start()
 
     -- Widgets that are aligned to the right
     local right_layout = wibox.layout.fixed.horizontal()
-    if s == 1 then right_layout:add(wibox.widget.systray()) end
-    right_layout:add(loadwidget)
-    right_layout:add(memorywidget)
-    right_layout:add(batterywidget)
-    right_layout:add(mytextclock)
+    if s == 1 then
+        right_layout:add(wibox.widget.systray())
+        right_layout:add(loadwidget)
+        right_layout:add(memorywidget)
+        right_layout:add(batterywidget)
+        right_layout:add(mytextclock)
+    end
     right_layout:add(mylayoutbox[s]) 
 
     -- Now bring it all together (with the tasklist in the middle)
@@ -259,7 +281,7 @@ root.buttons(awful.util.table.join(
     awful.button({ }, 3, function () mymainmenu:toggle() end),
     awful.button({ }, 4, awful.tag.viewnext),
     awful.button({ }, 5, awful.tag.viewprev)
-))
+    ))
 -- }}}
 
 -- {{{ Key bindings
@@ -272,12 +294,12 @@ globalkeys = awful.util.table.join(
         function ()
             awful.client.focus.byidx( 1)
             if client.focus then client.focus:raise() end
-        end),
+            end),
     awful.key({ modkey,           }, "k",
         function ()
             awful.client.focus.byidx(-1)
             if client.focus then client.focus:raise() end
-        end),
+            end),
     awful.key({ modkey,           }, "w", function () mymainmenu:show() end),
 
     -- Layout manipulation
@@ -292,7 +314,7 @@ globalkeys = awful.util.table.join(
             if client.focus then
                 client.focus:raise()
             end
-        end),
+            end),
 
     -- Standard program
     awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("xscreensaver-command -lock") end),
@@ -315,20 +337,20 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
 
     awful.key({ modkey }, "x",
-              function ()
-                  awful.prompt.run({ prompt = "Run Lua code: " },
-                  mypromptbox[mouse.screen].widget,
-                  awful.util.eval, nil,
-                  awful.util.getdir("cache") .. "/history_eval")
-              end),
+      function ()
+          awful.prompt.run({ prompt = "Run Lua code: " },
+              mypromptbox[mouse.screen].widget,
+              awful.util.eval, nil,
+              awful.util.getdir("cache") .. "/history_eval")
+          end),
     -- Menubar
     awful.key({ modkey }, "p", function() menubar.show() end)
-)
+    )
 
 clientkeys = awful.util.table.join(
     awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
     awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
-    awful.key({ modkey, "Alt"   }, "f4",      function (c) c:kill()                         end),
+    awful.key({ modkey, "Alt"     }, "f4",     function (c) c:kill()                         end),
     awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
     awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
     awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
@@ -338,13 +360,13 @@ clientkeys = awful.util.table.join(
             -- The client currently has the input focus, so it cannot be
             -- minimized, since minimized clients can't have the focus.
             c.minimized = true
-        end),
+            end),
     awful.key({ modkey,           }, "m",
         function (c)
             c.maximized_horizontal = not c.maximized_horizontal
             c.maximized_vertical   = not c.maximized_vertical
-        end)
-)
+            end)
+    )
 
 -- Bind all key numbers to tags.
 -- Be careful: we use keycodes to make it works on any keyboard layout.
@@ -353,55 +375,54 @@ for i = 1, 9 do
     globalkeys = awful.util.table.join(globalkeys,
 
  -- Brightness
-
-    awful.key({ }, "XF86MonBrightnessDown", function ()
-        awful.util.spawn("xbacklight -dec 10") end),
-    awful.key({ }, "XF86MonBrightnessUp", function ()
-        awful.util.spawn("xbacklight -inc 10") end),
-    awful.key({ }, "XF86AudioLowerVolume", function ()
-        awful.util.spawn("amixer -q set Master 5%-") end),
-    awful.key({ }, "XF86AudioRaiseVolume", function ()
-        awful.util.spawn("amixer -q set Master 5%+") end),
-    awful.key({ }, "XF86AudioMute", function ()
-        awful.util.spawn("amixer -q set Master toggle") end),
-    awful.key({ }, "Print", function ()
-        awful.util.spawn("scrot -s -e 'mv $f ~/Pictures/'") end),
+awful.key({ }, "XF86MonBrightnessDown", function ()
+    awful.util.spawn("xbacklight -dec 10") end),
+awful.key({ }, "XF86MonBrightnessUp", function ()
+    awful.util.spawn("xbacklight -inc 10") end),
+awful.key({ }, "XF86AudioLowerVolume", function ()
+    awful.util.spawn("amixer -q set Master 5%-") end),
+awful.key({ }, "XF86AudioRaiseVolume", function ()
+    awful.util.spawn("amixer -q set Master 5%+") end),
+awful.key({ }, "XF86AudioMute", function ()
+    awful.util.spawn("amixer -q set Master toggle") end),
+awful.key({ }, "Print", function ()
+    awful.util.spawn("scrot -s -e 'mv $f ~/Pictures/'") end),
 
 
-        awful.key({ modkey }, "#" .. i + 9,
-                  function ()
-                        local screen = mouse.screen
-                        local tag = awful.tag.gettags(screen)[i]
-                        if tag then
-                           awful.tag.viewonly(tag)
-                        end
-                  end),
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
-                  function ()
-                      local screen = mouse.screen
-                      local tag = awful.tag.gettags(screen)[i]
-                      if tag then
-                         awful.tag.viewtoggle(tag)
-                      end
-                  end),
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = awful.tag.gettags(client.focus.screen)[i]
-                          if tag then
-                              awful.client.movetotag(tag)
-                          end
-                     end
-                  end),
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = awful.tag.gettags(client.focus.screen)[i]
-                          if tag then
-                              awful.client.toggletag(tag)
-                          end
-                      end
-                  end))
+awful.key({ modkey }, "#" .. i + 9,
+    function ()
+        local screen = mouse.screen
+        local tag = awful.tag.gettags(screen)[i]
+        if tag then
+            awful.tag.viewonly(tag)
+        end
+    end),
+awful.key({ modkey, "Control" }, "#" .. i + 9,
+    function ()
+        local screen = mouse.screen
+        local tag = awful.tag.gettags(screen)[i]
+        if tag then
+            awful.tag.viewtoggle(tag)
+         end
+    end),
+awful.key({ modkey, "Shift" }, "#" .. i + 9,
+    function ()
+        if client.focus then
+            local tag = awful.tag.gettags(client.focus.screen)[i]
+            if tag then
+                awful.client.movetotag(tag)
+            end
+        end
+    end),
+ awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+    function ()
+        if client.focus then
+            local tag = awful.tag.gettags(client.focus.screen)[i]
+            if tag then
+                awful.client.toggletag(tag)
+           end
+        end
+    end))
 end
 
 clientbuttons = awful.util.table.join(
@@ -417,17 +438,17 @@ root.keys(globalkeys)
 awful.rules.rules = {
     -- All clients will match this rule.
     { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
+    properties = { border_width = beautiful.border_width,
+    border_color = beautiful.border_normal,
+    focus = awful.client.focus.filter,
+    keys = clientkeys,
+    buttons = clientbuttons } },
     { rule = { class = "MPlayer" },
-      properties = { floating = true } },
+    properties = { floating = true } },
     { rule = { class = "pinentry" },
-      properties = { floating = true } },
+    properties = { floating = true } },
     { rule = { class = "gimp" },
-      properties = { floating = true } },
+    properties = { floating = true } },
     -- Set Firefox to always map on tags number 2 of screen 1.
     -- { rule = { class = "Firefox" },
     --   properties = { tag = tags[1][2] } },
@@ -461,17 +482,17 @@ client.connect_signal("manage", function (c, startup)
     if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
         -- buttons for the titlebar
         local buttons = awful.util.table.join(
-                awful.button({ }, 1, function()
-                    client.focus = c
-                    c:raise()
-                    awful.mouse.client.move(c)
+            awful.button({ }, 1, function()
+                client.focus = c
+                c:raise()
+                awful.mouse.client.move(c)
                 end),
-                awful.button({ }, 3, function()
-                    client.focus = c
-                    c:raise()
-                    awful.mouse.client.resize(c)
+            awful.button({ }, 3, function()
+                client.focus = c
+                c:raise()
+                awful.mouse.client.resize(c)
                 end)
-                )
+            )
 
         -- Widgets that are aligned to the left
         local left_layout = wibox.layout.fixed.horizontal()
@@ -506,4 +527,3 @@ end)
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
-