From c3e3d2a6575018ea69d362778bc57c84bad3f0d5 Mon Sep 17 00:00:00 2001
From: HitcherUK <HitcherUK@gmail.com>
Date: Mon, 7 Mar 2016 17:44:24 +0000
Subject: [PATCH] [skin.confluence] v3.0.2

Merged setting dialogs into DialogSettings
---
 720p/DialogAudioDSPSettings.xml   | 244 ------------------------------
 720p/DialogContentSettings.xml    | 127 ----------------
 720p/DialogMediaFilter.xml        | 145 ------------------
 720p/DialogNetworkSetup.xml       | 166 --------------------
 720p/DialogPVRTimerSettings.xml   | 130 ----------------
 720p/DialogPeripheralSettings.xml | 159 -------------------
 720p/DialogSettings.xml           | 158 +++++++++++++++++++
 720p/LockSettings.xml             | 112 --------------
 720p/ProfileSettings.xml          | 162 --------------------
 720p/VideoOSDSettings.xml         | 148 ------------------
 addon.xml                         |   2 +-
 changelog.txt                     |   4 +
 12 files changed, 163 insertions(+), 1394 deletions(-)
 delete mode 100644 720p/DialogAudioDSPSettings.xml
 delete mode 100644 720p/DialogContentSettings.xml
 delete mode 100644 720p/DialogMediaFilter.xml
 delete mode 100644 720p/DialogNetworkSetup.xml
 delete mode 100644 720p/DialogPVRTimerSettings.xml
 delete mode 100644 720p/DialogPeripheralSettings.xml
 create mode 100644 720p/DialogSettings.xml
 delete mode 100644 720p/LockSettings.xml
 delete mode 100644 720p/ProfileSettings.xml
 delete mode 100644 720p/VideoOSDSettings.xml

diff --git a/720p/DialogAudioDSPSettings.xml b/720p/DialogAudioDSPSettings.xml
deleted file mode 100644
index 95fa7c4..0000000
--- a/720p/DialogAudioDSPSettings.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol>5</defaultcontrol>
-	<coordinates>
-		<left>240</left>
-		<top>60</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<control type="group">
-			<animation effect="fade" start="100" end="0" time="400" condition="Window.IsVisible(SliderDialog)">Conditional</animation>
-			<control type="image">
-				<description>background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>800</width>
-				<height>600</height>
-				<texture border="40">DialogBack2.png</texture>
-			</control>
-			<control type="image">
-				<description>Dialog Header image</description>
-				<left>40</left>
-				<top>16</top>
-				<width>720</width>
-				<height>40</height>
-				<texture>dialogheader.png</texture>
-			</control>
-			<control type="label" id="2">
-				<description>header label</description>
-				<left>40</left>
-				<top>20</top>
-				<width>720</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>-</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>selected</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="button">
-				<description>Close Window button</description>
-				<left>710</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="grouplist" id="5">
-				<description>control area</description>
-				<left>40</left>
-				<top>65</top>
-				<width>520</width>
-				<height>470</height>
-				<itemgap>5</itemgap>
-				<pagecontrol>60</pagecontrol>
-				<onleft>60</onleft>
-				<onright>60</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-			<control type="scrollbar" id="60">
-				<left>560</left>
-				<top>65</top>
-				<width>25</width>
-				<height>470</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>5</onleft>
-				<onright>5</onright>
-				<ondown>61</ondown>
-				<onup>61</onup>
-				<showonepage>false</showonepage>
-				<orientation>vertical</orientation>
-			</control>
-			<control type="label">
-				<description>info label</description>
-				<left>40</left>
-				<top>540</top>
-				<width>720</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>$INFO[ADSP.MasterInfo]</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>selected</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="image">
-				<description>Audio DSP Image</description>
-				<left>555</left>
-				<top>540</top>
-				<width>85</width>
-				<height>35</height>
-				<aspectratio align="center">keep</aspectratio>
-				<visible>!IsEmpty(ADSP.MasterOwnIcon)</visible>
-				<texture>$INFO[ADSP.MasterOwnIcon]</texture>
-			</control>
-			<control type="image">
-				<description>Audio Codec Image</description>
-				<left>640</left>
-				<top>540</top>
-				<width>85</width>
-				<height>35</height>
-				<aspectratio align="center">keep</aspectratio>
-				<texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
-				<visible>IsEmpty(ADSP.MasterOverrideIcon) + Player.HasVideo</visible>
-			</control>
-			<control type="image">
-				<description>Audio Codec Image</description>
-				<left>640</left>
-				<top>540</top>
-				<width>85</width>
-				<height>35</height>
-				<aspectratio align="center">keep</aspectratio>
-				<texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
-				<visible>IsEmpty(ADSP.MasterOverrideIcon) + Player.HasAudio</visible>
-			</control>
-			<control type="image">
-				<description>Audio Codec Override Image</description>
-				<left>640</left>
-				<top>540</top>
-				<width>85</width>
-				<height>35</height>
-				<aspectratio align="center">keep</aspectratio>
-				<visible>!IsEmpty(ADSP.MasterOverrideIcon)</visible>
-				<texture>$INFO[ADSP.MasterOverrideIcon]</texture>
-			</control>
-			<control type="image">
-				<description>Audio Channels Image</description>
-				<left>730</left>
-				<top>540</top>
-				<width>50</width>
-				<height>35</height>
-				<aspectratio align="center">keep</aspectratio>
-				<texture>$INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]</texture>
-			</control>
-			<control type="label">
-				<description>type label</description>
-				<left>590</left>
-				<top>65</top>
-				<width>720</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>15042</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>grey2</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<description>type label</description>
-				<left>590</left>
-				<top>100</top>
-				<width>230</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>$INFO[ADSP.DetectedStreamType]</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>selected</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="image" id="11">
-			<description>separator image</description>
-			<height>2</height>
-			<texture>separator2.png</texture>
-		</control>
-		<control type="edit" id="12">
-			<description>Default Edit</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="sliderex" id="13">
-			<description>Default Slider</description>
-			<height>40</height>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<left>0</left>
-			<top>0</top>
-			<height>30</height>
-			<label>-</label>
-			<align>center</align>
-			<aligny>bottom</aligny>
-			<font>font13_title</font>
-			<textcolor>grey</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogContentSettings.xml b/720p/DialogContentSettings.xml
deleted file mode 100644
index a252194..0000000
--- a/720p/DialogContentSettings.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol always="true">20</defaultcontrol>
-	<coordinates>
-		<left>240</left>
-		<top>90</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<control type="group">
-			<animation effect="fade" start="100" end="0" time="150" condition="Window.IsActive(AddonSettings)">Conditional</animation>
-			<include name="DialogBackgroundCommons">
-				<param name="DialogBackgroundWidth" value="800" />
-				<param name="DialogBackgroundHeight" value="535" />
-				<param name="DialogHeaderWidth" value="720" />
-				<param name="DialogHeaderLabel" value="$LOCALIZE[20333]" />
-				<param name="DialogHeaderId" value="1" />
-				<param name="CloseButtonLeft" value="710" />
-				<param name="CloseButtonNav" value="10" />
-			</include>
-			<control type="button" id="20">
-				<description>Content Picker</description>
-				<left>30</left>
-				<top>60</top>
-				<width>740</width>
-				<height>40</height>
-				<onup>28</onup>
-				<ondown>21</ondown>
-				<font>font13</font>
-			</control>
-			<control type="button" id="21">
-				<description>Information Provider Button</description>
-				<left>30</left>
-				<top>105</top>
-				<width>740</width>
-				<height>40</height>
-				<onup>20</onup>
-				<ondown>22</ondown>
-				<font>font13</font>
-			</control>
-			<control type="button" id="22">
-				<description>Scraper Settings Button</description>
-				<left>30</left>
-				<top>150</top>
-				<width>740</width>
-				<height>40</height>
-				<label>- $LOCALIZE[5]</label>
-				<onup>21</onup>
-				<ondown>5</ondown>
-			</control>
-			<control type="label">
-				<description>Scanning Options Header</description>
-				<left>30</left>
-				<top>205</top>
-				<width>740</width>
-				<height>20</height>
-				<font>font12</font>
-				<label>$LOCALIZE[31314]</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>blue</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="grouplist" id="5">
-				<description>control area</description>
-				<left>30</left>
-				<top>235</top>
-				<width>740</width>
-				<height>220</height>
-				<itemgap>4</itemgap>
-				<onup>22</onup>
-				<ondown>28</ondown>
-				<onleft>5</onleft>
-				<onright>5</onright>
-			</control>
-			<control type="button" id="7">
-				<description>Default Button</description>
-				<left>0</left>
-				<top>0</top>
-				<height>40</height>
-				<font>font13</font>
-				<texturefocus border="5">button-focus2.png</texturefocus>
-			</control>
-			<control type="radiobutton" id="8">
-				<description>Default RadioButton</description>
-				<left>0</left>
-				<top>0</top>
-				<height>40</height>
-				<font>font13</font>
-				<texturefocus border="5">button-focus2.png</texturefocus>
-			</control>
-			<control type="group" id="9001">
-				<top>470</top>
-				<control type="button" id="28">
-					<description>OK Button</description>
-					<left>195</left>
-					<top>0</top>
-					<width>200</width>
-					<height>40</height>
-					<align>center</align>
-					<aligny>center</aligny>
-					<font>font12_title</font>
-					<label>186</label>
-					<onleft>29</onleft>
-					<onright>29</onright>
-					<onup>5</onup>
-					<ondown>20</ondown>
-				</control>
-				<control type="button" id="29">
-					<description>Cancel Button</description>
-					<left>405</left>
-					<top>0</top>
-					<width>200</width>
-					<height>40</height>
-					<align>center</align>
-					<aligny>center</aligny>
-					<font>font12_title</font>
-					<label>222</label>
-					<onleft>28</onleft>
-					<onright>28</onright>
-					<onup>5</onup>
-					<ondown>20</ondown>
-				</control>
-			</control>
-		</control>
-	</controls>
-</window>
\ No newline at end of file
diff --git a/720p/DialogMediaFilter.xml b/720p/DialogMediaFilter.xml
deleted file mode 100644
index 3c8fa41..0000000
--- a/720p/DialogMediaFilter.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol always="true">5</defaultcontrol>
-	<coordinates>
-		<left>240</left>
-		<top>100</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="800" />
-			<param name="DialogBackgroundHeight" value="500" />
-			<param name="DialogHeaderWidth" value="720" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[587]" />
-			<param name="DialogHeaderId" value="2" />
-			<param name="CloseButtonLeft" value="710" />
-			<param name="CloseButtonNav" value="10" />
-		</include>
-		<control type="grouplist" id="5">
-			<description>control area</description>
-			<left>30</left>
-			<top>70</top>
-			<width>720</width>
-			<height>350</height>
-			<itemgap>4</itemgap>
-			<pagecontrol>6</pagecontrol>
-			<onup>9001</onup>
-			<ondown>9001</ondown>
-			<onleft>9001</onleft>
-			<onright>6</onright>
-		</control>
-		<control type="scrollbar" id="6">
-			<left>755</left>
-			<top>70</top>
-			<width>25</width>
-			<height>350</height>
-			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-			<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-			<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-			<textureslidernib>ScrollBarNib.png</textureslidernib>
-			<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-			<onleft>5</onleft>
-			<onright>9001</onright>
-			<showonepage>false</showonepage>
-			<orientation>vertical</orientation>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<invalidcolor>invalid</invalidcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="sliderex" id="13">
-			<description>Default Slider</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<aligny>center</aligny>
-		</control>
-		<control type="edit" id="12">
-			<description>Default Edit</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="group" id="9001">
-			<left>190</left>
-			<top>435</top>
-			<control type="button" id="28">
-				<description>Ok Button</description>
-				<left>0</left>
-				<top>0</top>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>186</label>
-				<font>font12_title</font>
-				<onup>5</onup>
-				<onleft>27</onleft>
-				<onright>27</onright>
-				<ondown>5</ondown>
-			</control>
-			<control type="button" id="27">
-				<description>Clear Button</description>
-				<left>210</left>
-				<top>0</top>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>192</label>
-				<font>font12_title</font>
-				<onup>5</onup>
-				<onleft>28</onleft>
-				<onright>28</onright>
-				<ondown>5</ondown>
-			</control>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogNetworkSetup.xml b/720p/DialogNetworkSetup.xml
deleted file mode 100644
index ad05ae7..0000000
--- a/720p/DialogNetworkSetup.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol>10</defaultcontrol>
-	<coordinates>
-		<left>240</left>
-		<top>135</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="800" />
-			<param name="DialogBackgroundHeight" value="440" />
-			<param name="DialogHeaderWidth" value="720" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[1007]" />
-			<param name="DialogHeaderId" value="2" />
-			<param name="CloseButtonLeft" value="710" />
-			<param name="CloseButtonNav" value="10" />
-		</include>
-		<control type="spincontrolex" id="10">
-			<description>Protocol SpinControl</description>
-			<left>30</left>
-			<top>70</top>
-			<height>40</height>
-			<width>740</width>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<textcolor>white</textcolor>
-			<disabledcolor>grey3</disabledcolor>
-			<textoffsetx>12</textoffsetx>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-			<font>font13</font>
-			<label>1008</label>
-			<onup>18</onup>
-			<ondown>11</ondown>
-			<onleft>10</onleft>
-			<onright>10</onright>
-		</control>
-		<control type="edit" id="11">
-			<description>Server Address Button</description>
-			<left>30</left>
-			<top>115</top>
-			<width>565</width>
-			<height>40</height>
-			<textoffsetx>12</textoffsetx>
-			<aligny>center</aligny>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<label>-</label>
-			<onup>10</onup>
-			<onleft>12</onleft>
-			<onright>12</onright>
-			<ondown>16</ondown>
-		</control>
-		<control type="button" id="12">
-			<description>Server Browse Button</description>
-			<left>600</left>
-			<top>115</top>
-			<width>170</width>
-			<height>40</height>
-			<textoffsetx>12</textoffsetx>
-			<font>font12_title</font>
-			<label>1024</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<onup>10</onup>
-			<onleft>11</onleft>
-			<onright>11</onright>
-			<ondown>16</ondown>
-		</control>
-		<control type="edit" id="16">
-			<description>Remote path Button</description>
-			<left>30</left>
-			<top>160</top>
-			<width>740</width>
-			<height>40</height>
-			<textoffsetx>12</textoffsetx>
-			<aligny>center</aligny>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<label>-</label>
-			<onup>11</onup>
-			<onleft>16</onleft>
-			<onright>16</onright>
-			<ondown>13</ondown>
-		</control>
-		<control type="edit" id="13">
-			<description>Port Button</description>
-			<left>30</left>
-			<top>205</top>
-			<width>740</width>
-			<height>40</height>
-			<textoffsetx>12</textoffsetx>
-			<aligny>center</aligny>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<label>1013</label>
-			<onup>16</onup>
-			<onleft>13</onleft>
-			<onright>13</onright>
-			<ondown>14</ondown>
-		</control>
-		<control type="edit" id="14">
-			<description>Username Button</description>
-			<left>30</left>
-			<top>250</top>
-			<width>740</width>
-			<height>40</height>
-			<textoffsetx>12</textoffsetx>
-			<aligny>center</aligny>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<label>1014</label>
-			<onup>13</onup>
-			<onleft>14</onleft>
-			<onright>14</onright>
-			<ondown>15</ondown>
-		</control>
-		<control type="edit" id="15">
-			<description>Password Button</description>
-			<left>30</left>
-			<top>295</top>
-			<width>740</width>
-			<height>40</height>
-			<textoffsetx>12</textoffsetx>
-			<aligny>center</aligny>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<label>15052</label>
-			<onup>14</onup>
-			<onleft>15</onleft>
-			<onright>15</onright>
-			<ondown>18</ondown>
-		</control>
-		<control type="button" id="18">
-			<description>Ok Button</description>
-			<left>195</left>
-			<top>375</top>
-			<width>200</width>
-			<height>40</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font12_title</font>
-			<label>186</label>
-			<onup>15</onup>
-			<onleft>19</onleft>
-			<onright>19</onright>
-			<ondown>10</ondown>
-		</control>
-		<control type="button" id="19">
-			<description>Cancel Button</description>
-			<left>405</left>
-			<top>375</top>
-			<width>200</width>
-			<height>40</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font12_title</font>
-			<label>222</label>
-			<onup>15</onup>
-			<onleft>18</onleft>
-			<onright>18</onright>
-			<ondown>10</ondown>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogPVRTimerSettings.xml b/720p/DialogPVRTimerSettings.xml
deleted file mode 100644
index 774749f..0000000
--- a/720p/DialogPVRTimerSettings.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol>29</defaultcontrol>
-	<coordinates>
-		<left>275</left>
-		<top>30</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="730" />
-			<param name="DialogBackgroundHeight" value="660" />
-			<param name="DialogHeaderWidth" value="650" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[19065]" />
-			<param name="DialogHeaderId" value="0" />
-			<param name="CloseButtonLeft" value="640" />
-			<param name="CloseButtonNav" value="10" />
-		</include>
-		<control type="grouplist" id="5">
-			<description>control area</description>
-			<left>30</left>
-			<top>70</top>
-			<width>670</width>
-			<height>510</height>
-			<itemgap>5</itemgap>
-			<onup>9001</onup>
-			<ondown>9001</ondown>
-			<onleft>9001</onleft>
-			<onright>9001</onright>
-		</control>
-		<control type="group" id="9001">
-			<left>160</left>
-			<top>590</top>
-			<control type="button" id="28">
-				<description>OK Button</description>
-				<left>0</left>
-				<top>0</top>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<label>186</label>
-				<onleft>29</onleft>
-				<onright>29</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-			<control type="button" id="29">
-				<description>Cancel Button</description>
-				<left>210</left>
-				<top>0</top>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<label>222</label>
-				<onleft>28</onleft>
-				<onright>28</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default spincontrolex</description>
-			<height>40</height>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<font>font13</font>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="sliderex" id="13">
-			<description>Default Slider</description>
-			<height>40</height>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-		</control>
-		<control type="image" id="11">
-			<description>Default Seperator</description>
-			<height>2</height>
-			<texture>separator2.png</texture>
-		</control>
-		<control type="edit" id="12">
-			<description>Default Edit</description>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<left>0</left>
-			<top>0</top>
-			<height>30</height>
-			<label>-</label>
-			<align>center</align>
-			<aligny>bottom</aligny>
-			<font>font13_title</font>
-			<textcolor>grey</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogPeripheralSettings.xml b/720p/DialogPeripheralSettings.xml
deleted file mode 100644
index 5b4a49f..0000000
--- a/720p/DialogPeripheralSettings.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol>5</defaultcontrol>
-	<coordinates>
-		<left>290</left>
-		<top>75</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="700" />
-			<param name="DialogBackgroundHeight" value="570" />
-			<param name="DialogHeaderWidth" value="620" />
-			<param name="DialogHeaderLabel" value="" />
-			<param name="DialogHeaderId" value="2" />
-			<param name="CloseButtonLeft" value="610" />
-			<param name="CloseButtonNav" value="5" />
-		</include>
-		<control type="grouplist" id="5">
-			<animation effect="slide" start="0,0" end="5,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation>
-			<description>control area</description>
-			<left>30</left>
-			<top>70</top>
-			<width>630</width>
-			<height>410</height>
-			<itemgap>5</itemgap>
-			<pagecontrol>60</pagecontrol>
-			<onleft>28</onleft>
-			<onright>60</onright>
-			<onup>28</onup>
-			<ondown>28</ondown>
-		</control>
-		<control type="scrollbar" id="60">
-			<left>658</left>
-			<top>70</top>
-			<width>25</width>
-			<height>410</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>5</onleft>
-			<onright>5</onright>
-			<ondown>60</ondown>
-			<onup>60</onup>
-			<showonepage>false</showonepage>
-			<orientation>vertical</orientation>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="sliderex" id="13">
-			<description>Default Slider</description>
-			<height>40</height>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-		</control>
-		<control type="image" id="11">
-			<description>separator image</description>
-			<height>2</height>
-			<texture>separator2.png</texture>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<left>0</left>
-			<top>0</top>
-			<height>30</height>
-			<label>-</label>
-			<align>center</align>
-			<aligny>bottom</aligny>
-			<font>font13_title</font>
-			<textcolor>grey</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-		<control type="group" id="9000">
-			<left>40</left>
-			<top>505</top>
-			<control type="button" id="29">
-				<description>Cancel Button</description>
-				<top>0</top>
-				<left>0</left>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<label>222</label>
-				<onleft>50</onleft>
-				<onright>28</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-			<control type="button" id="28">
-				<description>OK Button</description>
-				<top>0</top>
-				<left>210</left>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<label>186</label>
-				<onleft>29</onleft>
-				<onright>50</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-			<control type="button" id="50">
-				<description>Defaults Button</description>
-				<top>0</top>
-				<left>420</left>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<label>409</label>
-				<onleft>28</onleft>
-				<onright>29</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogSettings.xml b/720p/DialogSettings.xml
new file mode 100644
index 0000000..d5a1ca0
--- /dev/null
+++ b/720p/DialogSettings.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<defaultcontrol always="true">5</defaultcontrol>
+	<coordinates>
+		<left>240</left>
+		<top>142</top>
+	</coordinates>
+	<include>dialogeffect</include>
+	<controls>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="150" condition="Window.Is(contentsettings) + Window.IsActive(AddonSettings)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="300" condition="[Window.Is(osdaudiosettings) | Window.Is(osdvideosettings)] + [Window.IsVisible(SliderDialog) | Window.IsVisible(OSDAudioDSPSettings) |  Window.IsVisible(FileBrowser)]">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="400" condition="Window.Is(osdaudiodspsettings) + Window.IsVisible(SliderDialog)">Conditional</animation>
+			<include name="DialogBackgroundCommons">
+				<param name="DialogBackgroundWidth" value="800" />
+				<param name="DialogBackgroundHeight" value="458" />
+				<param name="DialogHeaderWidth" value="720" />
+				<param name="DialogHeaderId" value="2" />
+				<param name="CloseButtonLeft" value="710" />
+				<param name="CloseButtonNav" value="10" />
+			</include>
+			<control type="grouplist" id="5">
+				<animation effect="slide" start="0,0" end="-10,0" time="0" condition="Control.IsVisible(60)">Conditional</animation>
+				<description>control area</description>
+				<left>35</left>
+				<top>70</top>
+				<width>730</width>
+				<height>308</height>
+				<itemgap>4</itemgap>
+				<pagecontrol>60</pagecontrol>
+				<onup>9001</onup>
+				<ondown>9001</ondown>
+				<onleft>60</onleft>
+				<onright>60</onright>
+			</control>
+			<control type="scrollbar" id="60">
+				<left>758</left>
+				<top>70</top>
+				<width>25</width>
+				<height>308</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>5</onleft>
+				<onright>5</onright>
+				<ondown>60</ondown>
+				<onup>60</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="button" id="7">
+				<description>Default Button</description>
+				<height>40</height>
+				<font>font13</font>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+			</control>
+			<control type="radiobutton" id="8">
+				<description>Default RadioButton</description>
+				<height>40</height>
+				<font>font13</font>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+			</control>
+			<control type="spincontrolex" id="9">
+				<description>Default SpinControlex</description>
+				<height>40</height>
+				<font>font13</font>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<aligny>center</aligny>
+				<reverse>yes</reverse>
+			</control>
+			<control type="image" id="11">
+				<description>separator image</description>
+				<height>2</height>
+				<texture>separator2.png</texture>
+			</control>
+			<control type="edit" id="12">
+				<description>Default Edit</description>
+				<height>40</height>
+				<font>font13</font>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+			</control>
+			<control type="sliderex" id="13">
+				<description>Default Slider</description>
+				<height>40</height>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<font>font13</font>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+			</control>
+			<control type="label" id="14">
+				<description>Default Heading</description>
+				<height>34</height>
+				<font>font12</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>blue</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="grouplist" id="9001">
+				<left>170</left>
+				<top>393</top>
+				<width>460</width>
+				<align>center</align>
+				<itemgap>20</itemgap>
+				<orientation>horizontal</orientation>
+				<control type="button" id="28">
+					<description>OK Button</description>
+					<top>0</top>
+					<width>200</width>
+					<height>40</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>font12_title</font>
+					<onleft>30</onleft>
+					<onright>29</onright>
+					<onup>5</onup>
+					<ondown>5</ondown>
+				</control>
+				<control type="button" id="29">
+					<description>Cancel Button</description>
+					<top>0</top>
+					<width>200</width>
+					<height>40</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>font12_title</font>
+					<label/>
+					<onleft>28</onleft>
+					<onright>30</onright>
+					<onup>5</onup>
+					<ondown>5</ondown>
+				</control>
+				<control type="button" id="30">
+					<description>Settings Button</description>
+					<top>0</top>
+					<width>200</width>
+					<height>40</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>font12_title</font>
+					<onleft>29</onleft>
+					<onright>28</onright>
+					<onup>5</onup>
+					<ondown>5</ondown>
+				</control>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/720p/LockSettings.xml b/720p/LockSettings.xml
deleted file mode 100644
index 25a579f..0000000
--- a/720p/LockSettings.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol>5</defaultcontrol>
-	<coordinates>
-		<left>290</left>
-		<top>75</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="700" />
-			<param name="DialogBackgroundHeight" value="570" />
-			<param name="DialogHeaderWidth" value="620" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[20043]" />
-			<param name="DialogHeaderId" value="2" />
-			<param name="CloseButtonLeft" value="610" />
-			<param name="CloseButtonNav" value="5" />
-		</include>
-		<control type="grouplist" id="5">
-			<description>control area</description>
-			<left>30</left>
-			<top>70</top>
-			<width>640</width>
-			<height>410</height>
-			<itemgap>5</itemgap>
-			<onleft>28</onleft>
-			<onright>29</onright>
-			<onup>28</onup>
-			<ondown>28</ondown>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="image" id="11">
-			<description>separator image</description>
-			<height>2</height>
-			<texture>separator2.png</texture>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<left>0</left>
-			<top>0</top>
-			<height>30</height>
-			<label>-</label>
-			<align>center</align>
-			<aligny>bottom</aligny>
-			<font>font13_title</font>
-			<textcolor>grey</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-		<control type="button" id="28">
-			<description>Ok Button</description>
-			<left>145</left>
-			<top>505</top>
-			<width>200</width>
-			<height>40</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font12_title</font>
-			<label>186</label>
-			<onleft>29</onleft>
-			<onright>29</onright>
-			<onup>5</onup>
-			<ondown>5</ondown>
-		</control>
-		<control type="button" id="29">
-			<description>Cancel Button</description>
-			<left>355</left>
-			<top>505</top>
-			<width>200</width>
-			<height>40</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font12_title</font>
-			<label>222</label>
-			<onleft>28</onleft>
-			<onright>28</onright>
-			<onup>5</onup>
-			<ondown>5</ondown>
-		</control>
-	</controls>
-</window>
diff --git a/720p/ProfileSettings.xml b/720p/ProfileSettings.xml
deleted file mode 100644
index 9006ef7..0000000
--- a/720p/ProfileSettings.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<coordinates>
-		<left>290</left>
-		<top>75</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="700" />
-			<param name="DialogBackgroundHeight" value="570" />
-			<param name="DialogHeaderWidth" value="620" />
-			<param name="DialogHeaderLabel" value="-" />
-			<param name="DialogHeaderId" value="2" />
-			<param name="CloseButtonLeft" value="610" />
-			<param name="CloseButtonNav" value="1" />
-		</include>
-		<control type="image" id="101">
-			<description>profile image</description>
-			<left>30</left>
-			<top>70</top>
-			<width>150</width>
-			<height>150</height>
-			<align>left</align>
-			<aspectratio>stretch</aspectratio>
-			<texture>unknown-user.png</texture>
-			<bordertexture border="8">ThumbBorder.png</bordertexture>
-			<bordersize>8</bordersize>
-		</control>
-		<control type="label">
-			<description>profile name label</description>
-			<left>200</left>
-			<top>70</top>
-			<width>460</width>
-			<align>left</align>
-			<font>font13_title</font>
-			<textcolor>blue</textcolor>
-			<label>$LOCALIZE[20093]</label>
-		</control>
-		<control type="label" id="102">
-			<description>profile name Value</description>
-			<left>200</left>
-			<top>95</top>
-			<width>460</width>
-			<align>left</align>
-			<font>font16</font>
-			<textcolor>white</textcolor>
-		</control>
-		<control type="label">
-			<description>profile directory label</description>
-			<left>200</left>
-			<top>155</top>
-			<width>460</width>
-			<align>left</align>
-			<font>font13_title</font>
-			<textcolor>blue</textcolor>
-			<label>$LOCALIZE[20070]</label>
-		</control>
-		<control type="label" id="103">
-			<description>profile directory Value</description>
-			<left>200</left>
-			<top>180</top>
-			<width>460</width>
-			<align>left</align>
-			<font>font13</font>
-			<textcolor>white</textcolor>
-		</control>
-		<control type="grouplist" id="5">
-			<description>control area</description>
-			<left>30</left>
-			<top>230</top>
-			<width>640</width>
-			<height>265</height>
-			<itemgap>5</itemgap>
-			<pagecontrol>60</pagecontrol>
-			<onleft>28</onleft>
-			<onright>60</onright>
-			<onup>28</onup>
-			<ondown>28</ondown>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="image" id="11">
-			<description>separator image</description>
-			<height>2</height>
-			<texture>separator2.png</texture>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<left>0</left>
-			<top>0</top>
-			<height>30</height>
-			<label>-</label>
-			<align>center</align>
-			<aligny>bottom</aligny>
-			<font>font13_title</font>
-			<textcolor>grey</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-		<control type="button" id="28">
-			<description>Ok Button</description>
-			<left>145</left>
-			<top>505</top>
-			<width>200</width>
-			<height>40</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font12_title</font>
-			<label>186</label>
-			<onleft>29</onleft>
-			<onright>29</onright>
-			<onup>5</onup>
-			<ondown>5</ondown>
-		</control>
-		<control type="button" id="29">
-			<description>Cancel Button</description>
-			<left>355</left>
-			<top>505</top>
-			<width>200</width>
-			<height>40</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font12_title</font>
-			<label>222</label>
-			<onleft>28</onleft>
-			<onright>28</onright>
-			<onup>5</onup>
-			<ondown>5</ondown>
-		</control>
-	</controls>
-</window>
diff --git a/720p/VideoOSDSettings.xml b/720p/VideoOSDSettings.xml
deleted file mode 100644
index 10113b6..0000000
--- a/720p/VideoOSDSettings.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol>5</defaultcontrol>
-	<coordinates>
-		<left>240</left>
-		<top>60</top>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<control type="group">
-			<animation effect="fade" start="100" end="0" time="300" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(OSDAudioDSPSettings) |  Window.IsVisible(FileBrowser)">Conditional</animation>
-			<control type="image">
-				<description>background image</description>
-				<left>0</left>
-				<top>0</top>
-				<width>800</width>
-				<height>600</height>
-				<texture border="40">DialogBack2.png</texture>
-			</control>
-			<control type="image">
-				<description>Dialog Header image</description>
-				<left>40</left>
-				<top>16</top>
-				<width>720</width>
-				<height>40</height>
-				<texture>dialogheader.png</texture>
-			</control>
-			<control type="label" id="2">
-				<description>header label</description>
-				<left>40</left>
-				<top>20</top>
-				<width>720</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>selected</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="button">
-				<description>Close Window button</description>
-				<left>710</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>
-				<onleft>2</onleft>
-				<onright>2</onright>
-				<onup>2</onup>
-				<ondown>2</ondown>
-				<visible>system.getbool(input.enablemouse)</visible>
-			</control>
-			<control type="grouplist" id="5">
-				<description>control area</description>
-				<left>40</left>
-				<top>65</top>
-				<width>720</width>
-				<height>505</height>
-				<itemgap>5</itemgap>
-				<pagecontrol>60</pagecontrol>
-				<onleft>60</onleft>
-				<onright>60</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
-			</control>
-			<control type="scrollbar" id="60">
-				<left>760</left>
-				<top>65</top>
-				<width>25</width>
-				<height>490</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>5</onleft>
-				<onright>5</onright>
-				<ondown>61</ondown>
-				<onup>61</onup>
-				<showonepage>false</showonepage>
-				<orientation>vertical</orientation>
-			</control>
-		</control>
-		<control type="sliderex" id="13">
-			<description>Default Slider</description>
-			<height>40</height>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<left>0</left>
-			<top>0</top>
-			<height>40</height>
-			<font>font13</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			<texturefocus border="5">button-focus2.png</texturefocus>
-			<aligny>center</aligny>
-			<reverse>yes</reverse>
-		</control>
-		<control type="image" id="11">
-			<description>separator image</description>
-			<height>2</height>
-			<texture>separator2.png</texture>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<left>0</left>
-			<top>0</top>
-			<height>30</height>
-			<label>-</label>
-			<align>center</align>
-			<aligny>bottom</aligny>
-			<font>font13_title</font>
-			<textcolor>grey</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-	</controls>
-</window>
diff --git a/addon.xml b/addon.xml
index f87e7c3..4095cb7 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="skin.confluence"
-  version="3.0.1"
+  version="3.0.2"
   name="Confluence"
   provider-name="Jezz_X, Team Kodi">
   <requires>
diff --git a/changelog.txt b/changelog.txt
index eb6eaa2..150273e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+[B]3.0.2[/B]
+
+- Merged setting dialogs into DialogSettings
+
 [B]3.0.1[/B]
 
 - Updated language files from Transifex