Index: themes/MythCenter-wide/base.xml
===================================================================
--- themes/MythCenter-wide/base.xml.orig
+++ themes/MythCenter-wide/base.xml
@@ -177,12 +177,12 @@
                     <filename>lb-arrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="255" />
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="100" />
                 </imagetype>
@@ -241,7 +241,7 @@
                     <align>vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="selectbar">
                     <area>25,0,1162,25</area>
                     <type>roundbox</type>
@@ -250,7 +250,7 @@
                     <cornerradius>4</cornerradius>
                 </shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="upscrollarrow">
             <position>1190,5</position>
@@ -527,8 +527,8 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="inactive" from="active" />
-            <state name="selected" from="active">
+            <state name="selectedinactive" from="active" />
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
         </statetype>
@@ -571,10 +571,10 @@
                     <area>5,5,465,30</area>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>480,2</position>
@@ -672,13 +672,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -721,13 +721,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -845,12 +845,12 @@
                         <area>4,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
@@ -921,8 +921,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <area>0,0,165,105</area>
                         <gradient start="#999999" end="#666666" alpha="220" />
Index: themes/MythCenter-wide/menu-ui.xml
===================================================================
--- themes/MythCenter-wide/menu-ui.xml.orig
+++ themes/MythCenter-wide/menu-ui.xml
@@ -149,7 +149,7 @@
                         <cutdown>yes</cutdown>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="background">
                         <filename>ui/button_on.png</filename>
                     </imagetype>
Index: themes/MythCenter-wide/recordings-ui.xml
===================================================================
--- themes/MythCenter-wide/recordings-ui.xml.orig
+++ themes/MythCenter-wide/recordings-ui.xml
@@ -33,7 +33,7 @@
                         <alpha>0</alpha>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>0,0,300,30</area>
                     <shape name="recSelectedGroupShape">
                         <area>0,0,0,0</area>
@@ -46,7 +46,7 @@
                         <alpha>200</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <area>0,0,0,0</area>
@@ -71,7 +71,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <textarea name="name">
                         <area>5,1,300,30</area>
                         <font>basesmallboldblue</font>
@@ -79,7 +79,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="name">
                         <area>5,1,300,30</area>
                         <font>basesmallbold</font>
@@ -155,8 +155,8 @@
                         <state name="no" />
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>26,0,855,33</area>
                     </shape>
@@ -627,7 +627,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>0,0,650,40</area>
                         <type>roundbox</type>
@@ -635,7 +635,7 @@
                         <cornerradius>13</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>590,390</position>
Index: themes/MythCenter/base.xml
===================================================================
--- themes/MythCenter/base.xml.orig
+++ themes/MythCenter/base.xml
@@ -177,12 +177,12 @@
                     <filename>lb-arrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="255" />
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="100" />
                 </imagetype>
@@ -241,7 +241,7 @@
                     <align>vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="selectbar">
                     <area>5,-4,750,29</area>
                     <type>roundbox</type>
@@ -250,7 +250,7 @@
                     <cornerradius>4</cornerradius>
                 </shape>
             </state>
-            <state name="inactive" from="active" /> 
+            <state name="selectedinactive" from="active" /> 
         </statetype>
         <statetype name="upscrollarrow">
             <position>710,268</position>
@@ -524,10 +524,10 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>205,2</position>
@@ -568,10 +568,10 @@
                     <area>5,5,365,30</area>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>380,2</position>
@@ -669,13 +669,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -718,13 +718,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -842,12 +842,12 @@
                         <area>4,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
@@ -918,8 +918,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <area>0,0,165,105</area>
                         <gradient start="#999999" end="#666666" alpha="220" />
Index: themes/MythCenter/menu-ui.xml
===================================================================
--- themes/MythCenter/menu-ui.xml.orig
+++ themes/MythCenter/menu-ui.xml
@@ -144,7 +144,7 @@
                         <cutdown>yes</cutdown>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="background">
                         <filename>ui/button_on.png</filename>
                     </imagetype>
Index: themes/MythCenter/recordings-ui.xml
===================================================================
--- themes/MythCenter/recordings-ui.xml.orig
+++ themes/MythCenter/recordings-ui.xml
@@ -33,7 +33,7 @@
                         <alpha>0</alpha>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>0,0,300,30</area>
                     <shape name="recSelectedGroupShape">
                         <area>0,0,0,0</area>
@@ -46,7 +46,7 @@
                         <alpha>230</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <area>0,0,0,0</area>
@@ -71,7 +71,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <textarea name="name">
                         <area>5,-4,180,30</area>
                         <font>basesmallboldblue</font>
@@ -79,7 +79,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="name">
                         <area>5,-4,180,30</area>
                         <font>basesmallbold</font>
@@ -121,9 +121,9 @@
                         <state name="no" />
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="titlesubtitle" from="buttontext">
                         <area>15,1,370,24</area>
                         <font>basesmallbold</font>
@@ -608,7 +608,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>0,0,650,40</area>
                         <type>roundbox</type>
@@ -616,7 +616,7 @@
                         <cornerradius>13</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>590,395</position>
Index: themes/MythCenter/schedule-ui.xml
===================================================================
--- themes/MythCenter/schedule-ui.xml.orig
+++ themes/MythCenter/schedule-ui.xml
@@ -86,8 +86,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -114,8 +114,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -253,8 +253,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -307,8 +307,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -503,7 +503,7 @@
                         <area>730,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="shortstarttimedate" from="buttontext">
                         <area>15,1,155,24</area>
                         <font state="disabled">basesmallboldgreyhighlight</font>
@@ -522,7 +522,7 @@
                         <font>basesmallbold</font>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -606,8 +606,8 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>710,340</position>
@@ -716,13 +716,13 @@
                         <position>710,1</position>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>3,-5,755,35</area>
                         <font>basesmallbold</font>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>710,355</position>
@@ -838,12 +838,12 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>5,-4,750,28</area>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>710,340</position>
@@ -1047,12 +1047,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1128,12 +1128,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1256,8 +1256,8 @@
                         <area>730,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>700,330</position>
@@ -1380,7 +1380,7 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
@@ -1388,7 +1388,7 @@
                         <area>0,0,0,0</area>
                     </shape>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="upscrollarrow">
                 <state type="off">
@@ -1428,12 +1428,12 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -1449,12 +1449,12 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
Index: themes/MythCenter/video-ui.xml
===================================================================
--- themes/MythCenter/video-ui.xml.orig
+++ themes/MythCenter/video-ui.xml
@@ -372,7 +372,7 @@
                         <area>670,4,50,25</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmall</font>
                     </textarea>
@@ -464,7 +464,7 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>0,0,50,255</area>
                     <imagetype name="buttonimage">
                         <alpha>255</alpha>
@@ -676,7 +676,7 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>shared/grid_back_sel.png</filename>
                     </imagetype>
Index: themes/Terra/base.xml
===================================================================
--- themes/Terra/base.xml.orig
+++ themes/Terra/base.xml
@@ -347,12 +347,12 @@
                     <align>allcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="buttonbackground">
                     <fill color="#8a916f" />
                 </shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="upscrollarrow">
             <position>0,0</position>
@@ -384,12 +384,12 @@
                     <align>allcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="buttonbackground">
                     <fill color="#8a916f" />
                 </shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>492,0</position>
@@ -540,9 +540,9 @@
                         <filename>popups/submenu_arrow.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="selecteditemarrow">
                         <position>5,16</position>
                         <filename>popups/selected_item_arrow.png</filename>
@@ -593,8 +593,8 @@
                         <filename>popups/submenu_arrow.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <imagetype name="selecteditemarrow">
                         <position>5,16</position>
                         <filename>popups/selected_item_arrow.png</filename>
@@ -782,8 +782,8 @@
                         <multiline>yes</multiline>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <shape name="buttonbackground">
                         <area>0,0,100%,100%</area>
                         <type>roundbox</type>
Index: themes/Terra/browser-ui.xml
===================================================================
--- themes/Terra/browser-ui.xml.orig
+++ themes/Terra/browser-ui.xml
@@ -34,7 +34,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="frame">
                         <position>-19,0</position>
                         <filename>recordings/generallistselectedframe.png</filename>
@@ -46,7 +46,7 @@
                         <position>37,58</position>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -90,14 +90,14 @@
                         <alpha>220</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <area>4,1,232,36</area>
                         <font>basemediumbrown</font>
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>1264,0</position>
Index: themes/Terra/config-ui.xml
===================================================================
--- themes/Terra/config-ui.xml.orig
+++ themes/Terra/config-ui.xml
@@ -41,12 +41,12 @@
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallbrown</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -150,7 +150,7 @@
                         <area>502,6,67,50</area>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="frame">
                         <position>-19,0</position>
                         <filename>recordings/generallistselectedframe.png</filename>
@@ -202,7 +202,7 @@
                         <mask>config/selected_icon_mask.png</mask>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -246,14 +246,14 @@
                         <alpha>220</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <area>4,1,232,36</area>
                         <font>basemediumbrown</font>
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>132,247</position>
Index: themes/Terra/gallery-ui.xml
===================================================================
--- themes/Terra/gallery-ui.xml.orig
+++ themes/Terra/gallery-ui.xml
@@ -67,7 +67,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>video/video_gallery_background_selected.png</filename>
                     </imagetype>
Index: themes/Terra/game-ui.xml
===================================================================
--- themes/Terra/game-ui.xml.orig
+++ themes/Terra/game-ui.xml
@@ -31,7 +31,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <gradient start="#8a916f" end="#8a916f" alpha="255"/>
                     </imagetype>
@@ -42,7 +42,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
     </buttontree>
Index: themes/Terra/menu-ui.xml
===================================================================
--- themes/Terra/menu-ui.xml.orig
+++ themes/Terra/menu-ui.xml
@@ -531,7 +531,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>-11,0,277,330</area>
 
                     <textarea name="buttontext">
@@ -942,7 +942,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>700,400</position>
Index: themes/Terra/netvision-ui.xml
===================================================================
--- themes/Terra/netvision-ui.xml.orig
+++ themes/Terra/netvision-ui.xml
@@ -24,7 +24,7 @@
             <buttonarea>0,0,1282,299</buttonarea>
             <spacing>0</spacing>
             <statetype name="buttonitem">
-                <state name="selected">
+                <state name="selectedactive">
                     <area>-13,0,209,332</area>
                     <imagetype name="buttonimage">
                         <area>1,3,209,325</area>
@@ -57,7 +57,7 @@
                     </textarea>
 
                 </state>
-                <state name="active" from="selected">
+                <state name="active" from="selectedactive">
                     <area>0,0,183,332</area>
                     <imagetype name="buttonimage">
                         <area>0,25,183,275</area>
@@ -175,7 +175,7 @@
                         <align>hcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>video/video_gallery_background_selected.png</filename>
                     </imagetype>
Index: themes/Terra/news-ui.xml
===================================================================
--- themes/Terra/news-ui.xml.orig
+++ themes/Terra/news-ui.xml
@@ -29,7 +29,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="frame">
                         <position>-19,0</position>
                         <filename>recordings/generallistselectedframe.png</filename>
@@ -38,7 +38,7 @@
                         <area>37,10,530,42</area>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -82,14 +82,14 @@
                         <alpha>220</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <area>4,1,232,36</area>
                         <font>basemediumbrown</font>
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>1264,0</position>
Index: themes/Terra/recordings-ui.xml
===================================================================
--- themes/Terra/recordings-ui.xml.orig
+++ themes/Terra/recordings-ui.xml
@@ -34,13 +34,13 @@
                         <alpha>220</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="name">
                         <area>4,1,232,36</area>
                         <font>baselargebrown</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected">
+                <state name="selectedinactive" from="selectedactive">
                     <textarea name="name">
                         <font>baselarge</font>
                         <alpha>220</alpha>
@@ -153,7 +153,7 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>-17,0,291,307</area>
                     <imagetype name="frame">
                         <filename>recordings/selected_recording_background.png</filename>
@@ -188,7 +188,7 @@
                         <position>240,12</position>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>0,289</position>
@@ -358,9 +358,9 @@
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="selecteditemarrow">
                         <position>3,6</position>
                         <filename>popups/selected_item_arrow.png</filename>
@@ -641,9 +641,9 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="selecteditemarrow">
                         <position>3,18</position>
                         <filename>popups/selected_item_arrow.png</filename>
Index: themes/Terra/schedule-ui.xml
===================================================================
--- themes/Terra/schedule-ui.xml.orig
+++ themes/Terra/schedule-ui.xml
@@ -158,7 +158,7 @@
                         <align>right,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="frame">
                         <position>-19,0</position>
                         <filename>recordings/generallistselectedframe.png</filename>
@@ -206,7 +206,7 @@
                         <position>457,58</position>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -250,14 +250,14 @@
                         <alpha>220</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <area>4,1,232,36</area>
                         <font>basemediumbrown</font>
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>1264,0</position>
@@ -408,8 +408,8 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1190,5</position>
@@ -553,7 +553,7 @@
                         <position>1180,2</position>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="background">
                         <area>21,0,1218,32</area>
                         <type>roundbox</type>
@@ -573,7 +573,7 @@
                         <font>basesmallbrown</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1250,0</position>
@@ -794,12 +794,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -877,12 +877,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1034,7 +1034,7 @@
                         <align>right,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="frame">
                         <position>-19,0</position>
                         <filename>recordings/generallistselectedframe.png</filename>
@@ -1076,7 +1076,7 @@
                         <position>37,58</position>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -1240,8 +1240,8 @@
                         <multiline>yes</multiline>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -1299,8 +1299,8 @@
                         <filename>shared/list_right_arrow.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -1873,7 +1873,7 @@
                         <value>123</value>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>0,-3,570,46</area>
                     <imagetype name="frame">
                         <filename>schedule/progfind_list_background_selected.png</filename>
@@ -1885,7 +1885,7 @@
                         <position>515,7</position>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected">
+                <state name="selectedinactive" from="selectedactive">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -1929,14 +1929,14 @@
                         <alpha>220</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <area>4,1,32,36</area>
                         <font>basemediumbrown</font>
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>132,247</position>
Index: themes/Terra/status-ui.xml
===================================================================
--- themes/Terra/status-ui.xml.orig
+++ themes/Terra/status-ui.xml
@@ -32,7 +32,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="frame">
                         <position>-19,0</position>
                         <filename>recordings/generallistselectedframe.png</filename>
@@ -46,7 +46,7 @@
                         <area>37,10,555,42</area>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
Index: themes/Terra/video-ui.xml
===================================================================
--- themes/Terra/video-ui.xml.orig
+++ themes/Terra/video-ui.xml
@@ -70,9 +70,9 @@
                         <filename>popups/submenu_arrow.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="selecteditemarrow">
                         <position>5,16</position>
                         <filename>popups/selected_item_arrow.png</filename>
@@ -324,7 +324,7 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>0,-24,92,137</area>
                     <imagetype name="buttonimage">
                         <area>0,0,92,137</area>
@@ -565,7 +565,7 @@
             <buttonarea>0,0,1282,299</buttonarea>
             <spacing>0</spacing>
             <statetype name="buttonitem">
-                <state name="selected">
+                <state name="selectedactive">
                     <area>-13,0,209,332</area>
                     <imagetype name="coverart">
                         <area>1,3,209,325</area>
@@ -598,7 +598,7 @@
                     </textarea>
 
                 </state>
-                <state name="active" from="selected">
+                <state name="active" from="selectedactive">
                     <area>0,0,183,332</area>
                     <imagetype name="coverart">
                         <area>0,25,183,275</area>
@@ -730,7 +730,7 @@
                         <align>hcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>video/video_gallery_background_selected.png</filename>
                     </imagetype>
Index: themes/default-wide/base.xml
===================================================================
--- themes/default-wide/base.xml.orig
+++ themes/default-wide/base.xml
@@ -136,12 +136,12 @@
                     <filename>lb-arrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="255" />
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="100" />
                 </imagetype>
@@ -229,7 +229,7 @@
                     <align>vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="selectbar">
                     <area>25,0,1162,25</area>
                     <type>roundbox</type>
@@ -237,7 +237,7 @@
                     <cornerradius>13</cornerradius>
                 </shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="upscrollarrow">
             <position>1190,5</position>
@@ -490,8 +490,8 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="inactive" from="active" />
-            <state name="selected" from="active">
+            <state name="selectedinactive" from="active" />
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
         </statetype>
@@ -534,10 +534,10 @@
                     <area>5,5,465,30</area>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>480,2</position>
@@ -637,13 +637,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -686,13 +686,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -810,12 +810,12 @@
                         <area>4,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
Index: themes/default-wide/config-ui.xml
===================================================================
--- themes/default-wide/config-ui.xml.orig
+++ themes/default-wide/config-ui.xml
@@ -41,8 +41,8 @@
                         <area>860,1,275,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
Index: themes/default-wide/recordings-ui.xml
===================================================================
--- themes/default-wide/recordings-ui.xml.orig
+++ themes/default-wide/recordings-ui.xml
@@ -42,7 +42,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>0,0,300,30</area>
                     <shape name="recSelectedGroupShape">
                         <area>0, 0, 100%, 100%</area>
@@ -60,7 +60,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>132,247</position>
@@ -85,8 +85,8 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active" />
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -126,8 +126,8 @@
                         <state name="no" />
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>25,0,857,30</area>
                     </shape>
@@ -421,7 +421,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>0,0,650,40</area>
                         <type>roundbox</type>
@@ -429,7 +429,7 @@
                         <cornerradius>13</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>590,390</position>
Index: themes/default-wide/schedule-ui.xml
===================================================================
--- themes/default-wide/schedule-ui.xml.orig
+++ themes/default-wide/schedule-ui.xml
@@ -93,8 +93,8 @@
                         <align>hcenter,bottom</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -147,8 +147,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -316,8 +316,8 @@
                         <align>hcenter,bottom</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -370,8 +370,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -567,8 +567,8 @@
                         <area>1145,1,35,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -652,8 +652,8 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1190,5</position>
@@ -761,8 +761,8 @@
                         <position>1130,1</position>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -942,12 +942,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1025,12 +1025,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1157,8 +1157,8 @@
                         <area>1160,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1190,5</position>
@@ -1283,7 +1283,7 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
@@ -1291,7 +1291,7 @@
                         <area>0,0,0,0</area>
                     </shape>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="upscrollarrow">
                 <state type="off">
@@ -1331,12 +1331,12 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -1353,8 +1353,8 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -1456,8 +1456,8 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -2016,8 +2016,8 @@
                         <area>1160,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1190,5</position>
Index: themes/default-wide/status-ui.xml
===================================================================
--- themes/default-wide/status-ui.xml.orig
+++ themes/default-wide/status-ui.xml
@@ -27,10 +27,10 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="background" from="baseselectedwidgetshape" />
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallgrey</font>
                     </textarea>
Index: themes/default/base.xml
===================================================================
--- themes/default/base.xml.orig
+++ themes/default/base.xml
@@ -135,12 +135,12 @@
                     <filename>lb-arrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="255" />
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <gradient start="#52CA38" end="#349838" alpha="100" />
                 </imagetype>
@@ -226,7 +226,7 @@
                     <align>vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="selectbar">
                     <area>25,0,735,25</area>
                     <type>roundbox</type>
@@ -234,7 +234,7 @@
                     <cornerradius>13</cornerradius>
                 </shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="upscrollarrow">
             <position>710,285</position>
@@ -508,10 +508,10 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>205,2</position>
@@ -552,10 +552,10 @@
                     <area>5,5,365,30</area>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape" />
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>380,2</position>
@@ -644,13 +644,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -693,13 +693,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,0,100%,30</area>
                         <align>allcenter</align>
@@ -817,12 +817,12 @@
                         <area>4,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,460,30</area>
                     </textarea>
@@ -893,8 +893,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <area>0,0,165,105</area>
                         <gradient start="#999999" end="#666666" alpha="220" />
Index: themes/default/config-ui.xml
===================================================================
--- themes/default/config-ui.xml.orig
+++ themes/default/config-ui.xml
@@ -29,12 +29,12 @@
                         <multiline>yes</multiline>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <gradient start="#669966" end="#339933" alpha="200" />
                     </imagetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>700,425</position>
@@ -131,8 +131,8 @@
                         <area>500,1,200,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
Index: themes/default/recordings-ui.xml
===================================================================
--- themes/default/recordings-ui.xml.orig
+++ themes/default/recordings-ui.xml
@@ -43,7 +43,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>0,0,300,30</area>
                     <shape name="recSelectedGroupShape">
                         <area>0, 0, 100%, 100%</area>
@@ -61,7 +61,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>132,247</position>
@@ -86,8 +86,8 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active" />
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -127,8 +127,8 @@
                         <state name="no" />
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>25,0,527,25</area>
                     </shape>
@@ -599,7 +599,7 @@
                         <align>vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>0,0,650,40</area>
                         <type>roundbox</type>
@@ -607,7 +607,7 @@
                         <cornerradius>13</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>590,395</position>
Index: themes/default/schedule-ui.xml
===================================================================
--- themes/default/schedule-ui.xml.orig
+++ themes/default/schedule-ui.xml
@@ -85,8 +85,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -113,8 +113,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -252,8 +252,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -306,8 +306,8 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="downscrollarrow">
                 <state type="off">
@@ -501,8 +501,8 @@
                         <area>730,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
 
@@ -586,8 +586,8 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>710,340</position>
@@ -696,8 +696,8 @@
                         <position>710,1</position>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>710,340</position>
@@ -812,8 +812,8 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>710,340</position>
@@ -1017,12 +1017,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1098,12 +1098,12 @@
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,0,450,30</area>
                     </textarea>
@@ -1225,8 +1225,8 @@
                         <area>730,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>700,330</position>
@@ -1350,7 +1350,7 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
@@ -1358,7 +1358,7 @@
                         <area>0,0,0,0</area>
                     </shape>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
             <statetype name="upscrollarrow">
                 <state type="off">
@@ -1398,12 +1398,12 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -1420,8 +1420,8 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active"/>
-                <state name="inactive" from="active"/>
+                <state name="selectedactive" from="active"/>
+                <state name="selectedinactive" from="active"/>
             </statetype>
         </buttonlist>
 
@@ -1943,8 +1943,8 @@
                         <area>730,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active" />
-                <state name="inactive" from="active" />
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>700,330</position>
Index: themes/default/status-ui.xml
===================================================================
--- themes/default/status-ui.xml.orig
+++ themes/default/status-ui.xml
@@ -29,10 +29,10 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="background" from="baseselectedwidgetshape" />
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallgrey</font>
                     </textarea>