--- a/.xinitrc	Tue Dec 17 10:21:15 2013 +0200
+++ b/.xinitrc	Mon Dec 23 23:51:52 2013 +0200
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -f ~/.bashenv ]]; then
-  . ~/.bashenv
+if [[ -f ~/.env ]]; then
+  . ~/.env
 fi
 # Load custom settings (user editable).
-if [[ -f ~/.bash_custom ]]; then
-  . ~/.bash_custom
+if [[ -f ~/.env.local ]]; then
+  . ~/.env.local
 fi
 
 if [[ -f ~/.Xdefaults ]]; then