--- config-ui.xml.orig	2018-04-17 14:44:54.355990144 +0000
+++ config-ui.xml	2018-04-17 21:15:29.208674746 +0000
@@ -151,7 +151,7 @@
         <area>0,0,1280,720</area>
 
         <textarea name="heading" from="base_heading">
-            <value>Edit Channels</value>
+            <value>Channel Editor</value>
         </textarea>
 
         <shape name="edit-channels-top-backdrop" from="base_backdrop">
@@ -261,13 +261,7 @@
                         <align>right,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selectedinactive" from="selectedactive">
-                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
-                        <area>0,0,100%,100%</area>
-                        <shape name="select_bar_bottom_highlight">
-                            <area>0,70,100%,2</area>
-                        </shape>
-                    </group>
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -301,7 +295,7 @@
         </textarea>
 
         <buttonlist name="sorting" from="base_selector">
-            <area>415,460,580,40</area>
+            <area>415,460,560,40</area>
         </buttonlist>
 
         <textarea name="sourcelabel" from="sortlabel">
@@ -310,21 +304,21 @@
         </textarea>
 
         <buttonlist name="source" from="sorting">
-            <area>415,515,580,40</area>
+            <area>415,515,560,40</area>
         </buttonlist>
 
         <button name="delete" from="base_button">
-            <area>1030,517,150,35</area>
-            <value>Delete</value>
+            <area>1010,517,200,35</area>
+            <value>Delete Source</value>
         </button>
 
-        <textarea name="nochannumlabel" from="basetextarea">
-            <area>450,575,500,60</area>
-            <value>Hide Channels without channel number.</value>
+        <textarea name="nochannumlabel" from="sortlabel">
+            <area>245,575,425,30</area>
+            <value>Hide Channels Without Channel Number:</value>
         </textarea>
 
         <checkbox name="nochannum" from="base_checkbox">
-            <position>410,572</position>
+            <position>685,575</position>
         </checkbox>
 
         <button name="scan" from="base_button">
@@ -645,7 +639,7 @@
         <textarea name="helptext" from="basetextarea">
             <area>231,372,818,227</area>
             <multiline>yes</multiline>
-            <font>basesmallblue</font>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
@@ -734,7 +728,7 @@
         <textarea name="helptext" from="basetextarea">
             <area>231,372,818,227</area>
             <multiline>yes</multiline>
-            <font>basesmallblue</font>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
@@ -901,7 +895,7 @@
         <textarea name="helptext" from="basetextarea">
             <area>233,488,814,111</area>
             <multiline>yes</multiline>
-            <font>basesmallblue</font>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
@@ -1000,7 +994,7 @@
         <textarea name="helptext" from="basetextarea">
             <area>231,372,818,227</area>
             <multiline>yes</multiline>
-            <font>basesmallblue</font>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
@@ -1016,4 +1010,572 @@
 
     </window>
 
+    <window name="backendselection">
+
+        <textarea name="heading" from="base_heading">
+            <value>MythTV Servers</value>
+        </textarea>
+
+        <shape name="beconnect-backdrop" from="base_backdrop">
+            <area>115,36,1050,649</area>
+        </shape>
+
+        <shape name="beconnect-backdrop-line" from="base_backdrop_line">
+            <area>116,37,1048,500</area>
+        </shape>
+
+        <shape name="beconnect-top-line" from="base_highlight_line">
+            <area>117,38,1046,2</area>
+        </shape>
+
+        <shape name="beconnect-bottom-line" from="base_highlight_line">
+            <area>117,534,1046,2</area>
+        </shape>
+
+        <shape name="beconnect-left-line" from="base_highlight_vertical_line">
+            <area>117,40,2,494</area>
+        </shape>
+
+        <shape name="beconnect-right-line" from="base_highlight_vertical_line">
+            <area>1161,40,2,494</area>
+        </shape>
+
+        <shape name="beconnect-bottom-backdrop-line" from="base_backdrop_line">
+            <area>116,547,1048,137</area>
+        </shape>
+
+        <shape name="beconnect-bottom-top-line" from="base_highlight_line">
+            <area>117,548,1046,2</area>
+        </shape>
+
+        <shape name="beconnect-bottom-bottom-line" from="base_highlight_line">
+            <area>117,681,1046,2</area>
+        </shape>
+
+        <shape name="beconnect-bottom-left-line" from="base_highlight_vertical_line">
+            <area>117,550,2,131</area>
+        </shape>
+
+        <shape name="beconnect-bottom-right-line" from="base_highlight_vertical_line">
+            <area>1161,550,2,131</area>
+        </shape>
+
+        <shape name="beconnect-bottom-seperator-first-line" from="base_line">
+            <area>138,620,1004,2</area>
+        </shape>
+
+        <buttonlist name="backends" from="base_list_state">
+            <area>123,44,1034,494</area>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,1034,30</area>
+                    <group name="select_bar" from="base_select_bar_active_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+                    <textarea name="buttontext" from="basetextarea">
+                        <area>8,0,420,100%</area>
+                        <align>left,vcenter</align>
+                    </textarea>
+                    <textarea name="modelname" from="buttontext" /> <!-- Workaround for vanishing buttontext bug -->
+                    <textarea name="protocollabel" from="buttontext" depends="protocolversion">
+                        <area>432,0,100,100%</area>
+                        <cutdown>yes</cutdown>
+                        <align>right,vcenter</align>
+                        <value>Protocol:</value>
+                        <font>basesmallerblue</font>
+                    </textarea>
+                    <textarea name="protocolversion" from="buttontext">
+                        <area>538,0,50,100%</area>
+                        <cutdown>yes</cutdown>
+                        <align>left,vcenter</align>
+                        <font>basesmaller</font>
+                    </textarea>
+                    <textarea name="versionlabel" from="protocollabel" depends="version">
+                        <area>596,0,100,100%</area>
+                        <value>Version:</value>
+                    </textarea>
+                    <textarea name="version" from="protocolversion">
+                        <area>704,0,242,100%</area>
+                    </textarea>
+                    <statetype name="connection">
+                        <area>8,0,100%-8,100%</area>
+                        <state name="good">
+                            <area>0,0,100%,100%</area>
+                        </state>
+                        <state name="protocolmismatch">
+                            <area>0,0,100%,100%</area>
+                            <textarea name="description">
+                                <area>0,0,100%,100%</area>
+                                <align>allcenter</align>
+                                <value>Version Mismatch Between Client and Server</value>
+                                <font>basesmallred</font>
+                            </textarea>
+                        </state>
+                        <state name="blocked" from="protocolmismatch">
+                            <textarea name="description">
+                                <area>0,0,100%,100%</area>
+                                <align>allcenter</align>
+                                <value>Firewall is Blocking the Server</value>
+                                <font>basesmallred</font>
+                            </textarea>
+                        </state>
+                    </statetype>
+                    <statetype name="securitypin">
+                        <area>946,0,80,100%</area>
+                        <state name="yes">
+                            <area>0,0,80,100%</area>
+                            <textarea name="description">
+                                <area>0,0,80,100%</area>
+                                <align>allcenter</align>
+                                <value>LOCKED</value>
+                                <font>basesupersmallred</font>
+                            </textarea>
+                        </state>
+                        <state name="no" from="yes">
+                            <textarea name="description">
+                                <value>UNLOCKED</value>
+                                <font>basesupersmallgreen</font>
+                            </textarea>
+                        </state>
+                    </statetype>
+                </state>
+                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active">
+                    <area>0,0,1034,64</area>
+                    <group name="select_bar" from="base_select_bar_selectedactive_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+                    <textarea name="buttontext" from="basetextarea">
+                        <area>8,0,420,100%</area>
+                        <align>left,vcenter</align>
+                        <font>basesmallyellow</font>
+                    </textarea>
+                    <textarea name="modelname" from="buttontext" /> <!-- Workaround for vanishing buttontext bug -->
+                    <textarea name="protocolversion" from="buttontext">
+                        <area>538,0,50,100%</area>
+                        <cutdown>yes</cutdown>
+                        <align>left,vcenter</align>
+                        <font>basesmalleryellow</font>
+                    </textarea>
+                    <textarea name="version" from="protocolversion">
+                        <area>704,0,242,100%</area>
+                    </textarea>
+                </state>
+                <state name="selectedinactive" from="selectedactive">
+                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+                </state>
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>998,494</position>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>1018,494</position>
+            </statetype>
+            <helptext>Select a server.</helptext>
+        </buttonlist>
+
+        <textarea name="helptext" from="basetextarea">
+            <area>139,552,1003,66</area>
+            <font>basesmaller</font>
+            <cutdown>yes</cutdown>
+            <align>allcenter</align>
+            <multiline>yes</multiline>
+        </textarea>
+        <button name="cancel" from="base_button">
+            <area>265,632,150,40</area>
+            <value>Cancel</value>
+            <helptext>Close without saving the selected server.</helptext>
+        </button>
+        <button name="manual" from="base_button">
+            <area>565,632,150,40</area>
+            <value>Manual</value>
+            <helptext>Manually select a server.</helptext>
+        </button>
+        <button name="save" from="base_button">
+            <area>865,632,150,40</area>
+            <value>Save</value>
+            <helptext>Save the selected server.</helptext>
+        </button>
+    </window>
+
+    <window name="guistartup">
+
+        <textarea name="heading" from="base_heading">
+            <value>MythTV Startup Status</value>
+        </textarea>
+
+        <shape name="startup-backdrop" from="base_backdrop">
+            <area>115,36,1050,649</area>
+        </shape>
+
+        <shape name="startup-backdrop-line" from="base_backdrop_line">
+            <area>116,37,1048,506</area>
+        </shape>
+
+        <shape name="startup-top-line" from="base_highlight_line">
+            <area>117,38,1046,2</area>
+        </shape>
+
+        <shape name="startup-bottom-line" from="base_highlight_line">
+            <area>117,540,1046,2</area>
+        </shape>
+
+        <shape name="startup-left-line" from="base_highlight_vertical_line">
+            <area>117,40,2,500</area>
+        </shape>
+
+        <shape name="startup-right-line" from="base_highlight_vertical_line">
+            <area>1161,40,2,500</area>
+        </shape>
+
+        <shape name="startup-bottom-backdrop-line" from="base_backdrop_line">
+            <area>116,547,1048,137</area>
+        </shape>
+
+        <shape name="startup-bottom-top-line" from="base_highlight_line">
+            <area>117,548,1046,2</area>
+        </shape>
+
+        <shape name="startup-bottom-bottom-line" from="base_highlight_line">
+            <area>117,681,1046,2</area>
+        </shape>
+
+        <shape name="startup-bottom-left-line" from="base_highlight_vertical_line">
+            <area>117,550,2,131</area>
+        </shape>
+
+        <shape name="startup-bottom-right-line" from="base_highlight_vertical_line">
+            <area>1161,550,2,131</area>
+        </shape>
+
+        <shape name="startup-bottom-seperator-first-line" from="base_line">
+            <area>138,620,1004,2</area>
+        </shape>
+
+        <progressbar name="progress" from="baseprogressbar">
+            <position>372,214</position>
+        </progressbar>
+
+        <statetype name="statusstate">
+            <area>129,255,1022,40</area>
+            <state name="start">
+                <area>0,0,1022,40</area>
+                <textarea name="status" from="basetextarea">
+                    <area>0,0,1022,40</area>
+                    <font>basemedium</font>
+                    <align>allcenter</align>
+                    <value>Waking up Database Machine</value>
+                    <multiline>true</multiline>
+                </textarea>
+            </state>
+            <state name="startFail" from="start">
+                <textarea name="status">
+                    <value>Database Machine Failed to Wake Up</value>
+                </textarea>
+            </state>
+            <state name="dbAwake" from="start">
+                <textarea name="status">
+                    <value>Waiting for Database to Start</value>
+                </textarea>
+            </state>
+            <state name="dbAwakeFail" from="start">
+                <textarea name="status">
+                    <value>Database Failed to Start</value>
+                </textarea>
+            </state>
+            <state name="dbStarted" from="start">
+                <textarea name="status">
+                    <value>Attempting to Connect to Database</value>
+                </textarea>
+            </state>
+            <state name="dbStartedFail" from="start">
+                <textarea name="status">
+                    <value>Unable to Connect to Database</value>
+                </textarea>
+            </state>
+            <state name="beWOL" from="start">
+                <textarea name="status">
+                    <value>Attempting to Wake Master Backend</value>
+                </textarea>
+            </state>
+            <state name="beWOLFail" from="start">
+                <textarea name="status">
+                    <value>Master Backend Failed to Wake</value>
+                </textarea>
+            </state>
+            <state name="beAwake" from="start">
+                <textarea name="status">
+                    <value>Attempting to Connect to Master Backend</value>
+                </textarea>
+            </state>
+            <state name="beAwakeFail" from="start">
+                <textarea name="status">
+                    <value>Unable to Connect to Master Backend</value>
+                </textarea>
+            </state>
+        </statetype>
+
+        <statetype name="messagestate">
+            <area>129,316,1022,40</area>
+            <state name="makeselection">
+                <area>0,0,100%,100%</area>
+                <textarea name="message" from="basetextarea">
+                    <area>0,0,100%,100%</area>
+                    <font>basemedium</font>
+                    <align>allcenter</align>
+                    <value></value>
+                    <multiline>true</multiline>
+                </textarea>
+            </state>
+            <state name="empty" from="makeselection">
+                <textarea name="message">
+                    <value></value>
+                </textarea>
+            </state>
+        </statetype>
+
+        <textarea name="helptext" from="basetextarea">
+            <area>139,552,1003,66</area>
+            <font>basesmaller</font>
+            <cutdown>yes</cutdown>
+            <align>allcenter</align>
+            <multiline>yes</multiline>
+        </textarea>
+
+        <button name="dummy" from="base_button">
+            <area>0%,80%,0,0</area>
+            <value></value>
+            <helptext></helptext>
+        </button>
+
+        <button name="retry" from="base_button">
+            <area>205,632,150,40</area>
+            <value>Retry</value>
+            <helptext>Try again to establish connections.</helptext>
+        </button>
+
+        <button name="search" from="base_button">
+            <area>445,632,150,40</area>
+            <value>Search</value>
+            <helptext>Search the local network for the MythTV Backend.</helptext>
+        </button>
+
+        <button name="setup" from="base_button">
+            <area>685,632,150,40</area>
+            <value>Setup</value>
+            <helptext>Use Database setup to enter database parameters.</helptext>
+        </button>
+
+        <button name="exit" from="base_button">
+            <area>925,632,150,40</area>
+            <value>Exit</value>
+            <helptext>Exit from MythTV.</helptext>
+        </button>
+    </window>
+
+    <window name="channelscanner">
+        <area>0,0,1280,720</area>
+
+        <textarea name="heading" from="base_heading">
+            <value>Channel Scanner</value>
+        </textarea>
+
+        <shape name="status-backdrop" from="base_backdrop">
+            <area>0,37,1280,44</area>
+            <type>box</type>
+        </shape>
+
+        <shape name="status-top-line" from="base_line">
+            <area>0,38,1280,2</area>
+        </shape>
+
+        <shape name="status-bottom-line" from="base_line">
+            <area>0,77,1280,2</area>
+        </shape>
+
+        <shape name="scanner-progress-backdrop" from="base_backdrop">
+            <area>645,92,615,592</area>
+        </shape>
+
+        <shape name="scanner-progress-backdrop-line" from="base_backdrop_line">
+            <area>646,93,613,590</area>
+        </shape>
+
+        <shape name="scanner-progress-top-line" from="base_highlight_line">
+            <area>647,94,611,2</area>
+        </shape>
+
+        <shape name="scanner-progress-bottom-line" from="base_highlight_line">
+            <area>647,680,611,2</area>
+        </shape>
+
+        <shape name="scanner-progress-left-line" from="base_highlight_vertical_line">
+            <area>647,96,2,584</area>
+        </shape>
+
+        <shape name="scanner-progress-right-line" from="base_highlight_vertical_line">
+            <area>1256,96,2,584</area>
+        </shape>
+
+        <shape name="scanner-channels-backdrop" from="base_backdrop">
+            <area>20,92,615,592</area>
+        </shape>
+
+        <shape name="scanner-channels-backdrop-line" from="base_backdrop_line">
+            <area>21,93,613,590</area>
+        </shape>
+
+        <shape name="scanner-channels-top-line" from="base_highlight_line">
+            <area>22,94,611,2</area>
+        </shape>
+
+        <shape name="scanner-channels-bottom-line" from="base_highlight_line">
+            <area>22,680,611,2</area>
+        </shape>
+
+        <shape name="scanner-channels-left-line" from="base_highlight_vertical_line">
+            <area>22,96,2,584</area>
+        </shape>
+
+        <shape name="scanner-channels-right-line" from="base_highlight_vertical_line">
+            <area>631,96,2,584</area>
+        </shape>
+
+        <shape name="scanner-channels-arrows-backdrop" from="base_arrows_backdrop">
+            <area>1207,684,50,10</area>
+        </shape>
+
+        <textarea name="status">
+            <area>265,39,460,40</area>
+            <font>basesmall</font>
+            <align>right,vcenter</align>
+            <template>%1</template>
+        </textarea>
+
+        <textarea name="signallock" from="status">
+            <area>735,39,300,40</area>
+            <align>left,vcenter</align>
+            <template>[%1]</template>
+        </textarea>
+
+        <textarea name="scanprogresstext" from="status">
+            <area>945,39,300,40</area>
+            <template>Channels%1</template>
+        </textarea>
+
+        <textarea name="progress_label">
+            <area>60,190,535,30</area>
+            <font>basesmall</font>
+            <align>left,vcenter</align>
+            <value>Scan Progress</value>
+        </textarea>
+
+        <textarea name="progresstext" from="progress_label">
+            <area>60,240,535,30</area>
+            <font>basesmall</font>
+            <align>allcenter</align>
+        </textarea>
+
+        <progressbar name="scanprogress" from="baseprogressbar">
+            <position>60,225</position>
+        </progressbar>
+
+        <group name="noisegroup" depends="signalnoise">
+            <area>60,300,535,200</area>
+            <textarea name="signalnoise_label">
+                <area>0,0,100%,30</area>
+                <align>left,vcenter</align>
+                <font>basesmall</font>
+                <value>Signal/Noise</value>
+            </textarea>
+            <textarea name="signalnoisetext">
+                <area>0,50,100%,30</area>
+                <font>basesmall</font>
+                <align>allcenter</align>
+            </textarea>
+            <progressbar name="signalnoise" from="smallprogressbar">
+                <position>0,35</position>
+            </progressbar>
+        </group>
+
+        <group name="strengthgroup" depends="signalstrength">
+            <area>60,400,535,200</area>
+            <textarea name="signalstrength_label">
+                <area>0,0,100%,30</area>
+                <align>left,vcenter</align>
+                <font>basesmall</font>
+                <value>Signal Strength</value>
+            </textarea>
+            <textarea name="signalstrengthtext">
+                <area>0,50,100%,30</area>
+                <font>basesmall</font>
+                <align>allcenter</align>
+            </textarea>
+            <progressbar name="signalstrength" from="smallprogressbar">
+                <position>0,35</position>
+            </progressbar>
+        </group>
+
+        <group name="rotatorgroup" depends="rotorprogress">
+            <area>60,500,535,200</area>
+            <textarea name="rotorprogress_label">
+                <area>0,0,100%,30</area>
+                <align>left,vcenter</align>
+                <font>basesmall</font>
+                <value>Rotor Movement</value>
+            </textarea>
+            <textarea name="rotatorprogresstext">
+                <area>0,50,100%,30</area>
+                <font>basesmall</font>
+                <align>allcenter</align>
+            </textarea>
+            <progressbar name="rotorprogress" from="smallprogressbar">
+                <position>0,35</position>
+            </progressbar>
+        </group>
+
+        <buttonlist name="log" from="base_list">
+            <area>653,100,599,578</area>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,599,54</area>
+                    <textarea name="buttontext">
+                        <area>0,0,100%,100%</area>
+                        <font>basesmaller</font>
+                        <multiline>yes</multiline>
+                        <align>allcenter</align>
+                    </textarea>
+                </state>
+                <state name="selectedactive" from="active">
+                    <area>0,0,599,112</area>
+                    <group name="select_bar" from="base_select_bar_selectedactive_group">
+                        <area>0,0,100%,100%</area>
+                        <shape name="select_bar_bottom_highlight">
+                            <area>0,110,100%,2</area>
+                        </shape>
+                    </group>
+                    <textarea name="buttontext">
+                        <font>basesmalleryellow</font>
+                    </textarea>
+                </state>
+                <state name="selectedinactive" from="selectedactive">
+                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                        <area>0,0,100%,100%</area>
+                        <shape name="select_bar_bottom_highlight">
+                            <area>0,110,100%,2</area>
+                        </shape>
+                    </group>
+                </state>
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>561,585</position>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>581,585</position>
+            </statetype>
+        </buttonlist>
+    </window>
+
 </mythuitheme>