diff --git a/720p/Home.xml b/720p/Home.xml
index fbfeeaf..a1a6738 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -49,7 +49,7 @@
 		<control type="image">
 			<depth>DepthFloor</depth>
 			<left>-20</left>
-			<top></top>
+			<top/>
 			<bottom>0</bottom>
 			<width>1320</width>
 			<height>90</height>
@@ -492,10 +492,10 @@
 			<top>-20</top>
 			<width>1</width>
 			<height>1</height>
-			<label></label>
-			<font></font>
-			<texturefocus></texturefocus>
-			<texturenofocus></texturenofocus>
+			<label/>
+			<font/>
+			<texturefocus/>
+			<texturenofocus/>
 			<onleft>9000</onleft>
 			<onright>9000</onright>
 			<onup>20</onup>
@@ -560,7 +560,7 @@
 				<left>180</left>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
-				<defaultcontrol></defaultcontrol>
+				<defaultcontrol/>
 				<enable>Player.HasMedia</enable>
 				<control type="image">
 					<description>Background image</description>
@@ -578,7 +578,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDPrevTrackFO.png</texturefocus>
 						<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 						<onleft>608</onleft>
@@ -592,7 +592,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDRewindFO.png</texturefocus>
 						<texturenofocus>OSDRewindNF.png</texturenofocus>
 						<onleft>601</onleft>
@@ -606,7 +606,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDPauseFO.png</texturefocus>
 						<texturenofocus>OSDPauseNF.png</texturenofocus>
 						<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -623,7 +623,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDStopFO.png</texturefocus>
 						<texturenofocus>OSDStopNF.png</texturenofocus>
 						<onleft>603</onleft>
@@ -638,7 +638,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDForwardFO.png</texturefocus>
 						<texturenofocus>OSDForwardNF.png</texturenofocus>
 						<onleft>604</onleft>
@@ -652,7 +652,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDNextTrackFO.png</texturefocus>
 						<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 						<onleft>605</onleft>
@@ -669,7 +669,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDChannelUPFO.png</texturefocus>
 						<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 						<onleft>608</onleft>
@@ -683,7 +683,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDChannelDownFO.png</texturefocus>
 						<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 						<onleft>601</onleft>
@@ -697,7 +697,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDStopFO.png</texturefocus>
 						<texturenofocus>OSDStopNF.png</texturenofocus>
 						<onleft>602</onleft>
@@ -712,7 +712,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDPauseFO.png</texturefocus>
 						<texturenofocus>OSDPauseNF.png</texturenofocus>
 						<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -731,7 +731,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDRadioRDSFO.png</texturefocus>
 						<texturenofocus>OSDRadioRDSNF.png</texturenofocus>
 						<onleft>604</onleft>
@@ -747,7 +747,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label></label>
+						<label/>
 						<texturefocus>OSDRecordOffFO.png</texturefocus>
 						<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 						<onleft>605</onleft>
@@ -902,7 +902,7 @@
 				<onup condition="System.HasAddon(script.globalsearch)">608</onup>
 				<onup condition="!System.HasAddon(script.globalsearch)">603</onup>
 				<ondown>9001</ondown>
-				<pagecontrol></pagecontrol>
+				<pagecontrol/>
 				<scrolltime>300</scrolltime>
 				<focusposition>2</focusposition>
 				<movement>1</movement>
@@ -979,88 +979,88 @@
 						<label>31950</label>
 						<onclick condition="!String.IsEmpty(Weather.Plugin)">ActivateWindow(Weather)</onclick>
 						<onclick condition="String.IsEmpty(Weather.Plugin)">ActivateWindow(servicesettings,weather)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
 					</item>
 					<item id="4">
 						<label>31951</label>
 						<onclick>ActivateWindow(Pictures)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible>
 					</item>
 					<item id="14">
 						<label>31001</label>
 						<onclick>ActivateWindow(Games)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoGamesButton)</visible>
 					</item>
 					<item id="13">
 						<label>31960</label>
 						<onclick>ActivateWindow(RadioChannels)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>PVR.HasRadioChannels</visible>
 					</item>
 					<item id="12">
 						<label>31952</label>
 						<onclick>ActivateWindow(TVChannels)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>PVR.HasTVChannels</visible>
 					</item>
 					<item id="2">
 						<label>31953</label>
 						<onclick condition="String.IsEqual(Window.Property(VideosDirectLink),True)">ActivateWindow(Videos)</onclick>
 						<onclick condition="!String.IsEqual(Window.Property(VideosDirectLink),True)">ActivateWindow(Videos,root)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible>
 					</item>
 					<item id="10">
 						<label>31954</label>
 						<onclick>ActivateWindow(Videos,MovieTitles,return)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoMovieButton) + Library.HasContent(Movies)</visible>
 					</item>
 					<item id="11">
 						<label>31955</label>
 						<onclick>ActivateWindow(Videos,TVShowTitles,return)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoTVShowButton) + Library.HasContent(TVShows)</visible>
 					</item>
 					<item id="3">
 						<label>31956</label>
 						<onclick condition="String.IsEqual(Window.Property(MusicDirectLink),True)">ActivateWindow(Music)</onclick>
 						<onclick condition="!String.IsEqual(Window.Property(MusicDirectLink),True)">ActivateWindow(Music,root)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>
 					</item>
 					<item id="1">
 						<label>31957</label>
 						<onclick condition="!System.Platform.Android">ActivateWindow(Programs,Addons,return)</onclick>
 						<onclick condition="System.Platform.Android">ActivateWindow(Programs)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 						<visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible>
 					</item>
 					<item id="6">
 						<label>31958</label>
 						<onclick>PlayDVD()</onclick>
-						<icon></icon>
-						<thumb></thumb>
-						<visible>System.HasMediaDVD</visible>
+						<icon/>
+						<thumb/>
+						<visible>System.HasMediaDVD | System.HasMediaAudioCD</visible>
 					</item>
 					<item id="5">
 						<label>31959</label>
 						<onclick>ActivateWindow(Settings)</onclick>
-						<icon></icon>
-						<thumb></thumb>
+						<icon/>
+						<thumb/>
 					</item>
 				</content>
 			</control>
@@ -1183,7 +1183,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font></font>
+				<font/>
 				<onclick>ActivateWindow(ShutdownMenu)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -1208,7 +1208,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>1036</label>
-				<font></font>
+				<font/>
 				<onclick>ActivateWindow(Favourites)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
diff --git a/720p/IncludesHomeMenuItems.xml b/720p/IncludesHomeMenuItems.xml
index 0aa6df8..cf56110 100644
--- a/720p/IncludesHomeMenuItems.xml
+++ b/720p/IncludesHomeMenuItems.xml
@@ -243,7 +243,13 @@
 			<onclick>SetFocus(9000)</onclick>
 			<onclick>EjectTray()</onclick>
 		</control>
-		<control type="image" id="90133">
+		<control type="button" id="90133">
+			<include>ButtonHomeSubCommonValues</include>
+			<label>600</label>
+			<onclick>RipCD</onclick>
+			<visible>System.HasMediaAudioCD</visible>
+		</control>
+		<control type="image" id="90134">
 			<width>35</width>
 			<height>35</height>
 			<texture border="0,0,0,3">HomeSubEnd.png</texture>
@@ -355,35 +361,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton1))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton2))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton3))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton4))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton5))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton5))</visible>
 		</item>
 	</include>
@@ -392,35 +398,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton1))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton2))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton3))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton4))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton5))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton5))</visible>
 		</item>
 	</include>
@@ -429,35 +435,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton1))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton2))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton3))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton4))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton5))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton5))</visible>
 		</item>
 	</include>
@@ -466,35 +472,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton1))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton2))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton3))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton4))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton5))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton5))</visible>
 		</item>
 	</include>
@@ -503,35 +509,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeGameButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeGameButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeGameButton1))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeGameButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeGameButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeGameButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeGameButton2))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeGameButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeGameButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeGameButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeGameButton3))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeGameButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeGameButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeGameButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeGameButton4))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeGameButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeGameButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeGameButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeGameButton5))]</icon>
-			<thumb></thumb>
+			<thumb/>
 			<visible>!String.IsEmpty(Skin.String(HomeGameButton5))</visible>
 		</item>
 	</include>
diff --git a/addon.xml b/addon.xml
index 8811ddc..17b504c 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.5.10" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.5.11" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.14.0"/>
 	</requires>