diff --git a/hosts/smolboi.toml b/hosts/smolboi.toml
index b84652e..ef7526d 100644
--- a/hosts/smolboi.toml
+++ b/hosts/smolboi.toml
@@ -2,3 +2,10 @@
 wireless = ["wlp36s0"]
 ethernet = ["enp37s0"]
 disks = ["/", "/home"]
+
+[xinit]
+outputs = [
+    { name = "HDMI-A-1", config = ["--auto", "--primary"] },
+    { name = "DVI-D-0", config = ["--auto", "--left-of", "HDMI-A-0"] },
+    { name = "DisplayPort-0" },
+]
diff --git a/templates/.config/sway/config b/templates/.config/i3/config
similarity index 96%
rename from templates/.config/sway/config
rename to templates/.config/i3/config
index c57bd74..ec4d7d8 100644
--- a/templates/.config/sway/config
+++ b/templates/.config/i3/config
@@ -36,10 +36,10 @@ bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exit
 bindsym $mod+Shift+q kill
-bindsym $mod+Shift+p exec --no-startup-id /usr/bin/swaylock
+bindsym $mod+Shift+p exec --no-startup-id /usr/bin/i3lock -c 000000
 
 bindsym $mod+d exec --no-startup-id /usr/bin/dmenu_run
-bindsym $mod+Return exec --no-startup-id  ${host.get('terminal', '/usr/bin/xfce4-terminal')}
+bindsym $mod+Return exec --no-startup-id  ${host.get('terminal', '/usr/bin/i3-sensible-terminal')}
 
 bindsym $mod+$kleft focus left
 bindsym $mod+$kdown focus down
diff --git a/templates/.config/swaylock/config b/templates/.config/swaylock/config
deleted file mode 100644
index b632b46..0000000
--- a/templates/.config/swaylock/config
+++ /dev/null
@@ -1,2 +0,0 @@
-daemonize
-color=000000
diff --git a/templates/.xinitrc b/templates/.xinitrc
new file mode 100644
index 0000000..a9e4e95
--- /dev/null
+++ b/templates/.xinitrc
@@ -0,0 +1,15 @@
+<% xinit = host.get('xinit', {}) %>\
+#!/bin/sh
+
+% for output in xinit.get('outputs', []):
+xrandr --output '${output['name']}' --set TearFree on \
+% if output.get('config'):
+${' '.join(output['config'])}\
+%endif
+
+% endfor 
+
+xset s 0 0
+xset -dpms
+
+exec /usr/bin/ck-launch-session /usr/bin/dbus-launch --sh-syntax --exit-with-session /usr/bin/i3