diff --git a/.gitmodules b/.gitmodules
index 5bc7f34..fe1477e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "awesome/.config/awesome/freedesktop"]
 	path = awesome/.config/awesome/freedesktop
 	url = https://github.com/lcpz/awesome-freedesktop
+[submodule "awesome/.config/awesome/awesome-wm-widgets"]
+	path = awesome/.config/awesome/awesome-wm-widgets
+	url = https://github.com/streetturtle/awesome-wm-widgets
diff --git a/awesome/.config/awesome/awesome-wm-widgets b/awesome/.config/awesome/awesome-wm-widgets
new file mode 160000
index 0000000..3bb3d56
--- /dev/null
+++ b/awesome/.config/awesome/awesome-wm-widgets
@@ -0,0 +1 @@
+Subproject commit 3bb3d56c26ac3500aab33381af0cccebf6aaa05c
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index f2ec584..af9ab90 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -168,6 +168,13 @@ local function set_wallpaper(s)
     end
 end
 
+
+
+-- WIDGETS
+
+local battery_widget = require("awesome-wm-widgets.battery-widget.battery")
+local cpu = lain.widget.cpu()
+
 -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
 screen.connect_signal("property::geometry", set_wallpaper)
 
@@ -218,9 +225,17 @@ awful.screen.connect_for_each_screen(function(s)
         s.mytasklist, -- Middle widget
         
         { -- Right widgets
+			-- Colors: #DDDD77 #77DDDD #DD77DD #7777DD #77DD77
         	layout = wibox.layout.fixed.horizontal,
-            arrow("alpha", "#DD77DD"),
-            wibox.container.background( mykeyboardlayout, "#DD77DD"),
+            arrow("alpha", "#DDDD77"),
+            wibox.container.background( mykeyboardlayout, "#DDDD77"),
+            arrow("#DDDD77", "#77DDDD"),
+            wibox.container.background( nil , "#77DDDD"),
+            arrow("#77DDDD", "#DD77DD"),
+            wibox.container.background( battery_widget({
+                show_current_level = true,
+                margin_right = 2,
+            }), "#DD77DD"),
             arrow("#DD77DD", "#7777DD"),
             wibox.container.background( wibox.widget.systray(), "#7777DD"),
             arrow("#7777DD", "#77DD77"),
@@ -593,7 +608,6 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n
 awful.spawn.once("lxsession") -- Let's run an lxsession which has a polkit
 awful.spawn.once("picom") -- Compositor
 awful.spawn.once("nm-applet") -- Network Manager applet
-awful.spawn.once("volumeicon") -- Volume icon
 awful.spawn.once("autorandr -l dual") -- Load my dual monitor autorandr config
 
 -- Wallpaper
diff --git a/setup b/setup
index a21a120..2dee35b 100755
--- a/setup
+++ b/setup
@@ -12,7 +12,7 @@ else
     echo "Updating Arch"
     sudo pacman -Syyu
     echo "Installing tools/utils"
-    sudo pacman -S ripgrep fd neovim make stow tmux awesome dmenu arandr autorandr volumeicon picom nitrogen network-manager-applet lxsession thunar lxappearance-gtk3 power-profiles-daemon thermald
+    sudo pacman -S ripgrep fd neovim make stow tmux awesome dmenu arandr autorandr volumeicon picom nitrogen network-manager-applet lxsession thunar lxappearance-gtk3 power-profiles-daemon thermald acpi arc-icon-theme
 
     sudo systemctl enable --now power-profiles-daemon
     sudo thermald --systemd