diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.extensions.dummy.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.extensions.dummy.xml
deleted file mode 100644
index a7385228cc2..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.extensions.dummy.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome DUMMY Focus</description>
-	 <type>image</type>
-	 <id>0</id>
-   <posX>1264</posX>
-   <posY>607</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_dummy.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(300)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>     
-	</control>     
-  <control>
-    <description>BasicHome DUMMY</description>
-    <type>button</type>
-    <id>300</id>
-		<posX>1274</posX>
-	  <posY>613</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>-</textureFocus>
-    <textureNoFocus>-</textureNoFocus>
-    <label></label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>600</onright>
-		<onleft>700</onleft>
-		<onup>200</onup>
-		<ondown>12</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.extensions.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.extensions.xml
deleted file mode 100644
index be7d501ba80..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.extensions.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome Extensions Focus</description>
-	 <type>image</type>
-	 <id>0</id>
-   <posX>1264</posX>
-   <posY>607</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_extensions.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(300)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>     
-	</control>     
-  <control>
-    <description>BasicHome Extensions</description>
-    <type>button</type>
-    <id>300</id>
-		<posX>1274</posX>
-	  <posY>613</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>801</hyperlink>
-    <label>100800</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>600</onright>
-		<onleft>700</onleft>
-		<onup>200</onup>
-		<ondown>12</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.infoservice.dummy.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.infoservice.dummy.xml
deleted file mode 100644
index a3f59ed4316..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.infoservice.dummy.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome DUMMY Focus</description>
-	 <type>image</type>
-	 <id>0</id>
- 	 <posX>653</posX>
-	 <posY>347</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_dummy.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(500)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>     
-	</control>     
-  <control>
-    <description>BasicHome DUMMY</description>
-    <type>button</type>
-    <id>500</id>
-		<posX>663</posX>
-	  <posY>353</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>-</textureFocus>
-    <textureNoFocus>-</textureNoFocus>
-    <label></label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>200</onright>
-		<onleft>400</onleft>
-		<onup>500</onup>
-		<ondown>700</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.infoservice.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.infoservice.xml
deleted file mode 100644
index b229bb4c8d2..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.infoservice.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome Infoservice Focus</description>
-	 <type>image</type>
-	 <id>0</id>
- 	 <posX>653</posX>
-	 <posY>347</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_infoservice.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(500)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>     
-	</control>     
-  <control>
-    <description>BasicHome Infoservice</description>
-    <type>button</type>
-    <id>500</id>
-		<posX>663</posX>
-	  <posY>353</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>16000</hyperlink>
-    <label>InfoService</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>200</onright>
-		<onleft>400</onleft>
-		<onup>500</onup>
-		<ondown>700</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.movingpictures.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.movingpictures.xml
deleted file mode 100644
index ccb0e6b5a01..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.movingpictures.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls>      
-    <control>
-      <description>BasicHome Movingictures</description>
-      <type>button</type>
-      <id>6</id>
-			<posX>1274</posX>
-	    <posY>353</posY>
-      <width>594</width>
-      <height>241</height>
-      <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-      <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>       
-      <label>#MovingPictures.Settings.HomeScreenName</label>
-      <font>TitanLight20</font>
-      <textcolor>FFFFFF</textcolor>
-			<textalign>center</textalign>   
-      <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-      <textYOff>176</textYOff>
-			<onright>400</onright>
-			<onleft>4</onleft>
-			<onup>6</onup>
-			<ondown>7</ondown>
-			<onclick>#(skin.setfocus(35,1100))</onclick>	
- 			<animation effect="fade" time="250" reversible="false">visiblechange</animation>
-      <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-      <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-      <animation effect="fade" time="250">WindowOpen</animation>
-      <animation effect="fade" time="250">WindowClose</animation>
-			<visible allowhiddenfocus="true">![control.hasfocus(12)|control.hasfocus(13)|control.hasfocus(14)|control.hasfocus(99999)|control.hasfocus(1000)|control.hasfocus(1001)|control.hasfocus(1002)|control.hasfocus(1003)|control.hasfocus(1004)|control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>   
-    </control>
-    
-    <control>
-      <description>submenu indicator</description>
-      <id>0</id>
-      <type>image</type>
-      <posX>1818</posX>
-      <posY>557</posY>
-      <width>22</width>
-      <height>20</height>
-      <texture>basichome_submenu_indicator.png</texture>
-			<visible>![Control.IsVisible(100)|Control.IsVisible(2000)|Control.IsVisible(3000)|control.hasfocus(1000)|control.hasfocus(1001)|control.hasfocus(1002)|control.hasfocus(1003)|control.hasfocus(1004)|control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>  
-      <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(4)">conditional</animation>
-	    <animation effect="fade" time="250">WindowOpen</animation>
-	    <animation effect="fade" time="150">WindowClose</animation>
-    </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.myfilms.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.myfilms.xml
deleted file mode 100644
index 1a2aa68ee5c..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.myfilms.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls>      
-    <control>
-      <description>BasicHome Videos</description>
-      <type>button</type>
-      <id>6</id>
-			<posX>1274</posX>
-	    <posY>353</posY>
-      <width>594</width>
-      <height>241</height>
-      <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-      <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-      <hyperlink>7986</hyperlink>        
-      <label>342</label>
-      <font>TitanLight20</font>
-      <textcolor>FFFFFF</textcolor>
-			<textalign>center</textalign>   
-      <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-      <textYOff>176</textYOff>
-			<onright>400</onright>
-			<onleft>4</onleft>
-			<onup>6</onup>
-			<ondown>7</ondown>
- 			<animation effect="fade" time="250" reversible="false">visiblechange</animation>
-      <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-      <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-      <animation effect="fade" time="250">WindowOpen</animation>
-      <animation effect="fade" time="250">WindowClose</animation>
-			<visible allowhiddenfocus="true">![control.hasfocus(12)|control.hasfocus(13)|control.hasfocus(14)|control.hasfocus(99999)|control.hasfocus(1000)|control.hasfocus(1001)|control.hasfocus(1002)|control.hasfocus(1003)|control.hasfocus(1004)|control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>   
-    </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.myvideo.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.myvideo.xml
deleted file mode 100644
index 029c6e80261..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.myvideo.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls>      
-    <control>
-      <description>BasicHome Videos</description>
-      <type>button</type>
-      <id>6</id>
-			<posX>1274</posX>
-	    <posY>353</posY>
-      <width>594</width>
-      <height>241</height>
-      <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-      <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-      <hyperlink>6</hyperlink>        
-      <label>3</label>
-      <font>TitanLight20</font>
-      <textcolor>FFFFFF</textcolor>
-			<textalign>center</textalign>   
-      <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-      <textYOff>176</textYOff>
-			<onright>400</onright>
-			<onleft>4</onleft>
-			<onup>6</onup>
-			<ondown>7</ondown>
- 			<animation effect="fade" time="250" reversible="false">visiblechange</animation>
-      <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-      <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-      <animation effect="fade" time="250">WindowOpen</animation>
-      <animation effect="fade" time="250">WindowClose</animation>
-			<visible allowhiddenfocus="true">![control.hasfocus(12)|control.hasfocus(13)|control.hasfocus(14)|control.hasfocus(99999)|control.hasfocus(1000)|control.hasfocus(1001)|control.hasfocus(1002)|control.hasfocus(1003)|control.hasfocus(1004)|control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>  
-    </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.onlinevideos.dummy.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.onlinevideos.dummy.xml
deleted file mode 100644
index 085e810ac46..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.onlinevideos.dummy.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome DUMMY Focus</description>
-	 <type>image</type>
-	 <id>0</id>
-	 <posX>1264</posX>
-   <posY>347</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_dummy.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(200)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>      
-	</control>     
-  <control>
-    <description>BasicHome DUMMY</description>
-    <type>button</type>
-    <id>200</id>
-		<posX>1274</posX>
-	  <posY>353</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>-</textureFocus>
-    <textureNoFocus>-</textureNoFocus>
-    <label></label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-    <onup>200</onup>
-		<onright>400</onright>
-		<onleft>500</onleft>
-		<ondown>300</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.onlinevideos.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.onlinevideos.xml
deleted file mode 100644
index ba2aec146d4..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.onlinevideos.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome Onlinevideos Focus</description>
-	 <type>image</type>
-	 <id>0</id>
-	 <posX>1264</posX>
-   <posY>347</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_onlinevideos.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(200)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>      
-	</control>     
-  <control>
-    <description>BasicHome Onlinevideos</description>
-    <type>button</type>
-    <id>200</id>
-		<posX>1274</posX>
-	  <posY>353</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>4755</hyperlink>
-    <label>Online Videos</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-    <onup>200</onup>
-		<onright>400</onright>
-		<onleft>500</onleft>
-		<ondown>300</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.plugins.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.plugins.xml
deleted file mode 100644
index c90b455fb74..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.plugins.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls>
-  <control>
-	 <description>BasicHome Plugins Focus</description>
-	 <type>image</type>
-	 <id>0</id>
- 	 <posX>1264</posX>
-	 <posY>607</posY>
-	 <width>623</width>
-	 <height>271</height>
-	 <texture>basichome_button_plugins.png</texture>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(7)">conditional</animation>
- 	 <animation effect="fade" time="250" reversible="false">visiblechange</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation> 
-	 <visible>![control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>      
-	</control>
-  
-  <control>
-    <description>BasicHome Plugins</description>
-    <type>button</type>
-    <id>7</id>
-		<posX>1274</posX>
-	  <posY>613</posY>
-    <width>594</width>
-    <height>241</height>
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>34</hyperlink>
-    <label>100034</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>600</onright>
-		<onleft>5</onleft>  
-		<ondown>12</ondown>
-		<onup>6</onup>
-		<ondown>12</ondown>
- 		<animation effect="fade" time="250" reversible="false">visiblechange</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-    <animation effect="fade" time="250">WindowOpen</animation>
-    <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">![control.hasfocus(12)|control.hasfocus(13)|control.hasfocus(14)|control.hasfocus(99999)|control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>  
-  </control>
-  
-	<!--            :: DUMMY BUTTON ON SECOND GROUP ::            -->
-  
-	<control>
-	 <description>BasicHome Plugins NoFocus</description>
-	 <type>image</type>
-	 <id>0</id>
-	 <posX>42</posX>
-	 <posY>607</posY>
-   <width>623</width>
-   <height>271</height>
-	 <texture>basichome_button_dummy.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(3000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(600)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>         
-	</control>
-  <control>
-    <description>BasicHome Plugins</description>
-    <type>button</type>
-    <id>600</id>
-		<posX>52</posX>
-	  <posY>613</posY>
-    <width>594</width>
-    <height>241</height>
-    <textureFocus>-</textureFocus>
-    <textureNoFocus>-</textureNoFocus>
-    <label></label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>700</onright>
-		<onleft>7</onleft>
-		<ondown>12</ondown>
-		<onup>400</onup>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-  	<animation effect="fade" time="250">WindowOpen</animation>
-  	<animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>    
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.trakt.dummy.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.trakt.dummy.xml
deleted file mode 100644
index 9a97abff135..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.trakt.dummy.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome DUMMY Focus</description>
-	 <type>image</type>
-	 <id>0</id>
-   <posX>653</posX>
-	 <posY>607</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_dummy.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(700)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	<visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>     
-	</control>     
-  <control>
-    <description>BasicHome DUMMY</description>
-    <type>button</type>
-    <id>700</id>
-		<posX>663</posX>
-	  <posY>613</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>-</textureFocus>
-    <textureNoFocus>-</textureNoFocus>
-    <label></label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>300</onright>
-		<onleft>600</onleft>
-		<onup>500</onup>
- 		<ondown>12</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.trakt.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.trakt.xml
deleted file mode 100644
index 9ea7a43ee2d..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.trakt.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome Trakt Focus</description>
-	 <type>image</type>
-	 <id>0</id>
-   <posX>653</posX>
-	 <posY>607</posY>
-   <width>624</width>
-   <height>271</height>
-	 <texture>basichome_button_trakt.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(700)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	<visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>     
-	</control>     
-  <control>
-    <description>BasicHome Trakt</description>
-    <type>button</type>
-    <id>700</id>
-		<posX>663</posX>
-	  <posY>613</posY>
-    <width>594</width>
-    <height>241</height> 
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>87258</hyperlink>
-    <label>Trakt</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>300</onright>
-		<onleft>600</onleft>
-		<onup>500</onup>
-		<ondown>12</ondown>
-	  <animation effect="fade" time="250" condition="!control.isvisible(2000)">conditional</animation>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-	  <animation effect="fade" time="250">WindowOpen</animation>
-	  <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible> 
-  </control>
-</controls>
-</window>
\ No newline at end of file
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.tvseries.xml b/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.tvseries.xml
deleted file mode 100644
index 8e061e1f680..00000000000
--- a/mediaportal/MediaPortal.Base/skin/Titan/include.BasicHomeButton.tvseries.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
-<controls> 
-  <control>
-	 <description>BasicHome TVSeries Focus</description>
-	 <type>image</type>
-	 <id>0</id>
- 	 <posX>1264</posX>
-	 <posY>607</posY>
-	 <width>623</width>
-	 <height>271</height>
-	 <texture>basichome_button_series.png</texture>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(7)">conditional</animation>
- 	 <animation effect="fade" time="250" reversible="false">visiblechange</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation> 
-	 <visible>![control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>      
-	</control>     
-  <control>
-    <description>BasicHome TVSeries</description>
-    <type>button</type>
-    <id>7</id>
-		<posX>1274</posX>
-	  <posY>613</posY>
-    <width>593</width>
-    <height>241</height>
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>9811</hyperlink>
-    <label>1300</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>600</onright>
-		<onleft>5</onleft>  
-		<ondown>12</ondown>
-		<onup>6</onup>
- 		<animation effect="fade" time="250" reversible="false">visiblechange</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-    <animation effect="fade" time="250">WindowOpen</animation>
-    <animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">![control.hasfocus(12)|control.hasfocus(13)|control.hasfocus(14)|control.hasfocus(99999)|control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>  
-  </control>
-  
-	<!--            :: PLUGINS BUTTON ON SECOND GROUP ::            -->
-  
-	<control>
-	 <description>BasicHome Plugins NoFocus</description>
-	 <type>image</type>
-	 <id>0</id>
- 	 <posX>43</posX>
-	 <posY>607</posY>
-	 <width>623</width>
-	 <height>271</height>
-	 <texture>basichome_button_plugins.png</texture>
-	 <animation effect="fade" time="250" condition="!control.isvisible(3000)">conditional</animation>
- 	 <animation effect="slide" start="700" end="0" time="600">visible</animation>
-	 <animation effect="fade" time="250">visible</animation>
-	 <animation effect="zoom" start="100,100" end="102,102" time="200" condition="control.hasfocus(600)">conditional</animation>
-	 <animation effect="fade" time="250">WindowOpen</animation>
-	 <animation effect="fade" time="250">WindowClose</animation>
-	 <visible>control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)</visible>         
-	</control> 
-  <control>
-    <description>BasicHome Plugins</description>
-    <type>button</type>
-    <id>600</id>
-		<posX>53</posX>
-	  <posY>613</posY>
-    <width>593</width>
-    <height>241</height>
-    <textureFocus>basichome_menu_item_label_overlay.png</textureFocus>
-    <textureNoFocus>basichome_menu_item_label_overlay.png</textureNoFocus>
-    <hyperlink>34</hyperlink>
-    <label>913</label>
-    <font>TitanLight20</font>
-    <textcolor>FFFFFF</textcolor>
-		<textalign>center</textalign>   
-    <textcolorNoFocus>FFFFFFFF</textcolorNoFocus>
-    <textYOff>176</textYOff>
-		<onright>700</onright>
-		<onleft>7</onleft>
-		<ondown>12</ondown>
-		<onup>400</onup>
- 		<animation effect="slide" start="700" end="0" time="600">visible</animation>
-		<animation effect="fade" time="250">visible</animation>
-    <animation effect="zoom" start="100,100" end="102,102" time="200">focus</animation>
-    <animation effect="zoom" start="102,102" end="100,100" time="150">unfocus</animation>
-  	<animation effect="fade" time="250">WindowOpen</animation>
-  	<animation effect="fade" time="250">WindowClose</animation>
-		<visible allowhiddenfocus="true">[control.HasFocus(200) | control.HasFocus(300) | control.HasFocus(400) | control.HasFocus(500) | control.HasFocus(600) | control.HasFocus(700)]</visible>    
-  </control>
-</controls>
-</window>
\ No newline at end of file