diff --git a/config/fontconfig/fonts.conf b/config/fontconfig/fonts.conf
new file mode 100644
index 0000000..afd7d3c
--- /dev/null
+++ b/config/fontconfig/fonts.conf
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+<alias>
+  <family>system-ui</family>
+  <prefer>
+    <family>Adwaita Sans</family>
+    <family>JetBrains Mono NF</family>
+  </prefer>
+</alias>
+</fontconfig>
diff --git a/config/scripts/updates.sh b/config/scripts/updates.sh
index b68b910..86fe814 100755
--- a/config/scripts/updates.sh
+++ b/config/scripts/updates.sh
@@ -4,7 +4,7 @@
 
 NOTIFY_ICON=/usr/share/icons/Papirus/32x32/apps/system-software-update.svg
 
-get_total_updates() { UPDATES=$(aur-check-updates --repos extra --raw 2>/dev/null | wc -l); }
+get_total_updates() { UPDATES=$(($(checkupdates | wc -l) + $(aur-check-updates --raw | wc -l))); }
 
 while true; do
     get_total_updates
diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index a7d6131..53d99fe 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -15,5 +15,11 @@ export GTK_THEME=Adwaita:dark
 export GTK2_RC_FILES=/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc
 export QT_STYLE_OVERRIDE=Adwaita-Dark
 
+# Set XDG Base Directory variables
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
 # Set vim as default text editor
 export EDITOR=vim
diff --git a/setup-scripts/config.sh b/setup-scripts/config.sh
index c88e04f..54b29b0 100644
--- a/setup-scripts/config.sh
+++ b/setup-scripts/config.sh
@@ -51,6 +51,11 @@ function config_cron() {
     sudo systemctl enable cronie.service
 }
 
+function config_gsettings() {
+    gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+    gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita'
+}
+
 function config_misc() {
     place $ROOT/config/dunst/dunstrc $HOME/.config/dunst/dunstrc
     place $ROOT/config/fastfetch/config.jsonc $HOME/.config/fastfetch/config.jsonc
@@ -59,9 +64,11 @@ function config_misc() {
     place $ROOT/config/gtk/.gtkrc-2.0 $HOME/.gtkrc-2.0
     place $ROOT/config/gtk/gtk-2.0/gtkfilechooser.ini $HOME/.config/gtk-2.0/gtkfilechooser.ini
     place $ROOT/config/gtk/gtk-3.0/settings.ini $HOME/.config/gtk-3.0/settings.ini
+    config_gsettings
     place $ROOT/config/i3/config $HOME/.config/i3/config
     place_dir $ROOT/config/kitty/ $HOME/.config/kitty/
     place $ROOT/config/picom/picom.conf $HOME/.config/picom/picom.conf
+    place $ROOT/config/fontconfig/fonts.conf $HOME/.config/fontconfig/fonts.conf
     place_dir $ROOT/config/polybar/ $HOME/.config/polybar/
     place_dir $ROOT/config/rofi/ $HOME/.config/rofi/
     place_dir $ROOT/config/wallpapers $HOME/.config/wallpapers/
diff --git a/setup.sh b/setup.sh
index 9946a4b..db066c2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -69,17 +69,18 @@ EOF
 official_packages=("base-devel"                                                    # AUR helper
     "linux-lts" "linux-lts-headers"                                                # Kernel
     "os-prober" "efibootmgr" "grub" "sbctl"                                        # Bootloader
-    "xorg" "xorg-xinit" "i3-wm"                                                    # Xorg adn i3
+    "xorg" "xorg-xinit" "i3-wm"                                                    # Xorg and i3
     "networkmanager"                                                               # Network
     "firefox" "discord" "nemo" "feh" "vim" "neovim"                                # Apps
     "kitty" "dunst" "picom" "polybar" "rofi" "zsh" "fastfetch"                     # Terminal and status bar
     "pipewire" "pipewire-pulse" "pipewire-alsa" "pipewire-jack" "pavucontrol"      # Audio
     "sl" "xclip" "playerctl" "flameshot" "bluez" "trash-cli" "man-db" "man-pages"
     "udiskie" "arandr" "autorandr" "btop" "powertop" "tlp" "brightnessctl"
-    "polkit-gnome" "unzip" "rsync" "cronie"                                        # Utilities
+    "polkit-gnome" "unzip" "rsync"                                                 # Utilities
     "sddm" "qt5-graphicaleffects" "qt5-quickcontrols2" "qt5-svg"                   # Login manager
     "gnome-themes-extra"                                                           # Themes
     "ttf-jetbrains-mono-nerd" "ttf-droid"                                          # Fonts
+    "pacman-contrib"                                                               # Updates
 )
 
 aur_packages=("visual-studio-code-bin" "cmatrix-git" "i3lock-color" "peaclock"