diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 96dfb178d..7d35569ed 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -258,6 +258,7 @@ $authoringMode = $dockercfg['DOCKER_AUTHORING_MODE'] == "yes" ? true : false;
 $authoring     = $authoringMode ? 'advanced' : 'noshow';
 $disableEdit   = $authoringMode ? 'false' : 'true';
 $showAdditionalInfo = '';
+$bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.switchbutton.css")?>">
@@ -266,7 +267,7 @@ $showAdditionalInfo = '';
 
 <style>
 .noshow,.advanced{display:none}
-.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none}
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:<?=$bgcolor?>}
 span.boxed{display:inline-block;line-height:normal;white-space:normal;width:56%}
 span.cpu,label.checkbox{display:inline-block;width:32px}
 span.ct{display:inline-block;width:230px}
@@ -425,9 +426,10 @@ function addConfigPopup() {
     }
   });
   $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $(".ui-dialog .ui-dialog-title").css('text-align','center').css('width', "100%");
-  $(".ui-dialog .ui-dialog-content").css('padding-top','15px').css('vertical-align','bottom');
-  $(".ui-button-text").css('padding','0px 5px');
+  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
+  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
+  $(".ui-widget-content").css({'background':'<?=$bgcolor?>'});
+  $(".ui-button-text").css({'padding':'0px 5px'});
 }
 
 function editConfigPopup(num,disabled) {
@@ -509,9 +511,10 @@ function editConfigPopup(num,disabled) {
     }
   });
   $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $(".ui-dialog .ui-dialog-title").css('text-align','center').css('width', "100%");
-  $(".ui-dialog .ui-dialog-content").css('padding-top','15px').css('vertical-align','bottom');
-  $(".ui-button-text").css('padding','0px 5px');
+  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
+  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
+  $(".ui-widget-content").css({'background':'<?=$bgcolor?>'});
+  $(".ui-button-text").css({'padding':'0px 5px'});
   $('.desc_readmore').readmore({maxHeight:10});
 }
 
diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index c389029d9..a415c352f 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -15,7 +15,11 @@ Cond="($pool_devices || $var['fsState']=='Stopped')"
  * all copies or substantial portions of the Software.
  */
 ?>
+<?
+$bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
+?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
+<link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
 <style>
 table.divider{margin-top:2px}
 </style>
@@ -52,9 +56,10 @@ function addPoolPopup() {
     }
   });
   $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $(".ui-dialog .ui-dialog-title").css('text-align','center').css('width', "100%");
-  $(".ui-dialog .ui-dialog-content").css('padding-top','15px').css('vertical-align','bottom');
-  $(".ui-button-text").css('padding','0px 5px');
+  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
+  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
+  $(".ui-widget-content").css({'background':'<?=$bgcolor?>'});
+  $(".ui-button-text").css({'padding':'0px 5px'});
 }
 
 function pool_status() {
@@ -95,7 +100,7 @@ pool_status();
 <form markdown="1" method="POST" action="/update.htm" target="progressFrame">
 <input type="hidden" name="changeSlots" value="apply">
 _(Name)_:
-: <input type="text" name="poolName" maxlength="40" value="">
+: <input type="text" name="poolName" maxlength="40" value="<?=count($pools)==0?'cache':''?>">
 
 _(Slots)_:
 : <select name="poolSlots">