settings: move <dependencies> tag out of <control> tag

2 files changed, 322 insertions, 418 deletions

diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml
index 5d7e9d9898..71d61de31e 100644
--- a/system/settings/darwin.xml
+++ b/system/settings/darwin.xml
@@ -37,11 +37,9 @@
         <setting id="input.appleremotealwayson" type="boolean" label="13602" help="">
           <level>4</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="input.appleremotemode" operator="!is">0</dependency> <!-- APPLE_REMOTE_DISABLED -->
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="input.appleremotemode" operator="!is">0</dependency> <!-- APPLE_REMOTE_DISABLED -->
+          </dependencies>
         </setting>
         <setting id="input.appleremotesequencetime" type="integer" label="13603" help="">
           <level>1</level>
@@ -51,11 +49,11 @@
             <step>50</step>
             <maximum>1000</maximum>
             <formatlabel>14046</formatlabel>
-            <dependencies>
-              <dependency type="enable" id="input.appleremotemode">2</dependency> <!-- APPLE_REMOTE_UNIVERSAL -->
-            </dependencies>
           </constraints>
-          <control type="spinner" format="string"/>
+          <dependencies>
+            <dependency type="enable" id="input.appleremotemode">2</dependency> <!-- APPLE_REMOTE_UNIVERSAL -->
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
     </category>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index a53a61067c..798cca75f1 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -10,11 +10,10 @@
         </setting>
         <setting id="lookandfeel.skinsettings" type="action" label="21417" help="">
           <level>0</level>
-          <control type="button" format="action">
-            <dependencies>
-              <dependency type="enable" on="property" name="AddonHasSettings" setting="lookandfeel.skin" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="AddonHasSettings" setting="lookandfeel.skin" />
+          </dependencies>
+          <control type="button" format="action" />
         </setting>
         <setting id="lookandfeel.skintheme" type="string" label="15111" help="">
           <level>1</level>
@@ -77,11 +76,10 @@
           <level>1</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="button" format="action">
-            <dependencies>
-              <dependency type="enable" setting="lookandfeel.enablerssfeeds">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="lookandfeel.enablerssfeeds">true</dependency>
+          </dependencies>
+          <control type="button" format="action" />
         </setting>
       </group>
     </category>
@@ -101,11 +99,10 @@
           <constraints>
             <options>regions</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="update" setting="locale.language" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="update" setting="locale.language" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="locale.charset" type="string" label="14091" help="">
           <level>1</level>
@@ -113,11 +110,10 @@
           <constraints>
             <options>charsets</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="update" setting="locale.language" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="update" setting="locale.language" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
       <group id="2">
@@ -135,11 +131,10 @@
           <constraints>
             <options>timezones</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="update" setting="locale.timezonecountry" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="update" setting="locale.timezonecountry" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
       <group id="4">
@@ -178,30 +173,26 @@
         <setting id="filelists.allowfiledeletion" type="boolean" label="14071" help="">
           <level>1</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <or>
-                  <condition on="property" operator="!is" name="ProfileHasFilesLocked" />
-                  <condition on="property" name="IsMasterUser" />
-                </or>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition on="property" operator="!is" name="ProfileHasFilesLocked" />
+                <condition on="property" name="IsMasterUser" />
+              </or>
+            </dependency>
+          </dependencies>
         </setting>
         <setting id="filelists.showaddsourcebuttons" type="boolean" label="21382" help="">
           <level>1</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <or>
-                  <condition on="property" name="ProfileCanWriteSources" />
-                  <condition on="property" name="IsMasterUser" />
-                </or>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition on="property" name="ProfileCanWriteSources" />
+                <condition on="property" name="IsMasterUser" />
+              </or>
+            </dependency>
+          </dependencies>
         </setting>
         <setting id="filelists.showhidden" type="boolean" label="21330" help="">
           <level>1</level>
@@ -222,24 +213,20 @@
         </setting>
         <setting id="screensaver.settings" type="action" label="21417" help="">
           <level>0</level>
-          <control type="button" format="action">
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition on="setting" setting="screensaver.mode" operator="!is"></condition>
-                  <condition on="property" name="AddonHasSettings" setting="screensaver.mode" />
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition on="setting" setting="screensaver.mode" operator="!is"></condition>
+                <condition on="property" name="AddonHasSettings" setting="screensaver.mode" />
+              </and>
+            </dependency>
+          </dependencies>
         </setting>
         <setting id="screensaver.preview" type="action" label="1000" help="">
           <level>0</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="screensaver.mode" operator="!is"></dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="screensaver.mode" operator="!is"></dependency>
+          </dependencies>
         </setting>
         <setting id="screensaver.time" type="integer" label="355" help="">
           <level>0</level>
@@ -250,36 +237,31 @@
             <maximum>60</maximum>
             <formatlabel>14044</formatlabel>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="screensaver.mode" operator="!is"></dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="screensaver.mode" operator="!is"></dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
       <group id="2">
         <setting id="screensaver.usemusicvisinstead" type="boolean" label="13392" help="">
           <level>1</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="screensaver.mode" operator="!is"></dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="screensaver.mode" operator="!is"></dependency>
+          </dependencies>
         </setting>
         <setting id="screensaver.usedimonpause" type="boolean" label="22014" help="">
           <level>1</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="screensaver.mode" operator="!is">screensaver.xbmc.builtin.dim</condition>
-                  <condition setting="screensaver.mode" operator="!is"></condition>
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="screensaver.mode" operator="!is">screensaver.xbmc.builtin.dim</condition>
+                <condition setting="screensaver.mode" operator="!is"></condition>
+              </and>
+            </dependency>
+          </dependencies>
         </setting>
       </group>
     </category>
@@ -438,11 +420,10 @@
           <constraints>
             <options>refreshchangedelays</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="videoplayer.adjustrefreshrate" operator="!is">0</dependency> <!-- ADJUST_REFRESHRATE_OFF -->
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="videoplayer.adjustrefreshrate" operator="!is">0</dependency> <!-- ADJUST_REFRESHRATE_OFF -->
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="videoplayer.usedisplayasclock" type="boolean" label="13510" help="">
           <level>2</level>
@@ -458,11 +439,10 @@
               <option label="13503">2</option> <!-- SYNC_RESAMPLE -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="videoplayer.usedisplayasclock" operator="is">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="videoplayer.usedisplayasclock" operator="is">true</dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="videoplayer.maxspeedadjust" type="number" label="13504" help="">
           <level>4</level>
@@ -472,16 +452,15 @@
             <step>0.1</step>
             <maximum>10.0</maximum>
           </constraints>
-          <control type="spinner" format="number">
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="videoplayer.usedisplayasclock" operator="is">true</condition>
-                  <condition setting="videoplayer.synctype" operator="is">2</condition> <!-- SYNC_RESAMPLE -->
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="videoplayer.usedisplayasclock" operator="is">true</condition>
+                <condition setting="videoplayer.synctype" operator="is">2</condition> <!-- SYNC_RESAMPLE -->
+              </and>
+            </dependency>
+          </dependencies>
+          <control type="spinner" format="number" />
         </setting>
         <setting id="videoplayer.resamplequality" type="integer" label="13505" help="">
           <level>4</level>
@@ -494,16 +473,15 @@
               <option label="13509">3</option> <!-- RESAMPLE_REALLYHIGH -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="videoplayer.usedisplayasclock" operator="is">true</condition>
-                  <condition setting="videoplayer.synctype" operator="is">2</condition> <!-- SYNC_RESAMPLE -->
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="videoplayer.usedisplayasclock" operator="is">true</condition>
+                <condition setting="videoplayer.synctype" operator="is">2</condition> <!-- SYNC_RESAMPLE -->
+              </and>
+            </dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="videoplayer.errorinaspect" type="integer" label="22021" help="">
           <level>2</level>
@@ -622,11 +600,10 @@
             <step>2</step>
             <maximum>74</maximum>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="update" setting="subtitles.font" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="update" setting="subtitles.font" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="subtitles.style" type="integer" label="736" help="">
           <level>1</level>
@@ -639,11 +616,10 @@
               <option label="741">3</option> <!-- FONT_STYLE_BOLD | FONT_STYLE_ITALICS -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" on="property" name="IsUsingTTFSubtitles" setting="subtitles.font" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="IsUsingTTFSubtitles" setting="subtitles.font" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="subtitles.color" type="integer" label="737" help="">
           <level>1</level>
@@ -660,11 +636,10 @@
               <option label="767">7</option> <!-- Grey -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" on="property" name="IsUsingTTFSubtitles" setting="subtitles.font" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="IsUsingTTFSubtitles" setting="subtitles.font" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="subtitles.charset" type="string" label="735" help="">
           <level>1</level>
@@ -672,11 +647,10 @@
           <constraints>
             <options>charsets</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" on="property" name="IsUsingTTFSubtitles" setting="subtitles.font" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="IsUsingTTFSubtitles" setting="subtitles.font" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="subtitles.overrideassfonts" type="boolean" label="21368" help="">
           <level>1</level>
@@ -784,19 +758,15 @@
       <group id="3">
         <setting id="pvrmanager.channelmanager" type="action" label="19199" help="">
           <level>1</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
+          </dependencies>
         </setting>
         <setting id="pvrmanager.channelscan" type="action" label="19117" help="">
           <level>1</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
+          </dependencies>
         </setting>
         <setting id="pvrmanager.resetdb" type="action" label="19185" help="">
           <level>2</level>
@@ -848,11 +818,9 @@
         </setting>
         <setting id="pvrmenu.searchicons" type="action" label="19167" help="">
           <level>1</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
+          </dependencies>
         </setting>
       </group>
     </category>
@@ -1087,11 +1055,10 @@
           <level>1</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="edit" format="integer" attributes="hidden,new" delayed="false">
-            <dependencies>
-              <dependency type="enable" setting="pvrparental.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="pvrparental.enabled">true</dependency>
+          </dependencies>
+          <control type="edit" format="integer" attributes="hidden,new" delayed="false" />
         </setting>
         <setting id="pvrparental.duration" type="integer" label="19260" help="">
           <level>1</level>
@@ -1102,11 +1069,10 @@
             <maximum>1200</maximum>
             <formatlabel>14045</formatlabel>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="pvrparental.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="pvrparental.enabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
     </category>
@@ -1232,15 +1198,13 @@
         <setting id="musicplayer.crossfadealbumtracks" type="boolean" label="13400" help="">
           <level>1</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="musicplayer.crossfade" operator="!is">0</condition>
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="musicplayer.crossfade" operator="!is">0</condition>
+              </and>
+            </dependency>
+          </dependencies>
         </setting>
       </group>
       <group id="4">
@@ -1352,16 +1316,15 @@
               <option label="603">3</option> <!-- CDDARIP_QUALITY_EXTREME -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="audiocds.encoder" operator="!is">2</condition> <!-- CDDARIP_ENCODER_WAV -->
-                  <condition setting="audiocds.encoder" operator="!is">3</condition> <!-- CDDARIP_ENCODER_FLAC -->
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="audiocds.encoder" operator="!is">2</condition> <!-- CDDARIP_ENCODER_WAV -->
+                <condition setting="audiocds.encoder" operator="!is">3</condition> <!-- CDDARIP_ENCODER_FLAC -->
+              </and>
+            </dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="audiocds.bitrate" type="integer" label="623" help="">
           <level>2</level>
@@ -1372,17 +1335,16 @@
             <maximum>320</maximum>
             <formatlabel>14048</formatlabel>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="audiocds.encoder" operator="!is">2</condition> <!-- CDDARIP_ENCODER_WAV -->
-                  <condition setting="audiocds.encoder" operator="!is">3</condition> <!-- CDDARIP_ENCODER_FLAC -->
-                  <condition setting="audiocds.quality" operator="is">0</condition> <!-- CDDARIP_QUALITY_CBR -->
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="audiocds.encoder" operator="!is">2</condition> <!-- CDDARIP_ENCODER_WAV -->
+                <condition setting="audiocds.encoder" operator="!is">3</condition> <!-- CDDARIP_ENCODER_FLAC -->
+                <condition setting="audiocds.quality" operator="is">0</condition> <!-- CDDARIP_QUALITY_CBR -->
+              </and>
+            </dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="audiocds.compressionlevel" type="integer" label="665" help="">
           <level>2</level>
@@ -1392,11 +1354,10 @@
             <step>1</step>
             <maximum>8</maximum>
           </constraints>
-          <control type="spinner" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="audiocds.encoder">3</dependency> <!-- CDDARIP_ENCODER_FLAC -->
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="audiocds.encoder">3</dependency> <!-- CDDARIP_ENCODER_FLAC -->
+          </dependencies>
+          <control type="spinner" format="integer" />
         </setting>
         <setting id="audiocds.ejectonrip" type="boolean" label="14099" help="">
           <level>1</level>
@@ -1414,11 +1375,9 @@
         <setting id="karaoke.autopopupselector" type="boolean" label="22037" help="">
           <level>2</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+          </dependencies>
         </setting>
       </group>
       <group id="2">
@@ -1428,11 +1387,10 @@
           <constraints>
             <options>fonts</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="karaoke.fontheight" type="integer" label="22031" help="">
           <level>2</level>
@@ -1442,12 +1400,11 @@
             <step>2</step>
             <maximum>74</maximum>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-              <dependency type="update" setting="karaoke.font" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+            <dependency type="update" setting="karaoke.font" />
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="karaoke.fontcolors" type="integer" label="22032" help="">
           <level>2</level>
@@ -1460,11 +1417,10 @@
               <option label="22043">3</option> <!-- black/white -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="karaoke.charset" type="string" label="22033" help="">
           <level>2</level>
@@ -1472,29 +1428,24 @@
           <constraints>
             <options>charsets</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
       <group id="3">
         <setting id="karaoke.export" type="action" label="22038" help="">
           <level>2</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+          </dependencies>
         </setting>
         <setting id="karaoke.importcsv" type="action" label="22036" help="">
           <level>2</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="karaoke.enabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="karaoke.enabled">true</dependency>
+          </dependencies>
         </setting>
       </group>
     </category>
@@ -1586,11 +1537,10 @@
         </setting>
         <setting id="weather.addonsettings" type="action" label="21417" help="">
           <level>0</level>
-          <control type="button" format="action">
-            <dependencies>
-              <dependency type="enable" on="property" name="AddonHasSettings" setting="weather.addon" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="AddonHasSettings" setting="weather.addon" />
+          </dependencies>
+          <control type="button" format="action" />
         </setting>
       </group>
     </category>
@@ -1614,11 +1564,9 @@
         <setting id="services.upnpannounce" type="boolean" label="20188" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="services.upnpserver">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.upnpserver">true</dependency>
+          </dependencies>
         </setting>
         <setting id="services.upnprenderer" type="boolean" label="21881" help="">
           <level>1</level>
@@ -1651,21 +1599,19 @@
           <level>2</level>
           <default>xbmc</default>
           <allowempty>true</allowempty>
-          <control type="edit" format="string">
-            <dependencies>
-              <dependency type="enable" setting="services.webserver">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.webserver">true</dependency>
+          </dependencies>
+          <control type="edit" format="string" />
         </setting>
         <setting id="services.webserverpassword" type="string" label="733" help="">
           <level>2</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="edit" format="string" attributes="hidden">
-            <dependencies>
-              <dependency type="enable" setting="services.webserver">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.webserver">true</dependency>
+          </dependencies>
+          <control type="edit" format="string" attributes="hidden" />
         </setting>
         <setting id="services.webskin" type="addon" label="199" help="">
           <level>1</level>
@@ -1695,11 +1641,10 @@
             <step>1</step>
             <maximum>65535</maximum>
           </constraints>
-          <control type="edit" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="services.esenabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.esenabled">true</dependency>
+          </dependencies>
+          <control type="edit" format="integer" />
         </setting>
         <setting id="services.esportrange" type="integer" label="793" help="">
           <visible>HAS_EVENT_SERVER</visible>
@@ -1710,11 +1655,10 @@
             <step>1</step>
             <maximum>100</maximum>
           </constraints>
-          <control type="spinner" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="services.esenabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.esenabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="integer" />
         </setting>
         <setting id="services.esmaxclients" type="integer" label="797" help="">
           <visible>HAS_EVENT_SERVER</visible>
@@ -1725,20 +1669,17 @@
             <step>1</step>
             <maximum>100</maximum>
           </constraints>
-          <control type="spinner" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="services.esenabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.esenabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="integer" />
         </setting>
         <setting id="services.esallinterfaces" type="boolean" label="794" help="">
           <level>1</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="services.esenabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.esenabled">true</dependency>
+          </dependencies>
         </setting>
         <setting id="services.esinitialdelay" type="integer" label="795" help="">
           <visible>HAS_EVENT_SERVER</visible>
@@ -1749,11 +1690,10 @@
             <step>5</step>
             <maximum>10000</maximum>
           </constraints>
-          <control type="spinner" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="services.esenabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.esenabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="integer" />
         </setting>
         <setting id="services.escontinuousdelay" type="integer" label="796" help="">
           <visible>HAS_EVENT_SERVER</visible>
@@ -1764,11 +1704,10 @@
             <step>5</step>
             <maximum>10000</maximum>
           </constraints>
-          <control type="spinner" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="services.esenabled">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.esenabled">true</dependency>
+          </dependencies>
+          <control type="spinner" format="integer" />
         </setting>
       </group>
     </category>
@@ -1791,21 +1730,18 @@
         <setting id="services.useairplaypassword" type="boolean" label="1272" help="">
           <level>1</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="services.airplay">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.airplay">true</dependency>
+          </dependencies>
         </setting>
         <setting id="services.airplaypassword" type="string" label="733" help="">
           <level>1</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="edit" format="string" attributes="hidden">
-            <dependencies>
-              <dependency type="enable" setting="services.useairplaypassword">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="services.useairplaypassword">true</dependency>
+          </dependencies>
+          <control type="edit" format="string" attributes="hidden" />
         </setting>
       </group>
     </category>
@@ -1841,12 +1777,11 @@
           <constraints>
             <options>resolutions</options>
           </constraints>
-          <control type="spinner" format="string" delayed="true">
-            <dependencies>
-              <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED -->
-              <dependency type="update" setting="videoscreen.screen" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED -->
+            <dependency type="update" setting="videoscreen.screen" />
+          </dependencies>
+          <control type="spinner" format="string" delayed="true" />
         </setting>
         <setting id="videoscreen.screenmode" type="string" label="243" help="">
           <visible>IsStandAlone</visible>
@@ -1858,31 +1793,26 @@
           <updates>
             <update type="change" />
           </updates>
-          <control type="spinner" format="string" delayed="true">
-            <dependencies>
-              <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED -->
-              <dependency type="update" setting="videoscreen.screen" />
-              <dependency type="update" setting="videoscreen.resolution" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED -->
+            <dependency type="update" setting="videoscreen.screen" />
+            <dependency type="update" setting="videoscreen.resolution" />
+          </dependencies>
+          <control type="spinner" format="string" delayed="true" />
         </setting>
         <setting id="videoscreen.fakefullscreen" type="boolean" label="14083" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED -->
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="videoscreen.screen" operator="!is">-1</dependency> <!-- DM_WINDOWED -->
+          </dependencies>
         </setting>
         <setting id="videoscreen.blankdisplays" type="boolean" label="13130" help="">
           <level>1</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" on="property" name="IsFullscreen" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="IsFullscreen" />
+          </dependencies>
         </setting>
       </group>
       <group id="2">
@@ -1959,76 +1889,64 @@
         <setting id="audiooutput.ac3passthrough" type="boolean" label="364" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <or>
-                  <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
-                  <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
-                </or>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
+                <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
+              </or>
+            </dependency>
+          </dependencies>
         </setting>
         <setting id="audiooutput.dtspassthrough" type="boolean" label="254" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <or>
-                  <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
-                  <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
-                </or>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
+                <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
+              </or>
+            </dependency>
+          </dependencies>
         </setting>
         <setting id="audiooutput.passthroughaac" type="boolean" label="299" help="">
           <level>2</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <or>
-                  <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
-                  <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
-                </or>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
+                <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
+              </or>
+            </dependency>
+          </dependencies>
         </setting>
         <setting id="audiooutput.multichannellpcm" type="boolean" label="348" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="audiooutput.mode">2</dependency> <!-- AUDIO_HDMI -->
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="audiooutput.mode">2</dependency> <!-- AUDIO_HDMI -->
+          </dependencies>
         </setting>
         <setting id="audiooutput.truehdpassthrough" type="boolean" label="349" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" setting="audiooutput.mode">2</dependency> <!-- AUDIO_HDMI -->
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="audiooutput.mode">2</dependency> <!-- AUDIO_HDMI -->
+          </dependencies>
         </setting>
         <setting id="audiooutput.dtshdpassthrough" type="boolean" label="347" help="">
           <level>2</level>
           <default>true</default>
-          <control>
-            <dependencies>
-              <dependency type="enable">
-                <and>
-                  <condition setting="audiooutput.dtspassthrough">true</condition>
-                  <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
-                </and>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <and>
+                <condition setting="audiooutput.dtspassthrough">true</condition>
+                <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
+              </and>
+            </dependency>
+          </dependencies>
         </setting>
       </group>
       <group id="2">
@@ -2046,16 +1964,15 @@
           <constraints>
             <options>audiodevicespassthrough</options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable">
-                <or>
-                  <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
-                  <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
-                </or>
-              </dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
+                <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
+              </or>
+            </dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
       </group>
       <group id="3">
@@ -2077,11 +1994,9 @@
       <group id="1">
         <setting id="input.peripherals" type="action" label="35000" help="">
           <level>1</level>
-          <control>
-            <dependencies>
-              <dependency type="enable" on="property" name="HasPeripherals" />
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="HasPeripherals" />
+          </dependencies>
         </setting>
       </group>
       <group id="2">
@@ -2118,21 +2033,19 @@
               <option label="1185">4</option> <!-- PROXY_SOCKS5_REMOTE -->
             </options>
           </constraints>
-          <control type="spinner" format="string">
-            <dependencies>
-              <dependency type="enable" setting="network.usehttpproxy">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="network.usehttpproxy">true</dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
         </setting>
         <setting id="network.httpproxyserver" type="string" label="706" help="">
           <level>1</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="edit" format="string">
-            <dependencies>
-              <dependency type="enable" setting="network.usehttpproxy">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="network.usehttpproxy">true</dependency>
+          </dependencies>
+          <control type="edit" format="string" />
         </setting>
         <setting id="network.httpproxyport" type="integer" label="730" help="">
           <level>1</level>
@@ -2142,31 +2055,28 @@
             <step>1</step>
             <maximum>65535</maximum>
           </constraints>
-          <control type="edit" format="integer">
-            <dependencies>
-              <dependency type="enable" setting="network.usehttpproxy">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="network.usehttpproxy">true</dependency>
+          </dependencies>
+          <control type="edit" format="integer" />
         </setting>
         <setting id="network.httpproxyusername" type="string" label="1048" help="">
           <level>1</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="edit" format="string">
-            <dependencies>
-              <dependency type="enable" setting="network.usehttpproxy">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="network.usehttpproxy">true</dependency>
+          </dependencies>
+          <control type="edit" format="string" />
         </setting>
         <setting id="network.httpproxypassword" type="string" label="733" help="">
           <level>1</level>
           <default></default>
           <allowempty>true</allowempty>
-          <control type="edit" format="string" attributes="hidden">
-            <dependencies>
-              <dependency type="enable" setting="network.usehttpproxy">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="network.usehttpproxy">true</dependency>
+          </dependencies>
+          <control type="edit" format="string" attributes="hidden" />
         </setting>
       </group>
       <group id="2">
@@ -2231,11 +2141,9 @@
         </setting>
         <setting id="debug.setextraloglevel" type="action" label="666" help="">
           <level>1</level>
-          <control type="button" format="action">
-            <dependencies>
-              <dependency type="enable" setting="debug.showloginfo">true</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" setting="debug.showloginfo">true</dependency>
+          </dependencies>
         </setting>
         <setting id="debug.screenshotpath" type="path" label="20004" help="">
           <level>1</level>
@@ -2257,11 +2165,9 @@
         <setting id="masterlock.startuplock" type="boolean" label="20076" help="">
           <level>2</level>
           <default>false</default>
-          <control>
-            <dependencies>
-              <dependency type="enable" on="property" name="ProfileLockMode" operator="!is">0</dependency>
-            </dependencies>
-          </control>
+          <dependencies>
+            <dependency type="enable" on="property" name="ProfileLockMode" operator="!is">0</dependency>
+          </dependencies>
         </setting>
         <setting id="masterlock.maxretries" type="integer" label="12364" help="">
           <level>4</level>