Removed: [Confluence] All traces of "Caps" fonts (except for main menu in home)

26 files changed, 53 insertions, 63 deletions

diff --git a/addons/skin.confluence/720p/AddonBrowser.xml b/addons/skin.confluence/720p/AddonBrowser.xml
index 7df9d8f5d3..40631c995e 100644
--- a/addons/skin.confluence/720p/AddonBrowser.xml
+++ b/addons/skin.confluence/720p/AddonBrowser.xml
@@ -34,7 +34,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -63,7 +63,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/DialogAddonInfo.xml b/addons/skin.confluence/720p/DialogAddonInfo.xml
index 65895931cd..79a87ae579 100644
--- a/addons/skin.confluence/720p/DialogAddonInfo.xml
+++ b/addons/skin.confluence/720p/DialogAddonInfo.xml
@@ -75,7 +75,7 @@
 				<height>30</height>
 				<align>left</align>
 				<aligny>center</aligny>
-				<font>font13caps</font>
+				<font>font13</font>
 				<label>[B]$INFO[ListItem.Property(Addon.Name)][/B]</label>
 				<textcolor>white</textcolor>
 				<scroll>true</scroll>
diff --git a/addons/skin.confluence/720p/DialogContentSettings.xml b/addons/skin.confluence/720p/DialogContentSettings.xml
index 2278633d49..e1df222668 100644
--- a/addons/skin.confluence/720p/DialogContentSettings.xml
+++ b/addons/skin.confluence/720p/DialogContentSettings.xml
@@ -125,7 +125,7 @@
 				<posy>315</posy>
 				<width>320</width>
 				<height>30</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<label>[B]$INFO[ListItem.Label][/B]</label>
 				<align>center</align>
 				<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/DialogPeripheralSettings.xml b/addons/skin.confluence/720p/DialogPeripheralSettings.xml
index b5e025b3bb..d1f9af55b1 100644
--- a/addons/skin.confluence/720p/DialogPeripheralSettings.xml
+++ b/addons/skin.confluence/720p/DialogPeripheralSettings.xml
@@ -60,7 +60,7 @@
 			<width>640</width>
 			<align>center</align>
 			<label>35004</label>
-			<font>font13caps</font>
+			<font>font13</font>
 		</control>
 		<control type="grouplist" id="5">
 			<animation effect="slide" start="0,0" end="5,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation>
diff --git a/addons/skin.confluence/720p/Font.xml b/addons/skin.confluence/720p/Font.xml
index ae581cbe8e..7d93f589cb 100644
--- a/addons/skin.confluence/720p/Font.xml
+++ b/addons/skin.confluence/720p/Font.xml
@@ -12,22 +12,12 @@
 			<size>17</size>
 		</font>
 	 	<font>
-			<name>font12caps</name>
-			<filename>Roboto-Regular.ttf</filename>
-			<size>17</size>
-		</font>
-	 	<font>
 			<name>font13</name>
 			<filename>Roboto-Regular.ttf</filename>
 			<size>20</size>
 		</font>
 	 	<font>
-			<name>font13caps</name>
-			<filename>Roboto-Regular.ttf</filename>
-			<size>20</size>
-		</font>
-	 	<font>
-			<name>font16caps</name>
+			<name>font16</name>
 			<filename>Roboto-Regular.ttf</filename>
 			<size>25</size>
 		</font>
@@ -80,17 +70,17 @@
 			<size>35</size>
 		</font>
 	 	<font>
-			<name>font50caps_title</name>
-			<filename>Roboto-Bold.ttf</filename>
-			<size>40</size>
-		</font>
-	 	<font>
 			<name>font45caps_title</name>
 			<filename>Roboto-Bold.ttf</filename>
 			<size>45</size>
 		</font>
 
 	 	<font>
+			<name>font_MainMenu</name>
+			<filename>Roboto-Bold.ttf</filename>
+			<size>40</size>
+		</font>
+	 	<font>
 			<name>WeatherTemp</name>
 			<filename>Roboto-Bold.ttf</filename>
 			<size>80</size>
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 8b1348c258..f22563b6ac 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -520,7 +520,7 @@
 						<posy>0</posy>
 						<width>290</width>
 						<height>60</height>
-						<font>font50caps_title</font>
+						<font>font_MainMenu</font>
 						<textcolor>grey3</textcolor>
 						<align>center</align>
 						<aligny>center</aligny>
@@ -547,7 +547,7 @@
 						<posy>0</posy>
 						<width>290</width>
 						<height>60</height>
-						<font>font50caps_title</font>
+						<font>font_MainMenu</font>
 						<textcolor>white</textcolor>
 						<align>center</align>
 						<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/LoginScreen.xml b/addons/skin.confluence/720p/LoginScreen.xml
index aad2afeb8b..fd6a598608 100644
--- a/addons/skin.confluence/720p/LoginScreen.xml
+++ b/addons/skin.confluence/720p/LoginScreen.xml
@@ -72,7 +72,7 @@
 				<posy>100</posy>
 				<width>690</width>
 				<height>40</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<textcolor>grey2</textcolor>
 				<align>center</align>
 				<aligny>center</aligny>
@@ -190,7 +190,7 @@
 					<posy>0</posy>
 					<width>580</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<textcolor>grey2</textcolor>
 					<align>right</align>
 					<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml
index bb3c5df889..2c0985ffce 100644
--- a/addons/skin.confluence/720p/MyMusicNav.xml
+++ b/addons/skin.confluence/720p/MyMusicNav.xml
@@ -40,7 +40,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -91,7 +91,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyMusicPlaylist.xml b/addons/skin.confluence/720p/MyMusicPlaylist.xml
index 380915eeda..2be0bbc896 100644
--- a/addons/skin.confluence/720p/MyMusicPlaylist.xml
+++ b/addons/skin.confluence/720p/MyMusicPlaylist.xml
@@ -33,7 +33,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -48,7 +48,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyMusicSongs.xml b/addons/skin.confluence/720p/MyMusicSongs.xml
index 5df8439d02..96ab988dce 100644
--- a/addons/skin.confluence/720p/MyMusicSongs.xml
+++ b/addons/skin.confluence/720p/MyMusicSongs.xml
@@ -36,7 +36,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyPics.xml b/addons/skin.confluence/720p/MyPics.xml
index a3b6665a01..75165a3df4 100644
--- a/addons/skin.confluence/720p/MyPics.xml
+++ b/addons/skin.confluence/720p/MyPics.xml
@@ -49,7 +49,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -84,7 +84,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml
index 610edf7956..c17a7142be 100644
--- a/addons/skin.confluence/720p/MyPrograms.xml
+++ b/addons/skin.confluence/720p/MyPrograms.xml
@@ -35,7 +35,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index ff1eb1bd39..10dbb45e3c 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -43,7 +43,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -87,7 +87,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyVideoPlaylist.xml b/addons/skin.confluence/720p/MyVideoPlaylist.xml
index 9b8985d72d..44267e077a 100644
--- a/addons/skin.confluence/720p/MyVideoPlaylist.xml
+++ b/addons/skin.confluence/720p/MyVideoPlaylist.xml
@@ -32,7 +32,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -47,7 +47,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml
index 8b49a6e56b..9049ef8409 100644
--- a/addons/skin.confluence/720p/MyWeather.xml
+++ b/addons/skin.confluence/720p/MyWeather.xml
@@ -121,7 +121,7 @@
 					<posy>185</posy>
 					<width>100</width>
 					<height>40</height>
-					<font>font16caps</font>
+					<font>font16</font>
 					<align>left</align>
 					<aligny>top</aligny>
 					<label>$INFO[System.TemperatureUnits]</label>
@@ -800,7 +800,7 @@
 				<control type="label" id="200">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31006</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
@@ -876,7 +876,7 @@
 				<control type="label" id="201">
 					<width>250</width>
 					<height>35</height>
-					<font>font12caps</font>
+					<font>font12</font>
 					<label>31026</label>
 					<textcolor>blue</textcolor>
 					<align>center</align>
diff --git a/addons/skin.confluence/720p/ProfileSettings.xml b/addons/skin.confluence/720p/ProfileSettings.xml
index 8d86e40126..a428cfb799 100644
--- a/addons/skin.confluence/720p/ProfileSettings.xml
+++ b/addons/skin.confluence/720p/ProfileSettings.xml
@@ -81,7 +81,7 @@
 			<posy>95</posy>
 			<width>460</width>
 			<align>left</align>
-			<font>font16caps</font>
+			<font>font16</font>
 			<textcolor>white</textcolor>
 		</control>
 		<control type="label">
diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml
index 0b9e0ad2ec..cc12b582d7 100644
--- a/addons/skin.confluence/720p/Settings.xml
+++ b/addons/skin.confluence/720p/Settings.xml
@@ -193,7 +193,7 @@
 				<posy>20</posy>
 				<width>740</width>
 				<height>30</height>
-				<font>font16caps</font>
+				<font>font16</font>
 				<label>$LOCALIZE[31000] $LOCALIZE[5]</label>
 				<align>left</align>
 				<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml
index 4d0b2ebd2b..84f8c33ea0 100644
--- a/addons/skin.confluence/720p/SettingsCategory.xml
+++ b/addons/skin.confluence/720p/SettingsCategory.xml
@@ -96,7 +96,7 @@
 				<posy>20</posy>
 				<width>740</width>
 				<height>30</height>
-				<font>font16caps</font>
+				<font>font16</font>
 				<label>$INFO[Control.GetLabel(2)] - $LOCALIZE[5]</label>
 				<align>left</align>
 				<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/SettingsProfile.xml b/addons/skin.confluence/720p/SettingsProfile.xml
index 2ddfb69802..673686ea68 100644
--- a/addons/skin.confluence/720p/SettingsProfile.xml
+++ b/addons/skin.confluence/720p/SettingsProfile.xml
@@ -88,7 +88,7 @@
 				<posy>135</posy>
 				<width>240</width>
 				<height>25</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<textcolor>grey2</textcolor>
 				<align>right</align>
 				<aligny>center</aligny>
@@ -100,7 +100,7 @@
 				<posy>135</posy>
 				<width>240</width>
 				<height>25</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<textcolor>grey2</textcolor>
 				<align>right</align>
 				<aligny>center</aligny>
@@ -136,7 +136,7 @@
 					<posy>245</posy>
 					<width>240</width>
 					<height>20</height>
-					<font>font13caps</font>
+					<font>font13</font>
 					<textcolor>white</textcolor>
 					<align>center</align>
 					<aligny>center</aligny>
@@ -158,7 +158,7 @@
 					<posy>305</posy>
 					<width>240</width>
 					<height>30</height>
-					<font>font13caps</font>
+					<font>font13</font>
 					<textcolor>white</textcolor>
 					<align>center</align>
 					<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/SettingsScreenCalibration.xml b/addons/skin.confluence/720p/SettingsScreenCalibration.xml
index 9b79adf000..8837ed2b36 100644
--- a/addons/skin.confluence/720p/SettingsScreenCalibration.xml
+++ b/addons/skin.confluence/720p/SettingsScreenCalibration.xml
@@ -85,7 +85,7 @@
 				<width>1240</width>
 				<label>-</label>
 				<align>center</align>
-				<font>font13caps</font>
+				<font>font13</font>
 			</control>
 			<control type="label" id="3">
 				<description>help information</description>
@@ -94,7 +94,7 @@
 				<width>1240</width>
 				<label>-</label>
 				<align>center</align>
-				<font>font13caps</font>
+				<font>font13</font>
 			</control>
 		</control>
 	</controls>
diff --git a/addons/skin.confluence/720p/SmartPlaylistRule.xml b/addons/skin.confluence/720p/SmartPlaylistRule.xml
index fbe4efa5d6..4b1c675b39 100644
--- a/addons/skin.confluence/720p/SmartPlaylistRule.xml
+++ b/addons/skin.confluence/720p/SmartPlaylistRule.xml
@@ -88,7 +88,7 @@
 				<posy>100</posy>
 				<width>300</width>
 				<height>40</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<label>$INFO[Control.GetLabel(15)]</label>
 				<align>left</align>
 				<aligny>center</aligny>
@@ -115,7 +115,7 @@
 				<posy>100</posy>
 				<width>300</width>
 				<height>40</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<label>$INFO[Control.GetLabel(16)]</label>
 				<align>left</align>
 				<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/VideoOSDSettings.xml b/addons/skin.confluence/720p/VideoOSDSettings.xml
index 3a4edb9008..fda0db66eb 100644
--- a/addons/skin.confluence/720p/VideoOSDSettings.xml
+++ b/addons/skin.confluence/720p/VideoOSDSettings.xml
@@ -77,7 +77,7 @@
 				<width>760</width>
 				<align>center</align>
 				<label>13390</label>
-				<font>font13caps</font>
+				<font>font13</font>
 			</control>
 			<control type="grouplist" id="5">
 				<description>control area</description>
diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml
index b8bb0f4e83..9f5e84d37c 100644
--- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml
+++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml
@@ -147,7 +147,7 @@
 				<posy>580</posy>
 				<width>1280</width>
 				<height>20</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<textcolor>white</textcolor>
 				<shadowcolor>black</shadowcolor>
 				<scroll>true</scroll>
@@ -201,7 +201,7 @@
 				<posy>575</posy>
 				<width>1280</width>
 				<height>35</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<textcolor>white</textcolor>
 				<scroll>true</scroll>
 				<align>center</align>
@@ -213,7 +213,7 @@
 				<posy>605</posy>
 				<width>1280</width>
 				<height>35</height>
-				<font>font12caps</font>
+				<font>font12</font>
 				<textcolor>white</textcolor>
 				<scroll>true</scroll>
 				<align>center</align>
@@ -252,7 +252,7 @@
 				<posy>575</posy>
 				<width>1280</width>
 				<height>35</height>
-				<font>font13caps</font>
+				<font>font13</font>
 				<textcolor>white</textcolor>
 				<scroll>true</scroll>
 				<align>center</align>
@@ -264,7 +264,7 @@
 				<posy>605</posy>
 				<width>1280</width>
 				<height>35</height>
-				<font>font12caps</font>
+				<font>font12</font>
 				<textcolor>white</textcolor>
 				<scroll>true</scroll>
 				<align>center</align>
diff --git a/addons/skin.confluence/720p/VisualisationPresetList.xml b/addons/skin.confluence/720p/VisualisationPresetList.xml
index 04c1d5b6d3..5fbbe34f78 100644
--- a/addons/skin.confluence/720p/VisualisationPresetList.xml
+++ b/addons/skin.confluence/720p/VisualisationPresetList.xml
@@ -61,7 +61,7 @@
 				<width>760</width>
 				<align>center</align>
 				<label>13389</label>
-				<font>font13caps</font>
+				<font>font13</font>
 			</control>
 			<control type="list" id="2">
 				<posx>40</posx>
diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
index e5d699d805..b24c193a73 100644
--- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -97,7 +97,7 @@
 						<posy>42</posy>
 						<width>870</width>
 						<height>25</height>
-						<font>font13caps</font>
+						<font>font13</font>
 						<textcolor>grey2</textcolor>
 						<align>right</align>
 						<aligny>center</aligny>
@@ -129,7 +129,7 @@
 						<posy>42</posy>
 						<width>870</width>
 						<height>25</height>
-						<font>font13caps</font>
+						<font>font13</font>
 						<textcolor>grey2</textcolor>
 						<align>right</align>
 						<aligny>center</aligny>
@@ -180,7 +180,7 @@
 				<posy>20</posy>
 				<width>740</width>
 				<height>30</height>
-				<font>font16caps</font>
+				<font>font16</font>
 				<label>$LOCALIZE[20077] - $INFO[Container(9000).ListItem.Label]</label>
 				<align>left</align>
 				<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index b563db5f16..0d84ddfc2a 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -35,7 +35,7 @@
 		<posy>0</posy>
 		<width>1060</width>
 		<height>28</height>
-		<font>font12caps</font>
+		<font>font12</font>
 		<textcolor>white</textcolor>
 		<scroll>false</scroll>
 		<align>right</align>
@@ -501,7 +501,7 @@
 		<control type="label" id="202">
 			<width>250</width>
 			<height>35</height>
-			<font>font12caps</font>
+			<font>font12</font>
 			<label>31023</label>
 			<textcolor>blue</textcolor>
 			<align>center</align>