diff --git a/.config/sway/display-arrangement.conf##hostname.rocinante b/.config/sway/display-arrangement.conf##hostname.rocinante
index d22717c..c4f3bec 100644
--- a/.config/sway/display-arrangement.conf##hostname.rocinante
+++ b/.config/sway/display-arrangement.conf##hostname.rocinante
@@ -2,6 +2,6 @@
 # Rocinante Display Config #
 ###                      ###
 
-set $builtindisplay eDP-1
+set $display eDP-1
 
-output $builtindisplay scale 1.2 pos 0 1080
+output $display scale 1.2 pos 0 1080
diff --git a/.config/sway/workspace-arrangement.conf##class.single-monitor b/.config/sway/workspace-arrangement.conf##class.single-monitor
new file mode 100644
index 0000000..f8c15d9
--- /dev/null
+++ b/.config/sway/workspace-arrangement.conf##class.single-monitor
@@ -0,0 +1,49 @@
+###       -*-conf-space-*-        ###
+# Single-Monitor Workspace Settings #
+###                               ###
+
+# This file defines the workspaces and creates the keybinds to switch
+# between them and move containers around between them. This version
+# is for dual-monitor systems. The host-specific display-arrangement.conf
+# file should declare the $display variable used here.
+
+workspace {
+	1  output $display
+	2  output $display
+	3  output $display
+	4  output $display
+	5  output $display
+	6  output $display
+	7  output DP-1 DP-2 DP-3 DP-4 $display
+	8  output $display
+	9  output $display
+	10 output $display
+}
+
+## Workspace Switching Keybinds
+bindsym {
+	$mod+1 exec swaymsg workspace 1
+	$mod+2 exec swaymsg workspace 2
+	$mod+3 exec swaymsg workspace 3
+	$mod+4 exec swaymsg workspace 4
+	$mod+5 exec swaymsg workspace 5
+	$mod+6 exec swaymsg workspace 6
+	$mod+7 exec swaymsg workspace 7
+	$mod+8 exec swaymsg workspace 8
+	$mod+9 exec swaymsg workspace 9
+	$mod+0 exec swaymsg workspace 10
+}
+
+## Window Reassignment Keybinds
+bindsym {
+	$mod+Shift+1 exec swaymsg move container to workspace  1
+	$mod+Shift+2 exec swaymsg move container to workspace  2
+	$mod+Shift+3 exec swaymsg move container to workspace  3
+	$mod+Shift+4 exec swaymsg move container to workspace  4
+	$mod+Shift+5 exec swaymsg move container to workspace  5
+	$mod+Shift+6 exec swaymsg move container to workspace  6
+	$mod+Shift+7 exec swaymsg move container to workspace  7
+	$mod+Shift+8 exec swaymsg move container to workspace  8
+	$mod+Shift+9 exec swaymsg move container to workspace  9
+	$mod+Shift+0 exec swaymsg move container to workspace  10
+}