diff --git a/setup_wayland_jarvis.sh b/setup_wayland_jarvis.sh
index ab1bb7b..9d7f66e 100644
--- a/setup_wayland_jarvis.sh
+++ b/setup_wayland_jarvis.sh
@@ -119,32 +119,46 @@ fi
 EOF
 fi
 
-echo "📊 Konfiguriere Waybar Taskleiste..."
+# 7. Waybar Taskleiste mit Schnellstartern einrichten
+echo "📊 Konfiguriere Waybar Taskleiste mit Schnellstartern..."
 mkdir -p "$REAL_HOME/.config/waybar"
 
-# Waybar Config schreiben
+# Waybar Config schreiben (Mit dedizierten Startern für Terminal und Firefox)
 cat << 'EOF' > "$REAL_HOME/.config/waybar/config"
 {
     "layer": "top",
     "position": "bottom",
-    "height": 30,
-    "modules-left": ["wlr/taskbar"],
+    "height": 34,
+    "modules-left": ["custom/terminal", "custom/browser", "wlr/taskbar"],
     "modules-right": ["clock"],
+    
+    "custom/terminal": {
+        "format": "📁 Term",
+        "on-click": "foot",
+        "tooltip": false
+    },
+    "custom/browser": {
+        "format": "🌐 Web",
+        "on-click": "MOZ_WEBRENDER=software MOZ_ENABLE_WAYLAND=1 firefox-esr",
+        "tooltip": false
+    },
     "wlr/taskbar": {
-        "format": "{icon} {title}",
+        "format": "{icon}",
         "icon-size": 16,
         "on-click": "activate",
         "on-click-right": "minimize"
     },
-    "clock": { "format": "{:%H:%M:%S}", "interval": 1 }
+    "clock": { "format": "%H:%M:%S", "interval": 1 }
 }
 EOF
 
-# Waybar Style schreiben (Minimal-CSS)
+# Waybar Style schreiben
 cat << 'EOF' > "$REAL_HOME/.config/waybar/style.css"
-* { font-family: sans-serif; font-size: 13px; }
-window#waybar { background-color: #1e293b; border-top: 1px solid #334155; color: white; }
-#taskbar button { padding: 0 10px; color: #94a3b8; background: transparent; }
+* { font-family: sans-serif; font-size: 12px; }
+window#waybar { background-color: #1e293b; color: white; border-top: 1px solid #334155; }
+#custom-terminal, #custom-browser { padding: 0 8px; background: #334155; margin: 3px 2px; border-radius: 3px; }
+#custom-terminal:hover, #custom-browser:hover { background: #475569; }
+#taskbar button { padding: 0 10px; color: #94a3b8; }
 #taskbar button.active { background-color: #0f172a; color: #38bdf8; }
 #clock { padding: 0 15px; background-color: #0f172a; }
 EOF