diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml
index 2337f6c..60ae354 100644
--- a/1080i/DialogConfirm.xml
+++ b/1080i/DialogConfirm.xml
@@ -49,30 +49,33 @@
                <posx>0</posx>
                <posy>228</posy>
                <width>8-col</width>
-               <height>6-row</height>
+               <height>8-row</height>
                <itemgap>0</itemgap>
-               <orientation>horizontal</orientation>
+               <orientation>vertical</orientation>
                
                <control type="button" id="10">
                    <description>No</description>
                    <align>center</align>
                    <textoffsetx>0</textoffsetx>
-                   <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
-                   <texturenofocus colordiffuse="ff000000">UIControls/button.png</texturenofocus>
+                   <width>8-col</width>
+                   <texturefocus border="24" colordiffuse="ffffffff">UIControls/button.png</texturefocus>
+                   <texturenofocus border="24" colordiffuse="ff000000">UIControls/button.png</texturenofocus>
                </control>
                <control type="button" id="11">
                      <description>Yes</description>
                      <align>center</align>
                      <textoffsetx>0</textoffsetx>
-                     <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
-                     <texturenofocus colordiffuse="ff000000">UIControls/button.png</texturenofocus>
+                     <width>8-col</width>
+                     <texturefocus border="24" colordiffuse="ffffffff">UIControls/button.png</texturefocus>
+                     <texturenofocus border="24" colordiffuse="ff000000">UIControls/button.png</texturenofocus>
                  </control>
                <control type="button" id="12">
                    <description>Custom</description>
                    <align>center</align>
                    <textoffsetx>0</textoffsetx>
-                   <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
-                   <texturenofocus colordiffuse="ff000000">UIControls/button.png</texturenofocus>
+                   <width>8-col</width>
+                   <texturefocus border="24" colordiffuse="ffffffff">UIControls/button.png</texturefocus>
+                   <texturenofocus border="24" colordiffuse="ff000000">UIControls/button.png</texturenofocus>
                </control>
            </control>
        </control>
diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index 1870bf3..246db0e 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -88,8 +88,8 @@
                         <onright>500</onright>
                         <onup>312</onup>
                         <ondown>302</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -106,8 +106,8 @@
                         <onright>100</onright>
                         <onup>312</onup>
                         <ondown>302</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -123,8 +123,8 @@
                         <onright>101</onright>
                         <onup>312</onup>
                         <ondown>120</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -138,8 +138,8 @@
                         <onright>102</onright>
                         <onup>312</onup>
                         <ondown>121</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -153,8 +153,8 @@
                         <onright>103</onright>
                         <onup>312</onup>
                         <ondown>122</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -168,8 +168,8 @@
                         <onright>104</onright>
                         <onup>312</onup>
                         <ondown>123</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -183,8 +183,8 @@
                         <onright>105</onright>
                         <onup>312</onup>
                         <ondown>124</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -198,8 +198,8 @@
                         <onright>106</onright>
                         <onup>312</onup>
                         <ondown>125</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -213,8 +213,8 @@
                         <onright>107</onright>
                         <onup>312</onup>
                         <ondown>126</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -228,8 +228,8 @@
                         <onright>108</onright>
                         <onup>312</onup>
                         <ondown>127</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -243,8 +243,8 @@
                         <onright>109</onright>
                         <onup>312</onup>
                         <ondown>128</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -258,8 +258,8 @@
                         <onright>110</onright>
                         <onup>312</onup>
                         <ondown>129</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -273,8 +273,8 @@
                         <onright>111</onright>
                         <onup>312</onup>
                         <ondown>130</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -288,8 +288,8 @@
                         <onright>300</onright>
                         <onup>312</onup>
                         <ondown>131</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -309,8 +309,8 @@
                         <onright>120</onright>
                         <onup>300</onup>
                         <ondown>303</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <textureradioonfocus></textureradioonfocus>
                         <textureradioonnofocus></textureradioonnofocus>
                         <textureradioofffocus></textureradioofffocus>
@@ -333,8 +333,8 @@
                         <onright>121</onright>
                         <onup>100</onup>
                         <ondown>140</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -349,8 +349,8 @@
                         <onright>122</onright>
                         <onup>101</onup>
                         <ondown>141</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -365,8 +365,8 @@
                         <onright>123</onright>
                         <onup>102</onup>
                         <ondown>142</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -381,8 +381,8 @@
                         <onright>124</onright>
                         <onup>103</onup>
                         <ondown>143</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -397,8 +397,8 @@
                         <onright>125</onright>
                         <onup>104</onup>
                         <ondown>144</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -413,8 +413,8 @@
                         <onright>126</onright>
                         <onup>105</onup>
                         <ondown>145</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -429,8 +429,8 @@
                         <onright>127</onright>
                         <onup>106</onup>
                         <ondown>146</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -445,8 +445,8 @@
                         <onright>128</onright>
                         <onup>107</onup>
                         <ondown>147</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -461,8 +461,8 @@
                         <onright>129</onright>
                         <onup>108</onup>
                         <ondown>148</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -477,8 +477,8 @@
                         <onright>130</onright>
                         <onup>109</onup>
                         <ondown>149</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -493,8 +493,8 @@
                         <onright>131</onright>
                         <onup>110</onup>
                         <ondown>150</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -509,8 +509,8 @@
                         <onright>302</onright>
                         <onup>111</onup>
                         <ondown>151</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -531,8 +531,8 @@
                         <onright>140</onright>
                         <onup>302</onup>
                         <ondown>304</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <textureradioonfocus></textureradioonfocus>
                         <textureradioonnofocus></textureradioonnofocus>
                         <textureradioofffocus></textureradioofffocus>
@@ -556,8 +556,8 @@
                         <onright>141</onright>
                         <onup>120</onup>
                         <ondown>160</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -572,8 +572,8 @@
                         <onright>142</onright>
                         <onup>121</onup>
                         <ondown>161</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -588,8 +588,8 @@
                         <onright>143</onright>
                         <onup>122</onup>
                         <ondown>162</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -604,8 +604,8 @@
                         <onright>144</onright>
                         <onup>123</onup>
                         <ondown>163</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -620,8 +620,8 @@
                         <onright>145</onright>
                         <onup>124</onup>
                         <ondown>164</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -636,8 +636,8 @@
                         <onright>146</onright>
                         <onup>125</onup>
                         <ondown>165</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -652,8 +652,8 @@
                         <onright>147</onright>
                         <onup>126</onup>
                         <ondown>166</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -668,8 +668,8 @@
                         <onright>148</onright>
                         <onup>127</onup>
                         <ondown>167</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -684,8 +684,8 @@
                         <onright>149</onright>
                         <onup>128</onup>
                         <ondown>168</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -700,8 +700,8 @@
                         <onright>150</onright>
                         <onup>129</onup>
                         <ondown>169</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -716,8 +716,8 @@
                         <onright>151</onright>
                         <onup>130</onup>
                         <ondown>170</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -732,8 +732,8 @@
                         <onright>303</onright>
                         <onup>131</onup>
                         <ondown>171</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -754,8 +754,8 @@
                         <onright>307</onright>
                         <onup>303</onup>
                         <ondown>309</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <textureradioonfocus></textureradioonfocus>
                         <textureradioonnofocus></textureradioonnofocus>
                         <textureradioofffocus></textureradioofffocus>
@@ -776,8 +776,8 @@
                         <posy>0</posy>
                         <width>2-col</width>
                         <height>1-col</height>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <label>31093</label>
                         <textoffsetx>0</textoffsetx>
                         <onleft>304</onleft>
@@ -798,8 +798,8 @@
                         <onright>161</onright>
                         <onup>140</onup>
                         <ondown>32</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -814,8 +814,8 @@
                         <onright>162</onright>
                         <onup>141</onup>
                         <ondown>32</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -830,8 +830,8 @@
                         <onright>163</onright>
                         <onup>142</onup>
                         <ondown>32</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -846,8 +846,8 @@
                         <onright>164</onright>
                         <onup>143</onup>
                         <ondown>32</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -862,8 +862,8 @@
                         <onright>165</onright>
                         <onup>144</onup>
                         <ondown>32</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -878,8 +878,8 @@
                         <onright>166</onright>
                         <onup>145</onup>
                         <ondown>32</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -894,8 +894,8 @@
                         <onright>167</onright>
                         <onup>146</onup>
                         <ondown>305</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -910,8 +910,8 @@
                         <onright>168</onright>
                         <onup>147</onup>
                         <ondown>306</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -926,8 +926,8 @@
                         <onright>169</onright>
                         <onup>148</onup>
                         <ondown>8</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -942,8 +942,8 @@
                         <onright>170</onright>
                         <onup>149</onup>
                         <ondown>8</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -958,8 +958,8 @@
                         <onright>171</onright>
                         <onup>150</onup>
                         <ondown>8</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -974,8 +974,8 @@
                         <onright>304</onright>
                         <onup>151</onup>
                         <ondown>111</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -996,8 +996,8 @@
                         <onright>32</onright>
                         <onup>304</onup>
                         <ondown>312</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -1010,8 +1010,8 @@
                         <width>462</width>
                         <height>1-col</height>
                         <label>20182</label>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1033,8 +1033,8 @@
                         <onright>309</onright>
                         <onup>171</onup>
                         <ondown>312</ondown>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus border="24" colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus border="24" colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1048,8 +1048,8 @@
                         <width>1-col</width>
                         <height>1-col</height>
                         <label>&lt;</label>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1066,8 +1066,8 @@
                         <width>1-col</width>
                         <height>1-col</height>
                         <label>&gt;</label>
-                        <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <texturenofocus colordiffuse="keyboardInactive">masks/square.png</texturenofocus>
+                        <texturefocus colordiffuse="highlight">masks/square.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>textActive</focusedcolor>
                         <textcolor>textActive</textcolor>
diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index b458fd3..3b13d25 100644
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -176,6 +176,7 @@
 				<height>6-row</height>
     			<control type="button" id="6">
     				<description>Refresh button</description>
+                    <visible>false</visible>
                     <font>thumbTitle</font>
                     <align>center</align>
                     <textoffsetx>0</textoffsetx>
@@ -187,6 +188,7 @@
     			</control>
     			<control type="button" id="10">
     				<description>Get Thumb</description>
+                    <visible>false</visible>
                     <posx>4-col</posx>
                     <font>thumbTitle</font>
                     <align>center</align>
@@ -255,12 +257,12 @@
 				<!--synopsis-->
 				<control type="textbox">
 					<posx>0</posx>
-					<posy>row-5-begin</posy>
+					<posy>10-row</posy>
 					<font>textbox</font>
 					<width>8-col</width>
 					<align>left</align>
 					<textcolor>textActive</textcolor>
-					<height>402</height>
+					<height>482</height>
 					<label fallback="31205">$INFO[ListItem.Property(Album_Description)]</label>
 					<autoscroll>false</autoscroll>
 					<pagecontrol>61</pagecontrol>
@@ -269,13 +271,13 @@
 					<posx>12r</posx>
 					<posy>216</posy>
 					<height>10-row</height>
-					<ondown>6</ondown>
-                    <onleft>6</onleft>
+					<ondown>8000</ondown>
+                    <onleft>8000</onleft>
 				</control>
 				<!--meta-->
 				<control type="panel">
 					<posx>-12</posx>
-					<posy>18-row</posy>
+					<posy>row-5-begin</posy>
 					<width>10-col</width>
 					<height>6-row</height>
 					<enable>false</enable>
@@ -324,60 +326,34 @@
 					</content>
 				</control>
 			</control>
-            <control type="group" id="8000">
+            <control type="grouplist" id="8000">
 				<posx>12</posx>
-				<posy>row-24-begin</posy>
+				<posy>row-26-begin</posy>
 				<width>10-col</width>
-				<height>6-row</height>
-    			<control type="button" id="6">
-    				<description>Refresh button</description>
+				<height>2-row</height>
+                <orientation>horizontal</orientation>
+                <onup>61</onup>
+                
+    			<control type="button" id="80000">
+    				<description>Go to artist</description>
                     <font>thumbTitle</font>
                     <align>center</align>
                     <textoffsetx>0</textoffsetx>
                     <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
                     <texturenofocus colordiffuse="77000000">UIControls/button.png</texturenofocus>
-    				<label>184</label>
-                    <onright>7</onright>
-                    <onup>61</onup>
-                    <ondown>10</ondown>
+    				<label>31254</label>
+                    <onclick>dialog.close(all,true)</onclick>
+                    <onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID]/,return)</onclick>
     			</control>
-    			<control type="button" id="7">
-    				<description>Set rating</description>
-                    <posx>4-col</posx>
+    			<control type="button" id="80001">
+    				<description>Go to album</description>
                     <font>thumbTitle</font>
                     <align>center</align>
                     <textoffsetx>0</textoffsetx>
                     <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
                     <texturenofocus colordiffuse="77000000">UIControls/button.png</texturenofocus>
-                    <label>31169</label>
-                    <onleft>6</onleft>
-                    <onup>61</onup>
-                    <ondown>12</ondown>
-    			</control>
-    			<control type="button" id="10">
-    				<description>Get Thumb</description>
-                    <posy>2-row</posy>
-                    <font>thumbTitle</font>
-                    <align>center</align>
-                    <textoffsetx>0</textoffsetx>
-                    <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
-                    <texturenofocus colordiffuse="77000000">UIControls/button.png</texturenofocus>
-    				<label>13405</label>
-                    <onup>6</onup>
-                    <onright>12</onright>
-    			</control>
-    			<control type="button" id="12">
-    				<description>Get Fanart</description>
-                    <posx>4-col</posx>
-                    <posy>2-row</posy>
-                    <font>thumbTitle</font>
-                    <align>center</align>
-                    <textoffsetx>0</textoffsetx>
-                    <texturefocus colordiffuse="ffffffff">UIControls/button.png</texturefocus>
-                    <texturenofocus colordiffuse="77000000">UIControls/button.png</texturenofocus>
-    				<label>20413</label>
-                    <onup>7</onup>
-                    <onleft>10</onleft>
+    				<label>31255</label>
+                    <onclick></onclick>
     			</control>
             </control>            
 		</control>
@@ -444,8 +420,7 @@
     					<shadowcolor>99000000</shadowcolor>
     				</control>
                 </control>
-            
-				
+        	
 				<!--dialog controls-->
                 <control type="grouplist" id="8000">
 					<posx>-36</posx>
diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml
index acb6f85..3fc2e21 100644
--- a/1080i/DialogSettings.xml
+++ b/1080i/DialogSettings.xml
@@ -9,14 +9,14 @@
             <animation type="conditional" condition="Window.IsVisible(sliderdialog) | window.isvisible(selectdialog) | window.isactive(subtitlesearch)" reversible="false">
                 <effect type="fade" start="100" end="0" time="200"/>
             </animation>
-            <posx>col-5-begin</posx>
+            <posx>col-7-begin</posx>
             <posy>row-4-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
                 <posx>-12</posx>
                 <posy>-12</posy>
-                <width>1176</width>
+                <width>888</width>
                 <height>768</height>
                 <texture border="24">dialogBackground.png</texture>
                 <colordiffuse>overlay</colordiffuse>
@@ -26,7 +26,7 @@
 				<visible>player.hasvideo</visible>
                 <posx>-12</posx>
                 <posy>-12</posy>
-                <width>1176</width>
+                <width>888</width>
                 <height>768</height>
                 <texture border="24">dialogBackground.png</texture>
                 <colordiffuse>overlay</colordiffuse>
@@ -35,7 +35,7 @@
 			<control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>16-col</width>
+                <width>12-col</width>
                 <height>71</height>
                 <texture border="10">masks/menuTitle2.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -93,120 +93,26 @@
                 <textcolor>highlight</textcolor>
                 <shadowcolor></shadowcolor>
             </control>
-            <!--dialog control buttons-->
-            <control type="panel" id="9000">
+            <!--dialog controls-->
+            <control type="grouplist" id="9000">
+                <visible>false</visible>
                 <posx>12-col</posx>
                 <posy>84</posy>
                 <width>4-col</width>
                 <height>6-row</height>
-                <orientation>vertical</orientation>
                 <onleft>5</onleft>
-                <itemlayout width="4-col" height="2-row">
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>1-col-indent</posx>
-                        <posy>0</posy>
-                        <width>5-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="4-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>highlight</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>0</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>1-col-indent</posx>
-                        <posy>0</posy>
-                        <width>5-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>black</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                </focusedlayout>
-                <content>
-                    <item id="1">
-						<visible>Control.IsEnabled(28) + !window.isactive(osdsubtitlesettings)</visible>
-                        <description>Ok Button</description>
-                        <label>186</label>
-                        <label2></label2>
-                        <thumb></thumb>
-                        <onclick>SendClick(28)</onclick>
-                    </item>
-                    <item id="2">
-						<visible>Control.IsEnabled(29)</visible>
-                        <description>Cancel Button</description>
-                        <label>222</label>
-                        <label2></label2>
-                        <thumb></thumb>
-                        <onclick>SendClick(29)</onclick>
-                    </item>
-                    <item id="3">
-                        <visible>Control.IsEnabled(30) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !window.isactive(osdsubtitlesettings)</visible>
-                        <description>clear / settings</description>
-                        <label>31048</label>
-                        <label2></label2>
-                        <thumb></thumb>
-                        <onclick>SendClick(30)</onclick>
-                    </item>
-                </content>
-            </control>
-            <!--dialog controls-->
-            <control type="group">
-                <visible>false</visible>
+                <orientation>vertical</orientation>
                 <control type="button" id="28">
                     <description>OK</description>
+                    <label>186</label>
                 </control>
                 <control type="button" id="29">
                     <description>Cancel</description>
+                    <label>222</label>
                 </control>
                 <control type="button" id="30">
                     <description>Clear / Settings</description>
+                    <label>31048</label>
                 </control>
             </control>
         </control>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index ac843dd..27c2e34 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -198,11 +198,11 @@
             <!--dialog controls-->
             <control type="grouplist" id="8000">
                 <posx>24</posx>
-                <posy>24-row</posy>
+                <posy>948</posy>
                 <width>10-col</width>
                 <height>6-row</height>
                 <orientation>horizontal</orientation>
-                <itemgap>24</itemgap>
+                <itemgap>12</itemgap>
                 <onup>61</onup>
                 <onleft>999981</onleft>
                 
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index c7e9b9d..15f4344 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -165,7 +165,7 @@
                     <posx>0</posx>
                     <posy>9-row</posy>
                     <font>textbox</font>
-                    <width>564</width>
+                    <width>552</width>
                     <align>left</align>
                     <textcolor>textActive</textcolor>
                     <height>314</height>
@@ -238,10 +238,16 @@
                 </focusedlayout>
                 <content>
                     <item>
-                        <description>Previous</description>
-                        <label2></label2>
+                        <description>Vol Down</description>
+                        <label2></label2>
                         <thumb></thumb>
-                        <onclick>PlayerControl(previous)</onclick>
+                        <onclick>VolumeDown</onclick>
+                    </item>
+                    <item>
+                        <description>Vol Up</description>
+                        <label2></label2>
+                        <thumb></thumb>
+                        <onclick>VolumeUp</onclick>
                     </item>
                     <item>
                         <description>Rewind</description>
@@ -276,12 +282,7 @@
                         <thumb></thumb>
                         <onclick>PlayerControl(forward)</onclick>
                     </item>
-                    <item>
-                        <description>Next Chapter</description>
-                        <label2></label2>
-                        <thumb></thumb>
-                        <onclick>PlayerControl(next)</onclick>
-                    </item>
+                    
                     <item>
                         <visible>PVR.CanRecordPlayingChannel</visible>
                         <label2></label2>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index b0691c3..00265e2 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -95,6 +95,19 @@
 						<label>[B]$INFO[MusicPlayer.artist][/B][CR]$INFO[MusicPlayer.Album,, ]$INFO[MusicPlayer.year,(,)]</label>
 						<shadowcolor>99000000</shadowcolor>
 					</control>
+					<control type="label">
+                        <visible>Pvr.IsPlayingRadio</visible>
+						<posx>4-col</posx>
+						<posy>112</posy>
+						<width>16-col</width>
+						<height>3-row</height>
+						<align>center</align>
+						<font>buttonTitle</font>
+						<textcolor>textActive</textcolor>
+						<scroll>true</scroll>
+						<label>[B]$INFO[MusicPlayer.channelname][/B]</label>
+						<shadowcolor>99000000</shadowcolor>
+					</control>
 					<control type="progress">
 		                <description>Progress Bar</description>
 		                <posx>9-col</posx>