Index: metallurgy/video-ui.xml
===================================================================
--- metallurgy/video-ui.xml	(revision 23428)
+++ metallurgy/video-ui.xml	(working copy)
@@ -253,7 +253,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>
@@ -329,7 +329,7 @@
                         <align>hcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <position>5,7</position>
                         <filename>mv_browse_selector.png</filename>
@@ -501,7 +501,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>0,0,356,140</area>
                     <imagetype name="buttonbackground">
                         <filename>video/back_sel.png</filename>
Index: metallurgy/schedule-ui.xml
===================================================================
--- metallurgy/schedule-ui.xml	(revision 23428)
+++ metallurgy/schedule-ui.xml	(working copy)
@@ -136,8 +136,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>560,0</position>
@@ -328,8 +328,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>
 
@@ -351,8 +351,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>
 
@@ -442,8 +442,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>
 
@@ -465,8 +465,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>
 
@@ -536,12 +536,12 @@
                         <area>30,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>30,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>30,0,450,30</area>
                     </textarea>
@@ -622,12 +622,12 @@
                         <area>30,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>30,0,450,30</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>30,0,450,30</area>
                     </textarea>
@@ -770,8 +770,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>560,0</position>
Index: metallurgy/gallery-ui.xml
===================================================================
--- metallurgy/gallery-ui.xml	(revision 23428)
+++ metallurgy/gallery-ui.xml	(working copy)
@@ -42,7 +42,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>gallery/back_sel.png</filename>
                     </imagetype>
Index: metallurgy/base.xml
===================================================================
--- metallurgy/base.xml	(revision 23428)
+++ metallurgy/base.xml	(working copy)
@@ -200,12 +200,12 @@
                     <filename>shared/rightarrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="selectindicator">
                     <filename>shared/selectbar.png</filename>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="selectindicator">
                     <filename>shared/inactiveselectbar.png</filename>
                 </imagetype>
@@ -299,12 +299,12 @@
                         <filename>shared/rightarrow.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="selectindicator">
                         <filename>shared/selectbar.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="selectindicator">
                         <filename>shared/inactiveselectbar.png</filename>
                     </imagetype>
@@ -344,8 +344,8 @@
                         <area>30,0,440,30</area>
                     </textarea>
                 </state>
-                <state name="inactive" from="active"/>
-                <state name="selected" from="active"/>
+                <state name="selectedinactive" from="active"/>
+                <state name="selectedactive" from="active"/>
             </statetype>
             <statetype name="upscrollarrow">
                 <position>423,0</position>
Index: metallurgy/recordings-ui.xml
===================================================================
--- metallurgy/recordings-ui.xml	(revision 23428)
+++ metallurgy/recordings-ui.xml	(working copy)
@@ -40,7 +40,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>
@@ -58,7 +58,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>132,247</position>
@@ -79,8 +79,8 @@
                         <case>capitaliseall</case>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active" />
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active" />
             </statetype>
         </buttonlist>
         
@@ -102,8 +102,8 @@
                         <align>hcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected" from="active" />
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>430,0</position>
@@ -380,12 +380,12 @@
                         <align>hcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="selectindicator">
                         <filename>shared/selectbar.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="selectindicator">
                         <filename>shared/inactiveselectbar.png</filename>
                     </imagetype>
@@ -619,7 +619,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>
@@ -627,7 +627,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: metallurgy/menu-ui.xml
===================================================================
--- metallurgy/menu-ui.xml	(revision 23428)
+++ metallurgy/menu-ui.xml	(working copy)
@@ -416,7 +416,7 @@
                         <multiline>yes</multiline>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>0,0,450,125</area>
                     <statetype name="icon">
 
Index: Arclight/config-ui.xml
===================================================================
--- Arclight/config-ui.xml	(revision 23428)
+++ Arclight/config-ui.xml	(working copy)
@@ -76,7 +76,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -117,7 +117,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#000000" alpha="100" />
                     </shape>
@@ -271,7 +271,7 @@
                         <alpha>100</alpha>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -288,7 +288,7 @@
                         <filename />
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#000000" alpha="100" />
                     </shape>
@@ -476,7 +476,7 @@
                         <alpha>100</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -497,7 +497,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
Index: Arclight/video-ui.xml
===================================================================
--- Arclight/video-ui.xml	(revision 23428)
+++ Arclight/video-ui.xml	(working copy)
@@ -286,7 +286,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -349,7 +349,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
@@ -520,7 +520,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonimage">
                         <area>-30,-10,246,285</area>
                         <preserveaspect>true</preserveaspect>
@@ -723,7 +723,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -762,7 +762,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
Index: Arclight/music-ui.xml
===================================================================
--- Arclight/music-ui.xml	(revision 23428)
+++ Arclight/music-ui.xml	(working copy)
@@ -1366,7 +1366,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -1406,7 +1406,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
             </statetype>
Index: Arclight/status-ui.xml
===================================================================
--- Arclight/status-ui.xml	(revision 23428)
+++ Arclight/status-ui.xml	(working copy)
@@ -110,14 +110,14 @@
                         <alpha>100</alpha>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,9,1100,40</area>
                         <align>vcenter,left</align>
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,9,1100,40</area>
                         <align>vcenter,left</align>
Index: Arclight/mytharchive-ui.xml
===================================================================
--- Arclight/mytharchive-ui.xml	(revision 23428)
+++ Arclight/mytharchive-ui.xml	(working copy)
@@ -266,7 +266,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -294,7 +294,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#000000" alpha="100" />
                     </shape>
@@ -462,7 +462,7 @@
                         <alpha>100</alpha>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -479,7 +479,7 @@
                         <filename />
                     </imagetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
@@ -631,7 +631,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -659,7 +659,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#000000" alpha="100" />
                     </shape>
@@ -777,14 +777,14 @@
                         <alpha>100</alpha>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,9,1100,40</area>
                         <align>vcenter,left</align>
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,9,1100,40</area>
                         <align>vcenter,left</align>
Index: Arclight/schedule-ui.xml
===================================================================
--- Arclight/schedule-ui.xml	(revision 23428)
+++ Arclight/schedule-ui.xml	(working copy)
@@ -121,8 +121,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">
@@ -180,8 +180,8 @@
                         <font>basesmall</font>
                     </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">
@@ -331,8 +331,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">
@@ -390,8 +390,8 @@
                         <font>basesmall</font>
                     </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">
@@ -677,7 +677,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -698,7 +698,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
@@ -789,7 +789,7 @@
                         <align>vcenter,right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -810,7 +810,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
@@ -945,7 +945,7 @@
                         <align>vcenter,right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -966,7 +966,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
@@ -1481,7 +1481,7 @@
                         <align>vcenter,right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -1502,7 +1502,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
@@ -2228,7 +2228,7 @@
                         <align>vcenter,right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -2249,7 +2249,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
@@ -2538,7 +2538,7 @@
                         <align>vcenter,right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -2563,7 +2563,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
Index: Arclight/gallery-ui.xml
===================================================================
--- Arclight/gallery-ui.xml	(revision 23428)
+++ Arclight/gallery-ui.xml	(working copy)
@@ -116,7 +116,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -147,7 +147,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
Index: Arclight/base.xml
===================================================================
--- Arclight/base.xml	(revision 23428)
+++ Arclight/base.xml	(working copy)
@@ -166,7 +166,7 @@
                     <alpha>100</alpha>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <textarea name="buttontext">
                     <alpha>255</alpha>
                 </textarea>
@@ -174,7 +174,7 @@
                     <alpha>255</alpha>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <alpha>100</alpha>
                 </imagetype>
@@ -364,7 +364,7 @@
                     <alpha>210</alpha>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <area>0,0,100%,199</area>
                 <shape name="item">
                     <area>0,0,100%,197</area>
@@ -464,7 +464,7 @@
                     <alpha>200</alpha>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <area>0,0,100%,199</area>
                 <shape name="item">
                     <area>0,0,100%,197</area>
@@ -721,7 +721,7 @@
                     </state>
                 </statetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="item">
                     <fill color="#0767AB" alpha="240" />
                 </shape>
@@ -818,7 +818,7 @@
                     </state>
                 </statetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <shape name="item">
                     <fill color="#222222" alpha="190" />
                 </shape>
@@ -890,7 +890,7 @@
                 <imagetype name="buttonarrow">
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="bulb">
                     <area>0,10,30,30</area>
                     <filename>images/checkbox_unselected_checked.png</filename>
@@ -899,7 +899,7 @@
                     <alpha>255</alpha>
                 </textarea>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="bulb">
                     <area>0,10,30,30</area>
                     <filename>images/checkbox_unselected_checked.png</filename>
@@ -958,7 +958,7 @@
                 <imagetype name="buttonarrow">
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="item">
                     <fill color="#0767AB" alpha="240" />
                 </shape>
@@ -966,7 +966,7 @@
                     <alpha>255</alpha>
                 </textarea>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <shape name="item">
                     <fill color="#222222" alpha="180" />
                 </shape>
@@ -1051,7 +1051,7 @@
                 <imagetype name="buttonarrow">
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="item">
                     <fill color="#0767AB" alpha="240" />
                 </shape>
@@ -1059,7 +1059,7 @@
                     <alpha>255</alpha>
                 </textarea>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <shape name="item">
                     <fill color="#222222" alpha="180" />
                 </shape>
@@ -1395,12 +1395,12 @@
                     <align>allcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/spinbox_selected.png</filename>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <textarea name="buttontext">
                     <alpha>60</alpha>
                 </textarea>
@@ -1456,12 +1456,12 @@
                     <align>allcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/wideselector_selected.png</filename>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <textarea name="buttontext">
                     <alpha>60</alpha>
                 </textarea>
@@ -1810,7 +1810,7 @@
                         <alpha>100</alpha>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <alpha>255</alpha>
                     </textarea>
@@ -1818,7 +1818,7 @@
                         <alpha>255</alpha>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="buttonbackground">
                         <alpha>100</alpha>
                     </imagetype>
@@ -2150,7 +2150,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -2191,7 +2191,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
Index: Arclight/recordings-ui.xml
===================================================================
--- Arclight/recordings-ui.xml	(revision 23428)
+++ Arclight/recordings-ui.xml	(working copy)
@@ -170,7 +170,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <imagetype name="preview">
                         <area>10,5,100,80</area>
                         <preserveaspect>true</preserveaspect>
@@ -255,7 +255,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <imagetype name="preview">
                         <area>10,5,100,80</area>
                         <preserveaspect>true</preserveaspect>
@@ -761,7 +761,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -802,7 +802,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
Index: Arclight/controls-ui.xml
===================================================================
--- Arclight/controls-ui.xml	(revision 23428)
+++ Arclight/controls-ui.xml	(working copy)
@@ -126,7 +126,7 @@
                         <alpha>100</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -135,7 +135,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
Index: Arclight/netvision-ui.xml
===================================================================
--- Arclight/netvision-ui.xml	(revision 23428)
+++ Arclight/netvision-ui.xml	(working copy)
@@ -139,7 +139,7 @@
                     <imagetype name="buttonarrow">
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -150,7 +150,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
@@ -249,7 +249,7 @@
                         <alpha>100</alpha>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <area>0,0,100%,177</area>
                         <fill color="#0767AB" alpha="240" />
@@ -285,7 +285,7 @@
                         <filename />
                     </imagetype>
                 </state>
-                <state name="inactive" from="selected">
+                <state name="selectedinactive" from="selectedactive">
                     <shape name="item">
                         <fill color="#000000" alpha="130" />
                     </shape>
@@ -614,7 +614,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -642,7 +642,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
@@ -789,7 +789,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -817,7 +817,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#000000" alpha="100" />
                     </shape>
@@ -1003,7 +1003,7 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonimage">
                         <area>-30,-10,246,285</area>
                         <preserveaspect>true</preserveaspect>
@@ -1198,7 +1198,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -1237,7 +1237,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>1075,-30</position>
Index: Arclight/weather-ui.xml
===================================================================
--- Arclight/weather-ui.xml	(revision 23428)
+++ Arclight/weather-ui.xml	(working copy)
@@ -837,7 +837,7 @@
                         <alpha>100</alpha>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <alpha>255</alpha>
                     </textarea>
@@ -845,7 +845,7 @@
                         <alpha>255</alpha>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="buttonbackground">
                         <alpha>100</alpha>
                     </imagetype>
Index: Arclight/settings-ui.xml
===================================================================
--- Arclight/settings-ui.xml	(revision 23428)
+++ Arclight/settings-ui.xml	(working copy)
@@ -55,7 +55,7 @@
                         <alpha>100</alpha>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <fill color="#0767AB" alpha="240" />
                     </shape>
@@ -64,7 +64,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
Index: Arclight/twitter-ui.xml
===================================================================
--- Arclight/twitter-ui.xml	(revision 23428)
+++ Arclight/twitter-ui.xml	(working copy)
@@ -168,7 +168,7 @@
                         <alpha>100</alpha>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="item">
                         <area>0,0,100%,177</area>
                         <fill color="#0767AB" alpha="240" />
@@ -191,7 +191,7 @@
                         <filename />
                     </imagetype>
                 </state>
-                <state name="inactive" from="selected">
+                <state name="selectedinactive" from="selectedactive">
                     <shape name="item">
                         <fill color="#000000" alpha="130" />
                     </shape>
Index: Arclight/menu-ui.xml
===================================================================
--- Arclight/menu-ui.xml	(revision 23428)
+++ Arclight/menu-ui.xml	(working copy)
@@ -64,7 +64,7 @@
                         <filename>images/arclight_wide_divider.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <area>0,0,759,245</area>
                     <shape name="item">
                         <area>0,0,765,245</area>
@@ -223,7 +223,7 @@
                         <filename>images/arclight_wide_divider.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <shape name="item">
                         <fill color="#222222" alpha="180" />
                     </shape>
Index: Mythbuntu/config-ui.xml
===================================================================
--- Mythbuntu/config-ui.xml	(revision 23428)
+++ Mythbuntu/config-ui.xml	(working copy)
@@ -45,8 +45,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: Mythbuntu/video-ui.xml
===================================================================
--- Mythbuntu/video-ui.xml	(revision 23428)
+++ Mythbuntu/video-ui.xml	(working copy)
@@ -372,7 +372,7 @@
                         <area>1050,1,100,30</area>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
 	            <shape name="buttonbackground">
 		        <type>roundbox</type>
 	    	        <area>0,0,100%,30</area>
@@ -380,7 +380,7 @@
 		        <cornerradius>15</cornerradius>
 	        </shape>
 		</state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
 	            <shape name="buttonbackground">
 		        <type>roundbox</type>
 	    	        <area>0,0,100%,30</area>
@@ -486,7 +486,7 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonimage">
                         <area>-10,-10,110,170</area>
                         <alpha>255</alpha>
@@ -712,8 +712,8 @@
                         <align>right</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="buttonbackground">
 	                <area>-5,-5,250,213</area>
 		        <fill color="#666666" alpha="150" />
Index: Mythbuntu/mythburn-ui.xml
===================================================================
--- Mythbuntu/mythburn-ui.xml	(revision 23428)
+++ Mythbuntu/mythburn-ui.xml	(working copy)
@@ -262,7 +262,7 @@
                     </statetype>
 
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <gradient start="#52CA38" end="#349838" alpha="255" />
                     </imagetype>
@@ -271,7 +271,7 @@
                         <font>basesmallyellow</font>
                     </textarea>
                 </state>
-               <state name="inactive" from="active">
+               <state name="selectedinactive" from="active">
                     <imagetype name="buttonbackground">
                         <gradient start="#52CA38" end="#349838" alpha="100" />
                     </imagetype>
@@ -563,7 +563,7 @@
                         <filename>mv_browse_nocover.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>
@@ -571,7 +571,7 @@
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="buttonbackground">
                         <gradient start="#52CA38" end="#349838" alpha="100" />
                     </imagetype>
Index: Mythbuntu/music-ui.xml
===================================================================
--- Mythbuntu/music-ui.xml	(revision 23428)
+++ Mythbuntu/music-ui.xml	(working copy)
@@ -841,12 +841,12 @@
                         <filename>mm_nothumb.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>mm_browser_back_sel.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
         </buttonlist>
 
Index: Mythbuntu/status-ui.xml
===================================================================
--- Mythbuntu/status-ui.xml	(revision 23428)
+++ Mythbuntu/status-ui.xml	(working copy)
@@ -53,7 +53,7 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
 	            <shape name="list_background">
 	                <area>0,0,190,40</area>
 	                <type>roundbox</type>
@@ -62,7 +62,7 @@
 	                <cornerradius>20</cornerradius>
 	            </shape>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
 	            <shape name="list_background">
 	                <area>0,0,190,40</area>
 	                <type>roundbox</type>
Index: Mythbuntu/browser-ui.xml
===================================================================
--- Mythbuntu/browser-ui.xml	(revision 23428)
+++ Mythbuntu/browser-ui.xml	(working copy)
@@ -81,12 +81,12 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
             	    <shape name="buttonbackground">
 	                <fill color="#ffffff" alpha="50" />
             	    </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="downscrollarrow">
                 <position>1130,10</position>
@@ -180,12 +180,12 @@
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="selectbar">
                         <area>30,0,1130,30</area>
                     </shape>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <textarea name="name">
                         <font>basesmallpurple</font>
                     </textarea>
Index: Mythbuntu/mytharchive-ui.xml
===================================================================
--- Mythbuntu/mytharchive-ui.xml	(revision 23428)
+++ Mythbuntu/mytharchive-ui.xml	(working copy)
@@ -178,12 +178,12 @@
                         <position>1115,5</position>
                     </statetype>
                 </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>
@@ -294,12 +294,12 @@
                         <position>1170,5</position>
                     </statetype>
                 </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>
@@ -365,12 +365,12 @@
                         <position>1100,5</position>
                     </statetype>
                 </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>
@@ -472,12 +472,12 @@
                         <position>1100,5</position>
                     </statetype>
                 </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>
Index: Mythbuntu/mythnative-ui.xml
===================================================================
--- Mythbuntu/mythnative-ui.xml	(revision 23428)
+++ Mythbuntu/mythnative-ui.xml	(working copy)
@@ -205,12 +205,12 @@
                         <area>35,0,1190,30</area>
                     </textarea>
                 </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>
Index: Mythbuntu/schedule-ui.xml
===================================================================
--- Mythbuntu/schedule-ui.xml	(revision 23428)
+++ Mythbuntu/schedule-ui.xml	(working copy)
@@ -77,8 +77,8 @@
                         <align>center</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">
@@ -133,8 +133,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">
@@ -303,8 +303,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">
@@ -357,8 +357,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">
@@ -563,8 +563,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>
 
@@ -648,8 +648,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>
@@ -757,8 +757,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>
 
@@ -939,12 +939,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>
@@ -1022,12 +1022,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>
@@ -1168,8 +1168,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>
@@ -1296,7 +1296,7 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <textarea name="buttontext">
                         <font>basesmallyellow</font>
                     </textarea>
@@ -1304,7 +1304,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">
@@ -1344,12 +1344,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>
 
@@ -1365,8 +1365,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>
 
@@ -1468,8 +1468,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>
 
Index: Mythbuntu/recordings-ui.xml
===================================================================
--- Mythbuntu/recordings-ui.xml	(revision 23428)
+++ Mythbuntu/recordings-ui.xml	(working copy)
@@ -58,12 +58,12 @@
                         <cutdown>yes</cutdown>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="name" from="buttontext">
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="selected" from="inactive" />
+                <state name="selectedactive" from="selectedinactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>0,0</position>
@@ -121,7 +121,7 @@
                         <state name="no" />
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="buttonbackground">
                         <area>30,0,706,30</area>
                         <type>roundbox</type>
@@ -138,7 +138,7 @@
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>738,0</position>
@@ -587,8 +587,8 @@
                         <align>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="selectbar">
                         <area>0,0,650,40</area>
                         <type>roundbox</type>
Index: Mythbuntu/gallery-ui.xml
===================================================================
--- Mythbuntu/gallery-ui.xml	(revision 23428)
+++ Mythbuntu/gallery-ui.xml	(working copy)
@@ -44,7 +44,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
             	    <shape name="btnbckgrnd">
             		<fill color="#FFFFFF" alpha="50" />
             	    </shape>
Index: Mythbuntu/base.xml
===================================================================
--- Mythbuntu/base.xml	(revision 23428)
+++ Mythbuntu/base.xml	(working copy)
@@ -160,7 +160,7 @@
                     <filename>shared/lb-arrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
 	        <shape name="buttonbackground">
 	            <type>roundbox</type>
 	            <area>0,0,99%,30</area>
@@ -171,7 +171,7 @@
                     <font>basesmall</font>
                 </textarea>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
 	        <shape name="buttonbackground">
 	            <type>roundbox</type>
         	    <area>0,0,99%,30</area>
@@ -253,7 +253,7 @@
                     <align>vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="selectbar">
                     <area>30,0,1162,25</area>
                     <type>roundbox</type>
@@ -264,7 +264,7 @@
                     <font>basesmall</font>
                 </textarea>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="upscrollarrow">
             <position>1190,5</position>
@@ -474,12 +474,12 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape">
             	    <cornerradius>15</cornerradius>
             	</shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>205,2</position>
@@ -527,12 +527,12 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <shape name="background" from="baseselectedwidgetshape">
             	    <cornerradius>15</cornerradius>
             	</shape>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
         <statetype name="downscrollarrow">
             <position>510,2</position>
@@ -641,13 +641,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>
@@ -689,13 +689,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>
@@ -813,12 +813,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>
@@ -889,8 +889,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: Mythbuntu/menu-ui.xml
===================================================================
--- Mythbuntu/menu-ui.xml	(revision 23428)
+++ Mythbuntu/menu-ui.xml	(working copy)
@@ -46,7 +46,7 @@
                         <cutdown>yes</cutdown>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <shape name="slctbr">
                 	<area>-10,-10,700,80</area>
 		        <type>roundbox</type> 
Index: Graphite/config-ui.xml
===================================================================
--- Graphite/config-ui.xml	(revision 23428)
+++ Graphite/config-ui.xml	(working copy)
@@ -32,7 +32,7 @@
                         <filename>images/43corrector.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>-30,-30,220,150</area>
                     <imagetype name="buttonbackground">
                         <area>0,0,220,150</area>
@@ -45,7 +45,7 @@
                         <mask>images/pbb_recording_mask.png</mask>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -179,13 +179,13 @@
                         <filename>images/rightarrow.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>images/buttonbackground_selected.png</filename>
                         <alphapulse min="200" max="255" change="1"/>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>images/buttonbackground_selected.png</filename>
                         <alpha>127</alpha>
Index: Graphite/video-ui.xml
===================================================================
--- Graphite/video-ui.xml	(revision 23428)
+++ Graphite/video-ui.xml	(working copy)
@@ -220,7 +220,7 @@
                         <area>670,4,50,25</area>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <statetype name="nodetype">
                         <position>0,9</position>
                         <state name="subfolder">
@@ -340,7 +340,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonimage">
                         <area>-60,-20,200,160</area>
                         <preserveaspect>true</preserveaspect>
@@ -519,7 +519,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>-40,-40,160,220</area>
                     <imagetype name="buttonbackground">
                         <area>2,-8,160,217</area>
Index: Graphite/music-ui.xml
===================================================================
--- Graphite/music-ui.xml	(revision 23428)
+++ Graphite/music-ui.xml	(working copy)
@@ -849,12 +849,12 @@
                         <filename>mm_nothumb.png</filename>
                     </imagetype>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <filename>mm_browser_back_sel.png</filename>
                     </imagetype>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
         </buttonlist>
         
@@ -1271,14 +1271,14 @@
                         <align>center</align>
                     </textarea>
                 </state>
-                <state name="selected" from="active">
+                <state name="selectedactive" from="active">
                     <imagetype name="buttonbackground">
                         <area>0,0,60,40</area>
                         <filename>images/buttonbackground_selected.png</filename>
                         <alphapulse min="200" max="255" change="1"/>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
         
Index: Graphite/browser-ui.xml
===================================================================
--- Graphite/browser-ui.xml	(revision 23428)
+++ Graphite/browser-ui.xml	(working copy)
@@ -84,7 +84,7 @@
                         <position>5,9</position>
                     </statetype>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <statetype name="buttoncheck">
                         <position>5,9</position>
                     </statetype>
@@ -99,7 +99,7 @@
                         <align>left,vcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <statetype name="buttoncheck">
                         <position>5,9</position>
                     </statetype>
Index: Graphite/schedule-ui.xml
===================================================================
--- Graphite/schedule-ui.xml	(revision 23428)
+++ Graphite/schedule-ui.xml	(working copy)
@@ -65,8 +65,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">
@@ -113,8 +113,8 @@
                         <align>center</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">
@@ -235,8 +235,8 @@
                         <align>left</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">
@@ -293,8 +293,8 @@
                         <align>hcenter</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">
@@ -593,8 +593,8 @@
                         <area>725,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>
         
@@ -606,12 +606,12 @@
                         <align>center</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <align>center</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <align>center</align>
                     </textarea>
@@ -738,7 +738,7 @@
                         <align>right</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <imagetype name="icon">
                         <area>135,-2,25,25</area>
                         <preserveaspect>true</preserveaspect>
@@ -770,7 +770,7 @@
                         <cornerradius>12</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
         
@@ -932,7 +932,7 @@
                         <position>1130,1</position>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="rectype" from="buttontext">
                         <area>30,1,20,24</area>
                         <align>hcenter</align>
@@ -958,7 +958,7 @@
                         <cornerradius>12</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
         
@@ -1188,12 +1188,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>
@@ -1279,12 +1279,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>
@@ -1437,7 +1437,7 @@
                         <area>1125,1,30,24</area>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="shortstarttimedate" from="buttontext">
                         <area>32,1,190,24</area>
                     </textarea>
@@ -1461,7 +1461,7 @@
                         <cornerradius>12</cornerradius>
                     </shape>
                 </state>
-                <state name="inactive" from="active" />
+                <state name="selectedinactive" from="active" />
             </statetype>
         </buttonlist>
         
@@ -1584,13 +1584,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <align>allcenter</align>
                     </textarea>
                 </state>
                  
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <align>allcenter</align>
                     </textarea>
Index: Graphite/gallery-ui.xml
===================================================================
--- Graphite/gallery-ui.xml	(revision 23428)
+++ Graphite/gallery-ui.xml	(working copy)
@@ -43,7 +43,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>-30,-30,220,150</area>
                     <imagetype name="buttonbackground">
                         <area>0,0,220,150</area>
@@ -56,7 +56,7 @@
                         <mask>images/pbb_recording_mask.png</mask>
                     </imagetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
Index: Graphite/base.xml
===================================================================
--- Graphite/base.xml	(revision 23428)
+++ Graphite/base.xml	(working copy)
@@ -147,13 +147,13 @@
                     <filename>images/rightarrow.png</filename>
                 </imagetype>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/buttonbackground_selected.png</filename>
                     <alphapulse min="200" max="255" change="1"/>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/buttonbackground_selected.png</filename>
                     <alpha>127</alpha>
@@ -215,13 +215,13 @@
                     <align>vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="selectbar">
                     <position>25,0</position>
                     <filename>images/schedule_selectbar.png</filename>
                 </imagetype>
             </state>
-            <state name="inactive" from="active" />
+            <state name="selectedinactive" from="active" />
         </statetype>
     </buttonlist>
     
@@ -475,12 +475,12 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/selector_background_selected.png</filename>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/selector_background_inactive.png</filename>
                 </imagetype>
@@ -532,12 +532,12 @@
                     <align>left,vcenter</align>
                 </textarea>
             </state>
-            <state name="selected" from="active">
+            <state name="selectedactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/selector_wide_background_selected.png</filename>
                 </imagetype>
             </state>
-            <state name="inactive" from="active">
+            <state name="selectedinactive" from="active">
                 <imagetype name="buttonbackground">
                     <filename>images/selector_wide_background_inactive.png</filename>
                 </imagetype>
@@ -713,13 +713,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,7,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,7,100%,30</area>
                         <align>allcenter</align>
@@ -762,13 +762,13 @@
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>0,5,100%,30</area>
                         <align>allcenter</align>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>0,5,100%,30</area>
                         <align>allcenter</align>
@@ -945,13 +945,13 @@
                         <area>5,6,315,30</area>
                     </textarea>
                 </state>
-                <state name="inactive">
+                <state name="selectedinactive">
                     <textarea name="buttontext">
                         <area>5,6,315,30</area>
                         <cutdown>yes</cutdown>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <textarea name="buttontext">
                         <area>5,6,315,30</area>
                     </textarea>
@@ -1076,8 +1076,8 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active" />
-                <state name="selected">
+                <state name="selectedinactive" from="active" />
+                <state name="selectedactive">
                     <area>-40,-40,180,240</area>
                     <statetype name="nodetype">
                         <state name="folder">
Index: Graphite/recordings-ui.xml
===================================================================
--- Graphite/recordings-ui.xml	(revision 23428)
+++ Graphite/recordings-ui.xml	(working copy)
@@ -130,7 +130,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>
@@ -148,7 +148,7 @@
                         <alpha>255</alpha>
                     </textarea>
                 </state>
-                <state name="inactive" from="selected" />
+                <state name="selectedinactive" from="selectedactive" />
             </statetype>
             <statetype name="upscrollarrow">
                 <position>132,247</position>
@@ -175,7 +175,7 @@
                         <font>basesmallergrey</font>
                     </textarea>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>8,0,400,83</area>
                     <imagetype name="pbbgroupselect">
                         <area>-80,-2,400,30</area>
@@ -189,7 +189,7 @@
                         <font>basesmall</font>
                     </textarea>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <imagetype name="pbbgroupselect">
                         <area>-80,-2,400,30</area>
                         <filename>images/pbb_blueselector.png</filename>
@@ -263,7 +263,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="selected">
+                <state name="selectedactive">
                     <area>-30,-30,220,150</area>
                     <imagetype name="buttonbackground">
                         <area>0,0,220,150</area>
@@ -293,7 +293,7 @@
                         </state>
                     </statetype>
                 </state>
-                <state name="inactive" from="active">
+                <state name="selectedinactive" from="active">
                     <textarea name="shortdate">
                         <font>basesmallergrey</font>
                     </textarea>
@@ -1045,7 +1045,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>
@@ -1053,7 +1053,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: Graphite/menu-ui.xml
===================================================================
--- Graphite/menu-ui.xml	(revision 23428)
+++ Graphite/menu-ui.xml	(working copy)
@@ -36,7 +36,7 @@
                         <case>upper</case>
                     </textarea>
                 </state>
-                <state name="selected"> 
+                <state name="selectedactive"> 
 <!--                    <area>0,9,240,59</area>-->
                     <area>0,9,413,59</area>
                     <imagetype name="background" />