diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 555e1d0..7fb8410 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -60,9 +60,9 @@ input {
 general {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    gaps_in = 5
-    gaps_out = 20
-    border_size = 2
+    gaps_in = 20
+    gaps_out = 40
+    border_size = 3
     col.active_border = $color4 $color13 45deg
     col.inactive_border = $color0
 
diff --git a/hypr/scripts/start-waybar.sh b/hypr/scripts/start-waybar.sh
index b244081..b93d47a 100644
--- a/hypr/scripts/start-waybar.sh
+++ b/hypr/scripts/start-waybar.sh
@@ -5,7 +5,7 @@ CONFIG_FILES="$HOME/.config/waybar/ $HOME/.cache/wal/"
 trap "killall waybar" EXIT
 
 while true; do
-	sleep 0.4
+	sleep 1.6
 	waybar &
 	inotifywait -e create,modify -r $CONFIG_FILES
 	killall waybar
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index ce24392..67f67e7 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -8,7 +8,8 @@
     // Choose the order of the modules
     "modules-left": [
         "hyprland/workspaces",
-        "tray"
+        "tray",
+        "hyprland/window"
     ],
     "modules-center": [
         "custom/spotify"
@@ -26,11 +27,23 @@
     ],
     "idle_inhibitor": {
         "format": "{icon}",
+        "tooltip-format-activated": "On",
+        "tooltip-format-deactivated": "Off",
         "format-icons": {
-            "activated": "󰒳",
-            "deactivated": "󰒲"
+            "activated": "󱫗",
+            "deactivated": "󰔛"
         }
     },
+    "hyprland/window": {
+      "format": "{}",
+      "rewrite": {
+          "(.*) — Mozilla Firefox": "󰈹  $1",
+          "(.*) - fish": "> [$1]",
+          "nv": "  neovim"
+      },
+      "separate-outputs": true,
+      "max-length": "40"
+    },
     "tray": {
         "icon-size": 18,
         "spacing": 10
diff --git a/waybar/modules/switch-wallpaper.sh b/waybar/modules/switch-wallpaper.sh
index d3bf6dd..0d2129c 100644
--- a/waybar/modules/switch-wallpaper.sh
+++ b/waybar/modules/switch-wallpaper.sh
@@ -4,7 +4,5 @@ wal -i ~/Wallpapers/ -n
 # Using feh to tile the wallpaper now.
 # We grab the wallpaper location from wal's cache so 
 # that this works even when a directory is passed.
-swww img "$(< "${HOME}/.cache/wal/wal")" --transition-type wipe --transition-angle 45
-
-notify-send "Changing Wallpaper"
+swww img "$(< "${HOME}/.cache/wal/wal")" --transition-type wipe --transition-angle 45 --transition-fps 90
 
diff --git a/waybar/style.css b/waybar/style.css
index 3eb4ce2..638d1dc 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,9 +1,10 @@
 * {
   /* `otf-font-awesome` is required to be installed for icons */
-  font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+  font-family: "JetBrains Mono", "Iosevka Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
   text-shadow: none;
   transition: color 0.5s ease-in-out;
   transition: background-color 0.5s ease-in-out;
+  color: @color15;
 }
 
 /*
@@ -31,6 +32,7 @@
 @import url('./styles/modules/swww.css');
 @import url('./styles/modules/temperature.css');
 @import url('./styles/modules/tray.css');
+@import url('./styles/modules/window.css');
 @import url('./styles/modules/wireplumber.css');
 @import url('./styles/modules/workspaces.css');
 
diff --git a/waybar/styles/modules/clock.css b/waybar/styles/modules/clock.css
index 9a87e94..4c0ebfd 100644
--- a/waybar/styles/modules/clock.css
+++ b/waybar/styles/modules/clock.css
@@ -1,5 +1,4 @@
 #clock {
-  color: #eee;
-  background-color: @color4;
+  background: @color5;
 }
 
diff --git a/waybar/styles/modules/idle.css b/waybar/styles/modules/idle.css
index 17e09a3..d3a7f61 100644
--- a/waybar/styles/modules/idle.css
+++ b/waybar/styles/modules/idle.css
@@ -1,8 +1,9 @@
 #idle_inhibitor {
-  color: #5e81ac;
+  padding: 0 16px 0 12px;
+  background-color: @color5;
 }
 
 #idle_inhibitor.activated {
-  background-color: #d8dee9;
+  background-color: @color6;
 }
 
diff --git a/waybar/styles/modules/window.css b/waybar/styles/modules/window.css
new file mode 100644
index 0000000..3d74dc8
--- /dev/null
+++ b/waybar/styles/modules/window.css
@@ -0,0 +1,21 @@
+#window {
+  color: @color6;
+  border-radius: 20px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+window#waybar.kitty {
+  background-color: #111111;
+  color: #ffffff;
+}
+
+window#waybar.chromium {
+  background-color: #eeeeee;
+  color: #000000;
+}
+
+/* make window module transparent when no windows present */
+window#waybar.empty #window {
+  background-color: transparent;
+}
diff --git a/waybar/styles/modules/wireplumber.css b/waybar/styles/modules/wireplumber.css
index b21c3db..935393d 100644
--- a/waybar/styles/modules/wireplumber.css
+++ b/waybar/styles/modules/wireplumber.css
@@ -1,6 +1,5 @@
 #wireplumber {
-  color: #eee;
-  background-color: @color6;
+  background: @color4;
 }
 
 #wireplumber.muted {
diff --git a/waybar/styles/modules/workspaces.css b/waybar/styles/modules/workspaces.css
index 98a7253..b9d3ba1 100644
--- a/waybar/styles/modules/workspaces.css
+++ b/waybar/styles/modules/workspaces.css
@@ -9,7 +9,6 @@
   box-shadow: none;
   border: none;
   border-radius: 0;
-  color: @color8;
 }
 
 #workspaces button:first-child {
@@ -23,13 +22,11 @@
 }
 
 #workspaces button.active {
-  background-color: @color4;
-  color: @color8;
+  background: @color4;
 }
 
 #workspaces button:hover {
   background: @color4;
-  color: @color8;
 }
 
 #workspaces button.focused {