diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 97796e4fb..af0d70c07 100644
Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ
diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index c6443c7df..9d18c575e 100644
Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ
diff --git a/netbox/project-static/dist/rack_elevation.css b/netbox/project-static/dist/rack_elevation.css
index 40fa2908a..185163389 100644
Binary files a/netbox/project-static/dist/rack_elevation.css and b/netbox/project-static/dist/rack_elevation.css differ
diff --git a/netbox/project-static/src/colorMode.ts b/netbox/project-static/src/colorMode.ts
index 7883a9630..894a1e8a5 100644
--- a/netbox/project-static/src/colorMode.ts
+++ b/netbox/project-static/src/colorMode.ts
@@ -30,7 +30,7 @@ function updateElements(targetMode: ColorMode): void {
   for (const elevation of getElements<HTMLObjectElement>('.rack_elevation')) {
     const svg = elevation.contentDocument?.querySelector('svg') ?? null;
     if (svg !== null) {
-      svg.setAttribute(`data-${COLOR_MODE_KEY}`, targetMode);
+      svg.setAttribute(`data-bs-theme`, targetMode);
     }
   }
 }
diff --git a/netbox/project-static/styles/svg/rack_elevation.scss b/netbox/project-static/styles/svg/rack_elevation.scss
index f61081983..603ad0a6c 100644
--- a/netbox/project-static/styles/svg/rack_elevation.scss
+++ b/netbox/project-static/styles/svg/rack_elevation.scss
@@ -8,23 +8,23 @@
 
 svg {
   // Light mode values
-  --nbx-rack-bg: #{$gray-200};
+  --nbx-rack-bg: var(--tblr-bg-surface-secondary);
   --nbx-rack-border: #{$black};
   --nbx-rack-slot-bg: #{$gray-200};
   --nbx-rack-slot-border: #{$gray-500};
   --nbx-rack-slot-hover-bg: #{$gray-400};
   --nbx-rack-link-color: #{$blue};
-  --nbx-rack-unit-color: #{$text-muted};
+  --nbx-rack-unit-color: #{$gray-600};
 
   &[data-bs-theme='dark'] {
     // Dark mode values
-    --nbx-rack-bg: #{$gray-800};
+    --nbx-rack-bg: rgb(27, 41, 58);
     --nbx-rack-border: #{$gray-600};
     --nbx-rack-slot-bg: #{$gray-800};
     --nbx-rack-slot-border: #{$gray-700};
     --nbx-rack-slot-hover-bg: #{$gray-900};
     --nbx-rack-link-color: #{$blue-200};
-    --nbx-rack-unit-color: #{$text-muted};
+    --nbx-rack-unit-color: #{$gray-500};
   }
 }
 
@@ -41,6 +41,8 @@ text {
 }
 
 svg {
+  background-color: var(--nbx-rack-bg);
+
   // Rack unit numbers along left side of rack elevation.
   .unit {
     margin: 0;
@@ -65,7 +67,6 @@ svg {
     fill: none;
     stroke-width: 2px;
     stroke: var(--nbx-rack-border);
-    background-color: var(--nbx-rack-bg);
   }
 
   // Rack unit slot.