diff --git a/Makefile b/Makefile
index 7b73d7b6..1993a481 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,9 @@ all: ${FILES}
 
 install: all
 	$(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
+	$(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
 	$(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
+	$(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
 
 clean:
 	rm -f src/*.o
diff --git a/i3.config b/i3.config
index 4a9468b0..2f49bbaf 100644
--- a/i3.config
+++ b/i3.config
@@ -1,34 +1,34 @@
-terminal /usr/pkg/bin/urxvt
+terminal /usr/bin/urxvt
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso8859-1
 
-# Fullscreen
+# Fullscreen (Mod1+f)
 bind Mod1+41 f
 
-# Stacking
+# Stacking (Mod1+h)
 bind Mod1+43 s
 
-# Default
+# Default (Mod1+e)
 bind Mod1+26 d
 
-# Focus
+# Focus (Mod1+j/k/l/;)
 bind Mod1+44 h
 bind Mod1+45 j
 bind Mod1+46 k
 bind Mod1+47 l
 
-# Snap
+# Snap (Mod1+Control+j/k/l/;)
 bind Mod1+Control+44 sh
 bind Mod1+Control+45 sj
 bind Mod1+Control+46 sk
 bind Mod1+Control+47 sl
 
-# Move
+# Move (Mod1+Shift+j/k/l/;)
 bind Mod1+Shift+44 mh
 bind Mod1+Shift+45 mj
 bind Mod1+Shift+46 mk
 bind Mod1+Shift+47 ml
 
-# Workspaces
+# Workspaces (Mod1+1/2/…)
 bind Mod1+10 1
 bind Mod1+11 2
 bind Mod1+12 3
@@ -40,4 +40,20 @@ bind Mod1+17 8
 bind Mod1+18 9
 bind Mod1+19 0
 
-bind Mod1+36 exec /usr/pkg/bin/urxvt
+# Move to Workspaces
+bind Mod1+Shift+10 m1
+bind Mod1+Shift+11 m2
+bind Mod1+Shift+12 m3
+bind Mod1+Shift+13 m4
+bind Mod1+Shift+14 m5
+bind Mod1+Shift+15 m6
+bind Mod1+Shift+16 m7
+bind Mod1+Shift+17 m8
+bind Mod1+Shift+18 m9
+bind Mod1+Shift+19 m0
+
+# Mod1+Enter starts a new terminal
+bind Mod1+36 exec /usr/bin/urxvt
+
+# Mod1+Shift+r restarts i3 inplace
+bind Mod1+Shift+27 restart