diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index a0c76ce..1c847fd 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -21,3 +21,5 @@ message/rfc822=userapp-Thunderbird-VUAL90.desktop
 [Added Associations]
 x-scheme-handler/mailto=userapp-Thunderbird-VUAL90.desktop;
 message/rfc822=userapp-Thunderbird-VUAL90.desktop;
+x-scheme-handler/sms=org.gnome.Shell.Extensions.ZorinConnect.desktop;
+x-scheme-handler/tel=org.gnome.Shell.Extensions.ZorinConnect.desktop;
diff --git a/.config/nvim b/.config/nvim
index 61f98e0..3321174 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 61f98e0d8e2fd6a34289b1a3ce8bcf5412370221
+Subproject commit 33211744c873f1389ef102e22f4fd078b651c22a
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 08cfa40..0c7093a 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -47,7 +47,6 @@ alias \
     lc="clone_from_labs" \
     gc="clone_from_github" \
     dgit="git --git-dir ~/.config/dotfiles/.git --work-tree=$HOME" \
-    sudo=doas \
     .z="source ~/.config/shell/profile" \
     testmic="arecord -vv -f dat /dev/null"
 
@@ -57,6 +56,8 @@ alias \
     roi="trans ro:en -i" \
     enr="trans en:ro -j -- "
 
+which doas >/dev/null && alias sudo=doas
+
 # Clone from labs
 function clone_from_labs() {
     git clone "git@labs.scarif.space:chris/$1" "${@:2}"
diff --git a/.config/shell/bm-files b/.config/shell/bm-files
index ed17fb3..b5f23c7 100644
--- a/.config/shell/bm-files
+++ b/.config/shell/bm-files
@@ -1,7 +1,6 @@
 bf    ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files
 bd    ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs
 cfx   ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources
-cfb   ~/.local/src/dwmblocks/config.h
 cfv   ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/init.vim
 cfz   $ZDOTDIR/.zshrc
 cfa   ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc
diff --git a/.config/shell/profile b/.config/shell/profile
index d200d9c..65c1101 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -3,9 +3,9 @@
 # profile file. Runs on login. Environmental variables are set here.
 
 # Adds `~/.local/bin` to $PATH
-export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}:$(yarn global bin)"
+#export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}:$(yarn global bin)"
 
-unsetopt PROMPT_SP
+#unsetopt PROMPT_SP
 
 # Default programs
 export EDITOR="nvim"
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 5a28707..c66b6e9 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
 XDG_DESKTOP_DIR="$HOME/"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_VIDEOS_DIR="$HOME/Videos"
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index 1131a28..a79be1e 100644
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -3,6 +3,8 @@
 # This file runs when a DM logs you into a graphical session.
 # If you use startx/xinit, this file will also be sourced.
 
+grep Zorin /etc/lsb-release >/dev/null && exit
+
 xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources # Use Xresources colors/settings on startup
 
 if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI" ]; then