diff --git a/awesome/theme.lua b/awesome/theme.lua
index 3e4a762..b3810f2 100644
--- a/awesome/theme.lua
+++ b/awesome/theme.lua
@@ -91,14 +91,8 @@ theme.titlebar_maximized_button_focus_inactive = theme.confdir .. '/icons/titleb
 theme.titlebar_maximized_button_normal_active = theme.confdir .. '/icons/titlebar/maximized_normal_active.png'
 theme.titlebar_maximized_button_focus_active = theme.confdir .. '/icons/titlebar/maximized_focus_active.png'
 
-theme.tasklist_fg_normal = '#555555'
-theme.tasklist_bg_normal = '#5bcdc2'
-theme.tasklist_fg_focus = '#111111'
-theme.tasklist_bg_focus = '#5bcdab'
-theme.tasklist_fg_urgent = '#c1cd5b'
-theme.tasklist_bg_urgent = '#cd5b66'
-theme.tasklist_fg_minimize = '#99aaff'
-theme.tasklist_bg_minimize = '#5c7875'
+theme.tasklist_fg_minimize = '#b3b3b3'
+theme.tasklist_bg_minimize = '#4d4d4d'
 
 local markup = lain.util.markup
 
@@ -293,14 +287,11 @@ function theme.at_screen_connect(s)
 	-- Create a tasklist widget
 	s.mytasklist = awful.widget.tasklist({
 		screen = s,
-		filter = awful.widget.tasklist.filter.currenttags,
+		filter = awful.widget.tasklist.filter.minimizedcurrenttags,
 		buttons = awful.util.tasklist_buttons,
 		style = {
-			shape_focus = function(cr, w, h)
-				gears.shape.partially_rounded_rect(cr, w, h, false, true, false, true, 10)
-			end,
 			shape = function(cr, w, h)
-				gears.shape.partially_rounded_rect(cr, w, h, true, false, true, false, 10)
+				gears.shape.partially_rounded_rect(cr, w, h, false, false, true, true, 10)
 			end,
 		},
 		layout = {