diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index f8c292a..0526b6c 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -89,14 +89,14 @@ window:
 # Font configuration
 font:
   # Normal (roman) font face
-  #normal:
+  normal:
     # Font family
     #
-    # Default:
+    Default:
     #   - (macOS) Menlo
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
-    #family: monospace
+    family: FiraCode
 
     # The `style` can be specified to pick a specific face.
     #style: Regular
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index 32bd7f2..697d82c 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -5,6 +5,7 @@
 		<family>serif</family>
 		<prefer>
 			<family>Droid Serif</family>
+            <family>Symbols Nerd Font</family>
 			<family>Joy Pixels</family>
 			<family>Font Awesome 5 Free Solid</family>
 			<family>Font Awesome 5 Free Regular</family>
@@ -16,6 +17,7 @@
 		<family>sans-serif</family>
 		<prefer>
 			<family>Droid Sans</family>
+            <family>Symbols Nerd Font</family>
 			<family>Joy Pixels</family>
 			<family>Font Awesome 5 Free Solid</family>
 			<family>Font Awesome 5 Free Regular</family>
@@ -27,6 +29,7 @@
 		<family>sans</family>
 		<prefer>
 			<family>Droid Sans</family>
+            <family>Symbols Nerd Font</family>
 			<family>Joy Pixels</family>
 			<family>Font Awesome 5 Free Solid</family>
 			<family>Font Awesome 5 Free Regular</family>
@@ -38,6 +41,7 @@
 		<family>monospace</family>
 		<prefer>
 			<family>Fira Code</family>
+            <family>Symbols Nerd Font</family>
 		</prefer>
 	</alias>
     <match target="pattern">
diff --git a/.config/nvim b/.config/nvim
index f7d2632..179d237 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit f7d2632d208c892a3f570674975a4477e0aeb7ab
+Subproject commit 179d23770d6fa96c292a778dd1e90a9a9f64cf28
diff --git a/.config/shell/profile b/.config/shell/profile
index adb2ba1..d200d9c 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -65,7 +65,10 @@ export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm
 
 # Development variables
 export ANDROID_HOME="/opt/android-sdk"
-export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME"
+export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$ANDROID_HOME/emulator"
+
+# Get pretty colours for ls
+. /usr/share/LS_COLORS/dircolors.sh
 
 # This is the list for lf icons:
 export LF_ICONS="di=📁:\
@@ -148,5 +151,7 @@ ex=🎯:\
 
 [ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 &
 
+[ "$XDG_CURRENT_DESKTOP" = "KDE" ] || [ "$XDG_CURRENT_DESKTOP" = "GNOME" ] || export QT_QPA_PLATFORMTHEME="qt5ct"
+
 [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
 
diff --git a/.local/bin/setup/setupandroid b/.local/bin/setup/setupandroid
index e5646c2..cd3ee42 100755
--- a/.local/bin/setup/setupandroid
+++ b/.local/bin/setup/setupandroid
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-doas pacman --noconfirm -S jdk11-openjdk curl maven ant gradle wget
+sudo pacman --noconfirm -S jdk11-openjdk curl maven ant gradle wget
 
 yay -S --noconfirm --needed \
     android-sdk-cmdline-tools-latest \
@@ -9,24 +9,27 @@ yay -S --noconfirm --needed \
 
 ANDROID_SDK_ROOT="/opt/android-sdk"
 
-mkdir "$HOME/.local/share/android" && touch "$HOME/.local/share/android/repositories.cfg" && \
-    while true; do echo 'y'; sleep 2; done | doas sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "build-tools;30.0.3", "platforms;android-30" && \
-    while true; do echo 'y'; sleep 2; done | doas sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "system-images;android-30;google_apis;x86_64" && \
-    while true; do echo 'y'; sleep 2; done | doas sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" &&  \
-    while true; do echo 'y'; sleep 2; done | doas sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1"
-    while true; do echo 'y'; sleep 2; done | doas sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses \
+mkdir "$HOME/.local/share/android"
+touch "$HOME/.local/share/android/repositories.cfg"
+sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "build-tools;30.0.3", "platforms;android-30"
+sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "system-images;android-30;google_apis;x86_64"
+sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository"
+sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1"
+sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses
 
 mvn -v && gradle -v && java -version && ant -version
 
-doas groupadd android-sdk
-doas gpasswd -a $USER android-sdk
-doas setfacl -R -m g:android-sdk:rwx /opt/android-sdk
-doas setfacl -d -m g:android-sdk:rwX /opt/android-sdk
+sudo groupadd android-sdk
+sudo gpasswd -a $USER android-sdk
+sudo setfacl -R -m g:android-sdk:rwx /opt/android-sdk
+sudo setfacl -d -m g:android-sdk:rwX /opt/android-sdk
 newgrp android-sdk
 
+# This sometimes doesn't work going into the android home directory and
+# running `sdkmanager "system-images;android-30;google_apis;x86_64"` will fix it
 avdmanager -v create avd -n main -k "system-images;android-30;google_apis;x86_64" --device "pixel_xl"
 
-doas pacman --noconfirm -S nodejs
+sudo pacman --noconfirm -S nodejs
 
 npm install -g yarn