diff --git a/conf/sway/conf.d/morty.config b/conf/sway/conf.d/morty.config
new file mode 100644
index 0000000..bd5229d
--- /dev/null
+++ b/conf/sway/conf.d/morty.config
@@ -0,0 +1,3 @@
+set $term termite
+output * bg ~/Documents/ressources/wallpapers/building_cyberpunk.jpg fill
+
diff --git a/conf/sway/conf.d/rick.config b/conf/sway/conf.d/rick.config
new file mode 100644
index 0000000..67243d1
--- /dev/null
+++ b/conf/sway/conf.d/rick.config
@@ -0,0 +1,2 @@
+set $term kitty
+output eDP-1 scale 2
diff --git a/conf/sway/config b/conf/sway/config
index 9d9a6c4..58bb771 100644
--- a/conf/sway/config
+++ b/conf/sway/config
@@ -3,7 +3,6 @@ set $left h
 set $down j
 set $up k
 set $right l
-set $term termite
 set $menu rofi -location 0 -show combi ~/.config/i3/rofi.config
 
 gaps inner 5
@@ -149,13 +148,14 @@ title_align center
 client.focused #f268b3 #a82d70 #ffffff #f268b3 #f268b3
 client.unfocused #000000 #4d3d46 #cccccc #000000 #000000
 
-output * bg ~/Documents/ressources/wallpapers/building_cyberpunk.jpg fill
-
 # Status Bar:
 bar {
 swaybar_command waybar
 }
 
+# Include configuration by hostname
+include ~/.config/sway/config.d/`hostname`.config
+
 # Automatic startup
 # -----------------
 exec_always import-gsettings.sh \