diff --git a/README.org b/README.org
index e42e8f104..fe4e44ecf 100644
--- a/README.org
+++ b/README.org
@@ -9,7 +9,6 @@ This is just a personal repository where i store all my dotfiles, you're free cl
 [[./screenshot3.png]]
 [[./screenshot5.png]]
 [[./screenshot6.png]]
-[[./screenshot7.png]]
 
 * GUIDE
 This guide is made for Arch Linux.
diff --git a/screenshot1.png b/screenshot1.png
index 733f7330a..c18936044 100644
Binary files a/screenshot1.png and b/screenshot1.png differ
diff --git a/screenshot2.png b/screenshot2.png
index 731d26ded..6d700a01c 100644
Binary files a/screenshot2.png and b/screenshot2.png differ
diff --git a/screenshot3.png b/screenshot3.png
index 153f22fe5..3c813b937 100644
Binary files a/screenshot3.png and b/screenshot3.png differ
diff --git a/screenshot4.png b/screenshot4.png
index c76423768..761f2477e 100644
Binary files a/screenshot4.png and b/screenshot4.png differ
diff --git a/screenshot5.png b/screenshot5.png
index 0897e54bf..227022f3d 100644
Binary files a/screenshot5.png and b/screenshot5.png differ
diff --git a/screenshot6.png b/screenshot6.png
index e0c172b94..0746f11f8 100644
Binary files a/screenshot6.png and b/screenshot6.png differ
diff --git a/screenshot7.png b/screenshot7.png
deleted file mode 100644
index 8fad38bfa..000000000
Binary files a/screenshot7.png and /dev/null differ
diff --git a/user/.config/awesome/helpers.lua b/user/.config/awesome/helpers.lua
index 4b989d235..8fae9123e 100644
--- a/user/.config/awesome/helpers.lua
+++ b/user/.config/awesome/helpers.lua
@@ -1,9 +1,6 @@
 local naughty = require("naughty")
-local awful = require("awful")
 local ruled = require("ruled")
-local naughty = require("naughty")
 local beautiful = require("beautiful")
-local gears = require("gears")
 
 -- {{{ Error handling
 naughty.connect_signal(
@@ -18,34 +15,6 @@ naughty.connect_signal(
 )
 -- }}}
 
--- {{{ Notifications
-ruled.notification.connect_signal(
-    "request::rules",
-    function()
-        ruled.notification.append_rule {
-        rule       = { },
-        properties = {
-            screen           = awful.screen.preferred,
-            implicit_timeout = 5,
-        }
-    }
-    end
-)
-naughty.connect_signal(
-    "request::display",
-    function(n)
-        naughty.layout.box {
-            notification = n
-        }
-    end
-)
-naughty.config.defaults[ "icon_size" ] = 80
-beautiful.notification_shape =
-    function(cr, w, h)
-        gears.shape.rounded_rect(cr, w, h, 8)
-    end
--- }}}
-
 -- {{{ Signals
 -- No borders when rearranging only 1 non-floating or maximized client
 screen.connect_signal(
diff --git a/user/.config/awesome/rc.lua b/user/.config/awesome/rc.lua
index d46809ad4..7a43129b4 100644
--- a/user/.config/awesome/rc.lua
+++ b/user/.config/awesome/rc.lua
@@ -5,6 +5,7 @@ require("helpers")
 require("apps")
 require("ui.layouts")
 require("ui.bar")
+require("ui.notif")
 require("keymaps.keyboard")
 require("keymaps.mouse")
 require("ui.rules")
diff --git a/user/.config/awesome/ui/bar.lua b/user/.config/awesome/ui/bar.lua
index 087649836..3e1bb0d3f 100644
--- a/user/.config/awesome/ui/bar.lua
+++ b/user/.config/awesome/ui/bar.lua
@@ -3,15 +3,9 @@ local wibox = require("wibox")
 local gears = require("gears")
 local awful = require("awful")
 local theme = require("ui.theme")
-local separators = require("ui.custom-widgets.separator")
---- }}}
-
 -- Textclock widget
 mytextclock = wibox.widget.textclock()
-
-screen.connect_signal(
-  "request::desktop_decoration",
-  function(s)
+screen.connect_signal("request::desktop_decoration", function(s)
 -- Tag names for each screen
     awful.tag(
       {
@@ -30,139 +24,171 @@ screen.connect_signal(
     )
 
 --  Layoutbox widget
-    s.mylayoutbox = awful.widget.layoutbox {
-      screen  = s,
-      buttons = {
-        awful.button(
-          { },
-          1,
-          function ()
-            awful.layout.inc(1)
-          end
-        ),
-        awful.button(
-          { },
-          3,
-          function ()
-            awful.layout.inc(-1)
-          end
-        ),
-        awful.button(
-          { },
-          4,
-          function ()
-            awful.layout.inc(-1)
-          end
-        ),
-        awful.button(
-          { },
-          5,
-          function ()
-            awful.layout.inc(1)
-          end
-        ),
+    s.mylayoutbox = {
+      widget = wibox.container.background,
+      bg = theme.bg_normal,
+      shape = gears.shape.circle,
+      awful.widget.layoutbox {
+        screen  = s,
+        buttons = {
+          awful.button(
+            { },
+            1,
+            function ()
+              awful.layout.inc(1)
+            end
+          ),
+          awful.button(
+            { },
+            3,
+            function ()
+              awful.layout.inc(-1)
+            end
+          ),
+          awful.button(
+            { },
+            4,
+            function ()
+              awful.layout.inc(-1)
+            end
+          ),
+          awful.button(
+            { },
+            5,
+            function ()
+              awful.layout.inc(1)
+            end
+          ),
+        }
       }
     }
 
--- Custom widgets
+--  Taglist widget
+    s.mytaglist = {
+      widget = wibox.container.background,
+      bg = theme.taglist_bg,
+      shape = gears.shape.rounded_rect,
+      awful.widget.taglist {
+        screen  = s,
+        filter  = awful.widget.taglist.filter.all,
+        buttons = {
+          awful.button(
+            { },
+            1,
+            function(t)
+              t:view_only()
+            end
+          ),
+          awful.button(
+            { modkey },
+            1,
+            function(t)
+              if client.focus then
+                client.focus:move_to_tag(t)
+              end
+            end
+          ),
+          awful.button(
+            { },
+            3,
+            awful.tag.viewtoggle
+          ),
+          awful.button(
+            { modkey },
+            3,
+            function(t)
+              if client.focus then
+                client.focus:toggle_tag(t)
+              end
+            end
+          ),
+          awful.button(
+            { },
+            4,
+            function(t)
+              awful.tag.viewprev(t.screen)
+            end
+          ),
+          awful.button(
+            { },
+            5,
+            function(t)
+              awful.tag.viewnext(t.screen)
+            end
+          ),
+        }
+      }
+    }
+
+-- Prepare custom widgets
     -- Volume widget
     s.volume =
       awful.widget.watch(
-        ".config/awesome/ui/custom-widgets/volume",
+        ".config/awesome/ui/widgets/volume",
         1 -- Update time in seconds
       )
     -- Battery widget
     s.battery =
       awful.widget.watch(
-        ".config/awesome/ui/custom-widgets/battery",
-        10 -- Update time in seconds
+        ".config/awesome/ui/widgets/battery",
+        10 -- update time in seconds
       )
     -- Wifi widget
     s.wifi =
       awful.widget.watch(
-        ".config/awesome/ui/custom-widgets/wifi",
+        ".config/awesome/ui/widgets/wifi",
         10 -- Update time in seconds
       )
     -- Brightness widget
     s.brightness =
       awful.widget.watch(
-        ".config/awesome/ui/custom-widgets/brightness",
+        ".config/awesome/ui/widgets/brightness",
         1 -- Update time in seconds
       )
     -- Keyboard layout widget
     s.layout =
       awful.widget.watch(
-        ".config/awesome/ui/custom-widgets/layout",
+        ".config/awesome/ui/widgets/layout",
         1 -- Update time in seconds
       )
 
---  Taglist widget
-    s.mytaglist = awful.widget.taglist {
-      screen  = s,
-      filter  = awful.widget.taglist.filter.all,
-      buttons = {
-        awful.button(
-          { },
-          1,
-          function(t)
-            t:view_only()
-          end
-        ),
-        awful.button(
-          { modkey },
-          1,
-          function(t)
-            if client.focus then
-              client.focus:move_to_tag(t)
-            end
-          end
-        ),
-        awful.button(
-          { },
-          3,
-          awful.tag.viewtoggle
-        ),
-        awful.button(
-          { modkey },
-          3,
-          function(t)
-            if client.focus then
-              client.focus:toggle_tag(t)
-            end
-          end
-        ),
-        awful.button(
-          { },
-          4,
-          function(t)
-            awful.tag.viewprev(t.screen)
-          end
-        ),
-        awful.button(
-          { },
-          5,
-          function(t)
-            awful.tag.viewnext(t.screen)
-          end
-        ),
-      }
+-- Prepare custom widgets container
+    local custom_widget_container = {
+      -- Keyboard layout widget
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one),
+      wibox.container.background(s.layout, theme.bar_bg_one),
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_one),
+      -- Volume widget
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two),
+      wibox.container.background(s.volume, theme.bar_bg_two),
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_two),
+      -- Brightness widget
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre),
+      wibox.container.background(s.brightness, theme.bar_bg_tre),
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_tre),
+      -- Battery widget
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for),
+      wibox.container.background(s.battery, theme.bar_bg_for),
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_for),
+      -- Wifi widget
+      wibox.container.background(wibox.widget.textbox(" "), theme.bar_bg_fiv),
+      wibox.container.background(s.wifi, theme.bar_bg_fiv),
+      layout  = wibox.layout.fixed.horizontal,
     }
 
--- Separators
-    local spr     = wibox.widget.textbox(" ")
-    local spr_one_dl = separators.arrow_left(theme.bg_normal, theme.bar_bg_one)
-    local spr_one_ld = separators.arrow_left(theme.bar_bg_one, theme.bar_bg_two)
-    local spr_two_dl = separators.arrow_left(theme.bar_bg_two, theme.bar_bg_two)
-    local spr_two_ld = separators.arrow_left(theme.bar_bg_two, theme.bar_bg_tre)
-    local spr_tre_dl = separators.arrow_left(theme.bar_bg_tre, theme.bar_bg_tre)
-    local spr_tre_ld = separators.arrow_left(theme.bar_bg_tre, theme.bar_bg_for)
-    local spr_for_dl = separators.arrow_left(theme.bar_bg_for, theme.bar_bg_for)
-    local spr_for_ld = separators.arrow_left(theme.bar_bg_for, theme.bar_bg_fiv)
-    local spr_fiv_dl = separators.arrow_left(theme.bar_bg_fiv, theme.bar_bg_fiv)
+-- Main right widget container with pill shape
+    local right_widgets = {
+      custom_widget_container,
+      widget = wibox.container.background,
+      shape = gears.shape.rounded_rect,
+    }
 
---  Wibox
+--  Wibar
     s.mywibox = awful.wibar {
       position = "top",
+      height   = (30),
+      border_width = (10),
+      border_color = theme.bg_normal,
       screen   = s,
       widget   = {
         layout = wibox.layout.stack,
@@ -171,58 +197,23 @@ screen.connect_signal(
           {
             -- [[ Left widgets ]]
             layout = wibox.layout.fixed.horizontal,
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
             -- Layoubox widget
             s.mylayoutbox,
-            wibox.widget.textbox(" "),
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+            wibox.container.background(wibox.widget.textbox(" "), theme.bg_normal),
             -- Taglist widget
             s.mytaglist,
-            wibox.widget.textbox(" "),
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
           },
           nil,
           {
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
             -- [[ Right widgets ]]
             layout = wibox.layout.fixed.horizontal,
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-            -- Keyboar layout widget
-            wibox.container.background(spr_one_dl, theme.bar_bg_one),
-            wibox.container.background(spr, theme.bar_bg_one),
-            wibox.container.background(s.layout, theme.bar_bg_one),
-            wibox.container.background(spr, theme.bar_bg_one),
-            wibox.container.background(spr_one_ld, theme.bar_bg_one),
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-            -- Volume widget
-            wibox.container.background(spr_two_dl, theme.bar_bg_two),
-            wibox.container.background(s.volume, theme.bar_bg_two),
-            wibox.container.background(spr, theme.bar_bg_two),
-            spr_two_ld,
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-            -- Brightness widget
-            wibox.container.background(spr_tre_dl, theme.bar_bg_tre),
-            wibox.container.background(s.brightness, theme.bar_bg_tre),
-            wibox.container.background(spr, theme.bar_bg_tre),
-            wibox.container.background(spr_tre_ld, theme.bar_bg_tre),
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-            -- Battery widget
-            wibox.container.background(spr_for_dl, theme.bar_bg_for),
-            wibox.container.background(s.battery, theme.bar_bg_for),
-            wibox.container.background(spr, theme.bar_bg_for),
-            wibox.container.background(spr_for_ld, theme.bar_bg_for),
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-            -- Wifi widget
-            wibox.container.background(spr_fiv_dl, theme.bar_bg_fiv),
-            wibox.container.background(s.wifi, theme.bar_bg_fiv),
-            wibox.container.background(spr, theme.bar_bg_fiv),
-            -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+            right_widgets
           },
         },
         {
           -- [[ Center widgets ]]
           -- Clock widget
-          wibox.container.background(mytextclock, theme.bar_clock),
+          wibox.container.background(mytextclock, theme.bar_clock, gears.shape.rounded_rect),
           valign = "center",
           halign = "center",
           layout = wibox.container.place,
diff --git a/user/.config/awesome/ui/custom-widgets/separator.lua b/user/.config/awesome/ui/custom-widgets/separator.lua
deleted file mode 100644
index dc6a7191c..000000000
--- a/user/.config/awesome/ui/custom-widgets/separator.lua
+++ /dev/null
@@ -1,106 +0,0 @@
-local wibox = require("wibox")
-local gears = require("gears")
-local beautiful = require("beautiful")
-
--- Lain Cairo separators util submodule
--- lain.util.separators
-local separators = { height = beautiful.separators_height or 0, width = beautiful.separators_width or 9 }
-
--- [[ Arrow
--- Right
-function separators.arrow_right(col1, col2)
-    local widget = wibox.widget.base.make_widget()
-    widget.col1 = col1
-    widget.col2 = col2
-
-    widget.fit = function(_, _, _)
-        return separators.width, separators.height
-    end
-
-    widget.update = function(_, _)
-        widget.col1 = col1
-        widget.col2 = col2
-        widget:emit_signal("widget::redraw_needed")
-    end
-
-    widget.draw = function(_, _, cr, width, height)
-        if widget.col2 ~= "alpha" then
-            cr:set_source_rgba(gears.color.parse_color(widget.col2))
-            cr:new_path()
-            cr:move_to(0, 0)
-            cr:line_to(width, height/2)
-            cr:line_to(width, 0)
-            cr:close_path()
-            cr:fill()
-
-            cr:new_path()
-            cr:move_to(0, height)
-            cr:line_to(width, height/2)
-            cr:line_to(width, height)
-            cr:close_path()
-            cr:fill()
-        end
-
-        if widget.col1 ~= "alpha" then
-            cr:set_source_rgba(gears.color.parse_color(widget.col1))
-            cr:new_path()
-            cr:move_to(0, 0)
-            cr:line_to(width, height/2)
-            cr:line_to(0, height)
-            cr:close_path()
-            cr:fill()
-        end
-   end
-
-   return widget
-end
-
--- Left
-function separators.arrow_left(col1, col2)
-    local widget = wibox.widget.base.make_widget()
-    widget.col1 = col1
-    widget.col2 = col2
-
-    widget.fit = function(_,  _, _)
-        return separators.width, separators.height
-    end
-
-    widget.update = function(c1, c2)
-        widget.col1 = c1
-        widget.col2 = c2
-        widget:emit_signal("widget::redraw_needed")
-    end
-
-    widget.draw = function(_, _, cr, width, height)
-        if widget.col1 ~= "alpha" then
-            cr:set_source_rgba(gears.color.parse_color(widget.col1))
-            cr:new_path()
-            cr:move_to(width, 0)
-            cr:line_to(0, height/2)
-            cr:line_to(0, 0)
-            cr:close_path()
-            cr:fill()
-
-            cr:new_path()
-            cr:move_to(width, height)
-            cr:line_to(0, height/2)
-            cr:line_to(0, height)
-            cr:close_path()
-            cr:fill()
-        end
-
-        if widget.col2 ~= "alpha" then
-            cr:new_path()
-            cr:move_to(width, 0)
-            cr:line_to(0, height/2)
-            cr:line_to(width, height)
-            cr:close_path()
-
-            cr:set_source_rgba(gears.color.parse_color(widget.col2))
-            cr:fill()
-        end
-   end
-   return widget
-end
--- ]]
-return separators
diff --git a/user/.config/awesome/ui/layout-icons/centerworkw.png b/user/.config/awesome/ui/icons/centerworkw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/centerworkw.png
rename to user/.config/awesome/ui/icons/centerworkw.png
diff --git a/user/.config/awesome/ui/layout-icons/cornerne.png b/user/.config/awesome/ui/icons/cornerne.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornerne.png
rename to user/.config/awesome/ui/icons/cornerne.png
diff --git a/user/.config/awesome/ui/layout-icons/cornernew.png b/user/.config/awesome/ui/icons/cornernew.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornernew.png
rename to user/.config/awesome/ui/icons/cornernew.png
diff --git a/user/.config/awesome/ui/layout-icons/cornernw.png b/user/.config/awesome/ui/icons/cornernw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornernw.png
rename to user/.config/awesome/ui/icons/cornernw.png
diff --git a/user/.config/awesome/ui/layout-icons/cornernww.png b/user/.config/awesome/ui/icons/cornernww.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornernww.png
rename to user/.config/awesome/ui/icons/cornernww.png
diff --git a/user/.config/awesome/ui/layout-icons/cornerse.png b/user/.config/awesome/ui/icons/cornerse.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornerse.png
rename to user/.config/awesome/ui/icons/cornerse.png
diff --git a/user/.config/awesome/ui/layout-icons/cornersew.png b/user/.config/awesome/ui/icons/cornersew.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornersew.png
rename to user/.config/awesome/ui/icons/cornersew.png
diff --git a/user/.config/awesome/ui/layout-icons/cornersw.png b/user/.config/awesome/ui/icons/cornersw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornersw.png
rename to user/.config/awesome/ui/icons/cornersw.png
diff --git a/user/.config/awesome/ui/layout-icons/cornersww.png b/user/.config/awesome/ui/icons/cornersww.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/cornersww.png
rename to user/.config/awesome/ui/icons/cornersww.png
diff --git a/user/.config/awesome/ui/layout-icons/dwindle.png b/user/.config/awesome/ui/icons/dwindle.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/dwindle.png
rename to user/.config/awesome/ui/icons/dwindle.png
diff --git a/user/.config/awesome/ui/layout-icons/dwindlew.png b/user/.config/awesome/ui/icons/dwindlew.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/dwindlew.png
rename to user/.config/awesome/ui/icons/dwindlew.png
diff --git a/user/.config/awesome/ui/layout-icons/fairh.png b/user/.config/awesome/ui/icons/fairh.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/fairh.png
rename to user/.config/awesome/ui/icons/fairh.png
diff --git a/user/.config/awesome/ui/layout-icons/fairhw.png b/user/.config/awesome/ui/icons/fairhw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/fairhw.png
rename to user/.config/awesome/ui/icons/fairhw.png
diff --git a/user/.config/awesome/ui/layout-icons/fairv.png b/user/.config/awesome/ui/icons/fairv.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/fairv.png
rename to user/.config/awesome/ui/icons/fairv.png
diff --git a/user/.config/awesome/ui/layout-icons/fairvw.png b/user/.config/awesome/ui/icons/fairvw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/fairvw.png
rename to user/.config/awesome/ui/icons/fairvw.png
diff --git a/user/.config/awesome/ui/layout-icons/floating.png b/user/.config/awesome/ui/icons/floating.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/floating.png
rename to user/.config/awesome/ui/icons/floating.png
diff --git a/user/.config/awesome/ui/layout-icons/floatingw.png b/user/.config/awesome/ui/icons/floatingw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/floatingw.png
rename to user/.config/awesome/ui/icons/floatingw.png
diff --git a/user/.config/awesome/ui/layout-icons/fullscreen.png b/user/.config/awesome/ui/icons/fullscreen.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/fullscreen.png
rename to user/.config/awesome/ui/icons/fullscreen.png
diff --git a/user/.config/awesome/ui/layout-icons/fullscreenw.png b/user/.config/awesome/ui/icons/fullscreenw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/fullscreenw.png
rename to user/.config/awesome/ui/icons/fullscreenw.png
diff --git a/user/.config/awesome/ui/layout-icons/magnifier.png b/user/.config/awesome/ui/icons/magnifier.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/magnifier.png
rename to user/.config/awesome/ui/icons/magnifier.png
diff --git a/user/.config/awesome/ui/layout-icons/magnifierw.png b/user/.config/awesome/ui/icons/magnifierw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/magnifierw.png
rename to user/.config/awesome/ui/icons/magnifierw.png
diff --git a/user/.config/awesome/ui/layout-icons/max.png b/user/.config/awesome/ui/icons/max.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/max.png
rename to user/.config/awesome/ui/icons/max.png
diff --git a/user/.config/awesome/ui/layout-icons/maxw.png b/user/.config/awesome/ui/icons/maxw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/maxw.png
rename to user/.config/awesome/ui/icons/maxw.png
diff --git a/user/.config/awesome/ui/layout-icons/spiral.png b/user/.config/awesome/ui/icons/spiral.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/spiral.png
rename to user/.config/awesome/ui/icons/spiral.png
diff --git a/user/.config/awesome/ui/layout-icons/spiralw.png b/user/.config/awesome/ui/icons/spiralw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/spiralw.png
rename to user/.config/awesome/ui/icons/spiralw.png
diff --git a/user/.config/awesome/ui/layout-icons/tile.png b/user/.config/awesome/ui/icons/tile.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tile.png
rename to user/.config/awesome/ui/icons/tile.png
diff --git a/user/.config/awesome/ui/layout-icons/tilebottom.png b/user/.config/awesome/ui/icons/tilebottom.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tilebottom.png
rename to user/.config/awesome/ui/icons/tilebottom.png
diff --git a/user/.config/awesome/ui/layout-icons/tilebottomw.png b/user/.config/awesome/ui/icons/tilebottomw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tilebottomw.png
rename to user/.config/awesome/ui/icons/tilebottomw.png
diff --git a/user/.config/awesome/ui/layout-icons/tileleft.png b/user/.config/awesome/ui/icons/tileleft.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tileleft.png
rename to user/.config/awesome/ui/icons/tileleft.png
diff --git a/user/.config/awesome/ui/layout-icons/tileleftw.png b/user/.config/awesome/ui/icons/tileleftw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tileleftw.png
rename to user/.config/awesome/ui/icons/tileleftw.png
diff --git a/user/.config/awesome/ui/layout-icons/tiletop.png b/user/.config/awesome/ui/icons/tiletop.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tiletop.png
rename to user/.config/awesome/ui/icons/tiletop.png
diff --git a/user/.config/awesome/ui/layout-icons/tiletopw.png b/user/.config/awesome/ui/icons/tiletopw.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tiletopw.png
rename to user/.config/awesome/ui/icons/tiletopw.png
diff --git a/user/.config/awesome/ui/layout-icons/tilew.png b/user/.config/awesome/ui/icons/tilew.png
similarity index 100%
rename from user/.config/awesome/ui/layout-icons/tilew.png
rename to user/.config/awesome/ui/icons/tilew.png
diff --git a/user/.config/awesome/ui/notif.lua b/user/.config/awesome/ui/notif.lua
new file mode 100644
index 000000000..fdf41ed57
--- /dev/null
+++ b/user/.config/awesome/ui/notif.lua
@@ -0,0 +1,112 @@
+local awful = require("awful")
+local beautiful = require("beautiful")
+local dpi = beautiful.xresources.apply_dpi
+local naughty = require("naughty")
+local wibox = require("wibox")
+local ruled = require("ruled")
+
+naughty.config.defaults.ontop = true
+naughty.config.defaults.timeout = 5
+naughty.config.defaults.screen = awful.screen.focused()
+naughty.config.defaults.border_width = 0
+naughty.config.defaults.position = "top_right"
+naughty.config.defaults.title = "Notification"
+
+ruled.notification.connect_signal(
+  "request::rules",
+  function()
+    -- Critical
+    ruled.notification.append_rule {
+      rule       = {
+        urgency = "critical"
+      },
+      properties = {
+        bg = beautiful.notification_bg,
+        fg = beautiful.notification_critical,
+        timeout = 0
+      }
+    }
+    -- Normal
+    ruled.notification.append_rule {
+      rule       = {
+        urgency = "normal"
+      },
+      properties = {
+        bg = beautiful.notification_bg,
+        fg = beautiful.notification_fg,
+        timeout = 5
+      }
+    }
+    -- Low
+    ruled.notification.append_rule {
+      rule       = {
+        urgency = "low"
+      },
+      properties = {
+        bg = beautiful.notification_bg,
+        fg = beautiful.notification_fg,
+        timeout = 5
+      }
+    }
+  end
+)
+
+naughty.connect_signal(
+  "request::display",
+  function(n)
+    naughty.layout.box {
+      notification = n,
+      type = "notification",
+      bg = beautiful.bg_normal,
+      widget_template = {
+        {
+          {
+            {
+              {
+                {
+                  {
+                    naughty.widget.title,
+                    forced_height = dpi(38),
+                    layout = wibox.layout.align.horizontal
+                  },
+                  left = dpi(15),
+                  right = dpi(15),
+                  widget = wibox.container.margin
+                },
+                bg = beautiful.notification_bg_alt,
+                widget = wibox.container.background
+              },
+              strategy = "min",
+              width = dpi(300),
+              widget = wibox.container.constraint
+            },
+            strategy = "max",
+            width = dpi(400),
+            widget = wibox.container.constraint
+          },
+          {
+            {
+              {
+                naughty.widget.message,
+                left = dpi(15),
+                right = dpi(15),
+                top = dpi(15),
+                bottom = dpi(15),
+                widget = wibox.container.margin
+              },
+              strategy = "min",
+              height = dpi(60),
+              widget = wibox.container.constraint
+            },
+            strategy = "max",
+            width = dpi(400),
+            widget = wibox.container.constraint
+          },
+          layout = wibox.layout.align.vertical
+        },
+        id = "background_role",
+        widget = naughty.container.background
+      }
+    }
+  end
+)
diff --git a/user/.config/awesome/ui/theme.lua b/user/.config/awesome/ui/theme.lua
index caa026632..f7f10c1f4 100644
--- a/user/.config/awesome/ui/theme.lua
+++ b/user/.config/awesome/ui/theme.lua
@@ -1,6 +1,5 @@
 -- {{{ Imports
 local gears = require("gears")
-local gcolor = require("gears.color")
 local dpi = require("beautiful.xresources").apply_dpi
 local beautiful = require("beautiful")
 -- }}}
@@ -12,49 +11,53 @@ local theme = {}
 -- }}}
 
 -- {{{ theme font
-theme.font  = "mononoki Nerd Font 12"
+theme.font  = "mononoki Nerd Font 13"
 --- }}}
 
 -- {{{ bar colors
-theme.bar_bg_one = "#9ece6a"
-theme.bar_bg_two = "#ff9e64"
-theme.bar_bg_tre = "#f7768e"
+theme.bar_bg_one = "#f7768e"
+theme.bar_bg_two = "#e0af68"
+theme.bar_bg_tre = "#9ece6a"
 theme.bar_bg_for = "#7aa2f7"
 theme.bar_bg_fiv = "#bb9af7"
-theme.bar_clock  = "#a9b1d6"
+theme.bar_clock  = "#9aa5ce"
 --- }}}
 
 -- {{{ Colors
-theme.fg_normal  = "#1a1b26"
+theme.fg_normal  = "#243b26"
 theme.fg_focus   = "#a9b1d6"
 theme.fg_urgent  = "#c0caf5"
 theme.bg_normal  = "#1a1b26"
-theme.bg_focus   = "#363b54"
-theme.bg_urgent  = "#787c99"
+theme.bg_focus   = "#24283b"
+theme.bg_urgent  = "#24283b"
 -- }}}
 
 -- {{{ Borders
 beautiful.gap_single_client = false
 theme.useless_gap           = dpi(0)
-theme.border_width          = dpi(1)
-theme.border_normal         = "#363b54"
+theme.border_width          = dpi(0.5)
+theme.border_normal         = "#363b58"
 theme.border_focus          = "#7aa2f7"
 theme.border_marked         = "#7aa2f7"
 -- }}}
 
 -- {{{ Taglist
-theme.taglist_font          = "mononoki Nerd Font Mono 22"
-theme.taglist_fg_focus      = "#f7768e"
-theme.taglist_fg_occupied   = "#c0caf5"
-theme.taglist_fg_urgent     = "#bb9af7"
+theme.taglist_font          = "mononoki Nerd Font Mono 28"
+theme.taglist_bg            = "#24283b"
+theme.taglist_fg_focus      = "#d5d6db"
+theme.taglist_fg_occupied   = "#9aa5ce"
+theme.taglist_fg_urgent     = "#f7758e"
 theme.taglist_fg_empty      = "#565f89"
 theme.taglist_spacing       = 5
 -- }}}
 
 -- {{{ Notifications
 theme.notification_font     = "mononoki Nerd Font 12"
-theme.notification_bg       = "#1a1b26"
+theme.notification_bg       = "#24283b"
+theme.notification_bg_alt   = "#414868"
 theme.notification_fg       = "#c0caf5"
+theme.notification_fg_alt   = "#1a1b26"
+theme.notification_critical = "#f7768e"
 theme.notification_shape    = gears.shape.rounded_rect
 -- }}}
 
@@ -75,24 +78,24 @@ theme.mouse_finder_radius   = dpi(5)
 theme.mouse_finder_timeout  = 10
 -- }}}
 
--- {{{ Layout
-theme.layout_tile       = gcolor.recolor_image(themes_path .. "layout-icons/tilew.png", theme.fg_urgent)
-theme.layout_centerwork = gcolor.recolor_image(themes_path .. "layout-icons/centerworkw.png", theme.fg_urgent)
-theme.layout_tileleft   = gcolor.recolor_image(themes_path .. "layout-icons/tileleftw.png", theme.fg_urgent)
-theme.layout_tilebottom = gcolor.recolor_image(themes_path .. "layout-icons/tilebottomw.png", theme.fg_urgent)
-theme.layout_tiletop    = gcolor.recolor_image(themes_path .. "layout-icons/tiletopw.png", theme.fg_urgent)
-theme.layout_fairv      = gcolor.recolor_image(themes_path .. "layout-icons/fairvw.png", theme.fg_urgent)
-theme.layout_fairh      = gcolor.recolor_image(themes_path .. "layout-icons/fairhw.png", theme.fg_urgent)
-theme.layout_spiral     = gcolor.recolor_image(themes_path .. "layout-icons/spiralw.png", theme.fg_urgent)
-theme.layout_dwindle    = gcolor.recolor_image(themes_path .. "layout-icons/dwindlew.png", theme.fg_urgent)
-theme.layout_max        = gcolor.recolor_image(themes_path .. "layout-icons/maxw.png", theme.fg_urgent)
-theme.layout_fullscreen = gcolor.recolor_image(themes_path .. "layout-icons/fullscreenw.png", theme.fg_urgent)
-theme.layout_magnifier  = gcolor.recolor_image(themes_path .. "layout-icons/magnifierw.png", theme.fg_urgent)
-theme.layout_floating   = gcolor.recolor_image(themes_path .. "layout-icons/floatingw.png", theme.fg_urgent)
-theme.layout_cornernw   = gcolor.recolor_image(themes_path .. "layout-icons/cornernw.png", theme.fg_urgent)
-theme.layout_cornerne   = gcolor.recolor_image(themes_path .. "layout-icons/cornerne.png", theme.fg_urgent)
-theme.layout_cornersw   = gcolor.recolor_image(themes_path .. "layout-icons/cornersw.png", theme.fg_urgent)
-theme.layout_cornerse   = gcolor.recolor_image(themes_path .. "layout-icons/cornerse.png", theme.fg_urgent)
+-- {{{ Layout Icons
+theme.layout_tile       = gears.color.recolor_image(themes_path .. "icons/tilew.png", theme.fg_urgent)
+theme.layout_centerwork = gears.color.recolor_image(themes_path .. "icons/centerworkw.png", theme.fg_urgent)
+theme.layout_tileleft   = gears.color.recolor_image(themes_path .. "icons/tileleftw.png", theme.fg_urgent)
+theme.layout_tilebottom = gears.color.recolor_image(themes_path .. "icons/tilebottomw.png", theme.fg_urgent)
+theme.layout_tiletop    = gears.color.recolor_image(themes_path .. "icons/tiletopw.png", theme.fg_urgent)
+theme.layout_fairv      = gears.color.recolor_image(themes_path .. "icons/fairvw.png", theme.fg_urgent)
+theme.layout_fairh      = gears.color.recolor_image(themes_path .. "icons/fairhw.png", theme.fg_urgent)
+theme.layout_spiral     = gears.color.recolor_image(themes_path .. "icons/spiralw.png", theme.fg_urgent)
+theme.layout_dwindle    = gears.color.recolor_image(themes_path .. "icons/dwindlew.png", theme.fg_urgent)
+theme.layout_max        = gears.color.recolor_image(themes_path .. "icons/maxw.png", theme.fg_urgent)
+theme.layout_fullscreen = gears.color.recolor_image(themes_path .. "icons/fullscreenw.png", theme.fg_urgent)
+theme.layout_magnifier  = gears.color.recolor_image(themes_path .. "icons/magnifierw.png", theme.fg_urgent)
+theme.layout_floating   = gears.color.recolor_image(themes_path .. "icons/floatingw.png", theme.fg_urgent)
+theme.layout_cornernw   = gears.color.recolor_image(themes_path .. "icons/cornernw.png", theme.fg_urgent)
+theme.layout_cornerne   = gears.color.recolor_image(themes_path .. "icons/cornerne.png", theme.fg_urgent)
+theme.layout_cornersw   = gears.color.recolor_image(themes_path .. "icons/cornersw.png", theme.fg_urgent)
+theme.layout_cornerse   = gears.color.recolor_image(themes_path .. "icons/cornerse.png", theme.fg_urgent)
 -- }}}
 
 return theme
diff --git a/user/.config/awesome/ui/custom-widgets/battery b/user/.config/awesome/ui/widgets/battery
similarity index 100%
rename from user/.config/awesome/ui/custom-widgets/battery
rename to user/.config/awesome/ui/widgets/battery
diff --git a/user/.config/awesome/ui/custom-widgets/brightness b/user/.config/awesome/ui/widgets/brightness
similarity index 100%
rename from user/.config/awesome/ui/custom-widgets/brightness
rename to user/.config/awesome/ui/widgets/brightness
diff --git a/user/.config/awesome/ui/custom-widgets/layout b/user/.config/awesome/ui/widgets/layout
similarity index 100%
rename from user/.config/awesome/ui/custom-widgets/layout
rename to user/.config/awesome/ui/widgets/layout
diff --git a/user/.config/awesome/ui/custom-widgets/volume b/user/.config/awesome/ui/widgets/volume
similarity index 100%
rename from user/.config/awesome/ui/custom-widgets/volume
rename to user/.config/awesome/ui/widgets/volume
diff --git a/user/.config/awesome/ui/custom-widgets/wifi b/user/.config/awesome/ui/widgets/wifi
similarity index 71%
rename from user/.config/awesome/ui/custom-widgets/wifi
rename to user/.config/awesome/ui/widgets/wifi
index 5be8d0655..b6773a915 100755
--- a/user/.config/awesome/ui/custom-widgets/wifi
+++ b/user/.config/awesome/ui/widgets/wifi
@@ -3,10 +3,9 @@ constate=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f3 | head -
 currentwfi=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f4 | head -1)
 
 if [ "$constate" = "disconnected" ]; then
-    echo "睊 "
+    echo "睊  "
 elif [ "$constate" = "connected" ]; then
-    echo "直  $currentwfi"
+    echo "直 $currentwfi"
 else
-    notify-send " Airplane mode activated"
-    echo " "
+    echo "睊  "
 fi
diff --git a/user/.config/btop/btop.conf b/user/.config/btop/btop.conf
index 31ff5e1cb..b5def3333 100644
--- a/user/.config/btop/btop.conf
+++ b/user/.config/btop/btop.conf
@@ -2,7 +2,7 @@
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-color_theme = "/usr/share/btop/themes/gruvbox_dark_v2.theme"
+color_theme = "/usr/share/btop/themes/tokyo-night.theme"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
 theme_background = False
@@ -203,4 +203,4 @@ selected_battery = "Auto"
 
 #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
\ No newline at end of file
+log_level = "WARNING"