diff --git a/user/.config/awesome/core/bar/bar.lua b/user/.config/awesome/core/bar/bar.lua
index 47942987a..3c5376d8f 100644
--- a/user/.config/awesome/core/bar/bar.lua
+++ b/user/.config/awesome/core/bar/bar.lua
@@ -1,6 +1,6 @@
 local wibox = require("wibox")
 local awful = require("awful")
-local theme = require("theme.gruvbox.theme")
+local theme = require("theme.theme")
 
 -- Keyboard layout widget
 mykeyboardlayout = awful.widget.keyboardlayout()
diff --git a/user/.config/awesome/core/signals.lua b/user/.config/awesome/core/signals.lua
new file mode 100644
index 000000000..f1498618b
--- /dev/null
+++ b/user/.config/awesome/core/signals.lua
@@ -0,0 +1,13 @@
+-- No borders when rearranging only 1 non-floating or maximized client
+screen.connect_signal("arrange", function (s)
+    local max = s.selected_tag.layout.name == "max"
+    local only_one = #s.tiled_clients == 1 -- use tiled_clients so that other floating windows don't affect the count
+    -- but iterate over clients instead of tiled_clients as tiled_clients doesn't include maximized windows
+    for _, c in pairs(s.clients) do
+        if (max or only_one) and not c.floating or c.maximized then
+            c.border_width = 0
+        else
+            c.border_width = beautiful.border_width
+        end
+    end
+end)
diff --git a/user/.config/awesome/rc.lua b/user/.config/awesome/rc.lua
index a2cdbca1b..60ee09d9e 100644
--- a/user/.config/awesome/rc.lua
+++ b/user/.config/awesome/rc.lua
@@ -1,9 +1,12 @@
+-- Imports
+local beautiful = require("beautiful")
+beautiful.init(string.format("%s/.config/awesome/theme/theme.lua", os.getenv("HOME"))) -- Selected theme
 require("core.error_handling")
 require("core.apps")
-require("theme.init")
 require("core.layouts")
 require("core.bar.bar")
 require("core.bindings")
 require("core.rules")
 require("core.notif")
+require("core.signals")
 require("core.autostart")
diff --git a/user/.config/awesome/theme/gruvbox/archlinux.png b/user/.config/awesome/theme/gruvbox/archlinux.png
deleted file mode 100644
index 0e660a7d5..000000000
Binary files a/user/.config/awesome/theme/gruvbox/archlinux.png and /dev/null differ
diff --git a/user/.config/awesome/theme/gruvbox/awesome.png b/user/.config/awesome/theme/gruvbox/awesome.png
deleted file mode 100644
index ffb105e64..000000000
Binary files a/user/.config/awesome/theme/gruvbox/awesome.png and /dev/null differ
diff --git a/user/.config/awesome/theme/gruvbox/background.jpg b/user/.config/awesome/theme/gruvbox/background.jpg
deleted file mode 100644
index 74bc1ceb7..000000000
Binary files a/user/.config/awesome/theme/gruvbox/background.jpg and /dev/null differ
diff --git a/user/.config/awesome/theme/gruvbox/screenshot.png b/user/.config/awesome/theme/gruvbox/screenshot.png
deleted file mode 100644
index 0e062b997..000000000
Binary files a/user/.config/awesome/theme/gruvbox/screenshot.png and /dev/null differ
diff --git a/user/.config/awesome/theme/gruvbox/submenu.png b/user/.config/awesome/theme/gruvbox/submenu.png
deleted file mode 100644
index b2778e2eb..000000000
Binary files a/user/.config/awesome/theme/gruvbox/submenu.png and /dev/null differ
diff --git a/user/.config/awesome/theme/gruvbox/theme.lua b/user/.config/awesome/theme/gruvbox/theme.lua
deleted file mode 100644
index 7e554d225..000000000
--- a/user/.config/awesome/theme/gruvbox/theme.lua
+++ /dev/null
@@ -1,110 +0,0 @@
--- {{{ Imports
-local gears = require("gears")
-local dpi = require("beautiful.xresources").apply_dpi
-local beautiful = require("beautiful")
--- }}}
-
-local themes_path = string.format("%s/.config/awesome/theme/", os.getenv("HOME"))
-
--- {{{ Main
-local theme = {}
--- }}}
-
--- {{{ theme font
-theme.font          = "mononoki Nerd Font 12"
---- }}}
-
--- {{{ bar colors
-theme.bar_bg_one = "#427b58"
-theme.bar_bg_two = "#076678"
-theme.bar_bg_tre = "#b57614"
-theme.bar_bg_for = "#9d0006"
-theme.bar_bg_fiv = "#8f3f71"
-theme.bar_clock = "#3c3836"
---- }}}
-
-
--- {{{ Colors
-theme.fg_normal  = "#ebdbb2"
-theme.fg_focus   = "#dfc4a1"
-theme.fg_urgent  = "#fbf1c7"
-theme.bg_normal  = "#1d2021"
-theme.bg_focus   = "#3c3836"
-theme.bg_urgent  = "#a89984"
--- }}}
-
--- {{{ Borders
--- No borders when rearranging only 1 non-floating or maximized client
-screen.connect_signal("arrange", function (s)
-    local max = s.selected_tag.layout.name == "max"
-    local only_one = #s.tiled_clients == 1 -- use tiled_clients so that other floating windows don't affect the count
-    -- but iterate over clients instead of tiled_clients as tiled_clients doesn't include maximized windows
-    for _, c in pairs(s.clients) do
-        if (max or only_one) and not c.floating or c.maximized then
-            c.border_width = 0
-        else
-            c.border_width = beautiful.border_width
-        end
-    end
-end)
-beautiful.gap_single_client = false
-theme.useless_gap   = dpi(1)
-theme.border_width  = dpi(1)
-theme.border_normal = "#504945"
-theme.border_focus  = "#9d0006"
-theme.border_marked = "#9d0006"
--- }}}
-
--- {{{ Taglist
-theme.taglist_font          = "mononoki Nerd Font Mono 24"
-theme.taglist_fg_focus      = "#fb4934"
-theme.taglist_fg_occupied   = "#8ec07c"
-theme.taglist_fg_urgent     = "#504945"
-theme.taglist_fg_empty      = "#a89984"
-theme.taglist_spacing       = 5
--- }}}
-
--- {{{ Notifications
-theme.notification_font     = "mononoki Nerd Font 12"
-theme.notification_bg       = "#282828"
-theme.notification_fg       = "#fbf1c7"
-theme.notification_shape    = gears.shape.rounded_rect
--- }}}
-
--- {{{ Hotkeys Popup
-theme.hotkeys_bg    = "#282828"
-theme.hotkeys_fg    = "#ebdbb2"
-theme.hotkeys_modifiers_fg  = "#458588"
-theme.hotkeys_label_bg      = "#fabd2f"
-theme.hotkeys_label_fg      = "#1d2021"
-theme.hotkeys_group_margin  = dpi(20)
-theme.hotkeys_description_font  = "mononoki Nerd Font 12"
-theme.hotkeys_font              = "mononoki Nerd Font 12"
--- }}}
-
--- {{{ Mouse finder
-theme.mouse_finder_color    = "#cc241d"
-theme.mouse_finder_radius   = dpi(5)
-theme.mouse_finder_timeout  = 10
--- }}}
-
--- {{{ Layout
-theme.layout_tile       = themes_path .. "gruvbox/layouts/tile.png"
-theme.layout_tileleft   = themes_path .. "gruvbox/layouts/tileleft.png"
-theme.layout_tilebottom = themes_path .. "gruvbox/layouts/tilebottom.png"
-theme.layout_tiletop    = themes_path .. "gruvbox/layouts/tiletop.png"
-theme.layout_fairv      = themes_path .. "gruvbox/layouts/fairv.png"
-theme.layout_fairh      = themes_path .. "gruvbox/layouts/fairh.png"
-theme.layout_spiral     = themes_path .. "gruvbox/layouts/spiral.png"
-theme.layout_dwindle    = themes_path .. "gruvbox/layouts/dwindle.png"
-theme.layout_max        = themes_path .. "gruvbox/layouts/max.png"
-theme.layout_fullscreen = themes_path .. "gruvbox/layouts/fullscreen.png"
-theme.layout_magnifier  = themes_path .. "gruvbox/layouts/magnifier.png"
-theme.layout_floating   = themes_path .. "gruvbox/layouts/floating.png"
-theme.layout_cornernw   = themes_path .. "gruvbox/layouts/cornernw.png"
-theme.layout_cornerne   = themes_path .. "gruvbox/layouts/cornerne.png"
-theme.layout_cornersw   = themes_path .. "gruvbox/layouts/cornersw.png"
-theme.layout_cornerse   = themes_path .. "gruvbox/layouts/cornerse.png"
--- }}}
-
-return theme
diff --git a/user/.config/awesome/theme/init.lua b/user/.config/awesome/theme/init.lua
deleted file mode 100644
index 2bc6d2088..000000000
--- a/user/.config/awesome/theme/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local beautiful = require("beautiful")
-local gears = require("gears")
--- Selected theme
-beautiful.init(string.format("%s/.config/awesome/theme/gruvbox/theme.lua", os.getenv("HOME")))
diff --git a/user/.config/awesome/theme/gruvbox/layouts/cornerne.png b/user/.config/awesome/theme/layouts/cornerne.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/cornerne.png
rename to user/.config/awesome/theme/layouts/cornerne.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/cornernw.png b/user/.config/awesome/theme/layouts/cornernw.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/cornernw.png
rename to user/.config/awesome/theme/layouts/cornernw.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/cornerse.png b/user/.config/awesome/theme/layouts/cornerse.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/cornerse.png
rename to user/.config/awesome/theme/layouts/cornerse.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/cornersw.png b/user/.config/awesome/theme/layouts/cornersw.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/cornersw.png
rename to user/.config/awesome/theme/layouts/cornersw.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/dwindle.png b/user/.config/awesome/theme/layouts/dwindle.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/dwindle.png
rename to user/.config/awesome/theme/layouts/dwindle.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/fairh.png b/user/.config/awesome/theme/layouts/fairh.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/fairh.png
rename to user/.config/awesome/theme/layouts/fairh.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/fairv.png b/user/.config/awesome/theme/layouts/fairv.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/fairv.png
rename to user/.config/awesome/theme/layouts/fairv.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/floating.png b/user/.config/awesome/theme/layouts/floating.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/floating.png
rename to user/.config/awesome/theme/layouts/floating.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/fullscreen.png b/user/.config/awesome/theme/layouts/fullscreen.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/fullscreen.png
rename to user/.config/awesome/theme/layouts/fullscreen.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/magnifier.png b/user/.config/awesome/theme/layouts/magnifier.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/magnifier.png
rename to user/.config/awesome/theme/layouts/magnifier.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/max.png b/user/.config/awesome/theme/layouts/max.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/max.png
rename to user/.config/awesome/theme/layouts/max.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/spiral.png b/user/.config/awesome/theme/layouts/spiral.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/spiral.png
rename to user/.config/awesome/theme/layouts/spiral.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/tile.png b/user/.config/awesome/theme/layouts/tile.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/tile.png
rename to user/.config/awesome/theme/layouts/tile.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/tilebottom.png b/user/.config/awesome/theme/layouts/tilebottom.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/tilebottom.png
rename to user/.config/awesome/theme/layouts/tilebottom.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/tileleft.png b/user/.config/awesome/theme/layouts/tileleft.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/tileleft.png
rename to user/.config/awesome/theme/layouts/tileleft.png
diff --git a/user/.config/awesome/theme/gruvbox/layouts/tiletop.png b/user/.config/awesome/theme/layouts/tiletop.png
similarity index 100%
rename from user/.config/awesome/theme/gruvbox/layouts/tiletop.png
rename to user/.config/awesome/theme/layouts/tiletop.png
diff --git a/user/.config/awesome/theme/theme.lua b/user/.config/awesome/theme/theme.lua
new file mode 100644
index 000000000..5c46b6ff6
--- /dev/null
+++ b/user/.config/awesome/theme/theme.lua
@@ -0,0 +1,96 @@
+-- {{{ Imports
+local gears = require("gears")
+local dpi = require("beautiful.xresources").apply_dpi
+local beautiful = require("beautiful")
+-- }}}
+
+local themes_path = string.format("%s/.config/awesome/theme/", os.getenv("HOME"))
+
+-- {{{ Main
+local theme = {}
+-- }}}
+
+-- {{{ theme font
+theme.font          = "mononoki Nerd Font 12"
+--- }}}
+
+-- {{{ bar colors
+theme.bar_bg_one = "#427b58"
+theme.bar_bg_two = "#076678"
+theme.bar_bg_tre = "#b57614"
+theme.bar_bg_for = "#9d0006"
+theme.bar_bg_fiv = "#8f3f71"
+theme.bar_clock  = "#3c3836"
+--- }}}
+
+-- {{{ Colors
+theme.fg_normal  = "#ebdbb2"
+theme.fg_focus   = "#dfc4a1"
+theme.fg_urgent  = "#fbf1c7"
+theme.bg_normal  = "#1d2021"
+theme.bg_focus   = "#3c3836"
+theme.bg_urgent  = "#a89984"
+-- }}}
+
+-- {{{ Borders
+beautiful.gap_single_client = false
+theme.useless_gap   = dpi(0)
+theme.border_width  = dpi(0.5)
+theme.border_normal = "#504945"
+theme.border_focus  = "#9d0006"
+theme.border_marked = "#9d0006"
+-- }}}
+
+-- {{{ Taglist
+theme.taglist_font          = "mononoki Nerd Font Mono 24"
+theme.taglist_fg_focus      = "#fb4934"
+theme.taglist_fg_occupied   = "#8ec07c"
+theme.taglist_fg_urgent     = "#504945"
+theme.taglist_fg_empty      = "#a89984"
+theme.taglist_spacing       = 5
+-- }}}
+
+-- {{{ Notifications
+theme.notification_font     = "mononoki Nerd Font Mono 12"
+theme.notification_bg       = "#282828"
+theme.notification_fg       = "#fbf1c7"
+theme.notification_shape    = gears.shape.rounded_rect
+-- }}}
+
+-- {{{ Hotkeys Popup
+theme.hotkeys_bg    = "#282828"
+theme.hotkeys_fg    = "#ebdbb2"
+theme.hotkeys_modifiers_fg  = "#458588"
+theme.hotkeys_label_bg      = "#fabd2f"
+theme.hotkeys_label_fg      = "#1d2021"
+theme.hotkeys_group_margin  = dpi(20)
+theme.hotkeys_description_font  = "mononoki Nerd Font Mono 12"
+theme.hotkeys_font              = "mononoki Nerd Font Mono 12"
+-- }}}
+
+-- {{{ Mouse finder
+theme.mouse_finder_color    = "#cc241d"
+theme.mouse_finder_radius   = dpi(5)
+theme.mouse_finder_timeout  = 10
+-- }}}
+
+-- {{{ Layout
+theme.layout_tile       = themes_path .. "layouts/tile.png"
+theme.layout_tileleft   = themes_path .. "layouts/tileleft.png"
+theme.layout_tilebottom = themes_path .. "layouts/tilebottom.png"
+theme.layout_tiletop    = themes_path .. "layouts/tiletop.png"
+theme.layout_fairv      = themes_path .. "layouts/fairv.png"
+theme.layout_fairh      = themes_path .. "layouts/fairh.png"
+theme.layout_spiral     = themes_path .. "layouts/spiral.png"
+theme.layout_dwindle    = themes_path .. "layouts/dwindle.png"
+theme.layout_max        = themes_path .. "layouts/max.png"
+theme.layout_fullscreen = themes_path .. "layouts/fullscreen.png"
+theme.layout_magnifier  = themes_path .. "layouts/magnifier.png"
+theme.layout_floating   = themes_path .. "layouts/floating.png"
+theme.layout_cornernw   = themes_path .. "layouts/cornernw.png"
+theme.layout_cornerne   = themes_path .. "layouts/cornerne.png"
+theme.layout_cornersw   = themes_path .. "layouts/cornersw.png"
+theme.layout_cornerse   = themes_path .. "layouts/cornerse.png"
+-- }}}
+
+return theme