diff --git a/scss/_bootstrap-dark.scss b/scss/_bootstrap-dark.scss
deleted file mode 100644
index 86edcc82a..000000000
--- a/scss/_bootstrap-dark.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * ---------- Dark Mode ------------------------------------------------------
- */
-
-// Layout & components
-@import "dark/bootstrap/root";
-@import "dark/bootstrap/reboot";
-@import "dark/bootstrap/type";
-@import "dark/bootstrap/images";
-// no colors in containers
-// no colors in grid
-@import "dark/bootstrap/tables";
-@import "dark/bootstrap/forms";
-@import "dark/bootstrap/buttons";
-// no colors in transitions
-@import "dark/bootstrap/dropdown";
-@import "dark/bootstrap/button-group";
-@import "dark/bootstrap/nav";
-@import "dark/bootstrap/navbar";
-@import "dark/bootstrap/card";
-@import "dark/bootstrap/accordion";
-@import "dark/bootstrap/breadcrumb";
-@import "dark/bootstrap/pagination";
-@import "dark/bootstrap/badge";
-@import "dark/bootstrap/alert";
-@import "dark/bootstrap/progress";
-@import "dark/bootstrap/list-group";
-@import "dark/bootstrap/close";
-@import "dark/bootstrap/toasts";
-@import "dark/bootstrap/modal";
-@import "dark/bootstrap/tooltip";
-@import "dark/bootstrap/popover";
-@import "dark/bootstrap/carousel";
-// no colors in spinners
-@import "dark/bootstrap/offcanvas";
-
-// Helpers
-@import "dark/bootstrap/helpers";
-
-// Utilities
-@import "dark/bootstrap/utilities/api";
-
-// Unique to dark-mode
-@import "dark/bootstrap/dark";
diff --git a/scss/layout/_brand-container.scss b/scss/_brand-container.scss
similarity index 100%
rename from scss/layout/_brand-container.scss
rename to scss/_brand-container.scss
diff --git a/scss/layout/_content-header.scss b/scss/_content-header.scss
similarity index 100%
rename from scss/layout/_content-header.scss
rename to scss/_content-header.scss
diff --git a/scss/layout/_content-wrapper.scss b/scss/_content-wrapper.scss
similarity index 100%
rename from scss/layout/_content-wrapper.scss
rename to scss/_content-wrapper.scss
diff --git a/scss/layout/_content.scss b/scss/_content.scss
similarity index 100%
rename from scss/layout/_content.scss
rename to scss/_content.scss
diff --git a/scss/_layout-dark.scss b/scss/_layout-dark.scss
deleted file mode 100644
index 8be11092e..000000000
--- a/scss/_layout-dark.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import "dark/layout/main-header";
-@import "dark/layout/content-wrapper";
-@import "dark/layout/main-footer";
diff --git a/scss/layout/_layout-fixed.scss b/scss/_layout-fixed.scss
similarity index 100%
rename from scss/layout/_layout-fixed.scss
rename to scss/_layout-fixed.scss
diff --git a/scss/layout/_layout-mobile.scss b/scss/_layout-mobile.scss
similarity index 100%
rename from scss/layout/_layout-mobile.scss
rename to scss/_layout-mobile.scss
diff --git a/scss/layout/_main-footer.scss b/scss/_main-footer.scss
similarity index 100%
rename from scss/layout/_main-footer.scss
rename to scss/_main-footer.scss
diff --git a/scss/layout/_main-header.scss b/scss/_main-header.scss
similarity index 100%
rename from scss/layout/_main-header.scss
rename to scss/_main-header.scss
diff --git a/scss/layout/_main-sidebar.scss b/scss/_main-sidebar.scss
similarity index 100%
rename from scss/layout/_main-sidebar.scss
rename to scss/_main-sidebar.scss
diff --git a/scss/layout/_nav-sidebar.scss b/scss/_nav-sidebar.scss
similarity index 100%
rename from scss/layout/_nav-sidebar.scss
rename to scss/_nav-sidebar.scss
diff --git a/scss/layout/_sidebar-close.scss b/scss/_sidebar-close.scss
similarity index 100%
rename from scss/layout/_sidebar-close.scss
rename to scss/_sidebar-close.scss
diff --git a/scss/layout/_sidebar-collapse.scss b/scss/_sidebar-collapse.scss
similarity index 100%
rename from scss/layout/_sidebar-collapse.scss
rename to scss/_sidebar-collapse.scss
diff --git a/scss/layout/_sidebar-horizontal.scss b/scss/_sidebar-horizontal.scss
similarity index 100%
rename from scss/layout/_sidebar-horizontal.scss
rename to scss/_sidebar-horizontal.scss
diff --git a/scss/layout/_sidebar.scss b/scss/_sidebar.scss
similarity index 100%
rename from scss/layout/_sidebar.scss
rename to scss/_sidebar.scss
diff --git a/scss/layout/_wrapper.scss b/scss/_wrapper.scss
similarity index 100%
rename from scss/layout/_wrapper.scss
rename to scss/_wrapper.scss
diff --git a/scss/dark/layout/_content-wrapper.scss b/scss/dark/_content-wrapper.scss
similarity index 100%
rename from scss/dark/layout/_content-wrapper.scss
rename to scss/dark/_content-wrapper.scss
diff --git a/scss/dark/layout/_main-footer.scss b/scss/dark/_main-footer.scss
similarity index 100%
rename from scss/dark/layout/_main-footer.scss
rename to scss/dark/_main-footer.scss
diff --git a/scss/dark/layout/_main-header.scss b/scss/dark/_main-header.scss
similarity index 100%
rename from scss/dark/layout/_main-header.scss
rename to scss/dark/_main-header.scss
diff --git a/scss/dark/adminlte-dark.scss b/scss/dark/adminlte-dark.scss
index 84bab919c..e2908e5f0 100644
--- a/scss/dark/adminlte-dark.scss
+++ b/scss/dark/adminlte-dark.scss
@@ -8,7 +8,7 @@ $enable-dark-mode:            true;
 @import "../adminlte";
 // stylelint-disable no-invalid-position-at-import-rule
 @include color-scheme-alt(alternative-color-scheme($default-color-scheme)) {
-  @import "../parts/dark";
+  @import "parts/core";
 }
 
 // Additional Global Utilities
diff --git a/scss/dark/parts/_core.scss b/scss/dark/parts/_core.scss
new file mode 100644
index 000000000..430d8d57b
--- /dev/null
+++ b/scss/dark/parts/_core.scss
@@ -0,0 +1,4 @@
+@import "../bootstrap/dark";
+@import "../main-header";
+@import "../content-wrapper";
+@import "../main-footer";
diff --git a/scss/parts/_core.scss b/scss/parts/_core.scss
index 788b0f3ce..972a263d3 100644
--- a/scss/parts/_core.scss
+++ b/scss/parts/_core.scss
@@ -2,4 +2,18 @@
 // Part: Core
 //
 
-@import "../layout";
+@import "../wrapper";
+@import "../main-header";
+@import "../brand-container";
+@import "../main-sidebar";
+@import "../sidebar";
+@import "../nav-sidebar";
+@import "../sidebar-collapse";
+// @import "../sidebar-horizontal";
+@import "../sidebar-close";
+@import "../content-wrapper";
+@import "../content-header";
+@import "../content";
+@import "../main-footer";
+@import "../layout-fixed";
+@import "../layout-mobile";
diff --git a/scss/parts/_dark.scss b/scss/parts/_dark.scss
deleted file mode 100644
index ed3aafd47..000000000
--- a/scss/parts/_dark.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "../bootstrap-dark";
-@import "../layout-dark";
diff --git a/scss/parts/_extra-components.scss b/scss/parts/_extra-components.scss
new file mode 100644
index 000000000..cadadf7b7
--- /dev/null
+++ b/scss/parts/_extra-components.scss
@@ -0,0 +1,5 @@
+//
+// Part: Extra Components
+//
+
+@import "../small-box";