diff --git a/.config/hypr/configs/monitors.conf b/.config/hypr/configs/monitors.conf
index a71c5305..4f968621 100644
--- a/.config/hypr/configs/monitors.conf
+++ b/.config/hypr/configs/monitors.conf
@@ -1,6 +1,12 @@
-# Generated by nwg-displays on 2023-09-04 at 18:08:34. Do not edit manually.
+# Main Monitor
+monitor=DP-1, 2560x1080@74.99, 0x1080,1.0
+workspace = DP-1, 1
 
-monitor = HDMI-A-1, 1920x1080@74.973, 2560x300, 1.0
-monitor = HDMI-A-1, transform, 3
-monitor = DP-3, 2560x1080@74.990997, 0x0, 1.0
-monitor = DP-1, 2560x1080@74.991, 0x1080, 1.0
+# Second Monitor
+monitor=DP-3, 2560x1080@74.99, 0x0,1.0
+workspace = DP-3, 11
+
+# Third Monitor
+monitor=HDMI-A-1, 1920x1080@74.97, 2560x300,1.0
+monitor=HDMI-A-1, transform, 3
+workspace = HDMI-A-1, 21
diff --git a/.config/hypr/configs/workspaces.conf b/.config/hypr/configs/workspaces.conf
index e6c07d42..bd23dc07 100644
--- a/.config/hypr/configs/workspaces.conf
+++ b/.config/hypr/configs/workspaces.conf
@@ -1,32 +1,35 @@
-# Generated by nwg-displays on 2023-09-04 at 18:08:34. Do not edit manually.
+# Main Monitor
+workspace = 1, monitor:DP-1
+workspace = 2, monitor:DP-1
+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
+workspace = 8, monitor:DP-1, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false
+workspace = 9, monitor:DP-1
+workspace = 10, monitor:DP-1
 
-workspace = DP-1, 1
-workspace = DP-1, 2
-workspace = DP-1, 3
-workspace = DP-1, 4
-workspace = DP-1, 5
-workspace = DP-1, 6
-workspace = DP-1, 7
-workspace = DP-1, 8
-workspace = DP-1, 9
-workspace = DP-1, 10
-workspace = DP-3, 11
-workspace = DP-3, 12
-workspace = DP-3, 13
-workspace = DP-3, 14
-workspace = DP-3, 15
-workspace = DP-3, 16
-workspace = DP-3, 17
-workspace = DP-3, 18
-workspace = DP-3, 19
-workspace = DP-3, 20
-workspace = HDMI-A-1, 21
-workspace = HDMI-A-1, 22
-workspace = HDMI-A-1, 23
-workspace = HDMI-A-1, 24
-workspace = HDMI-A-1, 25
-workspace = HDMI-A-1, 26
-workspace = HDMI-A-1, 27
-workspace = HDMI-A-1, 28
-workspace = HDMI-A-1, 29
-workspace = HDMI-A-1, 30
+# Second Monitor
+workspace = 11, monitor:DP-3
+workspace = 12, monitor:DP-3
+workspace = 13, monitor:DP-3
+workspace = 14, monitor:DP-3
+workspace = 15, monitor:DP-3
+workspace = 16, monitor:DP-3
+workspace = 17, monitor:DP-3
+workspace = 18, monitor:DP-3
+workspace = 19, monitor:DP-3
+workspace = 20, monitor:DP-3
+
+# Third Monitor
+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
+workspace = 28, monitor:HDMI-A-1
+workspace = 29, monitor:HDMI-A-1
+workspace = 30, monitor:HDMI-A-1
diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf
index 0d75c69f..979bf896 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/themes/luna/rules.conf
@@ -30,7 +30,6 @@ windowrulev2 = workspace 19, class:^(.*GParted.*)$|(.*clamtk.*)$|(.*gnome.Logs.*
 
 # Gaming
 windowrulev2 = workspace 8, class:^(.*steam_app.*)$|(.*gamescope.*)$|(.*atlauncher.*)$|(.*Minecraft.*)$, decorate:0
-workspace = 8, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false
 windowrulev2 = workspace 18, class:^(steam)$|(.*heroic.*)$
 windowrulev2 = workspace 8, class:^(.*Ryujinx.*)$|(.*cemu.*)$|(.*dolphin.*)$|(.*RetroArch.*)$|(.*xemu.*)$|(.*duckstation.*)$|(.*rpcs3.*)$