diff --git a/.config/sway/available/general/variables.conf b/.config/sway/available/general/variables.conf
index 621498d..828ce2b 100644
--- a/.config/sway/available/general/variables.conf
+++ b/.config/sway/available/general/variables.conf
@@ -2,9 +2,6 @@
 #
 # Thurstylark
 
-# Get hostname
-set $hostname "$(uname -n)"
-
 # Directories
 set $dir-conf ~/.config/sway
 set $dir-localconf $dir-conf/$hostname
diff --git a/.config/sway/available/output/configure.conf b/.config/sway/available/output/configure.conf
index 850d11d..75871ec 100644
--- a/.config/sway/available/output/configure.conf
+++ b/.config/sway/available/output/configure.conf
@@ -2,10 +2,4 @@
 #
 # Thurstylark
 
-# Tools for setting output configuration
-include $dir-utils/output/set-mode
-include $dir-utils/output/set-position
-include $dir-utils/output/set-scale
-include $dir-utils/output/set-transform
-
 include $dir-localconf/outputs/*.conf
diff --git a/.config/sway/available/output/default-bg.conf b/.config/sway/available/output/default-bg.conf
index ee28c97..1b86c47 100644
--- a/.config/sway/available/output/default-bg.conf
+++ b/.config/sway/available/output/default-bg.conf
@@ -2,10 +2,8 @@
 #
 # Thurstylark
 
-include $dir-utils/output/set-bg
-
 set $o-id "*"
 set $o-bg-path $default-background
 set $o-bg-fill "#000000"
 
-$u-output-set-bg
+output $o-id bg $o-bg-path fill $o-bg-fill
diff --git a/.config/sway/available/output/random-bg.conf b/.config/sway/available/output/random-bg.conf
index fb79277..6e01af0 100644
--- a/.config/sway/available/output/random-bg.conf
+++ b/.config/sway/available/output/random-bg.conf
@@ -8,4 +8,4 @@ set $o-id "*"
 set $o-bg-path $$(find $dir-wallpapers -type f \( -iname \*.jpg -o -iname \*.png \) -not -path $dir-wallpapers/sway/\* | shuf -n 1 )
 set $o-bg-fill "#000000"
 
-$u-output-set-bg
+output $o-id bg $o-bg-path fill $o-bg-fill
diff --git a/.config/sway/config b/.config/sway/config
index ee76c37..bf23941 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -2,8 +2,8 @@
 #
 # Thurstylark
 
-# Include all common configs
-#include ~/.config/sway/common/*.conf
+# Get hostname
+set $hostname "$(uname -n)"
 
 # Include all configs by hostname
 include ~/.config/sway/$hostname/*.conf
diff --git a/.config/sway/kd-laptop/outputs/desk-primary.conf b/.config/sway/kd-laptop/outputs/desk-primary.conf
index c86359f..4147ede 100644
--- a/.config/sway/kd-laptop/outputs/desk-primary.conf
+++ b/.config/sway/kd-laptop/outputs/desk-primary.conf
@@ -9,5 +9,7 @@ set $o-pos-y "0"
 
 
 # Do the thing
-$u-output-set-mode
-$u-output-set-position
+output $o-id {
+	mode $o-mode
+	pos $o-pos-x $o-pos-y
+}
diff --git a/.config/sway/kd-laptop/outputs/desk-secondary.conf b/.config/sway/kd-laptop/outputs/desk-secondary.conf
index c34e9a1..e61e355 100644
--- a/.config/sway/kd-laptop/outputs/desk-secondary.conf
+++ b/.config/sway/kd-laptop/outputs/desk-secondary.conf
@@ -9,5 +9,7 @@ set $o-pos-y "0"
 
 
 # Do the thing
-$u-output-set-mode
-$u-output-set-position
+output $o-id {
+	mode $o-mode
+	pos $o-pos-x $o-pos-y
+}
diff --git a/.config/sway/kd-laptop/outputs/laptop.conf b/.config/sway/kd-laptop/outputs/laptop.conf
index 91f168c..e431d32 100644
--- a/.config/sway/kd-laptop/outputs/laptop.conf
+++ b/.config/sway/kd-laptop/outputs/laptop.conf
@@ -9,5 +9,7 @@ set $o-pos-y "0"
 
 
 # Do the thing
-$u-output-set-mode
-$u-output-set-position
+output $o-id {
+	mode $o-mode
+	pos $o-pos-x $o-pos-y
+}
diff --git a/.config/sway/template/outputs/example.conf b/.config/sway/template/outputs/example.conf
index bde0749..0ec6920 100644
--- a/.config/sway/template/outputs/example.conf
+++ b/.config/sway/template/outputs/example.conf
@@ -21,7 +21,9 @@ set $o-transform "90"
 
 # Do the thing
 #  (comment or remove direcives that are unnecessary to avoid errors)
-$u-output-set-mode
-$u-output-set-position
-$u-output-set-scale
-$u-output-set-transform
+output $o-id {
+	mode $o-mode
+	position $o-pos-x $o-pos-y
+	scale $o-scalefactor
+	transform $o-transform
+}
diff --git a/.config/sway/utils/output/set-bg b/.config/sway/utils/output/set-bg
deleted file mode 100644
index 5f93273..0000000
--- a/.config/sway/utils/output/set-bg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Wallpaper
-#
-# Thurstylark
-
-set $u-output-set-bg "output $$o-id bg $$o-bg-path fill $$o-bg-fill"
diff --git a/.config/sway/utils/output/set-mode b/.config/sway/utils/output/set-mode
deleted file mode 100644
index 9c277a8..0000000
--- a/.config/sway/utils/output/set-mode
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Mode
-#
-# Thurstylark
-
-set $u-output-set-mode "output $$o-id mode $$o-mode"
diff --git a/.config/sway/utils/output/set-position b/.config/sway/utils/output/set-position
deleted file mode 100644
index 7a4f21b..0000000
--- a/.config/sway/utils/output/set-position
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Position
-#
-# Thurstylark
-
-set $u-output-set-position "output $$o-id pos $$o-pos-x $$o-pos-y"
diff --git a/.config/sway/utils/output/set-scale b/.config/sway/utils/output/set-scale
deleted file mode 100644
index 504a5c1..0000000
--- a/.config/sway/utils/output/set-scale
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Scale
-#
-# Thurstylark
-
-set $u-output-set-scale "output $$o-id scale $$o-scalefactor"
diff --git a/.config/sway/utils/output/set-transform b/.config/sway/utils/output/set-transform
deleted file mode 100644
index b3ca306..0000000
--- a/.config/sway/utils/output/set-transform
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Transform
-#
-# Thurstylark
-
-set $u-output-set-transform "output $$o-id transform $$o-transform"