diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index f2cd28a90..728f4dcf0 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -49,10 +49,9 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/context.standalone.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.sweetalert.css")?>">
 
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-color-pallet.css")?>">
+<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-color-palette.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-base.css")?>">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-{$display['theme']}.css")?>">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/base-dynamix.css")?>">
+<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-dynamix.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/dynamix-{$display['theme']}.css")?>">
 <style>
 <?if (empty($display['width'])):?>
diff --git a/emhttp/plugins/dynamix/styles/default-color-pallet.css b/emhttp/plugins/dynamix/styles/default-color-palette.css
similarity index 100%
rename from emhttp/plugins/dynamix/styles/default-color-pallet.css
rename to emhttp/plugins/dynamix/styles/default-color-palette.css
diff --git a/emhttp/plugins/dynamix/styles/base-dynamix.css b/emhttp/plugins/dynamix/styles/default-dynamix.css
similarity index 100%
rename from emhttp/plugins/dynamix/styles/base-dynamix.css
rename to emhttp/plugins/dynamix/styles/default-dynamix.css
diff --git a/emhttp/plugins/dynamix/styles/dynamix-azure.css b/emhttp/plugins/dynamix/styles/dynamix-azure.css
deleted file mode 100644
index 9df3fae57..000000000
--- a/emhttp/plugins/dynamix/styles/dynamix-azure.css
+++ /dev/null
@@ -1,22 +0,0 @@
-:root {
-    --dynamix-ui-dropdownchecklist-color: #606e7f;
-    --dynamix-ui-dropdownchecklist-color-alt1: var(--gray-900);
-    --dynamix-ui-dropdownchecklist-color-alt2: var(--gray-500);
-    --dynamix-ui-dropdownchecklist-dropcontainer-border-color: #0072c6;
-    --dynamix-ui-state-active-border-color: #0072c6;
-
-    --dynamix-sweet-alert-text-color: #606e7f;
-    --dynamix-sweet-alert-icon-bg-color: #e4e2e4;
-
-    --dynamix-tablesorter-thead-row-border-color: #606e7f;
-    --dynamix-tablesorter-thead-th-text-color: #606e7f;
-    --dynamix-tablesorter-thead-th-bg-color: #e4e2e4;
-
-    --dynamix-tablesorter-tbody-row-border-color: #edeaef;
-
-    --dynamix-select-bg-color: #1c1b1b;
-    --dynamix-select-box-shadow: 0 2px 0 #1f1f1f, inset 0 -1px #000000;
-    --dynamix-select-disabled-bg-color: #383a34;
-
-    --dynamix-box-text-color: #606e7f;
-}
diff --git a/emhttp/plugins/dynamix/styles/dynamix-black.css b/emhttp/plugins/dynamix/styles/dynamix-black.css
deleted file mode 100644
index 58bb6de60..000000000
--- a/emhttp/plugins/dynamix/styles/dynamix-black.css
+++ /dev/null
@@ -1 +0,0 @@
-/* default CSS var values set in base-dynamix.css */
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/styles/dynamix-gray.css b/emhttp/plugins/dynamix/styles/dynamix-gray.css
deleted file mode 100644
index e706bd16c..000000000
--- a/emhttp/plugins/dynamix/styles/dynamix-gray.css
+++ /dev/null
@@ -1,25 +0,0 @@
-:root {
-    --dynamix-ui-dropdownchecklist-color: #606e7f;
-    --dynamix-ui-dropdownchecklist-color-alt1: var(--gray-900);
-    --dynamix-ui-dropdownchecklist-dropcontainer-border-color: #0072c6;
-    --dynamix-ui-state-active-border-color: #0072c6;
-
-    --dynamix-sweet-alert-text-color: #606e7f;
-    --dynamix-sweet-alert-icon-bg-color: #1b1d1b;
-
-    --dynamix-tablesorter-thead-row-border-color: #606e7f;
-    --dynamix-tablesorter-thead-th-text-color: var(--gray-500);
-    --dynamix-tablesorter-thead-th-bg-color: #1b1d1b;
-
-    --dynamix-tablesorter-tbody-row-alt-bg-color: #121510;
-    --dynamix-tablesorter-tbody-row-bg-color: #1b1d1b;
-    --dynamix-tablesorter-tbody-row-border-color: var(--table-alt-border-color); /* #edeaef */
-
-    --dynamix-select-bg-color: #1c1b1b;
-    --dynamix-select-box-shadow: 0 2px 0 #1f1f1f, inset 0 -1px #000000;
-    --dynamix-select-disabled-bg-color: #383a34;
-    --dynamix-select-disabled-border-color: #808080;
-    --dynamix-select-disabled-color: #808080;
-
-    --dynamix-box-text-color: #606e7f;
-}
diff --git a/emhttp/plugins/dynamix/styles/dynamix-white.css b/emhttp/plugins/dynamix/styles/dynamix-white.css
deleted file mode 100644
index 315357d17..000000000
--- a/emhttp/plugins/dynamix/styles/dynamix-white.css
+++ /dev/null
@@ -1,21 +0,0 @@
-:root {
-    --dynamix-ui-dropdownchecklist-color: #1c1b1b;
-    --dynamix-ui-dropdownchecklist-color-alt1: #e8e8e8;
-    --dynamix-ui-dropdownchecklist-color-alt2: #a2a2a2;
-
-    --dynamix-sweet-alert-text-color: #1c1b1b;
-    --dynamix-sweet-alert-icon-bg-color: #f2f2f2;
-
-    --dynamix-tablesorter-thead-row-border-color: #e3e3e3;
-    --dynamix-tablesorter-thead-th-text-color: #1c1b1b;
-    --dynamix-tablesorter-thead-th-bg-color: #e8e8e8;
-
-    --dynamix-tablesorter-tbody-row-alt-bg-color: #ededed;
-    --dynamix-tablesorter-tbody-row-bg-color: #f2f2f2;
-    --dynamix-tablesorter-tbody-row-border-color: #e3e3e3;
-
-    --dynamix-select-box-shadow: 0 2px 0 #ff8c2f, inset 0 -1px #f2f2f2;
-    --dynamix-select-disabled-bg-color: #e8e8e8;
-    --dynamix-select-disabled-border-color: #808080;
-    --dynamix-select-disabled-color: #1c1b1b;
-}
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/theme-azure.css
similarity index 72%
rename from emhttp/plugins/dynamix/styles/default-azure.css
rename to emhttp/plugins/dynamix/styles/theme-azure.css
index 45c0baee8..36961cff2 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/theme-azure.css
@@ -83,4 +83,28 @@
 
     --input-border-color: var(--blue-800); /* Condensed from: #0072c6 */
     --input-bg-color: var(--mild-background-color);
+    /* /End vars used in default-base */
+
+    /* Set vars for default-dynamix */
+    --dynamix-ui-dropdownchecklist-color: var(--theme-azure--cyan-400);
+    --dynamix-ui-dropdownchecklist-color-alt1: var(--gray-900);
+    --dynamix-ui-dropdownchecklist-color-alt2: var(--gray-500);
+    --dynamix-ui-dropdownchecklist-dropcontainer-border-color: var(--blue-800); /* Condensed from: #0072c6 */
+    --dynamix-ui-state-active-border-color: var(--blue-800); /* Condensed from: #0072c6 */
+
+    --dynamix-sweet-alert-text-color: var(--theme-azure--cyan-400);
+    --dynamix-sweet-alert-icon-bg-color: var(--gray-150); /* Originally #e4e2e4 */
+
+    --dynamix-tablesorter-thead-row-border-color: var(--theme-azure--cyan-400);
+    --dynamix-tablesorter-thead-th-text-color: var(--theme-azure--cyan-400);
+    --dynamix-tablesorter-thead-th-bg-color: var(--gray-150); /* Originally #e4e2e4 */
+
+    --dynamix-tablesorter-tbody-row-border-color: var(--theme-azure--gray-150);
+
+    --dynamix-select-bg-color: var(--black);
+    --dynamix-select-box-shadow: 0 2px 0 #1f1f1f, inset 0 -1px #000000;
+    --dynamix-select-disabled-bg-color: var(--gray-700); /* Originally #383a34 */
+
+    --dynamix-box-text-color: var(--theme-azure--cyan-400);
+    /* /End vars for default-dynamix */
 }
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/theme-black.css
similarity index 96%
rename from emhttp/plugins/dynamix/styles/default-black.css
rename to emhttp/plugins/dynamix/styles/theme-black.css
index f5d6bba36..ed2f9ec8f 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/theme-black.css
@@ -66,4 +66,7 @@
 
     --input-border-color: var(--gray-200);
     --input-bg-color: transparent;
+    /* /End vars used in default-base */
+
+    /* dynamix CSS var values set in base-dynamix.css */
 }
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/theme-gray.css
similarity index 70%
rename from emhttp/plugins/dynamix/styles/default-gray.css
rename to emhttp/plugins/dynamix/styles/theme-gray.css
index a2a4ba66c..7b81cff1e 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/theme-gray.css
@@ -79,4 +79,31 @@
     --input-bg-color: var(--theme-gray--black-alt);
     --focus-input-border-color: var(--blue-700);
     --focus-input-background-color: var(--mild-background-color);
+    /* /End vars used in default-base */
+
+    /* Set vars for default-dynamix */
+    --dynamix-ui-dropdownchecklist-color: var(--theme-gray--cyan-300);
+    --dynamix-ui-dropdownchecklist-color-alt1: var(--gray-900);
+    --dynamix-ui-dropdownchecklist-dropcontainer-border-color: var(--blue-700);
+    --dynamix-ui-state-active-border-color: var(--blue-700);
+
+    --dynamix-sweet-alert-text-color: var(--theme-gray--cyan-300);
+    --dynamix-sweet-alert-icon-bg-color: var(--black);
+
+    --dynamix-tablesorter-thead-row-border-color: var(--theme-gray--cyan-300);
+    --dynamix-tablesorter-thead-th-text-color: var(--gray-500);
+    --dynamix-tablesorter-thead-th-bg-color: var(--black);
+
+    --dynamix-tablesorter-tbody-row-alt-bg-color: #121510;
+    --dynamix-tablesorter-tbody-row-bg-color: var(--black);
+    --dynamix-tablesorter-tbody-row-border-color: var(--table-alt-border-color); /* #edeaef */
+
+    --dynamix-select-bg-color: var(--black);
+    --dynamix-select-box-shadow: 0 2px 0 #1f1f1f, inset 0 -1px #000000;
+    --dynamix-select-disabled-bg-color: var(--gray-700); /* Originally #383a34 */
+    --dynamix-select-disabled-border-color: var(--gray-500);
+    --dynamix-select-disabled-color: var(--gray-500);
+
+    --dynamix-box-text-color: var(--theme-gray--cyan-300);
+    /* /End vars for default-dynamix */
 }
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/theme-white.css
similarity index 69%
rename from emhttp/plugins/dynamix/styles/default-white.css
rename to emhttp/plugins/dynamix/styles/theme-white.css
index ff4325fdb..efa18b05c 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/theme-white.css
@@ -67,4 +67,27 @@
 
     --input-border-color: var(--black);
     --input-bg-color: transparent;
+    /* /End vars used in default-base */
+
+    /* Set vars for default-dynamix */
+    --dynamix-ui-dropdownchecklist-color: var(--black);
+    --dynamix-ui-dropdownchecklist-color-alt1: var(--gray-150);
+    --dynamix-ui-dropdownchecklist-color-alt2: var(--gray-400); /* Originally #a2a2a2 */
+
+    --dynamix-sweet-alert-text-color: var(--black);
+    --dynamix-sweet-alert-icon-bg-color: var(--gray-100);
+
+    --dynamix-tablesorter-thead-row-border-color: var(--gray-200); /* Originally #e3e3e3 */
+    --dynamix-tablesorter-thead-th-text-color: var(--black);
+    --dynamix-tablesorter-thead-th-bg-color: var(--gray-150);
+
+    --dynamix-tablesorter-tbody-row-alt-bg-color: var(--gray-150); /* Originally #ededed */
+    --dynamix-tablesorter-tbody-row-bg-color: var(--gray-100);
+    --dynamix-tablesorter-tbody-row-border-color: var(--gray-200); /* Originally #e3e3e3 */
+
+    --dynamix-select-box-shadow: 0 2px 0 var(--orange-500), inset 0 -1px var(--gray-100);
+    --dynamix-select-disabled-bg-color: var(--gray-150);
+    --dynamix-select-disabled-border-color: var(--gray-500);
+    --dynamix-select-disabled-color: var(--black);
+    /* /End vars for default-dynamix */
 }