diff --git a/config/alacritty-alacritty.toml b/files/.config/alacritty/alacritty.toml
similarity index 100%
rename from config/alacritty-alacritty.toml
rename to files/.config/alacritty/alacritty.toml
diff --git a/config/fish-config.fish b/files/.config/fish/config.fish
similarity index 100%
rename from config/fish-config.fish
rename to files/.config/fish/config.fish
diff --git a/config/helix-config.toml b/files/.config/helix/config.toml
similarity index 100%
rename from config/helix-config.toml
rename to files/.config/helix/config.toml
diff --git a/config/hypr-colors.conf b/files/.config/hypr/colors.conf
similarity index 100%
rename from config/hypr-colors.conf
rename to files/.config/hypr/colors.conf
diff --git a/config/hypr-hypridle.conf b/files/.config/hypr/hypridle.conf
similarity index 100%
rename from config/hypr-hypridle.conf
rename to files/.config/hypr/hypridle.conf
diff --git a/config/hypr-hyprland.conf b/files/.config/hypr/hyprland.conf
similarity index 100%
rename from config/hypr-hyprland.conf
rename to files/.config/hypr/hyprland.conf
diff --git a/config/hypr-hyprlock.conf b/files/.config/hypr/hyprlock.conf
similarity index 100%
rename from config/hypr-hyprlock.conf
rename to files/.config/hypr/hyprlock.conf
diff --git a/config/hypr-hyprpaper.conf b/files/.config/hypr/hyprpaper.conf
similarity index 100%
rename from config/hypr-hyprpaper.conf
rename to files/.config/hypr/hyprpaper.conf
diff --git a/config/hypr-lockbg.jpg b/files/.config/hypr/lockbg.jpg
similarity index 100%
rename from config/hypr-lockbg.jpg
rename to files/.config/hypr/lockbg.jpg
diff --git a/config/hypr-wallpaper.jpg b/files/.config/hypr/wallpaper.jpg
similarity index 100%
rename from config/hypr-wallpaper.jpg
rename to files/.config/hypr/wallpaper.jpg
diff --git a/config/kitty-kitty.conf b/files/.config/kitty/kitty.conf
similarity index 100%
rename from config/kitty-kitty.conf
rename to files/.config/kitty/kitty.conf
diff --git a/config/sway-clamshell.sh b/files/.config/sway/clamshell.sh
similarity index 100%
rename from config/sway-clamshell.sh
rename to files/.config/sway/clamshell.sh
diff --git a/config/sway-status.sh b/files/.config/sway/status.sh
similarity index 100%
rename from config/sway-status.sh
rename to files/.config/sway/status.sh
diff --git a/config/systemd-user-rclonesync.service b/files/.config/systemd/user/rclonesync.service
similarity index 100%
rename from config/systemd-user-rclonesync.service
rename to files/.config/systemd/user/rclonesync.service
diff --git a/config/systemd-user-rclonesync.timer b/files/.config/systemd/user/rclonesync.timer
similarity index 100%
rename from config/systemd-user-rclonesync.timer
rename to files/.config/systemd/user/rclonesync.timer
diff --git a/config/systemd-user-sshagent.service b/files/.config/systemd/user/sshagent.service
similarity index 100%
rename from config/systemd-user-sshagent.service
rename to files/.config/systemd/user/sshagent.service
diff --git a/config/tmux-tmux.conf b/files/.config/tmux/tmux.conf
similarity index 100%
rename from config/tmux-tmux.conf
rename to files/.config/tmux/tmux.conf
diff --git a/config/waybar-battery.sh b/files/.config/waybar/battery.sh
similarity index 100%
rename from config/waybar-battery.sh
rename to files/.config/waybar/battery.sh
diff --git a/config/waybar-brightness.sh b/files/.config/waybar/brightness.sh
similarity index 100%
rename from config/waybar-brightness.sh
rename to files/.config/waybar/brightness.sh
diff --git a/config/waybar-cpu.sh b/files/.config/waybar/cpu.sh
similarity index 100%
rename from config/waybar-cpu.sh
rename to files/.config/waybar/cpu.sh
diff --git a/config/waybar-media.py b/files/.config/waybar/media.py
similarity index 100%
rename from config/waybar-media.py
rename to files/.config/waybar/media.py
diff --git a/config/waybar-ram.sh b/files/.config/waybar/ram.sh
similarity index 100%
rename from config/waybar-ram.sh
rename to files/.config/waybar/ram.sh
diff --git a/config/waybar-start.sh b/files/.config/waybar/start.sh
similarity index 100%
rename from config/waybar-start.sh
rename to files/.config/waybar/start.sh
diff --git a/config/waybar-style.css b/files/.config/waybar/style.css
similarity index 100%
rename from config/waybar-style.css
rename to files/.config/waybar/style.css
diff --git a/config/wofi-style.css b/files/.config/wofi/style.css
similarity index 100%
rename from config/wofi-style.css
rename to files/.config/wofi/style.css
diff --git a/files/.gitconfig b/files/.gitconfig
new file mode 100644
index 0000000..d0d7f8d
--- /dev/null
+++ b/files/.gitconfig
@@ -0,0 +1,8 @@
+[user]
+	name = Ludwig Lehnert
+	email = ludwig@lehnert.dev
+	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjDSkdrqYytm51H5o+Shr9mhboal4TR0o2XbrzrsRkf
+[gpg]
+	format = ssh
+[commit]
+	gpgSign = true
diff --git a/install b/install
index 6f7e079..4985650 100755
--- a/install
+++ b/install
@@ -3,16 +3,12 @@
 cd "$(dirname $(realpath "$0"))"
 
 # install config files
-for filename in $(ls -p config); do
-	subpath="${filename//-//}"
-	filepath="$HOME/.config/$subpath"
-	mkdir -p "$(dirname $filepath)"
-	cp "config/$filename" "$filepath"
+cd files
+for filepath in $(find . -type f); do
+	mkdir -p "$HOME/$(dirname $filepath)"
+	cp "$filepath" "$HOME/$filepath"
 done
-
-# install backrounds
-mkdir -p "$HOME/.local/share/wallpapers"
-cp ./backgrounds/* "$HOME/.local/share/wallpapers/"
+cd ..
 
 mkdir -p "$HOME/.local/bin"
 
diff --git a/setup b/setup
index 4329750..85be1e9 100755
--- a/setup
+++ b/setup
@@ -92,6 +92,7 @@ if [[ $distro == "arch linux" ]]; then
         "org.inkscape.Inkscape"
         "org.onlyoffice.desktopeditors"
         "com.github.xournalpp.xournalpp"
+        "com.github.flxzt.rnote"
         "net.nokyan.Resources"
         "org.gnome.Loupe"
         "org.gnome.Evince"
@@ -123,6 +124,11 @@ if [[ $distro == "arch linux" ]]; then
 
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     flatpak install -y "${flatpak[@]}"
+
+    sudo chsh -s /usr/bin/fish $USER
+
+    sudo usermod -aG video $USER
+    sudo usermod -aG kvm $USER
 else
     echo "Unknown distribution '$distro'; exiting..."
     exit 1