diff --git a/applications.conf.yaml b/arch/applications.conf.yaml
similarity index 100%
rename from applications.conf.yaml
rename to arch/applications.conf.yaml
diff --git a/config/.xinitrc b/arch/config/.xinitrc
similarity index 100%
rename from config/.xinitrc
rename to arch/config/.xinitrc
diff --git a/config/bspwmrc b/arch/config/bspwmrc
similarity index 100%
rename from config/bspwmrc
rename to arch/config/bspwmrc
diff --git a/config/chromium/extensions.list.txt b/arch/config/chromium/extensions.list.txt
similarity index 100%
rename from config/chromium/extensions.list.txt
rename to arch/config/chromium/extensions.list.txt
diff --git a/config/chromium/flags b/arch/config/chromium/flags
similarity index 100%
rename from config/chromium/flags
rename to arch/config/chromium/flags
diff --git a/config/cursors.theme b/arch/config/cursors.theme
similarity index 100%
rename from config/cursors.theme
rename to arch/config/cursors.theme
diff --git a/config/gtk/2.ini b/arch/config/gtk/2.ini
similarity index 100%
rename from config/gtk/2.ini
rename to arch/config/gtk/2.ini
diff --git a/config/gtk/3.ini b/arch/config/gtk/3.ini
similarity index 100%
rename from config/gtk/3.ini
rename to arch/config/gtk/3.ini
diff --git a/config/kitty.conf b/arch/config/kitty.conf
similarity index 100%
rename from config/kitty.conf
rename to arch/config/kitty.conf
diff --git a/config/pacman.conf b/arch/config/pacman.conf
similarity index 100%
rename from config/pacman.conf
rename to arch/config/pacman.conf
diff --git a/config/picom.conf b/arch/config/picom.conf
similarity index 100%
rename from config/picom.conf
rename to arch/config/picom.conf
diff --git a/config/polybar/config b/arch/config/polybar/config
similarity index 100%
rename from config/polybar/config
rename to arch/config/polybar/config
diff --git a/config/polybar/launch.sh b/arch/config/polybar/launch.sh
similarity index 100%
rename from config/polybar/launch.sh
rename to arch/config/polybar/launch.sh
diff --git a/config/polybar/modules/menu b/arch/config/polybar/modules/menu
similarity index 100%
rename from config/polybar/modules/menu
rename to arch/config/polybar/modules/menu
diff --git a/config/polybar/modules/spotify b/arch/config/polybar/modules/spotify
similarity index 100%
rename from config/polybar/modules/spotify
rename to arch/config/polybar/modules/spotify
diff --git a/config/polybar/modules/status b/arch/config/polybar/modules/status
similarity index 100%
rename from config/polybar/modules/status
rename to arch/config/polybar/modules/status
diff --git a/config/polybar/modules/system b/arch/config/polybar/modules/system
similarity index 100%
rename from config/polybar/modules/system
rename to arch/config/polybar/modules/system
diff --git a/config/polybar/modules/wm b/arch/config/polybar/modules/wm
similarity index 100%
rename from config/polybar/modules/wm
rename to arch/config/polybar/modules/wm
diff --git a/config/polybar/scripts/color.rasi b/arch/config/polybar/scripts/color.rasi
similarity index 100%
rename from config/polybar/scripts/color.rasi
rename to arch/config/polybar/scripts/color.rasi
diff --git a/config/polybar/scripts/get_spotify_status.sh b/arch/config/polybar/scripts/get_spotify_status.sh
similarity index 100%
rename from config/polybar/scripts/get_spotify_status.sh
rename to arch/config/polybar/scripts/get_spotify_status.sh
diff --git a/config/polybar/scripts/power-menu.sh b/arch/config/polybar/scripts/power-menu.sh
similarity index 100%
rename from config/polybar/scripts/power-menu.sh
rename to arch/config/polybar/scripts/power-menu.sh
diff --git a/config/polybar/scripts/scroll_spotify_status.sh b/arch/config/polybar/scripts/scroll_spotify_status.sh
similarity index 100%
rename from config/polybar/scripts/scroll_spotify_status.sh
rename to arch/config/polybar/scripts/scroll_spotify_status.sh
diff --git a/config/rofi/config.rasi b/arch/config/rofi/config.rasi
similarity index 100%
rename from config/rofi/config.rasi
rename to arch/config/rofi/config.rasi
diff --git a/config/rofi/material.rasi b/arch/config/rofi/material.rasi
similarity index 100%
rename from config/rofi/material.rasi
rename to arch/config/rofi/material.rasi
diff --git a/config/sddm.conf b/arch/config/sddm.conf
similarity index 100%
rename from config/sddm.conf
rename to arch/config/sddm.conf
diff --git a/config/spotifyd.conf b/arch/config/spotifyd.conf
similarity index 100%
rename from config/spotifyd.conf
rename to arch/config/spotifyd.conf
diff --git a/config/sxhkdrc b/arch/config/sxhkdrc
similarity index 100%
rename from config/sxhkdrc
rename to arch/config/sxhkdrc
diff --git a/config/vscodium.json b/arch/config/vscodium.json
similarity index 100%
rename from config/vscodium.json
rename to arch/config/vscodium.json
diff --git a/arch/install-root.conf.yaml b/arch/install-root.conf.yaml
new file mode 100644
index 0000000..7bf8dcc
--- /dev/null
+++ b/arch/install-root.conf.yaml
@@ -0,0 +1,16 @@
+- defaults:
+    link:
+      create: true
+      relink: true
+      force: true
+
+- link:
+    # sddm
+    /etc/sddm.conf.d/default.conf: arch/config/sddm.conf
+
+    # System
+    /etc/pacman.conf: arch/config/pacman.conf
+
+    /bin/dotfiles: dotfiles
+
+    /usr/share/icons/default/index.theme: arch/config/cursors.theme
diff --git a/install.conf.yaml b/arch/install.conf.yaml
similarity index 50%
rename from install.conf.yaml
rename to arch/install.conf.yaml
index 73cbea8..54b688a 100644
--- a/install.conf.yaml
+++ b/arch/install.conf.yaml
@@ -8,29 +8,29 @@
 
 - link:
     # WM
-    ~/.config/bspwm/bspwmrc: config/bspwmrc
-    ~/.config/sxhkd/sxhkdrc: config/sxhkdrc
-    ~/.config/polybar: config/polybar
-    ~/.config/picom/picom.conf: config/picom.conf
+    ~/.config/bspwm/bspwmrc: arch/config/bspwmrc
+    ~/.config/sxhkd/sxhkdrc: arch/config/sxhkdrc
+    ~/.config/polybar: arch/config/polybar
+    ~/.config/picom/picom.conf: arch/config/picom.conf
 
     # Shell
-    ~/.config/kitty/kitty.conf: config/kitty.conf
+    ~/.config/kitty/kitty.conf: arch/config/kitty.conf
     ~/.aliases: config/.aliases.sh
     ~/gpg.conf: config/gpg.conf
     ~/.ssh/config: config/ssh
-    ~/.xinitrc: config/.xinitrc
+    ~/.xinitrc: arch/config/.xinitrc
 
     # Micro
     ~/.config/micro/settings.json: config/micro/settings.json
     ~/.config/micro/bindings.json: config/micro/bindings.json
 
     # Applications
-    ~/.config/spotifyd/spotifyd.conf: config/spotifyd.conf
-    ~/.gtkrc-2.0: config/gtk/2.ini
-    ~/.config/gtk-3.0/settings.ini: config/gtk/3.ini
-    ~/.config/VSCodium/User/settings.json: config/vscodium.json
-    ~/.config/chromium-flags.conf: config/chromium/flags
-    ~/.config/rofi: config/rofi/
+    ~/.config/spotifyd/spotifyd.conf: arch/config/spotifyd.conf
+    ~/.gtkrc-2.0: arch/config/gtk/2.ini
+    ~/.config/gtk-3.0/settings.ini: arch/config/gtk/3.ini
+    ~/.config/VSCodium/User/settings.json: arch/config/vscodium.json
+    ~/.config/chromium-flags.conf: arch/config/chromium/flags
+    ~/.config/rofi: arch/config/rofi/
 
     # System
 
diff --git a/install_scripts/install-applications b/arch/install_scripts/install-applications
similarity index 56%
rename from install_scripts/install-applications
rename to arch/install_scripts/install-applications
index e1198c6..a15fff5 100755
--- a/install_scripts/install-applications
+++ b/arch/install_scripts/install-applications
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-$DOTFILES/install -p dotbot-yay/yay.py -p dotbot-vscode/vscode.py -c applications.conf.yaml
+$ROOT/install -p dotbot-yay/yay.py -p dotbot-vscode/vscode.py -c applications.conf.yaml
 
 # Spotifyd
 sudo systemctl enable spotifyd --machine=$USER@.host --user --now
diff --git a/arch/install_scripts/install-packages b/arch/install_scripts/install-packages
new file mode 100755
index 0000000..aefadc1
--- /dev/null
+++ b/arch/install_scripts/install-packages
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$ROOT/install -p dotbot-yay/yay.py -c $DOTFILES/packages.conf.yaml
diff --git a/install_scripts/post-install b/arch/install_scripts/post-install
similarity index 76%
rename from install_scripts/post-install
rename to arch/install_scripts/post-install
index 169a0bd..76879e2 100755
--- a/install_scripts/post-install
+++ b/arch/install_scripts/post-install
@@ -14,10 +14,10 @@ sudo cp $DOTFILES/themes/zune /usr/share/sddm/themes/ -r
 micro -plugin install quoter filemanager
 
 # ZSH
-$DOTFILES/scripts/install-z.sh
+$ROOT/scripts/install-z.sh
 
 # Update user
-$DOTFILES/scripts/chuser.sh
+$ROOT/scripts/chuser.sh
 
 # Set locale
-$DOTFILES/scripts/set_locale.sh
+$ROOT/scripts/set_locale.sh
diff --git a/arch/install_scripts/pre-install b/arch/install_scripts/pre-install
new file mode 100755
index 0000000..d2ca1ee
--- /dev/null
+++ b/arch/install_scripts/pre-install
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+$ROOT/install
+sudo $ROOT/install -c "$DOTFILES/install-root.conf.yaml"
diff --git a/packages.conf.yaml b/arch/packages.conf.yaml
similarity index 100%
rename from packages.conf.yaml
rename to arch/packages.conf.yaml
diff --git a/themes/zune/AUTHORS b/arch/themes/zune/AUTHORS
similarity index 100%
rename from themes/zune/AUTHORS
rename to arch/themes/zune/AUTHORS
diff --git a/themes/zune/LICENSE b/arch/themes/zune/LICENSE
similarity index 100%
rename from themes/zune/LICENSE
rename to arch/themes/zune/LICENSE
diff --git a/themes/zune/Login.qml b/arch/themes/zune/Login.qml
similarity index 100%
rename from themes/zune/Login.qml
rename to arch/themes/zune/Login.qml
diff --git a/themes/zune/Main.qml b/arch/themes/zune/Main.qml
similarity index 100%
rename from themes/zune/Main.qml
rename to arch/themes/zune/Main.qml
diff --git a/themes/zune/Skel.qml b/arch/themes/zune/Skel.qml
similarity index 100%
rename from themes/zune/Skel.qml
rename to arch/themes/zune/Skel.qml
diff --git a/themes/zune/components/ActionButton.qml b/arch/themes/zune/components/ActionButton.qml
similarity index 100%
rename from themes/zune/components/ActionButton.qml
rename to arch/themes/zune/components/ActionButton.qml
diff --git a/themes/zune/components/Battery.qml b/arch/themes/zune/components/Battery.qml
similarity index 100%
rename from themes/zune/components/Battery.qml
rename to arch/themes/zune/components/Battery.qml
diff --git a/themes/zune/components/Clock.qml b/arch/themes/zune/components/Clock.qml
similarity index 100%
rename from themes/zune/components/Clock.qml
rename to arch/themes/zune/components/Clock.qml
diff --git a/themes/zune/components/ComboBoxMenu.qml b/arch/themes/zune/components/ComboBoxMenu.qml
similarity index 100%
rename from themes/zune/components/ComboBoxMenu.qml
rename to arch/themes/zune/components/ComboBoxMenu.qml
diff --git a/themes/zune/components/KeyboardButton.qml b/arch/themes/zune/components/KeyboardButton.qml
similarity index 100%
rename from themes/zune/components/KeyboardButton.qml
rename to arch/themes/zune/components/KeyboardButton.qml
diff --git a/themes/zune/components/LoginButton.qml b/arch/themes/zune/components/LoginButton.qml
similarity index 100%
rename from themes/zune/components/LoginButton.qml
rename to arch/themes/zune/components/LoginButton.qml
diff --git a/themes/zune/components/NotificationMessage.qml b/arch/themes/zune/components/NotificationMessage.qml
similarity index 100%
rename from themes/zune/components/NotificationMessage.qml
rename to arch/themes/zune/components/NotificationMessage.qml
diff --git a/themes/zune/components/Screensaver.qml b/arch/themes/zune/components/Screensaver.qml
similarity index 100%
rename from themes/zune/components/Screensaver.qml
rename to arch/themes/zune/components/Screensaver.qml
diff --git a/themes/zune/components/SessionButton.qml b/arch/themes/zune/components/SessionButton.qml
similarity index 100%
rename from themes/zune/components/SessionButton.qml
rename to arch/themes/zune/components/SessionButton.qml
diff --git a/themes/zune/components/SwitchButton.qml b/arch/themes/zune/components/SwitchButton.qml
similarity index 100%
rename from themes/zune/components/SwitchButton.qml
rename to arch/themes/zune/components/SwitchButton.qml
diff --git a/themes/zune/components/TextBox.qml b/arch/themes/zune/components/TextBox.qml
similarity index 100%
rename from themes/zune/components/TextBox.qml
rename to arch/themes/zune/components/TextBox.qml
diff --git a/themes/zune/components/TextConstants.qml b/arch/themes/zune/components/TextConstants.qml
similarity index 100%
rename from themes/zune/components/TextConstants.qml
rename to arch/themes/zune/components/TextConstants.qml
diff --git a/themes/zune/components/User.qml b/arch/themes/zune/components/User.qml
similarity index 100%
rename from themes/zune/components/User.qml
rename to arch/themes/zune/components/User.qml
diff --git a/themes/zune/components/UserList.qml b/arch/themes/zune/components/UserList.qml
similarity index 100%
rename from themes/zune/components/UserList.qml
rename to arch/themes/zune/components/UserList.qml
diff --git a/themes/zune/components/UsernameLabel.qml b/arch/themes/zune/components/UsernameLabel.qml
similarity index 100%
rename from themes/zune/components/UsernameLabel.qml
rename to arch/themes/zune/components/UsernameLabel.qml
diff --git a/themes/zune/components/VirtualKeyboard.qml b/arch/themes/zune/components/VirtualKeyboard.qml
similarity index 100%
rename from themes/zune/components/VirtualKeyboard.qml
rename to arch/themes/zune/components/VirtualKeyboard.qml
diff --git a/themes/zune/components/artwork/background.jpg b/arch/themes/zune/components/artwork/background.jpg
similarity index 100%
rename from themes/zune/components/artwork/background.jpg
rename to arch/themes/zune/components/artwork/background.jpg
diff --git a/themes/zune/components/artwork/background2.jpg b/arch/themes/zune/components/artwork/background2.jpg
similarity index 100%
rename from themes/zune/components/artwork/background2.jpg
rename to arch/themes/zune/components/artwork/background2.jpg
diff --git a/themes/zune/components/artwork/buttons/fullscreen.svg b/arch/themes/zune/components/artwork/buttons/fullscreen.svg
similarity index 100%
rename from themes/zune/components/artwork/buttons/fullscreen.svg
rename to arch/themes/zune/components/artwork/buttons/fullscreen.svg
diff --git a/themes/zune/components/artwork/buttons/reboot.svg b/arch/themes/zune/components/artwork/buttons/reboot.svg
similarity index 100%
rename from themes/zune/components/artwork/buttons/reboot.svg
rename to arch/themes/zune/components/artwork/buttons/reboot.svg
diff --git a/themes/zune/components/artwork/buttons/shutdown.svg b/arch/themes/zune/components/artwork/buttons/shutdown.svg
similarity index 100%
rename from themes/zune/components/artwork/buttons/shutdown.svg
rename to arch/themes/zune/components/artwork/buttons/shutdown.svg
diff --git a/themes/zune/components/artwork/buttons/suspend.svg b/arch/themes/zune/components/artwork/buttons/suspend.svg
similarity index 100%
rename from themes/zune/components/artwork/buttons/suspend.svg
rename to arch/themes/zune/components/artwork/buttons/suspend.svg
diff --git a/themes/zune/components/artwork/buttons/switch-user.svg b/arch/themes/zune/components/artwork/buttons/switch-user.svg
similarity index 100%
rename from themes/zune/components/artwork/buttons/switch-user.svg
rename to arch/themes/zune/components/artwork/buttons/switch-user.svg
diff --git a/themes/zune/components/artwork/combobox/double-arrow.png b/arch/themes/zune/components/artwork/combobox/double-arrow.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/double-arrow.png
rename to arch/themes/zune/components/artwork/combobox/double-arrow.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ae.png b/arch/themes/zune/components/artwork/combobox/flags/default/ae.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ae.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ae.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/am.png b/arch/themes/zune/components/artwork/combobox/flags/default/am.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/am.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/am.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ar.png b/arch/themes/zune/components/artwork/combobox/flags/default/ar.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ar.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ar.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/at.png b/arch/themes/zune/components/artwork/combobox/flags/default/at.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/at.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/at.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/az.png b/arch/themes/zune/components/artwork/combobox/flags/default/az.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/az.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/az.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/be.png b/arch/themes/zune/components/artwork/combobox/flags/default/be.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/be.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/be.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/bg.png b/arch/themes/zune/components/artwork/combobox/flags/default/bg.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/bg.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/bg.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/bh.png b/arch/themes/zune/components/artwork/combobox/flags/default/bh.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/bh.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/bh.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/br.png b/arch/themes/zune/components/artwork/combobox/flags/default/br.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/br.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/br.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/by.png b/arch/themes/zune/components/artwork/combobox/flags/default/by.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/by.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/by.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ca.png b/arch/themes/zune/components/artwork/combobox/flags/default/ca.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ca.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ca.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ch.png b/arch/themes/zune/components/artwork/combobox/flags/default/ch.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ch.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ch.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/cu.png b/arch/themes/zune/components/artwork/combobox/flags/default/cu.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/cu.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/cu.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/cz.png b/arch/themes/zune/components/artwork/combobox/flags/default/cz.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/cz.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/cz.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/de.png b/arch/themes/zune/components/artwork/combobox/flags/default/de.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/de.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/de.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/dj.png b/arch/themes/zune/components/artwork/combobox/flags/default/dj.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/dj.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/dj.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/dk.png b/arch/themes/zune/components/artwork/combobox/flags/default/dk.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/dk.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/dk.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/dz.png b/arch/themes/zune/components/artwork/combobox/flags/default/dz.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/dz.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/dz.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ee.png b/arch/themes/zune/components/artwork/combobox/flags/default/ee.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ee.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ee.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/eg.png b/arch/themes/zune/components/artwork/combobox/flags/default/eg.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/eg.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/eg.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/es.png b/arch/themes/zune/components/artwork/combobox/flags/default/es.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/es.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/es.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/eu.png b/arch/themes/zune/components/artwork/combobox/flags/default/eu.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/eu.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/eu.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/fi.png b/arch/themes/zune/components/artwork/combobox/flags/default/fi.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/fi.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/fi.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/fr.png b/arch/themes/zune/components/artwork/combobox/flags/default/fr.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/fr.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/fr.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/gb.png b/arch/themes/zune/components/artwork/combobox/flags/default/gb.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/gb.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/gb.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ge.png b/arch/themes/zune/components/artwork/combobox/flags/default/ge.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ge.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ge.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/gr.png b/arch/themes/zune/components/artwork/combobox/flags/default/gr.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/gr.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/gr.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/hr.png b/arch/themes/zune/components/artwork/combobox/flags/default/hr.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/hr.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/hr.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/hu.png b/arch/themes/zune/components/artwork/combobox/flags/default/hu.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/hu.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/hu.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/il.png b/arch/themes/zune/components/artwork/combobox/flags/default/il.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/il.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/il.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/in.png b/arch/themes/zune/components/artwork/combobox/flags/default/in.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/in.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/in.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/iq.png b/arch/themes/zune/components/artwork/combobox/flags/default/iq.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/iq.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/iq.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/is.png b/arch/themes/zune/components/artwork/combobox/flags/default/is.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/is.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/is.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/it.png b/arch/themes/zune/components/artwork/combobox/flags/default/it.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/it.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/it.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/jo.png b/arch/themes/zune/components/artwork/combobox/flags/default/jo.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/jo.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/jo.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/jp.png b/arch/themes/zune/components/artwork/combobox/flags/default/jp.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/jp.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/jp.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/km.png b/arch/themes/zune/components/artwork/combobox/flags/default/km.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/km.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/km.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/kr.png b/arch/themes/zune/components/artwork/combobox/flags/default/kr.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/kr.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/kr.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/kw.png b/arch/themes/zune/components/artwork/combobox/flags/default/kw.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/kw.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/kw.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/la.png b/arch/themes/zune/components/artwork/combobox/flags/default/la.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/la.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/la.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/lb.png b/arch/themes/zune/components/artwork/combobox/flags/default/lb.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/lb.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/lb.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/lt.png b/arch/themes/zune/components/artwork/combobox/flags/default/lt.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/lt.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/lt.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/lv.png b/arch/themes/zune/components/artwork/combobox/flags/default/lv.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/lv.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/lv.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ly.png b/arch/themes/zune/components/artwork/combobox/flags/default/ly.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ly.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ly.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ma.png b/arch/themes/zune/components/artwork/combobox/flags/default/ma.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ma.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ma.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/mk.png b/arch/themes/zune/components/artwork/combobox/flags/default/mk.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/mk.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/mk.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/mn.png b/arch/themes/zune/components/artwork/combobox/flags/default/mn.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/mn.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/mn.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/mx.png b/arch/themes/zune/components/artwork/combobox/flags/default/mx.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/mx.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/mx.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/nl.png b/arch/themes/zune/components/artwork/combobox/flags/default/nl.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/nl.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/nl.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/no.png b/arch/themes/zune/components/artwork/combobox/flags/default/no.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/no.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/no.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/om.png b/arch/themes/zune/components/artwork/combobox/flags/default/om.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/om.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/om.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/pl.png b/arch/themes/zune/components/artwork/combobox/flags/default/pl.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/pl.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/pl.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ps.png b/arch/themes/zune/components/artwork/combobox/flags/default/ps.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ps.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ps.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/pt.png b/arch/themes/zune/components/artwork/combobox/flags/default/pt.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/pt.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/pt.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/qa.png b/arch/themes/zune/components/artwork/combobox/flags/default/qa.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/qa.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/qa.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/qc.png b/arch/themes/zune/components/artwork/combobox/flags/default/qc.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/qc.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/qc.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ro.png b/arch/themes/zune/components/artwork/combobox/flags/default/ro.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ro.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ro.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ru.png b/arch/themes/zune/components/artwork/combobox/flags/default/ru.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ru.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ru.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/sa.png b/arch/themes/zune/components/artwork/combobox/flags/default/sa.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/sa.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/sa.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/sd.png b/arch/themes/zune/components/artwork/combobox/flags/default/sd.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/sd.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/sd.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/se.png b/arch/themes/zune/components/artwork/combobox/flags/default/se.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/se.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/se.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/si.png b/arch/themes/zune/components/artwork/combobox/flags/default/si.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/si.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/si.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/sk.png b/arch/themes/zune/components/artwork/combobox/flags/default/sk.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/sk.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/sk.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/so.png b/arch/themes/zune/components/artwork/combobox/flags/default/so.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/so.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/so.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/sr.png b/arch/themes/zune/components/artwork/combobox/flags/default/sr.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/sr.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/sr.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/sy.png b/arch/themes/zune/components/artwork/combobox/flags/default/sy.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/sy.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/sy.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/th.png b/arch/themes/zune/components/artwork/combobox/flags/default/th.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/th.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/th.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/tn.png b/arch/themes/zune/components/artwork/combobox/flags/default/tn.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/tn.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/tn.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/tr.png b/arch/themes/zune/components/artwork/combobox/flags/default/tr.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/tr.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/tr.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ua.png b/arch/themes/zune/components/artwork/combobox/flags/default/ua.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ua.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ua.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/uk.png b/arch/themes/zune/components/artwork/combobox/flags/default/uk.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/uk.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/uk.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/un.png b/arch/themes/zune/components/artwork/combobox/flags/default/un.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/un.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/un.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/us.png b/arch/themes/zune/components/artwork/combobox/flags/default/us.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/us.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/us.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/uy.png b/arch/themes/zune/components/artwork/combobox/flags/default/uy.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/uy.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/uy.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/vn.png b/arch/themes/zune/components/artwork/combobox/flags/default/vn.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/vn.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/vn.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/ye.png b/arch/themes/zune/components/artwork/combobox/flags/default/ye.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/ye.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/ye.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/yu.png b/arch/themes/zune/components/artwork/combobox/flags/default/yu.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/yu.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/yu.png
diff --git a/themes/zune/components/artwork/combobox/flags/default/zz.png b/arch/themes/zune/components/artwork/combobox/flags/default/zz.png
similarity index 100%
rename from themes/zune/components/artwork/combobox/flags/default/zz.png
rename to arch/themes/zune/components/artwork/combobox/flags/default/zz.png
diff --git a/themes/zune/components/artwork/face.icon b/arch/themes/zune/components/artwork/face.icon
similarity index 100%
rename from themes/zune/components/artwork/face.icon
rename to arch/themes/zune/components/artwork/face.icon
diff --git a/themes/zune/components/artwork/fonts/Fonts.qml b/arch/themes/zune/components/artwork/fonts/Fonts.qml
similarity index 100%
rename from themes/zune/components/artwork/fonts/Fonts.qml
rename to arch/themes/zune/components/artwork/fonts/Fonts.qml
diff --git a/themes/zune/components/artwork/fonts/Segoe.ttf b/arch/themes/zune/components/artwork/fonts/Segoe.ttf
similarity index 100%
rename from themes/zune/components/artwork/fonts/Segoe.ttf
rename to arch/themes/zune/components/artwork/fonts/Segoe.ttf
diff --git a/themes/zune/components/artwork/textbox/backspace.svg b/arch/themes/zune/components/artwork/textbox/backspace.svg
similarity index 100%
rename from themes/zune/components/artwork/textbox/backspace.svg
rename to arch/themes/zune/components/artwork/textbox/backspace.svg
diff --git a/themes/zune/components/artwork/textbox/hidden.svg b/arch/themes/zune/components/artwork/textbox/hidden.svg
similarity index 100%
rename from themes/zune/components/artwork/textbox/hidden.svg
rename to arch/themes/zune/components/artwork/textbox/hidden.svg
diff --git a/themes/zune/components/artwork/textbox/visible.svg b/arch/themes/zune/components/artwork/textbox/visible.svg
similarity index 100%
rename from themes/zune/components/artwork/textbox/visible.svg
rename to arch/themes/zune/components/artwork/textbox/visible.svg
diff --git a/themes/zune/components/style/Background.qml b/arch/themes/zune/components/style/Background.qml
similarity index 100%
rename from themes/zune/components/style/Background.qml
rename to arch/themes/zune/components/style/Background.qml
diff --git a/themes/zune/components/style/MenuBackground.qml b/arch/themes/zune/components/style/MenuBackground.qml
similarity index 100%
rename from themes/zune/components/style/MenuBackground.qml
rename to arch/themes/zune/components/style/MenuBackground.qml
diff --git a/themes/zune/components/style/MenuBorder.qml b/arch/themes/zune/components/style/MenuBorder.qml
similarity index 100%
rename from themes/zune/components/style/MenuBorder.qml
rename to arch/themes/zune/components/style/MenuBorder.qml
diff --git a/themes/zune/faces/.face.icon b/arch/themes/zune/faces/.face.icon
similarity index 100%
rename from themes/zune/faces/.face.icon
rename to arch/themes/zune/faces/.face.icon
diff --git a/themes/zune/metadata.desktop b/arch/themes/zune/metadata.desktop
similarity index 100%
rename from themes/zune/metadata.desktop
rename to arch/themes/zune/metadata.desktop
diff --git a/themes/zune/preview.jpg b/arch/themes/zune/preview.jpg
similarity index 100%
rename from themes/zune/preview.jpg
rename to arch/themes/zune/preview.jpg
diff --git a/themes/zune/theme.conf b/arch/themes/zune/theme.conf
similarity index 100%
rename from themes/zune/theme.conf
rename to arch/themes/zune/theme.conf
diff --git a/themes/zune/theme.conf.user b/arch/themes/zune/theme.conf.user
similarity index 100%
rename from themes/zune/theme.conf.user
rename to arch/themes/zune/theme.conf.user
diff --git a/config/micro.json b/config/micro.json
deleted file mode 100644
index 0967ef4..0000000
--- a/config/micro.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/dotfiles b/dotfiles
index a103f0e..5c15258 100755
--- a/dotfiles
+++ b/dotfiles
@@ -1,15 +1,17 @@
 #!/bin/bash
 
-export DOTFILES=~/dotfiles
+export ROOT=~/dotfiles
+export OS=$1
+export DOTFILES=$ROOT/$OS
 export EDITOR=micro
 
-case $1 in
+case $2 in
     edit)
-        $EDITOR $DOTFILES/config/$2
+        $EDITOR $ROOT/$OS/config/$3
     ;;
 
     add)
-        echo "    - $2" >> $DOTFILES/packages.conf.yaml
+        echo "    - $3" >> $ROOT/$OS/packages.conf.yaml
     ;;
 
     install)
diff --git a/install b/install
index a42f44e..401a274 100755
--- a/install
+++ b/install
@@ -2,7 +2,7 @@
 
 set -e
 
-CONFIG="install.conf.yaml"
+CONFIG="$DOTFILES/install.conf.yaml"
 DOTBOT_DIR="dotbot"
 
 PLUGIN_YAY="dotbot-yay/yay.py"
diff --git a/install-root.conf.yaml b/install-root.conf.yaml
deleted file mode 100644
index 03da1c8..0000000
--- a/install-root.conf.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- defaults:
-    link:
-      create: true
-      relink: true
-      force: true
-
-- link:
-    # sddm
-    /etc/sddm.conf.d/default.conf: config/sddm.conf
-
-    # System
-    /etc/pacman.conf: config/pacman.conf
-
-    /bin/dotfiles: dotfiles
-
-    /usr/share/icons/default/index.theme: config/cursors.theme
diff --git a/install_scripts/install-packages b/install_scripts/install-packages
deleted file mode 100755
index 8be1544..0000000
--- a/install_scripts/install-packages
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-$DOTFILES/install -p dotbot-yay/yay.py -c packages.conf.yaml
diff --git a/install_scripts/pre-install b/install_scripts/pre-install
deleted file mode 100755
index cc54c9d..0000000
--- a/install_scripts/pre-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-$DOTFILES/install
-sudo $DOTFILES/install -c "install-root.conf.yaml"