diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index f12d9c7..ef4649b 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -1,3 +1,5 @@
+# This is my lf config, totally and completely stolen from Luke Smith -> LukeSmithxyz.
+
 # Luke's lf settings
 
 
@@ -128,4 +130,4 @@ map W $setsid -f $TERMINAL >/dev/null 2>&1
 map Y $printf "%s" "$fx" | xclip -selection clipboard
 
 # Source Bookmarks
-source "~/.config/lf/shortcutrc"
+# source "~/.config/lf/shortcutrc"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5707eae..971a9e2 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -153,4 +153,4 @@ nnoremap <leader>h :call ToggleHiddenAll()<CR>
 " Here leader is ";".
 " So ":vs ;cfz" will expand into ":vs /home/<user>/.config/zsh/.zshrc"
 " if typed fast without the timeout.
-source ~/.config/nvim/shortcuts.vim
+" source ~/.config/nvim/shortcuts.vim
diff --git a/.xinitrc b/.xinitrc
index ff81d04..c655097 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,3 @@
-
 #!/bin/sh
 
 userresources=$HOME/.Xresources
@@ -25,7 +24,7 @@ if [ -f "$userresources" ]; then
 fi
 
 if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
+    xmodmap -pke "$usermodmap"
 fi
 
 # start some nice programs
diff --git a/.zshrc b/.zshrc
index 7fb1bb5..8dd3489 100644
--- a/.zshrc
+++ b/.zshrc
@@ -91,7 +91,7 @@ source $ZSH/oh-my-zsh.sh
  if [[ -n $SSH_CONNECTION ]]; then
    export EDITOR='nano'
  else
-   export EDITOR='micro'
+   export EDITOR='nvim'
  fi
 
 # Compilation flags
@@ -109,8 +109,10 @@ source $ZSH/oh-my-zsh.sh
 alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
 alias logout='/usr/bin/kill -9 -1'
 alias ipaddr='curl api.ipify.org'
-alias sms='nohup kdeconnect-sms &'
 alias ls='ls -la --color=auto'
+alias tmn='tmux new'
+alias tma='tmux attach'
+alias lf='lfub'
 
 path+=('/home/solomon/.local/bin')
 
@@ -205,4 +207,9 @@ ZSH_HIGHLIGHT_STYLES[arg0]='fg=#F8F8F2'
 ZSH_HIGHLIGHT_STYLES[default]='fg=#F8F8F2'
 ZSH_HIGHLIGHT_STYLES[cursor]='standout'
 
-# source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+HOST=$(hostname)
+if [ "$HOST" = "holocene" ] ; then
+	source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
+else
+	source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi