diff --git a/netbox/project-static/bundle.js b/netbox/project-static/bundle.js
index 22a6e304a..3b4bdbebc 100644
--- a/netbox/project-static/bundle.js
+++ b/netbox/project-static/bundle.js
@@ -74,8 +74,7 @@ async function bundleStyles() {
   try {
     const entryPoints = {
       'netbox-external': 'styles/_external.scss',
-      'netbox-light': 'styles/_light.scss',
-      // 'netbox-dark': 'styles/_dark.scss',
+      'netbox': 'styles/_netbox.scss',
       'netbox-print': 'styles/_print.scss',
       rack_elevation: 'styles/_rack_elevation.scss',
       cable_trace: 'styles/_cable_trace.scss',
diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
new file mode 100644
index 000000000..9048a3286
Binary files /dev/null and b/netbox/project-static/dist/netbox.css differ
diff --git a/netbox/project-static/styles/_light.scss b/netbox/project-static/styles/_netbox.scss
similarity index 100%
rename from netbox/project-static/styles/_light.scss
rename to netbox/project-static/styles/_netbox.scss
diff --git a/netbox/project-static/styles/theme-base.scss b/netbox/project-static/styles/theme-base.scss
deleted file mode 100644
index 97f6dd020..000000000
--- a/netbox/project-static/styles/theme-base.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-// Base NetBox Theme Overrides and Settings - color mode agnostic.
-
-@import '../node_modules/bootstrap/scss/functions';
-
-$card-cap-bg: 'unset';
-
-$border-radius-md: 0.375rem;
-$border-radius-lg: 0.5rem;
-$border-radius-xl: 0.75rem;
-$border-radius-2xl: 1.5rem;
-
-$border-radius: $border-radius-md;
-
-$border-radius-sm: $border-radius;
-$border-radius-lg: $border-radius-xl;
-
-$badge-border-radius: $border-radius-md;
-$progress-border-radius: $border-radius-md;
-
-$font-weight-lighter: 200;
-$font-weight-medium: 600;
-$font-weight-bolder: 800;
-
-$font-size-xs: 0.75rem;
-
-$line-height-base: 1.5;
-$line-height-xs: 1;
-$line-height-sm: 1.25;
-$line-height-lg: 1.75;
-
-$darker: #1b1f22;
-$darkest: #171b1d;
-
-@import '../node_modules/bootstrap/scss/variables';
-
-// This is the same value as the default from Bootstrap, but it needs to be in scope prior to
-// importing _variables.scss from Bootstrap.
-$btn-close-width: 1em;
-
-$accordion-padding-y: 0.8125rem;
-$accordion-padding-x: 0.8125rem;
-
-$sidebar-width: 280px;
-$sidebar-bottom-height: 4rem;
-
-$transition-100ms-ease-in-out: all 0.1s ease-in-out;
-
-// Sidebar/Sidenav
-$sidenav-width-closed: 3rem;
-$sidenav-width-open: 16rem;
-$sidenav-icon-width: 2rem;
-$sidenav-spacing-x: 1.5rem;
-$sidenav-link-spacing-x: 1rem;
-$sidenav-link-spacing-y: 0.5rem;
diff --git a/netbox/project-static/styles/theme-light.scss b/netbox/project-static/styles/theme-light.scss
index c9478f1cc..79517f729 100644
--- a/netbox/project-static/styles/theme-light.scss
+++ b/netbox/project-static/styles/theme-light.scss
@@ -1,6 +1,57 @@
-// Light Mode Theme Variables and Overrides.
+// Base NetBox Theme Overrides and Settings - color mode agnostic.
 
-@import './theme-base.scss';
+@import '../node_modules/bootstrap/scss/functions';
+
+$card-cap-bg: 'unset';
+
+$border-radius-md: 0.375rem;
+$border-radius-lg: 0.5rem;
+$border-radius-xl: 0.75rem;
+$border-radius-2xl: 1.5rem;
+
+$border-radius: $border-radius-md;
+
+$border-radius-sm: $border-radius;
+$border-radius-lg: $border-radius-xl;
+
+$badge-border-radius: $border-radius-md;
+$progress-border-radius: $border-radius-md;
+
+$font-weight-lighter: 200;
+$font-weight-medium: 600;
+$font-weight-bolder: 800;
+
+$font-size-xs: 0.75rem;
+
+$line-height-base: 1.5;
+$line-height-xs: 1;
+$line-height-sm: 1.25;
+$line-height-lg: 1.75;
+
+$darker: #1b1f22;
+$darkest: #171b1d;
+
+@import '../node_modules/bootstrap/scss/variables';
+
+// This is the same value as the default from Bootstrap, but it needs to be in scope prior to
+// importing _variables.scss from Bootstrap.
+$btn-close-width: 1em;
+
+$accordion-padding-y: 0.8125rem;
+$accordion-padding-x: 0.8125rem;
+
+$sidebar-width: 280px;
+$sidebar-bottom-height: 4rem;
+
+$transition-100ms-ease-in-out: all 0.1s ease-in-out;
+
+// Sidebar/Sidenav
+$sidenav-width-closed: 3rem;
+$sidenav-width-open: 16rem;
+$sidenav-icon-width: 2rem;
+$sidenav-spacing-x: 1.5rem;
+$sidenav-link-spacing-x: 1rem;
+$sidenav-link-spacing-y: 0.5rem;
 
 // Theme colors (BS5 classes)
 $primary: #337ab7;
diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html
index 8003ba9bc..4af904976 100644
--- a/netbox/templates/base/base.html
+++ b/netbox/templates/base/base.html
@@ -49,7 +49,7 @@
     <link
       rel="stylesheet"
       href="{% static 'netbox-light.css'%}?v={{ settings.VERSION }}"
-      onerror="window.location='{% url 'media_failure' %}?filename=netbox-light.css'"
+      onerror="window.location='{% url 'media_failure' %}?filename=netbox.css'"
     />
     <link
       rel="stylesheet"