diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 2c8f93f4d..81a06f54e 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -3,7 +3,7 @@ Title="Display Settings"
 Icon="icon-display"
 Tag="desktop"
 ---
-<?PHP
+<?php
 /* Copyright 2005-2025, Lime Technology
  * Copyright 2012-2025, Bergware International.
  *
@@ -15,7 +15,7 @@ Tag="desktop"
  * all copies or substantial portions of the Software.
  */
 ?>
-<?
+<?php
 $void = "<img src='/webGui/images/banner.png' id='image' width='330' height='30' onclick='$(&quot;#drop&quot;).click()' style='cursor:pointer' title='_(Click to select PNG file)_'>";
 $icon = "<i class='fa fa-trash top' title='_(Restore default image)_' onclick='restore()'></i>";
 $plugins = '/var/log/plugins';
@@ -129,8 +129,8 @@ $(function() {
 
 _(Display width)_:
 : <select name="width">
-  <?=mk_option($display['width'], "",_('Boxed'))?>
-  <?=mk_option($display['width'], "1",_('Unlimited'))?>
+  <?=mk_option($display['width'], "", _('Boxed'))?>
+  <?=mk_option($display['width'], "1", _('Unlimited'))?>
   </select>
 
 :display_width_help:
@@ -148,127 +148,123 @@ _(Language)_:
 
 _(Font size)_:
 : <select name="font" id='font'>
-  <?=mk_option($display['font'], "50",_('Very small'))?>
-  <?=mk_option($display['font'], "56.25",_('Small'))?>
-  <?=mk_option($display['font'], "",_('Normal'))?>
-  <?=mk_option($display['font'], "68.75",_('Large'))?>
-  <?=mk_option($display['font'], "75",_('Very large'))?>
-  <?=mk_option($display['font'], "80",_('Huge'))?>
+  <?=mk_option($display['font'], "50", _('Very small'))?>
+  <?=mk_option($display['font'], "56.25", _('Small'))?>
+  <?=mk_option($display['font'], "", _('Normal'))?>
+  <?=mk_option($display['font'], "68.75", _('Large'))?>
+  <?=mk_option($display['font'], "75", _('Very large'))?>
+  <?=mk_option($display['font'], "80", _('Huge'))?>
   </select>
 
 :display_font_size_help:
 
 _(Terminal font size)_:
 : <select name="tty" id="tty">
-  <?=mk_option($display['tty'], "11",_('Very small'))?>
-  <?=mk_option($display['tty'], "13",_('Small'))?>
-  <?=mk_option($display['tty'], "15",_('Normal'))?>
-  <?=mk_option($display['tty'], "17",_('Large'))?>
-  <?=mk_option($display['tty'], "19",_('Very large'))?>
-  <?=mk_option($display['tty'], "21",_('Huge'))?>
+  <?=mk_option($display['tty'], "11", _('Very small'))?>
+  <?=mk_option($display['tty'], "13", _('Small'))?>
+  <?=mk_option($display['tty'], "15", _('Normal'))?>
+  <?=mk_option($display['tty'], "17", _('Large'))?>
+  <?=mk_option($display['tty'], "19", _('Very large'))?>
+  <?=mk_option($display['tty'], "21", _('Huge'))?>
   </select>
 
 :display_tty_size_help:
 
 _(Number format)_:
 : <select name="number">
-  <?=mk_option($display['number'], ".,",_('[D] dot : [G] comma'))?>
-  <?=mk_option($display['number'], ". ",_('[D] dot : [G] space'))?>
-  <?=mk_option($display['number'], ".",_('[D] dot : [G] none'))?>
-  <?=mk_option($display['number'], ",.",_('[D] comma : [G] dot'))?>
-  <?=mk_option($display['number'], ", ",_('[D] comma : [G] space'))?>
-  <?=mk_option($display['number'], ",",_('[D] comma : [G] none'))?>
+  <?=mk_option($display['number'], ".,", _('[D] dot : [G] comma'))?>
+  <?=mk_option($display['number'], ". ", _('[D] dot : [G] space'))?>
+  <?=mk_option($display['number'], ".", _('[D] dot : [G] none'))?>
+  <?=mk_option($display['number'], ",.", _('[D] comma : [G] dot'))?>
+  <?=mk_option($display['number'], ", ", _('[D] comma : [G] space'))?>
+  <?=mk_option($display['number'], ",", _('[D] comma : [G] none'))?>
   </select>
 
 _(Number scaling)_:
 : <select name="scale">
-  <?=mk_option($display['scale'], "-1",_('Automatic'))?>
-  <?=mk_option($display['scale'], "0",_('Disabled'))?>
-  <?=mk_option($display['scale'], "1",_('KB'))?>
-  <?=mk_option($display['scale'], "2",_('MB'))?>
-  <?=mk_option($display['scale'], "3",_('GB'))?>
-  <?=mk_option($display['scale'], "4",_('TB'))?>
-  <?=mk_option($display['scale'], "5",_('PB'))?>
+  <?=mk_option($display['scale'], "-1", _('Automatic'))?>
+  <?=mk_option($display['scale'], "0", _('Disabled'))?>
+  <?=mk_option($display['scale'], "1", _('KB'))?>
+  <?=mk_option($display['scale'], "2", _('MB'))?>
+  <?=mk_option($display['scale'], "3", _('GB'))?>
+  <?=mk_option($display['scale'], "4", _('TB'))?>
+  <?=mk_option($display['scale'], "5", _('PB'))?>
   </select>
 
 _(Page view)_:
 : <select name="tabs">
-  <?=mk_option($display['tabs'], "0",_('Tabbed'))?>
-  <?=mk_option($display['tabs'], "1",_('Non-tabbed'))?>
+  <?=mk_option($display['tabs'], "0", _('Tabbed'))?>
+  <?=mk_option($display['tabs'], "1", _('Non-tabbed'))?>
   </select>
 
 :display_page_view_help:
 
 _(Placement of Users menu)_:
 : <select name="users">
-  <?=mk_option($display['users'], "Tasks:3",_('Header menu'))?>
-  <?=mk_option($display['users'], "UserPreferences",_('Settings menu'))?>
+  <?=mk_option($display['users'], "Tasks:3", _('Header menu'))?>
+  <?=mk_option($display['users'], "UserPreferences", _('Settings menu'))?>
   </select>
 
 :display_users_menu_help:
 
 _(Listing height)_:
 : <select name="resize">
-  <?=mk_option($display['resize'], "0",_('Automatic'))?>
-  <?=mk_option($display['resize'], "1",_('Fixed'))?>
+  <?=mk_option($display['resize'], "0", _('Automatic'))?>
+  <?=mk_option($display['resize'], "1", _('Fixed'))?>
   </select>
 
 :display_listing_height_help:
 
 _(Display device name)_:
 : <select name="raw">
-  <?=mk_option($display['raw'], "",_('Normalized'))?>
-  <?=mk_option($display['raw'], "1",_('Raw'))?>
+  <?=mk_option($display['raw'], "", _('Normalized'))?>
+  <?=mk_option($display['raw'], "1", _('Raw'))?>
   </select>
 
 _(Display world-wide-name in device ID)_:
 : <select name="wwn">
-  <?=mk_option($display['wwn'], "0",_('Disabled'))?>
-  <?=mk_option($display['wwn'], "1",_('Automatic'))?>
+  <?=mk_option($display['wwn'], "0", _('Disabled'))?>
+  <?=mk_option($display['wwn'], "1", _('Automatic'))?>
   </select>
 
 :display_wwn_device_id_help:
 
 _(Display array totals)_:
 : <select name="total">
-  <?=mk_option($display['total'], "0",_('No'))?>
-  <?=mk_option($display['total'], "1",_('Yes'))?>
+  <?=mk_option($display['total'], "0", _('No'))?>
+  <?=mk_option($display['total'], "1", _('Yes'))?>
   </select>
 
 _(Show array utilization indicator)_:
 : <select name="usage">
-  <?=mk_option($display['usage'], "0",_('No'))?>
-  <?=mk_option($display['usage'], "1",_('Yes'))?>
+  <?=mk_option($display['usage'], "0", _('No'))?>
+  <?=mk_option($display['usage'], "1", _('Yes'))?>
   </select>
 
 _(Temperature unit)_:
 : <select name="unit">
-  <?=mk_option($display['unit'], "C",_('Celsius'))?>
-  <?=mk_option($display['unit'], "F",_('Fahrenheit'))?>
+  <?=mk_option($display['unit'], "C", _('Celsius'))?>
+  <?=mk_option($display['unit'], "F", _('Fahrenheit'))?>
   </select>
 
 :display_temperature_unit_help:
 
-<?
-  $currentTheme = $themeHelper->getThemeName(); // $themeHelper set in DefaultPageLayout.php
-  $themes = $themeHelper->getThemesFromFileSystem($docroot);
-?>
 _(Dynamix color theme)_:
 : <select name="theme">
-  <?foreach ($themes as $theme):?>
-    <?=mk_option($currentTheme, $theme, _(ucfirst($theme)))?>
-  <?endforeach;?>
+  <?foreach ($themeHelper->getThemesFromFileSystem($docroot) as $theme):?>
+    <?=mk_option($themeHelper->getThemeName(), $theme, _(ucfirst($theme)))?>
+  <?endforeach; // $themeHelper set in DefaultPageLayout.php ?>
   </select>
 
 _(Used / Free columns)_:
 : <select name="text">
-  <?=mk_option($display['text'], "0",_('Text'))?>
-  <?=mk_option($display['text'], "1",_('Bar (gray)'))?>
-  <?=mk_option($display['text'], "2",_('Bar (color)'))?>
-  <?=mk_option($display['text'], "10",_('Text - Bar (gray)'))?>
-  <?=mk_option($display['text'], "20",_('Text - Bar (color)'))?>
-  <?=mk_option($display['text'], "11",_('Bar (gray) - Text'))?>
-  <?=mk_option($display['text'], "21",_('Bar (color) - Text'))?>
+  <?=mk_option($display['text'], "0", _('Text'))?>
+  <?=mk_option($display['text'], "1", _('Bar (gray)'))?>
+  <?=mk_option($display['text'], "2", _('Bar (color)'))?>
+  <?=mk_option($display['text'], "10", _('Text - Bar (gray)'))?>
+  <?=mk_option($display['text'], "20", _('Text - Bar (color)'))?>
+  <?=mk_option($display['text'], "11", _('Bar (gray) - Text'))?>
+  <?=mk_option($display['text'], "21", _('Bar (color) - Text'))?>
   </select>
 
 _(Header custom text color)_:
@@ -286,14 +282,14 @@ _(Header custom background color)_:
 
 _(Header show description)_:
 : <select name="headerdescription">
-  <?=mk_option($display['headerdescription'], "yes",_('Yes'))?>
-  <?=mk_option($display['headerdescription'], "no",_('No'))?>
+  <?=mk_option($display['headerdescription'], "yes", _('Yes'))?>
+  <?=mk_option($display['headerdescription'], "no", _('No'))?>
   </select>
 
 _(Show banner)_:
 : <select name="banner" onchange="presetBanner(this.form)">
-  <?=mk_option($display['banner'], "",_('No'))?>
-  <?=mk_option($display['banner'], "image",_('Yes'))?>
+  <?=mk_option($display['banner'], "", _('No'))?>
+  <?=mk_option($display['banner'], "image", _('Yes'))?>
   </select>
 
 <div class="js-bannerSettings" markdown="1" style="display:none">
@@ -313,23 +309,23 @@ _(Custom banner)_:
 <div class="js-bannerSettings" markdown="1" style="display:none">
 _(Show banner background color fade)_:
 : <select name="showBannerGradient">
-  <?=mk_option($display['showBannerGradient'], "no",_('No'))?>
-  <?=mk_option($display['showBannerGradient'], "yes",_('Yes'))?>
+  <?=mk_option($display['showBannerGradient'], "no", _('No'))?>
+  <?=mk_option($display['showBannerGradient'], "yes", _('Yes'))?>
   </select>
 </div>
 
 _(Favorites enabled)_:
 : <select name="favorites">
-  <?=mk_option($display['favorites'], "yes",_('Yes'))?>
-  <?=mk_option($display['favorites'], "no",_('No'))?>
+  <?=mk_option($display['favorites'], "yes", _('Yes'))?>
+  <?=mk_option($display['favorites'], "no", _('No'))?>
   </select>
 
 :display_favorites_enabled_help:
 
 _(Allow realtime updates on inactive browsers)_:
 : <select name='liveUpdate'>
-  <?=mk_option($display['liveUpdate'],"no",_('No'))?>
-  <?=mk_option($display['liveUpdate'],"yes",_('Yes'))?>
+  <?=mk_option($display['liveUpdate'], "no", _('No'))?>
+  <?=mk_option($display['liveUpdate'], "yes", _('Yes'))?>
   </select>
 
 <input type="submit" name="#default" value="_(Default)_" onclick="filename='reset'">