diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml
index 83d36b3..6c70618 100644
--- a/1080i/Defaults.xml
+++ b/1080i/Defaults.xml
@@ -10,8 +10,8 @@
         <textoffsetx>0</textoffsetx>
         <font>regular</font>
         <textcolor>textActive</textcolor>
-        <focusedcolor>selected</focusedcolor>
-        <selectedcolor>selected</selectedcolor>
+        <focusedcolor>textActive</focusedcolor>
+        <selectedcolor>textActive</selectedcolor>
         <disabledcolor>textDisabled</disabledcolor>
         <shadowcolor>-</shadowcolor>
     </default>
@@ -30,7 +30,7 @@
         <font>regular</font>
         <textcolor>textActive</textcolor>
         <textoffsetx>0</textoffsetx>
-        <focusedcolor>selected</focusedcolor>
+        <focusedcolor>textActive</focusedcolor>
         <selectedcolor>textActive</selectedcolor>
         <disabledcolor>textDisabled</disabledcolor>
         <scrollout>false</scrollout>
@@ -59,7 +59,7 @@
         <texturenofocus>-</texturenofocus>
         <textoffsetx>24</textoffsetx>
         <disabledcolor>textDisabled</disabledcolor>
-        <invalidcolor>disabled</invalidcolor>
+        <invalidcolor>textDisabled</invalidcolor>
         <pulseonselect>false</pulseonselect>
     </default>
     <default type="togglebutton">
@@ -76,8 +76,8 @@
         <alttexturefocus>-</alttexturefocus>
         <alttexturenofocus>-</alttexturenofocus>
         <font>buttonTitle</font>
-        <textcolor>unselected</textcolor>
-        <focusedcolor>selected</focusedcolor>
+        <textcolor>menuUnselected</textcolor>
+        <focusedcolor>textActive</focusedcolor>
         <disabledcolor>textDisabled</disabledcolor>
         <pulseonselect>false</pulseonselect>
         <colordiffuse>ffFFFFFF</colordiffuse>
diff --git a/1080i/DialogAudioDSPManager.xml b/1080i/DialogAudioDSPManager.xml
index a4938aa..23d0c11 100644
--- a/1080i/DialogAudioDSPManager.xml
+++ b/1080i/DialogAudioDSPManager.xml
@@ -212,7 +212,7 @@
                             <aligny>center</aligny>
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
                         </control>
                     </itemlayout>
@@ -248,7 +248,7 @@
                             <aligny>center</aligny>
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
                         </control>
 
@@ -263,7 +263,7 @@
                             <aligny>center</aligny>
                             <textcolor>grey2</textcolor>
                             <scroll>false</scroll>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(Description)]</label>
                             <visible>!Control.HasFocus(20)</visible>
                         </control>
@@ -280,7 +280,7 @@
                             <textcolor>grey2</textcolor>
                             <scroll>true</scroll>
                             <scrollsuffix>&gt;   &lt;</scrollsuffix>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(Description)]</label>
                             <visible>Control.HasFocus(20)</visible>
                         </control>
@@ -373,7 +373,7 @@
                             <aligny>center</aligny>
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
                         </control>
                     </itemlayout>
@@ -415,7 +415,7 @@
                             <aligny>center</aligny>
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
                             <visible>true</visible>
                         </control>
@@ -430,7 +430,7 @@
                             <aligny>center</aligny>
                             <textcolor>grey2</textcolor>
                             <scroll>false</scroll>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(Description)]</label>
                             <visible>!Control.HasFocus(21)</visible>
                         </control>
@@ -446,7 +446,7 @@
                             <textcolor>grey2</textcolor>
                             <scroll>true</scroll>
                             <scrollsuffix>&gt;   &lt;</scrollsuffix>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$INFO[ListItem.Property(Description)]</label>
                             <visible>Control.HasFocus(21)</visible>
                         </control>
diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index 30e3876..6059696 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -87,7 +87,7 @@
                         <ondown>302</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -105,7 +105,7 @@
                         <ondown>302</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -122,7 +122,7 @@
                         <ondown>120</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -137,7 +137,7 @@
                         <ondown>121</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -152,7 +152,7 @@
                         <ondown>122</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -167,7 +167,7 @@
                         <ondown>123</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -182,7 +182,7 @@
                         <ondown>124</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -197,7 +197,7 @@
                         <ondown>125</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -212,7 +212,7 @@
                         <ondown>126</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -227,7 +227,7 @@
                         <ondown>127</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -242,7 +242,7 @@
                         <ondown>128</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -257,7 +257,7 @@
                         <ondown>129</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -272,7 +272,7 @@
                         <ondown>130</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -287,7 +287,7 @@
                         <ondown>131</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -316,7 +316,7 @@
                         <radioheight>24</radioheight>
                         <radioposy>12</radioposy>
                         <radioposx>252</radioposx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -333,7 +333,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -349,7 +349,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -365,7 +365,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -381,7 +381,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -397,7 +397,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -413,7 +413,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -429,7 +429,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -445,7 +445,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -461,7 +461,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -477,7 +477,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -493,7 +493,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -509,7 +509,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -539,7 +539,7 @@
                         <radioposy>12</radioposy>
                         <radioposx>252</radioposx>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -556,7 +556,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -572,7 +572,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -588,7 +588,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -604,7 +604,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -620,7 +620,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -636,7 +636,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -652,7 +652,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -668,7 +668,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -684,7 +684,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -700,7 +700,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -716,7 +716,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -732,7 +732,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -762,7 +762,7 @@
                         <textoffsetx>0</textoffsetx>
                         <radioposy>12</radioposy>
                         <radioposx>252</radioposx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -781,7 +781,7 @@
                         <onright>160</onright>
                         <onup>303</onup>
                         <ondown>309</ondown>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -798,7 +798,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -814,7 +814,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -830,7 +830,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -846,7 +846,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -862,7 +862,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -878,7 +878,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -894,7 +894,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -910,7 +910,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -926,7 +926,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -942,7 +942,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -958,7 +958,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -974,7 +974,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                     </control>
@@ -995,7 +995,7 @@
                         <ondown>312</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -1010,7 +1010,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <onleft>309</onleft>
@@ -1033,7 +1033,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <font>buttonTitle</font>
@@ -1048,7 +1048,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <onleft>32</onleft>
@@ -1066,7 +1066,7 @@
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
-                        <focusedcolor>selected</focusedcolor>
+                        <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
                         <onleft>305</onleft>
diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml
index 0c8fe8f..d4a3cbb 100644
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@@ -145,7 +145,7 @@
                             <aligny>center</aligny>
                             <font>mediumStrong</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <label>$LOCALIZE[31208]: $INFO[listitem.label]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml
index 7dcb56a..256a63f 100644
--- a/1080i/DialogNumeric.xml
+++ b/1080i/DialogNumeric.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">4</defaultcontrol>
-     
+    <defaultcontrol always="true">11</defaultcontrol>
     <controls>
         <control type="group">
         <posx>0</posx>
@@ -56,7 +55,7 @@
                     <ondown>14</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="12">
@@ -73,7 +72,7 @@
                     <ondown>15</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="13">
@@ -90,7 +89,7 @@
                     <ondown>16</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="23">
@@ -108,7 +107,7 @@
                     <ondown>21</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                     <font>buttonTitle</font>
                 </control>
@@ -127,7 +126,7 @@
                     <ondown>17</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="15">
@@ -144,7 +143,7 @@
                     <ondown>18</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="16">
@@ -161,7 +160,7 @@
                     <ondown>19</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="21">
@@ -179,7 +178,7 @@
                     <ondown>23</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                     <font>buttonTitle</font>
                 </control>
@@ -198,7 +197,7 @@
                     <ondown>20</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="18">
@@ -215,7 +214,7 @@
                     <ondown>10</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="19">
@@ -232,7 +231,7 @@
                     <ondown>22</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <!--row 4-->
@@ -250,7 +249,7 @@
                     <ondown>11</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="10">
@@ -267,7 +266,7 @@
                     <ondown>12</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="button" id="22">
@@ -284,7 +283,7 @@
                     <ondown>13</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                     <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                    <focusedcolor>selected</focusedcolor>
+                    <focusedcolor>textActive</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
             </control>
diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml
index 53bb8f1..f2d9bb3 100644
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@@ -18,7 +18,6 @@
                 <posx>col-7-begin</posx>
                 <posy>row-5-begin</posy>
                 <include>modalDialogInOut</include>
-
                 <!--titles-->
                 <control type="label">
                     <description>Episode title</description>
@@ -29,12 +28,11 @@
                     <align>left</align>
                     <aligny>center</aligny>
                     <font>mediumStrong</font>
-                    <textcolor>textActive</textcolor>
+                    <textcolor>highlight</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
                     <wrapmultiline>true</wrapmultiline>
                 </control>
-
                 <control type="label">
                     <posx>0</posx>
                     <posy>4-row</posy>
@@ -46,7 +44,6 @@
                     <shadowcolor>-</shadowcolor>
                     <label>[COLOR highlight]$LOCALIZE[31214][/COLOR] $INFO[ListItem.channelname]</label>
                 </control>
-
                 <control type="label">
                     <posx>0</posx>
                     <posy>5-row</posy>
@@ -58,7 +55,6 @@
                     <shadowcolor>-</shadowcolor>
                     <label>[COLOR highlight]$LOCALIZE[31192][/COLOR] $INFO[ListItem.startdate]</label>
                 </control>
-
                 <control type="label">
                     <posx>0</posx>
                     <posy>6-row</posy>
@@ -70,7 +66,6 @@
                     <shadowcolor>-</shadowcolor>
                     <label>[COLOR highlight]$LOCALIZE[31193][/COLOR] $INFO[ListItem.duration]</label>
                 </control>
-
                 <!--synopsis-->
                 <control type="textbox">
                     <posx>0</posx>
@@ -84,7 +79,6 @@
                     <label>$INFO[ListItem.plot]</label>
                     <autoscroll delay="10000" time="1000" repeat="10000"/>
                 </control>
-
                 <!--dialog controls-->
                 <control type="list" id="8000">
                     <posx>0</posx>
@@ -92,11 +86,11 @@
                     <width>12-col</width>
                     <height>2-row</height>
                     <orientation>horizontal</orientation>
-                    <itemlayout width="6-col" height="2-row">
+                    <itemlayout width="4-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
+                            <width>4-col</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/black.png</texture>
@@ -116,7 +110,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
+                            <width>3-col</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
@@ -125,7 +119,7 @@
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="6-col" height="2-row">
+                    <focusedlayout width="4-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
@@ -139,7 +133,7 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>5-col</width>
+                            <width>3-col</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
@@ -159,7 +153,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
+                            <width>3-col</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
@@ -173,15 +167,22 @@
                             <label>31075</label>
                             <label2></label2>
                             <thumb>-</thumb>
-                            <onclick>sendclick(2003,10)</onclick>
+                            <onclick>sendclick(2003,8)</onclick>
                         </item>
-
                         <item id="2">
                             <label>264</label>
                             <label2></label2>
                             <thumb>-</thumb>
                             <onclick>SendClick(2003,6)</onclick>
                         </item>
+                        <item id="3">
+                            <label>31073</label>
+                            <label2></label2>
+                            <thumb>-</thumb>
+                            <onclick>dialog.close(all,true)</onclick>
+                            <onclick>ActivateWindow(TVGuide)</onclick>
+                            <onclick>Control.SetFocus(10)</onclick>
+                        </item>
                     </content>
                 </control>
             </control>
@@ -193,24 +194,17 @@
                 <description>Find similar</description>
                 <label>19003</label>
             </control>
-
             <control type="button" id="5">
                 <description>Switch to Channel</description>
                 <label>19165</label>
             </control>
-
             <control type="button" id="6">
                 <description>Record</description>
             </control>
-
             <control type="button" id="8">
                 <description>Play recording</description>
                 <label>19687</label>
             </control>
-
-            <control type="button" id="10">
-                <description>Play</description>
-            </control>
         </control>
         <!--debugging-->
         <include>DebugGrid</include>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 2dad564..ff8c14c 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -89,7 +89,7 @@
                             <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <info>ListItem.Label2</info>
                         </control>
@@ -102,7 +102,7 @@
                             <aligny>center</aligny>
                             <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.Label] - $INFO[ListItem.ActualIcon]*</label>
                         </control>
@@ -186,7 +186,7 @@
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <info>ListItem.Label</info>
                             <visible>!ListItem.property(man)</visible>
@@ -199,7 +199,7 @@
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <info>ListItem.Label</info>
                             <visible>ListItem.property(man)</visible>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index e6911b4..4723b45 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -183,7 +183,7 @@
                 <height>4-row</height>
                 <align>right</align>
                 <font>veryLarge</font>
-                <textcolor>selected</textcolor>
+                <textcolor>textActive</textcolor>
                 <label>$INFO[System.Time]</label>
             </control>
             <control type="label">
@@ -193,7 +193,7 @@
                 <height>4-row</height>
                 <align>right</align>
                 <font>Large</font>
-                <textcolor>selected</textcolor>
+                <textcolor>textActive</textcolor>
                 <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
             </control>
             <control type="label">
@@ -204,7 +204,7 @@
                 <height>3-row</height>
                 <align>right</align>
                 <font>regular</font>
-                <textcolor>selected</textcolor>
+                <textcolor>textActive</textcolor>
                 <label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
             </control>
         </control>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index a33d387..87ea584 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -64,7 +64,7 @@
                             <height>2-row</height>
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.ChannelName]</label>
                         </control>
@@ -95,7 +95,7 @@
                             <height>2-row</height>
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.ChannelName]</label>
                             <scroll>true</scroll>
@@ -116,7 +116,7 @@
                             <font>itemTitle</font>
                             <textoffsetx>12</textoffsetx>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
+                            <selectedcolor>textActive</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.Label]</label>
                         </control>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 27c4cf4..977fca0 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -171,7 +171,7 @@
                         <width>12-col-gutter</width>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <selectedcolor>selected</selectedcolor>
+                        <selectedcolor>textActive</selectedcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[Pvr.BackendDiskSpace]</label>
                     </control>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 2cc51c0..5db9306 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
-     
+
     <include>fadeInOut</include>
     <controls>
         <!--page container group-->
@@ -47,7 +47,7 @@
                                 <align>center</align>
                                 <aligny>center</aligny>
                                 <font>regularStrong</font>
-                                <textcolor>disabled</textcolor>
+                                <textcolor>textDisabled</textcolor>
                                 <label>$INFO[ListItem.label]</label>
                             </control>
                             <control type="label">
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 5c5563c..4925f29 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
-     
+
     <controls>
         <!--background-->
         <include>globalBackground</include>
@@ -66,7 +66,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>symbolLarge</font>
-                        <textcolor>unselected</textcolor>
+                        <textcolor>menuUnselected</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                     </control>
                     <control type="label">
@@ -76,7 +76,7 @@
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
-                        <textcolor>unselected</textcolor>
+                        <textcolor>menuUnselected</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
                     <control type="label">
@@ -86,7 +86,7 @@
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemSubTitle</font>
-                        <textcolor>unselected</textcolor>
+                        <textcolor>menuUnselected</textcolor>
                         <label>$INFO[listitem.property(label3)]</label>
                     </control>
                 </itemlayout>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index 84cee9d..574b7ab 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">3</defaultcontrol>
-     
+
     <controls>
         <!--background-->
         <include>globalBackground</include>
@@ -13,7 +13,7 @@
             <width>8-col</width>
             <font>regular</font>
             <label>-</label>
-            <textcolor>unselected</textcolor>
+            <textcolor>menuUnselected</textcolor>
         </control>
         <!--Settings category-->
         <control type="group" id="9001">
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index e72978d..7ff87d1 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -51,6 +51,20 @@
                     <texture>colors/white.png</texture>
                     <aspectratio>stretch</aspectratio>
                 </control>
+                <control type="progress">
+                      <description>Duration</description>
+                      <posx>0</posx>
+                      <posy>196</posy>
+                      <width>8-col</width>
+                      <height>2-row</height>
+                      <reveal>false</reveal>
+                      <texturebg>-</texturebg>
+                      <lefttexture>-</lefttexture>
+                      <midtexture border="36" colordiffuse="33FFFFFF">colors/black.png</midtexture>
+                      <righttexture>-</righttexture>
+                      <overlaytexture>-</overlaytexture>
+                      <info>Player.Progress</info>
+                </control>
                 <!--content-->
                     <control type="group">
                         <posx>24</posx>
@@ -73,7 +87,7 @@
                             <width>528</width>
                             <height>2-row</height>
                             <align>left</align>
-                            <font>dialogTitle</font>
+                            <font>regularStrong</font>
                             <textcolor>dd000000</textcolor>
                             <label>[B]$INFO[Videoplayer.time] / $INFO[Videoplayer.duration][/B]</label>
                             <shadowcolor>-</shadowcolor>
@@ -86,7 +100,7 @@
                             <width>528</width>
                             <align>left</align>
                             <textcolor>textActive</textcolor>
-                            <height>14-row</height>
+                            <height>444</height>
                             <label fallback="31205">$INFO[videoplayer.plot]</label>
                             <autoscroll delay="10000" time="1000" repeat="10000"/>
                             <shadowcolor>-</shadowcolor>
@@ -95,9 +109,9 @@
                 <!--dialog controls-->
                 <control type="panel" id="8001">
                     <posx>0</posx>
-                    <posy>24-row</posy>
+                    <posy>22-row</posy>
                     <width>8-col</width>
-                    <height>6-row</height>
+                    <height>8-row</height>
                     <itemgap>3</itemgap>
                     <orientation>vertical</orientation>
                     <itemlayout width="8-col" height="2-row">
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 02100b9..bfe3620 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -52,7 +52,7 @@
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>regularStrong</font>
-                    <textcolor>disabled</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.label]</label>
                 </control>
                 <control type="label">
@@ -64,7 +64,7 @@
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>regularStrong</font>
-                    <textcolor>disabled</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.Title]</label>
                 </control>
                 <control type="label">
@@ -76,7 +76,7 @@
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>buttonTitle</font>
-                    <textcolor>disabled</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.artist]</label>
                 </control>
                 <control type="image">
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index c9e84eb..b3860a3 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -107,7 +107,7 @@
                             <align>center</align>
                             <aligny>center</aligny>
                             <font>regularStrong</font>
-                            <textcolor>disabled</textcolor>
+                            <textcolor>textDisabled</textcolor>
                             <label>$INFO[ListItem.label]</label>
                         </control>
                         <control type="label">
@@ -119,7 +119,7 @@
                             <align>center</align>
                             <aligny>center</aligny>
                             <font>regularStrong</font>
-                            <textcolor>disabled</textcolor>
+                            <textcolor>textDisabled</textcolor>
                             <label>$INFO[ListItem.Title]</label>
                         </control>
                         <control type="label">
@@ -131,7 +131,7 @@
                             <align>center</align>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
-                            <textcolor>disabled</textcolor>
+                            <textcolor>textDisabled</textcolor>
                             <label>$INFO[ListItem.year,(,)]</label>
                         </control>
                         <control type="image">
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index e515e77..d613e88 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -31,7 +31,7 @@
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>3-col-gutter</width>
+                        <width>180</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -110,7 +110,7 @@
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>3-col-gutter</width>
+                        <width>180</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index f1f8ee4..7719b7c 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -54,7 +54,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
                     <control type="label">
@@ -66,7 +66,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.title]</label>
                     </control>
                     <control type="label">
@@ -78,7 +78,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>buttonTitle</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.year]</label>
                     </control>
                     <control type="image">
diff --git a/1080i/View_MusicAddons.xml b/1080i/View_MusicAddons.xml
index 82e6e41..0ee2f32 100644
--- a/1080i/View_MusicAddons.xml
+++ b/1080i/View_MusicAddons.xml
@@ -33,7 +33,7 @@
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>regularStrong</font>
-                    <textcolor>disabled</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.label]</label>
                 </control>
                 <control type="label">
@@ -45,7 +45,7 @@
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>buttonTitle</font>
-                    <textcolor>disabled</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.Property(Addon.Summary)]</label>
                 </control>
                 <control type="image">
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index 2a07b0e..73567e4 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -95,7 +95,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.title]</label>
                     </control>
                     <control type="label">
@@ -107,7 +107,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>buttonTitle</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.artist]</label>
                     </control>
                     <control type="image">
diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml
index 60df69d..517a5c4 100644
--- a/1080i/View_Photos.xml
+++ b/1080i/View_Photos.xml
@@ -33,7 +33,7 @@
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>itemTitle</font>
-                    <textcolor>disabled</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.Label]</label>
                 </control>
                 <control type="image">
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 1a86b7a..c1eac13 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -104,7 +104,7 @@
                             <align>center</align>
                             <aligny>center</aligny>
                             <font>regularStrong</font>
-                            <textcolor>disabled</textcolor>
+                            <textcolor>textDisabled</textcolor>
                             <label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011]]</label>
                         </control>
                         <control type="label">
@@ -116,7 +116,7 @@
                             <align>center</align>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
-                            <textcolor>disabled</textcolor>
+                            <textcolor>textDisabled</textcolor>
                             <label>$VAR[itemDetail]</label>
                         </control>
                         <control type="image">
diff --git a/1080i/View_VideoAddons.xml b/1080i/View_VideoAddons.xml
index 7b2d370..20e21bd 100644
--- a/1080i/View_VideoAddons.xml
+++ b/1080i/View_VideoAddons.xml
@@ -36,7 +36,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
                     <control type="label">
@@ -48,7 +48,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>buttonTitle</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.Property(Addon.Summary)]</label>
                     </control>
                     <control type="image">
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index 8704e62..7f29726 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -120,7 +120,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.title]</label>
                     </control>
                     <control type="label">
@@ -132,7 +132,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.tvshowtitle]</label>
                     </control>
                     <control type="label">
@@ -144,7 +144,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>buttonTitle</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.year]</label>
                     </control>
                     <control type="label">
@@ -156,7 +156,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>buttonTitle</font>
-                        <textcolor>disabled</textcolor>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
                     </control>
                     <control type="image">
diff --git a/changelog.txt b/changelog.txt
index a8748cb..391faec 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -34,20 +34,19 @@
 
 ***To do***
 
-Finish Info screen rework for the OSD (match movie info style instead - use a fillbar for duration)
-Check extra button to dialogAddonInfo.xml (auto update)
+Color Schemes - check menu disabled color
 
-Touch support for file seeking etc
+PVR Recording indicators
+
+Check extra button to dialogAddonInfo.xml (auto update)
 
 on startup: add check for parent folder items and warn user to turn off: system.getbool(showparentdiritems)
 
 Pictures section update
 
-DialogPVRinfo - button update
-
 Radio RDS test
 
-Touchscreen controls on Android tablets
+Touchscreen controls on Android tablets (file seeking etc)
 
 Expand menu system to add options for sub menu etc (see xbox NXE for inspiration)
 
diff --git a/colors/custom.xml b/colors/custom.xml
new file mode 100644
index 0000000..bbbbccb
--- /dev/null
+++ b/colors/custom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+    <color name="black">ff111111</color>
+    <color name="background">ff222222</color>
+    <color name="highlight">ff00ae5f</color>
+    <color name="overlay">44ffffff</color>
+    <color name="textActive">fff0f0f0</color>
+    <color name="textDisabled">ff757575</color>
+    <color name="menuDisabled">ffEF9A9A</color>
+    <color name="menuUnselected">ff919191</color>
+    <color name="textboxInactive">99FFFFFF</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+</colors>
\ No newline at end of file
diff --git a/colors/defaults.xml b/colors/defaults.xml
index 7d75da2..f8e4b79 100644
--- a/colors/defaults.xml
+++ b/colors/defaults.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
     <color name="black">ff111111</color>
-    <color name="selected">fff0f0f0</color>
-    <color name="unselected">ff919191</color>
-    <color name="disabled">ff515151</color>
-
-    <!--new scheme-->
     <color name="background">ff222222</color>
-    <!--<color name="highlight">ffee3343</color>-->
     <color name="highlight">ffee3343</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
     <color name="menuDisabled">ffEF9A9A</color>
+    <color name="menuUnselected">ff919191</color>
     <color name="textboxInactive">99FFFFFF</color>
-
     <color name="keyboardInactive">aa212121</color>
     <color name="keyboardAccent">ffBDBDBD</color>
-
 </colors>
\ No newline at end of file
diff --git a/language/English/strings.po b/language/English/strings.po
index fcb5151..251a159 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -245,12 +245,16 @@ msgctxt "#31072"
 msgid "Play now"
 msgstr ""
 
+msgctxt "#31073"
+msgid "Channel Guide"
+msgstr ""
+
 msgctxt "#31074"
 msgid "Cast and Crew"
 msgstr ""
 
 msgctxt "#31075"
-msgid "Play Title"
+msgid "Play"
 msgstr ""
 
 msgctxt "#31076"