diff --git a/userChrome.css b/userChrome.css
index d8948e2..dff0da5 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -1,15 +1,17 @@
 @media (-moz-proton) {
-  /** Lightmode - Color darker ************************************************/
+  /** Default Thme - Contrast *************************************************/
+  /*= Lightmode - Color darker ===============================================*/
   :root[lwtheme-mozlightdark][lwthemetextcolor="dark"] {
     --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */
   }
 
-  /** Darkmode - Color lighter ************************************************/
+  /*= Darkmode - Color lighter ===============================================*/
   :root[lwtheme-mozlightdark][lwthemetextcolor="bright"] {
     --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; /* Original: rgba(43, 42, 51, 1) */
   }
 
-  /* Theme - Compatibility ****************************************************/
+  /** Theme - Compatibility ***************************************************/
+  /*= Light Weidght Theme ====================================================*/
   /* Header Image */
   :root[lwtheme-image] {
       background-image: var(--lwt-header-image)  !important; /* Original: var(--lwt-header-image) */
@@ -34,7 +36,7 @@
     border-radius: 4px;
   }
 
-  /** Windows 7 - Compatibility ***********************************************/
+  /*= Windows 7 ==============================================================*/
   @media (-moz-os-version: windows-win7) {
     /* Header Color */
     :root:not([lwtheme-image]) #navigator-toolbox:-moz-lwtheme {
@@ -49,7 +51,23 @@
     }
   }
 
-  /** Windows System Default Theme - Use acccent color ************************/
+  /** System Default Theme ****************************************************/
+  /*= Common - URL Bar focus color ===========================================*/
+  @media (-moz-windows-accent-color-in-titlebar),
+         (-moz-gtk-csd-available) {
+    /* URL Bar */
+    :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme),
+    :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
+      --focus-outline-color: -moz-accent-color !important;
+    }
+
+    :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background,
+    :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #urlbar[open] > #urlbar-background {
+      border-color: color-mix(in srgb, -moz-accent-color 50%, transparent) !important; /* Like: --toolbar-field-focus-border-color */
+    }
+  }
+
+  /*= Windows10 - Titlebar accent color ======================================*/
   @media (-moz-windows-accent-color-in-titlebar) {
     /* Tab Bar */
     :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .titlebar-color,
@@ -64,17 +82,6 @@
       --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent);
       --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent);
     }
-
-    /* URL Bar */
-    :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme),
-    :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) {
-      --focus-outline-color: -moz-accent-color !important;
-    }
-
-    :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background,
-    :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #urlbar[open] > #urlbar-background {
-      border-color: color-mix(in srgb, -moz-accent-color 50%, transparent) !important; /* Like: --toolbar-field-focus-border-color */
-    }
   }
 
   /* Fully Theme Mode *********************************************************/