diff --git a/.config/dwb/settings b/.config/dwb/settings
index b3631152..0fdf08f9 100644
--- a/.config/dwb/settings
+++ b/.config/dwb/settings
@@ -38,7 +38,7 @@ auto-shrink-images=true
 print-backgrounds=false
 enable-caret-browsing=false
 enable-scripts=true
-adblocker-filterlist=/home/peter/.config/dwb/adblock_lists
+adblocker-filterlist=/home/morpheo/neidhard/.config/dwb/adblock_lists
 proxy=false
 user-agent=
 full-content-zoom=true
diff --git a/.emacs.d/main.el b/.emacs.d/main.el
index c6bbae90..d461e9a1 100644
--- a/.emacs.d/main.el
+++ b/.emacs.d/main.el
@@ -184,3 +184,6 @@
           (setq org-agenda-files '("~/todo.org"))
           (setq org-enforce-todo-dependencies t))
 
+
+;; Tell grep-find to skip VCS folders.
+(grep-apply-setting 'grep-find-command "find . -name \"*.svn\" -prune -o -type f -print0 | \"xargs\" -0 -e grep -nH -e ")
diff --git a/.scripts/homeinit b/.scripts/homeinit
index fd772fbd..89b79e70 100755
--- a/.scripts/homeinit
+++ b/.scripts/homeinit
@@ -19,7 +19,7 @@ echo
 ## escape sequences with quotes and so on.
 EMFILE='/usr/local/bin/em'
 EMCFILE='/usr/local/bin/emc'
-if [ -n "$(command -v emacs)" ] && [ ! -f "$EMFILE" ]; then
+if [ -n "$(command -v emacs)" ] && [ ! -f "$EMFILE" ] || [ ! -f "$EMCFILE" ]; then
 	echo "==> Emacs (press Ctrl-D to skip)"
 
     if [ -z "$(command -v base64)" ]; then
@@ -30,10 +30,10 @@ bHNlCiAgICBJU19HUkFQSElDQUw9JChlbWFjcyAtYmF0Y2ggLVEgLS1ldmFsPScoaWYgKGZib3Vu
 ZHAgJyInIid0b29sLWJhci1tb2RlKSAobWVzc2FnZSAiMSIpIChtZXNzYWdlICIwIikpJyAyPiYx
 KQpmaQoKaWYgWyAkSVNfR1JBUEhJQ0FMIC1lcSAxIF07IHRoZW4KICAgIGVtYWNzY2xpZW50IC1h
 ICIiIC1uYyAiJEAiCmVsc2UKICAgIGVtYWNzY2xpZW50IC1hICIiIC10ICIkQCIKZmkK
-' | base64 -d > "'"'"$EMFILE"'"'""
+' | base64 -d > "'"'"$EMFILE"'"'" && chmod 755 "'"'"$EMFILE"'"'""
 
         sudo sh -c "umask 022 && echo 'IyEvYmluL3NoCmVtYWNzY2xpZW50IC1hICIiIC10ICIkQCIK
-' | base64 -d > "'"'"$EMCFILE"'"'""
+' | base64 -d > "'"'"$EMCFILE"'"'" && chmod 755 "'"'"$EMFILE"'"'""
 
     fi
 fi