diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml
index df00c4a..cf12973 100644
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@@ -142,7 +142,7 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>textActive</selectedcolor>
-                            <label>$LOCALIZE[31208]: $INFO[listitem.label]</label>
+                            <label>$LOCALIZE[573]: $INFO[listitem.label]</label>
                             <shadowcolor></shadowcolor>
                         </control>
                     </itemlayout>
@@ -166,7 +166,7 @@
                             <font>itemTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
-                            <label>$LOCALIZE[31208]: $INFO[listitem.label]</label>
+                            <label>$LOCALIZE[573]: $INFO[listitem.label]</label>
                             <shadowcolor></shadowcolor>
                         </control>
                     </focusedlayout>
@@ -203,7 +203,7 @@
                     <aligny>center</aligny>
                     <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
-                    <label>$LOCALIZE[31210]:</label>
+                    <label>$LOCALIZE[551]:</label>
                     <shadowcolor></shadowcolor>
                 </control>
             </control>
diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index a2dfcf1..0e975bf 100644
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -141,7 +141,7 @@
 						<width>4-col-gutter</width>
 						<font>itemSubTitle</font>
 						<textcolor>textActive</textcolor>
-						<label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
+						<label fallback="13205">[B]$INFO[ListItem.label2][/B]</label>
 						<shadowcolor></shadowcolor>
 					</control>
 				</itemlayout>
@@ -149,7 +149,7 @@
                 </focusedlayout>
 				<content>
 					<item>
-						<label>$LOCALIZE[31140]</label>
+						<label>$LOCALIZE[21894]</label>
 						<label2>$INFO[ListItem.Property(Artist_Formed)]</label2>
 						<thumb></thumb>
 					</item>
@@ -159,12 +159,12 @@
 						<thumb></thumb>
 					</item>
 					<item>
-						<label>$LOCALIZE[31141]</label>
+						<label>$LOCALIZE[21898]</label>
 						<label2>$INFO[ListItem.Property(Artist_YearsActive)]</label2>
 						<thumb></thumb>
 					</item>
 					<item>
-						<label>$LOCALIZE[31193]</label>
+						<label>$LOCALIZE[180]</label>
 						<label2>$INFO[ListItem.Property(Artist_Style)]</label2>
 						<thumb></thumb>
 					</item>
@@ -376,7 +376,7 @@
 							<width>4-col-gutter</width>
 							<font>itemSubTitle</font>
 							<textcolor>textActive</textcolor>
-							<label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
+							<label fallback="13205">[B]$INFO[ListItem.label2][/B]</label>
 							<shadowcolor></shadowcolor>
 						</control>
 					</itemlayout>
@@ -389,17 +389,17 @@
 							<thumb></thumb>
 						</item>
 						<item>
-							<label>$LOCALIZE[31150]</label>
+							<label>$LOCALIZE[21899]</label>
 							<label2>$INFO[ListItem.Property(Album_Label)]</label2>
 							<thumb></thumb>
 						</item>
 						<item>
-							<label>$LOCALIZE[31167]</label>
+							<label>$LOCALIZE[515]</label>
 							<label2>$INFO[ListItem.Genre]</label2>
 							<thumb></thumb>
 						</item>
 						<item>
-							<label>$LOCALIZE[31148]</label>
+							<label>$LOCALIZE[736]</label>
 							<label2>$INFO[ListItem.Property(Album_Style)]</label2>
 							<thumb></thumb>
 						</item>
@@ -568,7 +568,7 @@
 					<font>itemTitle</font>
 					<textcolor>textActive</textcolor>
 					<shadowcolor></shadowcolor>
-					<label>[COLOR highlight]$LOCALIZE[31129][/COLOR] $INFO[ListItem.artist]</label>
+					<label>[COLOR highlight]$LOCALIZE[557][/COLOR] $INFO[ListItem.artist]</label>
 				</control>
 				<control type="label">
 					<posx>0</posx>
@@ -579,7 +579,7 @@
 					<font>itemTitle</font>
 					<textcolor>textActive</textcolor>
 					<shadowcolor></shadowcolor>
-					<label>[COLOR highlight]$LOCALIZE[31130][/COLOR] $INFO[ListItem.year]</label>
+					<label>[COLOR highlight]$LOCALIZE[562][/COLOR] $INFO[ListItem.year]</label>
 				</control>
 				<control type="label">
 					<posx>0</posx>
@@ -590,7 +590,7 @@
 					<font>itemTitle</font>
 					<textcolor>textActive</textcolor>
 					<shadowcolor></shadowcolor>
-					<label>[COLOR highlight]$LOCALIZE[31193][/COLOR] $INFO[ListItem.duration]</label>
+					<label>[COLOR highlight]$LOCALIZE[180][/COLOR] $INFO[ListItem.duration]</label>
 				</control>
 				<!--col 2-->
 				<control type="label">
@@ -602,7 +602,7 @@
 					<font>itemTitle</font>
 					<textcolor>textActive</textcolor>
 					<shadowcolor></shadowcolor>
-					<label>[COLOR highlight]$LOCALIZE[31166][/COLOR] $INFO[ListItem.album]</label>
+					<label>[COLOR highlight]$LOCALIZE[558][/COLOR] $INFO[ListItem.album]</label>
 				</control>
 				<control type="label">
 					<posx>6-col</posx>
@@ -613,7 +613,7 @@
 					<font>itemTitle</font>
 					<textcolor>textActive</textcolor>
 					<shadowcolor></shadowcolor>
-					<label>[COLOR highlight]$LOCALIZE[31167][/COLOR] $INFO[ListItem.genre]</label>
+					<label>[COLOR highlight]$LOCALIZE[515][/COLOR] $INFO[ListItem.genre]</label>
 				</control>
 				<control type="label">
 					<posx>6-col</posx>
@@ -624,7 +624,7 @@
 					<font>itemTitle</font>
 					<textcolor>textActive</textcolor>
 					<shadowcolor></shadowcolor>
-					<label>[COLOR highlight]$LOCALIZE[31168][/COLOR] $INFO[ListItem.UserRating]</label>
+					<label>[COLOR highlight]$LOCALIZE[563][/COLOR] $INFO[ListItem.UserRating]</label>
 				</control>
 				<!--synopsis-->
 				<control type="textbox">
@@ -724,7 +724,7 @@
 					</focusedlayout>
 					<content>
 						<item id="1">
-							<label>31075</label>
+							<label>208</label>
 							<label2></label2>
 							<thumb></thumb>
 							<onclick>dialog.close(all,true)</onclick>
diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml
index e89263b..3fb0be7 100644
--- a/1080i/DialogPVRChannelManager.xml
+++ b/1080i/DialogPVRChannelManager.xml
@@ -81,7 +81,7 @@
                     <aligny>center</aligny>
                     <font>itemSubTitle</font>
                     <textcolor>textActive</textcolor>
-                    <label>$LOCALIZE[31214]</label>
+                    <label>$LOCALIZE[19029]</label>
                 </control>
                 <control type="list" id="20">
                     <posx>0</posx>
diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml
index a256602..6341f04 100644
--- a/1080i/DialogPVRGroupManager.xml
+++ b/1080i/DialogPVRGroupManager.xml
@@ -67,7 +67,7 @@
                 <aligny>center</aligny>
                 <font>itemSubTitle</font>
                 <textcolor>textActive</textcolor>
-                <label>$LOCALIZE[31194]</label>
+                <label>$LOCALIZE[19141]</label>
             </control>
             <control type="group">
                 <posx>0</posx>
diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml
index d9dd569..7d783dd 100644
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@@ -56,7 +56,7 @@
                             <width>324</width>
                             <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
+                            <label fallback="13205">[B]$INFO[ListItem.label2][/B]</label>
                             <shadowcolor></shadowcolor>
                         </control>
                     </itemlayout>
@@ -64,22 +64,22 @@
                     </focusedlayout>
                     <content>
                         <item>
-                            <label>$LOCALIZE[31214]</label>
+                            <label>$LOCALIZE[19029]</label>
                             <label2>$INFO[ListItem.channelname]</label2>
                             <thumb></thumb>
                         </item>
                         <item>
-                            <label>$LOCALIZE[31192]</label>
+                            <label>$LOCALIZE[552]</label>
                             <label2>$INFO[ListItem.startdate]</label2>
                             <thumb></thumb>
                         </item>
                         <item>
-                            <label>$LOCALIZE[31167]</label>
+                            <label>$LOCALIZE[515]</label>
                             <label2>$INFO[ListItem.genre]</label2>
                             <thumb></thumb>
                         </item>
                         <item>
-                            <label>$LOCALIZE[31193]</label>
+                            <label>$LOCALIZE[180]</label>
                             <label2>$INFO[ListItem.duration]</label2>
                             <thumb></thumb>
                         </item>
@@ -192,14 +192,14 @@
                     <content>
                         <item id="1">
 							<visible>window.isactive(tvchannels) | window.isactive(radiochannels) | window.isactive(tvguide)</visible>
-                            <label>31075</label>
+                            <label>208</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>sendclick(pvrguideinfo,5)</onclick>
                         </item>
 						<item id="2">
 							<visible>window.isactive(tvrecordings) | window.isactive(radiorecordings)</visible>
-                            <label>31075</label>
+                            <label>208</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>sendclick(pvrrecordinginfo,8)</onclick>
diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml
index 2fbdce1..ee6d7c0 100644
--- a/1080i/DialogPictureInfo.xml
+++ b/1080i/DialogPictureInfo.xml
@@ -40,7 +40,7 @@
                         <width>324</width>
                         <font>itemSubTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">$INFO[ListItem.label2]</label>
+                        <label fallback="13205">$INFO[ListItem.label2]</label>
                         <shadowcolor></shadowcolor>
                     </control>
                 </itemlayout>
diff --git a/1080i/DialogPlayerProcessInfo.xml b/1080i/DialogPlayerProcessInfo.xml
index ce34095..df19dba 100644
--- a/1080i/DialogPlayerProcessInfo.xml
+++ b/1080i/DialogPlayerProcessInfo.xml
@@ -76,7 +76,7 @@
             </control>
             <control type="label">
                 <width>24-col</width>
-                <label>$INFO[System.Memory(used.percent),$LOCALIZE[31030]: ,       ]$INFO[System.CpuUsage,$LOCALIZE[13271] ]</label>
+                <label>$INFO[System.Memory(used.percent)] $INFO[System.CpuUsage,$LOCALIZE[13271] ]</label>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 1e0493a..29f4314 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -32,7 +32,7 @@
                 <width>20-col-gutter</width>
                 <height>2-row</height>
                 <font>dialogTitle</font>
-                <label>$LOCALIZE[31154] - $INFO[Player.Filename]</label>
+                <label>$LOCALIZE[287] - $INFO[Player.Filename]</label>
                 <textcolor>textActive</textcolor>
             </control>
             <!--dialog background-->
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 7a4fc94..f3748f0 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -129,7 +129,7 @@
                         <width>4-col-gutter</width>
                         <font>itemSubTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">[B]$INFO[ListItem.label2][/B]</label>
+                        <label fallback="13205">[B]$INFO[ListItem.label2][/B]</label>
                         <shadowcolor></shadowcolor>
                     </control>
                 </itemlayout>
@@ -147,12 +147,12 @@
                         <thumb></thumb>
                     </item>
                     <item>
-                        <label>$LOCALIZE[31146]</label>
+                        <label>$LOCALIZE[20339]</label>
                         <label2>$INFO[ListItem.director]</label2>
                         <thumb></thumb>
                     </item>
                     <item>
-                        <label>$LOCALIZE[31193]</label>
+                        <label>$LOCALIZE[180]</label>
                         <label2>$INFO[ListItem.duration]</label2>
                         <thumb></thumb>
                     </item>
@@ -284,7 +284,7 @@
                 </focusedlayout>
                 <content>
                     <item>
-                        <label>31075</label>
+                        <label>208</label>
                         <label2></label2>
                         <thumb></thumb>
                         <onclick>sendclick(2003,8)</onclick>
@@ -375,7 +375,7 @@
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">$INFO[listitem.duration]    [COLOR textboxInactive]$INFO[listitem.filename][/COLOR]</label>
+                        <label fallback="13205">$INFO[listitem.duration]    [COLOR textboxInactive]$INFO[listitem.filename][/COLOR]</label>
                     </control>
                 </control>
                 <!--synopsis-->
@@ -484,7 +484,7 @@
                     </focusedlayout>
                     <content>
                         <item id="1">
-                            <label>31075</label>
+                            <label>208</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>sendclick(2003,8)</onclick>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 9238fe9..46f4503 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -57,7 +57,7 @@
                 <height>2-row</height>
                 <aligny>center</aligny>
                 <font>dialogTitle</font>
-                <label>31089</label>
+                <label>10126</label>
                 <textcolor>textActive</textcolor>
                 <shadowcolor></shadowcolor>
             </control>
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 73fb885..50f8528 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -8,7 +8,7 @@
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
             <width>12-col</width>
-            <label>31147</label>
+            <label>137</label>
             <onclick>RunScript(script.globalsearch,movies=true&amp;tvshows=true&amp;episodes=true&amp;livetv=true&amp;actors=true&amp;directors=true)</onclick>
         </control>
         <control type="button" id="3">
@@ -107,7 +107,7 @@
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
             <width>12-col</width>
-            <label>31147</label>
+            <label>137</label>
             <onclick>RunScript(script.globalsearch,artists=true&amp;albums=true&amp;songs=true&amp;musicvideos=true)</onclick>
         </control>
         <control type="button" id="3">
@@ -167,7 +167,7 @@
             <width>12-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <label>31241</label>
+            <label>191</label>
             <onclick condition="!Playlist.IsRandom">PlayerControl(randomOn)</onclick>
             <onclick condition="Playlist.IsRandom">PlayerControl(randomOff)</onclick>
         </control>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 715dc17..626a296 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -5,7 +5,7 @@
     <variable name="listTitle">
         <value condition="Window.isactive(Videos) + Container.Content(musicvideos)">$LOCALIZE[20389] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
         <value condition="Window.isactive(Videos) + [Container.Content(movies) | container.content(tvshows)] + String.Contains(Container.folderpath,special://profile/playlists/video)">[CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
-        <value condition="Window.isactive(Videos) + String.Contains(Container.folderpath,plugin)">$INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,]</value>
+        <value condition="Window.isactive(Videos) + String.Contains(Container.folderpath,plugin)">$INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[20373] ,]</value>
         <value condition="Window.isactive(Videos) + Container.Content(movies)">$LOCALIZE[20342] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
         <value condition="Window.isactive(Videos) + Container.Content(tvshows)">$LOCALIZE[31216] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
         <value condition="Window.isactive(Videos) + [Container.Content(seasons) | Container.Content(episodes)]">$LOCALIZE[20343]</value>
@@ -14,18 +14,18 @@
         <value condition="Window.isactive(Music) + String.Contains(Container.folderpath,special://profile/playlists)">[CAPITALIZE]$INFO[container.foldername][/CAPITALIZE]</value>
         <value condition="Window.isactive(Music) + Container.Content(albums) + String.Contains(Container.folderpath,special://profile/playlists/music)">[CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
 		<value condition="Window.isactive(Music) + String.contains(container.folderpath,spotify)">$INFO[container.foldername] [CAPITALIZE][COLOR highlight]$INFO[container.content][/COLOR][/CAPITALIZE]</value>
-		<value condition="Window.isactive(Music) + String.Contains(container.folderpath,addons://)">$LOCALIZE[31058]</value>
+		<value condition="Window.isactive(Music) + String.Contains(container.folderpath,addons://)">$LOCALIZE[1038]</value>
         <value condition="Window.isactive(Music) + String.Contains(container.folderpath,plugin://)">$INFO[container.foldername]</value>
-        <value condition="Window.isactive(Music) + Container.Content(albums)">$LOCALIZE[31038] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
-        <value condition="Window.isactive(Music) + Container.Content(artists)">$LOCALIZE[31024] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
-        <value condition="Window.isactive(Music) + Container.Content(songs)">$LOCALIZE[31182]</value>
+        <value condition="Window.isactive(Music) + Container.Content(albums)">$LOCALIZE[132] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
+        <value condition="Window.isactive(Music) + Container.Content(artists)">$LOCALIZE[133] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
+        <value condition="Window.isactive(Music) + Container.Content(songs)">$LOCALIZE[182]</value>
         <value condition="Window.isactive(Music) + !container.content(genres) + String.Contains(container.folderpath,musicdb://genres)">$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
         <value condition="Window.isactive(Music) + !String.IsEmpty(container.foldername)">$INFO[container.foldername]</value>
-        <value condition="Window.isactive(Music) + String.IsEmpty(container.foldername)">$LOCALIZE[31053]</value>
-    	<value condition="Window.isactive(Weather)">$LOCALIZE[31197]</value>
-		<value condition="Window.isactive(TVchannels) | Window.isactive(TVGuide)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
-		<value condition="Window.isactive(RadioChannels)">$LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
-		<value condition="Window.isactive(TVRecordings)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
+        <value condition="Window.isactive(Music) + String.IsEmpty(container.foldername)">$LOCALIZE[14237]</value>
+    	<value condition="Window.isactive(Weather)">$LOCALIZE[8]</value>
+		<value condition="Window.isactive(TVchannels) | Window.isactive(TVGuide)">$LOCALIZE[19020] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
+		<value condition="Window.isactive(RadioChannels)">$LOCALIZE[19021] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
+		<value condition="Window.isactive(TVRecordings)">$LOCALIZE[19020] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
 		<value condition="Window.isactive(MyPVRTimers.xml)">$LOCALIZE[31060] [COLOR highlight]$LOCALIZE[31087][/COLOR]</value>
 		<value condition="Window.isactive(programs)">$LOCALIZE[10506]</value>
 		<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$LOCALIZE[31123]</value>
@@ -37,7 +37,7 @@
         <value condition="Window.isactive(Music)">$INFO[container.NumAllItems,, $LOCALIZE[31014]]</value>
 		<value condition="Window.isactive(MyPVRTimers.xml)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
 		<value condition="Window.isactive(Weather)">$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</value>
-		<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)])</value>
+		<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[19019] ($INFO[control.getlabel(29)])</value>
 		<value condition="Window.isactive(TVRecordings)">$INFO[container.NumAllItems] $LOCALIZE[31165] ($INFO[Pvr.BackendDiskSpace])</value>
 		<value condition="Window.isactive(programs)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
 		<value condition="Window.isactive(games)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
@@ -78,7 +78,7 @@
     </variable>
     <!--unwatched only filter active-->
     <variable name="unwatchedOnly">
-        <value condition="System.Setting(hidewatched)">$LOCALIZE[31213]</value>
+        <value condition="System.Setting(hidewatched)">• $LOCALIZE[31213]</value>
     </variable>
     <!--Star rating for music tracks-->
     <variable name="starRating">
diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml
index 83be6ca..81ef19b 100644
--- a/1080i/MyMusicPlaylistEditor.xml
+++ b/1080i/MyMusicPlaylistEditor.xml
@@ -127,7 +127,7 @@
                     <posy>0</posy>
                     <width>9-col-gutter</width>
                     <height>2-row</height>
-                    <label>31029</label>
+                    <label>13350</label>
                     <font>settingsCategoryTitle</font>
                     <textcolor>black</textcolor>
                 </control>
diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml
index 185146f..0348464 100644
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@@ -1,217 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">100</defaultcontrol>
-    <include>fadeInOut</include>
-    <controls>
-        <!--background-->
-        <include>globalBackground</include>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>resource://resource.images.weatherfanart.single/$INFO[Window(weather).Property(Current.fanartCode),,.jpg]</texture>
-            <colordiffuse>33ffffff</colordiffuse>
-            <aspectratio>stretch</aspectratio>
-            <include>kenBurnsey</include>
-            <fadetime>1500</fadetime>
-        </control>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>vignette.png</texture>
-            <colordiffuse>ffffffff</colordiffuse>
-            <aspectratio>stretch</aspectratio>
-        </control>
-		<!--page header-->
-        <control type="group">
-			<include>pageHeader</include>    
-        </control>
-        <control type="group">
-            <posx>col-1-begin</posx>
-            <posy>row-5-begin</posy>
-            <!--today-->
-            <control type="group">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>24-col</width>
-                    <height>2-row</height>
-                    <font>veryLarge</font>
-                    <label>[COLOR highlight]$LOCALIZE[31200][/COLOR] $INFO[Window.Property(Location)]</label>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <animation type="Conditional" condition="String.IsEmpty(Window.Property(location))" loop="false" reversible="true">
-                        <effect type="rotatey" end="180" center="auto" tween="back" easing="out" time="2000"/>
-                        <effect type="fade" start="100" end="30" time="800"/>
-                    </animation>
-                </control>
-                <control type="group">
-                    <animation type="Conditional" condition="String.IsEmpty(Window.Property(location))" loop="false" reversible="true">
-                        <effect type="rotatey" end="180" center="auto" tween="back" easing="out" time="3500"/>
-                        <effect type="fade" start="100" end="30" time="800"/>
-                    </animation>
-                    <control type="image">
-                        <posx>-12</posx>
-                        <posy>3-row</posy>
-                        <width>3-col</width>
-                        <height>3-col</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">resource://resource.images.weathericons.outline/$INFO[Window(weather).Property(current.fanartCode),,.png]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>3-col</posx>
-                        <posy>4-row</posy>
-                        <width>21-col</width>
-                        <height>2-row</height>
-                        <font>largeTitle</font>
-                        <label>$LOCALIZE[31026]: $INFO[Window.Property(Day0.Outlook)]</label>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>3-col</posx>
-                        <posy>6-row</posy>
-                        <width>21-col</width>
-                        <height>2-row</height>
-                        <font>large</font>
-                        <label>$LOCALIZE[31027] $INFO[Window.Property(Current.Temperature)]$INFO[System.TemperatureUnits] ($LOCALIZE[31028] $INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]), $INFO[Window.Property(current.condition)].</label>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>3-col</posx>
-                        <posy>8-row</posy>
-                        <width>12-col</width>
-                        <height>2-row</height>
-                        <font>regular</font>
-                        <label>$LOCALIZE[13508]: [B]$INFO[Window.Property(Day0.HighTemp)]$INFO[System.TemperatureUnits][/B]     $LOCALIZE[418]: [B]$INFO[Window.Property(Day0.LowTemp)]$INFO[System.TemperatureUnits][/B]     $LOCALIZE[31030]: [B]$INFO[Window.Property(Current.Humidity)][/B]</label>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>3-col</posx>
-                        <posy>336</posy>
-                        <width>12-col</width>
-                        <height>2-row</height>
-                        <font>regular</font>
-                        <label>$LOCALIZE[31094] $INFO[Window.Property(Current.wind)]</label>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                </control>
-            </control>
-
-            <!--remaining forecast begins-->
-            <control type="group">
-                <animation type="Conditional" condition="String.IsEmpty(Window.Property(location))" loop="false" reversible="true">
-                    <effect type="slide" start="0,0" end="0,400" time="1500" tween="back" easing="out"/>
-                    <effect type="fade" start="100" end="0" time="300"/>
-                </animation>
-                <control type="panel" id="9000">
-                    <posx>0</posx>
-                    <posy>18-row</posy>
-                    <width>24-col</width>
-                    <height>24-row</height>
-                    <itemlayout width="6-col" height="4-row">
-                        <control type="image">
-                            <posx>-12</posx>
-                            <posy>-24</posy>
-                            <width>2-col</width>
-                            <height>2-col</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">resource://resource.images.weathericons.outline/$INFO[listitem.property(fanartCode),,.png]</texture>
-                        </control>
-                        <control type="label">
-                            <posx>2-col</posx>
-                            <posy>-24</posy>
-                            <width>6-col-gutter</width>
-                            <height>2-row</height>
-                            <font>dialogTitle</font>
-                            <label>$INFO[ListItem.Label]</label>
-                            <textcolor>textActive</textcolor>
-                            <shadowcolor></shadowcolor>
-                        </control>
-                        <control type="label">
-                            <posx>2-col</posx>
-                            <posy>18</posy>
-                            <width>4-col</width>
-                            <height>2-row</height>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <autoscroll delay="3000" time="1000" repeat="3000"/>
-                            <label>$INFO[ListItem.Property(Outlook)]</label>
-                        </control>
-                        <control type="label">
-                            <posx>2-col</posx>
-                            <posy>76</posy>
-                            <width>6-col-gutter</width>
-                            <height>1-row</height>
-                            <font>itemSubTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$LOCALIZE[13508] [B]$INFO[ListItem.Property(HighTemp)] $INFO[ListItem.Property(TempUnits)][/B]  $LOCALIZE[418] [B]$INFO[ListItem.Property(LowTemp)] $INFO[ListItem.Property(TempUnits)][/B]</label>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout/>
-                    <content>
-                        <item id="2">
-                            <description>Day 1</description>
-                            <label>$INFO[Window.Property(Day1.Title)]</label>
-                            <property name="fanartCode">$INFO[Window.Property(Day1.fanartCode)]</property>
-                            <property name="HighTemp">$INFO[Window.Property(Day1.HighTemp)]</property>
-                            <property name="LowTemp">$INFO[Window.Property(Day1.LowTemp)]</property>
-                            <property name="Outlook">$INFO[Window.Property(Day1.Outlook)]</property>
-                            <property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-                            
-                        </item>
-                        <item id="3">
-                            <description>Day 2</description>
-                            <label>$INFO[Window.Property(Day2.Title)]</label>
-                            <property name="fanartCode">$INFO[Window.Property(Day2.fanartCode)]</property>
-                            <property name="HighTemp">$INFO[Window.Property(Day2.HighTemp)]</property>
-                            <property name="LowTemp">$INFO[Window.Property(Day2.LowTemp)]</property>
-                            <property name="Outlook">$INFO[Window.Property(Day2.Outlook)]</property>
-                            <property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-                            
-                        </item>
-                        <item id="4">
-                            <description>Day 3</description>
-                            <label>$INFO[Window.Property(Day3.Title)]</label>
-                            <property name="fanartCode">$INFO[Window.Property(Day3.fanartCode)]</property>
-                            <property name="HighTemp">$INFO[Window.Property(Day3.HighTemp)]</property>
-                            <property name="LowTemp">$INFO[Window.Property(Day3.LowTemp)]</property>
-                            <property name="Outlook">$INFO[Window.Property(Day3.Outlook)]</property>
-                            <property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-                            
-                        </item>
-                        <item id="5">
-                            <description>Day 4</description>
-                            <label>$INFO[Window.Property(Day4.Title)]</label>
-                            <property name="fanartCode">$INFO[Window.Property(Day4.fanartCode)]</property>
-                            <property name="HighTemp">$INFO[Window.Property(Day4.HighTemp)]</property>
-                            <property name="LowTemp">$INFO[Window.Property(Day4.LowTemp)]</property>
-                            <property name="Outlook">$INFO[Window.Property(Day4.Outlook)]</property>
-                            <property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-                            
-                        </item>
-                    </content>
-                </control>
-                <!--panel ends-->
-            </control>
-        </control>
-        <!--location control-->
-        <control type="button" id="100">
-            <description>change location button</description>
-            <left>-100</left>
-            <top>-100</top>
-            <width>6-col</width>
-            
-            <onright>Weather.LocationNext</onright>
-            <onleft>Weather.LocationPrevious</onleft>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>WindowID</include>
-            <label>MyWeather.xml</label>
-        </control>
-    </controls>
+	<!--unused-->
+    <onload>back</onload>
 </window>
\ No newline at end of file
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 7e54552..9af7f2f 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -206,7 +206,7 @@
                     </item>
                     <item>
                         <description>Programs</description>
-                        <label>31003</label>
+                        <label>$LOCALIZE[1043]</label>
                         <label2></label2>
                         <property name="label3">$LOCALIZE[31111]</property>
                         <onclick>ActivateWindow(programs,addons,return)</onclick>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index cd68ba1..7999927 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -65,7 +65,7 @@
                 <posy>17-row</posy>
                 <font>smallStrong</font>
                 <texturenofocus colordiffuse="11FFFFFF">colors/black.png</texturenofocus>
-                <label>[B][COLOR highlight]$LOCALIZE[31025]:[/COLOR][/B] $INFO[control.getlabel(20)]</label>
+                <label>[B][COLOR highlight]$LOCALIZE[21417]:[/COLOR][/B] $INFO[control.getlabel(20)]</label>
                 <onclick>SettingsLevelChange</onclick>
                 <onup>3</onup>
                 <onright>5</onright>
diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml
index 1410f42..7a1ba6c 100644
--- a/1080i/SettingsSystemInfo.xml
+++ b/1080i/SettingsSystemInfo.xml
@@ -80,8 +80,7 @@
                         
                     </item>
                     <item id="2">
-                        <label>31119</label>
-                        
+                        <label>12389</label>
                     </item>
                 </content>
             </control>
diff --git a/1080i/SmartPlaylistEditor.xml b/1080i/SmartPlaylistEditor.xml
index 5272a47..4979297 100644
--- a/1080i/SmartPlaylistEditor.xml
+++ b/1080i/SmartPlaylistEditor.xml
@@ -266,7 +266,7 @@
                     <content>
                         <item id="1">
                             <description>New Rule</description>
-                            <label>31128</label>
+                            <label>15019</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>SendClick(129,13)</onclick>
diff --git a/1080i/SmartPlaylistRule.xml b/1080i/SmartPlaylistRule.xml
index ae3a5e5..e5e0738 100644
--- a/1080i/SmartPlaylistRule.xml
+++ b/1080i/SmartPlaylistRule.xml
@@ -60,7 +60,7 @@
                     <posx>12</posx>
                     <posy>0</posy>
                     <width>6-col-gutter</width>
-                    <label>31046</label>
+                    <label>$LOCALIZE[31046]:</label>
                     <onright>16</onright>
                     <ondown>17</ondown>
                 </control>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index d734233..10c984d 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -93,7 +93,7 @@
                         <width>6-col</width>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">[B]$INFO[player.timeremaining][/B]</label>
+                        <label fallback="13205">[B]$INFO[player.timeremaining][/B]</label>
                         <shadowcolor></shadowcolor>
                     </control>
 
@@ -114,7 +114,7 @@
                         <width>6-col</width>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">[B]$INFO[VideoPlayer.FinishTime][/B]</label>
+                        <label fallback="13205">[B]$INFO[VideoPlayer.FinishTime][/B]</label>
                         <shadowcolor></shadowcolor>
                     </control>
 
@@ -135,7 +135,7 @@
                         <width>6-col</width>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">$INFO[VideoPlayer.EndTime]</label>
+                        <label fallback="13205">$INFO[VideoPlayer.EndTime]</label>
                         <shadowcolor></shadowcolor>
                     </control>
 
@@ -146,7 +146,7 @@
                         <width>2-col</width>
                         <font>itemSubTitle</font>
                         <textcolor>highlight</textcolor>
-                        <label>[B]$LOCALIZE[31242][/B]</label>
+                        <label>[B]$LOCALIZE[19031][/B]</label>
                         <shadowcolor></shadowcolor>
                     </control>
 					<control type="label">
@@ -156,7 +156,7 @@
                         <width>6-col</width>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="31159">$INFO[VideoPlayer.NextTitle]</label>
+                        <label fallback="13205">$INFO[VideoPlayer.NextTitle]</label>
                         <shadowcolor></shadowcolor>
                     </control>
 				</control>
@@ -373,21 +373,21 @@
                     </item>
                     <item>
                         <description>Subtitles</description>
-                        <label>31154</label>
+                        <label>287</label>
                         <label2></label2>
                         <thumb></thumb>
                         <onclick>ActivateWindow(osdsubtitlesettings)</onclick>
                     </item>
                     <item>
                         <description>Video Settings</description>
-                        <label>31191</label>
+                        <label>13395</label>
                         <label2></label2>
                         <thumb></thumb>
                         <onclick>ActivateWindow(osdvideosettings)</onclick>
                     </item>
                     <item>
                         <description>Audio Settings</description>
-                        <label>31177</label>
+                        <label>13396</label>
                         <label2></label2>
                         <thumb></thumb>
                         <onclick>ActivateWindow(osdaudiosettings)</onclick>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 6cbbc06..7f7b040 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -82,7 +82,7 @@
                 <align></align>
                 <font>itemTitle</font>
                 <textcolor>menuUnselected</textcolor>
-                <label>$INFO[listitem.Season,$LOCALIZE[31011] , | ]$INFO[Container(53).NumItems,, $LOCALIZE[31189]]</label>
+                <label>$INFO[listitem.Season,$LOCALIZE[20373] , | ]$INFO[Container(53).NumItems,, $LOCALIZE[31189]]</label>
             </control>
         </control>
         <!--episode synopsis & thumb-->
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index e6f8f12..4186098 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -68,7 +68,7 @@
 	                    </item>
 	                    <item>
 	                        <label>special://skin/extras/playlists/inprogressMovies.xsp</label>
-	                        <property name="textTitle">31132</property>
+	                        <property name="textTitle">31127</property>
 	                    </item>
 	                </content>
 	            </control>
@@ -228,7 +228,7 @@
 	                <aligny>center</aligny>
 	                <font>menuTitle</font>
 	                <textcolor>textActive</textcolor>
-	                <label>$LOCALIZE[31097]</label>
+	                <label>$LOCALIZE[559]</label>
 	            </control>
 				<control type="panel" id="51">
 					<visible>$EXP[isMovie]</visible>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 559e1e2..dd91546 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -285,17 +285,6 @@
 						<textcolor>textActive</textcolor>
 						<label>$INFO[ListItem.label]</label>
 					</control>
-					<control type="label">
-						<visible>!controlgroup(9000).hasfocus</visible>
-						<posx>12</posx>
-						<posy>350</posy>
-						<width>204</width>
-						<height>1-row</height>
-						<aligny>center</aligny>
-						<font>thumbTitle</font>
-						<textcolor>textActive</textcolor>
-						<label>[B]$INFO[ListItem.title][/B][CR]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-					</control>
 					<control type="label">
 						<visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
@@ -377,17 +366,6 @@
 							<textcolor>textActive</textcolor>
 							<label>$INFO[ListItem.label]</label>
 						</control>
-						<control type="label">
-							<visible>!controlgroup(9000).hasfocus</visible>
-							<posx>12</posx>
-							<posy>354</posy>
-							<width>204</width>
-							<height>1-row</height>
-							<aligny>center</aligny>
-							<font>thumbTitle</font>
-							<textcolor>textActive</textcolor>
-							<label>[B]$INFO[ListItem.title][/B][CR]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-						</control>
 						<control type="label">
 							<visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index ecfcf09..adbf6ca 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -319,7 +319,7 @@
 		                    </item>
 		                    <item>
 		                        <description>Visualisation</description>
-		                        <label>31032</label>
+		                        <label>250</label>
 		                        <label2></label2>
 		                        <thumb></thumb>
 		                        <onclick>activateWindow(musicOSD)</onclick>
@@ -344,6 +344,7 @@
 			<height>1-col</height>
 			<width>1-col</width>
 			<onclick>control.setfocus(8001)</onclick>
+			<oninfo>control.setfocus(8001)</oninfo>
 		</control>
 		<!--debugging-->
 		<include>DebugGrid</include>
diff --git a/1080i/script-globalsearch.xml b/1080i/script-globalsearch.xml
index 3d99437..7fe99a2 100644
--- a/1080i/script-globalsearch.xml
+++ b/1080i/script-globalsearch.xml
@@ -153,7 +153,7 @@
 		            <posy>0</posy>
 		            <width>18-col</width>
 		            <font>pageTitle</font>
-		            <label>$LOCALIZE[31147]</label>
+		            <label>$LOCALIZE[137]</label>
 		            <textcolor>textActive</textcolor>
 		        </control>
 		        <!--subtitle-->
diff --git a/addon.xml b/addon.xml
index 9d15b91..48e760f 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="2.1.2" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="2.2" name="Pellucid" provider-name="theDeadman">
     <requires>
         <import addon="xbmc.gui" version="5.14.0"/>
         <import addon="script.skinshortcuts" version="1.0.13"/>
-        <import addon="resource.images.weathericons.outline" version="0.0.5"/>
-        <import addon="resource.images.weatherfanart.single" version="0.0.6"/>
     </requires>
     <extension point="xbmc.gui.skin" debugging="false">
         <res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
     </extension>
     <extension point="xbmc.addon.metadata">
         <summary lang="en_GB">A skin for Kodi by theDeadMan</summary>
-        <description lang="en_GB">Built for the living room, Pellucid is a clean and carefully designed kodi experience designed for maximum usability and minimum fuss. Skin Shortcuts addon support is available for full menu customisation. With thanks to Marco "Dadebue" Debus for the homescreen photography.</description>
+        <description lang="en_GB">Built for the living room, Pellucid is a clean and carefully designed Kodi experience designed for maximum usability and minimum fuss. Skin Shortcuts addon support is available for full menu customisation. With thanks to Marco "Dadebue" Debus for the homescreen photography.</description>
         <platform>all</platform>
         <license>Creative Commons Attribution-Noncommercial-Share Alike 3.0</license>
         <forum>https://forum.kodi.tv/forumdisplay.php?fid=267</forum>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 24da698..b64eca8 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -25,62 +25,14 @@ msgid ""
 "Pellucid is a lightweight, clean and simple Kodi experience designed for maximum usability and minimum fuss."
 msgstr ""
 
-msgctxt "#31000"
-msgid "Videos"
-msgstr ""
-
-msgctxt "#31001"
-msgid "Music"
-msgstr ""
-
-msgctxt "#31002"
-msgid "Photos"
-msgstr ""
-
-msgctxt "#31003"
-msgid "Program Addons"
-msgstr ""
-
-msgctxt "#31004"
-msgid "Power"
-msgstr ""
-
-msgctxt "#31005"
-msgid "Spotlight"
-msgstr ""
-
-msgctxt "#31006"
-msgid "TV"
-msgstr ""
-
-msgctxt "#31007"
-msgid "System Info"
-msgstr ""
-
 msgctxt "#31008"
 msgid "Sort by"
 msgstr ""
 
-msgctxt "#31009"
-msgid "Genres"
-msgstr ""
-
-msgctxt "#31010"
-msgid "Add-ons"
-msgstr ""
-
-msgctxt "#31011"
-msgid "Season"
-msgstr ""
-
 msgctxt "#31012"
 msgid "My Library"
 msgstr ""
 
-msgctxt "#31013"
-msgid "Auto Update"
-msgstr ""
-
 msgctxt "#31014"
 msgid "title(s)"
 msgstr ""
@@ -89,18 +41,6 @@ msgctxt "#31015"
 msgid "On"
 msgstr ""
 
-msgctxt "#31016"
-msgid "Off"
-msgstr ""
-
-msgctxt "#31017"
-msgid "Channels"
-msgstr ""
-
-msgctxt "#31018"
-msgid "mins"
-msgstr ""
-
 msgctxt "#31019"
 msgid "Open playlist"
 msgstr ""
@@ -121,46 +61,10 @@ msgctxt "#31023"
 msgid "Notification"
 msgstr ""
 
-msgctxt "#31024"
-msgid "Artists"
-msgstr ""
-
-msgctxt "#31025"
-msgid "Settings"
-msgstr ""
-
-msgctxt "#31026"
-msgid "Outlook"
-msgstr ""
-
-msgctxt "#31027"
-msgid "Currently"
-msgstr ""
-
-msgctxt "#31028"
-msgid "feels like"
-msgstr ""
-
-msgctxt "#31029"
-msgid "Current playlist"
-msgstr ""
-
-msgctxt "#31030"
-msgid "Humidity"
-msgstr ""
-
 msgctxt "#31031"
 msgid "Play Random"
 msgstr ""
 
-msgctxt "#31032"
-msgid "Visualisation"
-msgstr ""
-
-msgctxt "#31033"
-msgid "Set Media Source Content"
-msgstr ""
-
 msgctxt "#31034"
 msgid "Enable Debug Grid"
 msgstr ""
@@ -169,34 +73,6 @@ msgctxt "#31035"
 msgid "Enable Debug Info"
 msgstr ""
 
-msgctxt "#31036"
-msgid "Advanced Launcher"
-msgstr ""
-
-msgctxt "#31037"
-msgid "Albums by"
-msgstr ""
-
-msgctxt "#31038"
-msgid "Albums"
-msgstr ""
-
-msgctxt "#31039"
-msgid "Audio"
-msgstr ""
-
-msgctxt "#31040"
-msgid "Video"
-msgstr ""
-
-msgctxt "#31041"
-msgid "Edit Menu Items"
-msgstr ""
-
-msgctxt "#31042"
-msgid "Specific Content type settings"
-msgstr ""
-
 msgctxt "#31043"
 msgid "Reload Skin"
 msgstr ""
@@ -205,50 +81,22 @@ msgctxt "#31044"
 msgid "Debugging"
 msgstr ""
 
-msgctxt "#31045"
-msgid "new episode(s)"
-msgstr ""
-
 msgctxt "#31046"
-msgid "Field:"
-msgstr ""
-
-msgctxt "#31047"
-msgid "Starting in"
+msgid "Field"
 msgstr ""
 
 msgctxt "#31048"
 msgid "Create Folder"
 msgstr ""
 
-msgctxt "#31049"
-msgid "Chapter"
-msgstr ""
-
-msgctxt "#31050"
-msgid "shot(s)"
-msgstr ""
-
 msgctxt "#31051"
 msgid "Disc Menu"
 msgstr ""
 
-msgctxt "#31052"
-msgid "Reset menu to default"
-msgstr ""
-
-msgctxt "#31053"
-msgid "Music Library"
-msgstr ""
-
 msgctxt "#31054"
 msgid "by"
 msgstr ""
 
-msgctxt "#31055"
-msgid "Timers"
-msgstr ""
-
 msgctxt "#31056"
 msgid "Photo Library"
 msgstr ""
@@ -257,14 +105,6 @@ msgctxt "#31057"
 msgid "Create Music Playlist"
 msgstr ""
 
-msgctxt "#31058"
-msgid "Music Addons"
-msgstr ""
-
-msgctxt "#31059"
-msgid "Radio"
-msgstr ""
-
 msgctxt "#31060"
 msgid "PVR"
 msgstr ""
@@ -285,26 +125,10 @@ msgctxt "#31064"
 msgid "CPU"
 msgstr ""
 
-msgctxt "#31065"
-msgid "EPG"
-msgstr ""
-
-msgctxt "#31066"
-msgid "Audio CDs"
-msgstr ""
-
 msgctxt "#31067"
 msgid "Extend Kodi's functionality"
 msgstr ""
 
-msgctxt "#31068"
-msgid "Slideshows"
-msgstr ""
-
-msgctxt "#31069"
-msgid "Locations"
-msgstr ""
-
 msgctxt "#31070"
 msgid "Screen"
 msgstr ""
@@ -313,30 +137,14 @@ msgctxt "#31071"
 msgid "Communications and sharing"
 msgstr ""
 
-msgctxt "#31072"
-msgid "Play now"
-msgstr ""
-
 msgctxt "#31073"
 msgid "Channel Guide"
 msgstr ""
 
-msgctxt "#31074"
-msgid "Cast and Crew"
-msgstr ""
-
-msgctxt "#31075"
-msgid "Play"
-msgstr ""
-
 msgctxt "#31076"
 msgid "Change Title"
 msgstr ""
 
-msgctxt "#31077"
-msgid "Music Files"
-msgstr ""
-
 msgctxt "#31078"
 msgid "Now and Next"
 msgstr ""
@@ -345,10 +153,6 @@ msgctxt "#31079"
 msgid "Import your content into Kodi"
 msgstr ""
 
-msgctxt "#31080"
-msgid "Programme Guide"
-msgstr ""
-
 msgctxt "#31081"
 msgid "Digital Television Setup"
 msgstr ""
@@ -357,22 +161,6 @@ msgctxt "#31082"
 msgid "By"
 msgstr ""
 
-msgctxt "#31083"
-msgid "Skin specific options"
-msgstr ""
-
-msgctxt "#31084"
-msgid "Manage Home Screen Menu"
-msgstr ""
-
-msgctxt "#31085"
-msgid "Add Video Addon"
-msgstr ""
-
-msgctxt "#31086"
-msgid "Add Music Addon"
-msgstr ""
-
 msgctxt "#31087"
 msgid "Timers"
 msgstr ""
@@ -381,30 +169,14 @@ msgctxt "#31088"
 msgid "Video Addons"
 msgstr ""
 
-msgctxt "#31089"
-msgid "File Browser"
-msgstr ""
-
 msgctxt "#31090"
 msgid "Music Addons"
 msgstr ""
 
-msgctxt "#31091"
-msgid "Add Video Playlist"
-msgstr ""
-
-msgctxt "#31092"
-msgid "Add Music Playlist"
-msgstr ""
-
 msgctxt "#31093"
 msgid "IP"
 msgstr ""
 
-msgctxt "#31094"
-msgid "Wind"
-msgstr ""
-
 msgctxt "#31095"
 msgid "Transfer and copy files"
 msgstr ""
@@ -413,14 +185,6 @@ msgctxt "#31096"
 msgid "No items found"
 msgstr ""
 
-msgctxt "#31097"
-msgid "Playlist"
-msgstr ""
-
-msgctxt "#31098"
-msgid "Volume Muted"
-msgstr ""
-
 msgctxt "#31099"
 msgid "Add Group"
 msgstr ""
@@ -449,10 +213,6 @@ msgctxt "#31105"
 msgid "Manage your Kodi system"
 msgstr ""
 
-msgctxt "#31106"
-msgid "Users"
-msgstr ""
-
 msgctxt "#31107"
 msgid "Current profile"
 msgstr ""
@@ -485,10 +245,6 @@ msgctxt "#31114"
 msgid "Pixel format"
 msgstr ""
 
-msgctxt "#31115"
-msgid "Video decoder"
-msgstr ""
-
 msgctxt "#31116"
 msgid "Set home background directory"
 msgstr ""
@@ -501,14 +257,6 @@ msgctxt "#31118"
 msgid "PVR not active"
 msgstr ""
 
-msgctxt "#31119"
-msgid "Privacy Policy"
-msgstr ""
-
-msgctxt "#31120"
-msgid "Playing"
-msgstr ""
-
 msgctxt "#31121"
 msgid "My Kodi"
 msgstr ""
@@ -521,78 +269,22 @@ msgctxt "#31123"
 msgid "Current Queue"
 msgstr ""
 
-msgctxt "#31124"
-msgid "Search Library"
-msgstr ""
-
-msgctxt "#31125"
-msgid "Searching for"
-msgstr ""
-
-msgctxt "#31126"
-msgid "Settings level"
-msgstr ""
-
 msgctxt "#31127"
 msgid "Continue Watching"
 msgstr ""
 
-msgctxt "#31128"
-msgid "Add"
-msgstr ""
-
-msgctxt "#31129"
-msgid "Artist"
-msgstr ""
-
-msgctxt "#31130"
-msgid "Year"
-msgstr ""
-
-msgctxt "#31131"
-msgid "Switch to this profile now"
-msgstr ""
-
-msgctxt "#31132"
-msgid "Continue Watching"
-msgstr ""
-
-msgctxt "#31133"
-msgid "Playlist shuffled"
-msgstr ""
-
 msgctxt "#31134"
 msgid "Manual search"
 msgstr ""
 
-msgctxt "#31135"
-msgid "Eject Disc"
-msgstr ""
-
 msgctxt "#31136"
 msgid "Now Playing"
 msgstr ""
 
-msgctxt "#31137"
-msgid "Content Scraper:"
-msgstr ""
-
 msgctxt "#31138"
 msgid "Stop video playing on return to menu"
 msgstr ""
 
-msgctxt "#31139"
-msgid "Version"
-msgstr ""
-
-msgctxt "#31140"
-msgid "Formed"
-msgstr ""
-
-msgctxt "#31141"
-msgid "Years active"
-msgstr ""
-
 msgctxt "#31142"
 msgid "Prioritise exit over shutdown in power menu"
 msgstr ""
@@ -609,30 +301,10 @@ msgctxt "#31145"
 msgid "Item(s)"
 msgstr ""
 
-msgctxt "#31146"
-msgid "Director"
-msgstr ""
-
-msgctxt "#31147"
-msgid "Search"
-msgstr ""
-
-msgctxt "#31148"
-msgid "Style"
-msgstr ""
-
 msgctxt "#31149"
 msgid "Released"
 msgstr ""
 
-msgctxt "#31150"
-msgid "Label"
-msgstr ""
-
-msgctxt "#31151"
-msgid "Subtitles"
-msgstr ""
-
 msgctxt "#31152"
 msgid "Press OK to cancel"
 msgstr ""
@@ -641,66 +313,14 @@ msgctxt "#31153"
 msgid "Playlist saved"
 msgstr ""
 
-msgctxt "#31154"
-msgid "Subtitles"
-msgstr ""
-
-msgctxt "#31155"
-msgid "Go to Artist"
-msgstr ""
-
-msgctxt "#31156"
-msgid "Games"
-msgstr ""
-
-msgctxt "#31157"
-msgid "Home: Hide Games"
-msgstr ""
-
-msgctxt "#31158"
-msgid "Go to Album"
-msgstr ""
-
-msgctxt "#31159"
-msgid "Unknown"
-msgstr ""
-
 msgctxt "#31160"
 msgid "Ends"
 msgstr ""
 
-msgctxt "#31161"
-msgid "Turn off Subtitles"
-msgstr ""
-
-msgctxt "#31162"
-msgid "Home menu items"
-msgstr ""
-
-msgctxt "#31163"
-msgid "Music Player"
-msgstr ""
-
-msgctxt "#31164"
-msgid "Radio"
-msgstr ""
-
 msgctxt "#31165"
 msgid "TV Recordings"
 msgstr ""
 
-msgctxt "#31166"
-msgid "Album"
-msgstr ""
-
-msgctxt "#31167"
-msgid "Genre"
-msgstr ""
-
-msgctxt "#31168"
-msgid "Rating"
-msgstr ""
-
 msgctxt "#31169"
 msgid "Rate"
 msgstr ""
@@ -725,18 +345,10 @@ msgctxt "#31174"
 msgid "Edit picture section menu"
 msgstr ""
 
-msgctxt "#31175"
-msgid "Set Latest Content"
-msgstr ""
-
 msgctxt "#31176"
 msgid "New Movies"
 msgstr ""
 
-msgctxt "#31177"
-msgid "Audio Settings"
-msgstr ""
-
 msgctxt "#31178"
 msgid "New TV Shows"
 msgstr ""
@@ -753,26 +365,6 @@ msgctxt "#31181"
 msgid "Random Albums"
 msgstr ""
 
-msgctxt "#31182"
-msgid "Tracks"
-msgstr ""
-
-msgctxt "#31183"
-msgid "Play"
-msgstr ""
-
-msgctxt "#31184"
-msgid "Info"
-msgstr ""
-
-msgctxt "#31185"
-msgid "Open"
-msgstr ""
-
-msgctxt "#31186"
-msgid "View"
-msgstr ""
-
 msgctxt "#31187"
 msgid "Top Albums"
 msgstr ""
@@ -789,62 +381,18 @@ msgctxt "#31190"
 msgid "All Episodes"
 msgstr ""
 
-msgctxt "#31191"
-msgid "Video Settings"
-msgstr ""
-
-msgctxt "#31192"
-msgid "Date"
-msgstr ""
-
-msgctxt "#31193"
-msgid "Duration"
-msgstr ""
-
-msgctxt "#31194"
-msgid "Group"
-msgstr ""
-
 msgctxt "#31195"
-msgid "Hide watched items:"
-msgstr ""
-
-msgctxt "#31196"
-msgid "Dir"
-msgstr ""
-
-msgctxt "#31197"
-msgid "Weather"
-msgstr ""
-
-msgctxt "#31198"
-msgid "unwatched"
+msgid "Show only unwatched items:"
 msgstr ""
 
 msgctxt "#31199"
 msgid "Artists in"
 msgstr ""
 
-msgctxt "#31200"
-msgid "Today"
-msgstr ""
-
-msgctxt "#31201"
-msgid "Record"
-msgstr ""
-
-msgctxt "#31202"
-msgid "Adjust Subtitle Offset"
-msgstr ""
-
 msgctxt "#31203"
 msgid "Smart Playlist"
 msgstr ""
 
-msgctxt "#31204"
-msgid "Episode"
-msgstr ""
-
 msgctxt "#31205"
 msgid "No further details available."
 msgstr ""
@@ -853,22 +401,10 @@ msgctxt "#31206"
 msgid "Kodi System Information"
 msgstr ""
 
-msgctxt "#31207"
-msgid "Total uptime:"
-msgstr ""
-
-msgctxt "#31208"
-msgid "Path"
-msgstr ""
-
 msgctxt "#31209"
 msgid "<Source name>"
 msgstr ""
 
-msgctxt "#31210"
-msgid "Name"
-msgstr ""
-
 msgctxt "#31211"
 msgid "<Smart playlist name>"
 msgstr ""
@@ -878,11 +414,7 @@ msgid "From"
 msgstr ""
 
 msgctxt "#31213"
-msgid "unwatched"
-msgstr ""
-
-msgctxt "#31214"
-msgid "Channel"
+msgid "Showing unwatched titles only"
 msgstr ""
 
 msgctxt "#31215"
@@ -893,18 +425,10 @@ msgctxt "#31216"
 msgid "TV Shows"
 msgstr ""
 
-msgctxt "#31217"
-msgid "Hide weather summary on homescreen"
-msgstr ""
-
 msgctxt "#31218"
 msgid "Enable this addon"
 msgstr ""
 
-msgctxt "#31219"
-msgid "Download art"
-msgstr ""
-
 msgctxt "#31220"
 msgid "Disable extended fanart"
 msgstr ""
@@ -933,10 +457,6 @@ msgctxt "#31226"
 msgid "LibreElec Settings"
 msgstr ""
 
-msgctxt "#31227"
-msgid "Additional options for LibreElec"
-msgstr ""
-
 msgctxt "#31228"
 msgid "Edit Menu"
 msgstr ""
@@ -965,10 +485,6 @@ msgctxt "#31234"
 msgid "Game Addons"
 msgstr ""
 
-msgctxt "#31235"
-msgid "mins remaining"
-msgstr ""
-
 msgctxt "#31236"
 msgid "Radio / TV"
 msgstr ""
@@ -989,34 +505,22 @@ msgctxt "#31240"
 msgid "Disable recently added section for Albums"
 msgstr ""
 
-msgctxt "#31241"
-msgid "Shuffle"
-msgstr ""
-
-msgctxt "#31242"
-msgid "Next"
-msgstr ""
-
-msgctxt "#31243"
-msgid "General"
-msgstr ""
-
-msgctxt "#31244"
-msgid "REC."
-msgstr ""
-
 msgctxt "#31245"
 msgid "Finishes"
 msgstr ""
 
-msgctxt "#31246"
-msgid "Direction"
-msgstr ""
-
-msgctxt "#31247"
-msgid "Import content"
-msgstr ""
-
 msgctxt "#31248"
 msgid "Queue"
-msgstr ""
\ No newline at end of file
+msgstr ""
+
+msgctxt "#31249"
+msgid "Live TV"
+msgstr ""
+
+msgctxt "#31250"
+msgid "Radio"
+msgstr ""
+
+msgctxt "#31251"
+msgid "Eject Disc"
+msgstr ""
diff --git a/shortcuts/mainmenu.DATA.xml b/shortcuts/mainmenu.DATA.xml
index 086a5a7..699f40e 100644
--- a/shortcuts/mainmenu.DATA.xml
+++ b/shortcuts/mainmenu.DATA.xml
@@ -17,7 +17,7 @@
     </shortcut>
     <shortcut>
         <visible>System.HasMediaDVD</visible>
-        <label>32033</label>
+        <label>31251</label>
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
@@ -25,7 +25,7 @@
     </shortcut>
     <shortcut>
         <visible>PVR.HasTVChannels</visible>
-        <label>31006</label>
+        <label>31249</label>
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
@@ -33,7 +33,7 @@
     </shortcut>
     <shortcut>
         <visible>PVR.HasRadioChannels</visible>
-        <label>31059</label>
+        <label>31250</label>
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
@@ -42,7 +42,7 @@
 	<shortcut>
 		<visible>Library.HasContent(Movies)</visible>
         <label>342</label>
-        <label2>32014</label2>
+        <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
         <action>ActivateWindow(Videos,videodb://movies/titles/)</action>
@@ -50,7 +50,7 @@
 	<shortcut>
 		<visible>Library.HasContent(TVshows)</visible>
         <label>20343</label>
-        <label2>32014</label2>
+        <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
         <action>ActivateWindow(Videos,videodb://tvshows/titles/)</action>
diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml
index 3957d71..5d81568 100644
--- a/shortcuts/musicsubmenu.DATA.xml
+++ b/shortcuts/musicsubmenu.DATA.xml
@@ -26,7 +26,7 @@
     </shortcut>
     <shortcut>
         <visible>PVR.HasRadioChannels</visible>
-        <label>31059</label>
+        <label>31250</label>
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />