diff --git a/userChrome.css b/userChrome.css
index ff73def..4a7b6f0 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -282,9 +282,10 @@
       --win-hover-active-bgcolor: #c2c2c2; /* also button-bgcolor */
       --win-field-bgcolor: #ffffff;
       --win-component-bgcolor: #f2f2f2;
+      --win-border-color: #8a8a8a;
+      --win-tab-seperator-color: #a3a3a3;
       --win-sidebar-bgcolor: #e6e6e6;
       --win-sidebar-hover-bgcolor: #cfcfcf;
-      --win-sidebar-border-color: #8a8a8a;
       --win-sidebar-button-hover-bgcolor: #b8b8b8;
       --win-sidebar-button-hover-active-bgcolor: #a3a3a3;
       --win-button-border: #747474;
@@ -308,9 +309,10 @@
         --win-hover-active-bgcolor: #454545; /* also button-bgcolor */
         --win-field-bgcolor: #373737;
         --win-component-bgcolor: #171717;
+        --win-border-color: #5b5b5b;
+        --win-tab-seperator-color: #555555;
         --win-sidebar-bgcolor: #1f1f1f;
         --win-sidebar-hover-bgcolor: #353535;
-        --win-sidebar-border-color: #5b5b5b;
         --win-sidebar-button-hover-bgcolor: #353535;
         --win-sidebar-button-hover-active-bgcolor: #4c4c4c;
         --win-button-border: #8f8f8f;
@@ -359,10 +361,7 @@
       --menu-border-color: var(--win-bgcolor) !important;
       --lwt-accent-color: var(--win-bgcolor) !important;
       --toolbar-field-border-color: var(--win-bgcolor) !important;
-      --arrowpanel-border-color: var(--win-bgcolor) !important;
       --chrome-content-separator-color: var(--win-bgcolor) !important;
-      --toolbarseparator-color: var(--win-bgcolor) !important;
-      --panel-separator-color: var(--win-bgcolor) !important;
 
       /* Component Background Color */
       --menu-background-color: var(--win-component-bgcolor) !important;
@@ -371,6 +370,9 @@
       --arrowpanel-background: var(--win-component-bgcolor) !important;
       --autocomplete-popup-background: var(--win-component-bgcolor) !important;
 
+      /* Seperator */
+      --toolbarseparator-color: var(--win-tab-seperator-color) !important;
+
       /* Field Backround Color */
       --input-bgcolor: var(--win-field-bgcolor) !important;
       --toolbar-field-background-color: var(--win-field-bgcolor) !important;
@@ -447,6 +449,16 @@
       --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important;
     }
 
+    /*- Separator ------------------------------------------------------------*/
+    :root:not(:-moz-lwtheme) {
+      --arrowpanel-border-color: var(--win-bgcolor) !important;
+      --panel-separator-color: var(--win-bgcolor) !important;
+    }
+    :root[lwt-default-theme-in-dark-mode] {
+      --arrowpanel-border-color: var(--win-border-color) !important;
+      --panel-separator-color: var(--win-border-color) !important;
+    }
+
     /*- Menu -----------------------------------------------------------------*/
     html#main-window menupopup:not(:-moz-lwtheme) {
       --menu-color: var(--win-text-color) !important;
@@ -474,7 +486,7 @@
     :root[lwt-default-theme-in-dark-mode] #sidebar-box {
       --sidebar-background-color: var(--win-sidebar-bgcolor) !important;
       --sidebar-text-color: var(--win-text-color) !important;
-      --sidebar-border-color: var(--win-sidebar-border-color) !important;
+      --sidebar-border-color: var(--win-border-color) !important;
     }
     @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
       .sidebar-panel[style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"],