diff --git a/pi-setup-desktop.sh b/pi-setup-desktop.sh
index 9d000b4..5f86ee9 100644
--- a/pi-setup-desktop.sh
+++ b/pi-setup-desktop.sh
@@ -20,7 +20,15 @@ fi
 
 # Zorg dat Chromium er is
 echo "🌐 Browser controleren..."
-sudo apt install -y chromium-browser
+sudo apt install -y unclutter
+
+# Installeer Pi-Apps voor Puffin browser
+echo "🌐 Pi-Apps en Puffin browser installeren..."
+wget -qO- https://raw.githubusercontent.com/Botspot/pi-apps/master/install | bash
+
+# Installeer Puffin via Pi-Apps (automatisch)
+echo "🚀 Puffin browser installeren..."
+~/.local/share/pi-apps/pi-apps install Puffin || echo "⚠️ Puffin installatie handmatig voltooien via Pi-Apps"
 
 # Configureer HDMI audio automatisch
 echo "🔊 HDMI audio automatisch configureren..."
@@ -52,11 +60,11 @@ docker-compose -f docker-compose-pi.yml up -d
 sleep 10
 
 # Sluit eventuele andere browsers
-pkill -f chromium-browser 2>/dev/null || true
+pkill -f puffin-browser 2>/dev/null || true
 
 # Start browser in kiosk mode met audio optimalisaties
 echo "Starting browser..."
-DISPLAY=:0 chromium-browser \
+DISPLAY=:0 puffin-browser \
     --kiosk \
     --start-maximized \
     --noerrdialogs \
@@ -65,14 +73,10 @@ DISPLAY=:0 chromium-browser \
     --disable-session-crashed-bubble \
     --disable-restore-session-state \
     --disable-web-security \
-    --disable-features=VizDisplayCompositor \
     --autoplay-policy=no-user-gesture-required \
     --allow-running-insecure-content \
-    --disable-background-timer-throttling \
-    --disable-renderer-backgrounding \
     --disable-translate \
     --disable-features=Translate \
-    --disable-component-extensions-with-background-pages \
     --lang=nl \
     http://localhost:5090 &
 
diff --git a/pi-setup.sh b/pi-setup.sh
index 663286d..ce6f064 100644
--- a/pi-setup.sh
+++ b/pi-setup.sh
@@ -26,9 +26,16 @@ sudo apt install -y --no-install-recommends \
     x11-xserver-utils \
     xinit \
     openbox \
-    chromium-browser \
     unclutter
 
+# Installeer Pi-Apps voor Puffin browser
+echo "🌐 Pi-Apps en Puffin browser installeren..."
+wget -qO- https://raw.githubusercontent.com/Botspot/pi-apps/master/install | bash
+
+# Installeer Puffin via Pi-Apps (automatisch)
+echo "🚀 Puffin browser installeren..."
+~/.local/share/pi-apps/pi-apps install Puffin || echo "⚠️ Puffin installatie handmatig voltooien via Pi-Apps"
+
 # Configureer HDMI audio automatisch
 echo "🔊 HDMI audio automatisch configureren..."
 sudo raspi-config nonint do_audio 2  # Force HDMI audio
@@ -58,42 +65,23 @@ docker-compose -f docker-compose-pi.yml up -d
 sleep 5
 
 # Sluit eventuele andere browsers
-pkill -f chromium-browser 2>/dev/null || true
+pkill -f puffin-browser 2>/dev/null || true
 
 # Start browser in kiosk mode met audio optimalisaties
 echo "Starting browser..."
-/usr/bin/chromium-browser \
+puffin-browser \
     --kiosk \
     --start-maximized \
     --noerrdialogs \
     --disable-infobars \
+    --no-first-run \
     --disable-session-crashed-bubble \
     --disable-restore-session-state \
-    --disable-background-timer-throttling \
-    --disable-backgrounding-occluded-windows \
-    --disable-renderer-backgrounding \
-    --disable-features=TranslateUI \
-    --disable-ipc-flooding-protection \
-    --enable-features=OverlayScrollbar \
-    --no-first-run \
-    --fast \
-    --fast-start \
-    --disable-default-apps \
-    --disable-popup-blocking \
-    --disable-prompt-on-repost \
-    --disable-hang-monitor \
-    --disable-background-networking \
-    --aggressive-cache-discard \
-    --memory-pressure-off \
-    --max_old_space_size=100 \
-    --force-device-scale-factor=1 \
     --autoplay-policy=no-user-gesture-required \
     --allow-running-insecure-content \
     --disable-web-security \
-    --disable-features=VizDisplayCompositor \
     --disable-translate \
     --disable-features=Translate \
-    --disable-component-extensions-with-background-pages \
     --lang=nl \
     http://localhost:5090 &