diff --git a/README.md b/README.md
index 21a7a53..c887f9f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ After 3 years of [xmonading](https://xmonad.org/), i wanted to give
 
 - This configuration use nerd patched font to get all the icons
 - Main theme is Gruvbox (see `themes` folder)
-- Wallpaper credits goes to [McSinyx](https://github.com/McSinyx/dotfiles)
+- Wallpaper credits goes to [atlas-ark](https://www.reddit.com/user/atlas-ark/)
 - Use of YAWL (yet another widget library, included in this configuration see `yawl` folder)
 
 ## License
diff --git a/rc.lua b/rc.lua
index 18c0c82..6f15a7b 100644
--- a/rc.lua
+++ b/rc.lua
@@ -32,21 +32,21 @@ local battery = require("yawl.widgets.battery")
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
     naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
+        title = "Oops, there were errors during startup!",
+        text = awesome.startup_errors })
 end
 
 -- Handle runtime errors after startup
 do
     local in_error = false
-    awesome.connect_signal("debug::error", function (err)
+    awesome.connect_signal("debug::error", function(err)
         -- Make sure we don't go into an endless error loop
         if in_error then return end
         in_error = true
 
         naughty.notify({ preset = naughty.config.presets.critical,
-                         title = "Oops, an error happened!",
-                         text = tostring(err) })
+            title = "Oops, an error happened!",
+            text = tostring(err) })
         in_error = false
     end)
 end
@@ -82,20 +82,20 @@ awful.layout.layouts = {
 -- {{{ Menu
 -- Create a launcher widget and a main menu
 myawesomemenu = {
-   { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
-   { "manual", terminal .. " -e man awesome" },
-   { "edit config", editor_cmd .. " " .. awesome.conffile },
-   { "restart", awesome.restart },
-   { "quit", function() awesome.quit() end },
+    { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
+    { "manual", terminal .. " -e man awesome" },
+    { "edit config", editor_cmd .. " " .. awesome.conffile },
+    { "restart", awesome.restart },
+    { "quit", function() awesome.quit() end },
 }
 
 mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+    { "open terminal", terminal }
+}
+})
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
-                                     menu = mymainmenu })
+    menu = mymainmenu })
 
 -- Menubar configuration
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
@@ -110,43 +110,43 @@ mytextclock = wibox.widget.textclock(" %H:%M · %d/%m/%y ")
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
-                    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.viewnext(t.screen) end),
-                    awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
-                )
+    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.viewnext(t.screen) end),
+    awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end)
+)
 
 local tasklist_buttons = gears.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if c == client.focus then
-                                                  c.minimized = true
-                                              else
-                                                  c:emit_signal(
-                                                      "request::activate",
-                                                      "tasklist",
-                                                      {raise = true}
-                                                  )
-                                              end
-                                          end),
-                     awful.button({ }, 3, function()
-                                              awful.menu.client_list({ theme = { width = 250 } })
-                                          end),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                          end))
+    awful.button({}, 1, function(c)
+        if c == client.focus then
+            c.minimized = true
+        else
+            c:emit_signal(
+                "request::activate",
+                "tasklist",
+                { raise = true }
+            )
+        end
+    end),
+    awful.button({}, 3, function()
+        awful.menu.client_list({ theme = { width = 250 } })
+    end),
+    awful.button({}, 4, function()
+        awful.client.focus.byidx(1)
+    end),
+    awful.button({}, 5, function()
+        awful.client.focus.byidx(-1)
+    end))
 
 local function set_wallpaper(s)
     -- Wallpaper
@@ -176,10 +176,10 @@ awful.screen.connect_for_each_screen(function(s)
     -- We need one layoutbox per screen.
     s.mylayoutbox = awful.widget.layoutbox(s)
     s.mylayoutbox:buttons(gears.table.join(
-                           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)))
+        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)))
     -- Create a taglist widget
     s.mytaglist = awful.widget.taglist {
         screen  = s,
@@ -195,7 +195,7 @@ awful.screen.connect_for_each_screen(function(s)
     }
 
     -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s, border_width = 4, border_color = "#282828" })
+    s.mywibox = awful.wibar({ position = "top", screen = s, border_width = 2, border_color = theme.bg_normal })
 
     -- Add widgets to the wibox
     s.mywibox:setup {
@@ -224,169 +224,167 @@ end)
 
 -- {{{ Mouse bindings
 root.buttons(gears.table.join(
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
+    awful.button({}, 3, function() mymainmenu:toggle() end),
+    awful.button({}, 4, awful.tag.viewnext),
+    awful.button({}, 5, awful.tag.viewprev)
 ))
 -- }}}
 
 -- {{{ Key bindings
 globalkeys = gears.table.join(
-    awful.key({ modkey,         }, "s",      hotkeys_popup.show_help,
-              {description="show help", group="awesome"}),
-    awful.key({ modkey, "Shift" }, "Left",   awful.tag.viewprev,
-              {description = "view previous", group = "tag"}),
-    awful.key({ modkey, "Shift" }, "Right",  awful.tag.viewnext,
-              {description = "view next", group = "tag"}),
-    awful.key({ modkey,         }, "y", awful.tag.history.restore,
-              {description = "go back", group = "tag"}),
+    awful.key({ modkey, }, "s", hotkeys_popup.show_help,
+        { description = "show help", group = "awesome" }),
+    awful.key({ modkey, "Shift" }, "Left", awful.tag.viewprev,
+        { description = "view previous", group = "tag" }),
+    awful.key({ modkey, "Shift" }, "Right", awful.tag.viewnext,
+        { description = "view next", group = "tag" }),
+    awful.key({ modkey, }, "y", awful.tag.history.restore,
+        { description = "go back", group = "tag" }),
 
-    awful.key({ modkey,         }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
+    awful.key({ modkey, }, "j",
+        function()
+            awful.client.focus.byidx(1)
         end,
-        {description = "focus next by index", group = "client"}
+        { description = "focus next by index", group = "client" }
     ),
-    awful.key({ modkey,        }, "k",
-        function ()
+    awful.key({ modkey, }, "k",
+        function()
             awful.client.focus.byidx(-1)
         end,
-        {description = "focus previous by index", group = "client"}
+        { description = "focus previous by index", group = "client" }
     ),
-    awful.key({ modkey,         }, "w", function () mymainmenu:show() end,
-              {description = "show main menu", group = "awesome"}),
+    awful.key({ modkey, }, "w", function() mymainmenu:show() end,
+        { description = "show main menu", group = "awesome" }),
 
     -- Layout manipulation
-    awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx(  1)    end,
-              {description = "swap with next client by index", group = "client"}),
-    awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1)    end,
-              {description = "swap with previous client by index", group = "client"}),
-    awful.key({ modkey          }, "o", function () awful.screen.focus_relative( 1) end,
-              {description = "focus the next screen", group = "screen"}),
-    awful.key({ modkey          }, "i", function () awful.screen.focus_relative(-1) end,
-              {description = "focus the previous screen", group = "screen"}),
-    awful.key({ modkey,         }, "u", awful.client.urgent.jumpto,
-              {description = "jump to urgent client", group = "client"}),
-    awful.key({ modkey,         }, "Tab",
-        function ()
+    awful.key({ modkey, "Shift" }, "j", function() awful.client.swap.byidx(1) end,
+        { description = "swap with next client by index", group = "client" }),
+    awful.key({ modkey, "Shift" }, "k", function() awful.client.swap.byidx(-1) end,
+        { description = "swap with previous client by index", group = "client" }),
+    awful.key({ modkey }, "o", function() awful.screen.focus_relative(1) end,
+        { description = "focus the next screen", group = "screen" }),
+    awful.key({ modkey }, "i", function() awful.screen.focus_relative(-1) end,
+        { description = "focus the previous screen", group = "screen" }),
+    awful.key({ modkey, }, "u", awful.client.urgent.jumpto,
+        { description = "jump to urgent client", group = "client" }),
+    awful.key({ modkey, }, "Tab",
+        function()
             awful.client.focus.history.previous()
             if client.focus then
                 client.focus:raise()
             end
         end,
-        {description = "go back", group = "client"}),
+        { description = "go back", group = "client" }),
 
     -- Standard program
-    awful.key({ mod4              }, "Return", function () awful.spawn(terminal) end,
-              {description = "open a terminal", group = "launcher"}),
+    awful.key({ mod4 }, "Return", function() awful.spawn(terminal) end,
+        { description = "open a terminal", group = "launcher" }),
     awful.key({ modkey, "Control" }, "r", awesome.restart,
-              {description = "reload awesome", group = "awesome"}),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit,
-              {description = "quit awesome", group = "awesome"}),
+        { description = "reload awesome", group = "awesome" }),
+    awful.key({ modkey, "Shift" }, "q", awesome.quit,
+        { description = "quit awesome", group = "awesome" }),
 
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,
-              {description = "increase master width factor", group = "layout"}),
-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,
-              {description = "decrease master width factor", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
-              {description = "increase the number of master clients", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,
-              {description = "decrease the number of master clients", group = "layout"}),
-    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,
-              {description = "increase the number of columns", group = "layout"}),
-    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,
-              {description = "decrease the number of columns", group = "layout"}),
-    awful.key({ modkey,           }, "space", function () awful.layout.inc( 1)                end,
-              {description = "select next", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,
-              {description = "select previous", group = "layout"}),
-    awful.key({ mod4  , "Shift"   }, "Return", function () awful.spawn(terminal .. " -t scratch") end,
-              {description = "start a scratch terminal", group = "launcher"}),
+    awful.key({ modkey, }, "l", function() awful.tag.incmwfact(0.05) end,
+        { description = "increase master width factor", group = "layout" }),
+    awful.key({ modkey, }, "h", function() awful.tag.incmwfact(-0.05) end,
+        { description = "decrease master width factor", group = "layout" }),
+    awful.key({ modkey, "Shift" }, "h", function() awful.tag.incnmaster(1, nil, true) end,
+        { description = "increase the number of master clients", group = "layout" }),
+    awful.key({ modkey, "Shift" }, "l", function() awful.tag.incnmaster(-1, nil, true) end,
+        { description = "decrease the number of master clients", group = "layout" }),
+    awful.key({ modkey, "Control" }, "h", function() awful.tag.incncol(1, nil, true) end,
+        { description = "increase the number of columns", group = "layout" }),
+    awful.key({ modkey, "Control" }, "l", function() awful.tag.incncol(-1, nil, true) end,
+        { description = "decrease the number of columns", group = "layout" }),
+    awful.key({ modkey, }, "space", function() awful.layout.inc(1) end,
+        { description = "select next", group = "layout" }),
+    awful.key({ modkey, "Shift" }, "space", function() awful.layout.inc(-1) end,
+        { description = "select previous", group = "layout" }),
+    awful.key({ mod4, "Shift" }, "Return", function() awful.spawn(terminal .. " -t scratch") end,
+        { description = "start a scratch terminal", group = "launcher" }),
 
 
     -- Launchers
-    awful.key({ mod4,             }, "space", function () awful.spawn("rofi -combi-modi window,drun -show combi -modi combi -m -4") end,
-              {description = "show rofi", group = "launcher"}),
-    awful.key({ mod4,             }, "r", function () awful.spawn("rofi-pass") end,
-              {description = "show rofi-pass", group = "launcher"}),
-    awful.key({ mod4,             }, "f", function () awful.spawn("brave") end,
-              {description = "start firefox", group = "launcher"}),
-    awful.key({ mod4,             }, "c", function () awful.spawn("code") end,
-              {description = "start vscode", group = "launcher"}),
+    awful.key({ mod4, }, "space", function() awful.spawn("rofi -combi-modi window,drun -show combi -modi combi -m -4") end,
+        { description = "show rofi", group = "launcher" }),
+    awful.key({ mod4, }, "r", function() awful.spawn("rofi-pass") end,
+        { description = "show rofi-pass", group = "launcher" }),
+    awful.key({ mod4, }, "f", function() awful.spawn("brave") end,
+        { description = "start firefox", group = "launcher" }),
 
     -- Lock screen
-    awful.key({ mod4,             }, "l", function () awful.spawn(".config/awesome/bin/saver.sh") end,
-              {description = "lock screen", group = "session"}),
+    awful.key({ mod4, }, "l", function() awful.spawn(".config/awesome/bin/saver.sh") end,
+        { description = "lock screen", group = "session" }),
 
     -- Volume controls
-    awful.key({                   }, "XF86AudioRaiseVolume", function () awful.spawn("pamixer -i 3") end,
-              {description = "raise volume", group = "volume"}),
-    awful.key({                   }, "XF86AudioLowerVolume", function () awful.spawn("pamixer -d 3") end,
-              {description = "lower volume", group = "volume"}),
-    awful.key({                   }, "XF86AudioMute", function () awful.spawn("pamixer -t") end,
-              {description = "mute volume", group = "volume"}),
+    awful.key({}, "XF86AudioRaiseVolume", function() awful.spawn("pamixer -i 3") end,
+        { description = "raise volume", group = "volume" }),
+    awful.key({}, "XF86AudioLowerVolume", function() awful.spawn("pamixer -d 3") end,
+        { description = "lower volume", group = "volume" }),
+    awful.key({}, "XF86AudioMute", function() awful.spawn("pamixer -t") end,
+        { description = "mute volume", group = "volume" }),
 
     -- Media controls
-    awful.key({                   }, "XF86AudioPlay", function () awful.spawn("playerctl play-pause") end,
-              {description = "play/pause song", group = "media"}),
-    awful.key({                   }, "XF86AudioNext", function () awful.spawn("playerctl next") end,
-              {description = "next song", group = "media"}),
-    awful.key({                   }, "XF86AudioPrev", function () awful.spawn("playerctl previous") end,
-              {description = "previous song", group = "media"}),
+    awful.key({}, "XF86AudioPlay", function() awful.spawn("playerctl play-pause") end,
+        { description = "play/pause song", group = "media" }),
+    awful.key({}, "XF86AudioNext", function() awful.spawn("playerctl next") end,
+        { description = "next song", group = "media" }),
+    awful.key({}, "XF86AudioPrev", function() awful.spawn("playerctl previous") end,
+        { description = "previous song", group = "media" }),
 
     -- Stretchly controls
-    awful.key({ mod4,             }, "u", function () awful.spawn("stretchly toggle") end,
-              {description = "toogle stretchly breaks", group = "stretchly"}),
-    awful.key({ mod4, "Shift"     }, "u", function () awful.spawn("stretchly reset") end,
-              {description = "reset stretchly breaks", group = "stretchly"}),
+    awful.key({ mod4, }, "u", function() awful.spawn("stretchly toggle") end,
+        { description = "toogle stretchly breaks", group = "stretchly" }),
+    awful.key({ mod4, "Shift" }, "u", function() awful.spawn("stretchly reset") end,
+        { description = "reset stretchly breaks", group = "stretchly" }),
 
 
     -- Notfications
-    awful.key({ mod4,            }, "x", function () naughty.destroy_all_notifications() end,
-              {description = "clear all notifications", group = "notifications"}),
+    awful.key({ mod4, }, "x", function() naughty.destroy_all_notifications() end,
+        { description = "clear all notifications", group = "notifications" }),
 
     -- brigthness controls
-    awful.key({                  }, "XF86MonBrightnessDown", function () awful.spawn("light -U 5") end,
-              {description = "down brigthness", group = "brigthness"}),
-    awful.key({                  }, "XF86MonBrightnessUp", function () awful.spawn("light -A 5") end,
-              {description = "up brigthness", group = "brigthness"})
+    awful.key({}, "XF86MonBrightnessDown", function() awful.spawn("light -U 5") end,
+        { description = "down brigthness", group = "brigthness" }),
+    awful.key({}, "XF86MonBrightnessUp", function() awful.spawn("light -A 5") end,
+        { description = "up brigthness", group = "brigthness" })
 
 
 )
 
 clientkeys = gears.table.join(
-    awful.key({ modkey,           }, "f",
-        function (c)
+    awful.key({ modkey, }, "f",
+        function(c)
             c.fullscreen = not c.fullscreen
             c:raise()
         end,
-        {description = "toggle fullscreen", group = "client"}),
-    awful.key({ mod4,             }, "q",      function (c) c:kill()                         end,
-              {description = "close", group = "client"}),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
-              {description = "toggle floating", group = "client"}),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
-              {description = "move to master", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "i",      function (c) c:move_to_screen()               end,
-              {description = "move to screen", group = "client"}),
-    awful.key({ modkey,           }, "m",
-        function (c)
+        { description = "toggle fullscreen", group = "client" }),
+    awful.key({ mod4, }, "q", function(c) c:kill() end,
+        { description = "close", group = "client" }),
+    awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle,
+        { description = "toggle floating", group = "client" }),
+    awful.key({ modkey, "Control" }, "Return", function(c) c:swap(awful.client.getmaster()) end,
+        { description = "move to master", group = "client" }),
+    awful.key({ modkey, "Shift" }, "i", function(c) c:move_to_screen() end,
+        { description = "move to screen", group = "client" }),
+    awful.key({ modkey, }, "m",
+        function(c)
             c.maximized = not c.maximized
             c:raise()
-        end ,
-        {description = "(un)maximize", group = "client"}),
+        end,
+        { description = "(un)maximize", group = "client" }),
     awful.key({ modkey, "Control" }, "m",
-        function (c)
+        function(c)
             c.maximized_vertical = not c.maximized_vertical
             c:raise()
-        end ,
-        {description = "(un)maximize vertically", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "m",
-        function (c)
+        end,
+        { description = "(un)maximize vertically", group = "client" }),
+    awful.key({ modkey, "Shift" }, "m",
+        function(c)
             c.maximized_horizontal = not c.maximized_horizontal
             c:raise()
-        end ,
-        {description = "(un)maximize horizontally", group = "client"})
+        end,
+        { description = "(un)maximize horizontally", group = "client" })
 )
 
 -- Bind all key numbers to tags.
@@ -396,59 +394,59 @@ for i = 1, 9 do
     globalkeys = gears.table.join(globalkeys,
         -- View tag only.
         awful.key({ "Control" }, "#" .. i + 9,
-                  function ()
-                        local screen = awful.screen.focused()
-                        local tag = screen.tags[i]
-                        if tag then
-                           tag:view_only()
-                        end
-                  end,
-                  {description = "view tag #"..i, group = "tag"}),
+            function()
+                local screen = awful.screen.focused()
+                local tag = screen.tags[i]
+                if tag then
+                    tag:view_only()
+                end
+            end,
+            { description = "view tag #" .. i, group = "tag" }),
         -- Toggle tag display.
         awful.key({ "Control", mod4 }, "#" .. i + 9,
-                  function ()
-                      local screen = awful.screen.focused()
-                      local tag = screen.tags[i]
-                      if tag then
-                         awful.tag.viewtoggle(tag)
-                      end
-                  end,
-                  {description = "toggle tag #" .. i, group = "tag"}),
+            function()
+                local screen = awful.screen.focused()
+                local tag = screen.tags[i]
+                if tag then
+                    awful.tag.viewtoggle(tag)
+                end
+            end,
+            { description = "toggle tag #" .. i, group = "tag" }),
         -- Move client to tag.
         awful.key({ "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = client.focus.screen.tags[i]
-                          if tag then
-                              client.focus:move_to_tag(tag)
-                          end
-                     end
-                  end,
-                  {description = "move focused client to tag #"..i, group = "tag"}),
+            function()
+                if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then
+                        client.focus:move_to_tag(tag)
+                    end
+                end
+            end,
+            { description = "move focused client to tag #" .. i, group = "tag" }),
         -- Toggle tag on focused client.
         awful.key({ modkey, mod4, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = client.focus.screen.tags[i]
-                          if tag then
-                              client.focus:toggle_tag(tag)
-                          end
-                      end
-                  end,
-                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+            function()
+                if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then
+                        client.focus:toggle_tag(tag)
+                    end
+                end
+            end,
+            { description = "toggle focused client on tag #" .. i, group = "tag" })
     )
 end
 
 clientbuttons = gears.table.join(
-    awful.button({ }, 1, function (c)
-        c:emit_signal("request::activate", "mouse_click", {raise = true})
+    awful.button({}, 1, function(c)
+        c:emit_signal("request::activate", "mouse_click", { raise = true })
     end),
-    awful.button({ modkey }, 1, function (c)
-        c:emit_signal("request::activate", "mouse_click", {raise = true})
+    awful.button({ modkey }, 1, function(c)
+        c:emit_signal("request::activate", "mouse_click", { raise = true })
         awful.mouse.client.move(c)
     end),
-    awful.button({ modkey }, 3, function (c)
-        c:emit_signal("request::activate", "mouse_click", {raise = true})
+    awful.button({ modkey }, 3, function(c)
+        c:emit_signal("request::activate", "mouse_click", { raise = true })
         awful.mouse.client.resize(c)
     end)
 )
@@ -461,52 +459,52 @@ root.keys(globalkeys)
 -- Rules to apply to new clients (through the "manage" signal).
 awful.rules.rules = {
     -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
-                     raise = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons,
-                     screen = awful.screen.preferred,
-                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
-     }
+    { rule = {},
+        properties = { border_width = beautiful.border_width,
+            border_color = beautiful.border_normal,
+            focus = awful.client.focus.filter,
+            raise = true,
+            keys = clientkeys,
+            buttons = clientbuttons,
+            screen = awful.screen.preferred,
+            placement = awful.placement.no_overlap + awful.placement.no_offscreen
+        }
     },
 
     -- Floating clients.
     { rule_any = {
         instance = {
-          "DTA",  -- Firefox addon DownThemAll.
-          "copyq",  -- Includes session name in class.
-          "pinentry",
+            "DTA", -- Firefox addon DownThemAll.
+            "copyq", -- Includes session name in class.
+            "pinentry",
         },
         class = {
-          "Arandr",
-          "Blueman-manager",
-          "Gpick",
-          "Kruler",
-          "MessageWin",  -- kalarm.
-          "Sxiv",
-          "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
-          "Wpa_gui",
-          "veromix",
-          "xtightvncviewer"},
+            "Arandr",
+            "Blueman-manager",
+            "Gpick",
+            "Kruler",
+            "MessageWin", -- kalarm.
+            "Sxiv",
+            "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
+            "Wpa_gui",
+            "veromix",
+            "xtightvncviewer" },
 
         -- Note that the name property shown in xprop might be set slightly after creation of the client
         -- and the name shown there might not match defined rules here.
         name = {
-          "Event Tester",  -- xev.
+            "Event Tester", -- xev.
         },
         role = {
-          "AlarmWindow",  -- Thunderbird's calendar.
-          "ConfigManager",  -- Thunderbird's about:config.
-          "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
+            "AlarmWindow", -- Thunderbird's calendar.
+            "ConfigManager", -- Thunderbird's about:config.
+            "pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
         }
-      }, properties = { floating = true }},
+    }, properties = { floating = true } },
 
     -- tiny scratchpad
     { rule = { name = "scratch" },
-       properties = {
+        properties = {
             floating = true,
             width = awful.screen.focused().workarea.width * 0.5,
             height = awful.screen.focused().workarea.height * 0.4
@@ -514,47 +512,47 @@ awful.rules.rules = {
     },
 
     -- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = false }
+    { rule_any = { type = { "normal", "dialog" }
+    }, properties = { titlebars_enabled = false }
     },
 
     -- Per app rules
     -- to tag 2
     { rule = { class = "Thunderbird" },
-       properties = { tag = tags[2] }
+        properties = { tag = tags[2] }
     },
 
     -- to tag 5
     { rule = { class = "[Ss]potify" },
-       properties = { tag = tags[5] }
+        properties = { tag = tags[5] }
     },
 
     -- to tag 6
     { rule = { class = "Keybase" },
-       properties = { tag = tags[6] }
+        properties = { tag = tags[6] }
     },
     { rule = { class = "discord" },
-       properties = { tag = tags[6] }
+        properties = { tag = tags[6] }
     },
     { rule = { class = "Slack" },
-       properties = { tag = tags[6] }
+        properties = { tag = tags[6] }
     },
     { rule = { class = "Telegram" },
-       properties = { tag = tags[6] }
+        properties = { tag = tags[6] }
     },
 }
 -- }}}
 
 -- {{{ Signals
 -- Signal function to execute when a new client appears.
-client.connect_signal("manage", function (c)
+client.connect_signal("manage", function(c)
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- if not awesome.startup then awful.client.setslave(c) end
 
     if awesome.startup
-      and not c.size_hints.user_position
-      and not c.size_hints.program_position then
+        and not c.size_hints.user_position
+        and not c.size_hints.program_position then
         -- Prevent clients from being unreachable after screen count changes.
         awful.placement.no_offscreen(c)
     end
@@ -564,17 +562,17 @@ end)
 client.connect_signal("request::titlebars", function(c)
     -- buttons for the titlebar
     local buttons = gears.table.join(
-        awful.button({ }, 1, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
+        awful.button({}, 1, function()
+            c:emit_signal("request::activate", "titlebar", { raise = true })
             awful.mouse.client.move(c)
         end),
-        awful.button({ }, 3, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
+        awful.button({}, 3, function()
+            c:emit_signal("request::activate", "titlebar", { raise = true })
             awful.mouse.client.resize(c)
         end)
     )
 
-    awful.titlebar(c) : setup {
+    awful.titlebar(c):setup {
         { -- Left
             awful.titlebar.widget.iconwidget(c),
             buttons = buttons,
@@ -589,11 +587,11 @@ client.connect_signal("request::titlebars", function(c)
             layout  = wibox.layout.flex.horizontal
         },
         { -- Right
-            awful.titlebar.widget.floatingbutton (c),
+            awful.titlebar.widget.floatingbutton(c),
             awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.stickybutton   (c),
-            awful.titlebar.widget.ontopbutton    (c),
-            awful.titlebar.widget.closebutton    (c),
+            awful.titlebar.widget.stickybutton(c),
+            awful.titlebar.widget.ontopbutton(c),
+            awful.titlebar.widget.closebutton(c),
             layout = wibox.layout.fixed.horizontal()
         },
         layout = wibox.layout.align.horizontal
@@ -602,7 +600,7 @@ end)
 
 -- Enable sloppy focus, so that focus follows mouse.
 client.connect_signal("mouse::enter", function(c)
-    c:emit_signal("request::activate", "mouse_enter", {raise = false})
+    c:emit_signal("request::activate", "mouse_enter", { raise = false })
 end)
 
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
@@ -611,24 +609,24 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n
 
 -- {{{ Startup applications
 do
-  local autostarts =
-  {
-    "xsetroot -cursor_name left_ptr",
-    "picom",
-    "unclutter",
-  }
+    local autostarts =
+    {
+        "xsetroot -cursor_name left_ptr",
+        "picom",
+        "unclutter",
+    }
 
-  for _,i in pairs(autostarts) do
-    awful.spawn.easy_async_with_shell(
-      'ps -C '.. i ..' |wc -l',
-      function(stdout, stderr, reason, exit_code)
-        gears.debug.dump(stdout)
-        if tonumber(stdout) or 0 < 2 then
-          awful.spawn(i)
+    for _, i in pairs(autostarts) do
+        awful.spawn.easy_async_with_shell(
+            'ps -C ' .. i .. ' |wc -l',
+            function(stdout, stderr, reason, exit_code)
+            gears.debug.dump(stdout)
+            if tonumber(stdout) or 0 < 2 then
+                awful.spawn(i)
+            end
         end
-      end
-    )
-  end
+        )
+    end
 end
 -- }}}
 
@@ -639,11 +637,11 @@ naughty.config.presets.spotify = {
         return true
     end,
 
-    height = 100,
-    width  = 400,
+    height    = 100,
+    width     = 400,
     icon_size = 90
 }
-table.insert(naughty.dbus.config.mapping, {{appname = "Spotify"}, naughty.config.presets.spotify})
+table.insert(naughty.dbus.config.mapping, { { appname = "Spotify" }, naughty.config.presets.spotify })
 
 naughty.config.padding = 15
 naughty.config.spacing = 10
diff --git a/scrot/current.png b/scrot/current.png
index b9ff6bf..66827c3 100644
Binary files a/scrot/current.png and b/scrot/current.png differ
diff --git a/themes/gruvbox/README.md b/themes/gruvbox/README.md
index b466927..1704efa 100644
--- a/themes/gruvbox/README.md
+++ b/themes/gruvbox/README.md
@@ -2,4 +2,6 @@
 
 ## Acknowledgement
 
-The background image and layouts icons credits goes to [McSinyx](https://github.com/McSinyx/dotfiles)
+Layouts icons credits goes to [McSinyx](https://github.com/McSinyx/dotfiles)
+
+Background image credits goes to [atlas-ark](https://www.reddit.com/user/atlas-ark/)
diff --git a/themes/gruvbox/awesome.png b/themes/gruvbox/awesome.png
index f926a0b..8e50a43 100644
Binary files a/themes/gruvbox/awesome.png and b/themes/gruvbox/awesome.png differ
diff --git a/themes/gruvbox/background.png b/themes/gruvbox/background.png
index f3a0e1e..864405f 100644
Binary files a/themes/gruvbox/background.png and b/themes/gruvbox/background.png differ
diff --git a/themes/gruvbox/layouts/cornerne.png b/themes/gruvbox/layouts/cornerne.png
index 0055c98..774f535 100644
Binary files a/themes/gruvbox/layouts/cornerne.png and b/themes/gruvbox/layouts/cornerne.png differ
diff --git a/themes/gruvbox/layouts/cornernw.png b/themes/gruvbox/layouts/cornernw.png
index 0951497..fbffe76 100644
Binary files a/themes/gruvbox/layouts/cornernw.png and b/themes/gruvbox/layouts/cornernw.png differ
diff --git a/themes/gruvbox/layouts/cornerse.png b/themes/gruvbox/layouts/cornerse.png
index c40d4f8..093c566 100644
Binary files a/themes/gruvbox/layouts/cornerse.png and b/themes/gruvbox/layouts/cornerse.png differ
diff --git a/themes/gruvbox/layouts/cornersw.png b/themes/gruvbox/layouts/cornersw.png
index b0fd9cd..16b3438 100644
Binary files a/themes/gruvbox/layouts/cornersw.png and b/themes/gruvbox/layouts/cornersw.png differ
diff --git a/themes/gruvbox/layouts/dwindle.png b/themes/gruvbox/layouts/dwindle.png
index d05ed6e..aff91e3 100644
Binary files a/themes/gruvbox/layouts/dwindle.png and b/themes/gruvbox/layouts/dwindle.png differ
diff --git a/themes/gruvbox/layouts/fairh.png b/themes/gruvbox/layouts/fairh.png
index 75d44d8..4851ed7 100644
Binary files a/themes/gruvbox/layouts/fairh.png and b/themes/gruvbox/layouts/fairh.png differ
diff --git a/themes/gruvbox/layouts/fairv.png b/themes/gruvbox/layouts/fairv.png
index 3d290e2..18955ce 100644
Binary files a/themes/gruvbox/layouts/fairv.png and b/themes/gruvbox/layouts/fairv.png differ
diff --git a/themes/gruvbox/layouts/floating.png b/themes/gruvbox/layouts/floating.png
index e003913..8bbca6e 100644
Binary files a/themes/gruvbox/layouts/floating.png and b/themes/gruvbox/layouts/floating.png differ
diff --git a/themes/gruvbox/layouts/fullscreen.png b/themes/gruvbox/layouts/fullscreen.png
index 33ea6f6..4686b87 100644
Binary files a/themes/gruvbox/layouts/fullscreen.png and b/themes/gruvbox/layouts/fullscreen.png differ
diff --git a/themes/gruvbox/layouts/magnifier.png b/themes/gruvbox/layouts/magnifier.png
index f6d753f..1e65c64 100644
Binary files a/themes/gruvbox/layouts/magnifier.png and b/themes/gruvbox/layouts/magnifier.png differ
diff --git a/themes/gruvbox/layouts/max.png b/themes/gruvbox/layouts/max.png
index fc5d8e6..6cb29ed 100644
Binary files a/themes/gruvbox/layouts/max.png and b/themes/gruvbox/layouts/max.png differ
diff --git a/themes/gruvbox/layouts/spiral.png b/themes/gruvbox/layouts/spiral.png
index 591d99d..a6d0792 100644
Binary files a/themes/gruvbox/layouts/spiral.png and b/themes/gruvbox/layouts/spiral.png differ
diff --git a/themes/gruvbox/layouts/tile.png b/themes/gruvbox/layouts/tile.png
index 4b27ce0..bdf12ca 100644
Binary files a/themes/gruvbox/layouts/tile.png and b/themes/gruvbox/layouts/tile.png differ
diff --git a/themes/gruvbox/layouts/tilebottom.png b/themes/gruvbox/layouts/tilebottom.png
index 286d6a1..6d8d8eb 100644
Binary files a/themes/gruvbox/layouts/tilebottom.png and b/themes/gruvbox/layouts/tilebottom.png differ
diff --git a/themes/gruvbox/layouts/tileleft.png b/themes/gruvbox/layouts/tileleft.png
index 03463ee..2c106a0 100644
Binary files a/themes/gruvbox/layouts/tileleft.png and b/themes/gruvbox/layouts/tileleft.png differ
diff --git a/themes/gruvbox/layouts/tiletop.png b/themes/gruvbox/layouts/tiletop.png
index c07b4f6..ba9c06d 100644
Binary files a/themes/gruvbox/layouts/tiletop.png and b/themes/gruvbox/layouts/tiletop.png differ
diff --git a/themes/gruvbox/submenu.png b/themes/gruvbox/submenu.png
index 53f03b4..61a8ced 100644
Binary files a/themes/gruvbox/submenu.png and b/themes/gruvbox/submenu.png differ
diff --git a/themes/gruvbox/tags/focus.png b/themes/gruvbox/tags/focus.png
index 9848f90..9f75a18 100644
Binary files a/themes/gruvbox/tags/focus.png and b/themes/gruvbox/tags/focus.png differ
diff --git a/themes/gruvbox/theme.lua b/themes/gruvbox/theme.lua
index 7df5321..5c90cce 100644
--- a/themes/gruvbox/theme.lua
+++ b/themes/gruvbox/theme.lua
@@ -10,65 +10,65 @@ theme.wallpaper = theme.wd .. "background.png"
 theme.awesome_icon = theme.wd .. "awesome.png"
 
 -- fonts
-theme.base_font     = "Fira Code"
-theme.font          = theme.base_font .. " 8"
-theme.hotkeys_font  = theme.base_font .. " 8"
-theme.taglist_font  = "Fira Code 15"
-theme.icon_font     = theme.base_font .. " 8"
+theme.base_font                = "Fira Code"
+theme.font                     = theme.base_font .. " 8"
+theme.hotkeys_font             = theme.base_font .. " 8"
+theme.taglist_font             = "Fira Code 15"
+theme.icon_font                = theme.base_font .. " 8"
 theme.hotkeys_description_font = theme.font
 
 -- colors
-theme.bg_normal     = "#282828"
-theme.bg_focus      = "#3c3836"
-theme.fg_normal     = "#ebdbb2"
-theme.fg_urgent     = "#cc241d"
-theme.border_normal = "#928374"
-theme.border_focus  = "#fabd2f"
-theme.bg_urgent     = theme.bg_normal
-theme.bg_minimize   = theme.bg_focus
-theme.bg_systray    = theme.bg_normal
-theme.hotkeys_bg    = theme.bg_normal
-theme.fg_focus      = theme.fg_normal
-theme.fg_minimize   = theme.fg_normal
-theme.hotkeys_fg    = theme.fg_normal
+theme.bg_normal            = "#fbf1c7"
+theme.bg_focus             = "#f2e5bc"
+theme.fg_normal            = "#3c3836"
+theme.fg_urgent            = "#cc241d"
+theme.border_normal        = "#928374"
+theme.border_focus         = "#b16286"
+theme.bg_urgent            = theme.bg_normal
+theme.bg_minimize          = theme.bg_focus
+theme.bg_systray           = theme.bg_normal
+theme.hotkeys_bg           = theme.bg_normal
+theme.fg_focus             = theme.fg_normal
+theme.fg_minimize          = theme.fg_normal
+theme.hotkeys_fg           = theme.fg_normal
 theme.hotkeys_border_color = theme.border_focus
 theme.hotkeys_border_width = theme.border_width
 theme.hotkeys_modifiers_fg = theme.fg_urgent
 
 -- borders and gaps
-theme.useless_gap   = 4
-theme.border_width  = 4
+theme.useless_gap  = 4
+theme.border_width = 4
 
 -- taglist
 theme.taglist_squares_sel   = theme.wd .. "tags/focus.png"
 theme.taglist_squares_unsel = theme.wd .. "tags/base.png"
-theme.taglist_font = theme.taglist_font
+theme.taglist_font          = theme.taglist_font
 
 -- tasklist
 theme.tasklist_disable_icon = true
 
 -- menu
 theme.menu_submenu_icon = theme.wd .. "submenu.png"
-theme.menu_height = 22
-theme.menu_width  = 160
+theme.menu_height       = 22
+theme.menu_width        = 160
 
 -- layouts icons
-theme.layout_fairh = theme.wd .. "layouts/fairh.png"
-theme.layout_fairv = theme.wd .. "layouts/fairv.png"
-theme.layout_floating  = theme.wd .. "layouts/floating.png"
-theme.layout_magnifier = theme.wd .. "layouts/magnifier.png"
-theme.layout_max = theme.wd .. "layouts/max.png"
+theme.layout_fairh      = theme.wd .. "layouts/fairh.png"
+theme.layout_fairv      = theme.wd .. "layouts/fairv.png"
+theme.layout_floating   = theme.wd .. "layouts/floating.png"
+theme.layout_magnifier  = theme.wd .. "layouts/magnifier.png"
+theme.layout_max        = theme.wd .. "layouts/max.png"
 theme.layout_fullscreen = theme.wd .. "layouts/fullscreen.png"
 theme.layout_tilebottom = theme.wd .. "layouts/tilebottom.png"
 theme.layout_tileleft   = theme.wd .. "layouts/tileleft.png"
-theme.layout_tile = theme.wd .. "layouts/tile.png"
-theme.layout_tiletop = theme.wd .. "layouts/tiletop.png"
-theme.layout_spiral  = theme.wd .. "layouts/spiral.png"
-theme.layout_dwindle = theme.wd .. "layouts/dwindle.png"
-theme.layout_cornernw = theme.wd .. "layouts/cornernw.png"
-theme.layout_cornerne = theme.wd .. "layouts/cornerne.png"
-theme.layout_cornersw = theme.wd .. "layouts/cornersw.png"
-theme.layout_cornerse = theme.wd .. "layouts/cornerse.png"
+theme.layout_tile       = theme.wd .. "layouts/tile.png"
+theme.layout_tiletop    = theme.wd .. "layouts/tiletop.png"
+theme.layout_spiral     = theme.wd .. "layouts/spiral.png"
+theme.layout_dwindle    = theme.wd .. "layouts/dwindle.png"
+theme.layout_cornernw   = theme.wd .. "layouts/cornernw.png"
+theme.layout_cornerne   = theme.wd .. "layouts/cornerne.png"
+theme.layout_cornersw   = theme.wd .. "layouts/cornersw.png"
+theme.layout_cornerse   = theme.wd .. "layouts/cornerse.png"
 
 -- YAWL required theme settings
 theme.yawl_font              = theme.font
@@ -84,10 +84,6 @@ theme.yawl_battery_full      = theme.yawl_bg_ok
 theme.yawl_battery_mid       = "#d79921"
 theme.yawl_battery_low       = theme.yawl_bg_nok
 theme.yawl_pomodoro_absent   = theme.bg_normal
-theme.yawl_pomodoro          = theme.fg_normal
-theme.yawl_pomodoro_working  = "#d79921"
-theme.yawl_pomodoro_break    = "#689d6a"
-theme.yawl_pomodoro_paused   = "#cc241d"
 
 -- Naughty
 theme.naughty_bg_urgent = theme.fg_urgent