diff --git a/awesome/rc.lua b/awesome/rc.lua
index f4164ef..446646c 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -61,8 +61,8 @@ end
 -- Autostart programs
 run_once({ 
     "picom -b", 
---    "sleep 0.25 && xrandr --output  DP-1 --primary --auto --pos 0x0 --output HDMI-0 --auto --pos 2560x180",
-    "keepassxc"
+    "xfce4-clipman",
+    "flameshoot"
 })
 
 -- Choose the theme
@@ -90,7 +90,9 @@ naughty.config.defaults.icon_size = 32
 naughty.config.defaults.fg = beautiful.fg_tooltip
 naughty.config.defaults.bg = beautiful.bg_tooltip
 naughty.config.defaults.border_color = beautiful.notification_border_color
-naughty.config.defaults.border_width = 0
+naughty.config.defaults.border_width = 1
+naughty.config.defaults.shape = function (cr, w, h) gears.shape.rounded_rect(cr, w, h, 6) end
+
 naughty.config.defaults.hover_timeout = nil
 
 awful.util.terminal = terminal
@@ -194,7 +196,7 @@ local myawesomemenu = {
 }
 
 awful.util.mymainmenu = freedesktop.menu.build({
-    icon_size = beautiful.menu_height or 16,
+    icon_size = 16,
     before = {
         { "Awesome", myawesomemenu, beautiful.awesome_icon },
         -- other triads can be put here
@@ -205,7 +207,6 @@ awful.util.mymainmenu = freedesktop.menu.build({
     }
 })
 
-
 -- Screen
 -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
 screen.connect_signal("property::geometry", function(s)
@@ -219,6 +220,7 @@ screen.connect_signal("property::geometry", function(s)
         gears.wallpaper.maximized(wallpaper, s, true)
     end
 end)
+
 -- Create a wibox for each screen and add it
 awful.screen.connect_for_each_screen(function(s) beautiful.connect(s) end)
 
@@ -378,7 +380,12 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey }, "e",      function () awful.spawn("xdg-open .") end, { group = "launcher", description = "Open File Explorer" }),
     awful.key({ modkey }, "q",      function () awful.spawn(browser) end, { group = "launcher", description = "Open browser window" }),
     awful.key({ modkey }, "Return", function () awful.spawn(terminal) end, { group = "launcher", description = "Open terminal" }),
-    awful.key({ }, "Pause", function () awful.spawn("playerctl play-pause") end, { group = "launcher", description = "Play/Pause" }),
+
+    awful.key({ }, "XF86Tools", function () awful.spawn("playerctl -p spotify play-pause") end, { group = "audio", description = "Play/Pause" }),
+    awful.key({ }, "XF86AudioMute", function () awful.spawn("amixer set Master toggle") end, { group = "audio", description = "Mute" }),
+    awful.key({ }, "XF86AudioRaiseVolume", function () awful.spawn("amixer set Master 3%+") end, { group = "audio", description = "Volume Up" }),
+    awful.key({ }, "XF86AudioLowerVolume", function () awful.spawn("amixer set Master 3%-") end, { group = "audio", description = "Volume Down" }),
+    awful.key({ }, "XF86Launch5", function () awful.spawn("amixer set Capture toggle") end, { group = "audio", description = "Mute toggle" }),
 
     -- Dropdown application
     awful.key({ modkey }, "`", function () awful.screen.focused().quake:toggle() end, { group = "launcher", description = "Open quake style terminal" }),
@@ -483,11 +490,13 @@ root.keys(globalkeys)
 -- }}}
 
 local client_colors = {
-    { rule = { class = "Firefox" }, color = "#0c0c0d" },
+    { rule = { class = "firefoxdeveloperedition" }, color = "#1c1b22" },
     { rule = { class = "kitty" }, color = "#0d0f18e6" },
     { rule = { class = "jetbrains-toolbox" }, color = "#111314" },
+    { rule = { class = "krita" }, color = "#323232" },
+    { rule = { class = "Code" }, color = "#181a1f" },
     { rule = { class = "TelegramDesktop" }, color = "#17212B" },
-    { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } }, color = "#2F3032" },
+    { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } }, color = "#2b2d30" },
 }
 
 -- Rules to apply to new clients (through the "manage" signal).
@@ -502,7 +511,7 @@ awful.rules.rules = {
          keys = clientkeys,
          buttons = clientbuttons,
          screen = awful.screen.preferred,
-         placement = awful.placement.no_overlap+awful.placement.no_offscreen,
+         -- placement = awful.placement.no_overlap+awful.placement.no_offscreen,
          size_hints_honor = false,
          floating = false,
          allow_titlebars = true,
@@ -519,7 +528,7 @@ awful.rules.rules = {
 
     -- Jetbrains stuff
     { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } },
-      properties = { titlebars_enabled = false, tag = awful.util.tagnames[1], maximized = false } },
+      properties = { titlebars_enabled = false, maximized = false, screen = 1 } },
 
     { rule_any = { name = { "*Emulator*", "Emulator" } },
       properties = { floating = true, titlebar_enabled = false, border_width = 0 } },
@@ -538,16 +547,28 @@ awful.rules.rules = {
     { rule = { class = "TelegramDesktop" },
       properties = { tag = awful.util.tagnames[4], focusable = true, focus = true } }, 
 
-    { rule = { class = "jetbrains-toolbox" },
-      properties = { tag = awful.util.tagnames[5], floating = true, sticky = true } }, 
+    { rule = { class = "TelegramDesktop", name = "Media viewer" },
+      properties = { fullscreen = true } }, 
 
     -- dialogs
     { rule = { type = "dialog" },
       properties = { titlebars_enabled = true, floating = true, maximized = false, border_width = 1 } },
 
+    { rule = { type = "utility" },
+      properties = { titlebars_enabled = true, floating = true, maximized = false, border_width = 1 } },
+
+    { rule = { class = "gcr-prompter" },
+      properties = { titlebars_enabled = true, floating = true, maximized = false, border_width = 1 } },
+
+    { rule = { type = "utility", class = "vlc" },
+      properties = { floating = true } },
+
     -- jetbrains bugs
+    { rule_any = { class = { "jetbrains-toolbox" } },
+      properties = { floating = true, sticky = true, maximized = false } }, 
+
     { rule = { class = "jetbrains-.*", name = "win.*" }, 
-      properties = { titlebars_enabled = false, allow_titlebars = false, focusable = false, floating = true } },
+     properties = { titlebars_enabled = false, allow_titlebars = false, focusable = false, floating = true } },
 
     -- quake
     { rule = { class = "QuakeDD" },
@@ -556,6 +577,22 @@ awful.rules.rules = {
     -- keepassxc
     { rule = { class = "KeePassXC" },
       properties = { titlebars_enabled = true, floating = true } },
+
+    -- games
+    { rule = { class = "Minecraft.*" },
+      properties = { tag = awful.util.tagnames[6], focusable = true, focus = true, screen = 1 } }, 
+
+    { rule_any = { name = { "Microsoft Teams Notification" } },	
+      properties = {
+           titlebars_enabled = false,
+           floating = true,	
+           focus = false,
+           draw_backdrop = false,
+           skip_decoration = true,
+           skip_taskbar = true,
+           ontop = true,
+           sticky = true }
+    },
 }
 
 -- Signals
@@ -569,6 +606,10 @@ client.connect_signal("manage", function (c)
         c.border_width = 1
     end
 
+    c.shape = function(cr,w,h)
+        gears.shape.rounded_rect(cr,w,h,3)
+    end
+
     if awesome.startup and
       not c.size_hints.user_position
       and not c.size_hints.program_position then
@@ -601,7 +642,7 @@ client.connect_signal("request::titlebars", function(c)
     )
 
     local title = awful.titlebar.widget.titlewidget(c)
-    title.font = "Fira Sans Medium 8"
+    title.font = "Fira Sans Medium 9"
 
     for index, rule in pairs(client_colors) do
         if awful.rules.matches(c, rule) then
@@ -610,7 +651,7 @@ client.connect_signal("request::titlebars", function(c)
         end
     end
 
-    awful.titlebar(c, { size = 20, fg_focus = "#ffffff", bg_focus = c.titlebar_color or beautiful.titlebar_bg_focus }) : setup {
+    awful.titlebar(c, { size = 28, fg_focus = "#ffffff", bg_focus = c.titlebar_color or beautiful.titlebar_bg_focus }) : setup {
         { -- Left
             awful.titlebar.widget.iconwidget(c),
             -- Title
@@ -618,8 +659,8 @@ client.connect_signal("request::titlebars", function(c)
             layout  = wibox.container.margin,
             left    = 8,
             right   = 8,
-            top     = 2,
-            bottom  = 2,
+            top     = 5,
+            bottom  = 5,
         },
         { -- Middle
             {
@@ -640,7 +681,7 @@ client.connect_signal("request::titlebars", function(c)
                 spacing = 6
             },
             layout = wibox.layout.margin,
-            top = 5, bottom = 4, left = 4, right = 8
+            top = 4, bottom = 4, left = 4, right = 8
         },
         layout = wibox.layout.align.horizontal
     }
diff --git a/awesome/themes/kadet/icons/layout/centerwork.png b/awesome/themes/kadet/icons/layout/centerwork.png
index f3a2e83..ea56af8 100644
Binary files a/awesome/themes/kadet/icons/layout/centerwork.png and b/awesome/themes/kadet/icons/layout/centerwork.png differ
diff --git a/awesome/themes/kadet/icons/layout/cornerne.png b/awesome/themes/kadet/icons/layout/cornerne.png
index 44fc059..40f67c3 100644
Binary files a/awesome/themes/kadet/icons/layout/cornerne.png and b/awesome/themes/kadet/icons/layout/cornerne.png differ
diff --git a/awesome/themes/kadet/icons/layout/cornernw.png b/awesome/themes/kadet/icons/layout/cornernw.png
index 9dee4dc..38dec4b 100644
Binary files a/awesome/themes/kadet/icons/layout/cornernw.png and b/awesome/themes/kadet/icons/layout/cornernw.png differ
diff --git a/awesome/themes/kadet/icons/layout/cornerse.png b/awesome/themes/kadet/icons/layout/cornerse.png
index dc444f9..1ccecc1 100644
Binary files a/awesome/themes/kadet/icons/layout/cornerse.png and b/awesome/themes/kadet/icons/layout/cornerse.png differ
diff --git a/awesome/themes/kadet/icons/layout/cornersw.png b/awesome/themes/kadet/icons/layout/cornersw.png
index 7465eab..729627b 100644
Binary files a/awesome/themes/kadet/icons/layout/cornersw.png and b/awesome/themes/kadet/icons/layout/cornersw.png differ
diff --git a/awesome/themes/kadet/icons/layout/dwindle.png b/awesome/themes/kadet/icons/layout/dwindle.png
index 5af3d34..f8a37fa 100644
Binary files a/awesome/themes/kadet/icons/layout/dwindle.png and b/awesome/themes/kadet/icons/layout/dwindle.png differ
diff --git a/awesome/themes/kadet/icons/layout/fairh.png b/awesome/themes/kadet/icons/layout/fairh.png
index 03cd07b..5f720e8 100644
Binary files a/awesome/themes/kadet/icons/layout/fairh.png and b/awesome/themes/kadet/icons/layout/fairh.png differ
diff --git a/awesome/themes/kadet/icons/layout/fairv.png b/awesome/themes/kadet/icons/layout/fairv.png
index cb82f32..6701ed6 100644
Binary files a/awesome/themes/kadet/icons/layout/fairv.png and b/awesome/themes/kadet/icons/layout/fairv.png differ
diff --git a/awesome/themes/kadet/icons/layout/floating.png b/awesome/themes/kadet/icons/layout/floating.png
index 50e3784..86cf222 100644
Binary files a/awesome/themes/kadet/icons/layout/floating.png and b/awesome/themes/kadet/icons/layout/floating.png differ
diff --git a/awesome/themes/kadet/icons/layout/fullscreen.png b/awesome/themes/kadet/icons/layout/fullscreen.png
index a823bf9..9d578f2 100644
Binary files a/awesome/themes/kadet/icons/layout/fullscreen.png and b/awesome/themes/kadet/icons/layout/fullscreen.png differ
diff --git a/awesome/themes/kadet/icons/layout/magnifier.png b/awesome/themes/kadet/icons/layout/magnifier.png
index 4ecee2a..afd94b4 100644
Binary files a/awesome/themes/kadet/icons/layout/magnifier.png and b/awesome/themes/kadet/icons/layout/magnifier.png differ
diff --git a/awesome/themes/kadet/icons/layout/max.png b/awesome/themes/kadet/icons/layout/max.png
index c8266ed..ec7efc9 100644
Binary files a/awesome/themes/kadet/icons/layout/max.png and b/awesome/themes/kadet/icons/layout/max.png differ
diff --git a/awesome/themes/kadet/icons/layout/spiral.png b/awesome/themes/kadet/icons/layout/spiral.png
index 8ef82b2..f8a37fa 100644
Binary files a/awesome/themes/kadet/icons/layout/spiral.png and b/awesome/themes/kadet/icons/layout/spiral.png differ
diff --git a/awesome/themes/kadet/icons/layout/tilebottom.png b/awesome/themes/kadet/icons/layout/tilebottom.png
index ca03439..1263d7f 100644
Binary files a/awesome/themes/kadet/icons/layout/tilebottom.png and b/awesome/themes/kadet/icons/layout/tilebottom.png differ
diff --git a/awesome/themes/kadet/icons/layout/tileleft.png b/awesome/themes/kadet/icons/layout/tileleft.png
index 02ad05f..a4f811c 100644
Binary files a/awesome/themes/kadet/icons/layout/tileleft.png and b/awesome/themes/kadet/icons/layout/tileleft.png differ
diff --git a/awesome/themes/kadet/icons/layout/tileright.png b/awesome/themes/kadet/icons/layout/tileright.png
index 29d4a51..7206d7c 100644
Binary files a/awesome/themes/kadet/icons/layout/tileright.png and b/awesome/themes/kadet/icons/layout/tileright.png differ
diff --git a/awesome/themes/kadet/icons/layout/tiletop.png b/awesome/themes/kadet/icons/layout/tiletop.png
index 2667339..bf9b9f9 100644
Binary files a/awesome/themes/kadet/icons/layout/tiletop.png and b/awesome/themes/kadet/icons/layout/tiletop.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/close-hover.png b/awesome/themes/kadet/icons/titlebar/close-hover.png
new file mode 100644
index 0000000..c7f326d
Binary files /dev/null and b/awesome/themes/kadet/icons/titlebar/close-hover.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/close-inactive.png b/awesome/themes/kadet/icons/titlebar/close-inactive.png
index 1eb2b14..a0a352f 100644
Binary files a/awesome/themes/kadet/icons/titlebar/close-inactive.png and b/awesome/themes/kadet/icons/titlebar/close-inactive.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/close-press.png b/awesome/themes/kadet/icons/titlebar/close-press.png
new file mode 100644
index 0000000..a97383b
Binary files /dev/null and b/awesome/themes/kadet/icons/titlebar/close-press.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/close.png b/awesome/themes/kadet/icons/titlebar/close.png
index 0f063f3..a14264f 100644
Binary files a/awesome/themes/kadet/icons/titlebar/close.png and b/awesome/themes/kadet/icons/titlebar/close.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/floating-inactive.png b/awesome/themes/kadet/icons/titlebar/floating-inactive.png
index af5367a..0e72b7c 100644
Binary files a/awesome/themes/kadet/icons/titlebar/floating-inactive.png and b/awesome/themes/kadet/icons/titlebar/floating-inactive.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/floating.png b/awesome/themes/kadet/icons/titlebar/floating.png
index 57f74f9..97288b1 100644
Binary files a/awesome/themes/kadet/icons/titlebar/floating.png and b/awesome/themes/kadet/icons/titlebar/floating.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/maximized-inactive.png b/awesome/themes/kadet/icons/titlebar/maximized-inactive.png
index 63e7089..4ec0a94 100644
Binary files a/awesome/themes/kadet/icons/titlebar/maximized-inactive.png and b/awesome/themes/kadet/icons/titlebar/maximized-inactive.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/maximized.png b/awesome/themes/kadet/icons/titlebar/maximized.png
index a470770..5c08bf1 100644
Binary files a/awesome/themes/kadet/icons/titlebar/maximized.png and b/awesome/themes/kadet/icons/titlebar/maximized.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/sticky-inactive.png b/awesome/themes/kadet/icons/titlebar/sticky-inactive.png
index c86d2ad..a74db55 100644
Binary files a/awesome/themes/kadet/icons/titlebar/sticky-inactive.png and b/awesome/themes/kadet/icons/titlebar/sticky-inactive.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/sticky.png b/awesome/themes/kadet/icons/titlebar/sticky.png
index 8249526..7e87d6d 100644
Binary files a/awesome/themes/kadet/icons/titlebar/sticky.png and b/awesome/themes/kadet/icons/titlebar/sticky.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/top-inactive.png b/awesome/themes/kadet/icons/titlebar/top-inactive.png
index 85688c3..ea46d79 100644
Binary files a/awesome/themes/kadet/icons/titlebar/top-inactive.png and b/awesome/themes/kadet/icons/titlebar/top-inactive.png differ
diff --git a/awesome/themes/kadet/icons/titlebar/top.png b/awesome/themes/kadet/icons/titlebar/top.png
index 8cd401e..119c79e 100644
Binary files a/awesome/themes/kadet/icons/titlebar/top.png and b/awesome/themes/kadet/icons/titlebar/top.png differ
diff --git a/awesome/themes/kadet/icons/widget/cpu.png b/awesome/themes/kadet/icons/widget/cpu.png
index d03d3dc..11d247d 100644
Binary files a/awesome/themes/kadet/icons/widget/cpu.png and b/awesome/themes/kadet/icons/widget/cpu.png differ
diff --git a/awesome/themes/kadet/icons/widget/hdd.png b/awesome/themes/kadet/icons/widget/hdd.png
index d934517..9e453cf 100644
Binary files a/awesome/themes/kadet/icons/widget/hdd.png and b/awesome/themes/kadet/icons/widget/hdd.png differ
diff --git a/awesome/themes/kadet/icons/widget/memory.png b/awesome/themes/kadet/icons/widget/memory.png
index efe0a1e..b7eb2b3 100644
Binary files a/awesome/themes/kadet/icons/widget/memory.png and b/awesome/themes/kadet/icons/widget/memory.png differ
diff --git a/awesome/themes/kadet/icons/widget/mic-off.png b/awesome/themes/kadet/icons/widget/mic-off.png
new file mode 100644
index 0000000..553662c
Binary files /dev/null and b/awesome/themes/kadet/icons/widget/mic-off.png differ
diff --git a/awesome/themes/kadet/icons/widget/mic-on.png b/awesome/themes/kadet/icons/widget/mic-on.png
new file mode 100644
index 0000000..adc36d6
Binary files /dev/null and b/awesome/themes/kadet/icons/widget/mic-on.png differ
diff --git a/awesome/themes/kadet/icons/widget/temp.png b/awesome/themes/kadet/icons/widget/temp.png
index 00ed63a..960e174 100644
Binary files a/awesome/themes/kadet/icons/widget/temp.png and b/awesome/themes/kadet/icons/widget/temp.png differ
diff --git a/awesome/themes/kadet/theme.lua b/awesome/themes/kadet/theme.lua
index 1035e0d..d5fa9d5 100644
--- a/awesome/themes/kadet/theme.lua
+++ b/awesome/themes/kadet/theme.lua
@@ -9,7 +9,7 @@ local fonts = {
     mono_bold    = "Jetbrains Mono ExtraBold 8"
 }
 
-fonts.widget = "Jetbrains Mono Bold 7"
+fonts.widget = "Jetbrains Mono ExtraBold 8"
 
 local colors = {
     dark        = "#161616",
@@ -43,7 +43,7 @@ theme.fg_focus                                  = colors.accent
 theme.bg_urgent                                 = colors.attention
 theme.fg_urgent                                 = colors.dark
 
-theme.fg_widget                                 = colors.light
+theme.fg_widget                                 = colors.dark
 
 theme.taglist_bg_focus                          = colors.dark
 theme.taglist_fg_focus                          = colors.accent
@@ -55,19 +55,19 @@ theme.taglist_bg_urgent                         = "#C92132"
 theme.taglist_fg_urgent                         = "#282828"
 
 theme.tasklist_bg_normal                        = "#32302f"
-theme.tasklist_fg_normal                        = "#ebdbb2"
+theme.tasklist_fg_normal                        = colors.dark
 theme.tasklist_bg_focus                         = "#32302f"
-theme.tasklist_fg_focus                         = "#ebdbb2"
+theme.tasklist_fg_focus                         = colors.dark
 theme.tasklist_bg_urgent                        = "#C92132"
-theme.tasklist_fg_urgent                        = "#32302f"
+theme.tasklist_fg_urgent                        = colors.attention
 
 theme.border_width                              = 0
 theme.border_normal                             = "#111111"
 theme.border_focus                              = "#000000"
 theme.border_marked                             = "#CC9393"
 
-theme.titlebar_bg_normal                        = "#111111"
-theme.titlebar_bg_focus                         = "#000000"
+theme.titlebar_bg_normal                        = "#212028"
+theme.titlebar_bg_focus                         = "#1c1b22"
 theme.titlebar_fg_normal                        = colors.white
 theme.titlebar_fg_focus                         = colors.white
 
@@ -109,13 +109,16 @@ theme.layout_cornersw                           = theme.dir .. "/icons/layout/co
 theme.layout_cornerne                           = theme.dir .. "/icons/layout/cprmerne.png"
 theme.layout_cornernw                           = theme.dir .. "/icons/layout/cornernw.png"
 
-theme.tasklist_disable_icon                     = true
+theme.tasklist_disable_icon                     = false
+theme.tasklist_plain_task_name                  = true
 theme.useless_gap                               = 3
 theme.master_width_factor                       = 0.66
 
 -- titlebar
 theme.titlebar_close_button_focus               = theme.dir .. "/icons/titlebar/close.png"
 theme.titlebar_close_button_normal              = theme.dir .. "/icons/titlebar/close-inactive.png"
+theme.titlebar_close_button_focus_hover         = theme.dir .. "/icons/titlebar/close-hover.png"
+theme.titlebar_close_button_focus_press         = theme.dir .. "/icons/titlebar/close-press.png"
 
 theme.titlebar_ontop_button_focus_active        = theme.dir .. "/icons/titlebar/top.png"
 theme.titlebar_ontop_button_focus_inactive      = theme.dir .. "/icons/titlebar/top-inactive.png"
@@ -148,8 +151,12 @@ image.icons = {
     hdd  = icon("widget", "hdd"),
     mem  = icon("widget", "memory"),
     temp = icon("widget", "temp"),
+    mic_on  = icon("widget", "mic-on"),
+    mic_off = icon("widget", "mic-off"),
 }
 
+image.icons.mic = image.icons.mic_on
+
 -- colors
 theme.green          = "#00b159"
 theme.red            = "#d64d4d"
@@ -208,8 +215,9 @@ local cpu_widget = wibox.widget { image.icons.cpu, cpu.widget, layout = wibox.la
 -- Coretemp (lain, average)
 local temp_icon = wibox.widget.imagebox(theme.widget_temp)
 local temp = lain.widget.temp({
+    tempfile = "/sys/class/thermal/thermal_zone2/temp",
     settings = function()
-        widget:set_markup(markup.font(fonts.widget, markup.fg.color(theme.fg_widget, " " .. coretemp_now .. "° ")))
+        widget:set_markup(markup.font(fonts.widget, markup.fg.color(theme.fg_widget, string.format(" %.1f° ", coretemp_now))))
     end
 })
 local temp_widget = wibox.widget { image.icons.temp, temp.widget, layout = wibox.layout.align.horizontal }
@@ -227,6 +235,21 @@ local fs = lain.widget.fs({
 })
 local fs_widget =  wibox.widget { image.icons.hdd, fs.widget, layout = wibox.layout.align.horizontal }
 
+-- -- Mic
+local mic = lain.widget.alsa({
+    channel = "Capture",
+    settings = function ()
+        if volume_now.status == "on" then
+            image.icons.mic = image.icons.mic_on
+        else
+            image.icons.mic = image.icons.mic_off
+        end
+
+        widget:set_markup(markup.font(fonts.widget, markup.fg.color(theme.fg_widget, string.format(" %s [%d%%]", volume_now.status, volume_now.level))))
+    end
+})
+local mic_widget =  wibox.widget { image.icons.mic, mic.widget, layout = wibox.layout.align.horizontal }
+
 function theme.connect(s)
     -- Quake application
     s.quake = lain.util.quake({ 
@@ -274,8 +297,8 @@ function theme.connect(s)
             shape = function(cr, width, height) return gears.shape.parallelogram(cr, width, height, width - 8) end
         },
         layout   = {
-            spacing = 2,
-            layout  = wibox.layout.fixed.horizontal
+            spacing = 4,
+            layout  = wibox.layout.fixed.horizontal,
         },
         widget_template = {
             {
@@ -300,10 +323,41 @@ function theme.connect(s)
     --s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons)
 
     -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s, height = 18, bg = theme.bg_wibar, fg = theme.fg_wibar, type = dock })
+    s.mywibox = awful.wibar({ position = "top", screen = s, height = 26, bg = theme.bg_wibar, fg = theme.fg_wibar, type = dock })
 
     s.tray = wibox.widget.systray()
 
+    s.mytasklist = awful.widget.tasklist {
+        screen   = s,
+        filter   = awful.widget.tasklist.filter.focused,
+        layout   = {
+            spacing = 10,
+            layout  = wibox.layout.flex.horizontal
+        },
+        widget_template = {
+            {
+                {
+                    {
+                        id     = 'icon_role',
+                        widget = wibox.widget.imagebox,
+                    },
+                    top = 5,
+                    bottom = 5,
+                    right = 10,
+                    widget  = wibox.container.margin,
+                },
+                {
+                    id     = 'text_role',
+                    widget = wibox.widget.textbox,
+                },
+                layout = wibox.layout.fixed.horizontal,
+            },
+            left  = 20,
+            right = 20,
+            widget = wibox.container.margin
+        },
+    }
+
     -- s.tray:setup {
     --     layout = wibox.layout.margin,
     --     widget = wibox.container.background,
@@ -313,6 +367,8 @@ function theme.connect(s)
     -- Add widgets to the wibox
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
+        widget = wibox.container.background,
+        bg = "#ffa90060",
         expand = 'none',
         { -- Left widgets
             layout = wibox.layout.margin,
@@ -320,6 +376,7 @@ function theme.connect(s)
             {
                 layout = wibox.layout.fixed.horizontal,
                 s.mytaglist,
+                s.mytasklist,
                 s.mypromptbox,
             }
         },
@@ -329,21 +386,25 @@ function theme.connect(s)
             date_widget,
         },
         { -- Right widgets
-            layout = wibox.layout.fixed.horizontal,
+            layout = wibox.layout.margin,
+            top = 2, bottom = 2,
             {
-                layout = wibox.layout.margin,
-                right = -8,
+                layout = wibox.layout.fixed.horizontal,
+                spacing = 8,
+                -- stat
                 {
                     widget = wibox.container.background,
-                    shape  = function (cr, w, h) gears.shape.parallelogram(cr, w, h, w - 8) end,
+                    shape  = function (cr, w, h) gears.shape.rounded_rect(cr, w, h, 4) end,
                     color  = "#000000",
-                    bg     = "#000000",
+                    bg     = "#00000000",
                     {
                         layout = wibox.layout.margin,
-                        left = 20, right = 20,
+                        left = 8, right = 8,
                         {
                             layout = wibox.layout.fixed.horizontal,
                             spacing = 8,
+                            -- Mic widget
+                            mic_widget,
                             -- Fs widget
                             fs_widget,
                             -- Temp
@@ -355,40 +416,41 @@ function theme.connect(s)
                         }
                     }
                 },
-            },
-            -- tray
-            {
-                widget = wibox.container.background,
-                shape = function (cr, w, h) gears.shape.parallelogram(cr, w, h, w - 8) end,
-                bg = "#FF9800",
-                {
-                    layout = wibox.layout.margin,
-                    left = 8, right = 8,
-                    {
-                        layout = wibox.layout.fixed.horizontal,
-                        s.tray,
-                        clock_widget,
-                    }
-                }
-            },
-            -- Layout box
-            {
-                layout = wibox.layout.margin,
-                left = -8, right = -8,
+                -- tray
                 {
                     widget = wibox.container.background,
-                    bg = "#000000",
-                    shape = function (cr, w, h) gears.shape.parallelogram(cr, w, h, w - 8) end,
+                    shape = function (cr, w, h) gears.shape.rounded_rect(cr, w, h, 4) end,
+                    bg = "#FF9800",
                     {
                         layout = wibox.layout.margin,
-                        s.mylayoutbox,
-                        left = 16, 
-                        right = 16,
-                        top = 1,
-                        bottom = 1,
+                        left = 8, right = 8, top = 2, bottom = 2,
+                        {
+                            layout = wibox.layout.fixed.horizontal,
+                            spacing = 8,
+                            s.tray,
+                            clock_widget,
+                        }
                     }
-                }
-            },
+                },
+                -- Layout box
+                {
+                    layout = wibox.layout.margin,
+                    right = 8,
+                    {
+                        widget = wibox.container.background,
+                        bg = "#00000000",
+                        shape = function (cr, w, h) gears.shape.rounded_rect(cr, w, h, 4) end,
+                        {
+                            layout = wibox.layout.margin,
+                            s.mylayoutbox,
+                            left = 8, 
+                            right = 8,
+                            top = 2,
+                            bottom = 2,
+                        }
+                    }
+                },
+            }
         },
     }
 end