diff --git a/PKGBUILD b/.install/PKGBUILDs/severin-base/PKGBUILD
similarity index 89%
rename from PKGBUILD
rename to .install/PKGBUILDs/severin-base/PKGBUILD
index 77455dc..86d2e86 100644
--- a/PKGBUILD
+++ b/.install/PKGBUILDs/severin-base/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Severin Kaderli <severin@kaderli.dev>
 pkgname="severin-base"
 pkgver=1.0.0
-pkgrel=35
+pkgrel=37
 arch=('x86_64')
 license=('MIT')
 depends=(
@@ -12,21 +12,17 @@ depends=(
     'linux-headers'
 
     # Kernel modules
-    'nvidia-dkms'
     'v4l2loopback-dkms'
     
-    # Graphic Driver
-    'nvidia-prime'
-    'mesa'
+    # Vulkan
+    'vulkan-icd-loader'
+    'lib32-vulkan-icd-loader'
     
     # Audio
     'pipewire'
     'pipewire-pulse'
     'pavucontrol'
     'chromaprint'
-    
-    # Microcode
-    'intel-ucode'
 
     # Window manager
     'sway'
@@ -57,9 +53,6 @@ depends=(
     'terminus-font'
     'inter-font'
 
-    # Vulkan
-    'vulkan-intel'
-
     # Wayland
     'xdg-desktop-portal-wlr'
     'xdg-desktop-portal-gtk'
@@ -115,6 +108,7 @@ depends=(
     'simple-scan'
     'evince'
     'networkmanager'
+    'network-manager-applet'
     'ncdu'
     'mpv'
     'wget'
@@ -146,6 +140,12 @@ depends=(
     'gnome-keyring'
     'pacman-contrib'
     'git-delta'
+    'sudo'
+    'openssh'
+    'man-db'
+    'man-pages'
+    'imv'
+    'inetutils'
     
     # Printer
     'cups'
@@ -177,6 +177,7 @@ depends=(
     'lutris'
     'heroic-games-launcher-bin'
     'gamemode'
+    'lib32-gamemode'
     'gamescope'
     'mangohud'
     'winetricks'
@@ -193,13 +194,13 @@ depends=(
     'osu-lazer-bin'
 
     # Emulation
-    'mgba-qt'
-    'dolphin-emu-git'
-    'duckstation-git'
-    'citra-qt-git'
-    'flycast-git'
-    'melonds-git'
-    'ares-emu'
+    #'mgba-qt'
+    #'dolphin-emu-git'
+    #'duckstation-git'
+    #'citra-qt-git'
+    #'flycast-git'
+    #'melonds-git'
+    #'ares-emu'
 
     # Archiving & Compression
     'zip'
diff --git a/.install/PKGBUILDs/severin-cpu-amd/PKGBUILD b/.install/PKGBUILDs/severin-cpu-amd/PKGBUILD
new file mode 100644
index 0000000..f7198bc
--- /dev/null
+++ b/.install/PKGBUILDs/severin-cpu-amd/PKGBUILD
@@ -0,0 +1,10 @@
+# Maintainer: Severin Kaderli <severin@kaderli.dev>
+pkgname="severin-cpu-amd"
+pkgver=1.0.0
+pkgrel=1
+arch=('x86_64')
+license=('MIT')
+depends=(
+    # Microcode
+    'amd-ucode'
+)
diff --git a/.install/PKGBUILDs/severin-cpu-intel/PKGBUILD b/.install/PKGBUILDs/severin-cpu-intel/PKGBUILD
new file mode 100644
index 0000000..5829d38
--- /dev/null
+++ b/.install/PKGBUILDs/severin-cpu-intel/PKGBUILD
@@ -0,0 +1,10 @@
+# Maintainer: Severin Kaderli <severin@kaderli.dev>
+pkgname="severin-cpu-intel"
+pkgver=1.0.0
+pkgrel=1
+arch=('x86_64')
+license=('MIT')
+depends=(
+    # Microcode
+    'intel-ucode'
+)
diff --git a/.install/PKGBUILDs/severin-gpu-amd/PKGBUILD b/.install/PKGBUILDs/severin-gpu-amd/PKGBUILD
new file mode 100644
index 0000000..9f457ad
--- /dev/null
+++ b/.install/PKGBUILDs/severin-gpu-amd/PKGBUILD
@@ -0,0 +1,19 @@
+# Maintainer: Severin Kaderli <severin@kaderli.dev>
+pkgname="severin-gpu-amd"
+pkgver=1.0.0
+pkgrel=1
+arch=('x86_64')
+license=('MIT')
+depends=(
+    # Userspace Driver
+    'mesa'
+    'lib32-mesa'
+
+    # Vulkan
+    'vulkan-radeon'
+    'lib32-vulkan-radeon'
+    
+    # Hardware Video Acceleration
+    'libva-mesa-driver'
+    'mesa-vdpau'
+)
diff --git a/.install/PKGBUILDs/severin-gpu-intel/PKGBUILD b/.install/PKGBUILDs/severin-gpu-intel/PKGBUILD
new file mode 100644
index 0000000..6aff1c5
--- /dev/null
+++ b/.install/PKGBUILDs/severin-gpu-intel/PKGBUILD
@@ -0,0 +1,18 @@
+# Maintainer: Severin Kaderli <severin@kaderli.dev>
+pkgname="severin-gpu-intel"
+pkgver=1.0.0
+pkgrel=2
+arch=('x86_64')
+license=('MIT')
+depends=(
+    # Userspace Driver
+    'mesa'
+    'lib32-mesa'
+    
+    # Vulkan
+    'vulkan-intel'
+    'lib32-vulkan-intel'
+    
+    # Hardware Video Acceleration
+    'intel-media-driver'
+)
diff --git a/.install/PKGBUILDs/severin-gpu-nvidia/PKGBUILD b/.install/PKGBUILDs/severin-gpu-nvidia/PKGBUILD
new file mode 100644
index 0000000..fc9261a
--- /dev/null
+++ b/.install/PKGBUILDs/severin-gpu-nvidia/PKGBUILD
@@ -0,0 +1,17 @@
+# Maintainer: Severin Kaderli <severin@kaderli.dev>
+pkgname="severin-gpu-nvidia"
+pkgver=1.0.0
+pkgrel=1
+arch=('x86_64')
+license=('MIT')
+depends=(
+    # Kernel Module
+    'nvidia-dkms'
+
+    # Userspace Driver
+    'nvidia-utils'
+    'lib32-nvidia-utils'
+
+    # Utilities
+    'nvidia-prime'
+)
diff --git a/.install/arch.sh b/.install/arch.sh
index 5301c00..b34fb97 100644
--- a/.install/arch.sh
+++ b/.install/arch.sh
@@ -11,11 +11,29 @@
 
 output::section "Arch Packages"
 
-# List created using: paru -Qqen > packages.native.list
+install-pkgbuild() {
+    output::log "Installing ${1} PKGBUILD"
+    cd "${INSTALL_DIR}/PKGBUILDs/${1}" || exit
+    paru -Ui
+    output::success "${1} successfully installed"
+}
+
 if output::prompt "Do you want to install Arch packages?"; then
     output::log "Updating package database"
     paru -Syy |& output::debug
     output::success "Package database successfully updated"
-    paru -Ui
-    output::success "Packages successfully installed"
+
+    install-pkgbuild "severin-base"
+    
+    if [ "${HOST}" = "odin" ]; then
+        install-pkgbuild "severin-cpu-intel"
+        install-pkgbuild "severin-gpu-intel"
+        install-pkgbuild "severin-gpu-nvidia"
+    fi
+    
+    if [ "${HOST}" = "tyr" ]; then
+        install-pkgbuild "severin-cpu-amd"
+        install-pkgbuild "severin-gpu-amd"
+        install-pkgbuild "severin-gpu-nvidia"
+    fi
 fi
diff --git a/system/.config/electron-flags.conf b/system/.config/electron-flags.conf
index 612fc17..c071f56 100644
--- a/system/.config/electron-flags.conf
+++ b/system/.config/electron-flags.conf
@@ -1,2 +1,2 @@
---enable-features=WaylandWindowDecorations
---ozone-platform-hint=auto
+#--enable-features=WaylandWindowDecorations
+#--ozone-platform-hint=auto