From 6e02f6df5f72ad1f654eb9b26d3a9b47cec05f00 Mon Sep 17 00:00:00 2001
From: HitcherUK <HitcherUK@gmail.com>
Date: Tue, 7 Jun 2016 15:19:31 +0100
Subject: [PATCH] [skin.confluence] v3.0.19

---
 720p/defaults.xml | 198 ----------------------------------------------
 720p/includes.xml |   2 +-
 2 files changed, 1 insertion(+), 199 deletions(-)
 delete mode 100644 720p/defaults.xml

diff --git a/720p/defaults.xml b/720p/defaults.xml
deleted file mode 100644
index e29e80a..0000000
--- a/720p/defaults.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<default type="image">
-		<left>0</left>
-		<top>0</top>
-		<texture>-</texture>
-	</default>
-	<default type="label">
-		<label>-</label>
-		<font>font13</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-	</default>
-	<default type="fadelabel">
-		<left>80</left>
-		<top>60</top>
-		<font>font13</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-	</default>
-	<default type="button">
-		<width>300</width>
-		<height>42</height>
-		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		<font>font13</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-		<textoffsetx>7</textoffsetx>
-		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
-	</default>
-	<default type="togglebutton">
-		<left>140</left>
-		<top>167</top>
-		<width>20</width>
-		<height>20</height>
-		<texturefocus>scroll-up-focus.png</texturefocus>
-		<texturenofocus>scroll-up.png</texturenofocus>
-		<alttexturefocus>scroll-down-focus.png</alttexturefocus>
-		<alttexturenofocus>scroll-down.png</alttexturenofocus>
-		<textcolor>white</textcolor>
-		<label>-</label>
-		<font>font13</font>
-		<disabledcolor>grey3</disabledcolor>
-		<pulseonselect>no</pulseonselect>
-	</default>
-	<default type="textbox">
-		<left>220</left>
-		<top>222</top>
-		<width>410</width>
-		<height>213</height>
-		<align>left</align>
-		<textcolor>white</textcolor>
-		<font>font13</font>
-	</default>
-	<default type="progress">
-		<left>100</left>
-		<top>325</top>
-		<texturebg border="6,0,6,0">OSDProgressBack.png</texturebg>
-		<lefttexture>-</lefttexture>
-		<midtexture border="6,0,6,0">OSDProgressMid.png</midtexture>
-		<righttexture>-</righttexture>
-		<overlaytexture>-</overlaytexture>
-	</default>
-	<default type="spincontrol">
-		<left>330</left>
-		<top>126</top>
-		<textureup>scroll-up-2.png</textureup>
-		<texturedown>scroll-down-2.png</texturedown>
-		<textureupdisabled colordiffuse="40FFFFFF">scroll-up-2.png</textureupdisabled>
-		<texturedowndisabled colordiffuse="40FFFFFF">scroll-down-2.png</texturedowndisabled>
-		<textureupfocus>scroll-up-focus-2.png</textureupfocus>
-		<texturedownfocus>scroll-down-focus-2.png</texturedownfocus>
-		<align>right</align>
-		<width>33</width>
-		<height>22</height>
-		<font>font13</font>
-		<reverse>yes</reverse>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-		<subtype>text</subtype>
-		<textoffsetx>-5</textoffsetx>
-		<textoffsety>0</textoffsety>
-		<pulseonselect>no</pulseonselect>
-	</default>
-	<default type="spincontrolex">
-		<left>530</left>
-		<top>160</top>
-		<width>300</width>
-		<height>42</height>
-		<spinwidth>33</spinwidth>
-		<spinheight>22</spinheight>
-		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>-</texturenofocus>
-		<textureup>scroll-up-2.png</textureup>
-		<texturedown>scroll-down-2.png</texturedown>
-		<textureupdisabled colordiffuse="40FFFFFF">scroll-up-2.png</textureupdisabled>
-		<texturedowndisabled colordiffuse="40FFFFFF">scroll-down-2.png</texturedowndisabled>
-		<textureupfocus>scroll-up-focus-2.png</textureupfocus>
-		<texturedownfocus>scroll-down-focus-2.png</texturedownfocus>
-		<font>font13</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-		<textoffsetx>7</textoffsetx>
-		<aligny>center</aligny>
-		<reverse>yes</reverse>
-		<pulseonselect>no</pulseonselect>
-	</default>
-	<default type="radiobutton">
-		<left>300</left>
-		<top>200</top>
-		<width>300</width>
-		<height>42</height>
-		<radiowidth>24</radiowidth>
-		<radioheight>24</radioheight>
-		<textureradioonfocus>radiobutton-focus.png</textureradioonfocus>
-		<textureradioonnofocus>radiobutton-focus.png</textureradioonnofocus>
-		<textureradioofffocus>radiobutton-nofocus.png</textureradioofffocus>
-		<textureradiooffnofocus>radiobutton-nofocus.png</textureradiooffnofocus>
-		<textureradioondisabled colordiffuse="40FFFFFF">radiobutton-focus.png</textureradioondisabled>
-		<textureradiooffdisabled colordiffuse="40FFFFFF">radiobutton-nofocus.png</textureradiooffdisabled>
-		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		<label>215</label>
-		<font>font13</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-		<textoffsetx>7</textoffsetx>
-		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
-	</default>
-	<default type="selectbutton">
-		<left>490</left>
-		<top>335</top>
-		<width>300</width>
-		<height>50</height>
-		<label>-</label>
-		<font>font12</font>
-		<texturefocus>-</texturefocus>
-		<texturenofocus>-</texturenofocus>
-		<texturebg>button-focus.png</texturebg>
-		<textureleft>scroll-left.png</textureleft>
-		<textureleftfocus>scroll-left-focus.png</textureleftfocus>
-		<textureright>scroll-right.png</textureright>
-		<texturerightfocus>scroll-right-focus.png</texturerightfocus>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-		<aligny>center</aligny>
-	</default>
-	<default type="slider">
-		<controloffsetx>75</controloffsetx>
-		<controloffsety>0</controloffsety>
-		<orientation>horizontal</orientation>
-	</default>
-	<default type="sliderex">
-		<height>35</height>
-		<textoffsetx>7</textoffsetx>
-		<aligny>center</aligny>
-		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		<sliderwidth>150</sliderwidth>
-		<sliderheight>20</sliderheight>
-		<texturesliderbar>osd_slider_bg.png</texturesliderbar>
-		<textureslidernib>osd_slider_nibNF.png</textureslidernib>
-		<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
-		<font>font12</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-	</default>
-	<default type="mover">
-		<left>60</left>
-		<top>192</top>
-		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus border="5">button-nofocus.png</texturenofocus>
-	</default>
-	<default type="resize">
-		<left>60</left>
-		<top>192</top>
-		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus border="5">button-nofocus.png</texturenofocus>
-	</default>
-	<default type="edit">
-		<left>300</left>
-		<top>200</top>
-		<width>300</width>
-		<height>42</height>
-		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus border="5">button-nofocus.png</texturenofocus>
-		<font>font13</font>
-		<textcolor>white</textcolor>
-		<disabledcolor>grey3</disabledcolor>
-		<invalidcolor>invalid</invalidcolor>
-		<textoffsetx>7</textoffsetx>
-		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
-	</default>
-</includes>
diff --git a/720p/includes.xml b/720p/includes.xml
index 93ebb7a..4b80e37 100644
--- a/720p/includes.xml
+++ b/720p/includes.xml
@@ -1392,7 +1392,7 @@
 		<font>font13</font>
 		<focusedcolor>black</focusedcolor>
 	</include>
-	<include content="CommonWindowHeader">
+	<include name="CommonWindowHeader">
 		<param name="Icon" default="icon_home" />
 		<param name="Label" default="" />
 		<param name="ShowLabel2" default="False" />