diff --git a/themes/unity_simplified/theme.lua b/themes/unity_simplified/theme.lua
index 8b928c8..df1a924 100644
--- a/themes/unity_simplified/theme.lua
+++ b/themes/unity_simplified/theme.lua
@@ -7,17 +7,9 @@ local theme = {}
 theme.name = "unity"
 
 theme.font          = "Ubuntu Regular 10"
-theme.unitybar_width = dpi(60)
-theme.unitybar_bg = "#0D0D09AA"
 theme.icon_rounding = 5
 theme.volume_slider_width = 60
-theme.tasklist_button_shape_border_width = dpi(1)
-theme.tasklist_button_shape_border_color = "#262626AA"
-theme.launcher_button_shape_border_width = dpi(1)
-theme.launcher_button_shape_border_color = "#262626AA"
 theme.username_container_spacing_horizontal = 3
-theme.launcher_button_size = 44
-theme.tasklist_button_size = 44
 theme.macbar_rounding = 5
 theme.macbar_height = 45
 theme.menu_button_inner_margin = 2
@@ -40,31 +32,79 @@ theme.border_normal = theme.bg_focus
 theme.border_focus  = theme.bg_focus
 theme.border_marked = theme.bg_marked
 
+-- unitybar
+theme.unitybar_width = dpi(60)
+theme.unitybar_bg = "#0D0D0966"
+theme.unitybar_border_width = 1
+theme.unitybar_border_color = "#26262666"
+theme.unitybar_inner_margin = 5
+local bsize = theme.unitybar_width - (theme.unitybar_inner_margin*2)
+
+theme.tasklist_button_shape_border_width = dpi(1)
+theme.tasklist_button_shape_border_color = {
+    type = "linear",
+    from = {bsize/2,0},
+    to = {bsize/2,bsize},
+    stops = { 
+        { 0 , "#FFFFFF66"},
+        { 1, "#43434366"},
+    }    
+}
+
+theme.launcher_button_shape_border_width = dpi(1)
+theme.launcher_button_shape_border_color = theme.tasklist_button_shape_border_color
+
 theme.tasklist_bg_focus = {
     type = "linear",
-    from = {25,0},
-    to = {25,50},
+    from = {bsize/2,0*bsize},
+    to = {bsize/2,1*bsize},
     stops = { 
-        { 0 , "#535353"},
-        { 0.5, "#212121"},
-        { 1, "#535353"}
+        { 0 , "#FFFFFFBB"},
+        { 0.3, "#E9542055"},
+        { 0.6, "#E9542055"},
+        { 1, "#FFFFFF44"}
     }    
 }
 
 theme.tasklist_bg_normal = {
     type = "linear",
-    from = {25,-10},
-    to = {25,60},
+    from = {bsize/2,0*bsize},
+    to = {bsize/2,1*bsize},
     stops = { 
-        { 0 , "#414141"},
-        { 0.5, "#232323"},
-        { 1, "#313131"}
+        { 0 , "#FFFFFF55"},
+        { 0.5, "#33333333"},
+        { 1, "#FFFFFF22"}
     }    
 }
+
+theme.tasklist_bg_minimize = "#23232366"
+theme.tasklist_bg_minimize = "#23232366"
+theme.tasklist_container_spacing = 5
+theme.launcher_container_spacing = 5
 -- There are other variable sets
 
-theme.launcher_button_bg_focus = theme.tasklist_bg_focus
-theme.launcher_button_bg_normal = theme.tasklist_bg_normal
+theme.launcher_button_bg_focus = {
+    type = "linear",
+    from = {bsize/2,0*bsize},
+    to = {bsize/2,1*bsize},
+    stops = { 
+        { 0 , "#FFFFFFBB"},
+        { 0.3, "#E9542055"},
+        { 0.6, "#E9542055"},
+        { 1, "#FFFFFF44"}
+    }    
+}
+
+theme.launcher_button_bg_normal = {
+    type = "linear",
+    from = {bsize/2,0*bsize},
+    to = {bsize/2,1*bsize},
+    stops = { 
+        { 0 , "#FFFFFF55"},
+        { 0.5, "#33333333"},
+        { 1, "#FFFFFF22"}
+    }    
+}
 -- overriding the default one when
 -- defined, the sets are:
 -- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
@@ -81,19 +121,25 @@ theme.hotkeys_opacity = 0.2
 
 theme.titlebar_bg_focus = {
     type = "linear",
-    from = { 0, 15 },
+    from = { 0, 20 },
     to = { 0, 0 },
-    stops = { { 0, "#3C3B37"} , { 1 , "#5C5B56"} }
+    stops = { { 0, "#3C3B37"} , { 1 , "#59574E"} }
 }
 
 theme.titlebar_bg_normal = {
     type = "linear",
-    from = { 0, 15 },
+    from = { 0, 20 },
     to = { 0, 0 },
-    stops = { { 0, "#3A3A36"} , { 1 , "#454440"} }
-
+    stops = { { 0, "#3C3B37"} , { 1 , "#41403D"} }
 }
-theme.topbar_bg = "#3C3B37"
+
+theme.topbar_bg = {
+    type = "linear",
+    from = { 0, 20 },
+    to = { 0, 0 },
+    stops = { { 0, "#3C3B37"} , { 1 , "#545249"} }
+}
+
 theme.titlebar_rounding = 6
 theme.bg_systray = "#3A3A36"
 theme.prompt_bg = theme.titlebar_bg_normal