diff --git a/gulpfile.js b/gulpfile.js
index 313c953b5..8e5858153 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,20 +3,22 @@
 /* eslint-disable no-undef */
 /* eslint-disable unicorn/prefer-module */
 
+const autoprefix = require('autoprefixer')
 const browserSync = require('browser-sync').create()
 const del = require('del')
 const esbuild = require('esbuild')
-const { src, dest, lastRun, watch, series, parallel } = require('gulp')
+const { src, dest, lastRun, watch, series } = require('gulp')
 const cleanCss = require('gulp-clean-css')
+const dependents = require('gulp-dependents')
 const eslint = require('gulp-eslint7')
 const fileinclude = require('gulp-file-include')
 const npmDist = require('gulp-npm-dist')
 const postcss = require('gulp-postcss')
 const rename = require('gulp-rename')
 const sass = require('gulp-sass')
-const sourcemaps = require('gulp-sourcemaps')
 const gulpStylelint = require('gulp-stylelint')
 const wait = require('gulp-wait')
+const rtlcss = require('rtlcss')
 
 sass.compiler = require('sass')
 
@@ -70,46 +72,28 @@ const sassOptions = {
   includePaths: ['./node_modules/']
 }
 
-function postcssOptions() {
-  return {
-    map: {
-      inline: false,
-      annotation: true,
-      sourcesContent: true
-    },
-    plugins: [
-      require('autoprefixer')({
-        cascade: false
-      })
-    ]
-  }
-}
+const postcssOptions = [
+  autoprefix({ cascade: false })
+]
 
-function postcssRtlOptions() {
-  return {
-    map: {
-      inline: false,
-      annotation: true,
-      sourcesContent: true
-    },
-    plugins: [
-      require('autoprefixer')({
-        cascade: false
-      }),
-      require('rtlcss')({})
-    ]
-  }
-}
+const postcssRtlOptions = [
+  autoprefix({ cascade: false }),
+  rtlcss({})
+]
+
+// From here Dev mode will Start
 
 // Compile SCSS
 const scss = () => {
-  return src(paths.src.scss + '/adminlte.scss')
+  return src(paths.src.scss + '/**/*.scss', {
+    since: lastRun(scss),
+    sourcemaps: true
+  })
     .pipe(wait(500))
-    .pipe(sourcemaps.init())
+    .pipe(dependents())
     .pipe(sass(sassOptions).on('error', sass.logError))
     .pipe(postcss(postcssOptions))
-    .pipe(sourcemaps.write('.'))
-    .pipe(dest(paths.temp.css))
+    .pipe(dest(paths.temp.css, { sourcemaps: '.' }))
     .pipe(browserSync.stream())
 }
 
@@ -197,16 +181,21 @@ const serve = () => {
   watch([paths.src.vendor], series(vendor))
 }
 
+exports.serve = serve
+
+// From here Dist will Start
+
 // Minify CSS
 const minifyDistCss = () => {
   return src([
     paths.dist.css + '/**/*.css'
-  ], { base: paths.dist.css })
-    .pipe(sourcemaps.init({ loadMaps: true }))
+  ], {
+    base: paths.dist.css,
+    sourcemaps: true
+  })
     .pipe(cleanCss({ format: { breakWith: 'lf' } }))
     .pipe(rename({ suffix: '.min' }))
-    .pipe(sourcemaps.write('.'))
-    .pipe(dest(paths.dist.css))
+    .pipe(dest(paths.dist.css, { sourcemaps: '.' }))
 }
 
 // Minify JS
@@ -230,32 +219,26 @@ const copyDistAssets = () => {
 }
 
 // Clean
-const cleanDist = () => {
-  return del([paths.dist.base])
-}
+const cleanDist = () => del([paths.dist.base])
 
 // Compile and copy all scss/css
 const copyDistCssAll = () => {
-  return src([
-    paths.src.scss + '/adminlte.scss',
-    paths.src.scss + '/dark/*.scss'
-  ], { base: paths.src.scss })
+  return src([paths.src.scss + '/**/*.scss'], {
+    base: paths.src.scss,
+    sourcemaps: true
+  })
     .pipe(wait(500))
-    .pipe(sourcemaps.init())
     .pipe(sass(sassOptions).on('error', sass.logError))
     .pipe(postcss(postcssOptions))
-    .pipe(sourcemaps.write('.'))
-    .pipe(dest(paths.dist.css))
+    .pipe(dest(paths.dist.css, { sourcemaps: '.' }))
 }
 
 const copyDistCssRtl = () => {
-  return src(paths.dist.css + '/**/*.css')
+  return src(paths.dist.css + '/*.css', { sourcemaps: true })
     .pipe(wait(500))
-    .pipe(sourcemaps.init({ loadMaps: true }))
     .pipe(postcss(postcssRtlOptions))
     .pipe(rename({ suffix: '.rtl' }))
-    .pipe(sourcemaps.write('.'))
-    .pipe(dest(paths.dist.css + '/rtl'))
+    .pipe(dest(paths.dist.css + '/rtl', { sourcemaps: '.' }))
 }
 
 // Compile and copy ts/js
@@ -310,4 +293,4 @@ const copyDistVendor = () => {
 exports.build = series(lintScss, lintTs, cleanDist, copyDistCssAll, copyDistCssRtl, minifyDistCss, copyDistJs, minifyDistJs, copyDistHtml, copyDistHtmlIndex, copyDistAssets, copyDistVendor)
 
 // Default
-exports.default = series(parallel(lintScss, scss, lintTs, ts, html, index, assets, vendor), serve)
+exports.default = series(scss, ts, html, index, assets, vendor, serve)
diff --git a/package-lock.json b/package-lock.json
index 65fba31b2..68a991792 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -398,130 +398,6 @@
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz",
       "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w=="
     },
-    "@gulp-sourcemaps/identity-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
-      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.4.1",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.16",
-        "source-map": "^0.6.0",
-        "through2": "^3.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "through2": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
-          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "@gulp-sourcemaps/map-sources": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^2.0.1",
-        "through2": "^2.0.3"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -2044,29 +1920,6 @@
         "which": "^2.0.1"
       }
     },
-    "css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map-resolve": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-          "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0"
-          }
-        }
-      }
-    },
     "cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -2110,28 +1963,6 @@
         "ms": "2.1.2"
       }
     },
-    "debug-fabulous": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
-      "dev": true,
-      "requires": {
-        "debug": "3.X",
-        "memoizee": "0.4.X",
-        "object-assign": "4.X"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -2287,12 +2118,6 @@
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
-    "detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-      "dev": true
-    },
     "dev-ip": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
@@ -3150,16 +2975,6 @@
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true
     },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -4622,6 +4437,29 @@
         }
       }
     },
+    "gulp-dependents": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/gulp-dependents/-/gulp-dependents-1.2.5.tgz",
+      "integrity": "sha512-zwZzr4yxEVKlW96Ch9DS6KsmA9XrHYWYFTdJ3q7GaG6uiVNAsZUR57BlLBRCV0YkVL0sfMozJcQOGdxyOxcjQA==",
+      "dev": true,
+      "requires": {
+        "fancy-log": "^1.3.3",
+        "through2": "^3.0.1",
+        "vinyl": "^2.2.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
     "gulp-eslint7": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/gulp-eslint7/-/gulp-eslint7-0.3.1.tgz",
@@ -4856,33 +4694,6 @@
         }
       }
     },
-    "gulp-sourcemaps": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
-      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
-      "dev": true,
-      "requires": {
-        "@gulp-sourcemaps/identity-map": "^2.0.1",
-        "@gulp-sourcemaps/map-sources": "^1.0.0",
-        "acorn": "^6.4.1",
-        "convert-source-map": "^1.0.0",
-        "css": "^3.0.0",
-        "debug-fabulous": "^1.0.0",
-        "detect-newline": "^2.0.0",
-        "graceful-fs": "^4.0.0",
-        "source-map": "^0.6.0",
-        "strip-bom-string": "^1.0.0",
-        "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-          "dev": true
-        }
-      }
-    },
     "gulp-stylelint": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/gulp-stylelint/-/gulp-stylelint-13.0.0.tgz",
@@ -5570,12 +5381,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
-    },
     "is-regex": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
@@ -6119,15 +5924,6 @@
         "yallist": "^4.0.0"
       }
     },
-    "lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "~0.10.2"
-      }
-    },
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
@@ -6347,30 +6143,6 @@
       "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
       "dev": true
     },
-    "memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      },
-      "dependencies": {
-        "next-tick": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-          "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-          "dev": true
-        }
-      }
-    },
     "memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -9893,12 +9665,6 @@
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true
     },
-    "strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-      "dev": true
-    },
     "strip-indent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
@@ -10551,16 +10317,6 @@
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
       "dev": true
     },
-    "timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
diff --git a/package.json b/package.json
index ca9cf0ebc..b44588c89 100644
--- a/package.json
+++ b/package.json
@@ -54,13 +54,13 @@
     "eslint-plugin-unicorn": "^32.0.1",
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.3.0",
+    "gulp-dependents": "^1.2.5",
     "gulp-eslint7": "^0.3.1",
     "gulp-file-include": "^2.3.0",
     "gulp-npm-dist": "^1.0.3",
     "gulp-postcss": "^9.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^4.1.0",
-    "gulp-sourcemaps": "^3.0.0",
     "gulp-stylelint": "^13.0.0",
     "gulp-wait": "0.0.2",
     "lockfile-lint": "^4.6.2",
diff --git a/src/scss/adminlte.scss b/src/scss/adminlte.scss
index aeb89a92c..790f23e02 100644
--- a/src/scss/adminlte.scss
+++ b/src/scss/adminlte.scss
@@ -10,20 +10,14 @@
 @import "bootstrap/scss/functions";
 @import "variables"; // little modified are here
 @import "bootstrap/scss/variables";
-@import "dark/variables-alt";  // dark color set is here
 @import "bootstrap/scss/mixins";
-@import "dark/bootstrap/mixins";
 @import "custom-utilities";
 @import "bootstrap/scss/utilities";
-@import "dark/bootstrap/utilities";
-@import "dark/bootstrap/patch";  // missing from BS, unsupported patch/hack
-@import "dark/bootstrap/color-scheme";
 @import "bootstrap/scss/bootstrap";
 
 // Variables and Mixins
 // ---------------------------------------------------
 @import "custom-variables";
-@import "dark/custom-variables-alt"; // dark color set is here
 @import "mixins";
 
 @import "parts/core";
diff --git a/src/scss/dark/bootstrap/_accordion.scss b/src/scss/bootstrap-dark/_accordion.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_accordion.scss
rename to src/scss/bootstrap-dark/_accordion.scss
diff --git a/src/scss/dark/bootstrap/_alert.scss b/src/scss/bootstrap-dark/_alert.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_alert.scss
rename to src/scss/bootstrap-dark/_alert.scss
diff --git a/src/scss/dark/bootstrap/_badge.scss b/src/scss/bootstrap-dark/_badge.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_badge.scss
rename to src/scss/bootstrap-dark/_badge.scss
diff --git a/src/scss/dark/bootstrap/_breadcrumb.scss b/src/scss/bootstrap-dark/_breadcrumb.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_breadcrumb.scss
rename to src/scss/bootstrap-dark/_breadcrumb.scss
diff --git a/src/scss/dark/bootstrap/_button-group.scss b/src/scss/bootstrap-dark/_button-group.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_button-group.scss
rename to src/scss/bootstrap-dark/_button-group.scss
diff --git a/src/scss/dark/bootstrap/_buttons.scss b/src/scss/bootstrap-dark/_buttons.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_buttons.scss
rename to src/scss/bootstrap-dark/_buttons.scss
diff --git a/src/scss/dark/bootstrap/_card.scss b/src/scss/bootstrap-dark/_card.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_card.scss
rename to src/scss/bootstrap-dark/_card.scss
diff --git a/src/scss/dark/bootstrap/_carousel.scss b/src/scss/bootstrap-dark/_carousel.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_carousel.scss
rename to src/scss/bootstrap-dark/_carousel.scss
diff --git a/src/scss/dark/bootstrap/_close.scss b/src/scss/bootstrap-dark/_close.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_close.scss
rename to src/scss/bootstrap-dark/_close.scss
diff --git a/src/scss/dark/bootstrap/_color-scheme.scss b/src/scss/bootstrap-dark/_color-scheme.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_color-scheme.scss
rename to src/scss/bootstrap-dark/_color-scheme.scss
diff --git a/src/scss/dark/bootstrap/_dark.scss b/src/scss/bootstrap-dark/_dark.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_dark.scss
rename to src/scss/bootstrap-dark/_dark.scss
diff --git a/src/scss/dark/bootstrap/_dropdown.scss b/src/scss/bootstrap-dark/_dropdown.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_dropdown.scss
rename to src/scss/bootstrap-dark/_dropdown.scss
diff --git a/src/scss/dark/bootstrap/_forms.scss b/src/scss/bootstrap-dark/_forms.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_forms.scss
rename to src/scss/bootstrap-dark/_forms.scss
diff --git a/src/scss/dark/bootstrap/_helpers.scss b/src/scss/bootstrap-dark/_helpers.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_helpers.scss
rename to src/scss/bootstrap-dark/_helpers.scss
diff --git a/src/scss/dark/bootstrap/_images.scss b/src/scss/bootstrap-dark/_images.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_images.scss
rename to src/scss/bootstrap-dark/_images.scss
diff --git a/src/scss/dark/bootstrap/_list-group.scss b/src/scss/bootstrap-dark/_list-group.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_list-group.scss
rename to src/scss/bootstrap-dark/_list-group.scss
diff --git a/src/scss/dark/bootstrap/_mixins.scss b/src/scss/bootstrap-dark/_mixins.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_mixins.scss
rename to src/scss/bootstrap-dark/_mixins.scss
diff --git a/src/scss/dark/bootstrap/_modal.scss b/src/scss/bootstrap-dark/_modal.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_modal.scss
rename to src/scss/bootstrap-dark/_modal.scss
diff --git a/src/scss/dark/bootstrap/_nav.scss b/src/scss/bootstrap-dark/_nav.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_nav.scss
rename to src/scss/bootstrap-dark/_nav.scss
diff --git a/src/scss/dark/bootstrap/_navbar.scss b/src/scss/bootstrap-dark/_navbar.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_navbar.scss
rename to src/scss/bootstrap-dark/_navbar.scss
diff --git a/src/scss/dark/bootstrap/_offcanvas.scss b/src/scss/bootstrap-dark/_offcanvas.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_offcanvas.scss
rename to src/scss/bootstrap-dark/_offcanvas.scss
diff --git a/src/scss/dark/bootstrap/_pagination.scss b/src/scss/bootstrap-dark/_pagination.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_pagination.scss
rename to src/scss/bootstrap-dark/_pagination.scss
diff --git a/src/scss/dark/bootstrap/_patch.scss b/src/scss/bootstrap-dark/_patch.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_patch.scss
rename to src/scss/bootstrap-dark/_patch.scss
diff --git a/src/scss/dark/bootstrap/_popover.scss b/src/scss/bootstrap-dark/_popover.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_popover.scss
rename to src/scss/bootstrap-dark/_popover.scss
diff --git a/src/scss/dark/bootstrap/_progress.scss b/src/scss/bootstrap-dark/_progress.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_progress.scss
rename to src/scss/bootstrap-dark/_progress.scss
diff --git a/src/scss/dark/bootstrap/_reboot.scss b/src/scss/bootstrap-dark/_reboot.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_reboot.scss
rename to src/scss/bootstrap-dark/_reboot.scss
diff --git a/src/scss/dark/bootstrap/_root.scss b/src/scss/bootstrap-dark/_root.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_root.scss
rename to src/scss/bootstrap-dark/_root.scss
diff --git a/src/scss/dark/bootstrap/_tables.scss b/src/scss/bootstrap-dark/_tables.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_tables.scss
rename to src/scss/bootstrap-dark/_tables.scss
diff --git a/src/scss/dark/bootstrap/_toasts.scss b/src/scss/bootstrap-dark/_toasts.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_toasts.scss
rename to src/scss/bootstrap-dark/_toasts.scss
diff --git a/src/scss/dark/bootstrap/_tooltip.scss b/src/scss/bootstrap-dark/_tooltip.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_tooltip.scss
rename to src/scss/bootstrap-dark/_tooltip.scss
diff --git a/src/scss/dark/bootstrap/_type.scss b/src/scss/bootstrap-dark/_type.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_type.scss
rename to src/scss/bootstrap-dark/_type.scss
diff --git a/src/scss/dark/bootstrap/_utilities.scss b/src/scss/bootstrap-dark/_utilities.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_utilities.scss
rename to src/scss/bootstrap-dark/_utilities.scss
diff --git a/src/scss/dark/_variables-alt.scss b/src/scss/bootstrap-dark/_variables-alt.scss
similarity index 98%
rename from src/scss/dark/_variables-alt.scss
rename to src/scss/bootstrap-dark/_variables-alt.scss
index 8117175ee..e2ee578dc 100644
--- a/src/scss/dark/_variables-alt.scss
+++ b/src/scss/bootstrap-dark/_variables-alt.scss
@@ -13,17 +13,17 @@ $color-schemes: (
 // items marked //** from https://bootswatch.com/darkly/
 // items marked //~~ from https://uxdesign.cc/dark-mode-ui-design-the-definitive-guide-part-1-color-53dcfaea5129
 
-$white-alt:    $white !default;
-$gray-100-alt: $gray-100 !default;  //~~
-$gray-200-alt: $gray-200 !default;  //~~
-$gray-300-alt: $gray-300 !default;  //~~
-$gray-400-alt: $gray-400 !default;  //~~
-$gray-500-alt: $gray-500 !default;  //~~
-$gray-600-alt: $gray-600 !default;  //~~
-$gray-700-alt: $gray-700 !default;  //~~
-$gray-800-alt: $gray-800 !default;  //~~
-$gray-900-alt: $gray-900 !default;  //~~
-$black-alt:    $black !default;  //~~
+$white-alt:    #fff !default;
+$gray-100-alt: #f8f9fa !default;
+$gray-200-alt: #e9ecef !default;
+$gray-300-alt: #dee2e6 !default;
+$gray-400-alt: #ced4da !default;
+$gray-500-alt: #adb5bd !default;
+$gray-600-alt: #6c757d !default;
+$gray-700-alt: #495057 !default;
+$gray-800-alt: #343a40 !default;
+$gray-900-alt: #212529 !default;
+$black-alt:    #000 !default;
 
 // fusv-disable
 $grays-alt: (
diff --git a/src/scss/dark/bootstrap/_variables-map-alt-to-core.scss b/src/scss/bootstrap-dark/_variables-map-alt-to-core.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_variables-map-alt-to-core.scss
rename to src/scss/bootstrap-dark/_variables-map-alt-to-core.scss
diff --git a/src/scss/dark/bootstrap/_variables-map-core-to-temp.scss b/src/scss/bootstrap-dark/_variables-map-core-to-temp.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_variables-map-core-to-temp.scss
rename to src/scss/bootstrap-dark/_variables-map-core-to-temp.scss
diff --git a/src/scss/dark/bootstrap/_variables-map-temp-to-alt.scss b/src/scss/bootstrap-dark/_variables-map-temp-to-alt.scss
similarity index 100%
rename from src/scss/dark/bootstrap/_variables-map-temp-to-alt.scss
rename to src/scss/bootstrap-dark/_variables-map-temp-to-alt.scss
diff --git a/src/scss/dark/bootstrap/forms/_floating-labels.scss b/src/scss/bootstrap-dark/forms/_floating-labels.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_floating-labels.scss
rename to src/scss/bootstrap-dark/forms/_floating-labels.scss
diff --git a/src/scss/dark/bootstrap/forms/_form-check.scss b/src/scss/bootstrap-dark/forms/_form-check.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_form-check.scss
rename to src/scss/bootstrap-dark/forms/_form-check.scss
diff --git a/src/scss/dark/bootstrap/forms/_form-control.scss b/src/scss/bootstrap-dark/forms/_form-control.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_form-control.scss
rename to src/scss/bootstrap-dark/forms/_form-control.scss
diff --git a/src/scss/dark/bootstrap/forms/_form-range.scss b/src/scss/bootstrap-dark/forms/_form-range.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_form-range.scss
rename to src/scss/bootstrap-dark/forms/_form-range.scss
diff --git a/src/scss/dark/bootstrap/forms/_form-select.scss b/src/scss/bootstrap-dark/forms/_form-select.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_form-select.scss
rename to src/scss/bootstrap-dark/forms/_form-select.scss
diff --git a/src/scss/dark/bootstrap/forms/_form-text.scss b/src/scss/bootstrap-dark/forms/_form-text.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_form-text.scss
rename to src/scss/bootstrap-dark/forms/_form-text.scss
diff --git a/src/scss/dark/bootstrap/forms/_input-group.scss b/src/scss/bootstrap-dark/forms/_input-group.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_input-group.scss
rename to src/scss/bootstrap-dark/forms/_input-group.scss
diff --git a/src/scss/dark/bootstrap/forms/_labels.scss b/src/scss/bootstrap-dark/forms/_labels.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_labels.scss
rename to src/scss/bootstrap-dark/forms/_labels.scss
diff --git a/src/scss/dark/bootstrap/forms/_validation.scss b/src/scss/bootstrap-dark/forms/_validation.scss
similarity index 100%
rename from src/scss/dark/bootstrap/forms/_validation.scss
rename to src/scss/bootstrap-dark/forms/_validation.scss
diff --git a/src/scss/dark/bootstrap/helpers/_colored-links.scss b/src/scss/bootstrap-dark/helpers/_colored-links.scss
similarity index 100%
rename from src/scss/dark/bootstrap/helpers/_colored-links.scss
rename to src/scss/bootstrap-dark/helpers/_colored-links.scss
diff --git a/src/scss/dark/bootstrap/mixins/_buttons.scss b/src/scss/bootstrap-dark/mixins/_buttons.scss
similarity index 100%
rename from src/scss/dark/bootstrap/mixins/_buttons.scss
rename to src/scss/bootstrap-dark/mixins/_buttons.scss
diff --git a/src/scss/dark/bootstrap/mixins/_color-scheme.scss b/src/scss/bootstrap-dark/mixins/_color-scheme.scss
similarity index 100%
rename from src/scss/dark/bootstrap/mixins/_color-scheme.scss
rename to src/scss/bootstrap-dark/mixins/_color-scheme.scss
diff --git a/src/scss/dark/bootstrap/mixins/_forms.scss b/src/scss/bootstrap-dark/mixins/_forms.scss
similarity index 100%
rename from src/scss/dark/bootstrap/mixins/_forms.scss
rename to src/scss/bootstrap-dark/mixins/_forms.scss
diff --git a/src/scss/dark/bootstrap/mixins/_table-variants.scss b/src/scss/bootstrap-dark/mixins/_table-variants.scss
similarity index 100%
rename from src/scss/dark/bootstrap/mixins/_table-variants.scss
rename to src/scss/bootstrap-dark/mixins/_table-variants.scss
diff --git a/src/scss/dark/bootstrap/utilities/_api-all.scss b/src/scss/bootstrap-dark/utilities/_api-all.scss
similarity index 100%
rename from src/scss/dark/bootstrap/utilities/_api-all.scss
rename to src/scss/bootstrap-dark/utilities/_api-all.scss
diff --git a/src/scss/dark/bootstrap/utilities/_api.scss b/src/scss/bootstrap-dark/utilities/_api.scss
similarity index 100%
rename from src/scss/dark/bootstrap/utilities/_api.scss
rename to src/scss/bootstrap-dark/utilities/_api.scss
diff --git a/src/scss/dark/adminlte-dark-addon.scss b/src/scss/dark/adminlte-dark-addon.scss
new file mode 100644
index 000000000..6e1a45452
--- /dev/null
+++ b/src/scss/dark/adminlte-dark-addon.scss
@@ -0,0 +1,57 @@
+/*!
+ *   AdminLTE Dark mode Add-on v4.0.0-alpha.1
+ *   Author: Colorlib
+ *   Website: AdminLTE.io <https://adminlte.io>
+ *   License: Open source - MIT <https://opensource.org/licenses/MIT>
+ */
+
+// Configuration
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";  // defaults are here
+@import "../bootstrap-dark/variables-alt";  // dark color set is here
+@import "bootstrap/scss/mixins";
+@import "../bootstrap-dark/mixins";
+@import "bootstrap/scss/utilities";
+@import "../bootstrap-dark/utilities";
+@import "../bootstrap-dark/patch";  // missing from BS, unsupported patch/hack
+
+// stylelint-disable no-invalid-position-at-import-rule
+
+:root { color-scheme: dark; }
+
+// Layout & components
+@import "../bootstrap-dark/root";
+@import "../bootstrap-dark/reboot";
+@import "../bootstrap-dark/type";
+@import "../bootstrap-dark/images";
+@import "../bootstrap-dark/tables";
+@import "../bootstrap-dark/forms";
+@import "../bootstrap-dark/buttons";
+@import "../bootstrap-dark/dropdown";
+@import "../bootstrap-dark/button-group";
+@import "../bootstrap-dark/nav";
+@import "../bootstrap-dark/navbar";
+@import "../bootstrap-dark/card";
+@import "../bootstrap-dark/accordion";
+@import "../bootstrap-dark/breadcrumb";
+@import "../bootstrap-dark/pagination";
+@import "../bootstrap-dark/badge";
+@import "../bootstrap-dark/alert";
+@import "../bootstrap-dark/progress";
+@import "../bootstrap-dark/list-group";
+@import "../bootstrap-dark/close";
+@import "../bootstrap-dark/toasts";
+@import "../bootstrap-dark/modal";
+@import "../bootstrap-dark/tooltip";
+@import "../bootstrap-dark/popover";
+@import "../bootstrap-dark/carousel";
+@import "../bootstrap-dark/offcanvas";
+
+// Helpers
+@import "../bootstrap-dark/helpers";
+
+// Utilities
+@import "../bootstrap-dark/utilities/api";
+
+// Unique to dark-mode
+@import "../bootstrap-dark/dark";
diff --git a/src/scss/dark/adminlte-dark.scss b/src/scss/dark/adminlte-dark.scss
deleted file mode 100644
index 265eaef8d..000000000
--- a/src/scss/dark/adminlte-dark.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-// Used https://github.com/vinorodrigues/bootstrap-dark-5/releases/tag/v1.0.0
-
-// Dark mode Enable using prefers-color-scheme
-$enable-dark-mode:            true;
-
-// AdminLTE
-// ---------------------------------------------------
-@import "../adminlte";
-// stylelint-disable no-invalid-position-at-import-rule
-@include color-scheme-alt(alternative-color-scheme($default-color-scheme)) {
-  /*
-  * ---------- Dark Mode ------------------------------------------------------
-  */
-
-  // Layout & components
-  @import "bootstrap/root";
-  @import "bootstrap/reboot";
-  @import "bootstrap/type";
-  @import "bootstrap/images";
-  // no colors in containers
-  // no colors in grid
-  @import "bootstrap/tables";
-  @import "bootstrap/forms";
-  @import "bootstrap/buttons";
-  // no colors in transitions
-  @import "bootstrap/dropdown";
-  @import "bootstrap/button-group";
-  @import "bootstrap/nav";
-  @import "bootstrap/navbar";
-  @import "bootstrap/card";
-  @import "bootstrap/accordion";
-  @import "bootstrap/breadcrumb";
-  @import "bootstrap/pagination";
-  @import "bootstrap/badge";
-  @import "bootstrap/alert";
-  @import "bootstrap/progress";
-  @import "bootstrap/list-group";
-  @import "bootstrap/close";
-  @import "bootstrap/toasts";
-  @import "bootstrap/modal";
-  @import "bootstrap/tooltip";
-  @import "bootstrap/popover";
-  @import "bootstrap/carousel";
-  // no colors in spinners
-  @import "bootstrap/offcanvas";
-
-  // Helpers
-  @import "bootstrap/helpers";
-
-  // Utilities
-  @import "bootstrap/utilities/api";
-
-  // Unique to dark-mode
-  @import "bootstrap/dark";
-
-  @import "parts/core";
-}
-
-// Additional Global Utilities
-@import "../dark/bootstrap/utilities/api-all";