diff --git a/.Xresources b/.Xresources
old mode 100644
new mode 100755
index 88d29a94..3e26c163
--- a/.Xresources
+++ b/.Xresources
@@ -26,10 +26,10 @@
 *color11: #d0ea8e
 
 ! blue
-*color4: #0000e9
+*color4: #3dafdc
 
 ! bright_blue
-*color12: #a88eea
+*color12: #8ed0ea
 
 ! magenta
 *color5: #dc3daf
@@ -51,5 +51,6 @@
 
 
 URxvt.scrollBar: false
+URxvt.perl-ext-common: default,clipboard
 URxvt.font: -*-neep-medium-*-semicondensed-*-11-*-*-*-*-*-*-*
 URxvt.boldFont: -*-neep-medium-*-semicondensed-*-11-*-*-*-*-*-*-*
diff --git a/.mkshrc b/.mkshrc
old mode 100644
new mode 100755
index 7dd5447c..61f6645d
--- a/.mkshrc
+++ b/.mkshrc
@@ -1,8 +1,25 @@
 export PATH=$HOME/.go/bin:$HOME/bin:$PATH
 export GOPATH=$HOME/.go
+export GOBIN=$GOPATH/bin
 export PS1="─── "
+export CC=egcc
 export EDITOR="vim"
-alias ls="ls -G"
-alias tty-clock="tty-clock -scurDC 7"
-alias screenfetch="screenfetch -c 6,15"
+export VISUAL="vim"
+export MAIL=$HOME/mail/inbox
+export IOUP_TOKEN=9lE7wicOVO
+
+export PKG_PATH=ftp://ftp.openbsd.org/pub/OpenBSD/5.6/packages/amd64/
+export LC_CTYPE=en_US.UTF-8
+export GTK_IM_MODULE=xim
+export LESSCHARSET=utf-8
+
+alias scrot="scrot"
+alias gcc="egcc"
+alias git=hub
+alias java="/usr/local/jdk-1.7.0/bin/java"
+alias shutdown="sudo shutdown -hp now"
+alias colors="python ~/bin/colors"
+alias ncmpc="ncmpc -c"
+alias screenfetch="screenfetch -c 11,12"
 alias sprunge="curl -F 'sprunge=<-' http://sprunge.us"
+alias vpn="openvpn /home/vypr/doc/ipredator.ovpn &"
diff --git a/.sxhkdrc b/.sxhkdrc
old mode 100644
new mode 100755
index 79a43517..1143af08
--- a/.sxhkdrc
+++ b/.sxhkdrc
@@ -1,16 +1,16 @@
-super + q
+mod4 + q
 	killw $(pfw)
 
-super + s
+mod4 + s
 	urxvt
 
-super + d
+mod4 + d
 	dmenu_run
 
-super + h
+mod4 + h
     mapw -u $(pfw)
 
-super + Down
+mod4 + Down
 	wmv 0 40 $(pfw)
 super + Up
 	wmv 0 -40 $(pfw)
@@ -50,3 +50,9 @@ super + u
     xbacklight -inc 10
 super + j
     xbacklight -dec 10
+
+ctrl + m
+    dmenu_run
+
+super + f
+    sh ~/code/wmutils/contrib/fullscreen.sh
diff --git a/.vimrc b/.vimrc
old mode 100644
new mode 100755
index aa875c1b..53f61122
--- a/.vimrc
+++ b/.vimrc
@@ -6,8 +6,9 @@ set tabstop=4
 set shiftwidth=4
 set autoindent
 set smarttab
-color flattr
+color term
 
+set backspace=2
 set wildmenu
 set cmdheight=1
 set laststatus=2
diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index 81630008..7e77d8ce
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 sh ~/.fehbg &
-#xsetroot -solid "#376f4a"
+#hsetroot -tile $HOME/img/wp/wp_pattern117.gif -tint "#313131"
 xsetroot -cursor_name left_ptr
+
+xset -b
 xset +fp $HOME/.local/share/fonts
 
-[ ! -s ~/.config/mpd/pid ] && mpd
-mpdscribble
-compton -bc
+offlineimap &
+
 xrdb -load ~/.Xresources
 sxhkd -c $HOME/.sxhkdrc &
 swm &
 
 exec urxvt
-xscreensaver -no-splash &
diff --git a/swmconfig.h b/swmconfig.h
old mode 100644
new mode 100755
index 2c230375..a3a6af0a
--- a/swmconfig.h
+++ b/swmconfig.h
@@ -1,13 +1,15 @@
 #define MOD		SUPER		/* modifier for mouse resize and move */
 
 /* INNER + OUTER should not be greater than BORDERWIDTH */
-#define BORDERWIDTH	3		/*  full  border width */
+#define BORDERWIDTH	2		/*  full  border width */
 #define INNER		2		/*  inner border width */
-#define OUTER		1		/*  outer border width */
+#define OUTER		0		/*  outer border width */
 
 /* default colours, don't worry, you can set these with swc later */
-#define FOCUSCOL	0x3ddc6a
+#define FOCUSCOL	0x3dafdc
 #define UNFOCUSCOL	0x3dafdc
-#define OUTERCOL	0x5c5c5c
+#define OUTERCOL	0x3dafdc
 
-#define DOUBLE_BORDER 1
+#define ENABLE_MOUSE
+#define ENABLE_SLOPPY
+#define DOUBLE_BORDER 0