diff --git a/sericea/.config/sway/config b/sericea/.config/sway/config
index ae2a422a..2231f313 100644
--- a/sericea/.config/sway/config
+++ b/sericea/.config/sway/config
@@ -6,33 +6,6 @@
 # Configs
 set $term foot
 
-## WORKSPACES
-set $w1 1
-set $w2 2
-set $w3 3
-set $w4 4
-set $w5 5
-set $w6 6
-set $w7 7
-set $w8 8
-set $w9 9
-set $w10 10
-# Workspace setup for my desktop
-# Defaults to whatever on my laptop and on other machines
-set $monprim DisplayPort-0
-set $monsec HDMI-A-0
-workspace $w1 output $monprim
-workspace $w2 output $monprim
-workspace $w3 output $monprim
-workspace $w4 output $monprim
-workspace $w5 output $monprim
-workspace $w6 output $monprim
-workspace $w7 output $monprim
-# Putting 10 here first so it's the default for my secondary
-workspace $w10 output $monsec
-workspace $w8 output $monsec
-workspace $w9 output $monsec
-
 ## WINDOW RULES
 for_window {
 	[app_id="org.mozilla.firefox"]		move container to workspace $w1
diff --git a/sericea/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf b/sericea/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf
index 46765d9f..bf80553c 100644
--- a/sericea/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf
+++ b/sericea/.config/sway/machine.d/dsk-ryzen-1.ws.mgmt.desu.ltd.conf
@@ -16,7 +16,7 @@ output "Unknown Unknown Unknown" {
 	disable
 }
 
-input "Logitech G502 X PLUS" {
+input type:pointer {
 	accel_profile		flat
 	pointer_accel		0.000
 }
diff --git a/sericea/.config/waybar/config b/sericea/.config/waybar/config
index af40cbda..bb771851 100644
--- a/sericea/.config/waybar/config
+++ b/sericea/.config/waybar/config
@@ -8,16 +8,16 @@
 		"all-outputs": false,
 		"disable-scroll": true,
 		"persistent_workspaces": {
-			"1": [],
-			"2": [],
-			"3": [],
-			"4": [],
-			"5": [],
-			"6": [],
-			"7": [],
-			"8": [],
-			"9": [],
-			"10": []
+			"1": ["eDP-1", "DP-1"],
+			"2": ["eDP-1", "DP-1"],
+			"3": ["eDP-1", "DP-1"],
+			"4": ["eDP-1", "DP-1"],
+			"5": ["eDP-1", "DP-1"],
+			"6": ["eDP-1", "DP-1"],
+			"7": ["eDP-1", "DP-1"],
+			"8": ["eDP-1", "DP-2"],
+			"9": ["eDP-1", "DP-2"],
+			"10": ["eDP-1", "DP-2"]
 		}
 	},
 	"idle_inhibitor": {