diff --git a/.config/sway/config b/.config/sway/config
index 2a8d943..3fead5b 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -22,12 +22,13 @@ set $background $HOME/.local/share/backgrounds/mountain.jpg
 # Device specific include
 # ------------------------------------------------------------------------------
 # This needs to set the following variables and additionally can override any of the above variables:
-# $primary_monitor_identifier - Identifier of the primary monitor
-# $primary_monitor_resolution - Resolution for the primary monitor
-# $primary_monitor_scale      - Scale factor for thr primary monitor
-# $secondary_monitor_x_offset - X offset for the secondary monitor
-# $audio_out                  - Name of the audio drain to be controlled by shortcuts
-# $audio_in                   - Name of the audio source to be controlled by shortcuts
+# $primary_monitor_identifier   - Identifier of the primary monitor
+# $primary_monitor_resolution   - Resolution for the primary monitor
+# $primary_monitor_scale        - Scale factor for thr primary monitor
+# $secondary_monitor_identifier - Identifier of the primary monitor
+# $secondary_monitor_x_offset   - X offset for the secondary monitor
+# $audio_out                    - Name of the audio drain to be controlled by shortcuts
+# $audio_in                     - Name of the audio source to be controlled by shortcuts
 
 include config.local
 
@@ -51,7 +52,7 @@ input 9456:311:Metadot_-_Das_Keyboard_Das_Keyboard_Model_S xkb_model "pc105"
 # Outputs
 # ------------------------------------------------------------------------------
 output $primary_monitor_identifier pos 0 0 res $primary_monitor_resolution scale $primary_monitor_scale
-output DP-3 pos $secondary_monitor_x_offset 0 res 1920x1200
+output $secondary_monitor_identifier pos $secondary_monitor_x_offset 0 res 1920x1200
 
 output * bg $background fill
 
diff --git a/.config/sway/config.local##hostname.avior b/.config/sway/config.local##hostname.avior
index f2c4709..a1d86b6 100644
--- a/.config/sway/config.local##hostname.avior
+++ b/.config/sway/config.local##hostname.avior
@@ -1,7 +1,8 @@
-set $primary_monitor_identifier eDP-1
-set $primary_monitor_resolution 3840x2400
-set $primary_monitor_scale      2
-set $secondary_monitor_x_offset 1920
+set $primary_monitor_identifier   eDP-1
+set $primary_monitor_resolution   3840x2400
+set $primary_monitor_scale        2
+set $secondary_monitor_identifier DP-6
+set $secondary_monitor_x_offset   1920
 
-set $audio_out                  alsa_output.pci-0000_00_1f.3.analog-stereo
-set $audio_in                   alsa_input.pci-0000_00_1f.3.analog-stereo
+set $audio_out                    alsa_output.pci-0000_00_1f.3.analog-stereo
+set $audio_in                     alsa_input.pci-0000_00_1f.3.analog-stereo
diff --git a/.config/sway/config.local##hostname.saiph b/.config/sway/config.local##hostname.saiph
index 6743e4d..af187b1 100644
--- a/.config/sway/config.local##hostname.saiph
+++ b/.config/sway/config.local##hostname.saiph
@@ -1,9 +1,10 @@
-set $primary_monitor_identifier eDP-1
-set $primary_monitor_resolution 1920x1080
-set $primary_monitor_scale      1
-set $secondary_monitor_x_offset 1920
+set $primary_monitor_identifier   eDP-1
+set $primary_monitor_resolution   1920x1080
+set $primary_monitor_scale        1
+set $secondary_monitor_identifier DP-3
+set $secondary_monitor_x_offset   1920
 
-set $audio_out                  alsa_output.pci-0000_00_1b.0.analog-stereo
-set $audio_in                   alsa_input.pci-0000_00_1b.0.analog-stereo
+set $audio_out                    alsa_output.pci-0000_00_1b.0.analog-stereo
+set $audio_in                     alsa_input.pci-0000_00_1b.0.analog-stereo
 
-set $background $HOME/.local/share/backgrounds/triangle.png
+set $background                   $HOME/.local/share/backgrounds/triangle.png