diff --git a/i3/shared.conf b/i3/shared.conf
index 2a666eb..731c319 100644
--- a/i3/shared.conf
+++ b/i3/shared.conf
@@ -110,9 +110,9 @@ bindsym $mod+Shift+9 move container to workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws10
 
 # reload the configuration file
-bindsym $mod+Shift+c exec "sh ~/.config/i3/i3wm-config-gen.sh"
+bindsym $mod+Shift+c exec "sh ~/.config/scripts/i3wm-config-gen.sh"
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r exec "sh ~/.config/i3/i3wm-config-gen.sh" ; restart
+bindsym $mod+Shift+r exec "sh ~/.config/scripts/i3wm-config-gen.sh" ; restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
diff --git a/scripts/i3wm-config-gen.sh b/scripts/i3wm-config-gen.sh
new file mode 100755
index 0000000..28e24ee
--- /dev/null
+++ b/scripts/i3wm-config-gen.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+# Load user settings from config file.
+. ~/.config/settings.conf
+
+cat ~/.config/i3/shared.conf ~/.config/i3/${computer}.conf > ~/.config/i3/config
+
+i3-msg reload