gitxelectron 1.3.6 → 1.3.7

package/out/renderer/assets/{index-BQtoJFsL.js → index-DyLS9VOZ.js}

@@ -13042,55 +13042,64 @@ function RepositoryWizard({ repoPath, onClose, onSuccess }) {
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "grid grid-cols-1 sm:grid-cols-2 gap-4", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-xs font-semibold text-secondary mb-1", children: "Add .gitignore" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs(
-                  "select",
-                  {
-                    value: gitignoreTemplate,
-                    onChange: (e) => setGitignoreTemplate(e.target.value),
-                    className: "w-full bg-surface-hover border border-border rounded-md px-3 py-2 text-sm text-primary focus:outline-none focus:border-accent appearance-none cursor-pointer transition-colors",
-                    children: [
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", children: "None" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Node", children: "Node" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Python", children: "Python" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Java", children: "Java" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "C++", children: "C++" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Go", children: "Go" })
-                    ]
-                  }
-                )
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                    "select",
+                    {
+                      value: gitignoreTemplate,
+                      onChange: (e) => setGitignoreTemplate(e.target.value),
+                      className: "w-full bg-surface-hover border border-border rounded-md px-3 py-2 text-sm text-primary focus:outline-none focus:border-accent appearance-none cursor-pointer transition-colors pr-8",
+                      children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", className: "bg-canvas text-primary", children: "None" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Node", className: "bg-canvas text-primary", children: "Node" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Python", className: "bg-canvas text-primary", children: "Python" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Java", className: "bg-canvas text-primary", children: "Java" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "C++", className: "bg-canvas text-primary", children: "C++" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "Go", className: "bg-canvas text-primary", children: "Go" })
+                      ]
+                    }
+                  ),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-secondary", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: "2", d: "M19 9l-7 7-7-7" }) }) })
+                ] })
               ] }),
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-xs font-semibold text-secondary mb-1", children: "Choose a license" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs(
-                  "select",
-                  {
-                    value: licenseTemplate,
-                    onChange: (e) => setLicenseTemplate(e.target.value),
-                    className: "w-full bg-surface-hover border border-border rounded-md px-3 py-2 text-sm text-primary focus:outline-none focus:border-accent appearance-none cursor-pointer transition-colors",
-                    children: [
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", children: "None" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "mit", children: "MIT License" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "gpl-3.0", children: "GNU GPLv3" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "apache-2.0", children: "Apache License 2.0" }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "bsd-3-clause", children: "BSD 3-Clause" })
-                    ]
-                  }
-                )
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs(
+                    "select",
+                    {
+                      value: licenseTemplate,
+                      onChange: (e) => setLicenseTemplate(e.target.value),
+                      className: "w-full bg-surface-hover border border-border rounded-md px-3 py-2 text-sm text-primary focus:outline-none focus:border-accent appearance-none cursor-pointer transition-colors pr-8",
+                      children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "", className: "bg-canvas text-primary", children: "None" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "mit", className: "bg-canvas text-primary", children: "MIT License" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "gpl-3.0", className: "bg-canvas text-primary", children: "GNU GPLv3" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "apache-2.0", className: "bg-canvas text-primary", children: "Apache License 2.0" }),
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: "bsd-3-clause", className: "bg-canvas text-primary", children: "BSD 3-Clause" })
+                      ]
+                    }
+                  ),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-secondary", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: "2", d: "M19 9l-7 7-7-7" }) }) })
+                ] })
               ] })
             ] })
           ] })
         ] }),
         action === "existing" && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-4 bg-canvas p-4 rounded-lg border border-border", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-xs font-semibold text-secondary mb-1", children: "Select Repository" }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx(
-            "select",
-            {
-              value: selectedRepoUrl,
-              onChange: (e) => setSelectedRepoUrl(e.target.value),
-              className: "w-full bg-surface-hover border border-border rounded-md px-3 py-2 text-sm text-primary focus:outline-none focus:border-accent appearance-none transition-colors",
-              children: userRepos.map((r) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: r.clone_url, children: r.full_name }, r.id))
-            }
-          )
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsx(
+              "select",
+              {
+                value: selectedRepoUrl,
+                onChange: (e) => setSelectedRepoUrl(e.target.value),
+                className: "w-full bg-surface-hover border border-border rounded-md px-3 py-2 text-sm text-primary focus:outline-none focus:border-accent appearance-none cursor-pointer transition-colors pr-8",
+                children: userRepos.map((r) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: r.clone_url, className: "bg-canvas text-primary", children: r.full_name }, r.id))
+              }
+            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-secondary", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-4 h-4", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: "2", d: "M19 9l-7 7-7-7" }) }) })
+          ] })
         ] }),
         /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex gap-3 pt-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           "button",
@@ -23225,22 +23234,22 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
     {
       initial: { opacity: 0, scale: 0.95, y: 20 },
       animate: { opacity: 1, scale: 1, y: 0 },
-      className: "bg-[#0f111a] border border-[#2a2d3d] w-full max-w-2xl rounded-2xl overflow-hidden shadow-2xl flex flex-col",
+      className: "bg-canvas shadow-xl border border-border w-full max-w-2xl rounded-2xl overflow-hidden shadow-2xl flex flex-col",
       style: { maxHeight: "85vh" },
       children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "p-4 border-b border-[#2a2d3d] flex items-center justify-between bg-[#151822]", children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "p-4 border-b border-border flex items-center justify-between bg-surface", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3", children: [
-            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "p-2 bg-blue-500/20 text-blue-400 rounded-lg", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FiGithub, { size: 20 }) }),
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "p-2 bg-brand/20 text-brand rounded-lg", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FiGithub, { size: 20 }) }),
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-              /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-white font-semibold text-lg leading-tight", children: "Push Anything" }),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-400 text-xs", children: "Universal GitHub Uploader" })
+              /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-primary font-semibold text-lg leading-tight", children: "Push Anything" }),
+              /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary text-xs", children: "Universal GitHub Uploader" })
             ] })
           ] }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(
             "button",
             {
               onClick: handleClose,
-              className: "p-2 text-gray-400 hover:text-white rounded-lg hover:bg-white/10 transition-colors",
+              className: "p-2 text-secondary hover:text-primary rounded-lg hover:bg-surface-hover transition-colors",
               children: /* @__PURE__ */ jsxRuntimeExports.jsx(FiX, { size: 20 })
             }
           )
@@ -23258,24 +23267,24 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               className: `flex flex-col items-center justify-center h-full gap-6 rounded-2xl transition-colors border-2 ${isDragging2 ? "border-brand bg-brand/10" : "border-transparent"}`,
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-center space-y-2 mb-4", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-2xl text-white font-semibold", children: "Select files to push" }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-400 text-sm", children: "You can push any file or folder directly to any repository." })
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-2xl text-primary font-semibold", children: "Select files to push" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary text-sm", children: "You can push any file or folder directly to any repository." })
                 ] }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "grid grid-cols-2 gap-4 w-full max-w-md", children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsxs(
                     "button",
                     {
                       onClick: () => handleSelectFiles(false),
-                      className: "flex flex-col items-center gap-4 p-6 rounded-xl bg-[#1a1d27] border border-[#2a2d3d] hover:border-blue-500 hover:bg-blue-500/10 transition-all group",
+                      className: "flex flex-col items-center gap-4 p-6 rounded-xl bg-surface border border-border shadow-sm border border-border hover:border-brand hover:bg-brand/10 transition-all group",
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsx(
                           FiFile,
                           {
                             size: 40,
-                            className: "text-blue-400 group-hover:scale-110 transition-transform"
+                            className: "text-brand group-hover:scale-110 transition-transform"
                           }
                         ),
-                        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-white font-medium", children: "Select File(s)" })
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-primary font-medium", children: "Select File(s)" })
                       ]
                     }
                   ),
@@ -23283,7 +23292,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                     "button",
                     {
                       onClick: () => handleSelectFiles(true),
-                      className: "flex flex-col items-center gap-4 p-6 rounded-xl bg-[#1a1d27] border border-[#2a2d3d] hover:border-purple-500 hover:bg-purple-500/10 transition-all group",
+                      className: "flex flex-col items-center gap-4 p-6 rounded-xl bg-surface border border-border shadow-sm border border-border hover:border-purple-500 hover:bg-purple-500/10 transition-all group",
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsx(
                           FiFolder,
@@ -23292,7 +23301,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                             className: "text-purple-400 group-hover:scale-110 transition-transform"
                           }
                         ),
-                        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-white font-medium", children: "Select Folder" })
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-primary font-medium", children: "Select Folder" })
                       ]
                     }
                   )
@@ -23309,18 +23318,18 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               exit: { opacity: 0 },
               className: "space-y-4",
               children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-white font-semibold mb-4", children: "Select GitHub Account" }),
-                accounts.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "p-6 text-center bg-[#1a1d27] border border-[#2a2d3d] rounded-xl flex flex-col items-center gap-4", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-primary font-semibold mb-4", children: "Select GitHub Account" }),
+                accounts.length === 0 ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "p-6 text-center bg-surface border border-border shadow-sm border border-border rounded-xl flex flex-col items-center gap-4", children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsx(FiAlertTriangle, { size: 32, className: "text-yellow-500" }),
                   /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-white font-medium mb-1", children: "No GitHub Accounts Found" }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-400 text-sm", children: "Please close this window and log in to a GitHub account using the Settings panel first." })
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-primary font-medium mb-1", children: "No GitHub Accounts Found" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary text-sm", children: "Please close this window and log in to a GitHub account using the Settings panel first." })
                   ] })
                 ] }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "grid gap-3", children: accounts.map((acc) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
                   "button",
                   {
                     onClick: () => handleSelectAccount(acc),
-                    className: "flex items-center gap-4 p-4 rounded-xl bg-[#1a1d27] border border-[#2a2d3d] hover:border-blue-500 transition-colors text-left w-full",
+                    className: "flex items-center gap-4 p-4 rounded-xl bg-surface border border-border shadow-sm border border-border hover:border-brand transition-colors text-left w-full",
                     children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsx(
                         "img",
@@ -23331,13 +23340,13 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                         }
                       ),
                       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-white font-medium", children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-primary font-medium", children: [
                           "@",
                           acc.username
                         ] }),
-                        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-gray-400 text-xs", children: "Authenticated" })
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-secondary text-xs", children: "Authenticated" })
                       ] }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, { className: "ml-auto text-gray-500" })
+                      /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, { className: "ml-auto text-secondary opacity-70" })
                     ]
                   },
                   acc.id
@@ -23354,15 +23363,15 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               exit: { opacity: 0 },
               className: "space-y-4 h-full flex flex-col",
               children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-white font-semibold", children: "Select Repository" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-primary font-semibold", children: "Select Repository" }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx(FiSearch, { className: "absolute left-3 top-3 text-gray-400" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx(FiSearch, { className: "absolute left-3 top-3 text-secondary" }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx(
                     "input",
                     {
                       type: "text",
                       placeholder: "Search repositories...",
-                      className: "w-full bg-[#1a1d27] border border-[#2a2d3d] rounded-lg py-2.5 pl-10 pr-4 text-white focus:outline-none focus:border-blue-500",
+                      className: "w-full bg-surface border border-border shadow-sm border border-border rounded-lg py-2.5 pl-10 pr-4 text-primary focus:outline-none focus:border-brand",
                       value: searchRepo,
                       onChange: (e) => setSearchRepo(e.target.value)
                     }
@@ -23372,20 +23381,20 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                   "button",
                   {
                     onClick: () => handleSelectRepo(repo),
-                    className: "w-full text-left p-3 rounded-lg bg-[#1a1d27] border border-[#2a2d3d] hover:border-blue-500 flex items-center justify-between group",
+                    className: "w-full text-left p-3 rounded-lg bg-surface border border-border shadow-sm border border-border hover:border-brand flex items-center justify-between group",
                     children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-white font-medium flex items-center gap-2", children: [
+                        /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-primary font-medium flex items-center gap-2", children: [
                           /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { children: [
                             repo.owner.login,
                             "/",
-                            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-blue-400", children: repo.name })
+                            /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-brand", children: repo.name })
                           ] }),
-                          repo.private && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] px-1.5 py-0.5 rounded bg-gray-700 text-gray-300", children: "Private" })
+                          repo.private && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] px-1.5 py-0.5 rounded bg-gray-700 text-secondary", children: "Private" })
                         ] }),
-                        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-gray-500 text-xs mt-1 truncate", children: repo.description || "No description" })
+                        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-secondary opacity-70 text-xs mt-1 truncate", children: repo.description || "No description" })
                       ] }),
-                      /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, { className: "text-gray-600 group-hover:text-blue-400" })
+                      /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, { className: "text-secondary opacity-50 group-hover:text-brand" })
                     ]
                   },
                   repo.id
@@ -23402,14 +23411,14 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               exit: { opacity: 0 },
               className: "space-y-6",
               children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-white font-semibold", children: "Select Branch" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-primary font-semibold", children: "Select Branch" }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-4", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 bg-[#1a1d27] p-1 rounded-lg border border-[#2a2d3d] w-fit", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 bg-surface border border-border shadow-sm p-1 rounded-lg border border-border w-fit", children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx(
                       "button",
                       {
                         onClick: () => setIsNewBranch(false),
-                        className: `px-4 py-1.5 rounded-md text-sm font-medium transition-colors ${!isNewBranch ? "bg-blue-500 text-white" : "text-gray-400 hover:text-white"}`,
+                        className: `px-4 py-1.5 rounded-md text-sm font-medium transition-colors ${!isNewBranch ? "bg-brand text-primary" : "text-secondary hover:text-primary"}`,
                         children: "Existing Branch"
                       }
                     ),
@@ -23417,7 +23426,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                       "button",
                       {
                         onClick: () => setIsNewBranch(true),
-                        className: `px-4 py-1.5 rounded-md text-sm font-medium transition-colors ${isNewBranch ? "bg-blue-500 text-white" : "text-gray-400 hover:text-white"}`,
+                        className: `px-4 py-1.5 rounded-md text-sm font-medium transition-colors ${isNewBranch ? "bg-brand text-primary" : "text-secondary hover:text-primary"}`,
                         children: "Create New"
                       }
                     )
@@ -23426,7 +23435,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                     "button",
                     {
                       onClick: () => setSelectedBranch(b.name),
-                      className: `w-full text-left p-3 rounded-lg border flex items-center gap-3 ${selectedBranch === b.name ? "bg-blue-500/10 border-blue-500 text-blue-400" : "bg-[#1a1d27] border-[#2a2d3d] text-gray-300 hover:border-gray-500"}`,
+                      className: `w-full text-left p-3 rounded-lg border flex items-center gap-3 ${selectedBranch === b.name ? "bg-brand/10 border-brand text-brand" : "bg-surface border border-border shadow-sm border-border text-secondary hover:border-accent"}`,
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsx(FiGitBranch, {}),
                         b.name
@@ -23435,26 +23444,26 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                     b.name
                   )) }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-4", children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-gray-400 text-sm mb-1", children: "New Branch Name" }),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-secondary text-sm mb-1", children: "New Branch Name" }),
                       /* @__PURE__ */ jsxRuntimeExports.jsx(
                         "input",
                         {
                           type: "text",
                           value: newBranchName,
                           onChange: (e) => setNewBranchName(e.target.value),
-                          className: "w-full bg-[#1a1d27] border border-[#2a2d3d] rounded-lg p-2.5 text-white focus:outline-none focus:border-blue-500",
+                          className: "w-full bg-surface border border-border shadow-sm border border-border rounded-lg p-2.5 text-primary focus:outline-none focus:border-brand",
                           placeholder: "e.g., feature/update-assets"
                         }
                       )
                     ] }),
                     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                      /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-gray-400 text-sm mb-1", children: "Base Branch" }),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-secondary text-sm mb-1", children: "Base Branch" }),
                       /* @__PURE__ */ jsxRuntimeExports.jsx(
                         "select",
                         {
                           value: baseBranch,
                           onChange: (e) => setBaseBranch(e.target.value),
-                          className: "w-full bg-[#1a1d27] border border-[#2a2d3d] rounded-lg p-2.5 text-white focus:outline-none focus:border-blue-500 appearance-none",
+                          className: "w-full bg-surface border border-border shadow-sm border border-border rounded-lg p-2.5 text-primary focus:outline-none focus:border-brand appearance-none",
                           children: branches.map((b) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: b.name, children: b.name }, b.name))
                         }
                       )
@@ -23482,11 +23491,11 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               exit: { opacity: 0 },
               className: "space-y-6",
               children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-white font-semibold", children: "Destination Path" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-400 text-sm", children: "Where should these files be placed in the repository?" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-primary font-semibold", children: "Destination Path" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary text-sm", children: "Where should these files be placed in the repository?" }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "space-y-2", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 bg-[#1a1d27] border border-[#2a2d3d] rounded-lg p-3", children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "text-blue-400", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 bg-surface border border-border shadow-sm border border-border rounded-lg p-3", children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "text-brand", children: [
                       selectedRepo?.name,
                       "/"
                     ] }),
@@ -23496,7 +23505,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                         type: "text",
                         value: destination,
                         onChange: (e) => setDestination(e.target.value),
-                        className: "bg-transparent border-none outline-none text-white w-full",
+                        className: "bg-transparent border-none outline-none text-primary w-full",
                         placeholder: "/"
                       }
                     )
@@ -23506,7 +23515,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                       "button",
                       {
                         onClick: () => setDestination("/"),
-                        className: "text-xs px-2 py-1 bg-white/5 hover:bg-white/10 text-gray-400 rounded",
+                        className: "text-xs px-2 py-1 bg-surface hover:bg-surface-hover text-secondary rounded",
                         children: "Root (/)"
                       }
                     ),
@@ -23514,7 +23523,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                       "button",
                       {
                         onClick: () => setDestination("src/"),
-                        className: "text-xs px-2 py-1 bg-white/5 hover:bg-white/10 text-gray-400 rounded",
+                        className: "text-xs px-2 py-1 bg-surface hover:bg-surface-hover text-secondary rounded",
                         children: "src/"
                       }
                     ),
@@ -23522,18 +23531,18 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                       "button",
                       {
                         onClick: () => setDestination("assets/"),
-                        className: "text-xs px-2 py-1 bg-white/5 hover:bg-white/10 text-gray-400 rounded",
+                        className: "text-xs px-2 py-1 bg-surface hover:bg-surface-hover text-secondary rounded",
                         children: "assets/"
                       }
                     )
                   ] })
                 ] }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-[#1a1d27] p-4 rounded-lg border border-[#2a2d3d]", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("h4", { className: "text-gray-300 font-medium mb-2 text-sm flex items-center gap-2", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface border border-border shadow-sm p-4 rounded-lg border border-border", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("h4", { className: "text-secondary font-medium mb-2 text-sm flex items-center gap-2", children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx(FiFolder, {}),
                     " Preview"
                   ] }),
-                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-xs text-gray-500 font-mono space-y-1", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-xs text-secondary opacity-70 font-mono space-y-1", children: [
                     files.slice(0, 3).map((f) => {
                       const name = f.split(/[\/\\]/).pop();
                       const dest = destination === "/" || destination === "" ? name : `${destination.replace(/\/$/, "")}/${name}`;
@@ -23550,7 +23559,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                   "button",
                   {
                     onClick: handleSetupWorkspace,
-                    className: "px-6 py-2 bg-blue-500 text-white font-semibold rounded-lg hover:bg-blue-600 transition-colors flex items-center gap-2",
+                    className: "px-6 py-2 bg-brand text-primary font-semibold rounded-lg hover:bg-brand brightness-110 transition-colors flex items-center gap-2",
                     children: [
                       "Verify & Prepare ",
                       /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, {})
@@ -23569,9 +23578,9 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               exit: { opacity: 0 },
               className: "flex flex-col items-center justify-center h-full gap-4",
               children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-12 h-12 border-4 border-blue-500/30 border-t-blue-500 rounded-full animate-spin" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-300 font-medium animate-pulse", children: "Safely preparing Git workspace..." }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-500 text-xs", children: "Checking for collisions and establishing sparse-checkout" })
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-12 h-12 border-4 border-brand/30 border-t-blue-500 rounded-full animate-spin" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary font-medium animate-pulse", children: "Safely preparing Git workspace..." }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary opacity-70 text-xs", children: "Checking for collisions and establishing sparse-checkout" })
               ]
             },
             "loading"
@@ -23594,14 +23603,14 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                     ] })
                   ] })
                 ] }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 bg-[#1a1d27] border border-[#2a2d3d] rounded-lg p-3 overflow-y-auto custom-scrollbar", children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs font-semibold text-gray-500 uppercase mb-2", children: "Modified Files" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 bg-surface border border-border shadow-sm border border-border rounded-lg p-3 overflow-y-auto custom-scrollbar", children: [
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs font-semibold text-secondary opacity-70 uppercase mb-2", children: "Modified Files" }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "space-y-1", children: collisions.modified.map((m) => /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-yellow-400 text-sm font-mono truncate py-1", children: [
                     "M ",
                     m
                   ] }, m)) }),
                   collisions.newFiles.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs font-semibold text-gray-500 uppercase mt-4 mb-2", children: "New Files" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-xs font-semibold text-secondary opacity-70 uppercase mt-4 mb-2", children: "New Files" }),
                     /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "space-y-1", children: collisions.newFiles.map((n) => /* @__PURE__ */ jsxRuntimeExports.jsxs(
                       "div",
                       {
@@ -23620,7 +23629,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                     "button",
                     {
                       onClick: handleClose,
-                      className: "px-5 py-2 bg-[#2a2d3d] text-white rounded-lg hover:bg-red-500/20 hover:text-red-400 transition-colors",
+                      className: "px-5 py-2 bg-surface-hover text-primary rounded-lg hover:bg-red-500/20 hover:text-red-400 transition-colors",
                       children: "Cancel Push"
                     }
                   ),
@@ -23629,7 +23638,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                       "button",
                       {
                         onClick: handleCompare,
-                        className: "px-5 py-2 bg-[#2a2d3d] text-white rounded-lg hover:bg-[#3a3d4d] transition-colors flex items-center gap-2",
+                        className: "px-5 py-2 bg-surface-hover text-primary rounded-lg hover:bg-surface-hover transition-colors flex items-center gap-2",
                         children: [
                           /* @__PURE__ */ jsxRuntimeExports.jsx(FiCode, {}),
                           " Compare"
@@ -23652,21 +23661,21 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                     "button",
                     {
                       onClick: () => setShowDiff(false),
-                      className: "text-gray-400 hover:text-white",
+                      className: "text-secondary hover:text-primary",
                       children: /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowLeft, {})
                     }
                   ),
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-white font-semibold", children: "Diff Viewer" })
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-primary font-semibold", children: "Diff Viewer" })
                 ] }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 bg-[#0d0f17] border border-[#2a2d3d] rounded-lg p-4 overflow-y-auto custom-scrollbar font-mono text-sm whitespace-pre-wrap", children: diffContent ? diffContent.split("\n").map((line, i) => {
+                /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 bg-canvas border border-border rounded-lg p-4 overflow-y-auto custom-scrollbar font-mono text-sm whitespace-pre-wrap", children: diffContent ? diffContent.split("\n").map((line, i) => {
                   if (line.startsWith("+"))
                     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-green-400 bg-green-900/20", children: line }, i);
                   if (line.startsWith("-"))
                     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-red-400 bg-red-900/20", children: line }, i);
                   if (line.startsWith("@@"))
-                    return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-blue-400 mt-2", children: line }, i);
-                  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-gray-300", children: line }, i);
-                }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-gray-500 text-center py-10", children: "Cannot show diff for binary files." }) })
+                    return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-brand mt-2", children: line }, i);
+                  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-secondary", children: line }, i);
+                }) : /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-secondary opacity-70 text-center py-10", children: "Cannot show diff for binary files." }) })
               ] })
             },
             "collision"
@@ -23679,11 +23688,11 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               exit: { opacity: 0 },
               className: "space-y-6",
               children: [
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-white font-semibold", children: "Commit & Push" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-[#1a1d27] p-4 rounded-lg border border-[#2a2d3d] flex justify-between items-center", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-primary font-semibold", children: "Commit & Push" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface border border-border shadow-sm p-4 rounded-lg border border-border flex justify-between items-center", children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-gray-400 text-xs mb-1", children: "Destination" }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-white font-medium flex items-center gap-2", children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-secondary text-xs mb-1", children: "Destination" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-primary font-medium flex items-center gap-2", children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsx(
                         "img",
                         {
@@ -23693,14 +23702,14 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                       ),
                       selectedRepo.name,
                       " ",
-                      /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, { className: "text-gray-600" }),
+                      /* @__PURE__ */ jsxRuntimeExports.jsx(FiArrowRight, { className: "text-secondary opacity-50" }),
                       " ",
                       isNewBranch ? newBranchName : selectedBranch
                     ] })
                   ] }),
                   /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-right", children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-gray-400 text-xs mb-1", children: "Changes" }),
-                    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-white font-medium", children: [
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-secondary text-xs mb-1", children: "Changes" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "text-primary font-medium", children: [
                       collisions.modified.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "text-yellow-400 mr-2", children: [
                         collisions.modified.length,
                         " modified"
@@ -23717,13 +23726,13 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                   ] })
                 ] }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-gray-400 text-sm mb-2", children: "Commit Message" }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("label", { className: "block text-secondary text-sm mb-2", children: "Commit Message" }),
                   /* @__PURE__ */ jsxRuntimeExports.jsx(
                     "textarea",
                     {
                       value: commitMessage,
                       onChange: (e) => setCommitMessage(e.target.value),
-                      className: "w-full bg-[#1a1d27] border border-[#2a2d3d] rounded-lg p-3 text-white focus:outline-none focus:border-blue-500 resize-none h-24",
+                      className: "w-full bg-surface border border-border shadow-sm border border-border rounded-lg p-3 text-primary focus:outline-none focus:border-brand resize-none h-24",
                       placeholder: "E.g., Added new logo assets"
                     }
                   )
@@ -23733,7 +23742,7 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
                   {
                     onClick: handleCommit,
                     disabled: !commitMessage.trim(),
-                    className: "px-6 py-2 bg-blue-500 text-white font-semibold rounded-lg hover:bg-blue-600 disabled:opacity-50 flex items-center gap-2",
+                    className: "px-6 py-2 bg-brand text-primary font-semibold rounded-lg hover:bg-brand brightness-110 disabled:opacity-50 flex items-center gap-2",
                     children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsx(FiGithub, {}),
                       " Push Now"
@@ -23753,8 +23762,8 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               className: "flex flex-col items-center justify-center h-full gap-4",
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-12 h-12 border-4 border-purple-500/30 border-t-purple-500 rounded-full animate-spin" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-white font-medium text-lg", children: "Pushing to GitHub..." }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-gray-500 text-sm font-mono", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-primary font-medium text-lg", children: "Pushing to GitHub..." }),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-secondary opacity-70 text-sm font-mono", children: [
                   selectedRepo?.name,
                   " : ",
                   isNewBranch ? newBranchName : selectedBranch
@@ -23771,11 +23780,11 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               className: "flex flex-col items-center justify-center h-full gap-4 text-center",
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-16 h-16 bg-green-500/20 text-green-400 rounded-full flex items-center justify-center mb-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FiCheck, { size: 32 }) }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-2xl text-white font-semibold", children: "Push Successful!" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-gray-400", children: [
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-2xl text-primary font-semibold", children: "Push Successful!" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsxs("p", { className: "text-secondary", children: [
                   "Your files were successfully pushed to ",
                   /* @__PURE__ */ jsxRuntimeExports.jsx("br", {}),
-                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-blue-400", children: selectedRepo?.name }),
+                  /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-brand", children: selectedRepo?.name }),
                   " on branch",
                   " ",
                   /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-purple-400", children: isNewBranch ? newBranchName : selectedBranch }),
@@ -23801,13 +23810,13 @@ function UniversalPushWizard({ isOpen, onClose, onAutoHealTrigger }) {
               className: "flex flex-col items-center justify-center h-full gap-4 text-center",
               children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-16 h-16 bg-red-500/20 text-red-400 rounded-full flex items-center justify-center mb-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FiX, { size: 32 }) }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-white font-semibold", children: "Operation Failed" }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-gray-400 text-sm max-w-sm whitespace-pre-wrap", children: errorMsg }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("h3", { className: "text-xl text-primary font-semibold", children: "Operation Failed" }),
+                /* @__PURE__ */ jsxRuntimeExports.jsx("p", { className: "text-secondary text-sm max-w-sm whitespace-pre-wrap", children: errorMsg }),
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
                   "button",
                   {
                     onClick: () => setStep("START"),
-                    className: "mt-4 px-6 py-2 bg-[#2a2d3d] text-white rounded-lg hover:bg-[#3a3d4d]",
+                    className: "mt-4 px-6 py-2 bg-surface-hover text-primary rounded-lg hover:bg-surface-hover",
                     children: "Try Again"
                   }
                 )
@@ -24593,7 +24602,7 @@ const CollaborationRepoView = ({
     collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 text-xs text-secondary flex-wrap px-1", children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[11px] font-medium text-secondary/80", children: "Filter summary:" }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { className: "inline-flex items-center gap-1 bg-surface border border-border px-2.5 py-1 rounded-lg font-mono text-[11px] text-primary", children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-2 h-2 rounded-full bg-emerald-400" }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-2 h-2 rounded-full bg-white" }),
         connectedCount,
         " Connected"
       ] }),
@@ -24690,7 +24699,7 @@ const CollaborationRepoView = ({
                       children: repo.name
                     }
                   ),
-                  repo.private ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-amber-500/10 text-amber-400 border border-amber-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Private" }) : /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-emerald-500/10 text-emerald-400 border border-emerald-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Public" }),
+                  repo.private ? /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-amber-500/10 text-amber-400 border border-amber-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Private" }) : /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[10px] bg-emerald-500/10 text-white border border-emerald-500/25 px-2 py-0.2 rounded-full font-medium flex-shrink-0", children: "Public" }),
                   isCurrentActive && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-[9px] bg-brand text-white px-2 py-0.5 rounded-full font-bold uppercase tracking-wider flex-shrink-0 shadow-xs", children: "Active" })
                 ] }),
                 /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 mt-1 text-xs text-secondary min-w-0 flex-wrap", children: [
@@ -24734,7 +24743,7 @@ const CollaborationRepoView = ({
               /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "min-w-0 flex-1", children: savedPath ? isMissing ? /* @__PURE__ */ jsxRuntimeExports.jsxs(
                 "div",
                 {
-                  className: "inline-flex items-center gap-1.5 text-xs text-danger font-mono bg-danger/10 border border-danger/25 px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
+                  className: "inline-flex items-center gap-1.5 text-xs text-danger font-mono bg-danger text-white border border-border px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
                   title: `Folder was deleted or moved: ${savedPath}`,
                   children: [
                     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-danger animate-pulse flex-shrink-0" }),
@@ -24744,14 +24753,14 @@ const CollaborationRepoView = ({
               ) : /* @__PURE__ */ jsxRuntimeExports.jsxs(
                 "div",
                 {
-                  className: "inline-flex items-center gap-1.5 text-xs text-emerald-400 font-mono bg-emerald-500/10 border border-emerald-500/25 px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
+                  className: "inline-flex items-center gap-1.5 text-xs text-white font-mono bg-success text-white border border-border px-2.5 py-1 rounded-lg min-w-0 max-w-full truncate",
                   title: savedPath,
                   children: [
-                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-emerald-400 flex-shrink-0" }),
+                    /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-white flex-shrink-0" }),
                     /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "truncate", children: savedPath.split("\\").pop() || savedPath })
                   ]
                 }
-              ) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "inline-flex items-center gap-1.5 text-xs text-secondary/70 italic bg-canvas/60 border border-border/60 px-2.5 py-1 rounded-lg flex-shrink-0", children: [
+              ) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "inline-flex items-center gap-1.5 text-xs text-secondary/70 italic bg-surface border border-border/60 px-2.5 py-1 rounded-lg flex-shrink-0", children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "w-1.5 h-1.5 rounded-full bg-secondary/40" }),
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "Not cloned yet" })
               ] }) }),
@@ -24780,7 +24789,7 @@ const CollaborationRepoView = ({
                       e.stopPropagation();
                       onSyncCollabRepo(repo, savedPath);
                     },
-                    className: "px-2.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1 bg-blue-600/15 hover:bg-blue-600/25 text-blue-400 border border-blue-500/30",
+                    className: "px-2.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1 bg-brand hover:bg-brand-hover text-white border border-border",
                     title: "Pull all latest team changes into this folder immediately",
                     children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: "⬇️" }),
@@ -24826,7 +24835,7 @@ const CollaborationRepoView = ({
                       e.stopPropagation();
                       onRepoCardClick(repo);
                     },
-                    className: `px-3.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1.5 ${savedPath ? isMissing ? "bg-danger/20 hover:bg-danger/30 text-danger border border-danger/40" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20"}`,
+                    className: `px-3.5 py-1.5 text-xs font-semibold rounded-xl transition-all shadow-xs flex items-center gap-1.5 ${savedPath ? isMissing ? "bg-danger hover:bg-danger text-white text-danger border border-danger/40" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20" : "bg-brand hover:bg-brand-hover text-white shadow-brand/20"}`,
                     children: [
                       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: savedPath ? isMissing ? "Re-Clone" : "Open Repo" : "Clone" }),
                       /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: isMissing ? "☁️" : savedPath ? "→" : "☁️" })
@@ -24888,7 +24897,7 @@ const CommitReceiptPrinter = ({
         /* @__PURE__ */ jsxRuntimeExports.jsx("br", {}),
         "Hash: ",
         commit.hash.substring(0, 7),
-        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "logo", children: "🐙" })
+        /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "logo text-gray-800 opacity-80", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { height: "40", viewBox: "0 0 16 16", width: "40", fill: "currentColor", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { d: "M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" }) }) })
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "receipt-subheader", children: [
         "Author: ",
@@ -25450,7 +25459,7 @@ const THEMES = [
   { id: "dracula", name: "Dracula" },
   { id: "github-light", name: "GitHub Light" },
   { id: "nord", name: "Nord" },
-  { id: "one-dark-pro", name: "One Dark Pro" },
+  { id: "retro-os", name: "Retro OS UI" },
   { id: "night-owl", name: "Night Owl" },
   { id: "tokyo-night", name: "Tokyo Night" },
   { id: "gruvbox-dark", name: "Gruvbox Dark" },
@@ -25474,7 +25483,8 @@ const THEMES = [
   { id: "dev-cpp-ocean", name: "Dev-C++ Ocean" },
   { id: "dev-cpp-matrix", name: "Dev-C++ Matrix" },
   { id: "dev-cpp-twilight", name: "Dev-C++ Twilight" },
-  { id: "turbo-cpp-classic", name: "Turbo C++ Classic" }
+  { id: "turbo-cpp-classic", name: "Turbo C++ Classic" },
+  { id: "game-rpg", name: "RPG Game UI" }
 ];
 function App() {
   const [repoPath, setRepoPath] = reactExports.useState(null);
@@ -25648,6 +25658,10 @@ function App() {
   const [pushFailureData, setPushFailureData] = reactExports.useState(null);
   const [gitErrorData, setGitErrorData] = reactExports.useState(null);
   const [showSettings, setShowSettings] = reactExports.useState(false);
+  const [draftTheme, setDraftTheme] = reactExports.useState("github-dark");
+  const [draftLang, setDraftLang] = reactExports.useState("en");
+  const [draftDailyAuth, setDraftDailyAuth] = reactExports.useState(true);
+  const [draftLockscreenSpace, setDraftLockscreenSpace] = reactExports.useState(true);
   const [showContributorsModal, setShowContributorsModal] = reactExports.useState(false);
   const [remoteUrl, setRemoteUrl] = reactExports.useState(null);
   const [gitConfig, setGitConfig] = reactExports.useState({ name: "", email: "" });
@@ -26606,9 +26620,24 @@ Are you SURE you want to link "${repoName}" to this folder?`
       if (!email) email = `${activeAcc.username}@users.noreply.github.com`;
     }
     setGitConfig({ name: name || "", email: email || "" });
+    setDraftTheme(theme);
+    setDraftLang(lang);
+    setDraftDailyAuth(dailyAuthEnabled);
+    setDraftLockscreenSpace(enableLockscreenSpace);
     setShowSettings(true);
   };
   const saveSettings = async () => {
+    setLang(draftLang);
+    handleThemeChange(draftTheme);
+    setDailyAuthEnabled(draftDailyAuth);
+    localStorage.setItem("gitelectron-daily-auth", draftDailyAuth ? "true" : "false");
+    setEnableLockscreenSpace(draftLockscreenSpace);
+    localStorage.setItem("gitelectron-enable-space", draftLockscreenSpace ? "true" : "false");
+    setShowSettings(false);
+    showToast("Settings saved successfully", "success");
+  };
+  const cancelSettings = () => {
+    document.documentElement.setAttribute("data-theme", theme);
     setShowSettings(false);
   };
   const viewDiff = async (file, staged) => {
@@ -26719,14 +26748,14 @@ Are you SURE you want to link "${repoName}" to this folder?`
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(
     "div",
     {
-      "data-theme": theme,
+      "data-theme": showSettings ? draftTheme : theme,
       className: "flex h-screen bg-canvas text-primary font-sans overflow-hidden transition-colors duration-300 select-none",
       onDragOver: handleDragOver,
       onDragLeave: handleDragLeave,
       onDrop: handleDrop,
       children: [
-        theme === "among-us-live" && /* @__PURE__ */ jsxRuntimeExports.jsx(AmongUsBackground, {}),
-        theme === "space-explorer-3d" && /* @__PURE__ */ jsxRuntimeExports.jsx(SpaceExplorerBackground, {}),
+        (showSettings ? draftTheme : theme) === "among-us-live" && /* @__PURE__ */ jsxRuntimeExports.jsx(AmongUsBackground, {}),
+        (showSettings ? draftTheme : theme) === "space-explorer-3d" && /* @__PURE__ */ jsxRuntimeExports.jsx(SpaceExplorerBackground, {}),
         showWelcomeWizard && /* @__PURE__ */ jsxRuntimeExports.jsx(WelcomeWizard, { onComplete: () => setShowWelcomeWizard(false) }),
         gitErrorData && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "absolute inset-0 bg-black/70 backdrop-blur-md flex items-center justify-center z-[150] p-6 animate-fade-in", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "bg-surface/95 border border-danger/50 rounded-2xl shadow-2xl w-full max-w-lg overflow-hidden flex flex-col p-6", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "text-xl font-bold text-danger mb-4", children: "Git Error" }),
@@ -26755,7 +26784,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
             ] }),
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("h4", { className: "text-sm font-medium text-primary mb-1", children: "AI Proposed Fix" }),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-brand/10 border border-brand/20 p-3 rounded text-sm text-brand", children: autoSyncErrorPayload.proposedFix })
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-brand text-white border border-brand/20 p-3 rounded text-sm text-brand", children: autoSyncErrorPayload.proposedFix })
             ] }),
             autoSyncErrorPayload.files && autoSyncErrorPayload.files.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("h4", { className: "text-sm font-medium text-primary mb-1", children: "Affected Files" }),
@@ -26926,8 +26955,8 @@ Are you SURE you want to link "${repoName}" to this folder?`
                         CustomDropdown,
                         {
                           options: LANGUAGES.map((l) => ({ value: l.id, label: l.name })),
-                          value: lang,
-                          onChange: (val) => setLang(val),
+                          value: draftLang,
+                          onChange: (val) => setDraftLang(val),
                           buttonClassName: "w-full bg-surface border border-border rounded-lg p-2.5 text-primary focus:outline-none focus:border-accent transition-all cursor-pointer font-medium text-sm"
                         }
                       )
@@ -26938,8 +26967,11 @@ Are you SURE you want to link "${repoName}" to this folder?`
                         CustomDropdown,
                         {
                           options: THEMES.map((t2) => ({ value: t2.id, label: t2.name })),
-                          value: theme,
-                          onChange: (val) => handleThemeChange(val),
+                          value: draftTheme,
+                          onChange: (val) => {
+                            setDraftTheme(val);
+                            document.documentElement.setAttribute("data-theme", val);
+                          },
                           buttonClassName: "w-full bg-surface border border-border rounded-lg p-2.5 text-primary focus:outline-none focus:border-accent transition-all cursor-pointer font-medium text-sm"
                         }
                       )
@@ -26998,14 +27030,10 @@ Are you SURE you want to link "${repoName}" to this folder?`
                           {
                             className: "toggle",
                             type: "checkbox",
-                            checked: dailyAuthEnabled,
+                            checked: draftDailyAuth,
                             onChange: (e) => {
                               const next = e.target.checked;
-                              setDailyAuthEnabled(next);
-                              localStorage.setItem(
-                                "gitelectron-daily-auth",
-                                next ? "true" : "false"
-                              );
+                              setDraftDailyAuth(next);
                             }
                           }
                         ),
@@ -27024,14 +27052,10 @@ Are you SURE you want to link "${repoName}" to this folder?`
                           {
                             className: "toggle",
                             type: "checkbox",
-                            checked: enableLockscreenSpace,
+                            checked: draftLockscreenSpace,
                             onChange: (e) => {
                               const next = e.target.checked;
-                              setEnableLockscreenSpace(next);
-                              localStorage.setItem(
-                                "gitelectron-enable-space",
-                                next ? "true" : "false"
-                              );
+                              setDraftLockscreenSpace(next);
                             }
                           }
                         ),
@@ -27090,10 +27114,10 @@ Are you SURE you want to link "${repoName}" to this folder?`
                       {
                         type: "button",
                         onClick: () => {
-                          setShowSettings(false);
+                          cancelSettings();
                           handleStartAuth();
                         },
-                        className: "px-3 py-1.5 bg-brand/10 hover:bg-brand/20 text-brand text-xs font-bold rounded-lg border border-brand/20 transition-colors",
+                        className: "px-3 py-1.5 bg-brand text-white hover:bg-brand text-white text-brand text-xs font-bold rounded-lg border border-brand/20 transition-colors",
                         children: [
                           "+ ",
                           t("addAccount")
@@ -27147,7 +27171,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                           setAccounts([]);
                           setActiveAccountId(null);
                           setPushPermission(false);
-                          setShowSettings(false);
+                          cancelSettings();
                           showToast("Successfully logged out", "success");
                         } catch (e) {
                           console.error("Logout failed", e);
@@ -27208,7 +27232,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                       await window.api.masterPush(remotes[0].name, status?.current || "main");
                       showToast("Master Push successful!", "success");
                       refreshRepoState();
-                      setShowSettings(false);
+                      cancelSettings();
                     } catch (err) {
                       showToast(
                         "Master Push failed: " + (err.message || "Unknown error"),
@@ -27234,7 +27258,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
                   "button",
                   {
-                    onClick: () => setShowSettings(false),
+                    onClick: () => cancelSettings(),
                     className: "px-6 py-2.5 bg-surface border-2 border-border hover:bg-surface-hover rounded-xl transition-all font-bold text-sm",
                     children: t("cancel")
                   }
@@ -27582,7 +27606,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
             }
           ),
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 pr-8 min-w-0", children: [
-            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-10 h-10 rounded-xl bg-brand/10 border border-brand/20 flex items-center justify-center text-brand flex-shrink-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "w-10 h-10 rounded-xl bg-brand text-white border border-brand/20 flex items-center justify-center text-brand flex-shrink-0", children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-5 h-5", fill: "none", stroke: "currentColor", viewBox: "0 0 24 24", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
               "path",
               {
                 strokeLinecap: "round",
@@ -28006,7 +28030,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
               "button",
               {
                 onClick: () => setShowUniversalWizard(true),
-                className: "w-full bg-gradient-to-r from-blue-600/20 to-purple-600/20 hover:from-blue-600/40 hover:to-purple-600/40 text-primary font-medium py-2 px-4 rounded-md transition-all border border-blue-500/30 text-sm flex items-center justify-center gap-2 shadow-sm",
+                className: "w-full bg-brand hover:bg-brand-hover text-white font-medium py-2 px-4 rounded-md transition-all border border-border shadow-sm flex items-center justify-center gap-2",
                 children: [
                   /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-base", children: "🚀" }),
                   " ",
@@ -28160,7 +28184,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     }
                   ),
                   t("collaborationRepo"),
-                  collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-auto bg-brand/20 text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
+                  collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-auto bg-brand text-white text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
                 ]
               }
             ),
@@ -28234,7 +28258,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
           ] })
         ] }),
         /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 p-6 flex flex-col overflow-y-auto custom-scrollbar min-h-0 relative z-10", children: isRepo && status && branches ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 flex flex-col min-h-0 gap-4 mb-6 relative z-20", children: [
-          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-wrap justify-between items-center bg-surface/70 backdrop-blur-md border border-border p-3 rounded-xl transition-colors duration-300 gap-4 relative z-50", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-wrap justify-between items-center bg-surface backdrop-blur-md border border-border p-3 rounded-xl transition-colors duration-300 gap-4 relative z-50", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-wrap items-center gap-4 text-sm", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-2 relative", children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-secondary", children: "Auth:" }),
@@ -28408,7 +28432,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "button",
                     {
                       onClick: handleToggleAutoSync,
-                      className: `px-2 py-1.5 rounded transition-colors flex items-center justify-center border font-medium ${autoSyncEnabled ? "bg-green-500/20 text-green-400 border-green-500/30" : "hover:bg-brand/20 text-brand border-brand/30"}`,
+                      className: `px-2 py-1.5 rounded transition-colors flex items-center justify-center border font-medium ${autoSyncEnabled ? "bg-green-500/20 text-green-400 border-green-500/30" : "hover:bg-brand text-white text-brand border-brand/30"}`,
                       title: autoSyncEnabled ? "Disable Auto-Push" : "Enable Auto-Push",
                       children: [
                         "⚡ ",
@@ -28530,7 +28554,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
               )
             ] })
           ] }),
-          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative z-40 flex flex-wrap justify-between items-center bg-surface/70 backdrop-blur-md p-4 rounded-xl border border-border transition-colors duration-300 gap-4", children: [
+          /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "relative z-40 flex flex-wrap justify-between items-center bg-surface backdrop-blur-md p-4 rounded-xl border border-border transition-colors duration-300 gap-4", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center gap-3 w-full sm:w-auto", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-secondary text-sm hidden sm:inline", children: "Branch:" }),
               /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "relative", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -28573,7 +28597,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                   "button",
                   {
                     onClick: () => window.api.openExternal(remoteUrl),
-                    className: "p-1.5 hover:bg-brand/20 text-brand rounded transition-colors flex items-center justify-center border border-brand/30",
+                    className: "p-1.5 hover:bg-brand text-white text-brand rounded transition-colors flex items-center justify-center border border-brand/30",
                     title: "View Repository on GitHub",
                     children: /* @__PURE__ */ jsxRuntimeExports.jsx("svg", { className: "w-3.5 h-3.5", viewBox: "0 0 24 24", fill: "currentColor", children: /* @__PURE__ */ jsxRuntimeExports.jsx("path", { d: "M12 0C5.374 0 0 5.373 0 12c0 5.302 3.438 9.8 8.205 11.387.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 21.795 24 17.298 24 12c0-6.627-5.373-12-12-12z" }) })
                   }
@@ -28599,7 +28623,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "button",
                     {
                       onClick: () => setShowContributorsModal(true),
-                      className: "px-2 py-1.5 hover:bg-brand/20 text-brand rounded transition-colors flex items-center justify-center border border-brand/30 font-medium",
+                      className: "px-2 py-1.5 hover:bg-brand text-white text-brand rounded transition-colors flex items-center justify-center border border-brand/30 font-medium",
                       title: "Manage Collaborators",
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -28731,7 +28755,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
               )
             ] })
           ] }),
-          changesTab === "collaboration-repo" ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 bg-surface/70 backdrop-blur-md rounded-2xl border border-border flex flex-col transition-colors duration-300 overflow-hidden p-4 sm:p-5 min-w-0", children: [
+          changesTab === "collaboration-repo" ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 bg-surface backdrop-blur-md rounded-2xl border border-border flex flex-col transition-colors duration-300 overflow-hidden p-4 sm:p-5 min-w-0", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center border-b border-border pb-3 mb-4 gap-2 flex-shrink-0", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsxs(
                 "button",
@@ -28752,7 +28776,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                   children: "Deleted"
                 }
               ),
-              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "ml-auto text-xs font-bold text-brand bg-brand/10 border border-brand/20 px-3 py-1 rounded-full", children: "Collaboration Repo" })
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "ml-auto text-xs font-bold text-brand bg-brand text-white border border-brand/20 px-3 py-1 rounded-full", children: "Collaboration Repo" })
             ] }),
             /* @__PURE__ */ jsxRuntimeExports.jsx(
               CollaborationRepoView,
@@ -28783,14 +28807,14 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "div",
                     {
                       style: { flex: leftPanelWidth },
-                      className: "bg-surface/70 backdrop-blur-md rounded-xl border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-[250px] min-w-0 min-h-0",
+                      className: "bg-surface backdrop-blur-md rounded-xl border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-[250px] min-w-0 min-h-0",
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-nowrap overflow-x-auto custom-scrollbar items-center border-b border-border px-4 pt-3 pb-1 gap-y-2 gap-x-1", children: [
                           /* @__PURE__ */ jsxRuntimeExports.jsxs(
                             "button",
                             {
                               onClick: () => setChangesTab("changes"),
-                              className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "changes" ? "text-primary border-accent bg-canvas/50" : "text-secondary border-transparent hover:text-primary"}`,
+                              className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "changes" ? "text-primary border-accent bg-surface border-b-2" : "text-secondary border-transparent hover:text-primary"}`,
                               children: [
                                 "Changes",
                                 status.not_added.length + status.modified.length + status.created.length + status.conflicted.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-1.5 bg-accent/20 text-accent text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: status.not_added.length + status.modified.length + status.created.length + status.conflicted.length })
@@ -28801,7 +28825,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                             "button",
                             {
                               onClick: () => setChangesTab("deleted"),
-                              className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "deleted" ? "text-primary border-danger bg-canvas/50" : "text-secondary border-transparent hover:text-primary"}`,
+                              className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "deleted" ? "text-primary border-danger bg-surface border-b-2" : "text-secondary border-transparent hover:text-primary"}`,
                               children: [
                                 "Deleted",
                                 status.deleted.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-1.5 bg-danger/20 text-danger text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: status.deleted.length })
@@ -28816,10 +28840,10 @@ Are you SURE you want to link "${repoName}" to this folder?`
                                 window.api.getCollaboratedRepos().then((repos) => setCollaboratedRepos(repos || [])).catch(() => {
                                 });
                               },
-                              className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "collaboration-repo" ? "text-primary border-brand bg-canvas/50" : "text-secondary border-transparent hover:text-primary"}`,
+                              className: `text-xs font-semibold px-3 py-1.5 rounded-t-md transition-colors border-b-2 whitespace-nowrap flex-shrink-0 ${changesTab === "collaboration-repo" ? "text-primary border-brand bg-surface border-b-2" : "text-secondary border-transparent hover:text-primary"}`,
                               children: [
                                 "Collaboration Repo",
-                                collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-1.5 bg-brand/20 text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
+                                collaboratedRepos.length > 0 && /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "ml-1.5 bg-brand text-white text-brand text-[10px] font-bold px-1.5 py-0.5 rounded-full", children: collaboratedRepos.length })
                               ]
                             }
                           ),
@@ -28829,7 +28853,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                               {
                                 onClick: handleUploadFiles,
                                 disabled: !repoPath || isUploading,
-                                className: "text-xs bg-brand/10 hover:bg-brand/20 text-brand border border-brand/30 px-2.5 py-1 rounded-md transition-all flex items-center gap-1.5 font-medium shadow-sm disabled:opacity-50 whitespace-nowrap flex-shrink-0",
+                                className: "text-xs bg-brand text-white hover:bg-brand text-white text-brand border border-brand/30 px-2.5 py-1 rounded-md transition-all flex items-center gap-1.5 font-medium shadow-sm disabled:opacity-50 whitespace-nowrap flex-shrink-0",
                                 title: "Upload files directly into this repository",
                                 children: [
                                   /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -29094,7 +29118,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                     "div",
                     {
                       style: { flex: 100 - leftPanelWidth },
-                      className: "bg-surface/70 backdrop-blur-md rounded-xl p-4 border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-0 min-w-0",
+                      className: "bg-surface backdrop-blur-md rounded-xl p-4 border border-border flex flex-col transition-colors duration-300 overflow-hidden min-h-0 min-w-0",
                       children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsx("h2", { className: "font-semibold mb-4 text-primary text-sm shrink-0", children: "Staged Changes" }),
                         /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-1 overflow-y-auto min-h-0 pr-2 custom-scrollbar", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("ul", { className: "space-y-1", children: [
@@ -29141,7 +29165,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 ]
               }
             ),
-            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mt-4 shrink-0 bg-surface/70 backdrop-blur-md p-4 rounded-xl border border-border flex flex-col sm:flex-row gap-3 items-center transition-colors duration-300", children: [
+            /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "mt-4 shrink-0 bg-surface backdrop-blur-md p-4 rounded-xl border border-border flex flex-col sm:flex-row gap-3 items-center transition-colors duration-300", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx(
                 "input",
                 {
@@ -29167,7 +29191,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
               )
             ] })
           ] })
-        ] }) : changesTab === "collaboration-repo" ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 bg-surface/70 backdrop-blur-md rounded-2xl border border-border flex flex-col transition-colors duration-300 overflow-hidden p-4 sm:p-5 min-w-0", children: [
+        ] }) : changesTab === "collaboration-repo" ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex-1 bg-surface backdrop-blur-md rounded-2xl border border-border flex flex-col transition-colors duration-300 overflow-hidden p-4 sm:p-5 min-w-0", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center justify-between border-b border-border pb-3 mb-4 gap-2 flex-shrink-0", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsxs(
               "button",
@@ -29180,7 +29204,7 @@ Are you SURE you want to link "${repoName}" to this folder?`
                 ]
               }
             ),
-            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-xs font-bold text-brand bg-brand/10 border border-brand/20 px-3 py-1 rounded-full", children: "Collaboration Hub" }) })
+            /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex items-center gap-2", children: /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-xs font-bold text-brand bg-brand text-white border border-brand/20 px-3 py-1 rounded-full", children: "Collaboration Hub" }) })
           ] }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(
             CollaborationRepoView,