diff --git a/chrome/buttonlike_toolbarbuttons.css b/chrome/buttonlike_toolbarbuttons.css
index a0b9e4a..0ffbf7b 100644
--- a/chrome/buttonlike_toolbarbuttons.css
+++ b/chrome/buttonlike_toolbarbuttons.css
@@ -34,11 +34,11 @@ See the above repository for updates as well as full license text. */
 .findbar-button,
 #navigator-toolbox > toolbar .chromeclass-toolbar-additional > .toolbarbutton-1 > .toolbarbutton-icon,
 #navigator-toolbox > toolbar .chromeclass-toolbar-additional > .toolbarbutton-icon{
-  border: 1px solid var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.55));
+  border: 1px solid var(--toolbar-field-border-color, hsla(240,5%,5%,.55));
 }
 
 /* stacks use box-shadow as a border to prevent size from changing */
-#navigator-toolbox > toolbar .chromeclass-toolbar-additional > stack{ box-shadow: inset 0 0 0 1px var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.55)) }
+#navigator-toolbox > toolbar .chromeclass-toolbar-additional > stack{ box-shadow: inset 0 0 0 1px var(--toolbar-field-border-color, hsla(240,5%,5%,.55)) }
 
 /* modify paddings within buttons */
 #back-button > .toolbarbutton-icon,
@@ -56,7 +56,7 @@ See the above repository for updates as well as full license text. */
 
 #back-button > .toolbarbutton-icon{
   border-radius: var(--toolbarbutton-border-radius) !important;
-  border: 1px solid var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25)) !important;
+  border: 1px solid var(--toolbar-field-border-color, hsla(240,5%,5%,.25)) !important;
 }
 
 /* Buttons in bookmarks toolbar also require some extra styling rules */
diff --git a/chrome/color_variable_template.css b/chrome/color_variable_template.css
index b3624d9..dd18230 100644
--- a/chrome/color_variable_template.css
+++ b/chrome/color_variable_template.css
@@ -20,7 +20,7 @@ See the above repository for updates as well as full license text. */
   /* urlbar */
   --lwt-toolbar-field-background-color: olive !important;
   --lwt-toolbar-field-focus: grey !important;
-  --lwt-toolbar-field-border-color: green !important;
+  --toolbar-field-border-color: green !important;
   --toolbar-field-focus-border-color: pink !important;
   --lwt-toolbar-field-color: red !important;
   --lwt-toolbar-field-focus-color: white !important;
diff --git a/chrome/full_width_urlbar_popup.css b/chrome/full_width_urlbar_popup.css
index c55cc13..cecb020 100644
--- a/chrome/full_width_urlbar_popup.css
+++ b/chrome/full_width_urlbar_popup.css
@@ -9,7 +9,7 @@ See the above repository for updates as well as full license text. */
   display: -moz-box !important;
   position: relative !important;
   background-color: var(--lwt-toolbar-field-background-color, hsla(0,0%,100%,.8));
-  border: 1px solid var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
+  border: 1px solid var(--toolbar-field-border-color, hsla(240,5%,5%,.25));
   top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important;
   bottom: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2) !important;
   margin-inline-start: 0px !important;
diff --git a/chrome/minimal_text_fields.css b/chrome/minimal_text_fields.css
index 263c18f..106831b 100644
--- a/chrome/minimal_text_fields.css
+++ b/chrome/minimal_text_fields.css
@@ -3,7 +3,7 @@ See the above repository for updates as well as full license text. */
 
 :root:not([customizing]){
   --lwt-toolbar-field-background-color: transparent !important;
-  --lwt-toolbar-field-border-color: transparent !important;
+  --toolbar-field-border-color: transparent !important;
 }
 
 #urlbar[open]{ background-color: var(--toolbar-bgcolor) !important; }
diff --git a/chrome/navigation_buttons_inside_urlbar.css b/chrome/navigation_buttons_inside_urlbar.css
index 35bd515..6176012 100644
--- a/chrome/navigation_buttons_inside_urlbar.css
+++ b/chrome/navigation_buttons_inside_urlbar.css
@@ -13,7 +13,7 @@ See the above repository for updates as well as full license text. */
 
 #urlbar,
 #nav-bar-customization-target > .chromeclass-toolbar-additional[overflows="false"]:not(#downloads-button){
-  border-color: var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
+  border-color: var(--toolbar-field-border-color, hsla(240,5%,5%,.25));
 }
 
 #nav-bar-customization-target > .chromeclass-toolbar-additional[overflows="false"]:not(#downloads-button){
diff --git a/chrome/theme_toolbars.css b/chrome/theme_toolbars.css
index 44fb34e..7bac66d 100644
--- a/chrome/theme_toolbars.css
+++ b/chrome/theme_toolbars.css
@@ -9,7 +9,7 @@ See the above repository for updates as well as full license text. */
 /* Override some default variables - stylesheet compatibility */
 :root{
   --lwt-toolbar-field-background-color: var(--uc-dark-bkgnd-color) !important;
-  --lwt-toolbar-field-border-color: transparent !important;
+  --toolbar-field-border-color: transparent !important;
   --toolbar-bgcolor: var(--uc-light-bkgnd-color) !important;
 }
 #nav-bar{--uc-ext-active-color: var(--uc-active-color);}
diff --git a/chrome/urlbar_popup_full_width.css b/chrome/urlbar_popup_full_width.css
index 09ae2d5..6ce48f9 100644
--- a/chrome/urlbar_popup_full_width.css
+++ b/chrome/urlbar_popup_full_width.css
@@ -16,7 +16,7 @@ See the above repository for updates as well as full license text. */
 #urlbar{
   height: auto !important;
   width: auto !important;
-  box-shadow: inset 0 0 0 1px var(--lwt-toolbar-field-border-color, hsla(240,5%,5%,.25));
+  box-shadow: inset 0 0 0 1px var(--toolbar-field-border-color, hsla(240,5%,5%,.25));
   background-color: var(--lwt-toolbar-field-background-color, hsla(0,0%,100%,.8));
   border-radius: var(--toolbarbutton-border-radius);
   --uc-urlbar-min-width: none; /* navbar_tabs_oneliner.css compatibility */