diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 295bac9..581a262 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -61,19 +61,28 @@
                 <font>textbox</font>
                 <width>24-col</width>
                 <textcolor>textActive</textcolor>
-                <height>76</height>
+                <height>114</height>
                 <label fallback="31205">$INFO[videoplayer.plot]</label>
                 <autoscroll delay="10000" time="1000" repeat="10000"/>
             </control>
             <!--options-->
             <control type="list" id="8001">
-                <posx>col-1-begin</posx>
-                <posy>1006</posy>
+                <posx>col-21-begin</posx>
+                <posy>0</posy>
                 <width>24-col</width>
                 <height>8-row</height>
                 <itemgap>0</itemgap>
                 <orientation>horizontal</orientation>
                 <itemlayout width="1-col" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>textboxInactive</colordiffuse>
+                    </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -86,7 +95,7 @@
                         <label>$INFO[ListItem.label2]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="2-row">
+                <focusedlayout width="1-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -95,15 +104,6 @@
                         <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>3-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
                         <posx>0</posx>
@@ -117,17 +117,6 @@
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
-                    <control type="label">
-                        <posx>1-col-indent</posx>
-                        <posy>-1</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>
@@ -147,22 +136,15 @@
                     </item>
                     <item>
                         <description>Audio Settings</description>
-                        <label>292</label>
+                        <label>5</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(124)</onclick>
                     </item>
-                    <item>
-                        <description>Video Settings</description>
-                        <label>444</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>ActivateWindow(123)</onclick>
-                    </item>
                     <item>
                         <description>Bookmarks</description>
                         <label>298</label>
-                        <label2></label2>
+                        <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(125)</onclick>
                     </item>
diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml
index 62f0be5..e2139e1 100644
--- a/1080i/VideoOSDSettings.xml
+++ b/1080i/VideoOSDSettings.xml
@@ -25,36 +25,84 @@
                 <aspectratio>stretch</aspectratio>
                 <colordiffuse>ccFFFFFF</colordiffuse>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
+
+            <!--audio / video options selection-->
+            <control type="panel" id="9123">
+                <posx>24</posx>
+                <posy>-24</posy>
                 <width>12-col</width>
                 <height>2-row</height>
+                <ondown>5</ondown>
+                <orientation>horizontal</orientation>
+                <itemlayout width="4-col" height="2-row">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col</width>
+                        <height>2-row</height>
+                        <font>buttonTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>[B]$INFO[ListItem.label][/B]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="4-col" height="78">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>62</posy>
+                        <width>4-col-gutter</width>
+                        <height>9</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                        <animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col</width>
+                        <height>2-row</height>
+                        <font>buttonTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>[B]$INFO[ListItem.label][/B]</label>
+                    </control>
+                </focusedlayout>
+                <content>
+                    <item id="1">
+                        <label>$LOCALIZE[292] $LOCALIZE[5]</label>
+                        <onclick>Dialog.close(all,True)</onclick>
+                        <onclick>ActivateWindow(124)</onclick>
+                    </item>
+                    <item id="2">
+                        <label>$LOCALIZE[3] $LOCALIZE[5]</label>
+                        <onclick>Dialog.close(all,True)</onclick>
+                        <onclick>ActivateWindow(123)</onclick>
+                    </item>
+                </content>
+            </control>
+            <!--current page marker-->
+            <control type="image">
+                <visible>window.isactive(124) + !control.hasfocus(9123)</visible>
+                <posx>24</posx>
+                <posy>38</posy>
+                <width>4-col-gutter</width>
+                <height>9</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="label">
-                <visible>Window.IsVisible(123)</visible>
-                <posx>24</posx>
-                <posy>0</posy>
-                <width>16-col</width>
-                <height>2-row</height>
-                <aligny>center</aligny>
-                <font>dialogTitle</font>
-                <label>$LOCALIZE[3] $LOCALIZE[5]</label>
-                <textcolor>textActive</textcolor>
-            </control>
-            <control type="label">
-                <visible>Window.IsVisible(124)</visible>
-                <posx>24</posx>
-                <posy>0</posy>
-                <width>16-col</width>
-                <height>2-row</height>
-                <aligny>center</aligny>
-                <font>dialogTitle</font>
-                <textcolor>textActive</textcolor>
-                <label>$LOCALIZE[292] $LOCALIZE[5]</label>
+            <control type="image">
+                <visible>window.isactive(123) + !control.hasfocus(9123)</visible>
+                <posx>312</posx>
+                <posy>38</posy>
+                <width>4-col-gutter</width>
+                <height>9</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
             <control type="grouplist" id="5">
                 <description>Control Area</description>
@@ -64,6 +112,7 @@
                 <height>21-row</height>
                 <orientation>vertical</orientation>
                 <itemgap>3</itemgap>
+                <onup>9123</onup>
             </control>
             <control type="button" id="7">
                 <description>Default Button</description>