diff --git a/.gitmodules b/.gitmodules
index 715116f1..7d98a0a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "shells/zsh/oh-my-zsh/plugins/zsh-better-npm-completion"]
 	path = shells/zsh/oh-my-zsh/plugins/zsh-better-npm-completion
 	url = https://github.com/lukechilds/zsh-better-npm-completion
+[submodule "dwm"]
+	path = dwm
+	url = git@github.com:Jab2870/dwm.git
diff --git a/bin/i3-shell b/bin/folder-shell
similarity index 100%
rename from bin/i3-shell
rename to bin/folder-shell
diff --git a/bin/screenshot b/bin/screenshot
new file mode 100755
index 00000000..ffcec492
--- /dev/null
+++ b/bin/screenshot
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# A simple wrapper around scrot
+#
+# When run, the screenshot will be added to she clipboard
+
+case $1 in
+	"window")
+		file=$(scrot -u '/tmp/%F_%T_$wx$h.png' -e 'echo /tmp/%F_%T_$wx$h.png')
+		;;
+	"select")
+		file=$(sleep 0.2; scrot -s '/tmp/%F_%T_$wx$h.png' -e 'echo /tmp/%F_%T_$wx$h.png')
+		;;
+	*)
+		file=$(scrot '/tmp/%F_%T_$wx$h.png' -e 'echo /tmp/%F_%T_$wx$h.png')
+		;;
+esac
+
+xclip -selection clipboard -target image/png -i "$file"
diff --git a/dwm b/dwm
new file mode 160000
index 00000000..bdc4d25b
--- /dev/null
+++ b/dwm
@@ -0,0 +1 @@
+Subproject commit bdc4d25b7af384533e17fb47c2acceb7126dfd34
diff --git a/git/gitconfig b/git/gitconfig
index 0c97e5fc..55300c36 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -1,5 +1,5 @@
 [user]
-	email = jonathan@lunarweb.co.uk
+	email = git@jonathanh.co.uk
 	name = Jonathan Hodgson
 [core]
 	editor = vim -c 'startinsert'
diff --git a/i3/i3blocks-secondary.conf b/i3/i3blocks-secondary.conf
index 07501fad..033a1df3 100644
--- a/i3/i3blocks-secondary.conf
+++ b/i3/i3blocks-secondary.conf
@@ -60,49 +60,49 @@ interval=300
 command=~/.dotfiles/i3/blocks/homeServerUpdates
 label=Home Server Updates
 
-[vps01status]
-command=~/.dotfiles/i3/blocks/serverStatus VPS01
-interval=10
-separator=false
-
-[vps02status]
-command=~/.dotfiles/i3/blocks/serverStatus VPS02
-interval=10
-separator=false
-
-[vps03status]
-command=~/.dotfiles/i3/blocks/serverStatus VPS03
-interval=10
-separator=false
-
-[vps04status]
-command=~/.dotfiles/i3/blocks/serverStatus VPS04
-interval=10
-separator=false
-
-[freightlinerstatus]
-command=~/.dotfiles/i3/blocks/serverStatus Freightliner
-interval=10
-separator=false
-
-[wilks]
-command=~/.dotfiles/i3/blocks/serverStatus Wilks
-interval=10
-separator=false
-
-[nhsstatus]
-command=~/.dotfiles/i3/blocks/serverStatus NHS
-interval=10
-separator=false
-
-[vapourtecstatus]
-command=~/.dotfiles/i3/blocks/serverStatus Vapourtec
-interval=10
-separator=false
-
-[checkitstatus]
-command=~/.dotfiles/i3/blocks/serverStatus Checkit
-interval=10
+# [vps01status]
+# command=~/.dotfiles/i3/blocks/serverStatus VPS01
+# interval=10
+# separator=false
+# 
+# [vps02status]
+# command=~/.dotfiles/i3/blocks/serverStatus VPS02
+# interval=10
+# separator=false
+# 
+# [vps03status]
+# command=~/.dotfiles/i3/blocks/serverStatus VPS03
+# interval=10
+# separator=false
+# 
+# [vps04status]
+# command=~/.dotfiles/i3/blocks/serverStatus VPS04
+# interval=10
+# separator=false
+# 
+# [freightlinerstatus]
+# command=~/.dotfiles/i3/blocks/serverStatus Freightliner
+# interval=10
+# separator=false
+# 
+# [wilks]
+# command=~/.dotfiles/i3/blocks/serverStatus Wilks
+# interval=10
+# separator=false
+# 
+# [nhsstatus]
+# command=~/.dotfiles/i3/blocks/serverStatus NHS
+# interval=10
+# separator=false
+# 
+# [vapourtecstatus]
+# command=~/.dotfiles/i3/blocks/serverStatus Vapourtec
+# interval=10
+# separator=false
+# 
+# [checkitstatus]
+# command=~/.dotfiles/i3/blocks/serverStatus Checkit
+# interval=10
 
 [wanip]
 label=🌍
diff --git a/i3/i3blocks.conf b/i3/i3blocks.conf
index 7c9a54c3..994bc59e 100644
--- a/i3/i3blocks.conf
+++ b/i3/i3blocks.conf
@@ -74,7 +74,7 @@ markup=pango
 # Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others.
 [mpvmediaplayer]
 command=~/.dotfiles/i3/blocks/mpvmediaplayer
-SOCKET=/tmp/mpvsocket
+#SOCKET=/tmp/mpvsocket
 interval=2
 #markup=pango
 
diff --git a/x/xinitrc b/x/xinitrc
index e67d6a04..095d95ce 100644
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -1,12 +1,20 @@
-[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap
+# Make keyboard layout coleemak but pushing both shifts will toggle to qwerty
+setxkbmap -layout gb,gb -variant "colemak," -option grp:shifts_toggle
+# Make key firing much faster
 xset r rate 200 70
+# Need this for making qt applications use gtk theme ( I think )
 export QT_QPA_PLATFORMTHEME=qt5ct
+# Use gnome keyring
+killall gnome-keyring-d 2> /dev/null
 export `gnome-keyring-daemon -d`
 eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
 export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
 dbus-update-activation-environment --systemd DISPLAY
 #exec xrdb .Xresources
 #xbindkeys
-exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
+#exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
+while :; do
+	dwm
+done;
 #exec sh /home/jonathan/.conky/conky-startup.sh
 #xcape