diff --git a/.config/hypr/configs/monitors.conf b/.config/hypr/configs/monitors.conf
index 88b8d207..d2a3fa3b 100644
--- a/.config/hypr/configs/monitors.conf
+++ b/.config/hypr/configs/monitors.conf
@@ -3,7 +3,3 @@ monitor=DP-1, 2560x1080@74.99, 0x1080,1.0
 
 # Second Monitor
 monitor=DP-3, 2560x1080@74.99, 0x0,1.0
-
-# Third Monitor
-monitor=HDMI-A-1, 1920x1080@74.97, 2560x300,1.0
-monitor=HDMI-A-1, transform, 3
diff --git a/.config/hypr/configs/workspaces.conf b/.config/hypr/configs/workspaces.conf
index 2ea3d141..dbb6ad34 100644
--- a/.config/hypr/configs/workspaces.conf
+++ b/.config/hypr/configs/workspaces.conf
@@ -5,7 +5,8 @@ workspace = 3, monitor:DP-1
 workspace = 4, monitor:DP-1
 workspace = 5, monitor:DP-1
 workspace = 6, monitor:DP-1
-workspace = 7, monitor:DP-1, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false # Gaming Workspace
+workspace = 7, monitor:DP-1
+workspace = 7, monitor:DP-1
 workspace = 8, monitor:DP-1
 workspace = 9, monitor:DP-1
 
@@ -19,14 +20,3 @@ workspace = 15, monitor:DP-3
 workspace = 16, monitor:DP-3
 workspace = 17, monitor:DP-3
 workspace = 18, monitor:DP-3
-
-# Third Monitor
-workspace = 19, monitor:HDMI-A-1, default:true
-workspace = 20, monitor:HDMI-A-1
-workspace = 21, monitor:HDMI-A-1
-workspace = 22, monitor:HDMI-A-1
-workspace = 23, monitor:HDMI-A-1
-workspace = 24, monitor:HDMI-A-1
-workspace = 25, monitor:HDMI-A-1
-workspace = 26, monitor:HDMI-A-1
-workspace = 27, monitor:HDMI-A-1
diff --git a/.config/hypr/theme/rules.conf b/.config/hypr/theme/rules.conf
index 958699d8..2a031188 100644
--- a/.config/hypr/theme/rules.conf
+++ b/.config/hypr/theme/rules.conf
@@ -36,29 +36,25 @@ windowrule = float, xfce-polkit|wleave|title:branchdialog|nwg-look|nm-connection
 # windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
 
 ## System
-windowrule = workspace 8, class:^(.*virt-manager.*)$|(.*PikaBackup.*)$|(.*VirtualBox Manager.*)$|(.*Vmware*)$
-windowrule = workspace 17, class:^(.*GParted.*)$|(.*clamtk.*)$|(.*gnome.Logs.*)$
+windowrule = workspace 5, class:^(.*virt-manager.*)$|(.*PikaBackup.*)$|(.*VirtualBox Manager.*)$|(.*Vmware*)$
+windowrule = workspace 5, class:^(.*GParted.*)$|(.*clamtk.*)$|(.*gnome.Logs.*)$
 
 ## Gaming
-windowrule = workspace 7, class:^(.*steam_app.*)$|(.*gamescope.*)$|(.*atlauncher.*)$|(.*Minecraft.*)$
-windowrule = workspace 16 silent, class:^([Ss]team)$|(.*heroic.*)$
-windowrule = workspace 7, class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(.*xemu.*)$|(.*duckstation.*)$|(.*rpcs3.*)$
+windowrule = workspace 6, class:^(.*steam_app.*)$|(.*gamescope.*)$|(.*atlauncher.*)$|(.*Minecraft.*)$
+windowrule = workspace 15 silent, class:^([Ss]team)$|(.*heroic.*)$
+windowrule = workspace 15, class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(.*xemu.*)$|(.*duckstation.*)$|(.*rpcs3.*)$
 
 ## Media
-windowrule = workspace 6, class:^(.*kdenlive.*)$
-windowrule = workspace 21 silent, class:^(.*thunderbird.*)$
-windowrule = workspace 22 silent, class:^(.*btop.*)$
-windowrule = workspace 22 silent, class:^(.*nvtop.*)$
-windowrule = workspace 19 silent, class:^(.*[Ss]potify.*)$|(.*tidal-hifi.*)$|(.*You[Tt]ube Music.*)$|^(.*feishin.*)$
-windowrule = workspace 20 silent, class:^(.*discord.*)$|(.*vesktop.*)$|(.*WebCord.*)$|(.*legcord.*)$
-windowrule = workspace 15, class:^(.*obsproject.*)$
-windowrule = workspace 14, class:^(.*easyeffects.*)$|^(.*qpwgraph.*)$|(.*Helvum.*)$|(.*nicotine_plus.*)$|(.*Picard*)$
-windowrule = workspace 5, class:^(.*vital.*)$|(.*fl64.*)$
-windowrule = workspace 5, title:^(.*FL Studio.*)$
+windowrule = workspace 4, class:^(.*kdenlive.*)$
+windowrule = workspace 12 silent, class:^(.*[Ss]potify.*)$|(.*tidal-hifi.*)$|(.*You[Tt]ube Music.*)$|^(.*feishin.*)$
+windowrule = workspace 7 silent, class:^(.*discord.*)$|(.*vesktop.*)$|(.*WebCord.*)$|(.*legcord.*)$
+windowrule = workspace 4, class:^(.*obsproject.*)$
+windowrule = workspace 12, class:^(.*easyeffects.*)$|^(.*qpwgraph.*)$|(.*Helvum.*)$|(.*nicotine_plus.*)$|(.*Picard*)$
+windowrule = workspace 3, class:^(.*vital.*)$|(.*fl64.*)$
+windowrule = workspace 3, title:^(.*FL Studio.*)$
 windowrule = workspace 4, class:^(.*pinta.*)$|(.*krita.*)$|(.*blender.*)$|(.*Upscayl.*)$
 
 ## Productivity/Dev
-windowrule = workspace 9 silent, class:^(.*obsidian.*)$|(.*Zotero.*)$
 windowrule = workspace 2, class:^(.*Code.*)$|(.*codium.*)$|(.*VSCodium.*)$|(.*neovide.*)$
 
 
diff --git a/.config/waybar/bars/bar-1.jsonc b/.config/waybar/bars/bar-1.jsonc
index 9a015d14..c1976077 100644
--- a/.config/waybar/bars/bar-1.jsonc
+++ b/.config/waybar/bars/bar-1.jsonc
@@ -1,29 +1,18 @@
 {
   "include": [
-    "~/.config/waybar/modules/custom-wf-recorder.jsonc",
-    "~/.config/waybar/modules/custom-updates.jsonc",
     "~/.config/waybar/modules/custom-music.jsonc",
-    "~/.config/waybar/modules/custom-logo.jsonc",
     "~/.config/waybar/modules/custom-notifications.jsonc",
-    "~/.config/waybar/modules/custom-weather.jsonc",
-    "~/.config/waybar/modules/hyprland-language.jsonc",
     "~/.config/waybar/modules/hyprland-workspaces.jsonc",
     "~/.config/waybar/modules/clock-1.jsonc",
-    "~/.config/waybar/modules/pulseaudio.jsonc",
-  ],
-  "modules-left": [
-    "custom/arch",
-    "hyprland/workspaces",
-    "custom/cava",
-    "custom/wf-recorder",
+    "~/.config/waybar/modules/hyprland-language.jsonc",
+    "~/.config/waybar/modules/tray.jsonc",
   ],
+  "modules-left": ["hyprland/workspaces"],
   "modules-center": ["custom/music"],
   "modules-right": [
-    "custom/updates",
+    "tray",
     "hyprland/language",
-    "custom/weather",
     "clock#cl1",
-    "pulseaudio",
     "custom/notifications",
   ],
 }
diff --git a/.config/waybar/bars/bar-2.jsonc b/.config/waybar/bars/bar-2.jsonc
index f0db478d..fae5e31e 100644
--- a/.config/waybar/bars/bar-2.jsonc
+++ b/.config/waybar/bars/bar-2.jsonc
@@ -5,14 +5,10 @@
     "~/.config/waybar/modules/custom-gpu-usage.jsonc",
     "~/.config/waybar/modules/temperature-gpu.jsonc",
     "~/.config/waybar/modules/temperature-cpu.jsonc",
-    "~/.config/waybar/modules/custom-logo.jsonc",
-    "~/.config/waybar/modules/custom-notifications.jsonc",
-    "~/.config/waybar/modules/hyprland-window.jsonc",
     "~/.config/waybar/modules/hyprland-workspaces.jsonc",
     "~/.config/waybar/modules/network.jsonc",
   ],
-  "modules-left": ["custom/arch", "hyprland/workspaces"],
-  "modules-center": ["hyprland/window"],
+  "modules-left": ["hyprland/workspaces"],
   "modules-right": [
     "network",
     "memory",
@@ -20,6 +16,5 @@
     "temperature#cpu",
     "custom/gpu-usage",
     "temperature#gpu",
-    "custom/notifications",
   ],
 }
diff --git a/.config/waybar/bars/bar-3.jsonc b/.config/waybar/bars/bar-3.jsonc
deleted file mode 100644
index 7ff5089d..00000000
--- a/.config/waybar/bars/bar-3.jsonc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "include": [
-    "~/.config/waybar/modules/clock-2.jsonc",
-    "~/.config/waybar/modules/custom-logo.jsonc",
-    "~/.config/waybar/modules/custom-notifications.jsonc",
-    "~/.config/waybar/modules/hyprland-workspaces.jsonc",
-    "~/.config/waybar/modules/tray.jsonc",
-  ],
-  "modules-left": ["custom/arch", "hyprland/workspaces"],
-  "modules-center": ["clock#cl2"],
-  "modules-right": ["tray", "custom/notifications"],
-}
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 1f1fd5f9..e9ad2a80 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -28,18 +28,4 @@
     "margin-bottom": 5,
     "margin-right": 5,
   },
-  {
-    "include": "~/.config/waybar/bars/bar-3.jsonc",
-    "height": 48,
-    "layer": "top",
-    "output": "HDMI-A-1",
-    "mode": "dock",
-    "exclusive": true,
-    "passtrough": false,
-    "gtk-layer-shell": true,
-    "margin-top": 5,
-    "margin-left": 5,
-    "margin-bottom": 0,
-    "margin-right": 5,
-  },
 ]
diff --git a/.config/waybar/modules/hyprland-workspaces.jsonc b/.config/waybar/modules/hyprland-workspaces.jsonc
index 3a62dbab..16caeca3 100644
--- a/.config/waybar/modules/hyprland-workspaces.jsonc
+++ b/.config/waybar/modules/hyprland-workspaces.jsonc
@@ -8,31 +8,22 @@
     "format-icons": {
       "1": "󰇧",
       "2": "",
-      "3": "",
+      "3": "󰝚",
       "4": "",
-      "5": "🎜",
-      "6": "",
-      "7": "",
-      "8": "",
-      "9": "",
+      "5": "",
+      "6": "󰺵",
+      "7": "",
+      "8": "",
+      "9": "",
       "10": "󰇧",
       "11": "",
-      "12": "",
+      "12": "󰝚",
       "13": "",
-      "14": "🎜",
-      "15": "",
-      "16": "",
-      "17": "",
-      "18": "",
-      "19": "",
-      "20": "󰍨",
-      "21": "✉",
-      "22": "🖵",
-      "23": "󰇧",
-      "24": "",
-      "25": "",
-      "26": "",
-      "27": "",
+      "14": "",
+      "15": "󰺵",
+      "16": "",
+      "17": "",
+      "18": "",
     },
     "on-scroll-up": "hyprctl dispatch workspace r-1",
     "on-scroll-down": "hyprctl dispatch workspace r+1",