diff --git a/emhttp/plugins/dynamix.apcupsd/UPSsettings.page b/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
index 973a5e297..cdde2cf31 100644
--- a/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
+++ b/emhttp/plugins/dynamix.apcupsd/UPSsettings.page
@@ -5,8 +5,8 @@ Icon="icon-ups"
 Tag="battery-3"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
  *
  * This program is free software; you can redistribute it and/or
@@ -22,13 +22,6 @@ Tag="battery-3"
 $sName = "dynamix.apcupsd";
 $cfg = parse_plugin_cfg($sName);
 ?>
-
-<style>
-table.ups thead tr th{width:16.6%;padding-left:10px}
-table.ups tbody tr td{padding-left:10px;font-weight:bold}
-tr.ups{height:3rem;line-height:3rem}
-i.ups{margin-right:8px}
-</style>
 <script>
 function toggleCustomCable(form) {
   var readonly = form.UPSCABLE.value != 'custom';
diff --git a/emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css b/emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css
new file mode 100644
index 000000000..d8b1dbb96
--- /dev/null
+++ b/emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css
@@ -0,0 +1,4 @@
+table.ups thead tr th{width:16.6%;padding-left:10px}
+table.ups tbody tr td{padding-left:10px;font-weight:bold}
+tr.ups{height:3rem;line-height:3rem}
+i.ups{margin-right:8px}
diff --git a/emhttp/plugins/dynamix.docker.manager/AddContainer.page b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
index 7562c3376..9afe0734d 100644
--- a/emhttp/plugins/dynamix.docker.manager/AddContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
@@ -3,9 +3,9 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerContainers.page b/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
index 42e9faab3..516c198d0 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerContainers.page
@@ -29,20 +29,7 @@ $cpus    = cpu_list();
 <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')?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
-<style>
-.basic{display:block}
-.advanced{display:none;white-space:nowrap}
-.log{cursor:zoom-in}
-.exec{cursor:pointer}
-table#docker_containers{text-align:left}
-th.five{width:5%}
-th.nine{width:9%}
-th.load{width:140px}
-input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
-table tbody td{line-height:normal}
-i.mover{margin-right:8px;display:none}
-#resetsort{margin-left:12px;display:inline-block;width:32px}
-</style>
+
 <table id="docker_containers" class="tablesorter shift">
 <thead><tr><th><a id="resetsort" class="nohand" onclick="resetSorting()" title="_(Reset sorting)_"><i class="fa fa-th-list"></i></a>_(Application)_</th><th>_(Version)_</th><th>_(Network)_</th><th>_(Port Mappings)_ <small>(_(App to Host)_)</small></th><th>_(Volume Mappings)_ <small>(_(App to Host)_)</small></th><th class="load advanced">_(CPU & Memory load)_</th><th class="nine">_(Autostart)_</th><th class="five">_(Uptime)_</th></tr></thead>
 <tbody id="docker_list"><tr><td colspan='8'></td></tr></tbody>
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 9ec4e396d..d7983e98f 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -106,31 +106,6 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-.errortext{color:#EF3D47;display:none;margin-left:20px}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.basic{display:inline-block}
-.advanced{display:none}
-select.mask{min-width:0;margin:0 10px 0 4px}
-select.net{min-width:0;margin:0 4px 0 2px}
-select option.hide{display:none}
-input.ip4{width:100px;margin:0 4px 0 1px}
-input.ip6{width:140px;margin:0 4px}
-input.gw4{width:100px;margin:0 4px 0 1px}
-input.gw6{width:160px;margin:0 4px}
-input.pool6{width:40px;margin:0 4px 0 1px}
-span.net{margin-left:4px;margin-right:2px}
-span.ip4{display:inline-block;width:260px}
-span.ip6{display:inline-block;width:310px}
-span.gw4{display:inline-block;width:200px}
-span.gw6{display:inline-block;width:270px}
-span.nonexist{margin-left:20px}
-<?if (strstr('white,azure',$display['theme'])):?>
-span.disabled{color:#B0B0B0}
-<?else:?>
-span.disabled{color:#404040}
-<?endif;?>
-</style>
 <span class="status vhshift"><input type="checkbox" class="advancedview"></span>
 
 <form markdown="1" id="settingsForm" name="settingsForm" method="POST" action="/update.php" target="progressFrame" onsubmit="return prepareDocker(this)">
diff --git a/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page b/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
index 764db4758..502df4806 100644
--- a/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/UpdateContainer.page
@@ -3,9 +3,9 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index 4651b2951..79f67266f 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
 /* Copyright 2005-2023, Lime Technology
- * Copyright 2015-2023, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  * Copyright 2012-2023, Bergware International.
+ * Copyright 2015-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -277,18 +277,6 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
 
-<style>
-.noshow,.advanced{display:none}
-.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:<?=$bgcolor?>}
-.required:after{content:" *";color:#E80000}
-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}
-span.net{display:inline-block;width:120px}
-span.ip{display:inline-block;width:160px}
-dl,dt,dd{line-height:normal!important}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/webGui/javascript/jquery.filetree.js')?>" charset="utf-8"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/dynamix.vm.manager.js')?>"></script>
@@ -406,8 +394,6 @@ function addConfigPopup() {
     resizable: false,
     width: 800,
     modal: true,
-    show : {effect: 'fade' , duration: 250},
-    hide : {effect: 'fade' , duration: 250},
     buttons: {
     "_(Add)_": function() {
         $(this).dialog("close");
@@ -439,11 +425,10 @@ function addConfigPopup() {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 
 function editConfigPopup(num,disabled) {
@@ -480,8 +465,6 @@ function editConfigPopup(num,disabled) {
     resizable: false,
     width: 800,
     modal: true,
-    show: {effect:'fade', duration: 250},
-    hide: {effect:'fade', duration: 250},
     buttons: {
     "_(Save)_": function() {
         $(this).dialog("close");
@@ -522,11 +505,10 @@ function editConfigPopup(num,disabled) {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
-  $(".ui-button-text").css({'padding':'0px 5px'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
   $('.desc_readmore').readmore({maxHeight:10});
 }
 
@@ -1009,7 +991,7 @@ _(Password Mask)_:
 <input type="hidden" name="confRequired[]" value="{7}">
 <input type="hidden" name="confMask[]" value="{8}">
 <span class="{11}">{0}:</span>
-: <span class="boxed"><input type="text" name="confValue[]" default="{2}" value="{9}" autocomplete="off" spellcheck="false" {11}>{10}<br><span class='orange-text'>{12}: {1}</span><br><span class="orange-text">{4}</span><br>
+: <span class="boxed"><input type="text" class="setting_input" name="confValue[]" default="{2}" value="{9}" autocomplete="off" spellcheck="false" {11}>{10}<br><span class='orange-text'>{12}: {1}</span><br><span class="orange-text">{4}</span><br></span>
 </div>
 
 <div markdown="1" id="templateAllocations" style="display:none">
diff --git a/emhttp/plugins/dynamix.docker.manager/javascript/docker.js b/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
index 39f5fd31f..680118fd7 100644
--- a/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
+++ b/emhttp/plugins/dynamix.docker.manager/javascript/docker.js
@@ -66,8 +66,6 @@ function popupWithIframe(title, cmd, reload, func) {
     height: Math.max(window.innerHeight*3/5,600),
     resizable:true,
     modal:true,
-    show:{effect:'fade', duration:250},
-    hide:{effect:'fade', duration:250},
     open:function(ev, ui) {
       $('#myIframe').attr('src', cmd);
     },
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
new file mode 100644
index 000000000..e6518eb71
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css
@@ -0,0 +1,9 @@
+.noshow,.advanced{display:none}
+.required:after{content:" *";color:#E80000}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
+span.cpu,label.checkbox{display:inline-block;width:32px}
+span.ct{display:inline-block;width:230px}
+span.net{display:inline-block;width:120px}
+span.ip{display:inline-block;width:160px}
+dl,dt,dd{line-height:normal!important}
+input.setting_input{margin-right:50px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css
new file mode 100644
index 000000000..f57f754f0
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css
@@ -0,0 +1,12 @@
+.basic{display:block}
+.advanced{display:none;white-space:nowrap}
+.log{cursor:zoom-in}
+.exec{cursor:pointer}
+table#docker_containers{text-align:left}
+th.five{width:5%}
+th.nine{width:9%}
+th.load{width:140px}
+input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
+table tbody td{line-height:normal}
+i.mover{margin-right:8px;display:none}
+#resetsort{margin-left:12px;display:inline-block;width:32px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css
new file mode 100644
index 000000000..d60555212
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css
@@ -0,0 +1,2 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#B0B0B0}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css
new file mode 100644
index 000000000..97dd4a600
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css
@@ -0,0 +1,2 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#404040}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css
new file mode 100644
index 000000000..97dd4a600
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css
@@ -0,0 +1,2 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#404040}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css
new file mode 100644
index 000000000..d60555212
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css
@@ -0,0 +1,2 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#B0B0B0}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css
new file mode 100644
index 000000000..b4db05070
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css
@@ -0,0 +1,17 @@
+.errortext{color:#EF3D47;display:none;margin-left:20px}
+.basic{display:inline-block}
+.advanced{display:none}
+select.mask{min-width:0;margin:0 10px 0 4px}
+select.net{min-width:0;margin:0 4px 0 2px}
+select option.hide{display:none}
+input.ip4{width:100px;margin:0 4px 0 1px}
+input.ip6{width:140px;margin:0 4px}
+input.gw4{width:100px;margin:0 4px 0 1px}
+input.gw6{width:160px;margin:0 4px}
+input.pool6{width:40px;margin:0 4px 0 1px}
+span.net{margin-left:4px;margin-right:2px}
+span.ip4{display:inline-block;width:260px}
+span.ip6{display:inline-block;width:310px}
+span.gw4{display:inline-block;width:200px}
+span.gw6{display:inline-block;width:270px}
+span.nonexist{margin-left:20px}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css
new file mode 100644
index 000000000..5bfde958d
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css
new file mode 100644
index 000000000..87419de0b
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css
@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}
diff --git a/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
new file mode 100644
index 000000000..e6518eb71
--- /dev/null
+++ b/emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css
@@ -0,0 +1,9 @@
+.noshow,.advanced{display:none}
+.required:after{content:" *";color:#E80000}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
+span.cpu,label.checkbox{display:inline-block;width:32px}
+span.ct{display:inline-block;width:230px}
+span.net{display:inline-block;width:120px}
+span.ip{display:inline-block;width:160px}
+dl,dt,dd{line-height:normal!important}
+input.setting_input{margin-right:50px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css b/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css
index af78778ad..260009398 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-azure.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#f2f2f2;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #1c1c1c;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#e3e3e3;
-  color:#1c1c1c;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #1c1c1c;
-  background:#f2f2f2;
-  color:#1c1c1c;
-
-.ui-state-active{
-  background:#e8e8e8;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#f2f2f2;
-  border:1px solid #1c1c1c;
-}
-.ui-state-disabled{
-  color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#1c1c1c;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#f2f2f2;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#f2f2f2;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#e3e3e3;color:#1c1c1c;font-weight:bold}
+.ui-widget-content{border:1px solid #1c1c1c;background:#f2f2f2;color:#1c1c1c}
+.ui-state-active{background:#e8e8e8}
+.ui-dropdownchecklist-dropcontainer{background:#f2f2f2;border:1px solid #1c1c1c}
+.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#1c1c1c;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#f2f2f2;border:0px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-black.css b/emhttp/plugins/dynamix.docker.manager/styles/style-black.css
index 4757973a7..064aa4307 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-black.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-black.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#1c1c1c;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #e5e5e5;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#2b2b2b;
-  color:#f2f2f2;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #e5e5e5;
-  background:#1c1c1c;
-  color:#f2f2f2;
-
-.ui-state-active{
-  background:#262626;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#1c1c1c;
-  border:1px solid #e5e5e5;
-}
-.ui-state-disabled{
-  color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#f2f2f2;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#1c1c1c;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#1c1c1c;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #e5e5e5;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#2b2b2b;color:#f2f2f2;font-weight:bold}
+.ui-widget-content{border:1px solid #e5e5e5;background:#1c1c1c;color:#f2f2f2}
+.ui-state-active{background:#262626}
+.ui-dropdownchecklist-dropcontainer{background:#1c1c1c;border:1px solid #e5e5e5}
+.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#f2f2f2;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#1c1c1c;border:0px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css b/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css
index 4757973a7..064aa4307 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-gray.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#1c1c1c;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #e5e5e5;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#2b2b2b;
-  color:#f2f2f2;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #e5e5e5;
-  background:#1c1c1c;
-  color:#f2f2f2;
-
-.ui-state-active{
-  background:#262626;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#1c1c1c;
-  border:1px solid #e5e5e5;
-}
-.ui-state-disabled{
-  color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#f2f2f2;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#1c1c1c;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#1c1c1c;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #e5e5e5;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#2b2b2b;color:#f2f2f2;font-weight:bold}
+.ui-widget-content{border:1px solid #e5e5e5;background:#1c1c1c;color:#f2f2f2}
+.ui-state-active{background:#262626}
+.ui-dropdownchecklist-dropcontainer{background:#1c1c1c;border:1px solid #e5e5e5}
+.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#f2f2f2;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#1c1c1c;border:0px}
diff --git a/emhttp/plugins/dynamix.docker.manager/styles/style-white.css b/emhttp/plugins/dynamix.docker.manager/styles/style-white.css
index af78778ad..260009398 100644
--- a/emhttp/plugins/dynamix.docker.manager/styles/style-white.css
+++ b/emhttp/plugins/dynamix.docker.manager/styles/style-white.css
@@ -1,62 +1,14 @@
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{
-  font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{
-  color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)
-}
-.ui-dropdownchecklist .ui-state-default{
-  background:#f2f2f2;
-  border:none;
-  box-shadow:none;
-  outline:none;
-  cursor:pointer;
-  height:2.2rem;
-  line-height:2.2rem;
-}
-.ui-dropdownchecklist-group{
-  font-weight:normal;
-  font-style:italic;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector{
-  border:1px solid #1c1c1c;
-  display:inline-block;
-  cursor:pointer;
-  padding:1px 9px 1px 8px;
-}
-.ui-dropdownchecklist-selector-wrapper{
-  vertical-align:middle;
-  font-size:0;
-}
-.ui-widget-header{
-  border:none;
-  background:#e3e3e3;
-  color:#1c1c1c;
-  font-weight:bold;
-}
-.ui-widget-content{
-  border:1px solid #1c1c1c;
-  background:#f2f2f2;
-  color:#1c1c1c;
-
-.ui-state-active{
-  background:#e8e8e8;
-}
-.ui-dropdownchecklist-dropcontainer{
-  background:#f2f2f2;
-  border:1px solid #1c1c1c;
-}
-.ui-state-disabled{
-  color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5;
-}
-.ui-dropdownchecklist-indent{
-  padding-left:7px;
-}
-.ui-dropdownchecklist-text{
-  color:#1c1c1c;
-  font-size:1.3rem;
-}
-.ui-dropdownchecklist .ui-widget-content .ui-state-default{
-  background:#f2f2f2;
-  border:0px;
-}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#f2f2f2;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#e3e3e3;color:#1c1c1c;font-weight:bold}
+.ui-widget-content{border:1px solid #1c1c1c;background:#f2f2f2;color:#1c1c1c}
+.ui-state-active{background:#e8e8e8}
+.ui-dropdownchecklist-dropcontainer{background:#f2f2f2;border:1px solid #1c1c1c}
+.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#1c1c1c;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#f2f2f2;border:0px}
diff --git a/emhttp/plugins/dynamix.my.servers/Registration.page b/emhttp/plugins/dynamix.my.servers/Registration.page
index fa79d9bc9..04bb0b400 100644
--- a/emhttp/plugins/dynamix.my.servers/Registration.page
+++ b/emhttp/plugins/dynamix.my.servers/Registration.page
@@ -26,13 +26,6 @@ function my_time_now($time) {
 $regGen = (int)$var['regGen'] ?? 0;
 $trialExtensionEligible = $regGen === 0 || $regGen === 1;
 ?>
-<style>
-span.thanks{padding-left:12px;color:#6FA239;font-weight:bold;}
-span.thanks.red{color:#F0000C;}
-div.device{padding:0 12px;font-weight:normal;font-style:italic;}
-div.remark{padding:0 12px;text-align:justify;}
-</style>
-
 <?if ( (strstr($var['regTy'], "unregistered")) or ($var['regTy']=="Trial") or (strstr($var['regTy'], "no connection")) or (strstr($var['regTy'], "withdrawn")) or (strstr($var['regTy'], "expired")) ):?>
 
 <span class="thanks">_(Thank you for trying Unraid OS)_!</span>
diff --git a/emhttp/plugins/dynamix.my.servers/sheets/Registration.css b/emhttp/plugins/dynamix.my.servers/sheets/Registration.css
new file mode 100644
index 000000000..2e70df6ad
--- /dev/null
+++ b/emhttp/plugins/dynamix.my.servers/sheets/Registration.css
@@ -0,0 +1,4 @@
+span.thanks{padding-left:12px;color:#6FA239;font-weight:bold;}
+span.thanks.red{color:#F0000C;}
+div.device{padding:0 12px;font-weight:normal;font-style:italic;}
+div.remark{padding:0 12px;text-align:justify;}
diff --git a/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page b/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page
index 26af81523..551e1a89d 100644
--- a/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page
+++ b/emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page
@@ -13,14 +13,6 @@ Link='nav-user'
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-/* Additional CSS for when user supplies element */
-.ca_element_notice{padding-right:20px;width:100%;height:40px;line-height:40px;color:#e68a00;background:#feefb3;border-bottom:#e68a00 1px solid;text-align:center;font-size:1.4rem;z-index:900;}
-a.ca_PluginUpdateInstall{cursor:pointer;}
-span.ca_PluginUpdateDismiss{float:right;margin-right:20px;cursor:pointer;}
-span.bannerInfo {cursor:pointer;text-decoration:none;margin:0 12px 0 6px;}
-span.bannerInfo::before {content:"\f05a";font-family:fontAwesome;color:#e68a00;}
-</style>
 <script>
 const ca_args = {};
 
diff --git a/emhttp/plugins/dynamix.plugin.manager/Plugins.page b/emhttp/plugins/dynamix.plugin.manager/Plugins.page
index 450922e61..a86f501e9 100644
--- a/emhttp/plugins/dynamix.plugin.manager/Plugins.page
+++ b/emhttp/plugins/dynamix.plugin.manager/Plugins.page
@@ -6,8 +6,8 @@ Tabs="true"
 Code="e944"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -25,10 +25,6 @@ if (!exec("pgrep -f $docroot/plugins/dynamix.plugin.manager/scripts/plugin")) {
 $check = $notify['version'] ? 0 : 1;
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
-<style>
-#plugin_tree{width:33%;height:200px;overflow-y:scroll}
-table tbody td{line-height:normal}
-</style>
 
 <script src="<?autov('/webGui/javascript/jquery.filetree.js')?>" charset="utf-8"></script>
 <script>
diff --git a/emhttp/plugins/dynamix.plugin.manager/Update.page b/emhttp/plugins/dynamix.plugin.manager/Update.page
index d4ba5ef5f..c92cc9192 100644
--- a/emhttp/plugins/dynamix.plugin.manager/Update.page
+++ b/emhttp/plugins/dynamix.plugin.manager/Update.page
@@ -4,8 +4,8 @@ Icon="icon-update"
 Tag="upload"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -35,21 +35,6 @@ if (file_exists($changes)) {
 }
 $reboot = preg_match("/^\*\*(REBOOT REQUIRED|DOWNGRADE)/",@file_get_contents("$docroot/plugins/unRAIDServer/README.md",false,null,0,20));
 ?>
-<style>
-ul,li{margin:0;padding-top:0;padding-bottom:0}
-pre.pre{margin:30px 0}
-pre>p{margin:0;padding:0}
-pre#swaltext{height:600px!important}
-@media (max-width:960px){pre#swaltext{height:400px!important}}
-@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-@media (max-height:768px){pre#swaltext{height:400px!important}}
-@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-input[value="_(Install)_"],input[value="_(Update)_"],input[value="_(Restore)_"]{margin:0}
-<?if ($themes1):?>
-span.vhshift{margin-top:13px!important}
-<?endif;?>
-</style>
-
 <script>
 var diagnosticsFile = "";
 var nchan_diagnostics = new NchanSubscriber('/sub/diagnostics',{subscriber:'websocket'});
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css b/emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css
new file mode 100644
index 000000000..17e5f1e0d
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/PluginHelpers.css
@@ -0,0 +1,5 @@
+.ca_element_notice{padding-right:20px;width:100%;height:40px;line-height:40px;color:#e68a00;background:#feefb3;border-bottom:#e68a00 1px solid;text-align:center;font-size:1.4rem;z-index:900}
+a.ca_PluginUpdateInstall{cursor:pointer}
+span.ca_PluginUpdateDismiss{float:right;margin-right:20px;cursor:pointer}
+span.bannerInfo {cursor:pointer;text-decoration:none;margin:0 12px 0 6px}
+span.bannerInfo::before {content:"\f05a";font-family:fontAwesome;color:#e68a00}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css
new file mode 100644
index 000000000..dc21dfb02
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Plugins.css
@@ -0,0 +1,2 @@
+#plugin_tree{width:33%;height:200px;overflow-y:scroll}
+table tbody td{line-height:normal}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css
new file mode 100644
index 000000000..35e27e237
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-black.css
@@ -0,0 +1 @@
+span.vhshift{margin-top:13px!important}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css
new file mode 100644
index 000000000..35e27e237
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Update-white.css
@@ -0,0 +1 @@
+span.vhshift{margin-top:13px!important}
diff --git a/emhttp/plugins/dynamix.plugin.manager/sheets/Update.css b/emhttp/plugins/dynamix.plugin.manager/sheets/Update.css
new file mode 100644
index 000000000..b1f500365
--- /dev/null
+++ b/emhttp/plugins/dynamix.plugin.manager/sheets/Update.css
@@ -0,0 +1,9 @@
+ul,li{margin:0;padding-top:0;padding-bottom:0}
+pre.pre{margin:30px 0}
+pre>p{margin:0;padding:0}
+pre#swaltext{height:600px!important}
+@media (max-width:960px){pre#swaltext{height:400px!important}}
+@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+@media (max-height:768px){pre#swaltext{height:400px!important}}
+@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+input[value="_(Install)_"],input[value="_(Update)_"],input[value="_(Restore)_"]{margin:0}
diff --git a/emhttp/plugins/dynamix.vm.manager/AddVM.page b/emhttp/plugins/dynamix.vm.manager/AddVM.page
index d27477c0f..7db9d73fd 100644
--- a/emhttp/plugins/dynamix.vm.manager/AddVM.page
+++ b/emhttp/plugins/dynamix.vm.manager/AddVM.page
@@ -4,9 +4,9 @@ Cond="(pgrep('libvirtd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.vm.manager/UpdateVM.page b/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
index c00207fd3..1e4d5d745 100644
--- a/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
+++ b/emhttp/plugins/dynamix.vm.manager/UpdateVM.page
@@ -4,9 +4,9 @@ Cond="(pgrep('libvirtd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index f34aebf5b..4aab01721 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -112,36 +112,6 @@ if (empty($vms)) {
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
 <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-$theme.css")?>">
-<style>
-th.th1{width:25%}
-th.th2{width:15%}
-th.th3{width:80px}
-div.four{font-size:1.1rem;width:260px}
-div.four label{float:left;display:table-cell;width:25%}
-div.four label:nth-child(4n+4){float:none;clear:both}
-div.four label.cpu1{width:32%}
-div.four label.cpu2{width:26%}
-div.template,div#dialogWindow,input#upload{display:none}
-div.template,div#dialogWindow2,input#upload{display:none}
-table.domdisk thead tr th:nth-child(1){width:56%!important}
-table.domdisk thead tr th:nth-child(n+2){width:8%!important}
-table.domdisk thead tr th:nth-child(1){padding-left:72px}
-table.domdisk tbody tr td:nth-child(1){padding-left:72px}
-table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
-table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
-i.mover{margin-right:8px;display:none}
-#resetsort{margin-left:12px;display:inline-block;width:32px}
-.fileTree{background:<?=$bgcolor?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-.dropdown-menu{z-index:10001}
-</style>
-<table id="kvm_table" class="tablesorter four shift">
-<thead><tr><th class="th1"><a id="resetsort" class="nohand" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks / vCDs)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
-<tbody id="kvm_list"><tr><td colspan='8'></td></tr></tbody>
-</table>
-<input type="button" onclick="addVM()" id="btnAddVM" value="_(Add VM)_" style="display:none">
-<input type="button" onclick="startAll()" value="_(Start All)_" style="display:none">
-<input type="button" onclick="stopAll()" value="_(Stop All)_" style="display:none">
 
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/dynamix.vm.manager.js')?>"></script>
@@ -166,37 +136,38 @@ function changemedia(uuid,dev,bus,file) {
   if (file === "--select") getisoimage(uuid,dev,bus,file);
   if (file === "--eject") ajaxVMDispatch({action:"change-media", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:file}, "loadlist");
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
+  var root = "<?=$domain_cfg["MEDIADIR"]?>";
+  var match = ".iso";
   var box = $("#dialogWindow");
   box.html($("#templateISOboth").html());
-
-  box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value', file).fileTreeAttach(null,null,function(path){
-      var bits = path.substr(1).split('/');
-      var auto = bits.length>3 ? '' : share;
-      box.find('#target').val(path+auto).change();
-    });
-      box.find('#target2').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value', file2).fileTreeAttach(null,null,function(path){
-      var bits = path.substr(1).split('/');
-      var auto = bits.length>3 ? '' : share;
-      box.find('#target2').val(path+auto).change();
-    });
-    var height = 100;
-
+  box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value',file).fileTreeAttach(null,null,function(path){
+    var bits = path.substr(1).split('/');
+    var auto = bits.length>3 ? '' : share;
+    box.find('#target').val(path+auto).change();
+  });
+  box.find('#target2').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).attr('value',file2).fileTreeAttach(null,null,function(path){
+    var bits = path.substr(1).split('/');
+    var auto = bits.length>3 ? '' : share;
+    box.find('#target2').val(path+auto).change();
+  });
   box.dialog({
-    title: "Select ISOs for CDROMs",
-    resizable: false,
+    title: "_(Select ISOs for CDROMs)_",
+    height: 600,
     width: 600,
-    height: 300,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Update)_": function(){
         var target = box.find('#target');
         if (target.length) {
-          target = target.val();  
+          target = target.val();
         } else target = '';
         var target2 = box.find('#target2');
         if (target2.length) {
@@ -204,7 +175,7 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
         } else target2 = '';
         box.find('#target').prop('disabled',true);
         box.find('#target2').prop('disabled',true);
-        ajaxVMDispatch({action:"change-media-both", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:target, dev2:dev2 , bus2:bus2 , file2:target2}, "loadlist");
+        ajaxVMDispatch({action:"change-media-both", uuid:uuid, cdrom:"", dev:dev, bus:bus, file:target, dev2:dev2, bus2:bus2, file2:target2}, "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -215,25 +186,21 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){
   dialogStyle();
 }
 function getisoimage(uuid,dev,bus,file){
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
+  var root = "<?=$domain_cfg["MEDIADIR"]?>";
+  var match = ".iso";
   var box = $("#dialogWindow");
   box.html($("#templateISO").html());
-
   box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).fileTreeAttach(null,null,function(path){
-      var bits = path.substr(1).split('/');
-      var auto = bits.length>3 ? '' : share;
-      box.find('#target').val(path+auto).change();
-    });
-    var height = 100;
+    var bits = path.substr(1).split('/');
+    var auto = bits.length>3 ? '' : share;
+    box.find('#target').val(path+auto).change();
+  });
   box.dialog({
-    title: "Select ISO",
-    resizable: false,
+    title: "_(Select ISO)_",
+    height: 600,
     width: 600,
-    height: 300,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Insert)_": function(){
         var target = box.find('#target');
@@ -242,7 +209,7 @@ function getisoimage(uuid,dev,bus,file){
           if (!target ) {errorTarget(); return;}
         } else target = '';
         box.find('#target').prop('disabled',true);
-        ajaxVMDispatch({action:"change-media", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:target}, "loadlist");
+        ajaxVMDispatch({action:"change-media", uuid:uuid, cdrom:"", dev:dev, bus:bus, file:target}, "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -253,44 +220,32 @@ function getisoimage(uuid,dev,bus,file){
   dialogStyle();
 }
 function VMClone(uuid, name){
-
-  //var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
   var box = $("#dialogWindow");
-  var height = 200;
   box.html($("#templateClone").html());
-  box.find('#VMBeingCloned').html(name).change() ;
-  box.find('#target').val(name + "_clone") ;
-  document.getElementById("Free").checked = true ;
-  document.getElementById("Overwrite").checked = true ;
-  var Cancel = _("Cancel") ;
+  box.find('#VMBeingCloned').html(name).change();
+  box.find('#target').val(name + "_clone");
+  document.getElementById("Free").checked = true;
+  document.getElementById("Overwrite").checked = true;
   box.dialog({
-    title: "VM Clone",
-    resizable: false,
+    title: "_(VM Clone)_",
+    height: 330,
     width: 600,
-    height: 500,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
-      "_(Clone)_" : function(){
+      "_(Clone)_": function(){
         var target = box.find('#target');
         if (target.length) {
           target = target.val();
-          //if (!target ) {errorTarget(); return;}
+          //if (!target) {errorTarget(); return;}
         } else target = '';
-
-        var clone = box.find("#target").prop('value') ;
-        x = box.find('#Start').prop('checked') ;
-        if (x) start = 'yes' ; else start = 'no' ;
-        x = box.find('#Edit').prop('checked') ;
-        if (x) edit = 'yes' ; else edit = 'no' ;
-        x = box.find('#Overwrite').prop('checked') ;
-        if (x) overwrite = 'yes' ; else overwrite = 'no' ;
-        x = box.find('#Free').prop('checked') ;
-        if (x) free = 'yes' ; else free = 'no' ;
-        scripturl =  "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone" , name:name ,clone:clone, overwrite:overwrite , edit:edit, start,start, free:free})) ;
-        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ;
+        var clone = box.find("#target").prop('value');
+        var start = box.find('#Start').prop('checked') ? 'yes' : 'no';
+        var edit = box.find('#Edit').prop('checked') ? 'yes' : 'no';
+        var overwrite = box.find('#Overwrite').prop('checked') ? 'yes' : 'no';
+        var free = box.find('#Free').prop('checked') ? 'yes' : 'no';
+        scripturl =  "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone", name:name, clone:clone, overwrite:overwrite, edit:edit, start:start, free:free}));
+        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -300,44 +255,30 @@ function VMClone(uuid, name){
   });
   dialogStyle();
 }
-
-
 function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
- 
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow2");
+  var box = $("#dialogWindow");
   box.html($("#templatesnapshot"+opt).html());
-  var height = 200;
-  const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1) ;
-  var optiontext = Capopt + " Snapshot" ;
-  box.find('#VMName').html(name) ;
-  box.find('#targetsnap').val(snaps) ;
-  box.find('#targetsnapl').html(snaps) ;
+  const capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
+  var optiontext = capopt + " _(Snapshot)_";
+  box.find('#VMName').html(name);
+  box.find('#targetsnap').val(snaps);
+  box.find('#targetsnapl').html(snaps);
   if (getlist) {
-    var only = 1 ;
-    if (opt == "remove") only = 0;
-    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid , snapshotname:snaps, only:only}, function(data) {
-    if (data.html) {
-    box.find('#targetsnapimages').html(data.html) ; 
-    } 
+    var only = (opt == "remove") ? 0 : 1;
+    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid, snapshotname:snaps, only:only}, function(data) {
+      if (data.html) box.find('#targetsnapimages').html(data.html);
     },'json');
   }
-
- document.getElementById("targetsnaprmv").checked = true ;
- document.getElementById("targetsnaprmvmeta").checked = true ;
- document.getElementById("targetsnapkeep").checked = true ;
- document.getElementById("targetsnapfspc").checked = true ;
- 
+  document.getElementById("targetsnaprmv").checked = true;
+  document.getElementById("targetsnaprmvmeta").checked = true;
+  document.getElementById("targetsnapkeep").checked = true;
+  document.getElementById("targetsnapfspc").checked = true;
   box.dialog({
-    title: "_("+optiontext+ ")_",
-    resizable: false,
+    title: optiontext,
+    height: 330,
     width: 600,
-    height: 500,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
-    
     buttons: {
       "_(Proceed)_": function(){
         var target = box.find('#targetsnap');
@@ -345,26 +286,22 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
           target = target.val();
           if (!target ) {errorTarget(); return;}
         } else target = '';
-        var remove  = 'yes' 
-        var keep  = 'yes' 
-        var removemeta  = 'yes' 
+        var remove = 'yes'
+        var keep = 'yes'
+        var removemeta = 'yes'
         var free = 'yes'
         var desc = ''
         box.find('#targetsnap').prop('disabled',true);
         if (opt == "revert") {
-          var x = box.find('#targetsnaprmv').prop('checked') ;
-          if (x) remove = 'yes' ; else remove = 'no' ;
-           x = box.find('#targetsnaprmvmeta').prop('checked') ;
-          if (x) removemeta = 'yes' ; else removemeta = 'no' ;
-           x = box.find('#targetsnapkeep').prop('checked') ;
-          if (x) keep = 'yes' ; else keep = 'no' ;
+          remove = box.find('#targetsnaprmv').prop('checked') ? 'yes' : 'no';
+          removemeta = box.find('#targetsnaprmvmeta').prop('checked') ? 'yes' : 'no';
+          keep = box.find('#targetsnapkeep').prop('checked') ? 'yes' : 'no';
         }
-          if (opt == "create") {
-          var x = box.find('#targetsnapfspc').prop('checked') ;
-          if (x) free = 'yes' ; else free = 'no' ;
-          var desc = box.find("#targetsnapdesc").prop('value') ;
+        if (opt == "create") {
+          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
+          desc = box.find("#targetsnapdesc").prop('value');
         }
-        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist");
+        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid, snapshotname:target, remove:remove, free:free, removemeta:removemeta, keep:keep, desc:desc}, "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -374,86 +311,72 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist,state){
   });
   dialogStyle();
 }
-
-function selectblock(uuid, name ,snaps, opt, getlist,state){
- 
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow2");
+function selectblock(uuid, name, snaps, opt, getlist, state){
+  var box = $("#dialogWindow");
   box.html($("#templateblock").html());
-  var height = 200;
-  const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1) ;
-  var optiontext = Capopt + " Block Devices" ;
-  box.find('#VMName').html(name) ;
-  box.find('#targetsnap').val(snaps) ;
-  box.find('#targetsnapl').html(snaps) ;
-
-  getlist =  true ;
+  const capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
+  var optiontext = capopt + " _(Block Devices)_";
+  box.find('#VMName').html(name);
+  box.find('#targetsnap').val(snaps);
+  box.find('#targetsnapl').html(snaps);
+  getlist = true;
   if (getlist) {
-    var only = 1 ;
+    var only = 1;
     if (opt == "remove") only = 0;
-    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-list", uuid:uuid }, function(data) {
-    if (data.html) {    
-    var targetbase = document.getElementById("targetblockbase")  ;
-    htmlstrbase = "<select class='targetblockbase' name='targetblockbase' id='targetblockbase'><option value='--base'>--base</option>" + data.html + "</select>"
-    htmlstrtop = "<select class='targetblocktop' name='targetblocktop' id='targetblocktop'><option value='--top'>--top</option>" + data.html + "</select>"
-    $("select.targetblockbase").replaceWith(htmlstrbase) ;
-    $("select.targetblocktop").replaceWith(htmlstrtop) ;
-    } 
+    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-list", uuid:uuid}, function(data){
+      if (data.html) {
+        var targetbase = document.getElementById("targetblockbase");
+        htmlstrbase = "<select class='targetblockbase' name='targetblockbase' id='targetblockbase'><option value='--base'>--base</option>" + data.html + "</select>"
+        htmlstrtop = "<select class='targetblocktop' name='targetblocktop' id='targetblocktop'><option value='--top'>--top</option>" + data.html + "</select>"
+        $("select.targetblockbase").replaceWith(htmlstrbase);
+        $("select.targetblocktop").replaceWith(htmlstrtop);
+      }
     },'json');
   }
-
- document.getElementById("targetsnaprmv").checked = true ;
- document.getElementById("targetsnaprmvmeta").checked = true ;
- document.getElementById("targetsnapkeep").checked = true ;
- document.getElementById("targetsnapfspc").checked = true ;
- if (opt== "pull") {
-  $('.toprow').hide(); 
-  $('.targetpivotrow').hide();
-  $('.targetdeleterow').hide();
- } else {
-  $('.toprow').show();
-  $('.targetpivotrow').show();
-  $('.targetdeleterow').show();
- }
-
+  document.getElementById("targetsnaprmv").checked = true;
+  document.getElementById("targetsnaprmvmeta").checked = true;
+  document.getElementById("targetsnapkeep").checked = true;
+  document.getElementById("targetsnapfspc").checked = true;
+  if (opt == "pull") {
+    $('.toprow').hide();
+    $('.targetpivotrow').hide();
+    $('.targetdeleterow').hide();
+  } else {
+    $('.toprow').show();
+    $('.targetpivotrow').show();
+    $('.targetdeleterow').show();
+  }
   box.dialog({
-    title: "_("+optiontext+ ")_",
-    resizable: false,
+    title: optiontext,
+    height: 330,
     width: 600,
-    height: 500,
+    resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
-      _("Action")_: function(){
+      "_(Action)_": function(){
         var target = box.find('#targetsnap');
         if (target.length) {
           target = target.val();
           if (!target ) {errorTarget(); return;}
         } else target = '';
-        var remove  = 'yes' 
-        var keep  = 'yes' 
-        var removemeta  = 'yes' 
+        var remove = 'yes'
+        var keep = 'yes'
+        var removemeta = 'yes'
         var free = 'yes'
         var delete_file = 'yes'
         var pivot = 'yes'
         var desc = ''
         box.find('#targetsnap').prop('disabled',true);
           if (opt == "create") {
-          var x = box.find('#targetsnapfspc').prop('checked') ;
-          if (x) free = 'yes' ; else free = 'no' ;
-          var desc = box.find("#targetsnapdesc").prop('value') ;
+          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
+          var desc = box.find("#targetsnapdesc").prop('value');
         }
-        var targetbase = box.find("#targetblockbase").prop('value') ;
-        var targettop = box.find("#targetblocktop").prop('value') ;
-
-        x = box.find('#targetpivot').prop('checked') ;
-        if (x) pivot = 'yes' ; else pivot = 'no' ;
-        x = box.find('#targetdelete').prop('checked') ;
-        if (x) delete_file = 'yes' ; else delete_file = 'no' ;
-        Ajaxurl =  "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, targetpivot:pivot ,removemeta:removemeta ,targetdelete:delete_file})) ;
-        openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ;
+        var targetbase = box.find("#targetblockbase").prop('value');
+        var targettop = box.find("#targetblocktop").prop('value');
+        pivot = box.find('#targetpivot').prop('checked') ? 'yes' : 'no';
+        delete_file = box.find('#targetdelete').prop('checked') ? 'yes' : 'no';
+        Ajaxurl =  "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt, name:name, targetbase:targetbase, targettop:targettop, snapshotname:target, remove:remove, targetpivot:pivot, removemeta:removemeta, targetdelete:delete_file}));
+        openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist");
         box.dialog('close');
       },
       "_(Cancel)_": function(){
@@ -463,13 +386,6 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){
   });
   dialogStyle();
 }
-
-function dialogStyle() {
-  $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('<i class="fa fa-times"></i>').prop('title');
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
-}
 var sortableHelper = function(e,ui){
   var child = ui.next();
   if (child.is(':visible')) child.addClass('unhide').hide();
@@ -561,7 +477,17 @@ $(function() {
 });
 </script>
 
+<table id="kvm_table" class="tablesorter four shift">
+<thead><tr><th class="th1"><a id="resetsort" class="nohand" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks / vCDs)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
+<tbody id="kvm_list"><tr><td colspan='8'></td></tr></tbody>
+</table>
+
+<input type="button" onclick="addVM()" id="btnAddVM" value="_(Add VM)_" style="display:none">
+<input type="button" onclick="startAll()" value="_(Start All)_" style="display:none">
+<input type="button" onclick="stopAll()" value="_(Stop All)_" style="display:none">
+
 <div id="dialogWindow"></div>
+
 <div markdown="1" id="templateISO" class="template">
 _(ISO Image)_:
 : <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
@@ -569,115 +495,54 @@ _(ISO Image)_:
 
 <div markdown="1" id="templateISOboth" class="template">
 _(CD1 ISO Image)_:
-: <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop=""><br>
+: <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
+
 _(CD2 ISO Image)_:
 : <input type="text" id="target2" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
 </div>
 
-<div id="dialogWindow2"></div>
-<div markdown="1" id="templatesnapshotcreate" class="template">
-<table id='snapshot'>
-<br><br>
-<tr><td> _(VM Name)_:</td><td>
-<label id="VMName"></label></td></tr>
-<tr><td>_(Snapshot Name)_:</td><td>
-<input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">
-_(Check free space)_:
-<input type="checkbox" id="targetsnapfspc" checked></td></tr>
-<tr><td>_(Description  )_:</td><td>
-<input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
+<div id="templatesnapshotcreate" class="template">
+<table id='snapshot' class='snapshot'>
+<tr><td>_(VM Name)_:</td><td><label id="VMName"></label></td></tr>
+<tr><td>_(Snapshot Name)_:</td><td><input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">_(Check free space)_: <input type="checkbox" id="targetsnapfspc" checked></td></tr>
+<tr><td>_(Description  )_:</td><td><input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
 </table>
 </div>
 
-<div markdown="1" id="templatesnapshotrevert" class="template">
-_(VM Name)_:
- <label id="VMName"></label>
-<br>
-_(Snapshot Name)_:
-  <input type="text" id="targetsnap" hidden>
- <label id="targetsnapl"></label><br>
-_(Remove Images)_:
-<input type="checkbox" id="targetsnaprmv" checked >
-_(Remove Meta)_:
-<input type="checkbox" id="targetsnaprmvmeta" checked>
-<!--_(Keep snapshot)_:-->
-<input type="checkbox" id="targetsnapkeep" hidden><br>
+<div id="templatesnapshotrevert" class="template">
+_(VM Name)_: <label id="VMName"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><br>
+_(Remove Images)_: <input type="checkbox" id="targetsnaprmv" checked><br>
+_(Remove Meta)_:<input type="checkbox" id="targetsnaprmvmeta" checked> <input type="checkbox" id="targetsnapkeep" hidden><label id="targetsnapimages"></label><br>
+</div>
 
-<label id="targetsnapimages"></label><br>
+<div id="templatesnapshotremove" class="template">
+<h3>!! _(Warning removing Snapshots can break the chain)_ !!</h3>
 
-<div markdown="1" id="templatesnapshotremove" class="template" post>
-_(!! Warning removing Snapshots can break the chain !!)_<br><br>
+_(VM Name)_: <label id="VMName"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><label id="targetsnapimages"></label>
+</div>
 
-_(VM Name)_:
- <label id="VMName"></label>
-<br>
-_(Snapshot Name)_:
-  <input type="text" id="targetsnap" hidden>
- <label id="targetsnapl"></label><br>
-
-<label id="targetsnapimages"></label><br>
-
-<div markdown="1" id="templateblock" class="template">
-_(VM Name)_:
- <label id="VMName"></label>
-<br>
-_(Snapshot Name)_:
-  <input type="text" id="targetsnap" hidden>
- <label id="targetsnapl"></label><br>
-<br><br><br><br>
-<table id='block'>
-<tr><td>_(Base Image)_:</td><td>
-<select class="targetblockbase" s>
-</select></td></tr>
-<tr name="toprow" class="toprow" ><td>_(Top Image  )_:</td><td>
-<select class="targetblocktop" name="targetblocktop" id="targetblocktop">
-</select></td><td>
-<tr name="targetpivotrow" class="targetpivotrow" ><td>_(Pivot)_:</td><td>
-<input type="checkbox" id="targetpivot" checked></td></tr>
-<tr name="targetdeleterow" class="targetdeleterow" ><td>_(Delete)_:</td><td>
-<input type="checkbox" id="targetdelete" checked></td></tr>
+<div id="templateblock" class="template">
+_(VM Name)_: <label id="VMName"></label><br>
+_(Snapshot Name)_: <input type="text" id="targetsnap" hidden><label id="targetsnapl"></label><br><br>
+<table id='block' class='snapshot'>
+<tr><td>_(Base Image)_:</td><td><select class="targetblockbase"></select></td></tr>
+<tr name="toprow" class="toprow" ><td>_(Top Image  )_:</td><td><select class="targetblocktop" name="targetblocktop" id="targetblocktop"></select></td><td></tr>
+<tr name="targetpivotrow" class="targetpivotrow" ><td>_(Pivot)_:</td><td><input type="checkbox" id="targetpivot" checked></td></tr>
+<tr name="targetdeleterow" class="targetdeleterow" ><td>_(Delete)_:</td><td><input type="checkbox" id="targetdelete" checked></td></tr>
 </table>
 <input type="checkbox" id="targetsnapkeep" hidden><br>
 <label id="targetsnapimages"></label><br>
 </div>
 
-<div id="dialogWindow"></div>
-<div markdown="1" id="templateClone" class="template">
-<html <?=$display['rtl']?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1600">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-</head>
-<body>
-<br>
-<table>
-<tr><td>_(VM Being Cloned)_:</td>
-<td><span id="VMBeingCloned"></span></td></tr>
-
-<tr><td>_(New VM)_:</td>
-<td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()" ></td></tr>
-
-<tr><td>_(Overwrite)_:</td>
-<td><input type="checkbox" id="Overwrite" value="" ></td></tr>
-
-<tr hidden><td>_(Start Cloned VM)_:</td>
-<td><input type="checkbox" id="Start" value="" ></td></tr>
-
-<tr hidden><td>_(Edit VM after clone)_:</td>
-<td><input type="checkbox" id="Edit" value="" ></td></tr>
-
-<tr><td>_(Check Free Space)_:</td>
-<td><input type="checkbox" id="Free" value="" ></td></tr>
-
+<div id="templateClone" class="template">
+<table class='snapshot'>
+<tr><td>_(VM Being Cloned)_:</td><td><span id="VMBeingCloned"></span></td></tr>
+<tr><td>_(New VM)_:</td><td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()" ></td></tr>
+<tr><td>_(Overwrite)_:</td><td><input type="checkbox" id="Overwrite" value="" ></td></tr>
+<tr hidden><td>_(Start Cloned VM)_:</td><td><input type="checkbox" id="Start" value="" ></td></tr>
+<tr hidden><td>_(Edit VM after clone)_:</td><td><input type="checkbox" id="Edit" value="" ></td></tr>
+<tr><td>_(Check Free Space)_:</td><td><input type="checkbox" id="Free" value="" ></td></tr>
 </table>
-</body>
-</html>
 </div>
-</div>
-
-</div>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 04f393221..890e8ad0f 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -61,21 +61,6 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-body{-webkit-overflow-scrolling:touch}
-.errortext{color:#EF3D47;display:none}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.basic{display:block}
-.advanced{display:none}
-#winvirtio{display:none}
-#download_status{margin-left:5px;color:#777;display:none}
-#download_button{cursor:pointer;margin-left:-2px;color:#08C;display:none;transform:translate(0px,2px)}
-#download_button.fa-spin{cursor:default;color:#777}
-#download_button span{font-family:clear-sans}
-#download_button.fa-spin span{font-family:clear-sans;display:none}
-#remove_button{cursor:pointer;margin-left:-2px;color:#EF3D47;display:none;transform:translate(0px,2px)}
-#remove_button span{font-family:clear-sans}
-</style>
 
 <?if ($hardware):?>
 <span class="status vhshift"><input type="checkbox" class="advancedview"></span>
diff --git a/emhttp/plugins/dynamix.vm.manager/VMTemplates.page b/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
index 460fc0341..96b2d3819 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMTemplates.page
@@ -4,8 +4,8 @@ Cond="(pgrep('libvirtd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2015-2020, Derek Macias, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2015-2023, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,12 +15,6 @@ Markdown="false"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style type="text/css">
-.vmheader{padding:10px;font-size:1.4rem;text-align:left;color:#888}
-.vmtemplate{display:inline-block;width:80px;height:90px;margin-bottom:15px;margin-left:10px;text-align:center;vertical-align:top}
-.vmtemplate img{width:48px;height:48px}
-.vmtemplate p{text-align:center;margin-top:8px;line-height:12px}
-</style>
 <?
 	$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 	require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
index 3adbda9be..fbf2a5d8b 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMedit.php
@@ -88,55 +88,6 @@ if (isset($_GET['uuid'])) {
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
 
-<style>
-body{-webkit-overflow-scrolling:touch}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
-#vmform table{margin-top:0}
-#vmform div.title + table{margin-top:0}
-#vmform table tr{vertical-align:top;line-height:40px}
-#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
-#vmform table tr td:nth-child(even){width:110px}
-#vmform table tr td:first-child{padding-right:30px}
-#vmform table tr td:last-child{width:inherit}
-#vmform .multiple{position:relative}
-#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
-#vmform .sectionbutton.remove{top:0;opacity:0.3}
-#vmform .sectionbutton.add{bottom:0}
-#vmform .sectionbutton:hover{opacity:1.0}
-#vmform .sectiontab{position:absolute;top:2px;bottom:2px;left:0;width:6px;border-radius:3px;background-color:#DDDDDD;transition-property:background,width;transition-duration:0.1s;transition-timing-function:linear}
-#vmform .multiple:hover .sectionbutton{opacity:0.7;left:4px}
-#vmform .multiple:hover .sectionbutton.remove{opacity:0.6}
-#vmform .multiple:hover .sectiontab{background-color:#CCCCCC;width:8px}
-#vmform table.multiple{margin:10px 0;background:<?=$bgcolor?>;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
-#vmform table.multiple:hover{background-position:0 0;}
-#vmform table.multiple td{padding:5px 0}
-span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
-.basic{display:none}
-.advanced{/*Empty placeholder*/}
-.switch-button-label.off{color:inherit}
-#template_img{cursor:pointer}
-#template_img:hover{opacity:0.5}
-#template_img:hover i{opacity:1.0}
-.template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
-.template_img_chooser_inner img{width:48px;height:48px}
-.template_img_chooser_inner p{text-align:center;line-height:8px;}
-#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
-#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
-#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:<?=$bgcolor?>;z-index:10}
-#form_content{display:none}
-#vmform .four{overflow:hidden}
-#vmform .four label{float:left;display:table-cell;width:15%;}
-#vmform .four label:nth-child(4n+4){}
-#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}
-#vmform .four label.cpu2{width:3%;height:16px;line-height:16px}
-#vmform .mac_generate{cursor:pointer;margin-left:-5px;color:#08C;font-size:1.3rem;transform:translate(0px, 2px)}
-#vmform .disk{display:none}
-#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
-span#dropbox{border:1px solid <?=$border?>;background:<?=$bgcolor?>;padding:28px 12px;line-height:72px;margin-right:16px;}
-i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
-input[type=checkbox]{margin-left:0}
-</style>
-
 <span class="status advancedview_panel" style="margin-top:<?=$top?>px"><input type="checkbox" class="advancedview"></span>
 <div class="domain">
 	<form id="vmform" method="POST">
diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 8885e269d..588cc6d11 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -69,14 +69,14 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
   if (x!=-1) path = path.substring(0,x);
   if (vmrcurl !== "" && state == "running")  {
     if (console == "web" || console == "both") {
-      var vmrctext=_("VM Console") + "(" + vmrcprotocol + ")" ;
+      var vmrctext=_("VM Console") + " (" + vmrcprotocol + ")" ;
       opts.push({text:vmrctext, icon:"fa-desktop", action:function(e) {
         e.preventDefault();
         window.open(vmrcurl, '_blank', 'scrollbars=yes,resizable=yes');
       }});
     }
     if (console == "remote" || console == "both") {
-      opts.push({text:_("VM remote-viewer")+ "(" + vmrcprotocol + ")" , icon:"fa-desktop", action:function(e) {
+      opts.push({text:_("VM remote-viewer")+ " (" + vmrcprotocol + ")" , icon:"fa-desktop", action:function(e) {
         e.preventDefault();
         ajaxVMDispatchconsoleRV({action:"domain-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;  
       }});
@@ -137,12 +137,12 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
     }});
     if (vmrcprotocol == "VNC" || vmrcprotocol == "SPICE") { 
       if (console == "web" || console == "both")  {
-        opts.push({text:_("Start with console")+ "(" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
+        opts.push({text:_("Start with console")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
           e.preventDefault();
           ajaxVMDispatchconsole({action:"domain-start-console", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;  
         }});}
       if (console == "remote" || console == "both")  {
-        opts.push({text:_("Start with remote-viewer")+ "(" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
+        opts.push({text:_("Start with remote-viewer")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
           e.preventDefault();
           ajaxVMDispatchconsoleRV({action:"domain-start-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;  
         }});
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
index f11df0a8c..73c4fef67 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -98,5 +98,4 @@ switch ($action) {
 #execCommand_nchan("ls /") ;
 write("stop_Wait\0$waitID") ;
 write('_DONE_','');
-
 ?>
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-azure.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-black.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-gray.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM-white.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
new file mode 100644
index 000000000..a2c0ae2b4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css
@@ -0,0 +1,42 @@
+body{-webkit-overflow-scrolling:touch}
+#vmform table{margin-top:0}
+#vmform div.title + table{margin-top:0}
+#vmform table tr{vertical-align:top;line-height:40px}
+#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
+#vmform table tr td:nth-child(even){width:110px}
+#vmform table tr td:first-child{padding-right:30px}
+#vmform table tr td:last-child{width:inherit}
+#vmform .multiple{position:relative}
+#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .sectionbutton.remove{top:0;opacity:0.3}
+#vmform .sectionbutton.add{bottom:0}
+#vmform .sectionbutton:hover{opacity:1.0}
+#vmform .sectiontab{position:absolute;top:2px;bottom:2px;left:0;width:6px;border-radius:3px;background-color:#DDDDDD;transition-property:background,width;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .multiple:hover .sectionbutton{opacity:0.7;left:4px}
+#vmform .multiple:hover .sectionbutton.remove{opacity:0.6}
+#vmform .multiple:hover .sectiontab{background-color:#CCCCCC;width:8px}
+#vmform table.multiple:hover{background-position:0 0;}
+#vmform table.multiple td{padding:5px 0}
+span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
+.basic{display:none}
+.advanced{/*Empty placeholder*/}
+.switch-button-label.off{color:inherit}
+#template_img{cursor:pointer}
+#template_img:hover{opacity:0.5}
+#template_img:hover i{opacity:1.0}
+.template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
+.template_img_chooser_inner img{width:48px;height:48px}
+.template_img_chooser_inner p{text-align:center;line-height:8px;}
+#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
+#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
+#form_content{display:none}
+#vmform .four{overflow:hidden}
+#vmform .four label{float:left;display:table-cell;width:15%;}
+#vmform .four label:nth-child(4n+4){}
+#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}
+#vmform .four label.cpu2{width:3%;height:16px;line-height:16px}
+#vmform .mac_generate{cursor:pointer;margin-left:-5px;color:#08C;font-size:1.3rem;transform:translate(0px, 2px)}
+#vmform .disk{display:none}
+#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
+i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
+input[type=checkbox]{margin-left:0}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-azure.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-black.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css
new file mode 100644
index 000000000..63cf210e4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-gray.css
@@ -0,0 +1,4 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#1c1c1c;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#1c1c1c;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#1c1c1c;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css
new file mode 100644
index 000000000..26d225a46
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM-white.css
@@ -0,0 +1,4 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:relative;z-index:100;display:none}
+#vmform table.multiple{margin:10px 0;background:#f2f2f2;background-size:800px 100%;background-position:-800px;background-repeat:no-repeat;background-clip:content-box;transition:background 0.3s linear}
+#template_img_chooser_outer{position:absolute;display:none;border-radius:5px;border:1px solid <?=$border?>;background:#f2f2f2;z-index:10}
+span#dropbox{border:1px solid <?=$border?>;background:#f2f2f2;padding:28px 12px;line-height:72px;margin-right:16px;}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
new file mode 100644
index 000000000..a2c0ae2b4
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css
@@ -0,0 +1,42 @@
+body{-webkit-overflow-scrolling:touch}
+#vmform table{margin-top:0}
+#vmform div.title + table{margin-top:0}
+#vmform table tr{vertical-align:top;line-height:40px}
+#vmform table tr td:nth-child(odd){width:300px;text-align:right;padding-right:10px}
+#vmform table tr td:nth-child(even){width:110px}
+#vmform table tr td:first-child{padding-right:30px}
+#vmform table tr td:last-child{width:inherit}
+#vmform .multiple{position:relative}
+#vmform .sectionbutton{position:absolute;left:2px;cursor:pointer;opacity:0.4;font-size:1.4rem;line-height:17px;z-index:10;transition-property:opacity,left;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .sectionbutton.remove{top:0;opacity:0.3}
+#vmform .sectionbutton.add{bottom:0}
+#vmform .sectionbutton:hover{opacity:1.0}
+#vmform .sectiontab{position:absolute;top:2px;bottom:2px;left:0;width:6px;border-radius:3px;background-color:#DDDDDD;transition-property:background,width;transition-duration:0.1s;transition-timing-function:linear}
+#vmform .multiple:hover .sectionbutton{opacity:0.7;left:4px}
+#vmform .multiple:hover .sectionbutton.remove{opacity:0.6}
+#vmform .multiple:hover .sectiontab{background-color:#CCCCCC;width:8px}
+#vmform table.multiple:hover{background-position:0 0;}
+#vmform table.multiple td{padding:5px 0}
+span.advancedview_panel{display:none;line-height:16px;margin-top:1px}
+.basic{display:none}
+.advanced{/*Empty placeholder*/}
+.switch-button-label.off{color:inherit}
+#template_img{cursor:pointer}
+#template_img:hover{opacity:0.5}
+#template_img:hover i{opacity:1.0}
+.template_img_chooser_inner{display:inline-block;width:80px;margin-bottom:15px;margin-right:10px;text-align:center;}
+.template_img_chooser_inner img{width:48px;height:48px}
+.template_img_chooser_inner p{text-align:center;line-height:8px;}
+#template_img_chooser{width:560px;height:300px;overflow-y:scroll;position:relative}
+#template_img_chooser div:hover{background-color:#eee;cursor:pointer;}
+#form_content{display:none}
+#vmform .four{overflow:hidden}
+#vmform .four label{float:left;display:table-cell;width:15%;}
+#vmform .four label:nth-child(4n+4){}
+#vmform .four label.cpu1{width:28%;height:16px;line-height:16px}
+#vmform .four label.cpu2{width:3%;height:16px;line-height:16px}
+#vmform .mac_generate{cursor:pointer;margin-left:-5px;color:#08C;font-size:1.3rem;transform:translate(0px, 2px)}
+#vmform .disk{display:none}
+#vmform .disk_preview{display:inline-block;color:#BBB;transform:translate(0px, 1px)}
+i.fa-plus-circle,i.fa-minus-circle{margin-left:8px}
+input[type=checkbox]{margin-left:0}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css
new file mode 100644
index 000000000..817ebfe24
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-azure.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css
new file mode 100644
index 000000000..4c8c88609
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-black.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css
new file mode 100644
index 000000000..4c8c88609
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-gray.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css
new file mode 100644
index 000000000..817ebfe24
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines-white.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
new file mode 100644
index 000000000..4ef919df5
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -0,0 +1,20 @@
+th.th1{width:25%}
+th.th2{width:15%}
+th.th3{width:80px}
+div.four{font-size:1.1rem;width:260px}
+div.four label{float:left;display:table-cell;width:25%}
+div.four label:nth-child(4n+4){float:none;clear:both}
+div.four label.cpu1{width:32%}
+div.four label.cpu2{width:26%}
+div.template,div#dialogWindow,input#upload{display:none}
+table.domdisk thead tr th:nth-child(1){width:56%!important}
+table.domdisk thead tr th:nth-child(n+2){width:8%!important}
+table.domdisk thead tr th:nth-child(1){padding-left:72px}
+table.domdisk tbody tr td:nth-child(1){padding-left:72px}
+table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
+table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
+table.snapshot{margin-top:0}
+i.mover{margin-right:8px;display:none}
+#resetsort{margin-left:12px;display:inline-block;width:32px}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.dropdown-menu{z-index:10001}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css
new file mode 100644
index 000000000..35ac63d60
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-azure.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css
new file mode 100644
index 000000000..3f9d4d283
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-black.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css
new file mode 100644
index 000000000..3f9d4d283
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-gray.css
@@ -0,0 +1 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css
new file mode 100644
index 000000000..35ac63d60
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings-white.css
@@ -0,0 +1 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css
new file mode 100644
index 000000000..8e877a4f6
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMSettings.css
@@ -0,0 +1,12 @@
+body{-webkit-overflow-scrolling:touch}
+.errortext{color:#EF3D47;display:none}
+.basic{display:block}
+.advanced{display:none}
+#winvirtio{display:none}
+#download_status{margin-left:5px;color:#777;display:none}
+#download_button{cursor:pointer;margin-left:-2px;color:#08C;display:none;transform:translate(0px,2px)}
+#download_button.fa-spin{cursor:default;color:#777}
+#download_button span{font-family:clear-sans}
+#download_button.fa-spin span{font-family:clear-sans;display:none}
+#remove_button{cursor:pointer;margin-left:-2px;color:#EF3D47;display:none;transform:translate(0px,2px)}
+#remove_button span{font-family:clear-sans}
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css
new file mode 100644
index 000000000..02918f1c1
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMTemplates.css
@@ -0,0 +1,4 @@
+.vmheader{padding:10px;font-size:1.4rem;text-align:left;color:#888}
+.vmtemplate{display:inline-block;width:80px;height:90px;margin-bottom:15px;margin-left:10px;text-align:center;vertical-align:top}
+.vmtemplate img{width:48px;height:48px}
+.vmtemplate p{text-align:center;margin-top:8px;line-height:12px}
diff --git a/emhttp/plugins/dynamix.vm.manager/spice.html b/emhttp/plugins/dynamix.vm.manager/spice.html
index 78d5adeec..0c9684419 100644
--- a/emhttp/plugins/dynamix.vm.manager/spice.html
+++ b/emhttp/plugins/dynamix.vm.manager/spice.html
@@ -22,13 +22,9 @@
    --------------------------------------------------
    S.Fairweather added addition functions to allow being called from external source and form for password.
 -->
-
-
-
 <!doctype html>
 <html>
     <head>
-
         <title>Spice Javascript client</title>
         <base href="spice/">
         <link rel="stylesheet" type="text/css" href="./spice.css" />
@@ -55,7 +51,6 @@
             .form-container input[type=text]:focus, .form-container input[type=password]:focus {background-color: #ddd;outline: none; }
             .form-container .btn:hover, .open-button:hover { opacity: 1;  }
         </style>
-
         <script type="module" crossorigin="anonymous">
             import * as SpiceHtml5 from './src/main.js';
             window.connect = connect;
@@ -63,13 +58,11 @@
             var sc;
             const queryString = window.location.search;
             const urlParams = new URLSearchParams(queryString);
-
             var auto = urlParams.get('autoconnect') ;
             var host = urlParams.get("host") ;
             var port = urlParams.get("port") ;
             var vmname = urlParams.get("vmname") ;
             var password = urlParams.get("password") ;
-            
             if (vmname == null) {
                 vmname = host ;
             } else {
@@ -79,47 +72,36 @@
             document.getElementById("port").value = port;
             document.getElementById("password").value = password;
             document.getElementById('hostname').innerHTML = (vmname) ;
-
             if (auto === 'true' || auto == '1') {
             auto = true;
             connect();
             }
-
             function spice_error(e)
             {
                 disconnect();
                 if (e !== undefined && e.message === "Permission denied.") {
-                    document.getElementById("passwordForm").style.display = "block";  
-                } 
+                    document.getElementById("passwordForm").style.display = "block";
+                }
             }
-
-
             function connect()
             {
                 var host, port, password, scheme = "ws://", uri;
                 if (window.location.protocol == 'https:') {
                     scheme = "wss://";
                 }
-
                 host = document.getElementById("host").value;
                 port = document.getElementById("port").value;
                 password = document.getElementById("password").value;
-
-
                 if ((!host) || (!port)) {
                     console.log("must set host and port");
                     return;
                 }
-
                 if (sc) {
                     sc.stop();
                 }
-
                 uri = scheme + host + port;
-
                 document.getElementById('connectButton').innerHTML = "Stop Connection";
                 document.getElementById('connectButton').onclick = disconnect;
-
                 try
                 {
                     sc = new SpiceHtml5.SpiceMainConn({uri: uri, screen_id: "spice-screen", dump_id: "debug-div",
@@ -130,9 +112,7 @@
                     alert(e.toString());
                     disconnect();
                 }
-
             }
-
             function disconnect()
             {
                 console.log(">> disconnect");
@@ -152,14 +132,11 @@
                 }
                 console.log("<< disconnect");
             }
-
             function agent_connected(sc)
             {
                 window.addEventListener('resize', SpiceHtml5.handle_resize);
                 window.spice_connection = this;
-
                 SpiceHtml5.resize_helper(this);
-
                 if (window.File && window.FileReader && window.FileList && window.Blob)
                 {
                     var spice_xfer_area = document.createElement("div");
@@ -173,20 +150,15 @@
                     console.log("File API is not supported");
                 }
             }
-
             document.getElementById('connectButton').onclick = connect();
             document.getElementById('sendCtrlAltDel').addEventListener('click', function(){ SpiceHtml5.sendCtrlAltDel(sc); });
         </script>
-
     </head>
-
     <body>
-
         <div id="login">
             <button onclick="open_nav()">&#9776; SPICE</button>
-            <p id="hostname">Host Console</p>          
+            <p id="hostname">Host Console</p>
         </div>
-
          <div id="Sidenav" class="SidenavClosed" style="width: 0;">
             <p class="closebtn" onclick="close_nav()">&#10006;</p>
             <label for="host">Host:</label> <input type='text' id='host' value='localhost'> <!-- localhost --><br>
@@ -196,34 +168,26 @@
             <button id="sendCtrlAltDel">Send Ctrl-Alt-Delete</button>
             <button id="debugLogs">Toggle Debug Logs</button>
             <div id="message-div" class="spice-message" style="display: none;"></div>
-
             <div id="debug-div">
             <!-- If DUMPXXX is turned on, dumped images will go here -->
             </div>
         </div>
-
         <div id="spice-area">
             <div id="spice-screen" class="spice-screen"></div>
         </div>
-
         <div class="form-popup" id="passwordForm">
             <form action="/action_page.php" class="form-container">
               <h3>Spice requires a password.</h3>
-
               <input type="password" autocomplete="off" placeholder="Enter Password" id="psw" name="psw" required>
-          
               <button type="button" class="btn cancel" onclick="connectpsw()">Connect</button>
             </form>
           </div>
-
-           
         <script>
             function connectpsw() {
-                document.getElementById("password").value = document.getElementById("psw").value;   
-                document.getElementById("passwordForm").style.display = "none"; 
-                connect() ;   
+                document.getElementById("password").value = document.getElementById("psw").value;
+                document.getElementById("passwordForm").style.display = "none";
+                connect() ;
             }
-            
             function show_debug_Logs() {
                 var content = document.getElementById('message-div')
                 if (content.style.display === 'block') {
@@ -232,16 +196,13 @@
                     content.style.display = 'block';
                 }
             }
-
             function open_nav() {
                 document.getElementById('Sidenav').className = 'SidenavOpen';
             }
-
             function close_nav() {
                 document.getElementById('Sidenav').className = 'SidenavClosed';
             }
             document.getElementById('debugLogs').addEventListener('click', function() { show_debug_Logs(); });
-            
         </script>
     </body>
 </html>
diff --git a/emhttp/plugins/dynamix/Apps.page b/emhttp/plugins/dynamix/Apps.page
index e816baebf..50826bfad 100644
--- a/emhttp/plugins/dynamix/Apps.page
+++ b/emhttp/plugins/dynamix/Apps.page
@@ -3,8 +3,8 @@ Name="Apps"
 Code="e942"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -14,10 +14,6 @@ Code="e942"
  * all copies or substantial portions of the Software.
 */
 ?>
-<style>
-div.notice{margin:150px 0 20px 0}
-</style>
-
 <script>
 function installPlugin(file) {
   openPlugin("plugin install "+file,"_(Install Plugin)_","","refresh");
diff --git a/emhttp/plugins/dynamix/ArrayOperation.page b/emhttp/plugins/dynamix/ArrayOperation.page
index 30d796a3f..09771ec57 100644
--- a/emhttp/plugins/dynamix/ArrayOperation.page
+++ b/emhttp/plugins/dynamix/ArrayOperation.page
@@ -81,13 +81,6 @@ function print_error($error) {
   return sprintf(_('Finding **%s** error'.($error==1?'':'s')),$error?:'0');
 }
 ?>
-<style>
-tr#copy,tr#file{display:none}
-td.gap{padding-left:26px!important}
-td.wrap{white-space:normal!important}
-span#pass{display:none;margin-left:20px}
-input[type=checkbox]{margin-left:0}
-</style>
 <script>
 var ctrl = '<span class="status <?=$tabbed?"":"vhshift"?>"><a style="cursor:pointer" class="tooltip_diskio" title="_(Toggle reads/writes display)_" onclick="toggle_diskio();return false"><i class="toggle fa"></i></a></span>';
 
diff --git a/emhttp/plugins/dynamix/Browse.page b/emhttp/plugins/dynamix/Browse.page
index f5b0510cb..93fdae25d 100644
--- a/emhttp/plugins/dynamix/Browse.page
+++ b/emhttp/plugins/dynamix/Browse.page
@@ -31,52 +31,12 @@ $dir     = htmlspecialchars(str_replace('\\','\\\\',$dir));
 $lock    = $root=='mnt' ? ($main ?: '---') : ($root=='boot' ? _('flash') : '---');
 $isshare = $root=='mnt' && (!$main || !$next || ($main=='rootshare' && !$rest));
 $editor  = '/boot/config/editor.cfg';
-$newos   = version_compare(parse_ini_file('/etc/unraid-version')['version'],'6.11.9','>');
 
 if (!file_exists($editor)) file_put_contents($editor,implode("\n",['','txt','js','php','page','plg','xml','old','bak','log','css']));
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.filetree.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.switchbutton.css")?>">
 
-<style>
-div#ace_settingsmenu,table#controls,table#more-controls{margin-top:0;background-color:#f2f2f2}
-tr.ace_optionsMenuEntry td{padding:4px;color:#1c1b1b}
-tr.ace_optionsMenuEntry td select option{color:#1c1b1b;background-color:#e8e8e8}
-<?if ($theme=='black'):?>
-tr.ace_optionsMenuEntry td select{color:#1c1b1b;border-bottom:1px solid #1c1b1b;background-image:linear-gradient(66.6deg,transparent 60%,#1c1b1b 40%),linear-gradient(113.4deg, #1c1b1b 40%,transparent 60%)}
-tr.ace_optionsMenuEntry td input[type=number]{color:#1c1b1b}
-<?endif;?>
-tr.ace_optionsMenuEntry td input[type=number]::-webkit-inner-spin-button{-webkit-appearance:auto;cursor:pointer}
-tr.ace_optionsMenuEntry td input[type=number]{-moz-appearance:auto;margin:0}
-
-.loc{text-align:left!important;padding-left:0!important}
-<?if ($newos):?>
-.title{letter-spacing:1px}
-.title span.left{text-transform:none}
-<?else:?>
-#title{letter-spacing:1px}
-#title span.left{text-transform:none}
-<?endif;?>
-table.tablesorter.indexer{margin-top:0}
-table.tablesorter.indexer thead th:nth-child(1){width:12px;text-align:left;padding-left:11px}
-table.tablesorter.indexer thead th:nth-child(2){width:3%!important}
-table.tablesorter.indexer thead th:nth-child(3){width:auto!important}
-table.tablesorter.indexer thead th:nth-child(n+4){width:10%!important}
-table.tablesorter.indexer thead th:nth-child(9){width:3%!important}
-table.tablesorter.indexer tbody tr:hover td{background-color:<?=$dfm['hover']?>}
-table.tablesorter.indexer thead th{text-align:left}
-table.tablesorter.indexer tbody td{text-align:left}
-table.tablesorter.indexer thead th:last-child{text-align:right}
-table.tablesorter.indexer tbody td:last-child{text-align:right}
-i[id^="row_"],i[id^="check_"]{cursor:pointer;font-size:1.8rem;color:gray}
-td[id^="name_"]{cursor:pointer}
-i.fa-home{font-size:2rem}
-i.fa-chevron-right{font-size:1.2rem;margin:0 8px}
-div.autoheight{width:100%;overflow-y:auto;margin-top:<?=$themes1?'-30px':'0'?>}
-div#buttons{display:none}
-.dropdown-menu{z-index:10001}
-</style>
-
 <script src="<?autov("/webGui/javascript/jquery.filetree.js")?>"></script>
 <script src="<?autov("/webGui/javascript/jquery.switchbutton.js")?>"></script>
 <script>
diff --git a/emhttp/plugins/dynamix/CPUvms.page b/emhttp/plugins/dynamix/CPUvms.page
index 854382295..2edd7a867 100644
--- a/emhttp/plugins/dynamix/CPUvms.page
+++ b/emhttp/plugins/dynamix/CPUvms.page
@@ -3,8 +3,8 @@ Title="CPU Pinning VM"
 Tag="icon-cpu"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -41,14 +41,6 @@ function create() {
   echo "<th>$label</th>".implode(array_map(function($t){return "<th>$t</th>";},$text));
 }
 ?>
-<style>
-table.tablesorter tr>th+th{text-align:right;vertical-align:top}
-table.tablesorter tr>td+td+td{vertical-align:top}
-table.tablesorter tr>th+th+th,table.tablesorter tr>td+td{text-align:center}
-table.tablesorter th:first-child,table.tablesorter td:first-child{width:180px;text-align:left}
-input.flat{margin:0}
-input.lock{margin:0}
-</style>
 <script>
 String.prototype.strip = function(){return this.replace(/ |\(|\)|\[|\]/g,'');}
 String.prototype.encode = function(){return this.replace(/\./g,'%2e');}
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index c74d8c9b8..df44dbf80 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -30,13 +30,10 @@ function isSubpool($name) {
   $subpool = ($tildaPosition!==false) ? substr($name, $tildaPosition+1) : false;
   return ($subpool!==false && in_array($subpool, $subpools)) ? $subpool : false;
 }
-$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:20px}
-</style>
+
 <script>
 function validate(poolname) {
   var valid = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
@@ -69,8 +66,6 @@ function addPoolPopup() {
     resizable: false,
     width: 600,
     modal: true,
-    show : {effect:'fade', duration:250},
-    hide : {effect:'fade', duration:250},
     buttons: {
     "_(Add)_": function() {
         if (validate($(this).find('input[name="poolName"]').val())) {
@@ -87,7 +82,6 @@ function addPoolPopup() {
   $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
   $(".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 removeOption(inputString,value) {
@@ -122,8 +116,6 @@ function addSubpoolPopup(poolname,currentsubpools) {
     resizable: false,
     width: 600,
     modal: true,
-    show : {effect:'fade', duration:250},
-    hide : {effect:'fade', duration:250},
     buttons: {
     "_(Add)_": function() {
         subpool=$(this).find('select[name="subpool"]').val();
@@ -136,12 +128,10 @@ function addSubpoolPopup(poolname,currentsubpools) {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".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'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 
 <?if (_var($var,'fsState')=="Started"):?>
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 35afb0afe..3a2272686 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -52,10 +52,9 @@ function customTiles($column) {
 // adjust the text color in log window
 $fgcolor = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
 exec("sed -ri 's/^\.logLine\{color:#......;/.logLine{color:$fgcolor;/' $docroot/plugins/dynamix.docker.manager/log.htm >/dev/null &");
-
 exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$dockerd);
 exec("/etc/rc.d/rc.libvirt status >/dev/null",$dummy,$libvirtd);
-$domain_cfg = parse_ini_file("/boot/config/domain.cfg");
+
 $dockerd = $dockerd==0;
 $libvirtd = $libvirtd==0;
 $apcupsd = file_exists('/var/run/apcupsd.pid');
@@ -173,73 +172,7 @@ switch ($display['theme']) {
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
 <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-$theme.css")?>">
-<style>
-div.frame{padding-top:14px;padding-bottom:160px}
-div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(<?=$themes1?'610px':'580px'?>,1fr));column-gap:20px}
-div.tile,i.tile{display:none}
-div#iframe-popup{display:none;-webkit-overflow-scrolling:touch}
-div.last{padding-bottom:12px}
-div.leftside{float:left;width:66%}
-div.rightside{float:right;margin:0;text-align:center}
-div[id$=chart]{margin:-12px 8px -24px -18px}
-div.template,div#dialogWindow,input#upload{display:none}
-span.head_info{width:250px;display:inline-block}
-span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_{display:none;margin-left:0}
-span.head_bar{display:inline-block;width:180px}
-span.head_gap{padding-left:14px}
-span.green,span.red,span.orange{padding-left:0}
-span.ctrl{float:right;margin-top:0;margin-right:10px}
-span.ctrl span{font-size:2rem!important}
-span.outer{float:left}
-span.inner{width:143px}
-span.rx{width:80px;display:inline-block}
-span.busy,i.inactive{opacity:0.5}
-span.dense{width:180px;display:inline-block}
-span#ups_model{margin-right:30px}
-span#chart-toggle{float:right}
-span.header,tr.header{font-size:1.1rem!important;text-transform:uppercase;letter-spacing:1px}
-span.wg1{font-size:1.1rem;text-indent:24px}
-span.wg2{font-size:1.1rem}
-span[id^=cpu],span[id^=sys]{width:0}
-span[class^="fa "]{font-size:1.6rem;margin-right:18px}
-span.load.resize{font-size:1.1rem}
-span.fan{width:36%;display:inline-block}
-span.w18{width:18%;display:inline-block;float:left}
-span.w26{width:26%;display:inline-block;float:left}
-span.w36{width:36%;display:inline-block;float:left}
-span.w44{width:44%;display:inline-block;float:left}
-span.w72{width:72%;display:inline-block;float:left}
-select#cpuline,select#netline{border:none;padding:0 12px 0 0}
-select[name=enter_share],select[name=enter_user]{margin-top:0;float:none}
-img#mycase{width:auto;max-width:128px;height:auto;max-height:128px}
-i.heat{margin-left:8px}
-i.ups{margin-right:8px;font-size:1.4rem!important}
-i.vpn{font-size:1.4rem!important;cursor:pointer}
-i.indent{display:inline-block;width:18px}
-i.f32{font-size:32px!important}
-i.f14{font-size:1.4rem!important}
-i.fa.orb{margin-left:0}
-i.fa-wrench.tile{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important}
-i[class^="icon-"]{font-size:1.6rem;margin-right:8px}
-i[class^="icon-u-"]{font-size:inherit}
-i#mycase[class^="case-"]{font-size:128px}
-i#mycase[class^="fa "]{font-size:96px}
-a.cpu_close,span.hand{cursor:pointer;z-index:1001}
-tr#var0,tr#var1,tr#var2,tr#var3,tr#var4{cursor:alias}
-tr#var1,tr#var4,tr#cpu_chart,.cpu_open{display:none}
-td.none{text-align:center;padding-top:12px}
-input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
-.share1,.share3,.user1,.user3,.view1,.view2,.view3,.view4,.unused{display:none}
-.port_view,.control,#apps,#vms{z-index:10000}
-.flat{height:0;lineheight:0}
-.wrap{white-space:normal}
-.switch-button-background{margin-left:0;margin-top:4px}
-.switch-button-label{margin-top:3px}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-#current_time{font-size:4rem;margin-left:8px}
-#current_date{font-size:1.3rem;margin-left:18px}
-span.ampm{font-size:2rem}
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.apexcharts.js')?>"></script>
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.docker.manager/javascript/docker.js')?>"></script>
@@ -251,7 +184,7 @@ span.ampm{font-size:2rem}
 <table id='db-box1' class='share_status dashboard'>
 <tbody class='system'>
 <tr><td><i class='icon-performance f32'></i><div class='section'><?=_var($var,'NAME')?><br>
-<span><?=_var($var,'COMMENT')?></span><br></div>
+<span><?=_var($var,'COMMENT')?></span><span id="_current_time_" class="head_time"></span><br></div>
 <a href='/Dashboard/Settings/Identification'><i class='fa fa-fw fa-cog control' title="_(Go to identification settings)_"></i></a><i class='fa fa-fw fa-wrench control tile' onclick='contentMgmt()' title="_(Tile Management)_"></i>
 <span class='ctrl'>
 <?if ($parity||$mover||$btrfs):?>
@@ -333,7 +266,7 @@ foreach ($cpus as $pair) {
 <tr><td><span class='w36'><i class='ups fa fa-compress'></i>_(Usable size)_: <?=my_scale($total,$unit,1,null,1024)." $unit"?></span><i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?></td></tr>
 <tr id='var0'><td><span class='w26'><i class='ups fa fa-fw fa-microchip'></i>_(RAM)_</span><span class='w72'><span class='sys0 load resize'>0%</span><div class='usage-disk sys'><span id='sys0'></span><span></span></div></span></td></tr>
 <tr id='var1'><td><span class='w26'><i class='ups fa fa-fw fa-shield'></i>_(ZFS)_</span><span class='w72'><span class='sys1 load resize'>0%</span><div class='usage-disk sys'><span id='sys1'></span><span></span></div></span></td></tr>
-<tr id='var2'><td><span class='w26'><i class='ups fa fa-fw fa-suitcase'></i>_(Flash)_</span><span class='w72'><span class='sys2 load resize'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span></td></tr>
+<tr id='var2'><td><span class='w26'><i class='ups fa fa-fw fa-pencil-square'></i>_(Flash)_</span><span class='w72'><span class='sys2 load resize'>0%</span><div class='usage-disk sys'><span id='sys2'></span><span></span></div></span></td></tr>
 <tr id='var3'><td><span class='w26'><i class='ups fa fa-fw fa-file-text'></i>_(Log)_</span><span class='w72'><span class='sys3 load resize'>0%</span><div class='usage-disk sys'><span id='sys3'></span><span></span></div></span></td></tr>
 <tr id='var4'><td><span class='w26'><i class='ups fa fa-fw fa-docker'></i>_(Docker)_</span><span class='w72'><span class='sys4 load resize'>0%</span><div class='usage-disk sys'><span id='sys4'></span><span></span></div></span></td></tr>
 </tbody>
@@ -666,6 +599,7 @@ if (!$group) {
 <input type='hidden' name='csrf_token' value='<?=_var($var,'csrf_token')?>'>
 <input type='hidden' name='cmd' value=''>
 </form>
+
 <div id="iframe-popup"></div>
 
 <div id="templateContentMgmt" class="template">
@@ -716,9 +650,8 @@ function hideShow() {
 !-->
 </div>
 
-<div id="dialogWindow"></div>
-<div markdown="1" id="templateClone" class="template">
-<table>
+<div id="templateClone" class="template">
+<table class="snapshot">
 <tr><td>_(VM Being Cloned)_:</td><td><span id="VMBeingCloned"></span></td></tr>
 <tr><td>_(New VM)_:</td><td><input type="text" id="target" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
 <tr><td>_(Overwrite)_:</td><td><input type="checkbox" id="Overwrite" value="" ></td></tr>
@@ -728,9 +661,8 @@ function hideShow() {
 </table>
 </div>
 
-<div id="dialogWindow2"></div>
-<div markdown="1" id="templatesnapshotcreate" class="template">
-<table id="snapshot">
+<div id="templatesnapshotcreate" class="template">
+<table id="snapshot" class="snapshot">
 <tr><td>_(VM Name)_:</td><td><label id="VMName"></label></td></tr>
 <tr><td>_(Snapshot Name)_:</td><td><input type="text" id="targetsnap" autocomplete="off" spellcheck="false" value="--generate" onclick="this.select()">_(Check free space)_:<input type="checkbox" id="targetsnapfspc" checked></td></tr>
 <tr><td>_(Description)_:</td><td><input type="text" id="targetsnapdesc" autocomplete="off" spellcheck="false" value="" onclick="this.select()"></td></tr>
@@ -794,19 +726,13 @@ jQuery.prototype.mixedView = function(s) {
     this.find('tr:gt(0)').hide();
     this.find('span[id^="head_"]').show();
     this.find('span[id^="tile_"]').hide();
-    this.find('span#_cpu_').prop('id','cpu');
-    this.find('span#_sys0_').prop('id','sys0');
-    this.find('span#_ups_loadpct_').prop('id','ups_loadpct');
-    this.find('span#_ups_status_').prop('id','ups_status');
+    changeSpan(this,0)
     return;
   }
   this.find('tr:gt(0)').show();
-  this.find('span#cpu:first').prop('id','_cpu_');
-  this.find('span#sys0:first').prop('id','_sys0_');
-  this.find('span#ups_loadpct:first').prop('id','_ups_loadpct_');
-  this.find('span#ups_status:first').prop('id','_ups_status_');
   this.find('span[id^="head_"]').hide();
   this.find('span[id^="tile_"]').show();
+  changeSpan(this,1)
   if (this.attr('data')) {
     setTimeout(this.attr('data'));
   }
@@ -866,63 +792,6 @@ var netchart = new ApexCharts(document.querySelector('#netchart'), options_net);
 if ($.cookie('port_select')!=null && !ports.includes($.cookie('port_select'))) $.removeCookie('port_select');
 var port_select = $.cookie('port_select')||ports[0];
 
-function selectsnapshot(uuid, name ,snaps, opt, getlist){
-  var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow2");
-  box.html($("#templatesnapshot"+opt).html());
-  var height = 200;
-  const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
-  var optiontext = Capopt + " Snapshot";
-  box.find('#VMName').html(name);
-  box.find('#targetsnap').val(snaps);
-  box.find('#targetsnapl').html(snaps);
-  if (getlist) {
-    var only = (opt == "remove") ? 0 : 1;
-    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid, snapshotname:snaps, only:only}, function(data){if (data.html) box.find('#targetsnapimages').html(data.html);},'json');
-  }
- document.getElementById("targetsnapfspc").checked = true;
-  box.dialog({
-    title: "_("+optiontext+ ")_",
-    resizable: false,
-    width: 600,
-    height: 500,
-    modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
-    buttons: {
-      "_(Proceed)_": function(){
-        var target = box.find('#targetsnap');
-        if (target.length) {
-          target = target.val();
-          if (!target) {errorTarget(); return;}
-        } else target = '';
-        var remove = 'yes';
-        var removemeta = 'yes';
-        var keep = 'yes';
-        var free = 'yes';
-        var desc = '';
-        box.find('#targetsnap').prop('disabled',true);
-        if (opt == "revert") {
-          remove = box.find('#targetsnaprmv').prop('checked') ? 'yes' : 'no';
-          removemeta = box.find('#targetsnaprmvmeta').prop('checked') ? 'yes' : 'no';
-          keep = box.find('#targetsnapkeep').prop('checked') ? 'yes' : 'no';
-        }
-        if (opt == "create") {
-          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
-          desc = box.find("#targetsnapdesc").prop('value');
-        }
-        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid, snapshotname:target, remove:remove, free:free, desc:desc}, "loadlist");
-        box.dialog('close');
-      },
-      "_(Cancel)_": function(){
-        box.dialog('close');
-      }
-    }
-  });
-  dialogStyle();
-}
-
 function initCharts(clear) {
   $.post('/webGui/include/InitCharts.php',{cmd:'get'},function(data) {
     data = JSON.parse(data);
@@ -1068,6 +937,13 @@ function changeMode(item) {
 <?endif;?>
   $('select[name="enter_user"]').val(item);
 }
+function changeSpan(span,dir) {
+  const spans = ['cpu','sys0','ups_loadpct','ups_status','current_time'];
+  switch (dir) {
+    case 0: for (var i=0,id; id=spans[i]; i++) span.find('span#_'+id+'_').prop('id',id); break;
+    case 1: for (var i=0,id; id=spans[i]; i++) span.find('span#'+id+':first').prop('id','_'+id+'_'); break;
+  }
+}
 function changeView(item) {
   if (item==0) $.removeCookie('enter_view'); else $.cookie('enter_view',item,{expires:3650});
   if (item==0) $('.view1').show(); else $('.view1').hide();
@@ -1319,10 +1195,7 @@ function showContent() {
       tbody.find('tr:gt(0)').hide();
       tbody.find('span[id^="head_"]').show();
       tbody.find('span[id^="tile_"]').hide();
-      tbody.find('span#_cpu_').prop('id','cpu');
-      tbody.find('span#_sys0_').prop('id','sys0');
-      tbody.find('span#_ups_loadpct_').prop('id','ups_loadpct');
-      tbody.find('span#_ups_status_').prop('id','ups_status');
+      changeSpan(tbody,0);
     }
   }
   if (count['db-box1']>0) $('div#tile1').show();
@@ -1381,17 +1254,21 @@ function dismiss(button) {
   inactive.push(tbody.attr('sort'));
   $.cookie('inactive_content',inactive.join(';'),{expires:3650});
 }
+function dialogStyle() {
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
+}
 function contentMgmt() {
   box = $("#iframe-popup");
   box.html($("#templateContentMgmt").html().build());
   box.dialog({
     title: "_(Tile Management)_",
-    height: 350,
+    height: 330,
     width: 900,
     resizable: false,
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Reset)_": function(){
         $.removeCookie('db-box1');
@@ -1417,10 +1294,94 @@ function contentMgmt() {
       }
     }
   });
-  $('.ui-dialog-titlebar-close').css({'display':'none'});
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
+  dialogStyle();
+}
+function VMClone(uuid, name){
+  box = $("#iframe-popup");
+  box.html($("#templateClone").html());
+  box.find('#VMBeingCloned').html(name).change();
+  box.find('#target').val(name + "_clone");
+  document.getElementById("Free").checked = true;
+  document.getElementById("Overwrite").checked = true;
+  box.dialog({
+    title: "_(VM Clone)_",
+    height: 330,
+    width: 600,
+    resizable: false,
+    modal: true,
+    buttons: {
+      "_(Clone)_": function(){
+        var target = box.find('#target');
+        if (target.length) {
+          target = target.val();
+          //if (!target) {errorTarget(); return;}
+        } else target = '';
+        var clone = box.find("#target").prop('value');
+        var start = box.find('#Start').prop('checked') ? 'yes' : 'no';
+        var edit = box.find('#Edit').prop('checked') ? 'yes' : 'no';
+        var overwrite = box.find('#Overwrite').prop('checked') ? 'yes' : 'no';
+        var free = box.find('#Free').prop('checked') ? 'yes' : 'no';
+        var scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone", name:name, clone:clone, overwrite:overwrite, edit:edit, start:start, free:free}));
+        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist");
+        box.dialog('close');
+      },
+      "_(Cancel)_": function(){
+        box.dialog('close');
+      }
+    }
+  });
+  dialogStyle();
+}
+function selectsnapshot(uuid, name ,snaps, opt, getlist){
+  box = $("#iframe-popup");
+  box.html($("#templatesnapshot"+opt).html());
+  const capopt = opt.charAt(0).toUpperCase() + opt.slice(1);
+  var optiontext = capopt + " _(Snapshot)_";
+  box.find('#VMName').html(name);
+  box.find('#targetsnap').val(snaps);
+  box.find('#targetsnapl').html(snaps);
+  if (getlist) {
+    var only = (opt == "remove") ? 0 : 1;
+    $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-images", uuid:uuid, snapshotname:snaps, only:only}, function(data){if (data.html) box.find('#targetsnapimages').html(data.html);},'json');
+  }
+  document.getElementById("targetsnapfspc").checked = true;
+  box.dialog({
+    title: optiontext,
+    height: 330,
+    width: 600,
+    resizable: false,
+    modal: true,
+    buttons: {
+      "_(Proceed)_": function(){
+        var target = box.find('#targetsnap');
+        if (target.length) {
+          target = target.val();
+          if (!target) {errorTarget(); return;}
+        } else target = '';
+        var remove = 'yes';
+        var removemeta = 'yes';
+        var keep = 'yes';
+        var free = 'yes';
+        var desc = '';
+        box.find('#targetsnap').prop('disabled',true);
+        if (opt == "revert") {
+          remove = box.find('#targetsnaprmv').prop('checked') ? 'yes' : 'no';
+          removemeta = box.find('#targetsnaprmvmeta').prop('checked') ? 'yes' : 'no';
+          keep = box.find('#targetsnapkeep').prop('checked') ? 'yes' : 'no';
+        }
+        if (opt == "create") {
+          free = box.find('#targetsnapfspc').prop('checked') ? 'yes' : 'no';
+          desc = box.find("#targetsnapdesc").prop('value');
+        }
+        ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid, snapshotname:target, remove:remove, free:free, desc:desc}, "loadlist");
+        box.dialog('close');
+      },
+      "_(Cancel)_": function(){
+        box.dialog('close');
+      }
+    }
+  });
+  dialogStyle();
 }
 
 var sortableHelper = function(e,ui){
@@ -1643,52 +1604,4 @@ $(function() {
     $.post('/webGui/include/InitCharts.php',{cmd:'set',data:JSON.stringify(data)});
   });
 });
-  function dialogStyle() {
-  $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('<i class="fa fa-times"></i>').prop('title');
-  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
-  $('.ui-button-text').css({'padding':'0px 5px'});
-}
-function VMClone(uuid, name){
-  //var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
-  var match= ".iso";
-  var box = $("#dialogWindow");
-  var height = 200;
-  box.html($("#templateClone").html());
-  box.find('#VMBeingCloned').html(name).change() ;
-  box.find('#target').val(name + "_clone") ;
-  document.getElementById("Free").checked = true ;
-  document.getElementById("Overwrite").checked = true ;
-  var Cancel = _("Cancel") ;
-  box.dialog({
-    title: "VM Clone",
-    resizable: false,
-    width: 600,
-    height: 500,
-    modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
-    buttons: {
-      "_(Clone)_": function(){
-        var target = box.find('#target');
-        if (target.length) {
-          target = target.val();
-          //if (!target ) {errorTarget(); return;}
-        } else target = '';
-        var clone = box.find("#target").prop('value');
-        var start = box.find('#Start').prop('checked') ? 'yes' : 'no';
-        var edit = box.find('#Edit').prop('checked') ? 'yes' : 'no';
-        var overwrite = box.find('#Overwrite').prop('checked') ? 'yes' : 'no';
-        var free = box.find('#Free').prop('checked') ? 'yes' : 'no';
-        var scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone", name:name, clone:clone, overwrite:overwrite, edit:edit, start:start, free:free}));
-        openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist");
-        box.dialog('close');
-      },
-      "_(Cancel)_": function(){
-        box.dialog('close');
-      }
-    }
-  });
-  dialogStyle();
-}
 </script>
diff --git a/emhttp/plugins/dynamix/DeviceIdentify.page b/emhttp/plugins/dynamix/DeviceIdentify.page
index e5d632b15..3374e6422 100644
--- a/emhttp/plugins/dynamix/DeviceIdentify.page
+++ b/emhttp/plugins/dynamix/DeviceIdentify.page
@@ -15,10 +15,6 @@ Cond="strpos(_var($disks[$name],'status'),'_NP')===false"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-input[type=date]{border:none;margin-left:-2px;padding-left:0;background:transparent;box-shadow:none}
-select.noframe{border:none;margin-left:0;padding-left:0;background:transparent;box-shadow:none}
-</style>
 <script>
 function disklog(disk,key,value) {
   $.post('/webGui/include/DiskLog.php',{disk:disk,key:key,value:value});
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index f6484e61f..f3f90437c 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -23,7 +23,6 @@ $disk       = &$disks[$name] ?? [];
 $dev        = _var($disk,'device');
 $disk['id'] = _var($disk,'id');
 $events     = explode('|',$disk['smEvents'] ?? $var['smEvents'] ?? $numbers);
-$bgcolor    = in_array($display['theme'],['white','azure']) ? '#f2f2f2' : '#1c1c1c';
 $mode       = ['Disabled','Hourly','Daily','Weekly','Monthly'];
 $days       = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
 
@@ -107,14 +106,7 @@ $text = isPool($name) ? _('This will ERASE content of ALL devices in the pool')
 ?>
 <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>
-input.option{display:none;width:40px}
-select.option,#autosize{display:none}
-span#devtext{display:none;font-weight:bold}
-span#helptext{display:none;font-style:italic}
-span.code{display:inline-block;width:186px}
-i.fa-info.i{margin-right:10px}
-</style>
+
 <script>
 if ($.cookie('deletepool')) {
   $.removeCookie('deletepool');
@@ -489,8 +481,6 @@ function renamePoolPopup() {
     resizable: false,
     width: 600,
     modal: true,
-    show : {effect:'fade', duration:250},
-    hide : {effect:'fade', duration:250},
     buttons: {
     "_(Rename)_": function() {
         if (validate($(this).find('input[name="poolName"]').val())) {
@@ -503,12 +493,10 @@ function renamePoolPopup() {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').css({'display':'none'});
-  $(".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'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function deletePool() {
   $.cookie('deletepool','deletepool');
diff --git a/emhttp/plugins/dynamix/Diagnostics.page b/emhttp/plugins/dynamix/Diagnostics.page
index 24e1a3675..e6aa70ea4 100644
--- a/emhttp/plugins/dynamix/Diagnostics.page
+++ b/emhttp/plugins/dynamix/Diagnostics.page
@@ -4,8 +4,8 @@ Icon="icon-diagnostics"
 Tag="tv"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -18,17 +18,6 @@ Tag="tv"
 <?
 $zip = htmlspecialchars(str_replace(' ','_',strtolower($var['NAME'])));
 ?>
-<style>
-ul,li{margin:0;padding-top:0;padding-bottom:0}
-pre.pre{margin:30px 0}
-pre>p{margin:0;padding:0}
-pre#swaltext{height:600px!important}
-@media (max-width:960px){pre#swaltext{height:400px!important}}
-@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-@media (max-height:768px){pre#swaltext{height:400px!important}}
-@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
-</style>
-
 <script>
 var diagnosticsFile = "";
 var nchan_diagnostics = new NchanSubscriber('/sub/diagnostics',{subscriber:'websocket'});
diff --git a/emhttp/plugins/dynamix/Disk.page b/emhttp/plugins/dynamix/Disk.page
index fb4ec39a0..4656110c7 100644
--- a/emhttp/plugins/dynamix/Disk.page
+++ b/emhttp/plugins/dynamix/Disk.page
@@ -1,8 +1,8 @@
 Type="xmenu"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -31,20 +31,9 @@ $end  = count($refs)-1;
 $prev = urlencode($i>0 ? $refs[$i-1] : $refs[$end]);
 $next = urlencode($i<$end ? $refs[$i+1] : $refs[0]);
 ?>
-<style>
-div.clone1{position:absolute;right:0;margin-top:0}
-div.clone2{position:absolute;right:0;margin-top:48px}
-<?if ($themes1):?>
-span.wrap{display:inline-block;width:128px}
-select.clone{min-width:123px;margin-right:0}
-<?else:?>
-span.wrap{display:inline-block;width:150px}
-select.clone{min-width:145px;margin-right:0}
-<?endif;?>
-input.clone{margin-left:8px;margin-right:0}
-span.clone,i.clone{margin-right:4px}
-</style>
 <script>
+var ctrl = "<span class='ctrl2 status <?=$tabbed?'vhshift':'vshift'?>'><a href='/Shares/Disk?name=<?=$prev?>' title='previous disk share'><button type='button' style='margin-right:4px'><i class='fa fa-chevron-left fa-fw'></i></button></a><a href='/Shares/Disk?name=<?=$next?>' title='next disk share'><button type='button'><i class='fa fa-chevron-right fa-fw'></i></button></a></span>";
+
 function toggleButton(button,id) {
   var disabled = true;
   switch (id) {
@@ -58,8 +47,6 @@ function toggleButton(button,id) {
   $('input#'+button).prop('disabled',disabled);
 }
 
-var ctrl = "<span class='ctrl2 status <?=$tabbed?'vhshift':'vshift'?>'><a href='/Shares/Disk?name=<?=$prev?>' title='previous disk share'><button type='button' style='margin-right:4px'><i class='fa fa-chevron-left fa-fw'></i></button></a><a href='/Shares/Disk?name=<?=$next?>' title='next disk share'><button type='button'><i class='fa fa-chevron-right fa-fw'></i></button></a></span>";
-
 $(function() {
 <?if ($tabbed):?>
   $('.tabs').append(ctrl);
diff --git a/emhttp/plugins/dynamix/DiskList.page b/emhttp/plugins/dynamix/DiskList.page
index 9c32bbdd4..a6fdadabc 100644
--- a/emhttp/plugins/dynamix/DiskList.page
+++ b/emhttp/plugins/dynamix/DiskList.page
@@ -15,11 +15,6 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareDisk')!='no'"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.share_status thead tr td:first-child{width:15%}
-table.share_status thead tr td:nth-child(n+3){width:10%}
-</style>
-
 <table class="share_status">
 <thead><tr><td>_(Name)_</td><td>_(Comment)_</td><td>_(SMB)_</td><td>_(NFS)_</td><td>_(Type)_</td><td>_(Size)_</td><td>_(Free)_</td></tr></thead>
 <tbody id="disk_list"></tbody>
diff --git a/emhttp/plugins/dynamix/DiskSettings.page b/emhttp/plugins/dynamix/DiskSettings.page
index 31aa59506..fc6e161c5 100644
--- a/emhttp/plugins/dynamix/DiskSettings.page
+++ b/emhttp/plugins/dynamix/DiskSettings.page
@@ -29,10 +29,6 @@ function displayTemp($temp) {
   return (is_numeric($temp) && _var($display,'unit')=='F') ? round(9/5*$temp)+32 : $temp;
 }
 ?>
-<style>
-span.code{display:inline-block;width:186px}
-</style>
-
 <script>
 function base64(str) {
   return window.btoa(unescape(encodeURIComponent(str)));
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 3844607bb..0e7a3eef8 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -22,12 +22,6 @@ $plugins = '/var/log/plugins';
 
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 ?>
-<style>
-span#dropbox{margin-right:20px;}
-i.top{position:relative;padding-left:4px;cursor:pointer;}
-select.fixed{max-width:166px}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
 <script>
 var path = '/boot/config/plugins/dynamix';
diff --git a/emhttp/plugins/dynamix/Eth0.page b/emhttp/plugins/dynamix/Eth0.page
index ed54cfc88..1d614fec2 100644
--- a/emhttp/plugins/dynamix/Eth0.page
+++ b/emhttp/plugins/dynamix/Eth0.page
@@ -71,20 +71,6 @@ $vlan_eth0 = $sort_eth0 = [];
 if (isset($eth0)) foreach (vlanID($eth0) as $key => $val) {$vlan_eth0[] = index($key); $sort_eth0[] = (int)$val;}
 array_multisort($sort_eth0,$vlan_eth0);
 ?>
-<style>
-span.red{color:#E68A00}
-span.blue{color:#00529B}
-span.green{color:#4F8A10}
-span.vshift{margin-top:0!important}
-input.gap{margin-right:6px}
-input.form{font-size:1rem;padding:5px 10px;margin-left:10px}
-div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
-div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
-div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
-div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
-select.slim{min-width:47px;margin-left:4px}
-input.slim{width:32px;margin-left:8px}
-</style>
 <script>
 <?if ($build):?>
 refresh(); // automatically include new ethernet ports
diff --git a/emhttp/plugins/dynamix/Flash.page b/emhttp/plugins/dynamix/Flash.page
index 84671cdcf..b57b8e8d6 100644
--- a/emhttp/plugins/dynamix/Flash.page
+++ b/emhttp/plugins/dynamix/Flash.page
@@ -1,8 +1,8 @@
 Type="xmenu"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -18,19 +18,6 @@ function clone_list($disk) {
   return strpos($disk['status'],'_NP')===false && ($disk['type']=='Data' || in_array($disk['name'],$pools));
 }
 ?>
-<style>
-div.clone1{position:absolute;right:0;margin-top:0}
-div.clone2{position:absolute;right:0;margin-top:48px}
-<?if ($themes1):?>
-span.wrap{display:inline-block;width:128px}
-select.clone{min-width:123px;margin-right:0}
-<?else:?>
-span.wrap{display:inline-block;width:150px}
-select.clone{min-width:145px;margin-right:0}
-<?endif;?>
-input.clone{margin-left:8px;margin-right:0}
-span.clone,i.clone{margin-right:4px}
-</style>
 <script>
 function toggleButton(button,id) {
   var disabled = true;
diff --git a/emhttp/plugins/dynamix/InstallKey.page b/emhttp/plugins/dynamix/InstallKey.page
index 62a3d6d01..bffe832f0 100644
--- a/emhttp/plugins/dynamix/InstallKey.page
+++ b/emhttp/plugins/dynamix/InstallKey.page
@@ -4,7 +4,7 @@ Tag="flag"
 Cond="($var['regTy']!='Pro')"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -14,10 +14,6 @@ Cond="($var['regTy']!='Pro')"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-span.info{margin-left:12px}
-</style>
-
 <script>
 function installKey(file) {
   file = file.trim();
diff --git a/emhttp/plugins/dynamix/Language.page b/emhttp/plugins/dynamix/Language.page
index 5877613c3..5c86deae4 100644
--- a/emhttp/plugins/dynamix/Language.page
+++ b/emhttp/plugins/dynamix/Language.page
@@ -28,13 +28,6 @@ $tail = '&quot;)"></i>';
 foreach (glob("$plugins/lang-*.xml",GLOB_NOSORT) as $xml_file) $installed[] = language('LanguageLocal',$xml_file).$head.str_replace('lang-','',basename($xml_file,'.xml')).$tail;
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-select.wide{min-width:<?=$themes2?'314':'300'?>px}
-div.notice{margin-top:70px;margin-bottom:30px}
-div#selectlang{margin-top:20px}
-label.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:1.8px;text-transform:uppercase;min-width:86px;margin:0;padding:8px;text-align:center;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:none;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-label.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
-</style>
 
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script>
diff --git a/emhttp/plugins/dynamix/ManagementAccess.page b/emhttp/plugins/dynamix/ManagementAccess.page
index 5fbf01ab4..9836b3824 100644
--- a/emhttp/plugins/dynamix/ManagementAccess.page
+++ b/emhttp/plugins/dynamix/ManagementAccess.page
@@ -190,10 +190,6 @@ foreach ($output as $line) {
 }
 sort($portsInUse,SORT_NUMERIC);
 ?>
-<style>
-span.warning{margin-left:20px}
-</style>
-
 <script>
 function provisionHandler(event, form) { // provisions and renewals require being Signed In to Unraid.net
   if (event.submitter.value === 'Delete') return true; // always allow deletes
diff --git a/emhttp/plugins/dynamix/NetworkExtra.page b/emhttp/plugins/dynamix/NetworkExtra.page
index b898ac218..b821b0350 100644
--- a/emhttp/plugins/dynamix/NetworkExtra.page
+++ b/emhttp/plugins/dynamix/NetworkExtra.page
@@ -26,13 +26,6 @@ if (file_exists($cfg)) {
   $exclude_interfaces = "";
 }
 ?>
-<style>
-span[id^="info-"]{margin-left:20px}
-<?if ($themes1):?>
-span.status.vhshift{margin-right:-10px!important}
-<?endif;?>
-</style>
-
 <script>
 function prepareText(form) {
   var mgmt = ['br0','bond0','eth0'];
diff --git a/emhttp/plugins/dynamix/NetworkRules.page b/emhttp/plugins/dynamix/NetworkRules.page
index cb94f97f7..5c7de7021 100644
--- a/emhttp/plugins/dynamix/NetworkRules.page
+++ b/emhttp/plugins/dynamix/NetworkRules.page
@@ -34,12 +34,6 @@ foreach ($rules as $rule) {
 }
 ksort($link,SORT_NATURAL);
 ?>
-<style>
-span[id^="info-"]{margin-left:20px}
-<?if ($themes1):?>
-span.status.vhshift{margin-right:-10px!important}
-<?endif;?>
-</style>
 <script>
 var info = {};
 <?foreach ($link as $eth => $val):?>
diff --git a/emhttp/plugins/dynamix/NewConfig.page b/emhttp/plugins/dynamix/NewConfig.page
index 96b6c4ac5..e4d3651ef 100644
--- a/emhttp/plugins/dynamix/NewConfig.page
+++ b/emhttp/plugins/dynamix/NewConfig.page
@@ -4,8 +4,8 @@ Icon="icon-config"
 Tag="cog"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -26,10 +26,6 @@ if ($newarray) {
   foreach ($pools as $pool) @unlink("/var/tmp/$pool.log.tmp");
 }
 ?>
-<style>
-span.indent{display:inline-block;width:240px;margin-top:30px}
-</style>
-
 <script>
 function prepareNewConfig(form) {
   for (var i=1,item; item=form.preset.options[i]; i++) {
diff --git a/emhttp/plugins/dynamix/NewPerms.page b/emhttp/plugins/dynamix/NewPerms.page
index 9d5715413..c43a6ebc6 100644
--- a/emhttp/plugins/dynamix/NewPerms.page
+++ b/emhttp/plugins/dynamix/NewPerms.page
@@ -22,12 +22,6 @@ function data_disks($disk) {
   return (_var($disk,'type')=="Data" || (_var($disk,'type')=="Cache" && in_array(_var($disk,'name'),$pools))) && _var($disk,'status')=='DISK_OK';
 }
 ?>
-<style>
-span.block{display:inline-block;width:300px;margin:24px 0}
-pre.pre{margin:30px 0;padding:20px}
-pre>p{margin:0;padding:0}
-</style>
-
 <script>
 function selection(select,remove) {
   if (remove) {
diff --git a/emhttp/plugins/dynamix/Notifications.page b/emhttp/plugins/dynamix/Notifications.page
index af06f6506..22e485de7 100644
--- a/emhttp/plugins/dynamix/Notifications.page
+++ b/emhttp/plugins/dynamix/Notifications.page
@@ -5,8 +5,8 @@ Icon="icon-notifications"
 Tag="phone-square"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2012, Andrew Hamer-Adams, http://www.pixeleyes.co.nz.
  *
  * This program is free software; you can redistribute it and/or
@@ -21,11 +21,6 @@ Tag="phone-square"
 $events = explode('|', $notify['events'] ?? '');
 $disabled = $notify['system'] ? '' : 'disabled';
 ?>
-<style>
-select.a{min-width:220px}
-input.a{width:220px}
-span.a{display:inline-block;width:220px;font-style:italic}
-</style>
 <script>
 function prepareNotify(form) {
   form.entity.value = form.normal1.checked | form.warning1.checked | form.alert1.checked;
diff --git a/emhttp/plugins/dynamix/NotificationsArchive.page b/emhttp/plugins/dynamix/NotificationsArchive.page
index 1809c97e9..94575b4d7 100644
--- a/emhttp/plugins/dynamix/NotificationsArchive.page
+++ b/emhttp/plugins/dynamix/NotificationsArchive.page
@@ -20,12 +20,6 @@ Tag="archive"
 $files = count(glob("{$notify['path']}/archive/*.notify", GLOB_NOSORT));
 $filters = mk_option(0,'',_('No filter')).mk_option(0,'alert',_('Alerts')).mk_option(0,'warning',_('Warnings')).mk_option(0,'normal',_('Notices'));
 ?>
-<style>
-select.filter{margin:0}
-span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
-i.red-text{font-size:1.6rem}
-</style>
-
 <script>
 var rows = [];
 var filter = "<?=unscript(_var($_GET,'filter'))?>";
diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index b905ca87d..35a91330a 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -24,12 +24,6 @@ if (!file_exists($log)) touch($log);
 <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-$theme.css")?>">
 
-<style>
-div#templateWindow,div#dialogWindow{display:none}
-span.dim{opacity:0.2}
-#screenlog{margin-left:0}
-</style>
-
 <div markdown="1" style="width:43%;margin-bottom:40px;padding:5px 15px;border:solid 1px">
 :php_settings_plug:
 This utility is used for development purposes only and allows Plugin Authors to verify their PHP code by enabling different levels of PHP error reporting.
@@ -137,8 +131,6 @@ function PHPinfo() {
     height: Math.min(window.innerHeight-80,800),
     width: Math.min(window.innerWidth,1200),
     modal: true,
-    show: {effect:'fade', duration:250},
-    hide: {effect:'fade', duration:250},
     buttons: {
       "_(Done)_": function(){
         box.dialog('close');
@@ -147,7 +139,8 @@ function PHPinfo() {
   });
   $('.ui-dialog-titlebar-close').css({'display':'none'});
   $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
-  $('.ui-button-text').css({'padding':'0 5px'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function preset(form) {
   // reset to default settings
diff --git a/emhttp/plugins/dynamix/RoutingTable.page b/emhttp/plugins/dynamix/RoutingTable.page
index a52aa5c0e..dcee292fd 100644
--- a/emhttp/plugins/dynamix/RoutingTable.page
+++ b/emhttp/plugins/dynamix/RoutingTable.page
@@ -29,12 +29,6 @@ foreach ($other as $port) {
   }
 }
 ?>
-<style>
-input.fixed{width:200px;}
-<?if ($themes1):?>
-span.status.vhshift{margin-right:-10px!important}
-<?endif;?>
-</style>
 <script>
 function deleteRoute(gateway,route,metric) {
   swal({title:"Delete route?",text:route+" by gateway "+gateway,type:"warning",html:true,showCancelButton:true,confirmButtonText:"_(Proceed)_",cancelButtonText:"_(Cancel)_"},function(){
diff --git a/emhttp/plugins/dynamix/Share.page b/emhttp/plugins/dynamix/Share.page
index f76f4b6e9..d75cdc6cf 100644
--- a/emhttp/plugins/dynamix/Share.page
+++ b/emhttp/plugins/dynamix/Share.page
@@ -1,8 +1,8 @@
 Type="xmenu"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -38,20 +38,6 @@ if ($name) {
   $tabbed = false;
 }
 ?>
-<style>
-div.clone1{position:absolute;right:10px;margin-top:0}
-div.clone2{position:absolute;right:10px;margin-top:48px}
-span.input{display:inline-block;width:330px}
-<?if ($themes1):?>
-span.wrap{display:inline-block;width:128px}
-select.clone{min-width:123px;max-width:123px;margin-right:0}
-<?else:?>
-span.wrap{display:inline-block;width:150px}
-select.clone{min-width:145px;max-width:145px;margin-right:0}
-<?endif;?>
-input.clone{margin-left:8px;margin-right:0}
-span.clone{margin-right:4px}
-</style>
 <script>
 function toggleButton(button,id) {
   var disabled = true;
diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index 9c26abb99..e5f42f49e 100644
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -98,18 +98,6 @@ function direction() {
 // global shares include/exclude
 $myDisks = array_filter(array_diff(array_keys(array_filter($disks,'my_disks')), explode(',',$var['shareUserExclude'])), 'globalInclude');
 ?>
-<style>
-div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
-div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
-div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
-div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
-#s1,#s2,#s3,#s4,#s5,#autosize,.empty,.full2,#zfs-name{display:none}
-i.fa-info.i{margin-right:10px}
-<?if ($themes1):?>
-form[name=share_edit]{margin-top:-20px}
-<?endif;?>
-</style>
-
 :share_edit_global1_help:
 <?if ($name):?>
 :share_edit_global2_help:
diff --git a/emhttp/plugins/dynamix/ShareList.page b/emhttp/plugins/dynamix/ShareList.page
index b22d0512d..de4970ce5 100644
--- a/emhttp/plugins/dynamix/ShareList.page
+++ b/emhttp/plugins/dynamix/ShareList.page
@@ -15,14 +15,6 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.share_status thead tr td:first-child{width:15%}
-table.share_status thead tr td:nth-child(n+3){width:9%!important}
-table.share_status thead tr td:nth-child(5){width:13%!important}
-td.empty{text-align:center;padding-top:12px}
-i.fa-fw{margin-right:2px}
-</style>
-
 <table class="share_status">
 <thead><tr><td>_(Name)_</td><td>_(Comment)_</td><td>_(SMB)_</td><td>_(NFS)_</td><td>_(Storage)_</td><td>_(Size)_</td><td>_(Free)_</td></tr></thead>
 <tbody id="shareslist"></tbody>
diff --git a/emhttp/plugins/dynamix/SysDevs.page b/emhttp/plugins/dynamix/SysDevs.page
index 650c6eb70..7101f00ca 100644
--- a/emhttp/plugins/dynamix/SysDevs.page
+++ b/emhttp/plugins/dynamix/SysDevs.page
@@ -4,8 +4,8 @@ Icon="icon-hardware"
 Tag="server"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,12 +15,6 @@ Tag="server"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.pre{margin-top:0;background:transparent}
-table.pre td:first-child{width:144px}
-table tr td{padding:0 0 3px 0;margin:0}
-table tr td.thin{line-height:8px;height:8px}
-</style>
 <script>
 $(function(){
   $('#t1').load('/webGui/include/SysDevs.php',{table:'t1'});
diff --git a/emhttp/plugins/dynamix/SysDrivers.page b/emhttp/plugins/dynamix/SysDrivers.page
index 1cdba485b..fe401b664 100644
--- a/emhttp/plugins/dynamix/SysDrivers.page
+++ b/emhttp/plugins/dynamix/SysDrivers.page
@@ -1,6 +1,6 @@
 Menu="UNRAID-OS"
 Title="System Drivers"
-Icon="fa-sitemap"
+Icon="icon-packages"
 Tag="server"
 ---
 <?PHP
@@ -15,18 +15,6 @@ Tag="server"
  * all copies or substantial portions of the Software.
  */
 ?>
-<style>
-table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
-table.t1 tr td{padding:0 0 3px 0;margin:0}
-table.t1 tr td.thin{line-height:8px;height:8px}
-table.t1 tr>td{width:1%;text-align:centre;white-space: nowrap}
-table.t1 tr>td+td{width:1%;white-space:nowrap}
-table.t1 tr>td+td+td{width:auto;text-align:left}
-table.t1 tr>td+td+td+td{text-align:left}
-table.t1 tr>td+td+td+td+td{text-align:left}
-.t1.tablesorter .filtered{display:none}
-</style>
-
 <script type="text/javascript" src="/webGui/javascript/jquery.tablesorter.widgets.js"></script>
 <script type="text/javascript">
 
diff --git a/emhttp/plugins/dynamix/Syslinux.page b/emhttp/plugins/dynamix/Syslinux.page
index bf088843e..e01948918 100644
--- a/emhttp/plugins/dynamix/Syslinux.page
+++ b/emhttp/plugins/dynamix/Syslinux.page
@@ -3,8 +3,8 @@ Title="Syslinux Configuration"
 Tag="edit"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -31,28 +31,7 @@ $menu    = 'menu default';
 $mark    = 'label ';
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-div.basic{display:block}
-div.advanced{display:none}
-textarea.raw{resize:none;font-family:bitstream;width:65.5%}
-<?
-switch (strtok($display['theme'],'-')) {
-case 'gray':
-case 'azure':
-  echo "span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #606E7F;border-bottom:none}\n";
-  echo "textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border-top:none}\n";
-  break;
-case 'white':
-  echo "span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #1c1c1c;border-bottom:none}\n";
-  echo "textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #1c1b1b;border-top:none}\n";
-  break;
-case 'black':
-  echo "span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #f2f2f2;border-bottom:none}\n";
-  echo "textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #f2f2f2;border-top:none}\n";
-  break;
-}
-?>
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script>
 const title = '<?=$title?>';
diff --git a/emhttp/plugins/dynamix/Syslog.page b/emhttp/plugins/dynamix/Syslog.page
index 3f4a19493..5ae4abec2 100644
--- a/emhttp/plugins/dynamix/Syslog.page
+++ b/emhttp/plugins/dynamix/Syslog.page
@@ -42,9 +42,6 @@ if (count($logs)) {
 }
 $select = implode($select);
 ?>
-<style>
-input#max{border:none;width:60px;margin:0;padding:0}
-</style>
 <script>
 var logfile = "<?=$log?>";
 
diff --git a/emhttp/plugins/dynamix/SyslogSettings.page b/emhttp/plugins/dynamix/SyslogSettings.page
index 314328b4b..22db32271 100644
--- a/emhttp/plugins/dynamix/SyslogSettings.page
+++ b/emhttp/plugins/dynamix/SyslogSettings.page
@@ -35,9 +35,6 @@ foreach ($output as $line) {
   if (!in_array($port,$portsInUse) && (!$bind || in_array(plain($ip),$list))) $portsInUse[] = $port;
 }
 ?>
-<style>
-span.span{display:inline-block;width:224px}
-</style>
 <script>
 function localFolder(local,time) {
   if (local) $('#local_folder').show(time); else $('#local_folder').hide(time);
diff --git a/emhttp/plugins/dynamix/UserAdd.page b/emhttp/plugins/dynamix/UserAdd.page
index d3a957f19..e32f64c22 100644
--- a/emhttp/plugins/dynamix/UserAdd.page
+++ b/emhttp/plugins/dynamix/UserAdd.page
@@ -3,8 +3,8 @@ Title="Add User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -19,21 +19,6 @@ $void = "<img src='/webGui/images/user.png' width='48' height='48' onclick='$(&q
 $icon = "<i class='fa fa-trash top' title='"._('Restore default image')."' onclick='restore()'></i>";
 $zxcvbn = file_exists('/boot/config/plugins/dynamix/zxcvbn.js');
 ?>
-<style>
-<?if ($display['theme']=='gray'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='azure'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='black'):?>
-span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
-<?else:?>
-span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
-<?endif;?>
-i.top{position:absolute;padding-top:4px;cursor:pointer}
-i#showPass.checked{opacity:0.5}
-.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
 <?if ($zxcvbn):?>
 <script src="<?autov('/boot/config/plugins/dynamix/zxcvbn.js')?>" async></script>
diff --git a/emhttp/plugins/dynamix/UserEdit.page b/emhttp/plugins/dynamix/UserEdit.page
index e14b7e2d8..4a4f937c2 100644
--- a/emhttp/plugins/dynamix/UserEdit.page
+++ b/emhttp/plugins/dynamix/UserEdit.page
@@ -3,8 +3,8 @@ Title="Edit User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -28,21 +28,6 @@ $zxcvbn = file_exists('/boot/config/plugins/dynamix/zxcvbn.js');
 $file   = "/boot/config/ssh/root/authorized_keys";
 $text   = preg_replace(["/\r\n/","/\r/"],"\n", @file_get_contents($file) ?: '');
 ?>
-<style>
-<?if ($display['theme']=='gray'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='azure'):?>
-span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
-<?elseif ($display['theme']=='black'):?>
-span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
-<?else:?>
-span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
-<?endif;?>
-i.top{position:absolute;padding-top:4px;cursor:pointer}
-i#showPass.checked{opacity:0.5}
-.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
-</style>
-
 <script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
 <?if ($zxcvbn):?>
 <script src="<?autov('/boot/config/plugins/dynamix/zxcvbn.js')?>" async></script>
diff --git a/emhttp/plugins/dynamix/UserList.page b/emhttp/plugins/dynamix/UserList.page
index c80219759..c81cfdc46 100644
--- a/emhttp/plugins/dynamix/UserList.page
+++ b/emhttp/plugins/dynamix/UserList.page
@@ -19,13 +19,6 @@ $submenu = !empty($display['users']) && substr($display['users'],0,5)!='Tasks';
 if ($submenu) $path = './Users';
 ksort($users);
 ?>
-<style>
-a.info span{top:66px;left:42px}
-<?if ($themes1):?>
-div#title{margin-top:-30px!important}
-<?endif;?>
-</style>
-
 <div id="title" class="title"><span class="left"><i class="fa fa-bell title"></i>_(Management Access)_</span></div>
 <?$img = "/boot/config/plugins/dynamix/users/root.png"?>
 <div class="user-list" style="text-align:center"><a class="<?=(!empty($users['root']['desc']) ? 'info' : '')?>" href="<?=$path?>/UserEdit?name=root"><img src="<?=(file_exists($img) ? autov($img) : '/webGui/images/user.png')?>" class="picture" border="0" width="48" height="48"><br>root<span><?=htmlspecialchars($users['root']['desc'])?></span></a></div>
diff --git a/emhttp/plugins/dynamix/WG0.page b/emhttp/plugins/dynamix/WG0.page
index 36317690d..27513b2fe 100644
--- a/emhttp/plugins/dynamix/WG0.page
+++ b/emhttp/plugins/dynamix/WG0.page
@@ -138,21 +138,22 @@ $server    = ipaddr($ethX);
 $dnsserver = _var($$ethX,'DNS_SERVER1');
 
 $link      = iflink($ethX);
+$vhost     = str_replace(['eth','br','bond'],'vhost',$link);
 $postUp0   = "$script add $link WireGuard-<wg> $server <port> <port> udp";
 $postUp1   = "logger -t wireguard -- 'Tunnel WireGuard-<wg> started';$services";
-$postUp2   = "iptables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postUp2   = "iptables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE;iptables -t nat -A POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postUp3   = "iptables -N WIREGUARD_DROP_<WG>;iptables -A WIREGUARD -o $link -j WIREGUARD_DROP_<WG>";
 $postUpX   = "iptables -A WIREGUARD_DROP_<WG> -s <source> -d <target> -j DROP";
 $postUpZ   = "iptables -A WIREGUARD_DROP_<WG> -s <source> -j ACCEPT;iptables -A WIREGUARD_DROP_<WG> -j RETURN";
-$postUp26  = "ip6tables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postUp26  = "ip6tables -t nat -A POSTROUTING -s <source> -o $link -j MASQUERADE;ip6tables -t nat -A POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postUp36  = "ip6tables -N WIREGUARD_DROP_<WG>;ip6tables -A WIREGUARD -o $link -j WIREGUARD_DROP_<WG>";
 $postUpX6  = "ip6tables -A WIREGUARD_DROP_<WG> -s <source> -d <target> -j DROP";
 $postUpZ6  = "ip6tables -A WIREGUARD_DROP_<WG> -s <source> -j ACCEPT;ip6tables -A WIREGUARD_DROP_<WG> -j RETURN";
 $postDown0 = "$script del $link <port> udp";
 $postDown1 = "logger -t wireguard -- 'Tunnel WireGuard-<wg> stopped';$services";
-$postDown2 = "iptables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postDown2 = "iptables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE;iptables -t nat -D POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postDown3 = "iptables -F WIREGUARD_DROP_<WG>;iptables -D WIREGUARD -o $link -j WIREGUARD_DROP_<WG>;iptables -X WIREGUARD_DROP_<WG>";
-$postDown26= "ip6tables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE";
+$postDown26= "ip6tables -t nat -D POSTROUTING -s <source> -o $link -j MASQUERADE;ip6tables -t nat -D POSTROUTING -s <source> -o $vhost -j MASQUERADE";
 $postDown36= "ip6tables -F WIREGUARD_DROP_<WG>;ip6tables -D WIREGUARD -o $link -j WIREGUARD_DROP_<WG>;ip6tables -X WIREGUARD_DROP_<WG>";
 
 $tld       = @file_get_contents("$docroot/webGui/include/tld.key")?:'';
@@ -211,39 +212,7 @@ foreach ($vtuns as $wgX) {
 }
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-dt{width:22%}
-span.even{float:right;display:inline-block;width:150px;margin-top:3px}
-span.even.wide{width:200px}
-span.pin{float:right;margin:-40px 12px 0 0;clear:both;display:inline-block;width:400px;text-align:right}
-span[class^=rx]{margin-right:40px}
-span.hshift{margin-right:<?=$themes1?'-7':'11'?>px!important}
-span.vshift{margin-top:-2px!important}
-span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:<?=$themes1?'-12':'-4'?>px}
-span.input{display:inline-block;width:420px}
-span.access-type{display:inline-block;width:35%;white-space:normal}
-@media(max-width:1920px){span.access-type{width:20%}}
-span.block{display:inline-block;width:48%;white-space:normal}
-div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
-div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
-div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
-div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
-div.title{margin-bottom:10px!important}
-div[id^=block-wg]{margin-bottom:30px}
-div.preset{margin:8px 0;float:right}
-input.wide{width:360px}
-input.subnet{width:150px;margin-right:4px}
-input.mask{width:30px}
-input.port{width:50px}
-input.form,button.form{font-size:1rem;min-width:0;padding:5px 8px;margin:0}
-input.ok{color:#f2f2f2;background:#4f8a10}
-input.nok{color:#f2f2f2;background:#f0000c}
-select.subnet{min-width:150px}
-i.fa-fw{margin-left:5px}
-i.key-off{opacity:0.3;cursor:default!important}
-input:user-invalid {border-bottom-color:#E22828;}
-input:-moz-ui-invalid {border-bottom-color:#E22828;}
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script>
 <?if ($build):?>
@@ -252,7 +221,7 @@ refresh();
 Number.prototype.long2ip = function(){return [this>>>24,this>>>16&255,this>>>8&255,this&255].join('.');}
 String.prototype.ip2long = function(){var ip=this.split('.');return (ip[0]<<24)+(ip[1]<<16)+(ip[2]<<8)+(ip[3]*1);}
 String.prototype.desc    = function(){return this.substr(this.lastIndexOf('/'));}
-String.prototype.patch   = function(s,t){return t?this.replace(/<source>/,s).replace(/<target>/,t):this.replace(/<source>/,s);}
+String.prototype.patch   = function(s,t){return t?this.replace(/<source>/g,s).replace(/<target>/,t):this.replace(/<source>/g,s);}
 Array.prototype.bind     = function(w){return (this.join(';')).replace(/<WG>/g,w).replace(/,/g,';');}
 
 var xml = $.cookie('upnp')||'<?=@file_get_contents('/var/tmp/upnp')?>';
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 0cdd4f4c3..d36fcc2bb 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -680,6 +680,13 @@ if ($themes2) echo "</div>";
 echo "</div></div>";
 foreach ($buttons as $button) {
   annotate($button['file']);
+  // include page specific stylesheets (if existing)
+  $css = "/{$button['root']}/sheets/{$button['name']}";
+  $css_stock = "$css.css";
+  $css_theme = "$css-$theme.css";
+  if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
+  if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
+  // create page content
   eval('?>'.parse_text($button['text']));
 }
 unset($buttons,$button);
@@ -738,9 +745,12 @@ foreach ($pages as $page) {
   // create list of nchan scripts to be started
   if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
   annotate($page['file']);
-  // include page specific stylesheet (if existing)
-  $css = "/{$page['root']}/pages/{$page['name']}.css";
-  if (is_file($docroot.$css)) echo '<link type="text/css" rel="stylesheet" href="',autov($css),'">',"\n";
+  // include page specific stylesheets (if existing)
+  $css = "/{$page['root']}/sheets/{$page['name']}";
+  $css_stock = "$css.css";
+  $css_theme = "$css-$theme.css";
+  if (is_file($docroot.$css_stock)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_stock),'">',"\n";
+  if (is_file($docroot.$css_theme)) echo '<link type="text/css" rel="stylesheet" href="',autov($css_theme),'">',"\n";
   // create page content
   empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
   if ($close) echo "</div></div>";
diff --git a/emhttp/plugins/dynamix/include/DiskList.php b/emhttp/plugins/dynamix/include/DiskList.php
index f8bd58e40..7c78e0998 100644
--- a/emhttp/plugins/dynamix/include/DiskList.php
+++ b/emhttp/plugins/dynamix/include/DiskList.php
@@ -88,7 +88,7 @@ foreach ($disks as $name => $disk) {
   } else $luks = "";
   echo "<tr><td><a class='view' href=\"/$path/Browse?dir=/mnt/$name\"><i class=\"icon-u-tab\" title=\"",_('Browse')," /mnt/$name\"></i></a>";
   echo "<a class='info nohand' onclick='return false'><i class='fa fa-$orb orb $color-orb'></i><span style='left:18px'>$help</span></a>$luks<a href=\"/$path/Disk?name=$name\" onclick=\"$.cookie('one','tab1')\">",compress($name),"</a></td>";
-  echo "<td>{$disk['comment']}</td>";
+  echo "<td>"._var($disk,'comment')."</td>";
   echo "<td>",disk_share_settings(_var($var,'shareSMBEnabled'), $sec[$name]),"</td>";
   echo "<td>",disk_share_settings(_var($var,'shareNFSEnabled'), $sec_nfs[$name]),"</td>";
   $cmd="/webGui/scripts/disk_size&arg1=$name&arg2=ssz2";
diff --git a/emhttp/plugins/dynamix/include/Templates.php b/emhttp/plugins/dynamix/include/Templates.php
index 5e2abdfaa..cb9f930b9 100644
--- a/emhttp/plugins/dynamix/include/Templates.php
+++ b/emhttp/plugins/dynamix/include/Templates.php
@@ -10,51 +10,9 @@
  * all copies or substantial portions of the Software.
  */
 ?>
-<?
-$dfm['hover']   = in_array($theme,['white','azure']) ? 'rgba(0,0,0,0.1)' : 'rgba(255,255,255,0.1)';
-$dfm['bgcolor'] = in_array($theme,['white','azure']) ? '#f2f2f2' : '#1c1c1c';
-$dfm['fgcolor'] = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
-$dfm['incolor'] = $theme!='gray' ? $dfm['bgcolor'] : '#121510';
-?>
 <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-$theme.css")?>">
 
-<style>
-#countdown{float:left;margin-left:100px}
-#user-notice{float:left}
-div.dfm_info{position:absolute;bottom:4px;width:74%;margin-left:23%}
-div.dfm_template{display:none}
-div#dfm_dialogWindow{overflow-x:hidden}
-div#dfm_dialogWindow dt{width:23%}
-div#dfm_joblist{text-align:left;margin-top:20px;margin-left:56px}
-span.dfm_filter{position:relative;margin-left:<?=$themes1?'12':'0'?>px;top:-<?=$themes1?'2':'8'?>px}
-span.dfm_filter i{position:absolute;left:10px;top:<?=$themes1?'4':'8'?>px;font-size:1.4rem}
-span.dfm_loc{display:inline-block}
-span.dfm_text{display:inline-block;width:75%;white-space:normal}
-span.dfm_device{display:inline-block;float:left}
-span.dfm_percent{display:inline-block;width:40px}
-span.dfm_speed{display:inline-block;margin-left:10px;width:140px}
-input.dfm_filter{border:none;width:100px;background-color:<?=$dfm['incolor']?>;margin:-8px 0 0 0;padding-left:30px}
-input.dfm_filter:focus{background-color:<?=$dfm['incolor']?>}
-input#dfm_sparse,input#dfm_exist{margin-left:0}
-input#dfm_target{color:<?=$dfm['fgcolor']?>;width:500px}
-input#dfm_target+.fileTree{background:<?=$dfm['bgcolor']?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-select.dfm{margin:0 40px 0 10px}
-select#dfm_source{min-width:none;max-width:none;border:none;background-image:none;width:660px;cursor:default}
-select#dfm_source option{background-color:transparent}
-i.dfm{margin-right:8px}
-i.dfm_filter{margin-top:-<?=$themes1?'2':'4'?>px}
-i.job{cursor:pointer;font-size:1.8rem;vertical-align:middle}
-.ui-dfm .ui-dialog-titlebar-close{background:transparent;border:none;font-size:1.8rem!important;margin-top:-14px!important;margin-right:-18px!important}
-.ui-dfm .ui-dialog-titlebar-close:hover{background:transparent;color:#ff8c2f}
-.ui-dfm .ui-dialog-title{text-align:center;width:100%;font-size:1.8rem}
-.ui-dfm .ui-dialog-content{padding-top:15px;vertical-align:bottom}
-.ui-dfm .ui-button-text{padding:0px 5px}
-.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled],
-.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]:hover
-{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-</style>
-
 <div class="dfm_template">
 <div id="dfm_dialogWindow"></div>
 <input type="file" id="dfm_upload" value="" onchange="startUpload(this.files)" multiple>
diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index 2f09b8bc0..62ffd5373 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -26,6 +26,9 @@ $_SERVER['REQUEST_URI'] = 'dashboard/main';
 $login_locale = _var($display,'locale');
 require_once "$docroot/webGui/include/Translations.php";
 
+// remember current language
+$locale_init = $locale;
+
 function update_translation($locale) {
   global $docroot,$language;
   $language = [];
diff --git a/emhttp/plugins/dynamix/sheets/Apps.css b/emhttp/plugins/dynamix/sheets/Apps.css
new file mode 100644
index 000000000..a634a683c
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Apps.css
@@ -0,0 +1 @@
+div.notice{margin:150px 0 20px 0}
diff --git a/emhttp/plugins/dynamix/sheets/ArrayOperation.css b/emhttp/plugins/dynamix/sheets/ArrayOperation.css
new file mode 100644
index 000000000..938141281
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ArrayOperation.css
@@ -0,0 +1,5 @@
+tr#copy,tr#file{display:none}
+td.gap{padding-left:26px!important}
+td.wrap{white-space:normal!important}
+span#pass{display:none;margin-left:20px}
+input[type=checkbox]{margin-left:0}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-azure.css b/emhttp/plugins/dynamix/sheets/Browse-azure.css
new file mode 100644
index 000000000..1c2163f85
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-azure.css
@@ -0,0 +1,2 @@
+div.autoheight{width:100%;overflow-y:auto;margin-top:0}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(0,0,0,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-black.css b/emhttp/plugins/dynamix/sheets/Browse-black.css
new file mode 100644
index 000000000..8e73bd4d7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-black.css
@@ -0,0 +1,4 @@
+tr.ace_optionsMenuEntry td select{color:#1c1b1b;border-bottom:1px solid #1c1b1b;background-image:linear-gradient(66.6deg,transparent 60%,#1c1b1b 40%),linear-gradient(113.4deg, #1c1b1b 40%,transparent 60%)}
+tr.ace_optionsMenuEntry td input[type=number]{color:#1c1b1b}
+div.autoheight{width:100%;overflow-y:auto;margin-top:-30px}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(255,255,255,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-gray.css b/emhttp/plugins/dynamix/sheets/Browse-gray.css
new file mode 100644
index 000000000..febf7ba94
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-gray.css
@@ -0,0 +1,2 @@
+div.autoheight{width:100%;overflow-y:auto;margin-top:0}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(255,255,255,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse-white.css b/emhttp/plugins/dynamix/sheets/Browse-white.css
new file mode 100644
index 000000000..9c6bf20b6
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse-white.css
@@ -0,0 +1,2 @@
+div.autoheight{width:100%;overflow-y:auto;margin-top:-30px}
+table.tablesorter.indexer tbody tr:hover td{background-color:rgba(0,0,0,0.1)}
diff --git a/emhttp/plugins/dynamix/sheets/Browse.css b/emhttp/plugins/dynamix/sheets/Browse.css
new file mode 100644
index 000000000..6143a0b62
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Browse.css
@@ -0,0 +1,26 @@
+div#ace_settingsmenu,table#controls,table#more-controls{margin-top:0;background-color:#f2f2f2}
+tr.ace_optionsMenuEntry td{padding:4px;color:#1c1b1b}
+tr.ace_optionsMenuEntry td select option{color:#1c1b1b;background-color:#e8e8e8}
+tr.ace_optionsMenuEntry td input[type=number]::-webkit-inner-spin-button{-webkit-appearance:auto;cursor:pointer}
+tr.ace_optionsMenuEntry td input[type=number]{-moz-appearance:auto;margin:0}
+.title{letter-spacing:1px}
+.title span.left{text-transform:none}
+.loc{text-align:left!important;padding-left:0!important}
+table.tablesorter.indexer{margin-top:0}
+table.tablesorter.indexer thead th:nth-child(1){width:12px;text-align:left;padding-left:11px}
+table.tablesorter.indexer thead th:nth-child(2){width:3%!important}
+table.tablesorter.indexer thead th:nth-child(3){width:auto!important}
+table.tablesorter.indexer thead th:nth-child(n+4){width:10%!important}
+table.tablesorter.indexer thead th:nth-child(9){width:3%!important}
+table.tablesorter.indexer tbody tr:hover td{background-color:<?=$dfm['hover']?>}
+table.tablesorter.indexer thead th{text-align:left}
+table.tablesorter.indexer tbody td{text-align:left}
+table.tablesorter.indexer thead th:last-child{text-align:right}
+table.tablesorter.indexer tbody td:last-child{text-align:right}
+i[id^="row_"],i[id^="check_"]{cursor:pointer;font-size:1.8rem;color:gray}
+td[id^="name_"]{cursor:pointer}
+i.fa-home{font-size:2rem}
+i.fa-chevron-right{font-size:1.2rem;margin:0 8px}
+div.autoheight{width:100%;overflow-y:auto;margin-top:<?=$themes1?'-30px':'0'?>}
+div#buttons{display:none}
+.dropdown-menu{z-index:10001}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-azure.css b/emhttp/plugins/dynamix/sheets/BrowseButton-azure.css
new file mode 100644
index 000000000..e1447bb24
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-azure.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:0;top:-8px}
+span.dfm_filter i{position:absolute;left:10px;top:8px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#f2f2f2;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#f2f2f2}
+input#dfm_target{color:#1c1c1c;width:500px}
+input#dfm_target+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-black.css b/emhttp/plugins/dynamix/sheets/BrowseButton-black.css
new file mode 100644
index 000000000..523a6c9c3
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-black.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:12px;top:-2px}
+span.dfm_filter i{position:absolute;left:10px;top:4px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#1c1c1c;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#1c1c1c}
+input#dfm_target{color:#f2f2f2;width:500px}
+input#dfm_target+.fileTree{background:#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-2px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-gray.css b/emhttp/plugins/dynamix/sheets/BrowseButton-gray.css
new file mode 100644
index 000000000..db8173b7a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-gray.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:0;top:-8px}
+span.dfm_filter i{position:absolute;left:10px;top:8px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#121510;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#121510}
+input#dfm_target{color:#f2f2f2;width:500px}
+input#dfm_target+.fileTree{background:<#1c1c1c;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton-white.css b/emhttp/plugins/dynamix/sheets/BrowseButton-white.css
new file mode 100644
index 000000000..028a259fd
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton-white.css
@@ -0,0 +1,7 @@
+span.dfm_filter{position:relative;margin-left:12px;top:-2px}
+span.dfm_filter i{position:absolute;left:10px;top:4px;font-size:1.4rem}
+input.dfm_filter{border:none;width:100px;background-color:#f2f2f2;margin:-8px 0 0 0;padding-left:30px}
+input.dfm_filter:focus{background-color:#f2f2f2}
+input#dfm_target{color:#1c1c1c;width:500px}
+input#dfm_target+.fileTree{background:#f2f2f2;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+i.dfm_filter{margin-top:-2px}
diff --git a/emhttp/plugins/dynamix/sheets/BrowseButton.css b/emhttp/plugins/dynamix/sheets/BrowseButton.css
new file mode 100644
index 000000000..deacdf437
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/BrowseButton.css
@@ -0,0 +1,25 @@
+#countdown{float:left;margin-left:100px}
+#user-notice{float:left}
+div.dfm_info{position:absolute;bottom:4px;width:74%;margin-left:23%}
+div.dfm_template{display:none}
+div#dfm_dialogWindow{overflow-x:hidden}
+div#dfm_dialogWindow dt{width:23%}
+div#dfm_joblist{text-align:left;margin-top:20px;margin-left:56px}
+span.dfm_loc{display:inline-block}
+span.dfm_text{display:inline-block;width:75%;white-space:normal}
+span.dfm_device{display:inline-block;float:left}
+span.dfm_percent{display:inline-block;width:40px}
+span.dfm_speed{display:inline-block;margin-left:10px;width:140px}
+input#dfm_sparse,input#dfm_exist{margin-left:0}
+select.dfm{margin:0 40px 0 10px}
+select#dfm_source{min-width:none;max-width:none;border:none;background-image:none;width:660px;cursor:default}
+select#dfm_source option{background-color:transparent}
+i.dfm{margin-right:8px}
+i.job{cursor:pointer;font-size:1.8rem;vertical-align:middle}
+.ui-dfm .ui-dialog-titlebar-close{background:transparent;border:none;font-size:1.8rem!important;margin-top:-14px!important;margin-right:-18px!important}
+.ui-dfm .ui-dialog-titlebar-close:hover{background:transparent;color:#ff8c2f}
+.ui-dfm .ui-dialog-title{text-align:center;width:100%;font-size:1.8rem}
+.ui-dfm .ui-dialog-content{padding-top:15px;vertical-align:bottom}
+.ui-dfm .ui-button-text{padding:0px 5px}
+.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled],
+.ui-dfm .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]:hover{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
diff --git a/emhttp/plugins/dynamix/sheets/CPUvms.css b/emhttp/plugins/dynamix/sheets/CPUvms.css
new file mode 100644
index 000000000..bbb3cdabf
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/CPUvms.css
@@ -0,0 +1,6 @@
+table.tablesorter tr>th+th{text-align:right;vertical-align:top}
+table.tablesorter tr>td+td+td{vertical-align:top}
+table.tablesorter tr>th+th+th,table.tablesorter tr>td+td{text-align:center}
+table.tablesorter th:first-child,table.tablesorter td:first-child{width:180px;text-align:left}
+input.flat{margin:0}
+input.lock{margin:0}
diff --git a/emhttp/plugins/dynamix/sheets/CacheDevices.css b/emhttp/plugins/dynamix/sheets/CacheDevices.css
new file mode 100644
index 000000000..018084e3c
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/CacheDevices.css
@@ -0,0 +1 @@
+table.divider{margin-top:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-azure.css b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
new file mode 100644
index 000000000..df98991be
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-azure.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-black.css b/emhttp/plugins/dynamix/sheets/DashStats-black.css
new file mode 100644
index 000000000..9d50b19d9
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-black.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(610px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-gray.css b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
new file mode 100644
index 000000000..df98991be
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-gray.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats-white.css b/emhttp/plugins/dynamix/sheets/DashStats-white.css
new file mode 100644
index 000000000..9d50b19d9
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats-white.css
@@ -0,0 +1 @@
+div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(610px,1fr));column-gap:20px}
diff --git a/emhttp/plugins/dynamix/sheets/DashStats.css b/emhttp/plugins/dynamix/sheets/DashStats.css
new file mode 100644
index 000000000..aa216a082
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DashStats.css
@@ -0,0 +1,67 @@
+div.frame{padding-top:14px;padding-bottom:160px}
+div.tile,i.tile{display:none}
+div#iframe-popup{display:none;-webkit-overflow-scrolling:touch}
+div.last{padding-bottom:12px}
+div.leftside{float:left;width:66%}
+div.rightside{float:right;margin:0;text-align:center}
+div[id$=chart]{margin:-12px 8px -24px -18px}
+div.template,div#dialogWindow,input#upload{display:none}
+span.head_info{width:250px;display:inline-block}
+span#head_cpu,span#head_ram,#head_ups,#head_apps,#head_vms,#_ups_status_,#_current_time_{display:none;margin-left:0}
+span.head_bar{display:inline-block;width:180px}
+span.head_gap{padding-left:14px}
+span.head_time{padding-left:40px;font-size:inherit!important;font-weight:bold!important}
+span.head_time .ampm{font-size:inherit!important;font-weight:bold!important;text-transform:uppercase!important}
+span.ampm{font-size:3rem}
+span.green,span.red,span.orange{padding-left:0}
+span.ctrl{float:right;margin-top:0;margin-right:10px}
+span.ctrl span{font-size:2rem!important}
+span.outer{float:left}
+span.inner{width:143px}
+span.rx{width:80px;display:inline-block}
+span.busy,i.inactive{opacity:0.5}
+span.dense{width:180px;display:inline-block}
+span#ups_model{margin-right:30px}
+span#chart-toggle{float:right}
+span.header,tr.header{font-size:1.1rem!important;text-transform:uppercase;letter-spacing:1px}
+span.wg1{font-size:1.1rem;text-indent:24px}
+span.wg2{font-size:1.1rem}
+span[id^=cpu],span[id^=sys]{width:0}
+span[class^="fa "]{font-size:1.6rem;margin-right:18px}
+span.load.resize{font-size:1.1rem}
+span.fan{width:36%;display:inline-block}
+span.w18{width:18%;display:inline-block;float:left}
+span.w26{width:26%;display:inline-block;float:left}
+span.w36{width:36%;display:inline-block;float:left}
+span.w44{width:44%;display:inline-block;float:left}
+span.w72{width:72%;display:inline-block;float:left}
+select#cpuline,select#netline{border:none;padding:0 12px 0 0}
+select[name=enter_share],select[name=enter_user]{margin-top:0;float:none}
+img#mycase{width:auto;max-width:128px;height:auto;max-height:128px}
+i.heat{margin-left:8px}
+i.ups{margin-right:8px;font-size:1.4rem!important}
+i.vpn{font-size:1.4rem!important;cursor:pointer}
+i.indent{display:inline-block;width:18px}
+i.f32{font-size:32px!important}
+i.f14{font-size:1.4rem!important}
+i.fa.orb{margin-left:0}
+i.fa-wrench.tile{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important}
+i[class^="icon-"]{font-size:1.6rem;margin-right:8px}
+i[class^="icon-u-"]{font-size:inherit}
+i#mycase[class^="case-"]{font-size:128px}
+i#mycase[class^="fa "]{font-size:96px}
+a.cpu_close,span.hand{cursor:pointer;z-index:1001}
+tr#var0,tr#var1,tr#var2,tr#var3,tr#var4{cursor:alias}
+tr#var1,tr#var4,tr#cpu_chart,.cpu_open{display:none}
+td.none{text-align:center;padding-top:12px}
+input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
+.share1,.share3,.user1,.user3,.view1,.view2,.view3,.view4,.unused{display:none}
+.port_view,.control,#apps,#vms{z-index:10000}
+.flat{height:0;lineheight:0}
+.wrap{white-space:normal}
+.switch-button-background{margin-left:0;margin-top:4px}
+.switch-button-label{margin-top:3px}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+#current_time{font-size:4rem;margin-left:8px}
+#current_date{font-size:1.3rem;margin-left:18px}
+table.snapshot{margin-top:0}
diff --git a/emhttp/plugins/dynamix/sheets/DeviceIdentify.css b/emhttp/plugins/dynamix/sheets/DeviceIdentify.css
new file mode 100644
index 000000000..461fd98a0
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DeviceIdentify.css
@@ -0,0 +1,2 @@
+input[type=date]{border:none;margin-left:-2px;padding-left:0;background:transparent;box-shadow:none}
+select.noframe{border:none;margin-left:0;padding-left:0;background:transparent;box-shadow:none}
diff --git a/emhttp/plugins/dynamix/sheets/DeviceInfo.css b/emhttp/plugins/dynamix/sheets/DeviceInfo.css
new file mode 100644
index 000000000..0e2842600
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DeviceInfo.css
@@ -0,0 +1,6 @@
+input.option{display:none;width:40px}
+select.option,#autosize{display:none}
+span#devtext{display:none;font-weight:bold}
+span#helptext{display:none;font-style:italic}
+span.code{display:inline-block;width:186px}
+i.fa-info.i{margin-right:10px}
diff --git a/emhttp/plugins/dynamix/sheets/Diagnostics.css b/emhttp/plugins/dynamix/sheets/Diagnostics.css
new file mode 100644
index 000000000..430502e32
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Diagnostics.css
@@ -0,0 +1,9 @@
+ul,li{margin:0;padding-top:0;padding-bottom:0}
+pre.pre{margin:30px 0}
+pre>p{margin:0;padding:0}
+pre#swaltext{height:600px!important}
+@media (max-width:960px){pre#swaltext{height:400px!important}}
+@media (max-width:960px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+@media (max-height:768px){pre#swaltext{height:400px!important}}
+@media (max-height:768px){.sweet-alert.nchan{height:600px;width:900px;margin-left:-470px}}
+
diff --git a/emhttp/plugins/dynamix/sheets/Disk-azure.css b/emhttp/plugins/dynamix/sheets/Disk-azure.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-azure.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk-black.css b/emhttp/plugins/dynamix/sheets/Disk-black.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-black.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk-gray.css b/emhttp/plugins/dynamix/sheets/Disk-gray.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-gray.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk-white.css b/emhttp/plugins/dynamix/sheets/Disk-white.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk-white.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Disk.css b/emhttp/plugins/dynamix/sheets/Disk.css
new file mode 100644
index 000000000..5815d053a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Disk.css
@@ -0,0 +1,4 @@
+div.clone1{position:absolute;right:0;margin-top:0}
+div.clone2{position:absolute;right:0;margin-top:48px}
+input.clone{margin-left:8px;margin-right:0}
+span.clone,i.clone{margin-right:4px}
diff --git a/emhttp/plugins/dynamix/sheets/DiskList.css b/emhttp/plugins/dynamix/sheets/DiskList.css
new file mode 100644
index 000000000..ff1a48f90
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DiskList.css
@@ -0,0 +1,2 @@
+table.share_status thead tr td:first-child{width:15%}
+table.share_status thead tr td:nth-child(n+3){width:10%}
diff --git a/emhttp/plugins/dynamix/sheets/DiskSettings.css b/emhttp/plugins/dynamix/sheets/DiskSettings.css
new file mode 100644
index 000000000..ae8354cc0
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DiskSettings.css
@@ -0,0 +1 @@
+span.code{display:inline-block;width:186px}
diff --git a/emhttp/plugins/dynamix/sheets/DisplaySettings.css b/emhttp/plugins/dynamix/sheets/DisplaySettings.css
new file mode 100644
index 000000000..c253fa4c9
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/DisplaySettings.css
@@ -0,0 +1,3 @@
+span#dropbox{margin-right:20px;}
+i.top{position:relative;padding-left:4px;cursor:pointer;}
+select.fixed{max-width:166px}
diff --git a/emhttp/plugins/dynamix/sheets/Eth0.css b/emhttp/plugins/dynamix/sheets/Eth0.css
new file mode 100644
index 000000000..6ddcb7136
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Eth0.css
@@ -0,0 +1,12 @@
+span.red{color:#E68A00}
+span.blue{color:#00529B}
+span.green{color:#4F8A10}
+span.vshift{margin-top:0!important}
+input.gap{margin-right:6px}
+input.form{font-size:1rem;padding:5px 10px;margin-left:10px}
+div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
+div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
+div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
+div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
+select.slim{min-width:47px;margin-left:4px}
+input.slim{width:32px;margin-left:8px}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-azure.css b/emhttp/plugins/dynamix/sheets/Flash-azure.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-azure.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-black.css b/emhttp/plugins/dynamix/sheets/Flash-black.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-black.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-gray.css b/emhttp/plugins/dynamix/sheets/Flash-gray.css
new file mode 100644
index 000000000..80004df10
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-gray.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash-white.css b/emhttp/plugins/dynamix/sheets/Flash-white.css
new file mode 100644
index 000000000..f9ca1ef79
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash-white.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Flash.css b/emhttp/plugins/dynamix/sheets/Flash.css
new file mode 100644
index 000000000..5815d053a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Flash.css
@@ -0,0 +1,4 @@
+div.clone1{position:absolute;right:0;margin-top:0}
+div.clone2{position:absolute;right:0;margin-top:48px}
+input.clone{margin-left:8px;margin-right:0}
+span.clone,i.clone{margin-right:4px}
diff --git a/emhttp/plugins/dynamix/sheets/InstallKey.css b/emhttp/plugins/dynamix/sheets/InstallKey.css
new file mode 100644
index 000000000..02ca70db2
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/InstallKey.css
@@ -0,0 +1 @@
+span.info{margin-left:12px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-azure.css b/emhttp/plugins/dynamix/sheets/Language-azure.css
new file mode 100644
index 000000000..d2b290e8f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-azure.css
@@ -0,0 +1 @@
+select.wide{min-width:314px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-black.css b/emhttp/plugins/dynamix/sheets/Language-black.css
new file mode 100644
index 000000000..383809988
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-black.css
@@ -0,0 +1 @@
+select.wide{min-width:300px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-gray.css b/emhttp/plugins/dynamix/sheets/Language-gray.css
new file mode 100644
index 000000000..d2b290e8f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-gray.css
@@ -0,0 +1 @@
+select.wide{min-width:314px}
diff --git a/emhttp/plugins/dynamix/sheets/Language-white.css b/emhttp/plugins/dynamix/sheets/Language-white.css
new file mode 100644
index 000000000..383809988
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language-white.css
@@ -0,0 +1 @@
+select.wide{min-width:300px}
diff --git a/emhttp/plugins/dynamix/sheets/Language.css b/emhttp/plugins/dynamix/sheets/Language.css
new file mode 100644
index 000000000..04aa828e7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Language.css
@@ -0,0 +1,4 @@
+div.notice{margin-top:70px;margin-bottom:30px}
+div#selectlang{margin-top:20px}
+label.button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:1.8px;text-transform:uppercase;min-width:86px;margin:0;padding:8px;text-align:center;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:none;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+label.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
diff --git a/emhttp/plugins/dynamix/sheets/ManagementAccess.css b/emhttp/plugins/dynamix/sheets/ManagementAccess.css
new file mode 100644
index 000000000..9f3854a18
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ManagementAccess.css
@@ -0,0 +1 @@
+span.warning{margin-left:20px}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkExtra-black.css b/emhttp/plugins/dynamix/sheets/NetworkExtra-black.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkExtra-black.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkExtra-white.css b/emhttp/plugins/dynamix/sheets/NetworkExtra-white.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkExtra-white.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkExtra.css b/emhttp/plugins/dynamix/sheets/NetworkExtra.css
new file mode 100644
index 000000000..b4e4b3999
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkExtra.css
@@ -0,0 +1 @@
+span[id^="info-"]{margin-left:20px}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkRules-black.css b/emhttp/plugins/dynamix/sheets/NetworkRules-black.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkRules-black.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkRules-white.css b/emhttp/plugins/dynamix/sheets/NetworkRules-white.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkRules-white.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/NetworkRules.css b/emhttp/plugins/dynamix/sheets/NetworkRules.css
new file mode 100644
index 000000000..b4e4b3999
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NetworkRules.css
@@ -0,0 +1 @@
+span[id^="info-"]{margin-left:20px}
diff --git a/emhttp/plugins/dynamix/sheets/NewConfig.css b/emhttp/plugins/dynamix/sheets/NewConfig.css
new file mode 100644
index 000000000..64980eedb
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NewConfig.css
@@ -0,0 +1 @@
+span.indent{display:inline-block;width:240px;margin-top:30px}
diff --git a/emhttp/plugins/dynamix/sheets/NewPerms.css b/emhttp/plugins/dynamix/sheets/NewPerms.css
new file mode 100644
index 000000000..068231dea
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NewPerms.css
@@ -0,0 +1,3 @@
+span.block{display:inline-block;width:300px;margin:24px 0}
+pre.pre{margin:30px 0;padding:20px}
+pre>p{margin:0;padding:0}
diff --git a/emhttp/plugins/dynamix/sheets/Notifications.css b/emhttp/plugins/dynamix/sheets/Notifications.css
new file mode 100644
index 000000000..c1e624014
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Notifications.css
@@ -0,0 +1,3 @@
+select.a{min-width:220px}
+input.a{width:220px}
+span.a{display:inline-block;width:220px;font-style:italic}
diff --git a/emhttp/plugins/dynamix/sheets/NotificationsArchive.css b/emhttp/plugins/dynamix/sheets/NotificationsArchive.css
new file mode 100644
index 000000000..5ccbb2024
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/NotificationsArchive.css
@@ -0,0 +1,3 @@
+select.filter{margin:0}
+span.right{margin-top:-6px;font-size:1.3rem!important;padding:0!important}
+i.red-text{font-size:1.6rem}
diff --git a/emhttp/plugins/dynamix/sheets/PHPsettings.css b/emhttp/plugins/dynamix/sheets/PHPsettings.css
new file mode 100644
index 000000000..5107f389f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/PHPsettings.css
@@ -0,0 +1,4 @@
+div#templateWindow,div#dialogWindow{display:none}
+span.dim{opacity:0.2}
+#screenlog{margin-left:0}
+
diff --git a/emhttp/plugins/dynamix/sheets/RoutingTable-black.css b/emhttp/plugins/dynamix/sheets/RoutingTable-black.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/RoutingTable-black.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/RoutingTable-white.css b/emhttp/plugins/dynamix/sheets/RoutingTable-white.css
new file mode 100644
index 000000000..403f3202e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/RoutingTable-white.css
@@ -0,0 +1 @@
+span.status.vhshift{margin-right:-10px!important}
diff --git a/emhttp/plugins/dynamix/sheets/RoutingTable.css b/emhttp/plugins/dynamix/sheets/RoutingTable.css
new file mode 100644
index 000000000..18130a5cf
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/RoutingTable.css
@@ -0,0 +1 @@
+input.fixed{width:200px;}
diff --git a/emhttp/plugins/dynamix/sheets/Share-azure.css b/emhttp/plugins/dynamix/sheets/Share-azure.css
new file mode 100644
index 000000000..3294cd53a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-azure.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;max-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share-black.css b/emhttp/plugins/dynamix/sheets/Share-black.css
new file mode 100644
index 000000000..15b1305c5
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-black.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;max-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share-gray.css b/emhttp/plugins/dynamix/sheets/Share-gray.css
new file mode 100644
index 000000000..3294cd53a
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-gray.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:150px}
+select.clone{min-width:145px;max-width:145px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share-white.css b/emhttp/plugins/dynamix/sheets/Share-white.css
new file mode 100644
index 000000000..15b1305c5
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share-white.css
@@ -0,0 +1,2 @@
+span.wrap{display:inline-block;width:128px}
+select.clone{min-width:123px;max-width:123px;margin-right:0}
diff --git a/emhttp/plugins/dynamix/sheets/Share.css b/emhttp/plugins/dynamix/sheets/Share.css
new file mode 100644
index 000000000..9aa9f3146
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Share.css
@@ -0,0 +1,5 @@
+div.clone1{position:absolute;right:10px;margin-top:0}
+div.clone2{position:absolute;right:10px;margin-top:48px}
+span.input{display:inline-block;width:330px}
+input.clone{margin-left:8px;margin-right:0}
+span.clone{margin-right:4px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit-black.css b/emhttp/plugins/dynamix/sheets/ShareEdit-black.css
new file mode 100644
index 000000000..319505151
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit-black.css
@@ -0,0 +1 @@
+form[name=share_edit]{margin-top:-20px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit-white.css b/emhttp/plugins/dynamix/sheets/ShareEdit-white.css
new file mode 100644
index 000000000..319505151
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit-white.css
@@ -0,0 +1 @@
+form[name=share_edit]{margin-top:-20px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit.css b/emhttp/plugins/dynamix/sheets/ShareEdit.css
new file mode 100644
index 000000000..3509ac2e4
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit.css
@@ -0,0 +1,6 @@
+div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
+div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
+div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
+div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
+#s1,#s2,#s3,#s4,#s5,#autosize,.empty,.full2,#zfs-name{display:none}
+i.fa-info.i{margin-right:10px}
diff --git a/emhttp/plugins/dynamix/sheets/ShareList.css b/emhttp/plugins/dynamix/sheets/ShareList.css
new file mode 100644
index 000000000..2fe2a4b43
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/ShareList.css
@@ -0,0 +1,5 @@
+table.share_status thead tr td:first-child{width:15%}
+table.share_status thead tr td:nth-child(n+3){width:9%!important}
+table.share_status thead tr td:nth-child(5){width:13%!important}
+td.empty{text-align:center;padding-top:12px}
+i.fa-fw{margin-right:2px}
diff --git a/emhttp/plugins/dynamix/sheets/SysDevs.css b/emhttp/plugins/dynamix/sheets/SysDevs.css
new file mode 100644
index 000000000..9d6489e2b
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SysDevs.css
@@ -0,0 +1,4 @@
+table.pre{margin-top:0;background:transparent}
+table.pre td:first-child{width:144px}
+table tr td{padding:0 0 3px 0;margin:0}
+table tr td.thin{line-height:8px;height:8px}
diff --git a/emhttp/plugins/dynamix/sheets/SysDrivers.css b/emhttp/plugins/dynamix/sheets/SysDrivers.css
new file mode 100644
index 000000000..835aff61e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SysDrivers.css
@@ -0,0 +1,9 @@
+table.t1{margin-top:0; border-collapse: collapse; border-spacing: 0;}
+table.t1 tr td{padding:0 0 3px 0;margin:0}
+table.t1 tr td.thin{line-height:8px;height:8px}
+table.t1 tr>td{width:1%;text-align:centre;white-space: nowrap}
+table.t1 tr>td+td{width:1%;white-space:nowrap}
+table.t1 tr>td+td+td{width:auto;text-align:left}
+table.t1 tr>td+td+td+td{text-align:left}
+table.t1 tr>td+td+td+td+td{text-align:left}
+.t1.tablesorter .filtered{display:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-azure.css b/emhttp/plugins/dynamix/sheets/Syslinux-azure.css
new file mode 100644
index 000000000..fbf4033b6
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-azure.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #606E7F;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-black.css b/emhttp/plugins/dynamix/sheets/Syslinux-black.css
new file mode 100644
index 000000000..1ea7870dc
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-black.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #f2f2f2;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #f2f2f2;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-gray.css b/emhttp/plugins/dynamix/sheets/Syslinux-gray.css
new file mode 100644
index 000000000..fbf4033b6
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-gray.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #606E7F;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux-white.css b/emhttp/plugins/dynamix/sheets/Syslinux-white.css
new file mode 100644
index 000000000..a25a77b27
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux-white.css
@@ -0,0 +1,2 @@
+span.array,span.system{margin-left:33.33%;width:65.5%;padding:2px 10px;font-weight:bold;border:solid 1px #1c1c1c;border-bottom:none}
+textarea.menu{margin-left:33.33%;width:65.5%;margin-bottom:12px;padding:4px 10px;font-family:bitstream;border:1px solid #1c1b1b;border-top:none}
diff --git a/emhttp/plugins/dynamix/sheets/Syslinux.css b/emhttp/plugins/dynamix/sheets/Syslinux.css
new file mode 100644
index 000000000..105f9ee66
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslinux.css
@@ -0,0 +1,3 @@
+div.basic{display:block}
+div.advanced{display:none}
+textarea.raw{resize:none;font-family:bitstream;width:65.5%}
diff --git a/emhttp/plugins/dynamix/sheets/Syslog.css b/emhttp/plugins/dynamix/sheets/Syslog.css
new file mode 100644
index 000000000..744120e1f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/Syslog.css
@@ -0,0 +1 @@
+input#max{border:none;width:60px;margin:0;padding:0}
diff --git a/emhttp/plugins/dynamix/sheets/SyslogSettings.css b/emhttp/plugins/dynamix/sheets/SyslogSettings.css
new file mode 100644
index 000000000..ce9ef4cbf
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/SyslogSettings.css
@@ -0,0 +1 @@
+span.span{display:inline-block;width:224px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-azure.css b/emhttp/plugins/dynamix/sheets/UserAdd-azure.css
new file mode 100644
index 000000000..927e648fe
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-azure.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-black.css b/emhttp/plugins/dynamix/sheets/UserAdd-black.css
new file mode 100644
index 000000000..0a94f7329
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-black.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-gray.css b/emhttp/plugins/dynamix/sheets/UserAdd-gray.css
new file mode 100644
index 000000000..e6795581e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-gray.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd-white.css b/emhttp/plugins/dynamix/sheets/UserAdd-white.css
new file mode 100644
index 000000000..ecc903eb7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd-white.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserAdd.css b/emhttp/plugins/dynamix/sheets/UserAdd.css
new file mode 100644
index 000000000..3c82b6cd2
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserAdd.css
@@ -0,0 +1,3 @@
+i.top{position:absolute;padding-top:4px;cursor:pointer}
+i#showPass.checked{opacity:0.5}
+.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-azure.css b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css
new file mode 100644
index 000000000..927e648fe
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-azure.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#EDEAEF;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-black.css b/emhttp/plugins/dynamix/sheets/UserEdit-black.css
new file mode 100644
index 000000000..0a94f7329
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-black.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #f2f2f2;border-radius:5px;background:#262626;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-gray.css b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css
new file mode 100644
index 000000000..e6795581e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-gray.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #606E7F;border-radius:5px;background:#121510;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit-white.css b/emhttp/plugins/dynamix/sheets/UserEdit-white.css
new file mode 100644
index 000000000..ecc903eb7
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit-white.css
@@ -0,0 +1 @@
+span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;padding:28px 12px;line-height:72px;margin-right:16px}
diff --git a/emhttp/plugins/dynamix/sheets/UserEdit.css b/emhttp/plugins/dynamix/sheets/UserEdit.css
new file mode 100644
index 000000000..3c82b6cd2
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserEdit.css
@@ -0,0 +1,3 @@
+i.top{position:absolute;padding-top:4px;cursor:pointer}
+i#showPass.checked{opacity:0.5}
+.usage-disk.sys{display:inline-block;width:10rem;top:<?=$themes2?'1.2':'.2'?>rem;margin-left:12px;border-radius:4px}
diff --git a/emhttp/plugins/dynamix/sheets/UserList-black.css b/emhttp/plugins/dynamix/sheets/UserList-black.css
new file mode 100644
index 000000000..d1db27757
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserList-black.css
@@ -0,0 +1 @@
+div#title{margin-top:-30px!important}
diff --git a/emhttp/plugins/dynamix/sheets/UserList-white.css b/emhttp/plugins/dynamix/sheets/UserList-white.css
new file mode 100644
index 000000000..d1db27757
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserList-white.css
@@ -0,0 +1 @@
+div#title{margin-top:-30px!important}
diff --git a/emhttp/plugins/dynamix/sheets/UserList.css b/emhttp/plugins/dynamix/sheets/UserList.css
new file mode 100644
index 000000000..d5736521b
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/UserList.css
@@ -0,0 +1 @@
+a.info span{top:66px;left:42px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-azure.css b/emhttp/plugins/dynamix/sheets/WG0-azure.css
new file mode 100644
index 000000000..26090881e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-azure.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:11px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-black.css b/emhttp/plugins/dynamix/sheets/WG0-black.css
new file mode 100644
index 000000000..ad6d3590f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-black.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:-7px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-12px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-gray.css b/emhttp/plugins/dynamix/sheets/WG0-gray.css
new file mode 100644
index 000000000..26090881e
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-gray.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:11px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-4px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0-white.css b/emhttp/plugins/dynamix/sheets/WG0-white.css
new file mode 100644
index 000000000..ad6d3590f
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0-white.css
@@ -0,0 +1,2 @@
+span.hshift{margin-right:-7px!important}
+span.label{font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;margin-left:-12px}
diff --git a/emhttp/plugins/dynamix/sheets/WG0.css b/emhttp/plugins/dynamix/sheets/WG0.css
new file mode 100644
index 000000000..2d5bb5253
--- /dev/null
+++ b/emhttp/plugins/dynamix/sheets/WG0.css
@@ -0,0 +1,29 @@
+dt{width:22%}
+span.even{float:right;display:inline-block;width:150px;margin-top:3px}
+span.even.wide{width:200px}
+span.pin{float:right;margin:-40px 12px 0 0;clear:both;display:inline-block;width:400px;text-align:right}
+span[class^=rx]{margin-right:40px}
+span.vshift{margin-top:-2px!important}
+span.input{display:inline-block;width:420px}
+span.access-type{display:inline-block;width:35%;white-space:normal}
+@media(max-width:1920px){span.access-type{width:20%}}
+span.block{display:inline-block;width:48%;white-space:normal}
+div.shade-white{background-color:#ededed;margin-top:10px;padding:8px 0 3px 0}
+div.shade-black{background-color:#212121;margin-top:10px;padding:8px 0 3px 0}
+div.shade-azure{background-color:#edeaef;margin-top:10px;padding:8px 0 3px 0}
+div.shade-gray{background-color:#121510;margin-top:10px;padding:8px 0 3px 0}
+div.title{margin-bottom:10px!important}
+div[id^=block-wg]{margin-bottom:30px}
+div.preset{margin:8px 0;float:right}
+input.wide{width:360px}
+input.subnet{width:150px;margin-right:4px}
+input.mask{width:30px}
+input.port{width:50px}
+input.form,button.form{font-size:1rem;min-width:0;padding:5px 8px;margin:0}
+input.ok{color:#f2f2f2;background:#4f8a10}
+input.nok{color:#f2f2f2;background:#f0000c}
+select.subnet{min-width:150px}
+i.fa-fw{margin-left:5px}
+i.key-off{opacity:0.3;cursor:default!important}
+input:user-invalid {border-bottom-color:#E22828;}
+input:-moz-ui-invalid {border-bottom-color:#E22828;}
diff --git a/emhttp/plugins/dynamix/styles/default-azure.css b/emhttp/plugins/dynamix/styles/default-azure.css
index ec6dbc23a..b79049e5f 100644
--- a/emhttp/plugins/dynamix/styles/default-azure.css
+++ b/emhttp/plugins/dynamix/styles/default-azure.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#606e7f;background-color:#e4e2e4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:left}
 p.centered{text-align:left}
@@ -196,7 +196,6 @@ span.ucfirst{text-transform:capitalize}
 span.strong{font-weight:bold}
 span.big{font-size:1.4rem}
 span.small{font-size:1.1rem}
-span.score{font-size:1.1rem;color:#ffffff;position:absolute}
 span#dropbox{background:none;line-height:6rem;margin-right:20px}
 span.outer{margin-bottom:20px;margin-right:0}
 span.outer.solid{background-color:#d7dbdd}
diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css
index 5f2b87035..7e2a1ebee 100644
--- a/emhttp/plugins/dynamix/styles/default-black.css
+++ b/emhttp/plugins/dynamix/styles/default-black.css
@@ -1,8 +1,8 @@
 html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#f2f2f2;background-color:#1c1b1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
-@media (max-width:1280px){#templsate{min-width:1260px;max-width:1260px;margin:0}}
+@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:justify}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-gray.css b/emhttp/plugins/dynamix/styles/default-gray.css
index 099a70081..3c058ea18 100644
--- a/emhttp/plugins/dynamix/styles/default-gray.css
+++ b/emhttp/plugins/dynamix/styles/default-gray.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#606e7f;background-color:#1b1d1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:left}
 p.centered{text-align:left}
diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css
index 7759a9311..68d210d2e 100644
--- a/emhttp/plugins/dynamix/styles/default-white.css
+++ b/emhttp/plugins/dynamix/styles/default-white.css
@@ -2,7 +2,7 @@ html{font-family:clear-sans;font-size:62.5%;height:100%}
 body{font-size:1.3rem;color:#1c1b1b;background-color:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
 @media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}}
 @media (min-width:1281px){#template{min-width:1260px;margin:0 10px}}
-@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
+@media (min-width:1920px){#template{min-width:1260px;max-width:1920px;margin:0 auto}}
 img{border:none;text-decoration:none;vertical-align:middle}
 p{text-align:justify}
 p.centered{text-align:left}
diff --git a/etc/rc.d/rc.S b/etc/rc.d/rc.S
index daf7382ff..62936e999 100755
--- a/etc/rc.d/rc.S
+++ b/etc/rc.d/rc.S
@@ -61,7 +61,7 @@ fi
 # provided to override which device is mounted for /boot (default: UNRAID)
 UNRAIDLABEL="UNRAID"
 UNRAIDROOT=
-set -- $(cat /proc/cmdline)
+set -- $(/bin/cat /proc/cmdline)
 for x in "$@"; do
   case "$x" in
   unraidlabel=*)
diff --git a/etc/rc.d/rc.acpid b/etc/rc.d/rc.acpid
index ae6316a14..bbc6f334f 100755
--- a/etc/rc.d/rc.acpid
+++ b/etc/rc.d/rc.acpid
@@ -13,6 +13,7 @@ DAEMON="ACPI power management daemon"
 . /etc/rc.d/rc.runlog
 
 acpid_running(){
+  sleep 0.1
   ps axc | grep -q ' acpid'
 }
 
diff --git a/etc/rc.d/rc.apcupsd b/etc/rc.d/rc.apcupsd
index 41cb3aead..60556310a 100755
--- a/etc/rc.d/rc.apcupsd
+++ b/etc/rc.d/rc.apcupsd
@@ -19,6 +19,7 @@ LOCK="/var/lock/apcupsd"
 . /etc/rc.d/rc.runlog
 
 apcupsd_running(){
+  sleep 0.1
   [[ -f $APCPID ]]
 }
 
diff --git a/etc/rc.d/rc.atd b/etc/rc.d/rc.atd
index c24fb5507..3ac3cf011 100755
--- a/etc/rc.d/rc.atd
+++ b/etc/rc.d/rc.atd
@@ -19,6 +19,7 @@ if [[ -r /etc/default/atd ]]; then
 fi
 
 atd_running(){
+  sleep 0.1
   pgrep --ns $$ --euid daemon -f "^$CROND" &>/dev/null
 }
 
diff --git a/etc/rc.d/rc.avahidaemon b/etc/rc.d/rc.avahidaemon
index 561996c07..e0a9e60aa 100755
--- a/etc/rc.d/rc.avahidaemon
+++ b/etc/rc.d/rc.avahidaemon
@@ -50,6 +50,7 @@ disable(){
 }
 
 avahid_running(){
+  sleep 0.1
   $AVAHI -c
   [[ $? == 0 ]]
 }
diff --git a/etc/rc.d/rc.avahidnsconfd b/etc/rc.d/rc.avahidnsconfd
index 88e186476..317e62c56 100755
--- a/etc/rc.d/rc.avahidnsconfd
+++ b/etc/rc.d/rc.avahidnsconfd
@@ -29,6 +29,7 @@ AVAHI="/usr/sbin/avahi-dnsconfd"
 . /etc/rc.d/rc.runlog
 
 avahidns_running(){
+  sleep 0.1
   $AVAHI -c
   [[ $? == 0 ]]
 }
diff --git a/etc/rc.d/rc.crond b/etc/rc.d/rc.crond
index 4dcf6c933..c816487b4 100755
--- a/etc/rc.d/rc.crond
+++ b/etc/rc.d/rc.crond
@@ -18,6 +18,7 @@ CROND="/usr/sbin/crond"
 [[ -r $CONF ]] && . $CONF
 
 crond_running(){
+  sleep 0.1
   pgrep --ns $$ --euid root -f "^$CROND" &>/dev/null
 }
 
diff --git a/etc/rc.d/rc.dnsmasq b/etc/rc.d/rc.dnsmasq
index f19bb3fed..1274cd831 100755
--- a/etc/rc.d/rc.dnsmasq
+++ b/etc/rc.d/rc.dnsmasq
@@ -14,6 +14,7 @@ PIDFILE="/var/run/dnsmasq.pid"
 . /etc/rc.d/rc.runlog
 
 dnsmasq_running(){
+  sleep 0.1
   pgrep -l -F $PIDFILE 2>/dev/null | grep -q dnsmasq
 }
 
diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker
index 2fc237952..3f0a8dfe9 100755
--- a/etc/rc.d/rc.docker
+++ b/etc/rc.d/rc.docker
@@ -101,6 +101,7 @@ docker_pid(){
 
 # Verify if docker daemon running
 docker_running(){
+  sleep 0.1
   [[ -S /var/run/docker.sock ]] || return 1
   [[ $(docker info 2>&1) =~ "Cannot connect to the Docker daemon" ]] && return 1 || return 0
 }
diff --git a/etc/rc.d/rc.elogind b/etc/rc.d/rc.elogind
index e05a8b564..146eb6d6d 100755
--- a/etc/rc.d/rc.elogind
+++ b/etc/rc.d/rc.elogind
@@ -28,6 +28,7 @@ PIDFILE="/run/elogind.pid"
 . /etc/rc.d/rc.runlog
 
 elogind_running(){
+  sleep 0.1
   pgrep -l -F $PIDFILE 2>/dev/null | grep -q elogind
 }
 
diff --git a/etc/rc.d/rc.inetd b/etc/rc.d/rc.inetd
index b78780837..765d58b0a 100755
--- a/etc/rc.d/rc.inetd
+++ b/etc/rc.d/rc.inetd
@@ -13,6 +13,7 @@ DAEMON="Internet daemon"
 . /etc/rc.d/rc.runlog
 
 inetd_running(){
+  sleep 0.1
   ps axc | grep -q ' inetd'
 }
 
diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index afa2e7217..41236c822 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -216,9 +216,9 @@ libvirtd_start(){
   # ensure tpm-states path exists
   mkdir -p /etc/libvirt/qemu/swtpm/tpm-states
   # setup snapshot persistance.
-  mkdir -p /etc/libvirt/qemu/snapshot/
-  rm -r /var/lib/libvirt/qemu/snapshot/*
-  ln -fs /etc/libvirt/qemu/snapshot/ /var/lib/libvirt/qemu/
+  mkdir -p /etc/libvirt/qemu/snapshot
+  rm -rf /var/lib/libvirt/qemu/snapshot
+  ln -sf /etc/libvirt/qemu/snapshot /var/lib/libvirt/qemu/snapshot
   # create directory for pid file
   mkdir -p $(dirname $LIBVIRTD_PIDFILE)
 
diff --git a/etc/rc.d/rc.mcelog b/etc/rc.d/rc.mcelog
index 5d6494307..4d3b173bb 100755
--- a/etc/rc.d/rc.mcelog
+++ b/etc/rc.d/rc.mcelog
@@ -39,6 +39,7 @@ TRIGGER="/sys/devices/system/machinecheck/machinecheck0/trigger"
 
 
 mcelog_running(){
+  sleep 0.1
   ps axc | grep -q ' mcelog'
 }
 
diff --git a/etc/rc.d/rc.messagebus b/etc/rc.d/rc.messagebus
index 438f93112..8a0187ed6 100755
--- a/etc/rc.d/rc.messagebus
+++ b/etc/rc.d/rc.messagebus
@@ -23,6 +23,7 @@ PIDFILE="/var/run/dbus/dbus.pid"
 . /etc/rc.d/rc.runlog
 
 dbus_running(){
+  sleep 0.1
   ps -u messagebus -c | grep -wq dbus-daemon
 }
 
diff --git a/etc/rc.d/rc.nfsd b/etc/rc.d/rc.nfsd
index 01b592970..e14c68fb9 100755
--- a/etc/rc.d/rc.nfsd
+++ b/etc/rc.d/rc.nfsd
@@ -37,6 +37,7 @@ fi
 [[ -r $RPC ]] && . $RPC
 
 nfsd_running(){
+  sleep 0.1
   ps axc | grep -q rpc.mountd
 }
 
diff --git a/etc/rc.d/rc.nginx b/etc/rc.d/rc.nginx
index 410bbea37..07ebdd264 100755
--- a/etc/rc.d/rc.nginx
+++ b/etc/rc.d/rc.nginx
@@ -590,6 +590,7 @@ unraid_api_control(){
 }
 
 nginx_running(){
+  sleep 0.1
   [[ -s $PID && -n "$(cat $PID)" && -d "/proc/$(cat $PID)" ]] && return 0 || return 1
 }
 
diff --git a/etc/rc.d/rc.ntpd b/etc/rc.d/rc.ntpd
index 865311be5..86ae79ff9 100755
--- a/etc/rc.d/rc.ntpd
+++ b/etc/rc.d/rc.ntpd
@@ -21,6 +21,7 @@ IDENT="/boot/config/ident.cfg"
 . /etc/rc.d/rc.library.source
 
 ntpd_running(){
+  sleep 0.1
   [[ $(pgrep -cf $NTPD) -gt 0 ]]
 }
 
diff --git a/etc/rc.d/rc.rpc b/etc/rc.d/rc.rpc
index fa10f9635..825e9aa85 100755
--- a/etc/rc.d/rc.rpc
+++ b/etc/rc.d/rc.rpc
@@ -31,6 +31,7 @@ if check && [[ -n $BIND ]]; then
 fi
 
 rpc_running(){
+  sleep 0.1
   ps axc | grep -q rpc.statd
 }
 
diff --git a/etc/rc.d/rc.rsyslogd b/etc/rc.d/rc.rsyslogd
index 976b5c7f7..7fc994948 100755
--- a/etc/rc.d/rc.rsyslogd
+++ b/etc/rc.d/rc.rsyslogd
@@ -28,6 +28,7 @@ create_xconsole(){
 }
 
 rsyslogd_running(){
+  sleep 0.1
   ps axc | grep -q ' rsyslogd'
 }
 
diff --git a/etc/rc.d/rc.samba b/etc/rc.d/rc.samba
index 7c9d931d9..0ecff247d 100755
--- a/etc/rc.d/rc.samba
+++ b/etc/rc.d/rc.samba
@@ -33,6 +33,7 @@ PRIVATE="/var/lib/samba/private"
 [[ $USE_NETBIOS == yes ]] && DENY6=1
 
 samba_running(){
+  sleep 0.1
   [[ $(pgrep -cf $SMBD) -gt 0 ]]
 }
 
diff --git a/etc/rc.d/rc.sshd b/etc/rc.d/rc.sshd
index 8d22af2b9..36961c19c 100755
--- a/etc/rc.d/rc.sshd
+++ b/etc/rc.d/rc.sshd
@@ -22,6 +22,7 @@ SSH_ETC="/etc/ssh"
 . /etc/rc.d/rc.library.source
 
 sshd_running(){
+  sleep 0.1
   [[ $(pgrep -cf $SSHD) -gt 0 ]]
 }
 
diff --git a/etc/rc.d/rc.wsdd2 b/etc/rc.d/rc.wsdd2
index 2599e75ee..eedaf81c0 100755
--- a/etc/rc.d/rc.wsdd2
+++ b/etc/rc.d/rc.wsdd2
@@ -28,6 +28,7 @@ DAEMON="WSDD daemon"
 # fi
 
 wsdd2_running(){
+  sleep 0.1
   ps axc | grep -q ' wsdd2'
 }