From 52f1e8ebfc58dd14bf94fcd8c6b3c4fa276f56d6 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Thu, 2 Apr 2015 16:38:10 +0100
Subject: [PATCH] Various

---
 1080i/DialogAddonInfo.xml      |   4 +-
 1080i/DialogKeyboard.xml       | 244 +++++++-------
 1080i/DialogNumeric.xml        | 569 ++++++++++++++++-----------------
 1080i/DialogSelect.xml         | 191 ++++++-----
 1080i/View_Addons.xml          |  60 ++--
 1080i/View_Seasons.xml         |  78 ++---
 colors/defaults.xml            |   4 +
 media/colors/inactive.png      | Bin 930 -> 0 bytes
 media/colors/keyaccent.png     | Bin 931 -> 0 bytes
 media/colors/keyselected.png   | Bin 931 -> 0 bytes
 media/colors/keyunselected.png | Bin 931 -> 0 bytes
 11 files changed, 578 insertions(+), 572 deletions(-)
 delete mode 100644 media/colors/inactive.png
 delete mode 100644 media/colors/keyaccent.png
 delete mode 100644 media/colors/keyselected.png
 delete mode 100644 media/colors/keyunselected.png

diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 9f0551c..85767c1 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -99,10 +99,10 @@
                 <control type="textbox" id="400">
                     <posx>12</posx>
                     <posy>4-row</posy>
-                    <font>textboxExtraLeading</font>
+                    <font>textbox</font>
                     <width>12-col-gutter</width>
                     <height>340</height>
-                    <label>[B]$INFO[ListItem.Property(Addon.Description)][/B]</label>
+                    <label>$INFO[ListItem.Property(Addon.Description)]</label>
                     <autoscroll delay="5000" time="1000" repeat="10000"/>
                 </control>
             </control>
diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index 04510b5..feacc5d 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -6,7 +6,7 @@
         <control type="group">
             <visible>!Window.IsVisible(numericinput)</visible>
             <posx>0</posx>
-            <posy>row-12-begin</posy>
+            <posy>row-14-begin</posy>
             <!--animations-->
             <animation effect="slide" start="0,500" end="0,0" time="200" tween="sine" easing="out">Windowopen</animation>
             <animation effect="slide" start="0,0" end="0,500" time="200" tween="sine" easing="out">Windowclose</animation>
@@ -22,11 +22,11 @@
             <!--headers-->
             <control type="group">
                 <posx>col-1-begin</posx>
-                <posy>row-1-begin</posy>
+                <posy>0</posy>
                 <control type="label" id="311">
                     <description>header label</description>
                     <posx>0</posx>
-                    <posy>-64</posy>
+                    <posy>-18</posy>
                     <width>24-col</width>
                     <height>1-row</height>
                     <align>center</align>
@@ -36,7 +36,7 @@
                 <control type="edit" id="312">
                     <description>Edit Text</description>
                     <posx>0</posx>
-                    <posy>-12</posy>
+                    <posy>1-row</posy>
                     <width>24-col</width>
                     <align>center</align>
                     <onup>300</onup>
@@ -60,8 +60,8 @@
                         <onright>500</onright>
                         <onup>312</onup>
                         <ondown>302</ondown>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -78,8 +78,8 @@
                         <onright>100</onright>
                         <onup>312</onup>
                         <ondown>302</ondown>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -95,8 +95,8 @@
                         <onright>101</onright>
                         <onup>312</onup>
                         <ondown>120</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -110,8 +110,8 @@
                         <onright>102</onright>
                         <onup>312</onup>
                         <ondown>121</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -125,8 +125,8 @@
                         <onright>103</onright>
                         <onup>312</onup>
                         <ondown>122</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -140,8 +140,8 @@
                         <onright>104</onright>
                         <onup>312</onup>
                         <ondown>123</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -155,8 +155,8 @@
                         <onright>105</onright>
                         <onup>312</onup>
                         <ondown>124</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -170,8 +170,8 @@
                         <onright>106</onright>
                         <onup>312</onup>
                         <ondown>125</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -185,8 +185,8 @@
                         <onright>107</onright>
                         <onup>312</onup>
                         <ondown>126</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -200,8 +200,8 @@
                         <onright>108</onright>
                         <onup>312</onup>
                         <ondown>127</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -215,8 +215,8 @@
                         <onright>109</onright>
                         <onup>312</onup>
                         <ondown>128</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -230,8 +230,8 @@
                         <onright>110</onright>
                         <onup>312</onup>
                         <ondown>129</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -245,8 +245,8 @@
                         <onright>111</onright>
                         <onup>312</onup>
                         <ondown>130</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -260,8 +260,8 @@
                         <onright>300</onright>
                         <onup>312</onup>
                         <ondown>131</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -281,8 +281,8 @@
                         <onright>120</onright>
                         <onup>300</onup>
                         <ondown>303</ondown>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textureradioonfocus>-</textureradioonfocus>
                         <textureradioonnofocus>-</textureradioonnofocus>
                         <textureradioofffocus>-</textureradioofffocus>
@@ -305,8 +305,8 @@
                         <onright>121</onright>
                         <onup>100</onup>
                         <ondown>140</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -321,8 +321,8 @@
                         <onright>122</onright>
                         <onup>101</onup>
                         <ondown>141</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -337,8 +337,8 @@
                         <onright>123</onright>
                         <onup>102</onup>
                         <ondown>142</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -353,8 +353,8 @@
                         <onright>124</onright>
                         <onup>103</onup>
                         <ondown>143</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -369,8 +369,8 @@
                         <onright>125</onright>
                         <onup>104</onup>
                         <ondown>144</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -385,8 +385,8 @@
                         <onright>126</onright>
                         <onup>105</onup>
                         <ondown>145</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -401,8 +401,8 @@
                         <onright>127</onright>
                         <onup>106</onup>
                         <ondown>146</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -417,8 +417,8 @@
                         <onright>128</onright>
                         <onup>107</onup>
                         <ondown>147</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -433,8 +433,8 @@
                         <onright>129</onright>
                         <onup>108</onup>
                         <ondown>148</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -449,8 +449,8 @@
                         <onright>130</onright>
                         <onup>109</onup>
                         <ondown>149</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -465,8 +465,8 @@
                         <onright>131</onright>
                         <onup>110</onup>
                         <ondown>150</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -481,8 +481,8 @@
                         <onright>302</onright>
                         <onup>111</onup>
                         <ondown>151</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -503,8 +503,8 @@
                         <onright>140</onright>
                         <onup>302</onup>
                         <ondown>304</ondown>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textureradioonfocus>-</textureradioonfocus>
                         <textureradioonnofocus>-</textureradioonnofocus>
                         <textureradioofffocus>-</textureradioofffocus>
@@ -528,8 +528,8 @@
                         <onright>141</onright>
                         <onup>120</onup>
                         <ondown>160</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -544,8 +544,8 @@
                         <onright>142</onright>
                         <onup>121</onup>
                         <ondown>161</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -560,8 +560,8 @@
                         <onright>143</onright>
                         <onup>122</onup>
                         <ondown>162</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -576,8 +576,8 @@
                         <onright>144</onright>
                         <onup>123</onup>
                         <ondown>163</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -592,8 +592,8 @@
                         <onright>145</onright>
                         <onup>124</onup>
                         <ondown>164</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -608,8 +608,8 @@
                         <onright>146</onright>
                         <onup>125</onup>
                         <ondown>165</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -624,8 +624,8 @@
                         <onright>147</onright>
                         <onup>126</onup>
                         <ondown>166</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -640,8 +640,8 @@
                         <onright>148</onright>
                         <onup>127</onup>
                         <ondown>167</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -656,8 +656,8 @@
                         <onright>149</onright>
                         <onup>128</onup>
                         <ondown>168</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -672,8 +672,8 @@
                         <onright>150</onright>
                         <onup>129</onup>
                         <ondown>169</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -688,8 +688,8 @@
                         <onright>151</onright>
                         <onup>130</onup>
                         <ondown>170</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -704,8 +704,8 @@
                         <onright>303</onright>
                         <onup>131</onup>
                         <ondown>171</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -726,8 +726,8 @@
                         <onright>307</onright>
                         <onup>303</onup>
                         <ondown>309</ondown>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textureradioonfocus>-</textureradioonfocus>
                         <textureradioonnofocus>-</textureradioonnofocus>
                         <textureradioofffocus>-</textureradioofffocus>
@@ -748,8 +748,8 @@
                         <posy>0</posy>
                         <width>2-col</width>
                         <height>1-col</height>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <label>IP</label>
                         <textoffsetx>0</textoffsetx>
                         <onleft>304</onleft>
@@ -770,8 +770,8 @@
                         <onright>161</onright>
                         <onup>140</onup>
                         <ondown>32</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -786,8 +786,8 @@
                         <onright>162</onright>
                         <onup>141</onup>
                         <ondown>32</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -802,8 +802,8 @@
                         <onright>163</onright>
                         <onup>142</onup>
                         <ondown>32</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -818,8 +818,8 @@
                         <onright>164</onright>
                         <onup>143</onup>
                         <ondown>32</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -834,8 +834,8 @@
                         <onright>165</onright>
                         <onup>144</onup>
                         <ondown>32</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -850,8 +850,8 @@
                         <onright>166</onright>
                         <onup>145</onup>
                         <ondown>32</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -866,8 +866,8 @@
                         <onright>167</onright>
                         <onup>146</onup>
                         <ondown>305</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -882,8 +882,8 @@
                         <onright>168</onright>
                         <onup>147</onup>
                         <ondown>306</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -898,8 +898,8 @@
                         <onright>169</onright>
                         <onup>148</onup>
                         <ondown>8</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -914,8 +914,8 @@
                         <onright>170</onright>
                         <onup>149</onup>
                         <ondown>8</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -930,8 +930,8 @@
                         <onright>171</onright>
                         <onup>150</onup>
                         <ondown>8</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -946,8 +946,8 @@
                         <onright>304</onright>
                         <onup>151</onup>
                         <ondown>111</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -968,8 +968,8 @@
                         <onright>32</onright>
                         <onup>304</onup>
                         <ondown>312</ondown>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -982,8 +982,8 @@
                         <width>462</width>
                         <height>1-col</height>
                         <label>20182</label>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1005,8 +1005,8 @@
                         <onright>309</onright>
                         <onup>171</onup>
                         <ondown>312</ondown>
-                        <texturenofocus>colors/keyselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1020,8 +1020,8 @@
                         <width>1-col</width>
                         <height>1-col</height>
                         <label>&lt;</label>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1038,8 +1038,8 @@
                         <width>1-col</width>
                         <height>1-col</height>
                         <label>&gt;</label>
-                        <texturenofocus>colors/keyunselected.png</texturenofocus>
-                        <texturefocus>colors/keyaccent.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml
index 01e4133..3f2076a 100644
--- a/1080i/DialogNumeric.xml
+++ b/1080i/DialogNumeric.xml
@@ -2,302 +2,291 @@
 <window>
     <defaultcontrol always="true">21</defaultcontrol>
     <allowoverlay>yes</allowoverlay>
-    <coordinates>
-        <origin x="0" y="540"/>
-    </coordinates>
     <controls>
-        <posx>col-3-begin</posx>
-        <!--background-->
-        <control type="image">
-            <posx>0</posx>
-            <posy>-24</posy>
-            <width>fullscreenWidth</width>
-            <height>10-row</height>
-            <texture>colors/black.png</texture>
-            <colordiffuse>ddffffff</colordiffuse>
-        </control>
-        <!--headers-->
         <control type="group">
-            <posx>col-1-begin</posx>
-            <posy>row-1-begin</posy>
-            <control type="label" id="1">
-                <description>header label</description>
-                <posx>0</posx>
-                <posy>-64</posy>
-                <width>24-col-gutter</width>
-                <height>1-row</height>
-                <align>center</align>
-                <font>itemSubTitle</font>
-                <textcolor>textActive</textcolor>
-            </control>
+        <posx>0</posx>
+        <posy>row-14-begin</posy>
+            <!--background-->
             <control type="image">
-                <posx>8-col</posx>
-                <posy>-12</posy>
-                <width>8-col</width>
-                <height>1-row</height>
-                <aspectratio>stretch</aspectratio>
-                <texture>colors/offblack.png</texture>
-            </control>
-            <control type="label" id="4">
-                <description>Edit Text</description>
-                <posx>8-col</posx>
-                <posy>-12</posy>
-                <width>8-col</width>
-                <height>1-row</height>
-                <align>center</align>
-                <textcolor>textActive</textcolor>
-                <font>itemTitle</font>
-            </control>
-        </control>
-        <!--keyboard-->
-        <control type="group">
-            <posx>col-10-begin</posx>
-            <posy>2-row</posy>
-            <!--row 1-->
-            <control type="button" id="11">
-                <description>1 button</description>
-                <label>12311</label>
                 <posx>0</posx>
-                <posy>0</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>23</onleft>
-                <onright>12</onright>
-                <onup>20</onup>
-                <ondown>14</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
+                <posy>-36</posy>
+                <width>fullscreenWidth</width>
+                <height>17-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>ddffffff</colordiffuse>
             </control>
-            <control type="button" id="12">
-                <description>2 button</description>
-                <label>12312</label>
-                <posx>78</posx>
-                <posy>0</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>11</onleft>
-                <onright>13</onright>
-                <onup>10</onup>
-                <ondown>15</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
+            <!--headers-->
+            <control type="group">
+                <posx>col-1-begin</posx>
+                <posy></posy>
+                <control type="label" id="1">
+                    <description>header label</description>
+                    <posx>0</posx>
+                    <posy>-18</posy>
+                    <width>24-col</width>
+                    <height>1-row</height>
+                    <align>center</align>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="edit" id="4">
+                    <description>Edit Text</description>
+                    <posx>8-col</posx>
+                    <posy>1-row</posy>
+                    <width>8-col</width>
+                    <align>center</align>
+                </control>
             </control>
-            <control type="button" id="13">
-                <description>3 button</description>
-                <label>12313</label>
-                <posx>156</posx>
-                <posy>0</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>12</onleft>
-                <onright>23</onright>
-                <onup>22</onup>
-                <ondown>16</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="23">
-                <description>Backspace button</description>
-                <label>20181</label>
-                <posx>234</posx>
-                <posy>0</posy>
-                <width>3-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <textwidth>180</textwidth>
-                <onleft>13</onleft>
-                <onright>11</onright>
-                <onup>21</onup>
-                <ondown>21</ondown>
-                <texturenofocus>colors/keyunselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-                <font>buttonTitle</font>
-            </control>
-            <!--row 2-->
-            <control type="button" id="14">
-                <description>4 button</description>
-                <label>12314</label>
-                <posx>0</posx>
-                <posy>78</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>21</onleft>
-                <onright>15</onright>
-                <onup>11</onup>
-                <ondown>17</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="15">
-                <description>5 button</description>
-                <label>12315</label>
-                <posx>78</posx>
-                <posy>78</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>14</onleft>
-                <onright>16</onright>
-                <onup>12</onup>
-                <ondown>18</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="16">
-                <description>6 button</description>
-                <label>12316</label>
-                <posx>156</posx>
-                <posy>78</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>15</onleft>
-                <onright>21</onright>
-                <onup>13</onup>
-                <ondown>19</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="21">
-                <description>Done button</description>
-                <label>20177</label>
-                <posx>234</posx>
-                <posy>78</posy>
-                <width>3-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <textwidth>180</textwidth>
-                <onleft>16</onleft>
-                <onright>14</onright>
-                <onup>23</onup>
-                <ondown>23</ondown>
-                <texturenofocus>colors/keyunselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-                <font>buttonTitle</font>
-            </control>
-            <!--row 3-->
-            <control type="button" id="17">
-                <description>7 button</description>
-                <label>12317</label>
-                <posx>0</posx>
-                <posy>156</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>19</onleft>
-                <onright>18</onright>
-                <onup>14</onup>
-                <ondown>20</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="18">
-                <description>8 button</description>
-                <label>12318</label>
-                <posx>78</posx>
-                <posy>156</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>17</onleft>
-                <onright>19</onright>
-                <onup>15</onup>
-                <ondown>10</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="19">
-                <description>9 button</description>
-                <label>12319</label>
-                <posx>156</posx>
-                <posy>156</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>18</onleft>
-                <onright>17</onright>
-                <onup>16</onup>
-                <ondown>22</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <!--row 4-->
-            <control type="button" id="20">
-                <description>prev button</description>
-                <label>&lt;</label>
-                <posx>0</posx>
-                <posy>234</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>22</onleft>
-                <onright>10</onright>
-                <onup>17</onup>
-                <ondown>11</ondown>
-                <texturenofocus>colors/keyunselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="10">
-                <description>0 button</description>
-                <label>12310</label>
-                <posx>78</posx>
-                <posy>234</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>20</onleft>
-                <onright>22</onright>
-                <onup>18</onup>
-                <ondown>12</ondown>
-                <texturenofocus>colors/keyselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="button" id="22">
-                <description>next button</description>
-                <label>&gt;</label>
-                <posx>156</posx>
-                <posy>234</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <align>center</align>
-                <onleft>10</onleft>
-                <onright>20</onright>
-                <onup>19</onup>
-                <ondown>13</ondown>
-                <texturenofocus>colors/keyunselected.png</texturenofocus>
-                <texturefocus>colors/keyaccent.png</texturefocus>
-                <focusedcolor>selected</focusedcolor>
-                <textcolor>textActive</textcolor>
+            <!--keyboard-->
+            <control type="group">
+                <posx>col-10-begin</posx>
+                <posy>4-row</posy>
+                <!--row 1-->
+                <control type="button" id="11">
+                    <description>1 button</description>
+                    <label>12311</label>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>23</onleft>
+                    <onright>12</onright>
+                    <onup>20</onup>
+                    <ondown>14</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="12">
+                    <description>2 button</description>
+                    <label>12312</label>
+                    <posx>78</posx>
+                    <posy>0</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>11</onleft>
+                    <onright>13</onright>
+                    <onup>10</onup>
+                    <ondown>15</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="13">
+                    <description>3 button</description>
+                    <label>12313</label>
+                    <posx>156</posx>
+                    <posy>0</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>12</onleft>
+                    <onright>23</onright>
+                    <onup>22</onup>
+                    <ondown>16</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="23">
+                    <description>Backspace button</description>
+                    <label>20181</label>
+                    <posx>234</posx>
+                    <posy>0</posy>
+                    <width>3-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <textwidth>180</textwidth>
+                    <onleft>13</onleft>
+                    <onright>11</onright>
+                    <onup>21</onup>
+                    <ondown>21</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                    <font>buttonTitle</font>
+                </control>
+                <!--row 2-->
+                <control type="button" id="14">
+                    <description>4 button</description>
+                    <label>12314</label>
+                    <posx>0</posx>
+                    <posy>78</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>21</onleft>
+                    <onright>15</onright>
+                    <onup>11</onup>
+                    <ondown>17</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="15">
+                    <description>5 button</description>
+                    <label>12315</label>
+                    <posx>78</posx>
+                    <posy>78</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>14</onleft>
+                    <onright>16</onright>
+                    <onup>12</onup>
+                    <ondown>18</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="16">
+                    <description>6 button</description>
+                    <label>12316</label>
+                    <posx>156</posx>
+                    <posy>78</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>15</onleft>
+                    <onright>21</onright>
+                    <onup>13</onup>
+                    <ondown>19</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="21">
+                    <description>Done button</description>
+                    <label>20177</label>
+                    <posx>234</posx>
+                    <posy>78</posy>
+                    <width>3-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <textwidth>180</textwidth>
+                    <onleft>16</onleft>
+                    <onright>14</onright>
+                    <onup>23</onup>
+                    <ondown>23</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                    <font>buttonTitle</font>
+                </control>
+                <!--row 3-->
+                <control type="button" id="17">
+                    <description>7 button</description>
+                    <label>12317</label>
+                    <posx>0</posx>
+                    <posy>156</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>19</onleft>
+                    <onright>18</onright>
+                    <onup>14</onup>
+                    <ondown>20</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="18">
+                    <description>8 button</description>
+                    <label>12318</label>
+                    <posx>78</posx>
+                    <posy>156</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>17</onleft>
+                    <onright>19</onright>
+                    <onup>15</onup>
+                    <ondown>10</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="19">
+                    <description>9 button</description>
+                    <label>12319</label>
+                    <posx>156</posx>
+                    <posy>156</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>18</onleft>
+                    <onright>17</onright>
+                    <onup>16</onup>
+                    <ondown>22</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <!--row 4-->
+                <control type="button" id="20">
+                    <description>prev button</description>
+                    <label>&lt;</label>
+                    <posx>0</posx>
+                    <posy>234</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>22</onleft>
+                    <onright>10</onright>
+                    <onup>17</onup>
+                    <ondown>11</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="10">
+                    <description>0 button</description>
+                    <label>12310</label>
+                    <posx>78</posx>
+                    <posy>234</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>20</onleft>
+                    <onright>22</onright>
+                    <onup>18</onup>
+                    <ondown>12</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="button" id="22">
+                    <description>next button</description>
+                    <label>&gt;</label>
+                    <posx>156</posx>
+                    <posy>234</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <align>center</align>
+                    <onleft>10</onleft>
+                    <onright>20</onright>
+                    <onup>19</onup>
+                    <ondown>13</ondown>
+                    <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
+                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <focusedcolor>selected</focusedcolor>
+                    <textcolor>textActive</textcolor>
+                </control>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index c71e8cd..8bd52c5 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -2,12 +2,6 @@
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
     <onload condition="!IntegerGreaterThan(container(3).numitems,0) + !IntegerGreaterThan(container(6).numitems,0)">control.SetFocus(9999)</onload>
-    <coordinates>
-        <system>1</system>
-        <posx>0</posx>
-        <posy>0</posy>
-    </coordinates>
-    <zorder>2</zorder>
     <include>fadeInOut</include>
     <controls>
         <!--background-->
@@ -16,41 +10,40 @@
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="group">
-                <posx>col-5-begin</posx>
+                <posx>col-4-begin</posx>
                 <posy>row-3-begin</posy>
                 <control type="image">
-                    <posx>-384</posx>
-                    <posy>44</posy>
-                    <width>fullscreenWidth</width>
-                    <height>1-row</height>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>18-col</width>
+                    <height>2-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
+                    <colordiffuse>500</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="image">
-                    <posx>-3</posx>
-                    <posy>44</posy>
-                    <width>1155</width>
-                    <height>1-row</height>
-                    <texture>colors/white.png</texture>
-                    <bordertexture border="0">colors/black.png</bordertexture>
-                    <bordersize>3,0,0,0</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
+                    <posx>0</posx>
+                    <posy>2-row</posy>
+                    <width>18-col</width>
+                    <height>21-row</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="label" id="1">
-                    <posx>12</posx>
-                    <posy>44</posy>
+                    <posx>24</posx>
+                    <posy>0</posy>
                     <width>16-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
                     <font>dialogTitle</font>
-                    <label>-</label>
-                    <textcolor>black</textcolor>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <control type="group" id="9000">
                     <control type="panel" id="3">
                         <posx>0</posx>
-                        <posy>120</posy>
+                        <posy>2-row</posy>
                         <width>12-col</width>
                         <height>11-row</height>
                         <onright>9999</onright>
@@ -137,65 +130,59 @@
                     <!--addon selection etc-->
                     <control type="panel" id="6">
                         <posx>0</posx>
-                        <posy>120</posy>
+                        <posy>2-row</posy>
                         <width>12-col</width>
-                        <height>11-row</height>
+                        <height>21-row</height>
                         <onright>9999</onright>
-                        <itemlayout height="1-row" width="6-col">
+                        <itemlayout height="2-row" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
-                                <posy>2</posy>
-                                <width>6-col-gutter</width>
-                                <height>53</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                                <bordersize>0</bordersize>
-                                <colordiffuse>99FFFFFF</colordiffuse>
-                            </control>
-                            <control type="image">
-                                <posx>4</posx>
-                                <posy>4</posy>
-                                <width>48</width>
-                                <height>48</height>
+                                <posy>0</posy>
+                                <width>1-col</width>
+                                <height>2-row</height>
                                 <aspectratio scalediffuse="false">scale</aspectratio>
-                                <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
+                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
                             </control>
                             <control type="label">
-                                <posx>1-col</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>312</width>
+                                <width>11-col-gutter</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
                                 <font>itemTitle</font>
                                 <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="1-row" width="6-col">
+                        <focusedlayout height="2-row" width="12-col">
                             <control type="image">
-                                <posx>0</posx>
-                                <posy>2</posy>
-                                <width>6-col-gutter</width>
-                                <height>53</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                                <bordersize>0</bordersize>
-                                <colordiffuse>FFFFFFFF</colordiffuse>
-                            </control>
-                            <control type="image">
-                                <posx>4</posx>
-                                <posy>4</posy>
-                                <width>48</width>
-                                <height>48</height>
-                                <aspectratio scalediffuse="false">scale</aspectratio>
-                                <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
-                            </control>
-                            <control type="label">
                                 <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>312</width>
+                                <width>11-col</width>
+                                <height>2-row</height>
+                                <aspectratio>stretch</aspectratio>
+                                <texture>colors/white.png</texture>
+                                <bordersize>0</bordersize>
+                                <colordiffuse>ffffffff</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>0</posy>
+                                <width>1-col</width>
+                                <height>2-row</height>
+                                <aspectratio scalediffuse="false">scale</aspectratio>
+                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
+                                <include>spinFocusIcon</include>
+                            </control>
+                            <control type="label">
+                                <posx>1-col-indent</posx>
+                                <posy>0</posy>
+                                <width>11-col-gutter</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
                                 <font>itemTitle</font>
                                 <textcolor>black</textcolor>
-                                <selectedcolor>black</selectedcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -204,66 +191,96 @@
                 </control>
                 <!--larger thumbnail-->
                 <control type="image">
-                    <posx>12-col</posx>
-                    <posy>5-row</posy>
-                    <width>6-col</width>
-                    <height>6-col</height>
+                    <posx>12-col-indent</posx>
+                    <posy>2-row</posy>
+                    <width>6-col-gutter</width>
+                    <height>6-col-gutter</height>
                     <aspectratio scalediffuse="false" align="left" aligny="center">keep</aspectratio>
                     <texture border="0">$INFO[container(6).Listitem.icon]</texture>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
                     <fadetime>200</fadetime>
                 </control>
                 <!--OK / Cancel-->
+                <control type="image">
+                    <posx>12-col</posx>
+                    <posy>2-row</posy>
+                    <width>6-col</width>
+                    <height>21-row</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
                 <control type="panel" id="9999">
                     <visible>control.isvisible(3) | control.isvisible(5)</visible>
                     <posx>12-col</posx>
-                    <posy>120</posy>
-                    <width>4-col</width>
-                    <height>5-row</height>
-                    <itemgap>3</itemgap>
+                    <posy>13-row</posy>
+                    <width>6-col</width>
+                    <height>6-row</height>
                     <orientation>vertical</orientation>
                     <onleft>9000</onleft>
-                    <itemlayout width="6-col" height="1-row">
+                    <itemlayout width="6-col" height="2-row">
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
                             <font>symbol</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>-1</posy>
-                            <width>6-col</width>
+                            <posx>1-col-indent</posx>
+                            <posy>0</posy>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
                             <font>menuTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="6-col" height="1-row">
+                    <focusedlayout width="6-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <height>53</height>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>500</colordiffuse>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>5-col</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
                             <font>symbol</font>
-                            <textcolor>black</textcolor>
+                            <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>-1</posy>
-                            <width>6-col</width>
+                            <posx>1-col-indent</posx>
+                            <posy>0</posy>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
                             <font>menuTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
diff --git a/1080i/View_Addons.xml b/1080i/View_Addons.xml
index 59d30d9..c21b972 100644
--- a/1080i/View_Addons.xml
+++ b/1080i/View_Addons.xml
@@ -30,48 +30,42 @@
                     </control>
                 </itemlayout>
                 <focusedlayout width="4-col" height="4-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
                     <control type="group">
-                        <posx>0</posx>
-                        <posy>0</posy>
+                        <include>spinFocusPoster</include>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>4-col-gutter</width>
                             <height>4-col-gutter</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordertexture border="3" colordiffuse="99111111">colors/white.png</bordertexture>
+                            <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
                             <bordersize>3</bordersize>
-                            <colordiffuse>44FFFFFF</colordiffuse>
+                            <colordiffuse>ffFFFFFF</colordiffuse>
                         </control>
-                        <control type="label">
-                            <posx>24</posx>
-                            <posy>3-row</posy>
-                            <width>3-col</width>
-                            <align>center</align>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                        </control>
-                        <control type="label">
-                            <posx>24</posx>
-                            <posy>4-row</posy>
-                            <width>3-col</width>
-                            <align>center</align>
-                            <font>itemSubTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.Property(Addon.summary)]</label>
+                        <control type="group">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>0</posy>
+                                <width>1-col</width>
+                                <height>4-col-gutter</height>
+                                <aspectratio>stretch</aspectratio>
+                                <texture border="0">colors/white.png</texture>
+                                <colordiffuse>500</colordiffuse>
+                            </control>
+                            <control type="label">
+                                <posx>12</posx>
+                                <posy>248</posy>
+                                <width>7-row</width>
+                                <align>left</align>
+                                <angle>90</angle>
+                                <aligny>top</aligny>
+                                <font>itemTitle</font>
+                                <textcolor>white</textcolor>
+                                <label>$INFO[ListItem.label]</label>
+                            </control>
                         </control>
                     </control>
                 </focusedlayout>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 2a42ff0..5f75df6 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -3,44 +3,6 @@
     <include name="seasons">
         <control type="group">
             <visible>container.content(seasons) + !container.content(episodes)</visible>
-
-            <!--fanart-->
-            <control type="group">
-                <posy>-516</posy>
-                <control type="image">
-                    <include>dimensionsFullscreen</include>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
-                    <bordertexture border="6" colordiffuse="500">colors/white.png</bordertexture>
-                    <bordersize>0,0,0,6</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
-                </control>
-            </control>
-
-            <!--title-->
-            <control type="group">
-                <posx>col-1-begin</posx>
-                <posy>row-2-begin</posy>
-                <control type="image">
-                    <posx>-96</posx>
-                    <posy>11-row</posy>
-                    <width>fullscreenWidth</width>
-                    <height>2-row</height>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture border="0">colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                </control>
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>11-row</posy>
-                    <width>24-col</width>
-                    <height>2-row</height>
-                    <font>medium</font>
-                    <textcolor>textActive</textcolor>
-                    <label>$INFO[container.foldername]</label>
-                </control>
-            </control>
-
             <!--content-->
             <control type="panel" id="58">
                 <visible>!StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
@@ -107,6 +69,46 @@
                     </control>
                 </focusedlayout>
             </control>
+
+            <!--fanart-->
+            <control type="group">
+                <animation type="conditional" condition="true">
+                    <effect type="slide" start="0,0" end="0,-516" tween="cubic" easing="out" delay="0" time="400"/>
+                </animation>
+                <posy>0</posy>
+                <control type="image">
+                    <include>dimensionsFullscreen</include>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
+                    <bordertexture border="6" colordiffuse="500">colors/white.png</bordertexture>
+                    <bordersize>0,0,0,6</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+                </control>
+            </control>
+
+            <!--title-->
+            <control type="group">
+                <posx>col-1-begin</posx>
+                <posy>row-2-begin</posy>
+                <control type="image">
+                    <posx>-96</posx>
+                    <posy>11-row</posy>
+                    <width>fullscreenWidth</width>
+                    <height>2-row</height>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture border="0">colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                </control>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>11-row</posy>
+                    <width>24-col</width>
+                    <height>2-row</height>
+                    <font>medium</font>
+                    <textcolor>textActive</textcolor>
+                    <label>$INFO[container.foldername]</label>
+                </control>
+            </control>
         </control>
     </include>
 </includes>
\ No newline at end of file
diff --git a/colors/defaults.xml b/colors/defaults.xml
index c981686..4911cfb 100644
--- a/colors/defaults.xml
+++ b/colors/defaults.xml
@@ -15,6 +15,10 @@
     <color name="textboxInactive">99FFFFFF</color>
     <color name="textAccented">FFE91E63</color>
 
+    <color name="keyboardActive">ffE91E63</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+
     <color name="500">ffE91E63</color>
 
     <color name="50">ffFFEBEE</color>
diff --git a/media/colors/inactive.png b/media/colors/inactive.png
deleted file mode 100644
index 6934639778623995b4559282ef5ebadde8f04d71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 930
zcmaJ=O^ee&7>=%pyHM~XC<w!>EC@E=O}C+OsY&VvOet-_9(S5d+t5uWCR3aCw0QF-
zcv|-Cb$@^!Jo^{+Pxu#{={8*t*1%-u9iHcTKj(9|^R{yE>_8BNig)Vt*#3a8NB7zP
z=<EJVwmqfpkoL)#E>MPrR!Bw|crlvb9!BBv!!O(vggqDyhIHt^GXoNfh-1VeP8nMe
znkPkyf*Gb@geOsA!QVfALJ)-(d|&frKeh2RI$dSBzv>Kv)huX)@Z>dU7A6yjF-4$=
z&y(CNEV$M+*_mHU5Ue3|X2IK_hJF{=B*UO4%GE$NWMC+wqUrT|{S{DUMV4e$Qq-za
zH#OCiWw7}m^Ol8Uv*)xozL;gfDW$0?NsGloTxcT6CX&)<G`NPURvDt2FB6K2YLXw8
z3J%VLEJ|ra62KMFh|H-4S){iq#OYQx$v0(U1(OPtN{T4+luDrQ{~sF1TXar)_%7am
z3g?4milrXT$vg{K<Hm>FRchK9MwDa&Le9%7cBh1rd`ePa_iMmML6mTNjrV=iOLB^m
z0DF!FnSvNap=q=o-8B?fw~sYNan<8i&9+@b*Ic7sGjz4&IwY9KIH4ssyyLcaa``C4
zDf8^$Ec%GUc1B{bPT7oh$71i)+i=6(u{b-q5(`G+js2_9<rSMAe%y{NGq!_|6E^J`
z8|%w2l^gaXo_J1cP~41kT@Nqr9X)(;akcmOOnClXxVrpyt?^gmxgF>F&Dp0vnl%~7

diff --git a/media/colors/keyaccent.png b/media/colors/keyaccent.png
deleted file mode 100644
index 261859723bb8cc96cf067296cf09b94ddf206a49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 931
zcmaJ=&u-H&91i0$P1+faljR){5>4!s^pDjrbxFe_NL96!=#eyW+o($%9CuB7LU2Gl
z1h2pgZ~!DOyaM9D10d}caJr`BKuMI?KkNIx-(SD)b)Oy|-9J(k<=DNj`*J-jzQY6g
ze-=OdDVGz`8HoX#h^5b|(hk{}0yp-jv`_tT_3ArqDau_K4M$?+JtqN+RlmTfd7MhN
zqO{KP)DPxVfH9p$i3zVieTE<kP58p_ke6C?7G1149jv><U_B3-Av}8mS~-ydF%>?@
z<I5x?xd}JAMDB}Y4T23s%uRR`)X3`ri*X7J6;%RML!gFLTzy=x*B=2LVWc5l!+HhR
zNmVBZf$amOHy%z%-*&dXq-DaH5Gm2L<#MSmt19DD4L6(3LPOUp5>d%kiSYAElAV?c
zHq8Par6OVpC=~rMTL=@%NN-Yz)17RRZObGJrsaOBVHFiAl|aw?KQxYa=uGtKZM^>!
z&W5X$YJHlq1rKE7CZ~m~lvtelg7G0^mt_@uGbUIzV=1r(2JrkKN(y^}_dMbznedZ<
zy0!_Wf*M63X|`*QZQ0mz8W`hFwb5u8O=L9;!;<g0Q*vz<EMl67k{jM~^}XC;6yj8R
zwkeOUXy|YjgH6gL+8c}I?A6<H!~L<Ky<ANOqZN()tI_3=oStI48(V4Y2A?K!+PNI-
ys|WN%UWt3I-5%yY#=oyWe0_b4@Gs@<-~fD4M$VmYVXC|<u8rI2+8@tfzWD=r_8jp5

diff --git a/media/colors/keyselected.png b/media/colors/keyselected.png
deleted file mode 100644
index 5c10c99986c8ccdff4655616c28c4c5f14b78041..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 931
zcmaJ=J#W)M7&ahKRjCpiAJfU5DiMFBPGT!=mD&llz)?sdk+B#1l33~aj`M{$VL@z+
zh=pIk2tNQJU}R%qLHq}P01M|dP8kTc?7R2$JkR@iFFWn~d%JgcB}v-zPra^Kck*xN
zs`x*^2S3Gfhc^ejM@D=O8Il?i86x0gI7VFrqs5c2s4hv@<hVcJgW#bZ60E=+qhy#0
zwj|Y$GYZ2g;$VozapK6oK75iv969o1GtdI+qDg$ZWT>}n_rv8hv?BTV2-GuM2w=n^
z$nbfR+L<G-bZxQEk5w70Abje`7eNhz4sZ!Wz*MwSs8uvj(G|UXSgls?0YlR@RWnrG
zDCt$ZY}lFx){iW_v1nv>z1G^7upD{9Iki=FKA$V|vO?Hc)h)})H4LL95T$gHaF~^n
zbiYvWP#UtB@|YwbSA;_{<BlvMy+{Gmjck&x%Onb>W{|47qU9+Sz##ZP6yps#<y~|c
z?>~jp{(>U4i&8RUp=jJ_KX*lKmm$ar>l1QbRIxK5oTL*%f!i}d0K+)R?G-)<Y(Ggk
zOhV*)jw}?EIF4+qQE7RuXS%JLuItTmtyVKF&8?ZHE8de<!SzTu!zkeeH@f6jwsP}P
zz*Knl5R0FpsKp2dtCa0{do1OxdTVa9J(k0*TvY_4=8gTU(Z!LNo_xC*TVZSlA0=Yi
znHcL=)9>%amAK`5jehoHc=)Y4{(R%jZTkGn!Ihh5(zEN*+ux5~f6T9q-)wvDPR?HZ
E0i7Kk_y7O^

diff --git a/media/colors/keyunselected.png b/media/colors/keyunselected.png
deleted file mode 100644
index b090474c5449b02adf02a6ca0d30787a8ad2429e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 931
zcmaJ=J#W)M7&aiGs!}BeBtE9obwHJfzk+M~6jP;kOfBjtN+QS@$G#+PYM-$$#L0x%
z*yzSDKw@EI>Hv)V02ai5;4g4a<CG!6mVNi0p67W#?_I0;Y;X7BF2`|u&WY7#>rV0Q
z++_df(ZO%FJfMvp?T{gzc`4@V0U2Q6MBWIuu@}r={lGPjy9L8;kM`VC<dcZ^3Jjk|
z31f3y?I=$?e}X9(;87SG@XzH}2*SXCFBMmG6BCcalSPU<i)PnfOng0nM^8a5M@%5X
z)B|~R9%m>w;8GW{eQ_*6u!PWw0k4AUxh-Il6a$49E53Lrf<uXys!vo^eGFt#5(QBf
zB)KA~s462-1gi%!Z)q?@ZOdNyVwM5NlqN_JX0sVTtMVir36iesg@!Cw7^0HRW9sFV
zINL83ES&jin9z{KpiuM%WJ(RlBE3o>O4hP*wki`Vn2>vkAn{_6QVDe3|3jl_jm~Hr
zU&p&qIP1<6EVOY(rm4>wH{35=CCE&%M@iZx<h-n6YfLD~#v}n|M**(qhjC#q@ve)U
zIHO+dW5+TeQ{cleK$azoW?gQWwkAnZqpE3|qKl@cC?<Q4?UHK|e;VPKmfYZ)Yj5Qi
zqYx#`vxU>}H4f~QL|~aR3OB@}*AH#WwA8J7D{inMmK9gq$`x2JLebcN8eJZ-=_$7B
zv1P`3@NvwhJ!NBk_vhs&b|vmPR=u158eCkw=zqKY;ePVw`@xMneeU!lccwmi|E0J#
MPNQjkKJLH$3u`4E9smFU