diff --git a/.bashrc b/.bashrc
index 0c4ffb4..8bf0a77 100644
--- a/.bashrc
+++ b/.bashrc
@@ -48,7 +48,12 @@ stty stop undef
 #   * mathematica / tools
 #   * nxclient / associated tools
 #   * maven tools
-export PATH=export PATH=$HOME/.cabal/bin:$HOME/.gem/ruby/2.0.0/bin:$HOME/.bin:$HOME/.texlive/2013/bin/x86_64-linux:${PATH}:/opt/maven/bin:/opt/NX/bin
+export PATH=export PATH=$HOME/.cabal/bin:$HOME/.gem/ruby/2.0.0/bin:$HOME/.bin:$HOME/.texlive/2014/bin/x86_64-linux:${PATH}:/opt/maven/bin:/opt/NX/bin:/usr/lib/smlnj/bin
+ctlu import-environment PATH
+
+# Setup smlnj (AUR)
+export SMLNJ_HOME="/usr/lib/smlnj"
+ctlu import-environment SMLNJ_HOME
 
 # Setup gpg-agent
 if [ -f "${HOME}/.gpg-agent-info" ]; then
diff --git a/.config/systemd/user/emacs.service b/.config/systemd/user/emacs.service
index 0691b49..d5b5074 100644
--- a/.config/systemd/user/emacs.service
+++ b/.config/systemd/user/emacs.service
@@ -5,7 +5,6 @@ Description = Emacs: the extensible, self-documenting text editor
 Type = forking
 ExecStart = /usr/bin/emacs --daemon
 ExecStop = /usr/bin/emacsclient --eval "(progn (setq kill-emacs-hook 'nil) (kill-emacs))"
-Environment = "PATH=/home/collin/.cabal/bin:/home/collin/.gem/ruby/2.0.0/bin:/home/collin/.bin:/home/collin/.texlive/2013/bin/x86_64-linux:/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/android-sdk/platform-tools:/opt/android-sdk/tools:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/smlnj/bin:/opt/maven/bin:/opt/NX/bin"
 Restart = always
 
 [Install]
diff --git a/.config/systemd/user/unclutter.service b/.config/systemd/user/unclutter.service
index 21e6eb9..e1aaba6 100644
--- a/.config/systemd/user/unclutter.service
+++ b/.config/systemd/user/unclutter.service
@@ -4,7 +4,6 @@ Description = Remove idle cursor image from screen
 [Service]
 type = simple
 ExecStart = /usr/bin/unclutter
-Environment = "DISPLAY=:0"
 Restart = always
 
 [Install]
diff --git a/.config/systemd/user/xbindkeys.service b/.config/systemd/user/xbindkeys.service
index f5c1218..ad17060 100644
--- a/.config/systemd/user/xbindkeys.service
+++ b/.config/systemd/user/xbindkeys.service
@@ -3,7 +3,6 @@ Description = A grabbing keys program for X
 
 [Service]
 ExecStart = /usr/bin/xbindkeys -n -f %h/.xbindkeysrc
-Environment = "DISPLAY=:0"
 Restart = always
 
 [Install]
diff --git a/.config/systemd/user/xscreensaver.service b/.config/systemd/user/xscreensaver.service
index 41d7fc9..43e6604 100644
--- a/.config/systemd/user/xscreensaver.service
+++ b/.config/systemd/user/xscreensaver.service
@@ -3,7 +3,6 @@ Description = Extensible screen saver framework, plus locking
 
 [Service]
 ExecStart = /usr/bin/xscreensaver -no-splash
-Environment = "DISPLAY=:0"
 Restart = always
 
 [Install]
diff --git a/.zshrc b/.zshrc
index 6823de7..839d8ea 100644
--- a/.zshrc
+++ b/.zshrc
@@ -81,7 +81,12 @@ stty stop undef
 #   * mathematica / tools
 #   * nxclient / associated tools
 #   * maven tools
-export PATH=$HOME/.cabal/bin:$HOME/.gem/ruby/2.0.0/bin:$HOME/.bin:$HOME/.texlive/2013/bin/x86_64-linux:${PATH}:/opt/maven/bin:/opt/NX/bin
+export PATH=$HOME/.cabal/bin:$HOME/.gem/ruby/2.0.0/bin:$HOME/.bin:$HOME/.texlive/2014/bin/x86_64-linux:${PATH}:/opt/maven/bin:/opt/NX/bin:/usr/lib/smlnj/bin
+ctlu import-environment PATH
+
+# Setup smlnj (AUR)
+export SMLNJ_HOME="/usr/lib/smlnj"
+ctlu import-environment SMLNJ_HOME
 
 # Setup gpg-agent
 if [ -f "${HOME}/.gpg-agent-info" ]; then