Changed: [Confluence] Cleaned up Window id white space since they are no longer required

78 files changed, 78 insertions, 78 deletions

diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml
index 3ec42aac3c..1baf7337ce 100644
--- a/addons/skin.confluence/720p/AddonBrowser.xml
+++ b/addons/skin.confluence/720p/AddonBrowser.xml
@@ -1,4 +1,4 @@
-<window id="40">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/DialogAddonInfo.xml b/addons/skin.confluence/720p/DialogAddonInfo.xml
index 79a87ae579..66a56d7555 100644
--- a/addons/skin.confluence/720p/DialogAddonInfo.xml
+++ b/addons/skin.confluence/720p/DialogAddonInfo.xml
@@ -1,4 +1,4 @@
-<window id="146">
+<window>
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogAddonSettings.xml b/addons/skin.confluence/720p/DialogAddonSettings.xml
index bf8e59e3b6..db60d78449 100644
--- a/addons/skin.confluence/720p/DialogAddonSettings.xml
+++ b/addons/skin.confluence/720p/DialogAddonSettings.xml
@@ -1,4 +1,4 @@
-<window id="10140">
+<window>
 	<defaultcontrol always="true">9</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogAlbumInfo.xml b/addons/skin.confluence/720p/DialogAlbumInfo.xml
index b59bf43b17..888b01a3a4 100644
--- a/addons/skin.confluence/720p/DialogAlbumInfo.xml
+++ b/addons/skin.confluence/720p/DialogAlbumInfo.xml
@@ -1,4 +1,4 @@
-<window id="2001">
+<window>
 	<defaultcontrol always="true">5</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/DialogBusy.xml b/addons/skin.confluence/720p/DialogBusy.xml
index 3fc6e4efb2..8d010eb4d5 100644
--- a/addons/skin.confluence/720p/DialogBusy.xml
+++ b/addons/skin.confluence/720p/DialogBusy.xml
@@ -1,4 +1,4 @@
-<window id="136">
+<window>
 	<animation effect="fade" time="100">WindowOpen</animation>
 	<animation effect="fade" time="200">WindowClose</animation>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogButtonMenu.xml b/addons/skin.confluence/720p/DialogButtonMenu.xml
index 6e8cda5a69..2b08f6942e 100644
--- a/addons/skin.confluence/720p/DialogButtonMenu.xml
+++ b/addons/skin.confluence/720p/DialogButtonMenu.xml
@@ -1,4 +1,4 @@
-<window type="buttonMenu" id="111">
+<window type="buttonMenu">
 	<defaultcontrol>9001</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogContentSettings.xml b/addons/skin.confluence/720p/DialogContentSettings.xml
index e1df222668..0399a1e679 100644
--- a/addons/skin.confluence/720p/DialogContentSettings.xml
+++ b/addons/skin.confluence/720p/DialogContentSettings.xml
@@ -1,4 +1,4 @@
-<window id="132">
+<window>
 	<defaultcontrol always="true">3</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogContextMenu.xml b/addons/skin.confluence/720p/DialogContextMenu.xml
index f339e4156b..b9c9a756a5 100644
--- a/addons/skin.confluence/720p/DialogContextMenu.xml
+++ b/addons/skin.confluence/720p/DialogContextMenu.xml
@@ -1,4 +1,4 @@
-<window id="106">
+<window>
 	<defaultcontrol>1000</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml
index 412d92c894..c9848fc0ca 100644
--- a/addons/skin.confluence/720p/DialogExtendedProgressBar.xml
+++ b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml
@@ -1,4 +1,4 @@
-<window id="614">
+<window>
 	<defaultcontrol></defaultcontrol>
 	<animation effect="slide" start="0,-70" end="0,0" time="100">WindowOpen</animation>
 	<animation effect="slide" start="0,0" end="0,-70" delay="400" time="100">WindowClose</animation>
diff --git a/addons/skin.confluence/720p/DialogFavourites.xml b/addons/skin.confluence/720p/DialogFavourites.xml
index 2d06273179..95e353e6ce 100644
--- a/addons/skin.confluence/720p/DialogFavourites.xml
+++ b/addons/skin.confluence/720p/DialogFavourites.xml
@@ -1,4 +1,4 @@
-<window type="dialog" id="134">
+<window type="dialog">
 	<defaultcontrol always="true">450</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogFileStacking.xml b/addons/skin.confluence/720p/DialogFileStacking.xml
index bfb1ca7635..242d746ed7 100644
--- a/addons/skin.confluence/720p/DialogFileStacking.xml
+++ b/addons/skin.confluence/720p/DialogFileStacking.xml
@@ -1,4 +1,4 @@
-<window id="2008">
+<window>
 	<defaultcontrol>450</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogGamepad.xml b/addons/skin.confluence/720p/DialogGamepad.xml
index f86d690cc7..ca8d30da2e 100644
--- a/addons/skin.confluence/720p/DialogGamepad.xml
+++ b/addons/skin.confluence/720p/DialogGamepad.xml
@@ -1,4 +1,4 @@
-<window id="110">
+<window>
 	<defaultcontrol always="true">1</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogKaiToast.xml b/addons/skin.confluence/720p/DialogKaiToast.xml
index 77283771d1..764adce8a6 100644
--- a/addons/skin.confluence/720p/DialogKaiToast.xml
+++ b/addons/skin.confluence/720p/DialogKaiToast.xml
@@ -1,4 +1,4 @@
-<window id="107">
+<window>
 	<animation effect="fade" start="0" end="100" time="200">WindowOpen</animation>
 	<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml b/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml
index 5180352d8d..883a40917b 100644
--- a/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml
+++ b/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml
@@ -1,4 +1,4 @@
-<window type="dialog" id="143">
+<window type="dialog">
 	<animation effect="slide" start="0,-40" end="0,0" time="100">WindowOpen</animation>
 	<animation effect="slide" start="0,0" end="0,-40" delay="400" time="100">WindowClose</animation>
 	<controls>
diff --git a/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml b/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
index 144a91ca66..2b985b22a6 100644
--- a/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
+++ b/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
@@ -1,4 +1,4 @@
-<window type="dialog" id="144">
+<window type="dialog">
 	<include>dialogeffect</include>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogKeyboard.xml b/addons/skin.confluence/720p/DialogKeyboard.xml
index a5e27a1d1a..07d87be2c7 100644
--- a/addons/skin.confluence/720p/DialogKeyboard.xml
+++ b/addons/skin.confluence/720p/DialogKeyboard.xml
@@ -1,4 +1,4 @@
-<window id="103">
+<window>
 	<defaultcontrol always="true">300</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogMediaFilter.xml b/addons/skin.confluence/720p/DialogMediaFilter.xml
index accb0c888c..1d9eb51e74 100644
--- a/addons/skin.confluence/720p/DialogMediaFilter.xml
+++ b/addons/skin.confluence/720p/DialogMediaFilter.xml
@@ -1,4 +1,4 @@
-<window id="151">
+<window>
 	<defaultcontrol always="true">5</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogMediaSource.xml b/addons/skin.confluence/720p/DialogMediaSource.xml
index 5985eb448f..8279eabacb 100644
--- a/addons/skin.confluence/720p/DialogMediaSource.xml
+++ b/addons/skin.confluence/720p/DialogMediaSource.xml
@@ -1,4 +1,4 @@
-<window id="129">
+<window>
 	<defaultcontrol>10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogMuteBug.xml b/addons/skin.confluence/720p/DialogMuteBug.xml
index 8549f51f84..47318589d9 100644
--- a/addons/skin.confluence/720p/DialogMuteBug.xml
+++ b/addons/skin.confluence/720p/DialogMuteBug.xml
@@ -1,4 +1,4 @@
-<window id="113">
+<window>
 	<defaultcontrol>-</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogNetworkSetup.xml b/addons/skin.confluence/720p/DialogNetworkSetup.xml
index 90d79340f6..a51c5ac86d 100644
--- a/addons/skin.confluence/720p/DialogNetworkSetup.xml
+++ b/addons/skin.confluence/720p/DialogNetworkSetup.xml
@@ -1,4 +1,4 @@
-<window id="128">
+<window>
 	<defaultcontrol>10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogNumeric.xml b/addons/skin.confluence/720p/DialogNumeric.xml
index c268f19f61..f50450d650 100644
--- a/addons/skin.confluence/720p/DialogNumeric.xml
+++ b/addons/skin.confluence/720p/DialogNumeric.xml
@@ -1,4 +1,4 @@
-<window id="109">
+<window>
 	<defaultcontrol always="true">21</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogOK.xml b/addons/skin.confluence/720p/DialogOK.xml
index f02d46a776..f0c8006476 100644
--- a/addons/skin.confluence/720p/DialogOK.xml
+++ b/addons/skin.confluence/720p/DialogOK.xml
@@ -1,4 +1,4 @@
-<window id="2002">
+<window>
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPVRChannelManager.xml b/addons/skin.confluence/720p/DialogPVRChannelManager.xml
index 4093206466..e41236507b 100644
--- a/addons/skin.confluence/720p/DialogPVRChannelManager.xml
+++ b/addons/skin.confluence/720p/DialogPVRChannelManager.xml
@@ -1,4 +1,4 @@
-<window id="605">
+<window>
 	<defaultcontrol always="true">20</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml b/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml
index fa54573f83..1cd58199c4 100644
--- a/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml
+++ b/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml
@@ -1,4 +1,4 @@
-<window id="609">
+<window>
 	<defaultcontrol always="true">11</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPVRGroupManager.xml b/addons/skin.confluence/720p/DialogPVRGroupManager.xml
index 5cdaaabcff..f137ea2ff3 100644
--- a/addons/skin.confluence/720p/DialogPVRGroupManager.xml
+++ b/addons/skin.confluence/720p/DialogPVRGroupManager.xml
@@ -1,4 +1,4 @@
-<window id="604">
+<window>
 	<defaultcontrol always="true">29</defaultcontrol>
 	<controls>
 		<control type="group">
diff --git a/addons/skin.confluence/720p/DialogPVRGuideInfo.xml b/addons/skin.confluence/720p/DialogPVRGuideInfo.xml
index 24cc03cb78..dd58296c25 100644
--- a/addons/skin.confluence/720p/DialogPVRGuideInfo.xml
+++ b/addons/skin.confluence/720p/DialogPVRGuideInfo.xml
@@ -1,4 +1,4 @@
-<window id="601">
+<window>
 	<defaultcontrol always="true">7</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml
index 8cd50eab2a..d683ba5886 100644
--- a/addons/skin.confluence/720p/DialogPVRGuideOSD.xml
+++ b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml
@@ -1,4 +1,4 @@
-<window id="610">
+<window>
 	<defaultcontrol always="true">11</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPVRGuideSearch.xml b/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
index 9eda47748b..ab5eaba653 100644
--- a/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
+++ b/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
@@ -1,4 +1,4 @@
-<window id="606">
+<window>
 	<defaultcontrol always="true">9</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml b/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml
index 83c3d6b590..9e635bf885 100644
--- a/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml
+++ b/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml
@@ -1,4 +1,4 @@
-<window id="602">
+<window>
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPVRTimerSettings.xml b/addons/skin.confluence/720p/DialogPVRTimerSettings.xml
index 219ac5cd7e..facec047b8 100644
--- a/addons/skin.confluence/720p/DialogPVRTimerSettings.xml
+++ b/addons/skin.confluence/720p/DialogPVRTimerSettings.xml
@@ -1,4 +1,4 @@
-<window id="603">
+<window>
 	<defaultcontrol>29</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPeripheralManager.xml b/addons/skin.confluence/720p/DialogPeripheralManager.xml
index 5717017a47..3d05a5a669 100644
--- a/addons/skin.confluence/720p/DialogPeripheralManager.xml
+++ b/addons/skin.confluence/720p/DialogPeripheralManager.xml
@@ -1,4 +1,4 @@
-<window id="10140">
+<window>
 	<defaultcontrol always="true">20</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPeripheralSettings.xml b/addons/skin.confluence/720p/DialogPeripheralSettings.xml
index d1f9af55b1..b584ee0df0 100644
--- a/addons/skin.confluence/720p/DialogPeripheralSettings.xml
+++ b/addons/skin.confluence/720p/DialogPeripheralSettings.xml
@@ -1,4 +1,4 @@
-<window id="123">
+<window>
 	<defaultcontrol>5</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogPictureInfo.xml b/addons/skin.confluence/720p/DialogPictureInfo.xml
index 9cbdad5c4e..d4661158dc 100644
--- a/addons/skin.confluence/720p/DialogPictureInfo.xml
+++ b/addons/skin.confluence/720p/DialogPictureInfo.xml
@@ -1,4 +1,4 @@
-<window id="139">
+<window>
 	<defaultcontrol always="true">5</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogProgress.xml b/addons/skin.confluence/720p/DialogProgress.xml
index 58c24ddb88..044fc008c9 100644
--- a/addons/skin.confluence/720p/DialogProgress.xml
+++ b/addons/skin.confluence/720p/DialogProgress.xml
@@ -1,4 +1,4 @@
-<window id="101">
+<window>
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogSeekBar.xml b/addons/skin.confluence/720p/DialogSeekBar.xml
index cedd79d873..fd696a6682 100644
--- a/addons/skin.confluence/720p/DialogSeekBar.xml
+++ b/addons/skin.confluence/720p/DialogSeekBar.xml
@@ -1,4 +1,4 @@
-<window id="115">
+<window>
 	<defaultcontrol>1</defaultcontrol>
 	<visible>[Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + ![Window.IsVisible(VideoOSD) | Window.IsVisible(MusicOSD)]</visible>
 	<animation effect="fade" start="0" end="100" time="200">WindowOpen</animation>
diff --git a/addons/skin.confluence/720p/DialogSelect.xml b/addons/skin.confluence/720p/DialogSelect.xml
index f2cf9ca4e4..2e60a7553c 100644
--- a/addons/skin.confluence/720p/DialogSelect.xml
+++ b/addons/skin.confluence/720p/DialogSelect.xml
@@ -1,4 +1,4 @@
-<window type="dialog" id="2000">
+<window type="dialog">
 	<defaultcontrol always="true">3</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogSlider.xml b/addons/skin.confluence/720p/DialogSlider.xml
index 7d4528d88d..d7395640b1 100644
--- a/addons/skin.confluence/720p/DialogSlider.xml
+++ b/addons/skin.confluence/720p/DialogSlider.xml
@@ -1,4 +1,4 @@
-<window id="145">
+<window>
 	<defaultcontrol>11</defaultcontrol>
 	<animation effect="slide" start="0,-80" end="0,0" time="100">WindowOpen</animation>
 	<animation effect="slide" start="0,0" end="0,-80" time="100">WindowClose</animation>
diff --git a/addons/skin.confluence/720p/DialogSongInfo.xml b/addons/skin.confluence/720p/DialogSongInfo.xml
index 5bd3735b2d..51c2e2f68d 100644
--- a/addons/skin.confluence/720p/DialogSongInfo.xml
+++ b/addons/skin.confluence/720p/DialogSongInfo.xml
@@ -1,4 +1,4 @@
-<window id="135">
+<window>
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/DialogTextViewer.xml b/addons/skin.confluence/720p/DialogTextViewer.xml
index b591ba03dd..490297ed4d 100644
--- a/addons/skin.confluence/720p/DialogTextViewer.xml
+++ b/addons/skin.confluence/720p/DialogTextViewer.xml
@@ -1,4 +1,4 @@
-<window id="147">
+<window>
 	<defaultcontrol>61</defaultcontrol>
 	<controls>
 		<control type="group">
diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml
index 98a3cf2279..8e9b2ae921 100644
--- a/addons/skin.confluence/720p/DialogVideoInfo.xml
+++ b/addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -1,4 +1,4 @@
-<window id="2003">
+<window>
 	<defaultcontrol always="true">8</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/DialogVolumeBar.xml b/addons/skin.confluence/720p/DialogVolumeBar.xml
index a465a456a8..5caacb2af4 100644
--- a/addons/skin.confluence/720p/DialogVolumeBar.xml
+++ b/addons/skin.confluence/720p/DialogVolumeBar.xml
@@ -1,4 +1,4 @@
-<window id="104">
+<window>
 	<defaultcontrol>1</defaultcontrol>
 		<animation effect="slide" start="0,-40" end="0,0" time="100">WindowOpen</animation>
 		<animation effect="slide" start="0,0" end="0,-40" delay="400" time="100">WindowClose</animation>
diff --git a/addons/skin.confluence/720p/DialogYesNo.xml b/addons/skin.confluence/720p/DialogYesNo.xml
index fba0b8d172..6bdfa353b8 100644
--- a/addons/skin.confluence/720p/DialogYesNo.xml
+++ b/addons/skin.confluence/720p/DialogYesNo.xml
@@ -1,4 +1,4 @@
-<window id="100">
+<window>
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/FileBrowser.xml b/addons/skin.confluence/720p/FileBrowser.xml
index e658b6da09..9fa35d188a 100644
--- a/addons/skin.confluence/720p/FileBrowser.xml
+++ b/addons/skin.confluence/720p/FileBrowser.xml
@@ -1,4 +1,4 @@
-<window id="126">
+<window>
 	<defaultcontrol always="true">450</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/FileManager.xml b/addons/skin.confluence/720p/FileManager.xml
index 399735374c..af9de17c77 100644
--- a/addons/skin.confluence/720p/FileManager.xml
+++ b/addons/skin.confluence/720p/FileManager.xml
@@ -1,4 +1,4 @@
-<window id="3">
+<window>
 	<defaultcontrol>20</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 1c21ae4299..6dcc13ddd7 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -1,4 +1,4 @@
-<window id="0">
+<window>
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<allowoverlay>no</allowoverlay>	
 	<onunload condition="Container(9000).Hasfocus(10) | Container(9000).Hasfocus(11) | ControlGroup(9010).HasFocus | ControlGroup(9016).HasFocus | ControlGroup(9017).HasFocus">SetProperty(VideosDirectLink,True)</onunload>
diff --git a/addons/skin.confluence/720p/LockSettings.xml b/addons/skin.confluence/720p/LockSettings.xml
index e934ec15d5..8057822640 100644
--- a/addons/skin.confluence/720p/LockSettings.xml
+++ b/addons/skin.confluence/720p/LockSettings.xml
@@ -1,4 +1,4 @@
-<window id="131">
+<window>
 	<defaultcontrol>5</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml
index 0d16a4ef46..b2a6c2e37a 100644
--- a/addons/skin.confluence/720p/LoginScreen.xml
+++ b/addons/skin.confluence/720p/LoginScreen.xml
@@ -1,4 +1,4 @@
-<window id="29">
+<window>
 	<defaultcontrol always="true">52</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
index 84900bf39d..186900e61c 100644
--- a/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
+++ b/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
@@ -1,4 +1,4 @@
-<window id="2009">
+<window>
 	<controls>
 		<control type="karvisualisation" id="1">
 			<description>visualisation</description>
diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml
index f7839fafb9..705ac064db 100644
--- a/addons/skin.confluence/720p/MusicOSD.xml
+++ b/addons/skin.confluence/720p/MusicOSD.xml
@@ -1,4 +1,4 @@
-<window id="120">
+<window>
 	<defaultcontrol always="true">602</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/MusicOverlay.xml b/addons/skin.confluence/720p/MusicOverlay.xml
index 510e6e3223..8a8debc23a 100644
--- a/addons/skin.confluence/720p/MusicOverlay.xml
+++ b/addons/skin.confluence/720p/MusicOverlay.xml
@@ -1,4 +1,4 @@
-<window id="2903">
+<window>
 	<defaultcontrol>-</defaultcontrol>
 	<controls>
 	</controls>
diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index 50d68d4575..4737eaf2aa 100644
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -1,4 +1,4 @@
-<window id="2006">
+<window>
 	<defaultcontrol>-</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml
index 5856fec624..1c7be7e35f 100644
--- a/addons/skin.confluence/720p/MyMusicNav.xml
+++ b/addons/skin.confluence/720p/MyMusicNav.xml
@@ -1,4 +1,4 @@
-<window id="502">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml
index 412bd670c2..a2447827ae 100644
--- a/addons/skin.confluence/720p/MyMusicPlaylist.xml
+++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml
@@ -1,4 +1,4 @@
-<window id="500">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml
index 5cf4cbedb1..c3ae0e8524 100644
--- a/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml
+++ b/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml
@@ -1,4 +1,4 @@
-<window id="503">
+<window>
 	<defaultcontrol allways="true">6</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml
index 6d6c152580..d37f15fc7c 100644
--- a/addons/skin.confluence/720p/MyMusicSongs.xml
+++ b/addons/skin.confluence/720p/MyMusicSongs.xml
@@ -1,4 +1,4 @@
-<window id="501">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/MyPVR.xml b/addons/skin.confluence/720p/MyPVR.xml
index c2ce585424..68cabee738 100644
--- a/addons/skin.confluence/720p/MyPVR.xml
+++ b/addons/skin.confluence/720p/MyPVR.xml
@@ -1,4 +1,4 @@
-<window id="600">
+<window>
 	<defaultcontrol>32</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml
index 0e50b10343..9033eed3b9 100644
--- a/addons/skin.confluence/720p/MyPics.xml
+++ b/addons/skin.confluence/720p/MyPics.xml
@@ -1,4 +1,4 @@
-<window id="2">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml
index 81942b0c0f..3692a4b9a2 100644
--- a/addons/skin.confluence/720p/MyPrograms.xml
+++ b/addons/skin.confluence/720p/MyPrograms.xml
@@ -1,4 +1,4 @@
-<window id="1">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index 5954c9f938..cb7bce38b6 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -1,4 +1,4 @@
-<window id="25">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<views>50,51,500,550,551,560,501,508,504,503,515,505,511</views>
diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml
index 0f9004422b..1653e852bd 100644
--- a/addons/skin.confluence/720p/MyVideoPlaylist.xml
+++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml
@@ -1,4 +1,4 @@
-<window id="28">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml
index 7a264af7ef..ae95bbe020 100644
--- a/addons/skin.confluence/720p/MyWeather.xml
+++ b/addons/skin.confluence/720p/MyWeather.xml
@@ -1,4 +1,4 @@
-<window id="2600">
+<window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
diff --git a/addons/skin.confluence/720p/PlayerControls.xml b/addons/skin.confluence/720p/PlayerControls.xml
index 05a5da83f0..e6a991271b 100644
--- a/addons/skin.confluence/720p/PlayerControls.xml
+++ b/addons/skin.confluence/720p/PlayerControls.xml
@@ -1,4 +1,4 @@
-<window type="dialog" id="114">
+<window type="dialog">
 	<defaultcontrol always="true">100</defaultcontrol>
 	<include>dialogeffect</include>
 	<visible>Player.HasMedia + Window.IsActive(PlayerControls) + !Window.IsActive(FullscreenVideo) + !Window.IsActive(Visualisation)</visible>
diff --git a/addons/skin.confluence/720p/Pointer.xml b/addons/skin.confluence/720p/Pointer.xml
index 66a9720dca..190e52191b 100644
--- a/addons/skin.confluence/720p/Pointer.xml
+++ b/addons/skin.confluence/720p/Pointer.xml
@@ -1,4 +1,4 @@
-<window id="105">
+<window>
 	<defaultcontrol>-</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/ProfileSettings.xml b/addons/skin.confluence/720p/ProfileSettings.xml
index a428cfb799..780323c7cc 100644
--- a/addons/skin.confluence/720p/ProfileSettings.xml
+++ b/addons/skin.confluence/720p/ProfileSettings.xml
@@ -1,4 +1,4 @@
-<window id="130">
+<window>
 	<defaultcontrol>1</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml
index 7c0a2b3c1d..5c4191569a 100644
--- a/addons/skin.confluence/720p/Settings.xml
+++ b/addons/skin.confluence/720p/Settings.xml
@@ -1,4 +1,4 @@
-<window id="4">
+<window>
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml
index 70ffdfc7a0..fda12b3695 100644
--- a/addons/skin.confluence/720p/SettingsCategory.xml
+++ b/addons/skin.confluence/720p/SettingsCategory.xml
@@ -1,4 +1,4 @@
-<window id="12">
+<window>
 	<defaultcontrol>3</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml
index 335c0c083d..e1b266c8f9 100644
--- a/addons/skin.confluence/720p/SettingsProfile.xml
+++ b/addons/skin.confluence/720p/SettingsProfile.xml
@@ -1,4 +1,4 @@
-<window id="34">
+<window>
 	<defaultcontrol always="true">2</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/SettingsScreenCalibration.xml b/addons/skin.confluence/720p/SettingsScreenCalibration.xml
index e694d0b7df..88fd450d35 100644
--- a/addons/skin.confluence/720p/SettingsScreenCalibration.xml
+++ b/addons/skin.confluence/720p/SettingsScreenCalibration.xml
@@ -1,4 +1,4 @@
-<window id="11">
+<window>
 	<defaultcontrol>8</defaultcontrol>
 	<controls>
 		<control type="videowindow" id="20">
diff --git a/addons/skin.confluence/720p/SettingsSystemInfo.xml b/addons/skin.confluence/720p/SettingsSystemInfo.xml
index c8748adb4e..6acb1398f7 100644
--- a/addons/skin.confluence/720p/SettingsSystemInfo.xml
+++ b/addons/skin.confluence/720p/SettingsSystemInfo.xml
@@ -1,4 +1,4 @@
-<window id="7">
+<window>
 	<defaultcontrol always="true">95</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/addons/skin.confluence/720p/SlideShow.xml b/addons/skin.confluence/720p/SlideShow.xml
index df71874643..e131d79a05 100644
--- a/addons/skin.confluence/720p/SlideShow.xml
+++ b/addons/skin.confluence/720p/SlideShow.xml
@@ -1,4 +1,4 @@
-<window id="2007">
+<window>
 	<defaultcontrol>2</defaultcontrol>
 	<controls>
 		<control type="group" id="13">
diff --git a/addons/skin.confluence/720p/SmartPlaylistEditor.xml b/addons/skin.confluence/720p/SmartPlaylistEditor.xml
index 730db2e80d..cae4be957c 100644
--- a/addons/skin.confluence/720p/SmartPlaylistEditor.xml
+++ b/addons/skin.confluence/720p/SmartPlaylistEditor.xml
@@ -1,4 +1,4 @@
-<window id="136">
+<window>
 	<defaultcontrol always="true">22</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/SmartPlaylistRule.xml b/addons/skin.confluence/720p/SmartPlaylistRule.xml
index 4b1c675b39..85c2f563a7 100644
--- a/addons/skin.confluence/720p/SmartPlaylistRule.xml
+++ b/addons/skin.confluence/720p/SmartPlaylistRule.xml
@@ -1,4 +1,4 @@
-<window id="137">
+<window>
 	<defaultcontrol always="true">9001</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml
index b32ec14bae..5ebdb752be 100644
--- a/addons/skin.confluence/720p/VideoFullScreen.xml
+++ b/addons/skin.confluence/720p/VideoFullScreen.xml
@@ -1,4 +1,4 @@
-<window id="2005">
+<window>
  <defaultcontrol>-</defaultcontrol>
 	<controls>
 		<!-- media infos -->
diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index 0ce63a60bf..b114a5e5dc 100644
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -1,4 +1,4 @@
-<window id="2901">
+<window>
 	<defaultcontrol always="true">100</defaultcontrol>
 	<include>dialogeffect</include>
 	<coordinates>
diff --git a/addons/skin.confluence/720p/VideoOSDBookmarks.xml b/addons/skin.confluence/720p/VideoOSDBookmarks.xml
index a213a1bf79..0893e55e4b 100644
--- a/addons/skin.confluence/720p/VideoOSDBookmarks.xml
+++ b/addons/skin.confluence/720p/VideoOSDBookmarks.xml
@@ -1,4 +1,4 @@
-<window id="125">
+<window>
 	<defaultcontrol always="true">2</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/VideoOSDSettings.xml b/addons/skin.confluence/720p/VideoOSDSettings.xml
index fda0db66eb..f42566cdef 100644
--- a/addons/skin.confluence/720p/VideoOSDSettings.xml
+++ b/addons/skin.confluence/720p/VideoOSDSettings.xml
@@ -1,4 +1,4 @@
-<window id="123">
+<window>
 	<defaultcontrol>5</defaultcontrol>
 	<coordinates>
 		<system>1</system>
diff --git a/addons/skin.confluence/720p/VideoOverlay.xml b/addons/skin.confluence/720p/VideoOverlay.xml
index 28b36e8be5..8a8debc23a 100644
--- a/addons/skin.confluence/720p/VideoOverlay.xml
+++ b/addons/skin.confluence/720p/VideoOverlay.xml
@@ -1,4 +1,4 @@
-<window id="2904">
+<window>
 	<defaultcontrol>-</defaultcontrol>
 	<controls>
 	</controls>
diff --git a/addons/skin.confluence/720p/VisualisationPresetList.xml b/addons/skin.confluence/720p/VisualisationPresetList.xml
index 5fbbe34f78..d091473ce3 100644
--- a/addons/skin.confluence/720p/VisualisationPresetList.xml
+++ b/addons/skin.confluence/720p/VisualisationPresetList.xml
@@ -1,4 +1,4 @@
-<window id="122">
+<window>
 	<defaultcontrol>2</defaultcontrol>
 	<coordinates>
 		<system>1</system>