diff --git a/720p/DialogAddonInfo.xml b/720p/DialogAddonInfo.xml
index c706bed..f18e200 100644
--- a/720p/DialogAddonInfo.xml
+++ b/720p/DialogAddonInfo.xml
@@ -224,8 +224,8 @@
 						<font>-</font>
 						<onleft>61</onleft>
 						<onright>9000</onright>
-						<ondown>-</ondown>
-						<onup>-</onup>
+						<ondown>noop</ondown>
+						<onup>noop</onup>
 						<textcolor>white</textcolor>
 						<showonepage>true</showonepage>
 					</control>
@@ -320,8 +320,8 @@
 						<font>-</font>
 						<onleft>9000</onleft>
 						<onright>60</onright>
-						<ondown>-</ondown>
-						<onup>-</onup>
+						<ondown>noop</ondown>
+						<onup>noop</onup>
 						<textcolor>white</textcolor>
 						<showonepage>true</showonepage>
 					</control>
diff --git a/720p/DialogFullScreenInfo.xml b/720p/DialogFullScreenInfo.xml
index fddea8f..ce38d51 100644
--- a/720p/DialogFullScreenInfo.xml
+++ b/720p/DialogFullScreenInfo.xml
@@ -22,7 +22,7 @@
 				<height>170</height>
 				<texture>black-back.png</texture>
 			</control>
-			<control type="label" id="1">
+			<control type="label">
 				<description>System Time Label</description>
 				<posx>1250</posx>
 				<posy>10</posy>
@@ -252,7 +252,7 @@
 					<font>font12</font>
 					<textcolor>white</textcolor>
 				</control>
-				<control type="label" id="1">
+				<control type="label">
 					<description>System Time Label</description>
 					<posx>1250</posx>
 					<posy>10</posy>
@@ -470,7 +470,7 @@
 					<font>font12</font>
 					<textcolor>white</textcolor>
 				</control>
-				<control type="label" id="1">
+				<control type="label">
 					<description>System Time Label</description>
 					<posx>1250</posx>
 					<posy>10</posy>
@@ -589,7 +589,7 @@
 				<height>170</height>
 				<texture>black-back.png</texture>
 			</control>
-			<control type="label" id="1">
+			<control type="label">
 				<description>System Time Label</description>
 				<posx>1250</posx>
 				<posy>10</posy>
@@ -752,7 +752,7 @@
 						<ondown>2</ondown>
 					</control>
 				</control>
-				<control type="label" id="1">
+				<control type="label">
 					<description>System Time Label</description>
 					<posx>1250</posx>
 					<posy>10</posy>
diff --git a/720p/MusicVisualisation.xml b/720p/MusicVisualisation.xml
index 9e15092..16b8b2d 100644
--- a/720p/MusicVisualisation.xml
+++ b/720p/MusicVisualisation.xml
@@ -1,4 +1,4 @@
-<window>
+<window>
 	<defaultcontrol>-</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
diff --git a/720p/Pointer.xml b/720p/Pointer.xml
index 7a0e423..036d53c 100644
--- a/720p/Pointer.xml
+++ b/720p/Pointer.xml
@@ -1,5 +1,5 @@
 <window>
-	<defaultcontrol>1</defaultcontrol>
+	<defaultcontrol>-/defaultcontrol>
 	<coordinates>
 		<system>1</system>
 		<posx>0</posx>
diff --git a/LICENSE.txt b/LICENSE.txt
index a92b505..82f999b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,3 +1,3 @@
-This work is licensed under the Creative Commons Attribution-Share Alike 3.0 United States License.
-
+This work is licensed under the Creative Commons Attribution-Share Alike 3.0 United States License.
+
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/us/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
\ No newline at end of file
diff --git a/addon.xml b/addon.xml
index d8bb8de..1b2ecd7 100644
--- a/addon.xml
+++ b/addon.xml
@@ -9,7 +9,7 @@
   </requires>
   <extension
     point="xbmc.gui.skin"
-    defaultthemename="textures.xbt"
+    defaultthemename="Textures.xbt"
     debugging="false"
     effectslowdown="1.0">
     <res width="1280" height="720" aspect="16:9" default="true" folder="720p" />
diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 536a5d5..2613a57 100644
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -1,81 +1,81 @@
-<!-- This file contains the mapping of actions to sounds                    -->
-
-<!-- The <actions> section contains global mapping                          -->
-
-<!-- To map a action to a sound, add a block like this to <actions>:        -->
-<!--    <action>                                                            -->
-<!--      <name>left</name>                                                 -->
-<!--      <file>cursor.wav</file>                                           -->
-<!--    </action>                                                           -->
-<!-- Where <name> specifies the action to map a sound to and <file> the wav -->
-<!-- file to play when the action occurs.                                   -->
-
-<!-- Valid entries for <name> can be found at                               -->
-<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=KeyMappingXML&v=6gu   -->
-
-
-<!-- Also window specific sound can be played                               -->
-
-<!-- To map a sound to a window, add a block like this to <windows>:        -->
-<!--    <window>                                                            -->
-<!--      <name>infodialog</name>                                           -->
-<!--      <activate>notify.wav</activate>                                   -->
-<!--      <deactivate>out.wav</deactivate>                                  -->
-<!--    </window>                                                           -->
-<!-- Where <name> specifies the window to map a sound to                    -->
-<!-- <activate> and <deactivate> are the events a sound can be mapped to    -->
-<!-- by setting the file to play.                                           -->
-
-<!-- Valid entries for <name> can be found at                               -->
-<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=WindowList&v=13k6     -->
-
-<!-- Note: Only wav files are supported                                     -->
-
-<sounds>
-  <actions>
-    <action>
-      <name>left</name>
-      <file>cursor.wav</file>
-    </action>
-    <action>
-      <name>right</name>
-      <file>cursor.wav</file>
-    </action>
-    <action>
-      <name>up</name>
-      <file>cursor.wav</file>
-    </action>
-    <action>
-      <name>down</name>
-      <file>cursor.wav</file>
-    </action>
-    <action>
-      <name>select</name>
-      <file>click.wav</file>
-    </action>
-    <action>
-      <name>parentdir</name>
-      <file>back.wav</file>
-    </action>
-    <action>
-      <name>previousmenu</name>
-      <file>back.wav</file>
-    </action>
-    <action>
-      <name>screenshot</name>
-      <file>shutter.wav</file>
-    </action>
-  </actions>
-
-  <windows>
-    <window>
-      <name>infodialog</name>
-      <activate>notify.wav</activate>
-      <deactivate>out.wav</deactivate>
-    </window>
-    <window>
-      <name>startup</name>
-      <activate></activate>
-    </window>
-  </windows>
-</sounds>
+<!-- This file contains the mapping of actions to sounds                    -->
+
+<!-- The <actions> section contains global mapping                          -->
+
+<!-- To map a action to a sound, add a block like this to <actions>:        -->
+<!--    <action>                                                            -->
+<!--      <name>left</name>                                                 -->
+<!--      <file>cursor.wav</file>                                           -->
+<!--    </action>                                                           -->
+<!-- Where <name> specifies the action to map a sound to and <file> the wav -->
+<!-- file to play when the action occurs.                                   -->
+
+<!-- Valid entries for <name> can be found at                               -->
+<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=KeyMappingXML&v=6gu   -->
+
+
+<!-- Also window specific sound can be played                               -->
+
+<!-- To map a sound to a window, add a block like this to <windows>:        -->
+<!--    <window>                                                            -->
+<!--      <name>infodialog</name>                                           -->
+<!--      <activate>notify.wav</activate>                                   -->
+<!--      <deactivate>out.wav</deactivate>                                  -->
+<!--    </window>                                                           -->
+<!-- Where <name> specifies the window to map a sound to                    -->
+<!-- <activate> and <deactivate> are the events a sound can be mapped to    -->
+<!-- by setting the file to play.                                           -->
+
+<!-- Valid entries for <name> can be found at                               -->
+<!-- http://manual.xboxmediacenter.de/wakka.php?wakka=WindowList&v=13k6     -->
+
+<!-- Note: Only wav files are supported                                     -->
+
+<sounds>
+  <actions>
+    <action>
+      <name>left</name>
+      <file>cursor.wav</file>
+    </action>
+    <action>
+      <name>right</name>
+      <file>cursor.wav</file>
+    </action>
+    <action>
+      <name>up</name>
+      <file>cursor.wav</file>
+    </action>
+    <action>
+      <name>down</name>
+      <file>cursor.wav</file>
+    </action>
+    <action>
+      <name>select</name>
+      <file>click.wav</file>
+    </action>
+    <action>
+      <name>parentdir</name>
+      <file>back.wav</file>
+    </action>
+    <action>
+      <name>previousmenu</name>
+      <file>back.wav</file>
+    </action>
+    <action>
+      <name>screenshot</name>
+      <file>shutter.wav</file>
+    </action>
+  </actions>
+
+  <windows>
+    <window>
+      <name>infodialog</name>
+      <activate>notify.wav</activate>
+      <deactivate>out.wav</deactivate>
+    </window>
+    <window>
+      <name>startup</name>
+      <activate></activate>
+    </window>
+  </windows>
+</sounds>