diff --git a/profile.d/apps b/profile.d/apps
index 564ea84..ff024a1 100644
--- a/profile.d/apps
+++ b/profile.d/apps
@@ -4,5 +4,5 @@
 export TERMINAL=urxvtc
 export PAGER=less
 export EDITOR=vim
-export BROWSER=firefox
+export BROWSER=surf
 
diff --git a/profile.d/keychain b/profile.d/keychain
new file mode 100644
index 0000000..19d70a2
--- /dev/null
+++ b/profile.d/keychain
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if $(which keychain &> /dev/null)
+then
+  eval $(keychain --agents ssh,gpg)
+fi
diff --git a/profile.d/mpd b/profile.d/mpd
new file mode 100644
index 0000000..11f6860
--- /dev/null
+++ b/profile.d/mpd
@@ -0,0 +1 @@
+MPD_HOST=volumio