diff --git a/720p/DialogSelect.xml b/720p/DialogSelect.xml
index 2e436a8..ff39f69 100644
--- a/720p/DialogSelect.xml
+++ b/720p/DialogSelect.xml
@@ -1,330 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog">
 	<defaultcontrol always="true">3</defaultcontrol>
-	<coordinates>
-		<left>235</left>
-		<top>75</top>
-	</coordinates>
 	<include>dialogeffect</include>
 	<depth>DepthDialog+</depth>
 	<controls>
-		<control type="group">
-			<animation effect="slide" start="0,0" end="0,46" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,4)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,2)]">Conditional</animation>
-			<animation effect="slide" start="0,0" end="0,46" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,6)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,3)]">Conditional</animation>
-			<animation effect="slide" start="0,0" end="0,46" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,4)]">Conditional</animation>
-			<control type="image">
-				<description>background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>850</width>
-				<height>550</height>
-				<texture border="40">$VAR[SelectBack]</texture>
-				<visible>[Control.IsVisible(3) + Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + Integer.IsGreater(Container(6).NumItems,4)]</visible>
-			</control>
-			<control type="image">
-				<description>background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>850</width>
-				<height>458</height>
-				<texture border="40">$VAR[SelectBack]</texture>
-				<visible>[Control.IsVisible(3) + Integer.IsGreater(Container(3).NumItems,6) + !Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + Integer.IsGreater(Container(6).NumItems,3) + !Integer.IsGreater(Container(6).NumItems,4)]</visible>
-			</control>
-			<control type="image">
-				<description>background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>850</width>
-				<height>366</height>
-				<texture border="40">$VAR[SelectBack]</texture>
-				<visible>[Control.IsVisible(3) + Integer.IsGreater(Container(3).NumItems,4) + !Integer.IsGreater(Container(3).NumItems,6)] | [Control.IsVisible(6) + Integer.IsGreater(Container(6).NumItems,2) + !Integer.IsGreater(Container(6).NumItems,3)]</visible>
-			</control>
-			<control type="image">
-				<description>background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>850</width>
-				<height>274</height>
-				<texture border="40">$VAR[SelectBack]</texture>
-				<visible>[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,4)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,2)]</visible>
-			</control>
-			<control type="image">
-				<description>Dialog Header image</description>
-				<left>40</left>
-				<top>16</top>
-				<width>770</width>
-				<height>40</height>
-				<texture>dialogheader.png</texture>
-			</control>
-			<control type="label" id="1">
-				<description>header label</description>
-				<left>40</left>
-				<top>20</top>
-				<width>770</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>$LOCALIZE[13406]</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>selected</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label" id="4">
-				<description>No Settings Label</description>
-				<left>20</left>
-				<top>120</top>
-				<width>550</width>
-				<align>center</align>
-				<font>font13</font>
-			</control>
-			<control type="button">
-				<description>Close Window button</description>
-				<left>760</left>
-				<top>15</top>
-				<width>64</width>
-				<height>32</height>
-				<label></label>
-				<font></font>
-				<onclick>PreviousMenu</onclick>
-				<texturefocus>DialogCloseButton-focus.png</texturefocus>
-				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<visible>system.getbool(input.enablemouse)</visible>
-			</control>
-			<control type="list" id="3">
-				<left>20</left>
-				<top>67</top>
-				<width>550</width>
-				<height>460</height>
-				<onup>3</onup>
-				<ondown>3</ondown>
-				<onleft>7</onleft>
-				<onright>61</onright>
-				<pagecontrol>61</pagecontrol>
-				<scrolltime>200</scrolltime>
-				<itemlayout height="46" width="550">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>550</width>
-						<height>40</height>
-						<texture border="5">button-nofocus.png</texture>
-					</control>
-					<control type="label">
-						<left>20</left>
-						<top>0</top>
-						<width>510</width>
-						<height>40</height>
-						<font>font13</font>
-						<textcolor>grey2</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-					</control>
-				</itemlayout>
-				<focusedlayout height="46" width="550">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>550</width>
-						<height>40</height>
-						<texture border="5">button-nofocus.png</texture>
-						<visible>!Control.HasFocus(3)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>550</width>
-						<height>40</height>
-						<texture border="5">button-focus2.png</texture>
-						<visible>Control.HasFocus(3)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="label">
-						<left>20</left>
-						<top>0</top>
-						<width>510</width>
-						<height>40</height>
-						<font>font13</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-					</control>
-				</focusedlayout>
-			</control>
-			<control type="list" id="6">
-				<left>20</left>
-				<top>67</top>
-				<width>550</width>
-				<height>460</height>
-				<onup>6</onup>
-				<ondown>6</ondown>
-				<onleft>7</onleft>
-				<onright>61</onright>
-				<pagecontrol>61</pagecontrol>
-				<scrolltime>200</scrolltime>
-				<itemlayout height="92" width="550">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>550</width>
-						<height>86</height>
-						<texture border="5">button-nofocus.png</texture>
-					</control>
-					<control type="image">
-						<left>2</left>
-						<top>3</top>
-						<width>80</width>
-						<height>80</height>
-						<texture>$INFO[Listitem.Icon]</texture>
-						<aspectratio>keep</aspectratio>
-						<bordertexture border="3">black-back2.png</bordertexture>
-						<bordersize>2</bordersize>
-					</control>
-					<control type="label">
-						<left>90</left>
-						<top>2</top>
-						<width>450</width>
-						<height>30</height>
-						<font>font13</font>
-						<textcolor>grey</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
-						<aligny>center</aligny>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-					</control>
-					<control type="textbox">
-						<left>90</left>
-						<top>34</top>
-						<width>450</width>
-						<height>48</height>
-						<font>font12</font>
-						<textcolor>grey</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
-						<label>$INFO[ListItem.Label2]</label>
-					</control>
-				</itemlayout>
-				<focusedlayout height="92" width="550">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>550</width>
-						<height>86</height>
-						<texture border="5">button-nofocus.png</texture>
-						<visible>!Control.HasFocus(6)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>550</width>
-						<height>86</height>
-						<texture border="5">button-focus2.png</texture>
-						<visible>Control.HasFocus(6)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="image">
-						<left>2</left>
-						<top>3</top>
-						<width>80</width>
-						<height>80</height>
-						<texture>$INFO[Listitem.Icon]</texture>
-						<aspectratio>keep</aspectratio>
-						<bordertexture border="3">black-back2.png</bordertexture>
-						<bordersize>2</bordersize>
-					</control>
-					<control type="label">
-						<left>90</left>
-						<top>2</top>
-						<width>450</width>
-						<height>30</height>
-						<font>font13</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
-						<aligny>center</aligny>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-					</control>
-					<control type="textbox">
-						<left>90</left>
-						<top>34</top>
-						<width>450</width>
-						<height>48</height>
-						<font>font12</font>
-						<textcolor>grey</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
-						<label>$INFO[ListItem.Label2]</label>
-					</control>
-				</focusedlayout>
-			</control>
-			<control type="scrollbar" id="61">
-				<left>570</left>
-				<top>65</top>
-				<width>25</width>
-				<height>464</height>
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-				<textureslidernib>ScrollBarNib.png</textureslidernib>
-				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-				<onleft condition="Control.IsVisible(3)">3</onleft>
-				<onleft condition="Control.IsVisible(6)">6</onleft>
-				<onright>90</onright>
-				<ondown>61</ondown>
-				<onup>61</onup>
-				<showonepage>false</showonepage>
-				<orientation>vertical</orientation>
-			</control>
-			<control type="group">
-				<control type="label">
-					<description>number of files/pages in list text label</description>
-					<left>592</left>
-					<top>490</top>
-					<width>240</width>
-					<height>35</height>
-					<font>font12</font>
-					<align>center</align>
-					<aligny>center</aligny>
-					<textcolor>grey</textcolor>
-					<label>$VAR[SelectLabel]</label>
-					<animation effect="slide" start="0,0" end="0,-92" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,4)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,2)]">Conditional</animation>
-					<animation effect="slide" start="0,0" end="0,-92" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,6)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,3)]">Conditional</animation>
-					<animation effect="slide" start="0,0" end="0,-92" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,4)]">Conditional</animation>
-				</control>
-				<control type="grouplist" id="90">
-					<left>612</left>
-					<top>100</top>
-					<onleft condition="Control.IsVisible(3)">3</onleft>
-					<onleft condition="Control.IsVisible(6)">6</onleft>
-					<onright condition="Control.IsVisible(3)">3</onright>
-					<onright condition="Control.IsVisible(6)">6</onright>
-					<control type="button" id="5">
-						<description>Manual button</description>
-						<width>200</width>
-						<height>40</height>
-						<label></label>
-						<font>font12_title</font>
-						<textcolor>white</textcolor>
-						<focusedcolor>white</focusedcolor>
-						<align>center</align>
-					</control>
-					<control type="button" id="7">
-						<description>Cancel button</description>
-						<width>200</width>
-						<height>40</height>
-						<label></label>
-						<font>font12_title</font>
-						<textcolor>white</textcolor>
-						<focusedcolor>white</focusedcolor>
-						<align>center</align>
-					</control>
-				</control>
-			</control>
-		</control>
+		<include condition="Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter)">GameDialogSelectLayout</include>
+		<include condition="![Window.IsActive(gameviewmode) | Window.IsActive(gamevideofilter)]">DefaultDialogSelectLayout</include>
 	</controls>
 </window>
diff --git a/720p/GameOSD.xml b/720p/GameOSD.xml
index 1763981..402b558 100644
--- a/720p/GameOSD.xml
+++ b/720p/GameOSD.xml
@@ -4,127 +4,142 @@
 	<include>dialogeffect</include>
 	<coordinates>
 		<left>470</left>
-		<top>229</top>
+		<top>208</top>
 	</coordinates>
 	<controls>
-		<control type="image">
-			<description>background image</description>
-			<left>0</left>
-			<top>0</top>
-			<width>340</width>
-			<height>302</height>
-			<texture border="20">DialogBack.png</texture>
-		</control>
-		<control type="image">
-			<description>Dialog Header image</description>
-			<left>40</left>
-			<top>16</top>
-			<width>260</width>
-			<height>40</height>
-			<texture>dialogheader.png</texture>
-		</control>
-		<control type="label">
-			<description>header label</description>
-			<left>40</left>
-			<top>20</top>
-			<width>260</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[35221]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>selected</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-		<control type="grouplist" id="1000">
-			<description>grouplist for buttons</description>
-			<left>20</left>
-			<top>70</top>
-			<width>300</width>
-			<height>212</height>
-			<itemgap>4</itemgap>
-			<control type="button" id="1001">
-				<description>Resume button</description>
-				<width>300</width>
-				<height>38</height>
-				<font>fontContextMenu</font>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>$LOCALIZE[13404]</label>
-				<label2>Select + X</label2>
-				<onclick>Play</onclick>
+		<control type="group">
+			<visible>!Window.IsActive(GameVideoFilter) + !Window.IsActive(GameViewMode) + !Window.IsActive(GameControllers)</visible>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>340</width>
+				<height>344</height>
+				<texture border="20">DialogBack.png</texture>
 			</control>
-			<control type="button" id="1002">
-				<description>Reset button</description>
-				<width>300</width>
-				<height>38</height>
-				<font>fontContextMenu</font>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>$LOCALIZE[10035]</label>
-				<label2>Select + B</label2>
-				<onclick>PlayerControl(Reset)</onclick>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<left>40</left>
+				<top>16</top>
+				<width>260</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
 			</control>
-			<control type="button" id="1003">
-				<description>Stop button</description>
-				<width>300</width>
-				<height>38</height>
-				<font>fontContextMenu</font>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>$LOCALIZE[35222]</label>
-				<label2>Select + Start</label2>
-				<onclick>Stop</onclick>
-			</control>
-			<control type="image" id="1004">
-				<description>separator image</description>
-				<height>2</height>
-				<texture>separator2.png</texture>
-			</control>
-			<control type="button" id="1005">
-				<description>Video settings button</description>
-				<width>300</width>
-				<height>38</height>
-				<font>fontContextMenu</font>
+			<control type="label">
+				<description>header label</description>
+				<left>40</left>
+				<top>20</top>
+				<width>260</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[35221]</label>
 				<align>center</align>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>$LOCALIZE[13395]</label>
-				<onclick>ActivateWindow(gamevideosettings)</onclick>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
-			<control type="button" id="1006">
-				<description>Input settings button</description>
+			<control type="grouplist" id="1000">
+				<description>grouplist for buttons</description>
+				<left>20</left>
+				<top>70</top>
 				<width>300</width>
-				<height>38</height>
-				<font>fontContextMenu</font>
-				<align>center</align>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>$LOCALIZE[35223]</label>
-				<onclick>ActivateWindow(gamecontrollers)</onclick>
+				<height>254</height>
+				<itemgap>4</itemgap>
+				<control type="button" id="1001">
+					<description>Resume button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[13404]</label>
+					<label2>Select + X</label2>
+					<onclick>Play</onclick>
+				</control>
+				<control type="button" id="1002">
+					<description>Reset button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[10035]</label>
+					<label2>Select + B</label2>
+					<onclick>PlayerControl(Reset)</onclick>
+				</control>
+				<control type="button" id="1003">
+					<description>Stop button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[35222]</label>
+					<label2>Select + Start</label2>
+					<onclick>Stop</onclick>
+				</control>
+				<control type="image" id="1004">
+					<description>separator image</description>
+					<height>2</height>
+					<texture>separator2.png</texture>
+				</control>
+				<control type="button" id="1005">
+					<description>Video filter button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<align>center</align>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[230]</label>
+					<onclick>ActivateWindow(GameVideoFilter)</onclick>
+				</control>
+				<control type="button" id="1006">
+					<description>View mode button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<align>center</align>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[629]</label>
+					<onclick>ActivateWindow(GameViewMode)</onclick>
+				</control>
+				<control type="button" id="1007">
+					<description>Input settings button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<align>center</align>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[35223]</label>
+					<onclick>ActivateWindow(gamecontrollers)</onclick>
+				</control>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<left>260</left>
+				<top>5</top>
+				<width>64</width>
+				<height>32</height>
+				<label/>
+				<font/>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>2</onleft>
+				<onright>2</onright>
+				<onup>2</onup>
+				<ondown>2</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
-		</control>
-		<control type="button">
-			<description>Close Window button</description>
-			<left>260</left>
-			<top>5</top>
-			<width>64</width>
-			<height>32</height>
-			<label/>
-			<font/>
-			<onclick>PreviousMenu</onclick>
-			<texturefocus>DialogCloseButton-focus.png</texturefocus>
-			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>2</onleft>
-			<onright>2</onright>
-			<onup>2</onup>
-			<ondown>2</ondown>
-			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
 	</controls>
-</window>
+</window>
\ No newline at end of file
diff --git a/720p/Includes.xml b/720p/Includes.xml
index cb52516..ce8e6d6 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 	<include file="Defaults.xml" />
+	<include file="Includes_DialogSelect.xml" />
 	<include file="ViewsVideoLibrary.xml" />
 	<include file="ViewsMusicLibrary.xml" />
 	<include file="ViewsFileMode.xml" />
@@ -38,6 +39,10 @@
 	<constant name="DepthFloor">-0.20</constant>
 	<constant name="DepthSideBlade">0.15</constant>
 	<!-- VARIABLES -->
+	<variable name="GameSelectHeader">
+		<value condition="Window.IsActive(gamevideofilter)">$LOCALIZE[230]</value>
+		<value condition="Window.IsActive(gameviewmode)">$LOCALIZE[629]</value>
+	</variable>
 	<variable name="DurationInMinutes">
 		<value condition="String.StartsWith(ListItem.Duration,01:00:)">60 $LOCALIZE[12391]</value>
 		<value condition="String.StartsWith(ListItem.Duration,01:01:)">61 $LOCALIZE[12391]</value>
diff --git a/720p/Includes_DialogSelect.xml b/720p/Includes_DialogSelect.xml
new file mode 100644
index 0000000..1fc7076
--- /dev/null
+++ b/720p/Includes_DialogSelect.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+	<include name="DefaultDialogSelectLayout">
+		<control type="group">
+			<left>235</left>
+			<top>75</top>
+			<animation effect="slide" start="0,0" end="0,46" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,4)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,2)]">Conditional</animation>
+			<animation effect="slide" start="0,0" end="0,46" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,6)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,3)]">Conditional</animation>
+			<animation effect="slide" start="0,0" end="0,46" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,4)]">Conditional</animation>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>850</width>
+				<height>550</height>
+				<texture border="40">$VAR[SelectBack]</texture>
+				<visible>[Control.IsVisible(3) + Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + Integer.IsGreater(Container(6).NumItems,4)]</visible>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>850</width>
+				<height>458</height>
+				<texture border="40">$VAR[SelectBack]</texture>
+				<visible>[Control.IsVisible(3) + Integer.IsGreater(Container(3).NumItems,6) + !Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + Integer.IsGreater(Container(6).NumItems,3) + !Integer.IsGreater(Container(6).NumItems,4)]</visible>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>850</width>
+				<height>366</height>
+				<texture border="40">$VAR[SelectBack]</texture>
+				<visible>[Control.IsVisible(3) + Integer.IsGreater(Container(3).NumItems,4) + !Integer.IsGreater(Container(3).NumItems,6)] | [Control.IsVisible(6) + Integer.IsGreater(Container(6).NumItems,2) + !Integer.IsGreater(Container(6).NumItems,3)]</visible>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>850</width>
+				<height>274</height>
+				<texture border="40">$VAR[SelectBack]</texture>
+				<visible>[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,4)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,2)]</visible>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<left>40</left>
+				<top>16</top>
+				<width>770</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label" id="1">
+				<description>header label</description>
+				<left>40</left>
+				<top>20</top>
+				<width>770</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[13406]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="label" id="4">
+				<description>No Settings Label</description>
+				<left>20</left>
+				<top>120</top>
+				<width>550</width>
+				<align>center</align>
+				<font>font13</font>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<left>760</left>
+				<top>15</top>
+				<width>64</width>
+				<height>32</height>
+				<label/>
+				<font/>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
+			<control type="list" id="3">
+				<left>20</left>
+				<top>67</top>
+				<width>550</width>
+				<height>460</height>
+				<onup>3</onup>
+				<ondown>3</ondown>
+				<onleft>7</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<itemlayout height="46" width="550">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="label">
+						<left>20</left>
+						<top>0</top>
+						<width>510</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="46" width="550">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(3)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>40</height>
+						<texture border="5">button-focus2.png</texture>
+						<visible>Control.HasFocus(3)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<left>20</left>
+						<top>0</top>
+						<width>510</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+				</focusedlayout>
+			</control>
+			<control type="list" id="6">
+				<left>20</left>
+				<top>67</top>
+				<width>550</width>
+				<height>460</height>
+				<onup>6</onup>
+				<ondown>6</ondown>
+				<onleft>7</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<itemlayout height="92" width="550">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>86</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="image">
+						<left>2</left>
+						<top>3</top>
+						<width>80</width>
+						<height>80</height>
+						<texture>$INFO[Listitem.Icon]</texture>
+						<aspectratio>keep</aspectratio>
+						<bordertexture border="3">black-back2.png</bordertexture>
+						<bordersize>2</bordersize>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>2</top>
+						<width>450</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[B]$INFO[ListItem.Label][/B]</label>
+					</control>
+					<control type="textbox">
+						<left>90</left>
+						<top>34</top>
+						<width>450</width>
+						<height>48</height>
+						<font>font12</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="92" width="550">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>86</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(6)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>86</height>
+						<texture border="5">button-focus2.png</texture>
+						<visible>Control.HasFocus(6)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>2</left>
+						<top>3</top>
+						<width>80</width>
+						<height>80</height>
+						<texture>$INFO[Listitem.Icon]</texture>
+						<aspectratio>keep</aspectratio>
+						<bordertexture border="3">black-back2.png</bordertexture>
+						<bordersize>2</bordersize>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>2</top>
+						<width>450</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[B]$INFO[ListItem.Label][/B]</label>
+					</control>
+					<control type="textbox">
+						<left>90</left>
+						<top>34</top>
+						<width>450</width>
+						<height>48</height>
+						<font>font12</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+				</focusedlayout>
+			</control>
+			<control type="scrollbar" id="61">
+				<left>570</left>
+				<top>65</top>
+				<width>25</width>
+				<height>464</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft condition="Control.IsVisible(3)">3</onleft>
+				<onleft condition="Control.IsVisible(6)">6</onleft>
+				<onright>90</onright>
+				<ondown>61</ondown>
+				<onup>61</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="group">
+				<control type="label">
+					<description>number of files/pages in list text label</description>
+					<left>592</left>
+					<top>490</top>
+					<width>240</width>
+					<height>35</height>
+					<font>font12</font>
+					<align>center</align>
+					<aligny>center</aligny>
+					<textcolor>grey</textcolor>
+					<label>$VAR[SelectLabel]</label>
+					<animation effect="slide" start="0,0" end="0,-92" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,4)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,2)]">Conditional</animation>
+					<animation effect="slide" start="0,0" end="0,-92" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,6)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,3)]">Conditional</animation>
+					<animation effect="slide" start="0,0" end="0,-92" time="0" condition="[Control.IsVisible(3) + !Integer.IsGreater(Container(3).NumItems,8)] | [Control.IsVisible(6) + !Integer.IsGreater(Container(6).NumItems,4)]">Conditional</animation>
+				</control>
+				<control type="grouplist" id="90">
+					<left>612</left>
+					<top>100</top>
+					<onleft condition="Control.IsVisible(3)">3</onleft>
+					<onleft condition="Control.IsVisible(6)">6</onleft>
+					<onright condition="Control.IsVisible(3)">3</onright>
+					<onright condition="Control.IsVisible(6)">6</onright>
+					<control type="button" id="5">
+						<description>Manual button</description>
+						<width>200</width>
+						<height>40</height>
+						<label/>
+						<font>font12_title</font>
+						<textcolor>white</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<align>center</align>
+					</control>
+					<control type="button" id="7">
+						<description>Cancel button</description>
+						<width>200</width>
+						<height>40</height>
+						<label/>
+						<font>font12_title</font>
+						<textcolor>white</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<align>center</align>
+					</control>
+				</control>
+			</control>
+		</control>
+	</include>
+	<include name="GameDialogSelectLayout">
+		<control type="group">
+			<left>20</left>
+			<top>408</top>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>1240</width>
+				<height>302</height>
+				<texture border="40">DialogBack2.png</texture>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<left>40</left>
+				<top>16</top>
+				<width>1240</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<left>40</left>
+				<top>20</top>
+				<width>1240</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$VAR[GameSelectHeader]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<left>1154</left>
+				<top>15</top>
+				<width>64</width>
+				<height>32</height>
+				<label/>
+				<font/>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>3</onleft>
+				<onright>3</onright>
+				<onup>3</onup>
+				<ondown>3</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
+			<control type="panel" id="11">
+				<left>20</left>
+				<top>65</top>
+				<width>1200</width>
+				<height>215</height>
+				<onleft>11</onleft>
+				<onright>11</onright>
+				<ondown>noop</ondown>
+				<onup>noop</onup>
+				<scrolltime>200</scrolltime>
+				<viewtype label="536">icon</viewtype>
+				<orientation>horizontal</orientation>
+				<pagecontrol/>
+				<orientation>vertical</orientation>
+				<itemlayout height="215" width="240">
+					<control type="image">
+						<left>2</left>
+						<top>2</top>
+						<width>235</width>
+						<height>211</height>
+						<texture border="3">button-nofocus.png</texture>
+					</control>
+					<control type="gamewindow">
+						<left>7</left>
+						<top>20</top>
+						<width>220</width>
+						<height>150</height>
+						<viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
+						<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
+					</control>
+					<control type="label">
+						<left>7</left>
+						<top>185</top>
+						<width>226</width>
+						<height>15</height>
+						<font>font12</font>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]$INFO[ListItem.Label2, (,)]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="215" width="240">
+					<control type="image">
+						<left>2</left>
+						<top>2</top>
+						<width>235</width>
+						<height>211</height>
+						<texture border="3">folder-focus.png</texture>
+					</control>
+					<control type="gamewindow">
+						<left>7</left>
+						<top>20</top>
+						<width>220</width>
+						<height>150</height>
+						<viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
+						<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
+					</control>
+					<control type="label">
+						<left>7</left>
+						<top>185</top>
+						<width>226</width>
+						<height>15</height>
+						<font>font12</font>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]$INFO[ListItem.Label2, (,)]</label>
+					</control>
+				</focusedlayout>
+			</control>
+		</control>
+	</include>
+</includes>
diff --git a/addon.xml b/addon.xml
index 1f1fde8..7e37c19 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.1.43" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.1.44" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>
@@ -145,6 +145,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>Added Game OSD dialog</news>
+		<news>Updated Game dialogs</news>
 	</extension>
 </addon>