diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
index e05ed52621..dd2e6dc9cb 100644
--- a/web_src/css/themes/theme-forgejo-dark.css
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -156,8 +156,8 @@
   --color-input-toggle-background: var(--steel-650);
   --color-input-border: var(--steel-550);
   --color-input-border-hover: var(--steel-450);
-  --color-navbar: var(--steel-850);
-  --color-navbar-transparent: #242D3800;
+  --color-header-wrapper: var(--steel-850);
+  --color-header-wrapper-transparent: #242D3800;
   --color-light: #00000028;
   --color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)));
   --color-light-border: #ffffff28;
@@ -182,7 +182,8 @@
   /* should ideally be --color-text-dark, see #15651 */
   --color-reaction-bg: #ffffff12;
   --color-reaction-active-bg: var(--color-primary-alpha-30);
-  --color-header-bar: var(--steel-900);
+  --color-nav-bg: var(--steel-900);
+  --color-nav-hover-bg: var(--steel-900);
   --color-label-active-bg: #4c525e;
   --color-label-text: #fff;
   --color-accent: var(--color-primary-light-1);
diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css
index c74a7ad0c5..6dc07ccca2 100644
--- a/web_src/css/themes/theme-forgejo-light.css
+++ b/web_src/css/themes/theme-forgejo-light.css
@@ -171,8 +171,8 @@
   --color-input-toggle-background: #fff;
   --color-input-border: var(--zinc-300);
   --color-input-border-hover: var(--zinc-400);
-  --color-navbar: var(--zinc-50);
-  --color-navbar-transparent: #D2E0F000;
+  --color-header-wrapper: var(--zinc-50);
+  --color-header-wrapper-transparent: #D2E0F000;
   --color-light: #ffffffcc;
   --color-light-mimic-enabled: rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)));
   --color-light-border: #0000001d;
@@ -197,7 +197,8 @@
   /* should ideally be --color-text-dark, see #15651 */
   --color-reaction-bg: #0000000a;
   --color-reaction-active-bg: var(--color-primary-alpha-20);
-  --color-header-bar: var(--zinc-100);
+  --color-nav-bg: var(--zinc-100);
+  --color-nav-hover-bg: var(--zinc-100);
   --color-label-active-bg: #4c525e;
   --color-accent: var(--color-primary-light-1);
   --color-small-accent: var(--color-primary-light-5);