diff --git a/themes/unity/theme.lua b/themes/unity/theme.lua
index 4db7712..7438ab4 100644
--- a/themes/unity/theme.lua
+++ b/themes/unity/theme.lua
@@ -7,18 +7,9 @@ local theme = {}
 theme.name = "unity"
 
 theme.font          = "Ubuntu Regular 10"
-theme.unitybar_width = dpi(60)
-theme.unitybar_bg = "#0D0D09AA"
-theme.unitybar_border_width = 0
 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
@@ -41,48 +32,77 @@ 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 = "radial",
+    from = {bsize/2,bsize/(-3),bsize/8},
+    to = {bsize/2,bsize/(-5),bsize*0.8},
+    stops = { 
+        { 0 , "#FFFFFF99"},
+        { 1, "#43434399"},
+    }    
+}
+
+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 = "radial",
-    from = {25,-20,7},
-    to = {25,5,55},
+    from = {bsize/2,-0.5*bsize,bsize/10},
+    to = {bsize/2,-0.5*bsize,bsize*2},
     stops = { 
-        { 0 , "#8c8c8cBB"},
-        { 0.5, "#414141AA"},
-        { 1, "#535353FF"}
+        { 0 , "#FFFFFFBB"},
+        { 0.45, "#DF744E99"},
+        { 0.55, "#DF744E99"},
+        { 1, "#FFFFFF44"}
     }    
 }
 
 theme.tasklist_bg_normal = {
     type = "radial",
-    from = {25,-20,7},
-    to = {25,5,55},
+    from = {bsize/2,-0.5*bsize,bsize/10},
+    to = {bsize/2,-0.2*bsize,bsize*1.5},
     stops = { 
-        { 0 , "#8c8c8cBB"},
-        { 0.5, "#232323AA"},
-        { 1, "#313131FF"}
+        { 0 , "#FFFFFFFF"},
+        { 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 = {
     type = "radial",
-    from = {25,-20,7},
-    to = {25,5,55},
+    from = {bsize/2,-0.5*bsize,bsize/10},
+    to = {bsize/2,-0.5*bsize,bsize*2},
     stops = { 
-        { 0 , "#8c8c8cBB"},
-        { 0.5, "#414141AA"},
-        { 1, "#535353FF"}
+        { 0 , "#FFFFFFBB"},
+        { 0.45, "#66666699"},
+        { 0.55, "#66666699"},
+        { 1, "#FFFFFF44"}
     }    
 }
 
 theme.launcher_button_bg_normal = {
     type = "radial",
-    from = {25,-20,7},
-    to = {25,5,55},
+    from = {bsize/2,-0.5*bsize,bsize/10},
+    to = {bsize/2,-0.2*bsize,bsize*1.5},
     stops = { 
-        { 0 , "#8c8c8cBB"},
-        { 0.5, "#232323AA"},
-        { 1, "#313131FF"}
+        { 0 , "#FFFFFFFF"},
+        { 0.5, "#33333333"},
+        { 1, "#FFFFFF22"}
     }    
 }
 -- overriding the default one when
@@ -101,25 +121,23 @@ 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, "#2A2A26"} , { 1 , "#454440"} }
-
+    stops = { { 0, "#3C3B37"} , { 1 , "#41403D"} }
 }
 
 theme.topbar_bg = {
     type = "linear",
-    from = { 0, 15 },
+    from = { 0, 20 },
     to = { 0, 0 },
-    stops = { { 0, "#3A3A36"} , { 1 , "#454440"} }
-
+    stops = { { 0, "#3C3B37"} , { 1 , "#545249"} }
 }
 
 theme.titlebar_rounding = 6