diff --git a/aliases.d/mc b/aliases.d/mc
index 35a4d8c..6f6b7c8 100644
--- a/aliases.d/mc
+++ b/aliases.d/mc
@@ -1 +1,7 @@
-alias mc='. /usr/libexec/mc/mc-wrapper.sh'
+#!/bin/bash
+
+if (which mc &> /dev/null); then
+  if [ "$TERM" = "rxvt-unicode" ]; then
+    alias mc="TERM=rxvt-unicode-256color mc"
+  fi
+fi
diff --git a/aliases.d/mutt b/aliases.d/mutt
new file mode 100644
index 0000000..6196cb0
--- /dev/null
+++ b/aliases.d/mutt
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if (which mutt &> /dev/null); then
+  if [ "$TERM" = "rxvt-unicode" ]; then
+    alias mutt="TERM=rxvt-unicode-256color SOCKS_SERVER=10.181.176.208:1080 socksify mutt"
+  else
+    alias mutt="SOCKS_SERVER=10.181.176.208:1080 socksify mutt"
+  fi
+fi
diff --git a/profile.d/xdg b/profile.d/xdg
new file mode 100644
index 0000000..cb07d05
--- /dev/null
+++ b/profile.d/xdg
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Defined prefered applications
+export XDG_RUNTIME_DIR=$HOME/.cache