diff --git a/core/layout.lua b/core/layout.lua
index d7c8bd3..191e1a0 100644
--- a/core/layout.lua
+++ b/core/layout.lua
@@ -75,7 +75,16 @@ awful.screen.connect_for_each_screen(function(s)
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
             layout = wibox.layout.fixed.horizontal,
-            require("core.widgets.menu_launcher"),
+            {
+                {
+                    require("core.widgets.menu_launcher"),
+                    widget = wibox.container.place,
+                    halign = "center"
+                },
+                bg = "#26262633",
+                widget = wibox.container.background,
+                forced_width = require("beautiful.xresources").apply_dpi(61),
+            },
             --require("widgets.polylauncher")({vertical = false}),
             --s.mytaglist,
             s.mypromptbox,
@@ -88,14 +97,16 @@ awful.screen.connect_for_each_screen(function(s)
         },
         -- Middle widget
         {
-            widget = wibox.container.background
+            --[[require("widgets.polytasklist")({
+                vertical = false,
+                stretch = false,
+                constraint = 180,
+                names = true,
+                margins = 5
+            })(s),]]
+            layout = wibox.layout.fixed.horizontal
         },
         { -- Right widgets
-            wibox.widget.textclock(),
-            {
-                widget = wibox.container.background,
-                forced_width = (math.abs(s.geometry.width/2)-200)
-            },
             layout = wibox.layout.fixed.horizontal,
             awful.widget.keyboardlayout(),
             require("widgets.wallpapers")({
@@ -119,7 +130,13 @@ awful.screen.connect_for_each_screen(function(s)
                 }
             }),
             require("widgets.battery")({
-                percentage = false,
+                percentage = true,
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            wibox.widget.textclock(),
+            require("widgets.username")({
                 style = {
                     icon_bg_normal = beautiful.topbar_bg
                 }
diff --git a/core/titlebar.lua b/core/titlebar.lua
index 882c423..d7d7f2d 100644
--- a/core/titlebar.lua
+++ b/core/titlebar.lua
@@ -71,26 +71,6 @@ return function(c)
             },
             { "Toggle on tag",
                 toggle_screentags
-            },
-            { "Set as background",
-                function()
-                    if G_BackgroundClient then
-                        awful.titlebar.show(G_BackgroundClient)
-                        G_BackgroundClient.below = false
-                        G_BackgroundClient.sticky = false
-                    end
-                    awful.titlebar.hide(c)
-                    c.below = true
-                    c.sticky = true
-                    G_BackgroundClient = c
-                end
-            },
-            { "Debug info",
-                {
-                    before = {
-                        require("widgets.window_debug")(c),
-                    },
-                }
             }
         },
         vertical = true
@@ -121,10 +101,26 @@ return function(c)
             layout  = wibox.layout.flex.horizontal
         },
         { -- Right
-            awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.minimizebutton (c),
-            awful.titlebar.widget.closebutton    (c),
-            layout = wibox.layout.fixed.horizontal(),
+            {
+                {
+                    awful.titlebar.widget.maximizedbutton(c),
+                    awful.titlebar.widget.minimizebutton (c),
+                    awful.titlebar.widget.closebutton    (c),
+                    layout = wibox.layout.fixed.horizontal(),
+                    widget = wibox.container.margin,
+                    margins = 3            
+                },
+                widget = wibox.container.background,
+                shape = gears.shape.rounded_bar,
+                bg = {
+                    type = "linear",
+                    from = { 0, 15 },
+                    to = { 0, 0},
+                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
+                },
+            },
+            widget = wibox.container.margin,
+            margins = 2
         },
         layout = wibox.layout.align.horizontal,
     }
diff --git a/core/vars.lua b/core/vars.lua
index d7bc1cb..9c6ef06 100644
--- a/core/vars.lua
+++ b/core/vars.lua
@@ -5,7 +5,7 @@ global = {}
 global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
 global.config_dir = os.getenv("HOME").."/.awesome/"
 global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/unity2/theme.lua"
+global.theme = global.awesome_dir .. "themes/unity/theme.lua"
 global.terminal = "xterm"
 global.editor = os.getenv("EDITOR") or "vim"
 global.editor_cmd = global.terminal .. " -e ".. global.editor
diff --git a/presets/ubuntu-11.10/core/vars.lua b/presets/ubuntu-11.10/core/vars.lua
index d7bc1cb..9c6ef06 100644
--- a/presets/ubuntu-11.10/core/vars.lua
+++ b/presets/ubuntu-11.10/core/vars.lua
@@ -5,7 +5,7 @@ global = {}
 global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
 global.config_dir = os.getenv("HOME").."/.awesome/"
 global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/unity2/theme.lua"
+global.theme = global.awesome_dir .. "themes/unity/theme.lua"
 global.terminal = "xterm"
 global.editor = os.getenv("EDITOR") or "vim"
 global.editor_cmd = global.terminal .. " -e ".. global.editor