diff --git a/720p/AddonBrowser.xml b/720p/AddonBrowser.xml
index 4f900a6..032ed5d 100644
--- a/720p/AddonBrowser.xml
+++ b/720p/AddonBrowser.xml
@@ -26,7 +26,7 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_addons" />
 			<param name="Label" value="$LOCALIZE[24001]" />
 		</include>
diff --git a/720p/DialogAddonInfo.xml b/720p/DialogAddonInfo.xml
index d4991c0..4a45994 100644
--- a/720p/DialogAddonInfo.xml
+++ b/720p/DialogAddonInfo.xml
@@ -11,7 +11,7 @@
 		<control type="group">
 			<include>VisibleFadeEffect</include>
 			<visible>!Window.isVisible(AddonSettings) + !Window.IsActive(TextViewer)</visible>
-			<include name="DialogBackgroundCommons">
+			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="920" />
 				<param name="DialogBackgroundHeight" value="639" />
 				<param name="DialogHeaderWidth" value="840" />
diff --git a/720p/DialogAddonSettings.xml b/720p/DialogAddonSettings.xml
index 10b4896..0d669ed 100644
--- a/720p/DialogAddonSettings.xml
+++ b/720p/DialogAddonSettings.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="800" />
 			<param name="DialogBackgroundHeight" value="600" />
 			<param name="DialogHeaderWidth" value="720" />
diff --git a/720p/DialogConfirm.xml b/720p/DialogConfirm.xml
index a854a1e..3a07951 100644
--- a/720p/DialogConfirm.xml
+++ b/720p/DialogConfirm.xml
@@ -7,7 +7,7 @@
 	<include>dialogeffect</include>
 	<depth>DepthDialog+</depth>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="650" />
 			<param name="DialogBackgroundHeight" value="260" />
 			<param name="DialogHeaderWidth" value="570" />
diff --git a/720p/DialogGameControllers.xml b/720p/DialogGameControllers.xml
index 30c60b1..ef98a66 100644
--- a/720p/DialogGameControllers.xml
+++ b/720p/DialogGameControllers.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="1120" />
 			<param name="DialogBackgroundHeight" value="590" />
 			<param name="DialogHeaderWidth" value="1020" />
diff --git a/720p/DialogKeyboard.xml b/720p/DialogKeyboard.xml
index 901cf47..7f215c4 100644
--- a/720p/DialogKeyboard.xml
+++ b/720p/DialogKeyboard.xml
@@ -11,7 +11,7 @@
 		<control type="group">
 			<include>VisibleFadeEffect</include>
 			<visible>!Window.IsVisible(numericinput)</visible>
-			<include name="DialogBackgroundCommons">
+			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="860" />
 				<param name="DialogBackgroundHeight" value="430" />
 				<param name="DialogHeaderWidth" value="780" />
diff --git a/720p/DialogMediaSource.xml b/720p/DialogMediaSource.xml
index f1cf500..a4fcd37 100644
--- a/720p/DialogMediaSource.xml
+++ b/720p/DialogMediaSource.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="800" />
 			<param name="DialogBackgroundHeight" value="500" />
 			<param name="DialogHeaderWidth" value="720" />
diff --git a/720p/DialogMusicInfo.xml b/720p/DialogMusicInfo.xml
index b527d54..0c6b892 100644
--- a/720p/DialogMusicInfo.xml
+++ b/720p/DialogMusicInfo.xml
@@ -179,7 +179,7 @@
 					<texture>$VAR[MusicInfoListThumb]</texture>
 					<aspectratio>keep</aspectratio>
 				</control>
-				<include name="MusicInfoPanel" condition="Container.Content(Artists) | Container.Content(Albums)">
+				<include content="MusicInfoPanel" condition="Container.Content(Artists) | Container.Content(Albums)">
 					<param name="panel-left" value="340"/>
 					<param name="panel-width" value="900"/>
 					<param name="item-width" value="450"/>
diff --git a/720p/DialogPVRChannelManager.xml b/720p/DialogPVRChannelManager.xml
index e18b6e7..841e6d2 100644
--- a/720p/DialogPVRChannelManager.xml
+++ b/720p/DialogPVRChannelManager.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="1120" />
 			<param name="DialogBackgroundHeight" value="570" />
 			<param name="DialogHeaderWidth" value="1020" />
diff --git a/720p/DialogPVRGuideSearch.xml b/720p/DialogPVRGuideSearch.xml
index 795195c..df8ca30 100644
--- a/720p/DialogPVRGuideSearch.xml
+++ b/720p/DialogPVRGuideSearch.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="865" />
 			<param name="DialogBackgroundHeight" value="605" />
 			<param name="DialogHeaderWidth" value="785" />
diff --git a/720p/DialogPVRInfo.xml b/720p/DialogPVRInfo.xml
index 87f1803..74f4e9b 100644
--- a/720p/DialogPVRInfo.xml
+++ b/720p/DialogPVRInfo.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="830" />
 			<param name="DialogBackgroundHeight" value="660" />
 			<param name="DialogHeaderWidth" value="750" />
diff --git a/720p/DialogSettings.xml b/720p/DialogSettings.xml
index d5a1ca0..36d6f0e 100644
--- a/720p/DialogSettings.xml
+++ b/720p/DialogSettings.xml
@@ -11,7 +11,7 @@
 			<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">
+			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="800" />
 				<param name="DialogBackgroundHeight" value="458" />
 				<param name="DialogHeaderWidth" value="720" />
diff --git a/720p/EventLog.xml b/720p/EventLog.xml
index 103bdfd..d143bcb 100644
--- a/720p/EventLog.xml
+++ b/720p/EventLog.xml
@@ -182,7 +182,7 @@
 				<visible>Control.IsVisible(570)</visible>
 			</control>
 		</control>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_events" />
 			<param name="Label" value="$LOCALIZE[14111]" />
 		</include>
diff --git a/720p/FileManager.xml b/720p/FileManager.xml
index da06a88..2e00294 100644
--- a/720p/FileManager.xml
+++ b/720p/FileManager.xml
@@ -444,7 +444,7 @@
 				<texture>icon_home.png</texture>
 			</control>
 		</control>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_system" />
 			<param name="Label" value="$LOCALIZE[7]" />
 		</include>
diff --git a/720p/MyMusicNav.xml b/720p/MyMusicNav.xml
index 8d726fc..e9cc2ce 100644
--- a/720p/MyMusicNav.xml
+++ b/720p/MyMusicNav.xml
@@ -38,7 +38,7 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_music" />
 			<param name="Label" value="$LOCALIZE[10516]" />
 		</include>
diff --git a/720p/MyMusicPlaylistEditor.xml b/720p/MyMusicPlaylistEditor.xml
index 176f862..dd13311 100644
--- a/720p/MyMusicPlaylistEditor.xml
+++ b/720p/MyMusicPlaylistEditor.xml
@@ -396,7 +396,7 @@
 				</focusedlayout>
 			</control>
 		</control>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_music" />
 			<param name="Label" value="$LOCALIZE[10503]" />
 		</include>
diff --git a/720p/MyPics.xml b/720p/MyPics.xml
index 0560517..5846f4f 100644
--- a/720p/MyPics.xml
+++ b/720p/MyPics.xml
@@ -44,7 +44,7 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_pictures" />
 			<param name="Label" value="$LOCALIZE[1]" />
 		</include>
diff --git a/720p/MyPlaylist.xml b/720p/MyPlaylist.xml
index 2919831..470b82c 100644
--- a/720p/MyPlaylist.xml
+++ b/720p/MyPlaylist.xml
@@ -24,11 +24,11 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader" condition="Window.IsActive(videoplaylist)">
+		<include content="CommonWindowHeader" condition="Window.IsActive(videoplaylist)">
 			<param name="Icon" value="icon_video" />
 			<param name="Label" value="$LOCALIZE[10522]" />
 		</include>
-		<include name="CommonWindowHeader" condition="Window.IsActive(musicplaylist)">
+		<include content="CommonWindowHeader" condition="Window.IsActive(musicplaylist)">
 			<param name="Icon" value="icon_music" />
 			<param name="Label" value="$LOCALIZE[10517]" />
 		</include>
diff --git a/720p/MyPrograms.xml b/720p/MyPrograms.xml
index 1e27c6c..5e1a44d 100644
--- a/720p/MyPrograms.xml
+++ b/720p/MyPrograms.xml
@@ -28,7 +28,7 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_addons" />
 			<param name="Label" value="$LOCALIZE[0]" />
 		</include>
diff --git a/720p/MyVideoNav.xml b/720p/MyVideoNav.xml
index e396a2e..c6a2ab9 100644
--- a/720p/MyVideoNav.xml
+++ b/720p/MyVideoNav.xml
@@ -44,7 +44,7 @@
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_video" />
 			<param name="Label" value="$LOCALIZE[3]" />
 		</include>
diff --git a/720p/MyWeather.xml b/720p/MyWeather.xml
index 8c6cdbd..eca8aed 100644
--- a/720p/MyWeather.xml
+++ b/720p/MyWeather.xml
@@ -17,7 +17,7 @@
 			<visible>System.HasAddon(resource.images.weatherfanart.multi)</visible>
 			<animation effect="fade" time="150">WindowClose</animation>
 		</control>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_weather" />
 			<param name="Label" value="$LOCALIZE[8]" />
 		</include>
diff --git a/720p/Settings.xml b/720p/Settings.xml
index f37230b..590cb3c 100644
--- a/720p/Settings.xml
+++ b/720p/Settings.xml
@@ -249,7 +249,7 @@
 		</control>
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_system" />
 			<param name="Label" value="$LOCALIZE[5]" />
 		</include>
diff --git a/720p/SettingsCategory.xml b/720p/SettingsCategory.xml
index 75da7a9..e51c76f 100644
--- a/720p/SettingsCategory.xml
+++ b/720p/SettingsCategory.xml
@@ -279,7 +279,7 @@
 			<include>CommonNowPlaying</include>
 		</control>
 		<include>MainWindowMouseButtons</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_system" />
 			<param name="Label" value="$LOCALIZE[5]" />
 			<param name="ShowLabel2" value="true" />
diff --git a/720p/SettingsProfile.xml b/720p/SettingsProfile.xml
index 61c8cf5..51f6dc4 100644
--- a/720p/SettingsProfile.xml
+++ b/720p/SettingsProfile.xml
@@ -379,7 +379,7 @@
 		</control>
 		<include>MainWindowMouseButtons</include>
 		<include>BehindDialogFadeOut</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_system" />
 			<param name="Label" value="$LOCALIZE[13200]" />
 		</include>
diff --git a/720p/SettingsSystemInfo.xml b/720p/SettingsSystemInfo.xml
index a8da755..df9f2a2 100644
--- a/720p/SettingsSystemInfo.xml
+++ b/720p/SettingsSystemInfo.xml
@@ -368,7 +368,7 @@
 		</control>
 		<include>CommonNowPlaying</include>
 		<include>MainWindowMouseButtons</include>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_system" />
 			<param name="Label" value="$LOCALIZE[130]" />
 		</include>
diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
index 4f01b23..60a6e89 100644
--- a/720p/SkinSettings.xml
+++ b/720p/SkinSettings.xml
@@ -11,7 +11,7 @@
 			<texture>floor.png</texture>
 			<include>VisibleFadeEffect</include>
 		</control>
-		<include name="CommonWindowHeader">
+		<include content="CommonWindowHeader">
 			<param name="Icon" value="icon_system" />
 			<param name="Label" value="$LOCALIZE[20077]" />
 		</include>
diff --git a/720p/SmartPlaylistEditor.xml b/720p/SmartPlaylistEditor.xml
index a352524..a868416 100644
--- a/720p/SmartPlaylistEditor.xml
+++ b/720p/SmartPlaylistEditor.xml
@@ -10,7 +10,7 @@
 		<control type="group">
 			<visible>!Window.IsVisible(smartplaylistrule)</visible>
 			<include>VisibleFadeEffect</include>
-			<include name="DialogBackgroundCommons">
+			<include content="DialogBackgroundCommons">
 				<param name="DialogBackgroundWidth" value="800" />
 				<param name="DialogBackgroundHeight" value="675" />
 				<param name="DialogHeaderWidth" value="720" />
diff --git a/720p/SmartPlaylistRule.xml b/720p/SmartPlaylistRule.xml
index fdc89f4..435c181 100644
--- a/720p/SmartPlaylistRule.xml
+++ b/720p/SmartPlaylistRule.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="800" />
 			<param name="DialogBackgroundHeight" value="280" />
 			<param name="DialogHeaderWidth" value="720" />
diff --git a/720p/ViewsWeather.xml b/720p/ViewsWeather.xml
index 2393474..0720e80 100644
--- a/720p/ViewsWeather.xml
+++ b/720p/ViewsWeather.xml
@@ -292,67 +292,67 @@
 						<onclick>noop</onclick>
 						<visible>!Weather.IsFetched</visible>
 					</item>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="0" />
 					</include>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="1" />
 					</include>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="2" />
 					</include>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="3" />
 					</include>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="4" />
 					</include>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="5" />
 					</include>
-					<include name="WeatherDefaultItem">
+					<include content="WeatherDefaultItem">
 						<param name="item_id" value="6" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="1" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="2" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="3" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="4" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="5" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="6" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="7" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="8" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="9" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="10" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="11" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="12" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="13" />
 					</include>
-					<include name="WeatherDailyItem">
+					<include content="WeatherDailyItem">
 						<param name="item_id" value="14" />
 					</include>
 				</content>
@@ -1007,76 +1007,76 @@
 						<onclick>noop</onclick>
 						<visible>String.IsEmpty(Window.Property(Hourly.IsFetched))</visible>
 					</item>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="1" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="2" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="3" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="4" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="5" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="6" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="7" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="8" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="9" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="10" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="11" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="12" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="13" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="14" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="15" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="16" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="17" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="18" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="19" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="20" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="21" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="22" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="23" />
 					</include>
-					<include name="WeatherHourlyItem">
+					<include content="WeatherHourlyItem">
 						<param name="item_id" value="24" />
 					</include>
 				</content>
@@ -1251,19 +1251,19 @@
 					</control>
 				</focusedlayout>
 				<content>
-					<include name="WeatherMapItem">
+					<include content="WeatherMapItem">
 						<param name="item_id" value="1" />
 					</include>
-					<include name="WeatherMapItem">
+					<include content="WeatherMapItem">
 						<param name="item_id" value="2" />
 					</include>
-					<include name="WeatherMapItem">
+					<include content="WeatherMapItem">
 						<param name="item_id" value="3" />
 					</include>
-					<include name="WeatherMapItem">
+					<include content="WeatherMapItem">
 						<param name="item_id" value="4" />
 					</include>
-					<include name="WeatherMapItem">
+					<include content="WeatherMapItem">
 						<param name="item_id" value="5" />
 					</include>
 				</content>
diff --git a/720p/includes.xml b/720p/includes.xml
index 4b80e37..93ebb7a 100644
--- a/720p/includes.xml
+++ b/720p/includes.xml
@@ -1392,7 +1392,7 @@
 		<font>font13</font>
 		<focusedcolor>black</focusedcolor>
 	</include>
-	<include name="CommonWindowHeader">
+	<include content="CommonWindowHeader">
 		<param name="Icon" default="icon_home" />
 		<param name="Label" default="" />
 		<param name="ShowLabel2" default="False" />
diff --git a/720p/script-RSS_Editor-rssEditor.xml b/720p/script-RSS_Editor-rssEditor.xml
index 81fc051..a272f03 100644
--- a/720p/script-RSS_Editor-rssEditor.xml
+++ b/720p/script-RSS_Editor-rssEditor.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="800" />
 			<param name="DialogBackgroundHeight" value="420" />
 			<param name="DialogHeaderWidth" value="720" />
diff --git a/720p/script-RSS_Editor-setEditor.xml b/720p/script-RSS_Editor-setEditor.xml
index 81fc051..a272f03 100644
--- a/720p/script-RSS_Editor-setEditor.xml
+++ b/720p/script-RSS_Editor-setEditor.xml
@@ -7,7 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
+		<include content="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="800" />
 			<param name="DialogBackgroundHeight" value="420" />
 			<param name="DialogHeaderWidth" value="720" />
diff --git a/addon.xml b/addon.xml
index 4702ad4..bb3cdb7 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.6"
+  version="3.0.7"
   name="Confluence"
   provider-name="Jezz_X, Team Kodi">
   <requires>
diff --git a/changelog.txt b/changelog.txt
index 29f3fa4..b839271 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+[B]3.0.7[/B]
+
+- Updated include calls
+
 [B]3.0.6[/B]
 
 - Added game controller support