diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Cerulean.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Cerulean.css
deleted file mode 100644
index 1271be5a..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Cerulean.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Cosmo.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Cosmo.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Cosmo.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Darkly.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Darkly.css
deleted file mode 100644
index 8e9197de..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Darkly.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* CSS overrides */
-input[type="text"], textarea {
-    background-color: #fff;
-}
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Default.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Default.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Default.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Flatly.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Flatly.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Flatly.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Journal.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Journal.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Journal.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Litera.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Litera.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Litera.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Lumen.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Lumen.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Lumen.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Lux.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Lux.css
deleted file mode 100644
index c6d209e4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Lux.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/* CSS overrides */
-body {
-    padding-top: 11rem;
-}
-
-.btn-secondary {
-    color: rgb(255, 255, 255);
-    background-color: rgb(0, 0, 0);
-}
-
-.btn {
-    padding: 0.75rem 0.75rem;
-}
-
-.table td, .table th {
-    padding: 1.0rem;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Materia.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Materia.css
deleted file mode 100644
index 21695b25..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Materia.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* CSS overrides */
-.btn {
-    font-size: 0.8rem;
-}
-
-body {
-    padding-top: 8rem;
-}
-
-[contenteditable].form-control, [type=email].form-control, [type=password].form-control, [type=tel].form-control, [type=text].form-control, input.form-control, input[type=email], input[type=number], input[type=password], input[type=text], textarea, textarea.form-control {
-    box-shadow: inset 0 -1px 0 #ddd !important;
-    transition: box-shadow .2s !important;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Minty.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Minty.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Minty.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Morph.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Morph.css
deleted file mode 100644
index ac7c241d..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Morph.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* CSS overrides */
-.btn {
-    padding: 0.9rem 0.9rem;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Pulse.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Pulse.css
deleted file mode 100644
index fdd8550f..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Pulse.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* CSS overrides */
-body{
-    padding-top: 9rem;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Quartz.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Quartz.css
deleted file mode 100644
index ec20f551..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Quartz.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* CSS overrides */
-.btn {
-    padding: 0.5rem 0.8rem;
-}
-
-.table .form-control {
-    background-color: transparent !important;
-}
-
-.table .form-select {
-    background-color: transparent !important;
-}
-
-option {
-    background-color: #6f749c !important;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Sandstone.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Sandstone.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Sandstone.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Simplex.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Simplex.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Simplex.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Sketchy.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Sketchy.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Sketchy.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Slate.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Slate.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Slate.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Solar.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Solar.css
deleted file mode 100644
index d39d1ce7..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Solar.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* CSS overrides */
-.card-body {
-    background-color: #073642;
-}
-
-card-header {
-    background-color: #d8b64c;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Spacelab.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Spacelab.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Spacelab.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Superhero.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Superhero.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Superhero.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Theme.css
deleted file mode 100644
index 93050da5..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Theme.css
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-body {
-    padding-top: 7rem;
-}
-
-.table > :not(caption) > * > * {
-    box-shadow: none;
-}
-
-.table .form-control {
-    background-color: #ffffff !important;
-    border-width: 0.5px !important;
-    border-bottom-color: #ccc !important;
-}
-
-.table .form-select {
-    background-color: #ffffff !important;
-    border-width: 0.5px !important;
-    border-bottom-color: #ccc !important;
-}
-
-.table .btn-primary {
-    background-color: var(--bs-primary);
-}
-
-.table .btn-secondary {
-    background-color: var(--bs-secondary);
-}
-
-.alert-dismissible .btn-close {
-    z-index: 1;
-}
-
-.controls {
-    z-index: 2000;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    margin-right: 10px;
-}
-
-.app-menu .nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-.app-menu .nav-item a {
-    border-radius: 4px;
-    height: 3rem;
-    display: flex;
-    align-items: center;
-    line-height: 3rem;
-    padding-left: 1rem;
-}
-
-.app-menu .nav-item a.active {
-    background-color: rgba(255,255,255,0.25);
-    color: white;
-}
-
-.app-menu .nav-item a:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.app-menu .nav-link .oi {
-    width: 1.5rem;
-    font-size: 1.1rem;
-    vertical-align: text-top;
-    top: -2px;
-}
-
-.navbar-toggler {
-    background-color: rgba(255, 255, 255, 0.1);
-    margin: .5rem;
-}
-
-@media (max-width: 767px) {
-
-    .app-menu {
-        width: 100%
-    }
-
-    .navbar {
-        position: fixed;
-        top: 60px;
-        width: 100%;
-    }
-
-    .controls {
-        height: 60px;
-        top: 15px;
-        position: fixed;
-        top: 0px;
-        width: 100%;
-        background-color: rgb(0, 0, 0);
-    }
-
-    .controls-group {
-        float: right;
-        margin-right: 25px;
-    }
-
-    .content {
-        position: relative;
-        top: 60px;
-    }
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/United.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/United.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/United.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Vapor.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Vapor.css
deleted file mode 100644
index cd55f9be..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Vapor.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* CSS overrides */
-.card {
-    background-color: #1a0a33;
-}
-
-.table .form-control {
-    background-color: transparent !important;
-}
-
-.table .form-select {
-    background-color: transparent !important;
-}
-
-option {
-    background-color: #ad82fc !important;
-}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Yeti.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Yeti.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Yeti.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Zephyr.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Zephyr.css
deleted file mode 100644
index 045bf4c4..00000000
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Theme.Bootswatch/Zephyr.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS overrides */