diff --git a/6_Polish.sh b/6_Polish.sh
index 7eaf7ae..920f6ff 100755
--- a/6_Polish.sh
+++ b/6_Polish.sh
@@ -10,21 +10,22 @@ fi
 
 # System aktualisieren und benötigte Pakete installieren
 echo "🔄 System wird aktualisiert..."
-sudo apt update && sudo apt upgrade -y
+sudo pacman -Syu --noconfirm
 
 echo "ℹ️ Firewall (ufw) wird installiert..."
-sudo apt install -y ufw
+sudo pacman -S --noconfirm ufw
 sudo ufw enable
 
 echo "ℹ️ Virenschutz (clamav) wird installiert..."
-sudo apt install -y clamav clamav-freshclam clamav-docs libclamunrar9 clamav-daemon
+sudo pacman -S --noconfirm clamav
+sudo systemctl enable --now clamav-freshclam
 
 echo "ℹ️ Installiere Flatpak..."
-sudo apt install -y flatpak
+sudo pacman -S --noconfirm flatpak
 sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 
 echo "ℹ️ Installiere nützliche Pakete..."
-sudo apt install -y neovim rfkill xdg-user-dirs rsync bleachbit network-manager-gnome
+sudo pacman -S --noconfirm neovim rfkill xdg-user-dirs rsync bleachbit networkmanager
 
 # Portmaster installieren
 read -p "❓ Soll Portmaster installiert werden? (j/n) [n]: " answer
@@ -46,12 +47,9 @@ answer=${answer:-n} # Standardwert 'n', falls leer
 
 if [[ "$answer" == "j" ]] || [[ "$answer" == "y" ]]; then
     echo "🌍 Waterfox wird installiert..."
-    sudo apt remove -y firefox
-    sudo install -d -m 0755 /etc/apt/keyrings
-    curl -fsSL https://download.opensuse.org/repositories/home:hawkeye116477:waterfox/Debian_12/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_hawkeye116477_waterfox.gpg > /dev/null
-    echo 'deb https://download.opensuse.org/repositories/home:/hawkeye116477:/waterfox/Debian_12/ /' | sudo tee /etc/apt/sources.list.d/home:hawkeye116477:waterfox.list
+    sudo pacman -Rns --noconfirm firefox
+    sudo yay -S --noconfirm waterfox
 
-    sudo apt update && sudo apt install -y waterfox
     echo "✅ Waterfox wurde installiert!"
 
     # Waterfox als Standardbrowser setzen