diff --git a/README.md b/README.md
index 10e3ea6..bda47fa 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ and more!
 Follow the [Pre-installation](https://wiki.archlinux.org/title/Installation_guide#Pre-installation).
 Once you mounted the partitions, clone this script
 ```bash
-git clone https://git.maby.dev/ange/archinstall /tmp/ai && cd "$_"
+git clone https://git.maby.dev/ange/archinstall /tmp/ai && cd -- "$_"
 ```
 
 To install the base system, run:
diff --git a/config b/config
index bcbed35..8b0ac7a 100644
--- a/config
+++ b/config
@@ -1,5 +1,6 @@
 # User Variables
 # Comment to disable
+# shellcheck disable=SC2034
 
 #swapfile=2048
 swapfile=auto # auto|MB
@@ -12,22 +13,22 @@ default_shell=/bin/zsh
 
 hostname="$username-pc"
 
-tz='Europe/Paris'
+tz=Europe/Paris
 locales=(
-    'en_US'
+    en_US
 )
 lang="${locales[0]}"
 
 pkg=(
     base{,-devel} man-{db,pages} tldr
     efibootmgr
+    fastfetch
     git
-    htop
+    gvfs{,-gphoto2,-mtp} dosfstools exfatprogs
     iwd iptables-nft wireguard-tools bind gnu-netcat
     jq
     lf
     linux{,-lts,-firmware} mkinitcpio
-    neofetch
     neovim{,-lspconfig} python-{pynvim,black} ripgrep bash-language-server pyright
     opendoas
     openssh
@@ -38,7 +39,6 @@ pkg=(
     rsync
     terminus-font awesome-terminal-fonts
     tlp
-    udisks2 dosfstools exfatprogs
     zsh fzf
 )
 
diff --git a/desktop/config b/desktop/config
index 99cf576..c3523dc 100644
--- a/desktop/config
+++ b/desktop/config
@@ -1,14 +1,14 @@
 # User Variables
 # Comment to disable
+# shellcheck disable=SC2034
 
 pkg=(
     aerc w3m
-    alacritty
     bluez{,-utils}
     dunst libnotify
     feh
     gammastep
-    graphicsmagick
+    graphicsmagick ghostscript
     materia-gtk-theme papirus-icon-theme
     monero
     mpv
@@ -16,11 +16,12 @@ pkg=(
     noto-fonts{,-cjk,-emoji} ttf-{dejavu,liberation} otf-font-awesome
     pass{,-otp} gcr
     pcmanfm-gtk3
+    pipewire{,-pulse,-jack} pavucontrol playerctl
     polkit-gnome
-    qemu-{base,audio-pipewire,hw-display-virtio-{gpu,vga},ui-gtk} dnsmasq
-    wireplumber pipewire{,-pulse,-jack} pavucontrol playerctl
+    qemu-{base,audio-pipewire,hw-usb-host,hw-display-virtio-{gpu,vga},ui-gtk} dnsmasq
     xdg-user-dirs
     yt-dlp
+    zathura{,-pdf-poppler}
     zenity
 )
 
@@ -28,6 +29,7 @@ flatpakpkg=(
     com.valvesoftware.Steam
     net.lutris.Lutris
     org.gimp.GIMP
+    org.gtk.Gtk3theme.Materia-dark
     org.mozilla.firefox
 )
 
diff --git a/desktop/dwm/config b/desktop/dwm/config
index 9f633ff..6099be9 100644
--- a/desktop/dwm/config
+++ b/desktop/dwm/config
@@ -1,5 +1,6 @@
 # User Variables
 # Comment to disable
+# shellcheck disable=SC2034
 
 pkg=(
     autorandr
diff --git a/desktop/dwm/install.sh b/desktop/dwm/install.sh
index 992947a..4e303f2 100755
--- a/desktop/dwm/install.sh
+++ b/desktop/dwm/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
 . ../../src/lib.sh
 
 cp -rfT rootfs/ /mnt/
diff --git a/desktop/dwm/src/install.sh b/desktop/dwm/src/install.sh
index 50812a6..0924ef7 100644
--- a/desktop/dwm/src/install.sh
+++ b/desktop/dwm/src/install.sh
@@ -17,3 +17,6 @@ case "$(lsmod)" in
     *)
         ;;
 esac
+
+git clone --depth 1 https://git.maby.dev/ange/.dotfiles /tmp/dotfiles
+/tmp/dotfiles/.config/suckless/update.sh
diff --git a/desktop/install.sh b/desktop/install.sh
index 5fc8116..216d9c8 100755
--- a/desktop/install.sh
+++ b/desktop/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
 . ../src/lib.sh
 
 cat config ../src/lib.sh src/install.sh | arch-chroot /mnt/ bash -ex
diff --git a/desktop/src/install.sh b/desktop/src/install.sh
index 225b5f7..d4735a6 100644
--- a/desktop/src/install.sh
+++ b/desktop/src/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-pac "${pkg[@]}" flatpak xdg-desktop-portal-gtk mesa
+pac "${pkg[@]}" flatpak xdg-desktop-portal-gtk
 flatpak install -y "${flatpakpkg[@]}"
 
 case "$(lspci | grep 'VGA\|3D')" in
diff --git a/dotfiles.sh b/dotfiles.sh
index 5f0b26a..cce9493 100755
--- a/dotfiles.sh
+++ b/dotfiles.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
 . ./config
 . ./src/lib.sh
 
diff --git a/install.sh b/install.sh
index 6987bd7..909435c 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
 . ./config
 . ./src/lib.sh
 
diff --git a/src/install.sh b/src/install.sh
index 7d26259..e34cf9c 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -8,7 +8,7 @@ for l in "${locales[@]}"; do
 done
 locale-gen
 echo "LANG=$lang.UTF-8" > /etc/locale.conf
-echo "$hostname" > /etc/hostname
+echo - "$hostname" > /etc/hostname
 
 sed -i '/^HOOKS=(/s/filesystems/encrypt filesystems/' /etc/mkinitcpio.conf
 
@@ -25,12 +25,12 @@ systemctl enable \
 # Users
 echo "root:$root_passwd" | chpasswd
 useradd -mG wheel,video "$username" -s "${default_shell-/bin/bash}"
-echo "$username:$user_passwd" | chpasswd
+echo - "$username:$user_passwd" | chpasswd
 
 # ucode
 case "$(lscpu)" in
-    *Intel*) pac amd-ucode ;;
-    *AMD*)   pac intel-ucode ;;
+    *AMD*)   pac amd-ucode ;;
+    *Intel*) pac intel-ucode ;;
     *) ;;
 esac