diff --git a/default_theme.lua b/default_theme.lua
index ad1502d..871890a 100644
--- a/default_theme.lua
+++ b/default_theme.lua
@@ -16,10 +16,10 @@ local theme = {}
 
 theme.font          = "sans 12"
 
-theme.bg_normal     = "#2e2e2e"
-theme.bg_focus      = "#343434"
+theme.bg_normal     = "#222222"
+theme.bg_focus      = "#282828"
 theme.bg_urgent     = "#bf221c"
-theme.bg_minimize   = "#555555"
+theme.bg_minimize   = "#111111"
 theme.bg_systray    = theme.bg_normal
 
 theme.fg_normal     = "#aaaaaa"
@@ -27,12 +27,16 @@ theme.fg_focus      = "#ffffff"
 theme.fg_urgent     = "#ffffff"
 theme.fg_minimize   = "#ffffff"
 
-theme.useless_gap   = dpi(0)
-theme.border_width  = dpi(1)
-theme.border_normal = "#222222"
-theme.border_focus  = "#191919"
+theme.useless_gap   = dpi(8)
+theme.border_width  = dpi(2)
+theme.border_normal = "#555555"
+theme.border_focus  = "#555555"
 theme.border_marked = "#91231c"
 
+-- Tasklist
+theme.tasklist_bg_focus = theme.bg_minimize
+
+-- Notifications
 naughty.config.defaults.position = "top_middle"
 naughty.config.presets.critical.bg = "#e82922"
 theme.notification_shape = function(cr, width, height)
@@ -44,6 +48,10 @@ theme.notification_border_color = theme.border_focus
 theme.notification_bg = theme.bg_focus
 theme.notification_fg = theme.fg_focus
 
+-- Hotkeys (awesome help menu)
+theme.hotkeys_border_color = theme.border_normal
+
+
 -- There are other variable sets
 -- overriding the default one when
 -- defined, the sets are:
diff --git a/rc.lua b/rc.lua
index 6cea024..aec9a85 100644
--- a/rc.lua
+++ b/rc.lua
@@ -240,11 +240,43 @@ awful.screen.connect_for_each_screen(function(s)
     s.mytasklist = awful.widget.tasklist {
         screen  = s,
         filter  = awful.widget.tasklist.filter.currenttags,
-        buttons = tasklist_buttons
+        buttons = tasklist_buttons,
+        widget_template = {
+            {
+                {
+                    {
+                        {
+                            id     = 'icon_role',
+                            widget = wibox.widget.imagebox,
+                        },
+                        margins = 8,
+                        widget  = wibox.container.margin,
+                    },
+                    {
+                        id     = 'text_role',
+                        widget = wibox.widget.textbox,
+                    },
+                    layout = wibox.layout.fixed.horizontal,
+                },
+                left  = 0,
+                right = 8,
+                widget = wibox.container.margin
+            },
+            id     = 'background_role',
+            widget = wibox.container.background,
+        },
+        layout = {
+            max_widget_size = 256,
+            layout = wibox.layout.flex.horizontal
+        }
     }
 
     -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s })
+    s.mywibox = awful.wibar({
+        position = "top",
+        screen = s,
+        height = 32
+    })
 
     -- Add widgets to the wibox
     s.mywibox:setup {