diff --git a/netbox/project-static/bundle.js b/netbox/project-static/bundle.js
index fdcce4218..69b553282 100644
--- a/netbox/project-static/bundle.js
+++ b/netbox/project-static/bundle.js
@@ -75,8 +75,8 @@ async function bundleStyles() {
     const entryPoints = {
       'netbox-external': 'styles/_external.scss',
       'netbox': 'styles/_netbox.scss',
-      rack_elevation: 'styles/_rack_elevation.scss',
-      cable_trace: 'styles/_cable_trace.scss',
+      rack_elevation: 'styles/svg/rack_elevation.scss',
+      cable_trace: 'styles/svg/cable_trace.scss',
       graphiql: 'netbox-graphiql/graphiql.scss',
     };
     const pluginOptions = { outputStyle: 'compressed' };
@@ -100,8 +100,7 @@ async function bundleStyles() {
     });
     if (result.errors.length === 0) {
       for (const [targetName, sourceName] of Object.entries(entryPoints)) {
-        const source = sourceName.split('/')[1];
-        console.log(`✅ Bundled source file '${source}' to '${targetName}.css'`);
+        console.log(`✅ Bundled source file '${sourceName}' to '${targetName}.css'`);
       }
     }
   } catch (err) {
diff --git a/netbox/project-static/styles/_cable_trace.scss b/netbox/project-static/styles/_cable_trace.scss
deleted file mode 100644
index 66da051c5..000000000
--- a/netbox/project-static/styles/_cable_trace.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './theme-light.scss';
-@import './cable-trace.scss';
diff --git a/netbox/project-static/styles/_rack_elevation.scss b/netbox/project-static/styles/_rack_elevation.scss
deleted file mode 100644
index a3f428db2..000000000
--- a/netbox/project-static/styles/_rack_elevation.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './theme-light.scss';
-@import './rack-elevation.scss';
diff --git a/netbox/project-static/styles/cable-trace.scss b/netbox/project-static/styles/svg/cable_trace.scss
similarity index 97%
rename from netbox/project-static/styles/cable-trace.scss
rename to netbox/project-static/styles/svg/cable_trace.scss
index 59c67ad4d..f184982ce 100644
--- a/netbox/project-static/styles/cable-trace.scss
+++ b/netbox/project-static/styles/svg/cable_trace.scss
@@ -1,3 +1,5 @@
+@import '../theme-light.scss';
+
 // Cable Trace Styles.
 
 :root {
@@ -73,3 +75,4 @@ svg {
     stroke-dasharray: 5px;
   }
 }
+
diff --git a/netbox/project-static/styles/rack-elevation.scss b/netbox/project-static/styles/svg/rack_elevation.scss
similarity index 98%
rename from netbox/project-static/styles/rack-elevation.scss
rename to netbox/project-static/styles/svg/rack_elevation.scss
index 8d6bdddb9..0c08f167d 100644
--- a/netbox/project-static/styles/rack-elevation.scss
+++ b/netbox/project-static/styles/svg/rack_elevation.scss
@@ -1,3 +1,5 @@
+@import '../theme-light.scss';
+
 // Rack Elevation Styles.
 
 svg {
@@ -110,3 +112,4 @@ svg {
     fill: url(#reserved);
   }
 }
+