kiwi-code 0.0.33__tar.gz → 0.0.35__tar.gz

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kiwi-code
-Version: 0.0.33
+Version: 0.0.35
 Summary: A textual-based terminal user interface application
 Project-URL: Homepage, https://meetkiwi.ai
 Project-URL: Repository, https://github.com/jetoslabs/kiwi-code

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiwi-code"
-version = "0.0.33"
+version = "0.0.35"
 description = "A textual-based terminal user interface application"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.11,<4.0"

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/main.py

@@ -235,8 +235,8 @@ class AutobotsTUI(App):
     # Brand color for the kiwi cyan, kept readable on both dark and
     # light themes. Exposed to CSS as `$brand-cyan` via
     # `get_css_variables` below.
-    BRAND_CYAN_DARK = "#5fffff"   # bright cyan — pops on dark backgrounds
-    BRAND_CYAN_LIGHT = "#006d8a"  # deeper teal — readable on light backgrounds
+    BRAND_CYAN_DARK = "#63d8dc"   # softened cyan — same feel, less eye strain on dark backgrounds
+    BRAND_CYAN_LIGHT = "#0b7084"  # slightly softened teal for light backgrounds
 
     def _is_dark_theme(self) -> bool:
         """Best-effort detection of whether the active theme is dark."""
@@ -249,65 +249,72 @@ class AutobotsTUI(App):
         return bool(getattr(self, "dark", True))
 
     def get_css_variables(self) -> dict[str, str]:
-        """Inject theme-aware brand color and override palette to match kiwi-code UX.
-
-        UX requirement: use a minimal palette (white + kiwi cyan) for UI text and
-        accents across screens.
-        """
+        """Inject theme-aware brand color and a softer neutral palette."""
         variables = super().get_css_variables()
-        cyan = self.BRAND_CYAN_DARK if self._is_dark_theme() else self.BRAND_CYAN_LIGHT
+        dark = self._is_dark_theme()
+        cyan = self.BRAND_CYAN_DARK if dark else self.BRAND_CYAN_LIGHT
         variables["brand-cyan"] = cyan
 
-        # Two-color palette: foreground text + cyan accents. Keep readability in light theme.
-        foreground = "#ffffff" if self._is_dark_theme() else "#000000"
+        if dark:
+            # Match the reference terminal theme more closely:
+            # - global background around #1E1E1E
+            # - user prompts on a lighter gray chip around #3A3A3A
+            bg = "#1E1E1E"
+            surface = "#252526"
+            raised = "#2D2D2D"
+            panel = "#333333"
+            foreground = "#F3F3F3"
+            user_msg_bg = "#3A3A3A"
+            assistant_stream_bg = "#252526"
+        else:
+            bg = "#f6f7f8"
+            surface = "#ffffff"
+            raised = "#eef1f3"
+            panel = "#dbe7ea"
+            foreground = "#101213"
+            user_msg_bg = "#f1f3f4"
+            assistant_stream_bg = "#f4f6f7"
+
+        variables["background"] = bg
         variables["foreground"] = foreground
         variables["text"] = foreground
 
-        # Map most semantic colors to the brand cyan (removes scattered colors).
+        # Keep the kiwi cyan for accents while softening the surrounding surfaces.
         for k in ("primary", "secondary", "accent", "error", "warning", "success"):
             variables[k] = cyan
 
-        # Also align text-* semantic variants used by Markdown, notifications, etc.
         for k in ("text-warning", "text-error", "text-success"):
             variables[k] = cyan
 
-        # Surfaces and borders: keep background dark, use cyan borders.
-        bg = variables.get("background", "#000000")
-        variables["surface"] = bg
-        variables["boost"] = bg
+        variables["surface"] = surface
+        variables["boost"] = raised
         variables["primary-background"] = bg
-        variables["panel"] = cyan
-        variables["border"] = cyan
-        variables["border-blurred"] = cyan
+        variables["panel"] = panel
+        variables["border"] = panel
+        variables["block-hover-background"] = surface
+        variables["border-blurred"] = raised
 
+        variables["user-msg-bg"] = user_msg_bg
+        variables["assistant-stream-bg"] = assistant_stream_bg
 
-        # Chat UX: full-width highlight color for user-message rows.
-        # Keep it subtle and theme-aware.
-        variables["user-msg-bg"] = "#333333" if self._is_dark_theme() else "#e8e8e8"
-        # Chat UX: subtle highlight for the *active streaming* assistant message.
-        variables["assistant-stream-bg"] = "#222222" if self._is_dark_theme() else "#f2f2f2"
-        # Scrollbars: cyan thumb, dark track.
         variables["scrollbar"] = cyan
         variables["scrollbar-hover"] = cyan
         variables["scrollbar-active"] = cyan
-        variables["scrollbar-background"] = bg
-        variables["scrollbar-background-hover"] = bg
-        variables["scrollbar-background-active"] = bg
+        variables["scrollbar-background"] = surface
+        variables["scrollbar-background-hover"] = surface
+        variables["scrollbar-background-active"] = raised
         variables["scrollbar-corner-color"] = bg
 
-        # Footer palette variables (Textual 8 uses these).
-        variables["footer-background"] = bg
+        variables["footer-background"] = surface
         variables["footer-foreground"] = foreground
-        variables["footer-description-background"] = bg
+        variables["footer-description-background"] = surface
         variables["footer-description-foreground"] = foreground
 
-        # Cursor / selection highlight: cyan text on background (no extra colors).
         variables["block-cursor-foreground"] = cyan
         variables["block-cursor-background"] = bg
         variables["block-cursor-blurred-foreground"] = cyan
         variables["block-cursor-blurred-background"] = bg
         return variables
-
     def watch_theme(self, theme: str) -> None:
         """Re-resolve palette variables whenever the user switches theme."""
         try:

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/screens/attach_content.py

@@ -27,7 +27,7 @@ class AttachContentScreen(ModalScreen[dict]):
         width: 60;
         height: auto;
         max-height: 20;
-        background: $surface;
+        background: $primary-background;
         border: solid $accent;
         padding: 1 2;
     }

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/screens/command_result.py

@@ -30,7 +30,7 @@ class CommandResultScreen(ModalScreen[None]):
     #cmdres-container {
         width: 90;
         height: 80%;
-        background: $surface;
+        background: $primary-background;
         border: solid $accent;
         padding: 1 2;
     }

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/screens/dashboard.py

@@ -6,6 +6,7 @@ from typing import Callable
 from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.screen import Screen
+from textual import events
 from textual.widgets import Header, Footer, Input, Static, Button, Markdown, LoadingIndicator
 from textual.containers import Vertical, VerticalScroll, Horizontal, Center
 from kiwi_tui.screens.file_browser import FileBrowserScreen
@@ -159,6 +160,7 @@ class DashboardScreen(Screen):
         self.current_run_kind: str | None = None  # 'action' or 'graph' (best-effort)
         self._last_listed_ids: list[str] = []  # Index for #N shortcuts
         self._pending_urls: list[str] = []  # File URLs to attach to next message
+        self._upload_status_text: str = ""  # Transient upload status shown above the input box
         self._metadata: dict = {}  # Persistent metadata for all subsequent runs
         self._is_streaming: bool = False  # Track streaming state for send/stop toggle
 
@@ -260,7 +262,7 @@ class DashboardScreen(Screen):
     }
 
 
-    #bottom-area, #input-bar, #input-row, #pending-files-bar {
+    #bottom-area, #input-bar, #input-row, #pending-files-row, #pending-files-bar {
         background: $background;
     }
 
@@ -377,13 +379,34 @@ class DashboardScreen(Screen):
         padding: 0;
     }
 
-    #pending-files-bar {
+    #pending-files-row {
         height: auto;
         width: 100%;
+    }
+
+    #pending-files-bar {
+        height: auto;
+        width: 1fr;
         padding: 0 1;
         color: $secondary;
     }
 
+    #detach-files-btn {
+        width: auto;
+        height: 1;
+        min-width: 8;
+        margin: 0 1 0 0;
+        padding: 0 1;
+        background: transparent;
+        color: $warning;
+        border: none;
+        display: none;
+    }
+
+    #detach-files-btn.visible {
+        display: block;
+    }
+
     #input-row {
         height: auto;
         width: 100%;
@@ -539,7 +562,9 @@ class DashboardScreen(Screen):
                 with Horizontal(id="activity-bar"):
                     yield LoadingIndicator(id="activity-spinner")
                     yield Static("", id="activity-text", markup=False)
-                yield Static("", id="pending-files-bar", markup=False)
+                with Horizontal(id="pending-files-row"):
+                    yield Static("", id="pending-files-bar", markup=False)
+                    yield Button("Detach", id="detach-files-btn", variant="default")
                 with Horizontal(id="input-row"):
                     yield ChatInput(placeholder="Message... (@ for files, / for commands)", id="chat-input")
                 with Horizontal(id="button-row"):
@@ -655,10 +680,8 @@ class DashboardScreen(Screen):
             pass
         chat_input.picker_active = False
 
-        val = chat_input.value
-        at_pos = val.rfind("@")
-        if at_pos != -1:
-            chat_input.value = val[:at_pos]
+        if chat_input.value.startswith("@"):
+            chat_input.value = ""
 
         # Open the full file browser; it returns list[str] of selected files.
         self.app.push_screen(FileBrowserScreen(), callback=self._on_files_selected)
@@ -701,11 +724,9 @@ class DashboardScreen(Screen):
         chat_input = self.query_one("#chat-input", ChatInput)
         picker.hide_picker()
         chat_input.picker_active = False
-        # Remove the @... text from the input
-        val = chat_input.value
-        at_pos = val.rfind("@")
-        if at_pos != -1:
-            chat_input.value = val[:at_pos]
+        # Remove the leading @-picker text from the input.
+        if chat_input.value.startswith("@"):
+            chat_input.value = ""
         chat_input.focus()
 
     def on_chat_input_changed(self, event: ChatInput.Changed) -> None:
@@ -714,19 +735,60 @@ class DashboardScreen(Screen):
         if not chat_input.picker_active:
             return
         val = chat_input.value
-        at_pos = val.rfind("@")
-        if at_pos == -1:
-            # @ was deleted — close picker
+        if not val.startswith("@"):
+            # The leading @ was removed or text was inserted before it.
             self._close_inline_picker()
             return
-        filter_text = val[at_pos + 1 :]
+        filter_text = val[1:]
         picker = self.query_one("#inline-file-picker", InlineFilePicker)
         picker.filter(filter_text)
 
+
+    def on_paste(self, event: events.Paste) -> None:
+        """Handle terminal paste/drop events that land on the screen instead of the input."""
+        try:
+            chat_input = self.query_one("#chat-input", ChatInput)
+        except Exception:
+            return
+
+        file_paths = chat_input._extract_pasted_file_paths(event.text)
+        if not file_paths:
+            return
+
+        event.prevent_default()
+        event.stop()
+        try:
+            self._close_inline_picker()
+        except Exception:
+            pass
+        self.notify(
+            f"Detected {len(file_paths)} file{'s' if len(file_paths) != 1 else ''}. Uploading...",
+            title="Attachments",
+            severity="information",
+            timeout=2.5,
+            markup=False,
+        )
+        self._on_files_selected(file_paths)
+
     def on_chat_input_submitted(self, event: ChatInput.Submitted) -> None:
         """Handle message submission (Enter)."""
         self._do_send()
 
+    def on_chat_input_file_paths_pasted(self, event: ChatInput.FilePathsPasted) -> None:
+        """Handle terminal drag/drop file pastes via the normal upload flow."""
+        try:
+            self._close_inline_picker()
+        except Exception:
+            pass
+        self.notify(
+            f"Detected {len(event.file_paths)} file{'s' if len(event.file_paths) != 1 else ''}. Uploading...",
+            title="Attachments",
+            severity="information",
+            timeout=2.5,
+            markup=False,
+        )
+        self._on_files_selected(event.file_paths)
+
     def handle_slash_command(self, command: str) -> None:
         """Schedule a slash command to run without blocking the UI."""
         # If a command is already running, ignore (prevents the "hung" feeling / double execution).
@@ -831,9 +893,7 @@ class DashboardScreen(Screen):
                 return
 
             if cmd == "/clear-files":
-                count = len(self._pending_urls)
-                self._pending_urls.clear()
-                self._update_pending_files_bar()
+                count = self._clear_pending_files()
                 show(f"Cleared {count} pending file(s).")
                 return
 
@@ -2095,6 +2155,30 @@ class DashboardScreen(Screen):
             self._do_send()
             return
 
+        if btn_id == "detach-files-btn":
+            if len(self._pending_urls) <= 1:
+                count = self._clear_pending_files()
+                self.notify(
+                    f"Detached {count} file{'s' if count != 1 else ''}.",
+                    title="Attachments",
+                    severity="information",
+                    timeout=2.5,
+                    markup=False,
+                )
+                try:
+                    self.query_one("#chat-input", ChatInput).focus()
+                except Exception:
+                    pass
+            else:
+                self.app.push_screen(
+                    IdPickerScreen(
+                        "Detach pending file",
+                        options=self._pending_file_picker_options(),
+                    ),
+                    callback=self._on_pending_file_detach_selected,
+                )
+            return
+
         api_client = self._get_api_client()
         if not api_client:
             return
@@ -2228,9 +2312,11 @@ class DashboardScreen(Screen):
         except Exception:
             pass
         # Disable auxiliary buttons while busy.
-        for btn_id in ("#upload-btn", "#slash-btn", "#copy-run-id"):
+        for btn_id in ("#upload-btn", "#slash-btn", "#copy-run-id", "#detach-files-btn"):
             try:
-                self.query_one(btn_id, Button).disabled = disabled or (btn_id == "#copy-run-id" and not bool(self.current_run_id))
+                is_copy_run = btn_id == "#copy-run-id" and not bool(self.current_run_id)
+                is_detach = btn_id == "#detach-files-btn" and (not bool(self._pending_urls) or bool(self._upload_status_text))
+                self.query_one(btn_id, Button).disabled = disabled or is_copy_run or is_detach
             except Exception:
                 pass
         self._update_run_status_bar()
@@ -2402,6 +2488,11 @@ class DashboardScreen(Screen):
             self.handle_slash_command(command)
             self.query_one("#chat-input", ChatInput).focus()
 
+    def _set_upload_status(self, text: str) -> None:
+        """Update the transient upload status shown immediately above the text box."""
+        self._upload_status_text = text
+        self._update_pending_files_bar()
+
     def _on_files_selected(self, file_paths: list[str]) -> None:
         """Callback from FileBrowserScreen — upload selected files."""
         if not file_paths:
@@ -2411,40 +2502,148 @@ class DashboardScreen(Screen):
             self.add_message("Error: Client not initialized", "error")
             return
         names = [Path(p).name for p in file_paths]
-        self.add_message(f"> Uploading: {', '.join(names)}", "user")
-        # Ensure the token is fresh before upload (important for long-running sessions).
-        try:
-            self.app._refresh_token_if_needed()
-        except Exception:
-            pass
+        self._set_upload_status(f"Uploading: {', '.join(names)}")
+        self.notify(
+            f"Uploading {len(file_paths)} file{'s' if len(file_paths) != 1 else ''}: {', '.join(names)}",
+            title="Attachments",
+            severity="information",
+            timeout=3,
+            markup=False,
+        )
+        self.run_worker(
+            self._upload_files_async(file_paths),
+            group="upload",
+            exclusive=False,
+            exit_on_error=False,
+        )
+        self.query_one("#chat-input", ChatInput).focus()
 
-        success, urls, message = self.app.autobots_client.upload_files(file_paths)
-        if (not success) and ("HTTP 401" in message or "HTTP 403" in message):
-            # Token may have expired or been rotated; force a refresh and retry once.
-            refreshed = False
+    async def _upload_files_async(self, file_paths: list[str]) -> None:
+        """Upload files without blocking the UI so the upload bar renders immediately."""
+        try:
+            # Ensure the token is fresh before upload (important for long-running sessions).
             try:
-                refreshed = bool(self.app._refresh_token_if_needed(force=True))
+                await asyncio.to_thread(self.app._refresh_token_if_needed)
             except Exception:
+                pass
+
+            success, urls, message = await asyncio.to_thread(
+                lambda: self.app.autobots_client.upload_files(file_paths)
+            )
+            if (not success) and ("HTTP 401" in message or "HTTP 403" in message):
                 refreshed = False
-            if refreshed:
-                success, urls, message = self.app.autobots_client.upload_files(file_paths)
-        if success:
-            self._pending_urls.extend(urls)
-            uploaded_names = [Path(u.rsplit("/", 1)[-1]).name for u in urls]
-            self.add_message(f"Uploaded: {', '.join(uploaded_names)}. Attached to your next message.", "info")
-            self._update_pending_files_bar()
-        else:
-            self.add_message(f"Upload failed: {message}", "error")
-        self.query_one("#chat-input", ChatInput).focus()
+                try:
+                    refreshed = bool(await asyncio.to_thread(self.app._refresh_token_if_needed, True))
+                except Exception:
+                    refreshed = False
+                if refreshed:
+                    success, urls, message = await asyncio.to_thread(
+                        lambda: self.app.autobots_client.upload_files(file_paths)
+                    )
 
+            if success:
+                self._pending_urls.extend(urls)
+                self._set_upload_status("")
+                self.notify(
+                    f"Attached {len(urls)} file{'s' if len(urls) != 1 else ''} to your next message.",
+                    title="Attachments",
+                    severity="information",
+                    timeout=3.5,
+                    markup=False,
+                )
+                self._update_pending_files_bar()
+            else:
+                self._set_upload_status("")
+                self.add_message(f"Upload failed: {message}", "error")
+                self.notify(
+                    f"Upload failed: {message}",
+                    title="Attachments",
+                    severity="error",
+                    timeout=4.5,
+                    markup=False,
+                )
+        finally:
+            try:
+                self.query_one("#chat-input", ChatInput).focus()
+            except Exception:
+                pass
+
+    def _clear_pending_files(self) -> int:
+        """Detach all pending files from the next message."""
+        count = len(self._pending_urls)
+        self._pending_urls.clear()
+        self._set_upload_status("")
+        self._update_pending_files_bar()
+        return count
+
+
+    def _detach_pending_file(self, url: str) -> bool:
+        """Detach a single pending file by URL."""
+        try:
+            self._pending_urls.remove(url)
+        except ValueError:
+            return False
+        self._update_pending_files_bar()
+        return True
+
+    def _pending_file_picker_options(self) -> list[tuple[str, str]]:
+        """Build picker options for detaching one or all pending files."""
+        options: list[tuple[str, str]] = [("__all__", "Detach all files")]
+        for url in self._pending_urls:
+            name = Path(url.rsplit("/", 1)[-1]).name if "/" in url else url
+            options.append((url, name))
+        return options
+
+    def _on_pending_file_detach_selected(self, selection: str) -> None:
+        """Detach a selected pending file from the next message."""
+        if not selection:
+            try:
+                self.query_one("#chat-input", ChatInput).focus()
+            except Exception:
+                pass
+            return
+
+        if selection == "__all__":
+            count = self._clear_pending_files()
+            self.notify(
+                f"Detached {count} file{'s' if count != 1 else ''}.",
+                title="Attachments",
+                severity="information",
+                timeout=2.5,
+                markup=False,
+            )
+        else:
+            removed = self._detach_pending_file(selection)
+            if removed:
+                name = Path(selection.rsplit("/", 1)[-1]).name if "/" in selection else selection
+                self.notify(
+                    f"Detached: {name}",
+                    title="Attachments",
+                    severity="information",
+                    timeout=2.5,
+                    markup=False,
+                )
+        try:
+            self.query_one("#chat-input", ChatInput).focus()
+        except Exception:
+            pass
     def _update_pending_files_bar(self) -> None:
-        """Update the pending-files bar to show queued file URLs or hide when empty."""
+        """Update the bar above the input to show upload progress or attached files."""
         bar = self.query_one("#pending-files-bar", Static)
-        if self._pending_urls:
+        detach_btn = self.query_one("#detach-files-btn", Button)
+        if self._upload_status_text:
+            bar.update(self._upload_status_text)
+            detach_btn.remove_class("visible")
+            detach_btn.disabled = True
+        elif self._pending_urls:
             names = [Path(url.rsplit("/", 1)[-1]).name for url in self._pending_urls]
             bar.update(f"Attached: {', '.join(names)}")
+            detach_btn.add_class("visible")
+            detach_btn.disabled = False
         else:
             bar.update("")
+            detach_btn.remove_class("visible")
+            detach_btn.disabled = True
 
     def process_message(self, message: str) -> None:
         """Process user message by running action."""

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/screens/file_browser.py

@@ -29,7 +29,7 @@ class FileBrowserScreen(ModalScreen[list[str]]):
     #file-browser-container {
         width: 96%;
         height: 95%;
-        background: $surface;
+        background: $primary-background;
         border: solid $accent;
         padding: 0 1;
     }
@@ -75,10 +75,32 @@ class FileBrowserScreen(ModalScreen[list[str]]):
     #dir-tree {
         height: 1fr;
         width: 100%;
+        background: $primary-background;
         border: solid $panel;
         scrollbar-size: 1 1;
+    #dir-tree:focus {
+        background-tint: 0%;
+    }
+
+    #dir-tree > .tree--highlight-line {
+        background: $surface;
+    }
+
+    #dir-tree > .tree--cursor {
+        background: $surface;
+        color: $foreground;
+        text-style: none;
     }
 
+    #dir-tree:focus > .tree--cursor {
+        background: $boost;
+        color: $foreground;
+        text-style: bold;
+    }
+
+    }
+
+
     #selected-files {
         height: auto;
         max-height: 3;

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/screens/help.py

@@ -29,7 +29,7 @@ class HelpScreen(ModalScreen[None]):
     #help-container {
         width: 96;
         height: 80%;
-        background: $surface;
+        background: $primary-background;
         border: solid $accent;
         /* Reduce top padding so the title/hint sit closer to the border. */
         padding: 0 3 1 3;
@@ -58,7 +58,7 @@ class HelpScreen(ModalScreen[None]):
         height: 1fr;
         width: 100%;
         border: solid $panel;
-        background: $surface;
+        background: $primary-background;
         scrollbar-size: 1 1;
         /* Keep the list away from the container border for consistent margins. */
         margin: 0 1;

{kiwi_code-0.0.33 → kiwi_code-0.0.35}/src/kiwi_tui/screens/id_picker.py

@@ -101,7 +101,7 @@ class IdPickerScreen(ModalScreen[str]):
     #idpicker-container {
         width: 90;
         height: 90%;
-        background: $surface;
+        background: $primary-background;
         border: solid $accent;
         padding: 0 1;
     }
@@ -111,7 +111,7 @@ class IdPickerScreen(ModalScreen[str]):
         text-align: center;
         text-style: bold;
         color: $primary;
-        background: $surface;
+        background: $primary-background;
         height: 1;
         margin-bottom: 0;
     }
@@ -119,17 +119,17 @@ class IdPickerScreen(ModalScreen[str]):
     #idpicker-table {
         height: 1fr;
         width: 100%;
-        background: $surface;
+        background: $primary-background;
         /* Slightly dim the row text so it's easier on the eyes. */
         color: $foreground 80%;
         border: none;
         overflow-x: auto;
         overflow-y: auto;
         scrollbar-gutter: auto;
-        scrollbar-background: $surface;
-        scrollbar-background-hover: $surface;
-        scrollbar-background-active: $surface;
-        scrollbar-corner-color: $surface;
+        scrollbar-background: $primary-background;
+        scrollbar-background-hover: $primary-background;
+        scrollbar-background-active: $primary-background;
+        scrollbar-corner-color: $primary-background;
         scrollbar-color: $panel;
         scrollbar-color-hover: $primary;
         scrollbar-color-active: $primary;
@@ -163,10 +163,10 @@ class IdPickerScreen(ModalScreen[str]):
         overflow-x: auto;
         overflow-y: auto;
         scrollbar-gutter: auto;
-        scrollbar-background: $surface;
-        scrollbar-background-hover: $surface;
-        scrollbar-background-active: $surface;
-        scrollbar-corner-color: $surface;
+        scrollbar-background: $primary-background;
+        scrollbar-background-hover: $primary-background;
+        scrollbar-background-active: $primary-background;
+        scrollbar-corner-color: $primary-background;
         scrollbar-color: $panel;
         scrollbar-color-hover: $primary;
         scrollbar-color-active: $primary;