diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
index 9a647e63..15368e88 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -95,12 +79,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -120,24 +100,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -165,24 +137,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -233,27 +197,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -291,27 +241,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -349,27 +285,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index 30a6aa78..e623da57 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -32,9 +28,7 @@
PopupBG
-
- StaticColor
-
+
0
0
@@ -46,9 +40,7 @@
-
- Visible
-
+
0
0
@@ -198,12 +190,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -217,12 +205,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -236,12 +220,8 @@
0
27
130
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -255,12 +235,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -274,12 +250,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -293,12 +265,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -312,12 +280,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -331,12 +295,8 @@
0
27
100
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -350,12 +310,8 @@
-1.01
27
380
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -369,12 +325,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -388,12 +340,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -407,12 +355,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -426,12 +370,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -445,12 +385,8 @@
0
31
770
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -464,12 +400,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2407,24 +2339,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2452,24 +2376,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2497,24 +2413,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2542,24 +2450,16 @@
50
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2587,24 +2487,16 @@
50
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2632,24 +2524,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2671,24 +2555,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2710,24 +2586,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2749,24 +2617,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
index 27287c0b..2adfbb73 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -63,24 +55,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -108,24 +92,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -153,24 +129,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -198,24 +166,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -237,24 +197,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -276,24 +228,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -315,24 +259,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -377,27 +313,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -435,27 +357,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
-5
@@ -477,12 +385,10 @@
CoverTile
-
1
1
1
0.2
-
PlayerSelector
@@ -497,9 +403,7 @@
17
Outline
-
- TextColor
-
+
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
index 70de2d83..773473b7 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -95,12 +79,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -120,24 +100,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -165,24 +137,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -233,27 +197,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -291,27 +241,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -349,27 +285,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
index 4460870d..486ca526 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -32,9 +28,7 @@
PopupBG
-
- StaticColor
-
+
0
0
@@ -46,9 +40,7 @@
-
- Visible
-
+
0
0
@@ -198,12 +190,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -217,12 +205,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -236,12 +220,8 @@
0
27
130
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -255,12 +235,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -274,12 +250,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -293,12 +265,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -312,12 +280,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -331,12 +295,8 @@
0
27
100
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -350,12 +310,8 @@
-1.01
27
380
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -369,12 +325,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -388,12 +340,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -407,12 +355,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -426,12 +370,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -445,12 +385,8 @@
0
31
770
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -464,12 +400,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2407,24 +2339,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2452,24 +2376,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2497,24 +2413,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2542,24 +2450,16 @@
50
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2587,24 +2487,16 @@
50
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2632,24 +2524,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2671,24 +2555,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2710,24 +2586,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2749,24 +2617,16 @@
15
-0.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
index ad2fc795..5c2613d2 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -63,24 +55,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -108,24 +92,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -153,24 +129,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -198,24 +166,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -237,24 +197,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -276,24 +228,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -315,24 +259,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -377,27 +313,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -435,27 +357,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
-5
@@ -477,12 +385,10 @@
CoverTile
-
- 1
- 1
- 1
- 0.2
-
+ 1
+ 1
+ 1
+ 0.2
PlayerSelector
@@ -497,9 +403,7 @@
17
Outline
-
- TextColor
-
+
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
index b4082b44..0fb3bf27 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -95,12 +79,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -120,24 +100,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -165,24 +137,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -233,27 +197,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -291,27 +241,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -349,27 +285,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -407,27 +329,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -465,27 +373,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
index 3dd79eae..3fe553b3 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -32,9 +28,7 @@
PopupBG
-
- StaticColor
-
+
0
0
@@ -46,9 +40,7 @@
PopupBG
-
- StaticColor
-
+
10
200
@@ -60,9 +52,7 @@
PopupBG
-
- StaticColor
-
+
1170
200
@@ -80,12 +70,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -99,12 +85,8 @@
-2.01
27
380
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -118,12 +100,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -137,12 +115,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -156,12 +130,8 @@
0
35
0
-
- Player1
-
-
- TextSColor
-
+
+
Center
Center
@@ -175,12 +145,8 @@
0
35
0
-
- Player2
-
-
- TextSColor
-
+
+
Center
Center
@@ -194,12 +160,8 @@
0
35
0
-
- Player1
-
-
- TextSColor
-
+
+
Left
Center
@@ -213,12 +175,8 @@
0
40
0
-
- Player2
-
-
- TextSColor
-
+
+
Right
Center
@@ -238,24 +196,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -283,24 +233,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -328,24 +270,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -373,24 +307,16 @@
50
-2.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -418,24 +344,16 @@
50
-2.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -463,24 +381,16 @@
100
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -502,24 +412,16 @@
100
0
-
- Player1Dim
-
-
- Player1
-
+
+
50
25
0
50
50
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -541,24 +443,16 @@
100
0
-
- Player2Dim
-
-
- Player2
-
+
+
50
25
0
50
50
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -580,24 +474,16 @@
100
0
-
- Player1Dim
-
-
- Player1
-
+
+
48
25
0
50
50
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -619,24 +505,16 @@
100
0
-
- Player2Dim
-
-
- Player2
-
+
+
48
25
0
50
50
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
index 2a33e780..9f85db0f 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -63,24 +55,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -108,24 +92,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -153,24 +129,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -198,24 +166,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -237,24 +197,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -276,24 +228,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -315,24 +259,16 @@
40
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
10
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -377,27 +313,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -435,27 +357,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
-5
@@ -477,12 +385,10 @@
CoverTile
-
- 1
- 1
- 1
- 0.2
-
+ 1
+ 1
+ 1
+ 0.2
PlayerSelector
@@ -497,9 +403,7 @@
17
Outline
-
- TextColor
-
+
diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml
index 3eadd4f4..e9f58296 100644
--- a/Output/Themes/Ambient.xml
+++ b/Output/Themes/Ambient.xml
@@ -11,6 +11,6 @@
Cursor
40,000
40,000
- StaticColor
+
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
index e8125613..4f181dd4 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
@@ -8,9 +8,7 @@
Menu
-
- StaticColor
-
+
49
0
@@ -22,9 +20,7 @@
CoverBackground
-
- Visible
-
+
55
2
@@ -42,12 +38,8 @@
0
27
769
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -67,24 +59,16 @@
28
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
2
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -106,24 +90,16 @@
28
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
2
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -145,24 +121,16 @@
38
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
2
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -184,24 +152,16 @@
38
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
190
25
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -223,24 +183,16 @@
38
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
405
25
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -262,24 +214,16 @@
38
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
315
0
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -301,24 +245,16 @@
38
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
380
0
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -340,24 +276,16 @@
38
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
315
0
0
32
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml
index 441542da..89cbb240 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenServerQR.xml
@@ -9,12 +9,10 @@
SongMenuBG
-
- 1
- 1
- 1
- 0.8
-
+ 1
+ 1
+ 1
+ 0.8
0
@@ -27,9 +25,7 @@
Menu
-
- Visible
-
+
490
210
@@ -41,9 +37,7 @@
Menu
-
- Visible
-
+
25
25
@@ -55,9 +49,7 @@
Menu
-
- Visible
-
+
1055
25
@@ -69,9 +61,7 @@
Menu
-
- Visible
-
+
25
495
@@ -83,9 +73,7 @@
Menu
-
- Visible
-
+
1055
495
@@ -103,12 +91,8 @@
-2
35
300
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -122,12 +106,8 @@
-2
27
200
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -141,12 +121,8 @@
-2
27
200
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -160,12 +136,8 @@
-2
27
200
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -179,12 +151,8 @@
-2
27
200
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -198,12 +166,8 @@
-2
35
300
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -217,12 +181,8 @@
-2
45
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
index e7fabe5a..b6578e27 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenVolumeControl.xml
@@ -8,9 +8,7 @@
Menu
-
- StaticColor
-
+
1065
672
@@ -28,12 +26,8 @@
-2
27
80
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -75,27 +69,13 @@
30
-2
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
-15
-8
diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
index cff7c62a..e86eb12e 100644
--- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml
+++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -32,9 +28,7 @@
TextBG
-
- Invisible
-
+
50
90
@@ -52,12 +46,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -71,12 +61,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -90,12 +76,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -109,12 +91,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -128,12 +106,8 @@
0
42
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -147,12 +121,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -166,12 +136,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -185,12 +151,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -204,12 +166,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -223,12 +181,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -242,12 +196,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -261,12 +211,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -280,12 +226,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -299,12 +241,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -318,12 +256,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -337,12 +271,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -356,12 +286,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -375,12 +301,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -394,12 +316,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -413,12 +331,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -432,12 +346,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -451,12 +361,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -470,12 +376,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -489,12 +391,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -508,12 +406,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -527,12 +421,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -546,12 +436,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -565,12 +451,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -584,12 +466,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -603,12 +481,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -622,12 +496,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -641,12 +511,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -660,12 +526,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -679,12 +541,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -698,12 +556,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -717,12 +571,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -736,12 +586,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -755,12 +601,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -774,12 +616,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -793,12 +631,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -812,12 +646,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -831,12 +661,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -850,12 +676,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -882,9 +704,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -898,9 +718,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -914,9 +732,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -930,9 +746,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -946,9 +760,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -962,9 +774,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -978,9 +788,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -994,9 +802,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -1010,9 +816,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
@@ -1026,9 +830,7 @@
35
1
-
- StaticColor
-
+
Star
25
250
diff --git a/Output/Themes/Ambient/Screens/ScreenLoad.xml b/Output/Themes/Ambient/Screens/ScreenLoad.xml
index 7d31a98a..a89f1723 100644
--- a/Output/Themes/Ambient/Screens/ScreenLoad.xml
+++ b/Output/Themes/Ambient/Screens/ScreenLoad.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
50
644
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
101
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml
index fba26420..748ec1bd 100644
--- a/Output/Themes/Ambient/Screens/ScreenMain.xml
+++ b/Output/Themes/Ambient/Screens/ScreenMain.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
49
32
@@ -32,9 +28,7 @@
TextBG
-
- StaticWarningColor
-
+
150
610
@@ -52,12 +46,8 @@
-1
15
0
-
- White
-
-
- White
-
+
+
Left
Center
@@ -71,12 +61,8 @@
-2
27
355
-
- TextWarningColor
-
-
- TextWarningColor
-
+
+
Center
Center
@@ -96,24 +82,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -141,24 +119,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -186,24 +156,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -231,24 +193,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -276,24 +230,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index 2a6c7822..346dbd7c 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -32,9 +28,7 @@
-
- Visible
-
+
20
105
@@ -46,9 +40,7 @@
-
- Visible
-
+
20
260
@@ -60,9 +52,7 @@
-
- Visible
-
+
20
415
@@ -74,9 +64,7 @@
-
- Visible
-
+
1152
105
@@ -88,9 +76,7 @@
-
- Visible
-
+
1152
260
@@ -102,9 +88,7 @@
-
- Visible
-
+
1152
415
@@ -116,9 +100,7 @@
PlayerSelector
-
- Player1
-
+
15
100
@@ -130,9 +112,7 @@
PlayerSelector
-
- Player2
-
+
15
255
@@ -144,9 +124,7 @@
PlayerSelector
-
- Player3
-
+
15
410
@@ -158,9 +136,7 @@
PlayerSelector
-
- Player4
-
+
1147
100
@@ -172,9 +148,7 @@
PlayerSelector
-
- Player5
-
+
1147
255
@@ -186,9 +160,7 @@
PlayerSelector
-
- Player6
-
+
1147
410
@@ -200,9 +172,7 @@
-
- StaticWarningColor
-
+
145
663
@@ -214,9 +184,7 @@
-
- StaticWarningColor
-
+
145
715
@@ -234,12 +202,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -253,12 +217,8 @@
0
27
970
-
- TextWarningColor
-
-
- TextWarningColor
-
+
+
Center
Center
@@ -272,12 +232,8 @@
0
27
970
-
- TextWarningColor
-
-
- TextWarningColor
-
+
+
Center
Center
@@ -291,12 +247,8 @@
0
20
0
-
- Player1
-
-
- TextSColor
-
+
+
Center
Center
@@ -310,12 +262,8 @@
0
20
0
-
- Player2
-
-
- TextSColor
-
+
+
Center
Center
@@ -329,12 +277,8 @@
0
20
0
-
- Player3
-
-
- TextSColor
-
+
+
Center
Center
@@ -348,12 +292,8 @@
0
20
0
-
- Player4
-
-
- TextSColor
-
+
+
Center
Center
@@ -367,12 +307,8 @@
0
20
0
-
- Player5
-
-
- TextSColor
-
+
+
Center
Center
@@ -386,12 +322,8 @@
0
20
0
-
- Player6
-
-
- TextSColor
-
+
+
Center
Center
@@ -411,24 +343,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextSColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -456,24 +380,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextSColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -524,27 +440,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -582,27 +484,13 @@
20
-4.01
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
20
0
0
@@ -640,27 +528,13 @@
20
-4.01
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
20
0
0
@@ -698,27 +572,13 @@
20
-4.01
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
20
0
0
@@ -756,27 +616,13 @@
20
-4.01
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
20
0
0
@@ -814,27 +660,13 @@
20
-4.01
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
20
0
0
@@ -872,27 +704,13 @@
20
-4.01
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
20
0
0
@@ -914,12 +732,10 @@
CoverTile
-
- 1
- 1
- 1
- 0.2
-
+ 1
+ 1
+ 1
+ 0.2
PlayerSelector
@@ -934,9 +750,7 @@
17
Outline
-
- TextColor
-
+
@@ -955,12 +769,8 @@
2
TR_CONFIG_OFF
-
- Player1Dim2
-
-
- Player1Dim2
-
+
+
@@ -976,12 +786,8 @@
2
TR_CONFIG_OFF
-
- Player2Dim2
-
-
- Player2Dim2
-
+
+
@@ -997,12 +803,8 @@
2
TR_CONFIG_OFF
-
- Player3Dim2
-
-
- Player3Dim2
-
+
+
@@ -1018,12 +820,8 @@
2
TR_CONFIG_OFF
-
- Player4Dim2
-
-
- Player4Dim2
-
+
+
@@ -1039,12 +837,8 @@
2
TR_CONFIG_OFF
-
- Player5Dim2
-
-
- Player5Dim2
-
+
+
@@ -1060,12 +854,8 @@
2
TR_CONFIG_OFF
-
- Player6Dim2
-
-
- Player6Dim2
-
+
+
diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml
index 120be893..d9a9352b 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptions.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
50
32
@@ -38,12 +34,8 @@
0
27
0
-
- Invisible
-
-
- Invisible
-
+
+
Left
Center
@@ -63,24 +55,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -108,24 +92,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -153,24 +129,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -198,24 +166,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -243,24 +203,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -288,24 +240,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
index 755cb06a..f85bc49b 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
40
40
@@ -32,9 +28,7 @@
-
- Invisible
-
+
50
100
@@ -46,9 +40,7 @@
-
- Invisible
-
+
50
160
@@ -60,9 +52,7 @@
-
- Invisible
-
+
50
220
@@ -74,9 +64,7 @@
-
- Invisible
-
+
50
280
@@ -88,9 +76,7 @@
-
- Invisible
-
+
50
340
@@ -102,9 +88,7 @@
-
- Invisible
-
+
50
400
@@ -122,12 +106,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -141,12 +121,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -160,12 +136,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -179,12 +151,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -198,12 +166,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -217,12 +181,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -236,12 +196,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -261,24 +217,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -306,24 +254,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -374,27 +314,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -432,27 +358,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -490,27 +402,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -548,27 +446,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -606,27 +490,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -664,27 +534,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
index cdfc0e4f..95568c9c 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -101,24 +85,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -169,27 +145,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -227,27 +189,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index e80685c6..16db3e04 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
40
40
@@ -32,9 +28,7 @@
-
- Invisible
-
+
50
100
@@ -46,9 +40,7 @@
-
- Invisible
-
+
50
160
@@ -60,9 +52,7 @@
-
- Invisible
-
+
50
220
@@ -74,9 +64,7 @@
-
- Invisible
-
+
50
280
@@ -88,9 +76,7 @@
-
- Invisible
-
+
50
340
@@ -102,9 +88,7 @@
-
- StaticWarningColor
-
+
145
530
@@ -116,9 +100,7 @@
EnergyBeam
-
- Visible
-
+
390
234
@@ -130,9 +112,7 @@
EnergyBeam
-
- Visible
-
+
390
296
@@ -150,12 +130,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -169,12 +145,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -188,12 +160,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -207,12 +175,8 @@
0
27
970
-
- TextWarningColor
-
-
- TextWarningColor
-
+
+
Center
Center
@@ -226,12 +190,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -245,12 +205,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -264,12 +220,8 @@
-1
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -283,12 +235,8 @@
-1
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -308,24 +256,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -353,24 +293,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -421,27 +353,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -479,27 +397,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -537,27 +441,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -595,27 +485,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -641,12 +517,8 @@
2
TR_CONFIG_OFF
-
- ButtonColor
-
-
- ButtonTextColor
-
+
+
26
10
@@ -665,12 +537,8 @@
2
TR_CONFIG_OFF
-
- ButtonColor
-
-
- ButtonTextColor
-
+
+
26
10
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
index 70432910..385ab7d3 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -95,12 +79,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -114,12 +94,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -133,12 +109,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -158,24 +130,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -226,27 +190,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -284,27 +234,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -342,27 +278,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -400,27 +322,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -458,27 +366,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
index df5d1521..9f9c586a 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -32,9 +28,7 @@
-
- Invisible
-
+
50
100
@@ -46,9 +40,7 @@
-
- Invisible
-
+
50
160
@@ -60,9 +52,7 @@
-
- Invisible
-
+
50
220
@@ -74,9 +64,7 @@
-
- Invisible
-
+
50
280
@@ -88,9 +76,7 @@
-
- Invisible
-
+
50
340
@@ -102,9 +88,7 @@
-
- Invisible
-
+
50
400
@@ -116,9 +100,7 @@
-
- Invisible
-
+
50
460
@@ -130,9 +112,7 @@
-
- Invisible
-
+
50
520
@@ -150,12 +130,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -169,12 +145,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -188,12 +160,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -207,12 +175,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -226,12 +190,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -245,12 +205,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -264,12 +220,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -283,12 +235,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -302,12 +250,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -327,24 +271,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -395,27 +331,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -453,27 +375,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -511,27 +419,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -569,27 +463,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -627,27 +507,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -685,27 +551,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -743,27 +595,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -801,27 +639,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index 3e16d286..ea795dc0 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
40
40
@@ -32,9 +28,7 @@
-
- Invisible
-
+
50
100
@@ -46,9 +40,7 @@
-
- Invisible
-
+
50
160
@@ -60,9 +52,7 @@
-
- Invisible
-
+
50
220
@@ -74,9 +64,7 @@
-
- Visible
-
+
550
460
@@ -94,12 +82,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -113,12 +97,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -132,12 +112,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -151,12 +127,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -170,12 +142,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -189,12 +157,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -208,12 +172,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -233,24 +193,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -278,24 +230,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -346,27 +290,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -404,27 +334,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -462,27 +378,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -520,27 +422,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -578,27 +466,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -636,27 +510,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
index bbef2844..ec82cf21 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
@@ -11,12 +11,10 @@
BG_Options
-
- 1
- 1
- 1
- 1
-
+ 1
+ 1
+ 1
+ 1
@@ -28,12 +26,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -47,12 +41,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -66,12 +56,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -85,12 +71,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -104,12 +86,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -123,12 +101,8 @@
0
35
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -148,24 +122,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml
index 874cc645..427cb65e 100644
--- a/Output/Themes/Ambient/Screens/ScreenParty.xml
+++ b/Output/Themes/Ambient/Screens/ScreenParty.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -38,12 +34,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -57,12 +49,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -76,12 +64,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -95,12 +79,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -114,12 +94,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -133,12 +109,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -152,12 +124,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -171,12 +139,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -190,12 +154,8 @@
0
27
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -209,12 +169,8 @@
0
27
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -228,12 +184,8 @@
0
27
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -247,12 +199,8 @@
0
27
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -266,12 +214,8 @@
0
27
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -285,12 +229,8 @@
0
27
600
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -304,12 +244,8 @@
0
27
600
-
- TextWarningColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -329,24 +265,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -374,24 +302,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -442,27 +362,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
index 3e6e5a47..394ba2b9 100644
--- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml
+++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
@@ -10,17 +10,13 @@
BG_Options
-
- BackgroundColor
-
+
Menu
-
- Invisible
-
+
40
40
@@ -32,9 +28,7 @@
-
- Invisible
-
+
50
160
@@ -46,9 +40,7 @@
-
- Invisible
-
+
50
220
@@ -60,9 +52,7 @@
-
- Invisible
-
+
50
280
@@ -74,9 +64,7 @@
-
- Invisible
-
+
50
340
@@ -88,9 +76,7 @@
-
- Invisible
-
+
50
400
@@ -102,9 +88,7 @@
-
- Visible
-
+
85
110
@@ -122,12 +106,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -141,12 +121,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -160,12 +136,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -179,12 +151,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -198,12 +166,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -217,12 +181,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -242,24 +202,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
355
10
0
27
702
-
- ButtonTextSColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -281,24 +233,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -326,24 +270,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -371,24 +307,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -416,24 +344,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -461,24 +381,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -506,24 +418,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -545,24 +449,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -584,24 +480,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -652,27 +540,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -710,27 +584,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -768,27 +628,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -826,27 +672,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
@@ -884,27 +716,13 @@
40
0
-
- SelectSlideColor
-
-
- SelectSlideSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
27
0
0
diff --git a/Output/Themes/Ambient/Screens/ScreenScore.xml b/Output/Themes/Ambient/Screens/ScreenScore.xml
index 5e80539f..2476be0e 100644
--- a/Output/Themes/Ambient/Screens/ScreenScore.xml
+++ b/Output/Themes/Ambient/Screens/ScreenScore.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
Menu
-
- StaticColor
-
+
40
40
@@ -33,12 +29,10 @@
TextBG
-
- 0
- 0
- 0
- 0
-
+ 0
+ 0
+ 0
+ 0
50
@@ -52,12 +46,10 @@
PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
+ 0
+ 0
+ 1
+ 0.75
560
@@ -70,9 +62,7 @@
PointsBar
-
- Player1
-
+
560
180
@@ -84,9 +74,7 @@
-
- Visible
-
+
560
410
@@ -102,12 +90,10 @@
PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
+ 0
+ 0
+ 1
+ 0.75
352
@@ -120,9 +106,7 @@
PointsBar
-
- Player1
-
+
352
180
@@ -134,9 +118,7 @@
-
- Visible
-
+
352
410
@@ -152,12 +134,10 @@
PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
+ 1
+ 0
+ 0
+ 0.75
768
@@ -170,9 +150,7 @@
PointsBar
-
- Player2
-
+
768
180
@@ -184,9 +162,7 @@
-
- Visible
-
+
768
410
@@ -202,12 +178,10 @@
PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
+ 0
+ 0
+ 1
+ 0.75
238
@@ -220,9 +194,7 @@
PointsBar
-
- Player1
-
+
238
180
@@ -234,9 +206,7 @@
-
- Visible
-
+
238
410
@@ -252,12 +222,10 @@
PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
+ 1
+ 0
+ 0
+ 0.75
560
@@ -270,9 +238,7 @@
PointsBar
-
- Player2
-
+
560
180
@@ -284,9 +250,7 @@
-
- Visible
-
+
560
410
@@ -302,12 +266,10 @@
PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
+ 0
+ 1
+ 0
+ 0.75
882
@@ -320,9 +282,7 @@
PointsBar
-
- Player3
-
+
882
180
@@ -334,9 +294,7 @@
-
- Visible
-
+
882
410
@@ -352,12 +310,10 @@
PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
+ 0
+ 0
+ 1
+ 0.75
190
@@ -370,9 +326,7 @@
PointsBar
-
- Player1
-
+
190
180
@@ -384,9 +338,7 @@
-
- Visible
-
+
190
410
@@ -402,12 +354,10 @@
PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
+ 1
+ 0
+ 0
+ 0.75
422
@@ -420,9 +370,7 @@
PointsBar
-
- Player2
-
+
422
180
@@ -434,9 +382,7 @@
-
- Visible
-
+
422
410
@@ -452,12 +398,10 @@
PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
+ 0
+ 1
+ 0
+ 0.75
654
@@ -470,9 +414,7 @@
PointsBar
-
- Player3
-
+
654
180
@@ -484,9 +426,7 @@
-
- Visible
-
+
654
410
@@ -502,12 +442,10 @@
PointsBarBG
-
- 0.5
- 0
- 1
- 0.75
-
+ 0.5
+ 0
+ 1
+ 0.75
886
@@ -520,9 +458,7 @@
PointsBar
-
- Player4
-
+
886
180
@@ -534,9 +470,7 @@
-
- Visible
-
+
886
410
@@ -552,12 +486,10 @@
PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
+ 0
+ 0
+ 1
+ 0.75
144
@@ -570,9 +502,7 @@
PointsBar
-
- Player1
-
+
144
180
@@ -584,9 +514,7 @@
-
- Visible
-
+
144
410
@@ -602,12 +530,10 @@
PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
+ 1
+ 0
+ 0
+ 0.75
352
@@ -620,9 +546,7 @@
PointsBar
-
- Player2
-
+
352
180
@@ -634,9 +558,7 @@
-
- Visible
-
+
352
410
@@ -652,12 +574,10 @@
PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
+ 0
+ 1
+ 0
+ 0.75
560
@@ -670,9 +590,7 @@
PointsBar
-
- Player3
-
+
560
180
@@ -684,9 +602,7 @@
-
- Visible
-
+
560
410
@@ -702,12 +618,10 @@
PointsBarBG
-
- 0.5
- 0
- 1
- 0.75
-
+ 0.5
+ 0
+ 1
+ 0.75
768
@@ -720,9 +634,7 @@
PointsBar
-
- Player4
-
+
768
180
@@ -734,9 +646,7 @@
-
- Visible
-
+
768
410
@@ -752,12 +662,10 @@
PointsBarBG
-
- 1
- 0.8
- 0
- 0.75
-
+ 1
+ 0.8
+ 0
+ 0.75
976
@@ -770,9 +678,7 @@
PointsBar
-
- Player5
-
+
976
180
@@ -784,9 +690,7 @@
-
- Visible
-
+
976
410
@@ -802,12 +706,10 @@
PointsBarBG
-
- 0
- 0
- 1
- 0.75
-
+ 0
+ 0
+ 1
+ 0.75
45
@@ -820,9 +722,7 @@
PointsBar
-
- Player1
-
+
45
180
@@ -834,9 +734,7 @@
-
- Visible
-
+
45
410
@@ -852,12 +750,10 @@
PointsBarBG
-
- 1
- 0
- 0
- 0.75
-
+ 1
+ 0
+ 0
+ 0.75
253
@@ -870,9 +766,7 @@
PointsBar
-
- Player2
-
+
253
180
@@ -884,9 +778,7 @@
-
- Visible
-
+
253
410
@@ -902,12 +794,10 @@
PointsBarBG
-
- 0
- 1
- 0
- 0.75
-
+ 0
+ 1
+ 0
+ 0.75
461
@@ -920,9 +810,7 @@
PointsBar
-
- Player3
-
+
461
180
@@ -934,9 +822,7 @@
-
- Visible
-
+
461
410
@@ -952,12 +838,10 @@
PointsBarBG
-
- 0.5
- 0
- 1
- 0.75
-
+ 0.5
+ 0
+ 1
+ 0.75
669
@@ -970,9 +854,7 @@
PointsBar
-
- Player4
-
+
669
180
@@ -984,9 +866,7 @@
-
- Visible
-
+
669
410
@@ -1002,12 +882,10 @@
PointsBarBG
-
- 1
- 0.8
- 0
- 0.75
-
+ 1
+ 0.8
+ 0
+ 0.75
877
@@ -1020,9 +898,7 @@
PointsBar
-
- Player5
-
+
877
180
@@ -1034,9 +910,7 @@
-
- Visible
-
+
877
410
@@ -1052,12 +926,10 @@
PointsBarBG
-
- 1
- 0
- 0.5
- 0.75
-
+ 1
+ 0
+ 0.5
+ 0.75
1085
@@ -1070,9 +942,7 @@
PointsBar
-
- Player6
-
+
1085
180
@@ -1084,9 +954,7 @@
-
- Visible
-
+
1085
410
@@ -1107,12 +975,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -1126,12 +990,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1145,12 +1005,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1164,12 +1020,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1183,12 +1035,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1202,12 +1050,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1221,12 +1065,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1240,12 +1080,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1259,12 +1095,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1278,12 +1110,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1297,12 +1125,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1316,12 +1140,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1335,12 +1155,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1354,12 +1170,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1373,12 +1185,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1392,12 +1200,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1411,12 +1215,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1430,12 +1230,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1449,12 +1245,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1468,12 +1260,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1487,12 +1275,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1506,12 +1290,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1525,12 +1305,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1544,12 +1320,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1563,12 +1335,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1582,12 +1350,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1601,12 +1365,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1620,12 +1380,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1639,12 +1395,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1658,12 +1410,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1677,12 +1425,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1696,12 +1440,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1715,12 +1455,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1734,12 +1470,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1753,12 +1485,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1772,12 +1500,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1791,12 +1515,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1810,12 +1530,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1829,12 +1545,8 @@
0
44
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1848,12 +1560,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1867,12 +1575,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1886,12 +1590,8 @@
0
28
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1905,12 +1605,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1924,12 +1620,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1943,12 +1635,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1962,12 +1650,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -1981,12 +1665,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2000,12 +1680,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2019,12 +1695,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2038,12 +1710,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2057,12 +1725,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2076,12 +1740,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2095,12 +1755,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2114,12 +1770,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2133,12 +1785,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2152,12 +1800,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2171,12 +1815,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2190,12 +1830,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2209,12 +1845,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2228,12 +1860,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2247,12 +1875,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2266,12 +1890,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2285,12 +1905,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2304,12 +1920,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2323,12 +1935,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2342,12 +1950,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2361,12 +1965,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2380,12 +1980,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2399,12 +1995,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2418,12 +2010,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2437,12 +2025,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2456,12 +2040,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2475,12 +2055,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2494,12 +2070,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2513,12 +2085,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2532,12 +2100,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2551,12 +2115,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2570,12 +2130,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2589,12 +2145,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2608,12 +2160,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2627,12 +2175,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2646,12 +2190,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2665,12 +2205,8 @@
0
44
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2684,12 +2220,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2703,12 +2235,8 @@
0
27
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -2722,12 +2250,8 @@
0
28
160
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index fd2c0365..936befd2 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -11,21 +11,17 @@
-
- 0
- 0
- 0
- 1
-
+ 0
+ 0
+ 0
+ 1
Score
-
- StaticColor
-
+
190
10
@@ -37,9 +33,7 @@
Lyrics
-
- StaticColor
-
+
40
600
@@ -51,9 +45,7 @@
Lyrics
-
- StaticColor
-
+
40
7
@@ -65,9 +57,7 @@
Lyrics
-
- StaticColor
-
+
40
7
@@ -79,9 +69,7 @@
TimeBar
-
- StaticColor
-
+
40
696
@@ -93,9 +81,7 @@
TimeLine
-
- StaticColor
-
+
44
702
@@ -107,9 +93,7 @@
TimeLine
-
- TimeBar
-
+
44
696
@@ -121,9 +105,7 @@
TimeLine
-
- TimeBarSentence
-
+
44
696
@@ -136,12 +118,10 @@
Pointer
-
- 0
- 0
- 0
- 1
-
+ 0
+ 0
+ 0
+ 1
44
@@ -154,9 +134,7 @@
LyricHelper
-
- LyricHelper
-
+
40
600
@@ -168,9 +146,7 @@
LyricHelper
-
- LyricHelper
-
+
40
12
@@ -182,9 +158,7 @@
LyricHelper
-
- LyricHelper
-
+
40
12
@@ -196,9 +170,7 @@
PauseBG
-
- Visible
-
+
0
0
@@ -210,9 +182,7 @@
-
- StaticColor
-
+
1150
350
@@ -225,12 +195,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -243,9 +211,7 @@
-
- StaticColor
-
+
1150
150
@@ -258,12 +224,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -276,9 +240,7 @@
-
- StaticColor
-
+
1150
350
@@ -291,12 +253,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -309,9 +269,7 @@
-
- StaticColor
-
+
1150
10
@@ -324,12 +282,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -342,9 +298,7 @@
-
- StaticColor
-
+
1150
210
@@ -357,12 +311,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -375,9 +327,7 @@
-
- StaticColor
-
+
1150
410
@@ -390,12 +340,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -408,9 +356,7 @@
-
- StaticColor
-
+
528
150
@@ -423,12 +369,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -441,9 +385,7 @@
-
- StaticColor
-
+
528
350
@@ -456,12 +398,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -474,9 +414,7 @@
-
- StaticColor
-
+
1150
150
@@ -489,12 +427,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -507,9 +443,7 @@
-
- StaticColor
-
+
1150
350
@@ -522,12 +456,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -540,9 +472,7 @@
-
- StaticColor
-
+
528
10
@@ -555,12 +485,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -573,9 +501,7 @@
-
- StaticColor
-
+
528
210
@@ -588,12 +514,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -606,9 +530,7 @@
-
- StaticColor
-
+
528
410
@@ -621,12 +543,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -639,9 +559,7 @@
-
- StaticColor
-
+
1150
150
@@ -654,12 +572,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -672,9 +588,7 @@
-
- StaticColor
-
+
1150
350
@@ -687,12 +601,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -705,9 +617,7 @@
-
- StaticColor
-
+
528
10
@@ -720,12 +630,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -738,9 +646,7 @@
-
- StaticColor
-
+
528
210
@@ -753,12 +659,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -771,9 +675,7 @@
-
- StaticColor
-
+
528
410
@@ -786,12 +688,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
40
@@ -804,9 +704,7 @@
-
- StaticColor
-
+
1150
10
@@ -819,12 +717,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -837,9 +733,7 @@
-
- StaticColor
-
+
1150
210
@@ -852,12 +746,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -870,9 +762,7 @@
-
- StaticColor
-
+
1150
410
@@ -885,12 +775,10 @@
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
1103
@@ -909,12 +797,8 @@
-1
27
880
-
- Black
-
-
- Black
-
+
+
Center
Center
@@ -928,12 +812,8 @@
-1
20
0
-
- White
-
-
- White
-
+
+
Right
Center
@@ -947,12 +827,8 @@
-2.11
90
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -966,12 +842,8 @@
-1
30
0
-
- TextSColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -985,12 +857,8 @@
-1
30
0
-
- TextSColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -1004,12 +872,8 @@
-1
27
0
-
- TextColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -1023,12 +887,8 @@
-1
198
0
-
- Player1Dim2
-
-
- TextSColor
-
+
+
Right
Center
@@ -1043,16 +903,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- TextSColor
-
+
Center
Center
@@ -1066,12 +922,8 @@
-1
173
0
-
- Player1Dim2
-
-
- Player1
-
+
+
Right
Center
@@ -1086,16 +938,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player1
-
+
Center
Center
@@ -1109,12 +957,8 @@
-1
173
0
-
- Player2Dim2
-
-
- Player2
-
+
+
Right
Center
@@ -1129,16 +973,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player2
-
+
Center
Center
@@ -1152,12 +992,8 @@
-1
148
0
-
- Player1Dim2
-
-
- Player1
-
+
+
Right
Center
@@ -1172,16 +1008,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player1
-
+
Center
Center
@@ -1195,12 +1027,8 @@
-1
148
0
-
- Player2Dim2
-
-
- Player2
-
+
+
Right
Center
@@ -1215,16 +1043,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player2
-
+
Center
Center
@@ -1238,12 +1062,8 @@
-1
148
0
-
- Player3Dim2
-
-
- Player3
-
+
+
Right
Center
@@ -1258,16 +1078,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player3
-
+
Center
Center
@@ -1281,12 +1097,8 @@
-1
173
0
-
- Player1Dim2
-
-
- Player1
-
+
+
Center
Center
@@ -1301,16 +1113,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player1
-
+
Center
Center
@@ -1324,12 +1132,8 @@
-1
173
0
-
- Player2Dim2
-
-
- Player2
-
+
+
Center
Center
@@ -1344,16 +1148,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player2
-
+
Center
Center
@@ -1367,12 +1167,8 @@
-1
173
0
-
- Player3Dim2
-
-
- Player3
-
+
+
Center
Center
@@ -1387,16 +1183,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player3
-
+
Center
Center
@@ -1410,12 +1202,8 @@
-1
173
0
-
- Player4Dim2
-
-
- Player4
-
+
+
Center
Center
@@ -1430,16 +1218,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player4
-
+
Center
Center
@@ -1453,12 +1237,8 @@
-1
148
0
-
- Player1Dim2
-
-
- Player1
-
+
+
Center
Center
@@ -1473,16 +1253,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player1
-
+
Center
Center
@@ -1496,12 +1272,8 @@
-1
148
0
-
- Player2Dim2
-
-
- Player2
-
+
+
Center
Center
@@ -1516,16 +1288,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player2
-
+
Center
Center
@@ -1539,12 +1307,8 @@
-1
148
0
-
- Player3Dim2
-
-
- Player3
-
+
+
Center
Center
@@ -1559,16 +1323,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player3
-
+
Center
Center
@@ -1582,12 +1342,8 @@
-1
173
0
-
- Player4Dim2
-
-
- Player4
-
+
+
Center
Center
@@ -1602,16 +1358,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player4
-
+
Center
Center
@@ -1625,12 +1377,8 @@
-1
173
0
-
- Player5Dim2
-
-
- Player5
-
+
+
Center
Center
@@ -1645,16 +1393,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player5
-
+
Center
Center
@@ -1668,12 +1412,8 @@
-1
148
0
-
- Player1Dim2
-
-
- Player1
-
+
+
Center
Center
@@ -1688,16 +1428,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player1
-
+
Center
Center
@@ -1711,12 +1447,8 @@
-1
148
0
-
- Player2Dim2
-
-
- Player2
-
+
+
Center
Center
@@ -1731,16 +1463,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player2
-
+
Center
Center
@@ -1754,12 +1482,8 @@
-1
148
0
-
- Player3Dim2
-
-
- Player3
-
+
+
Center
Center
@@ -1774,16 +1498,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player3
-
+
Center
Center
@@ -1797,12 +1517,8 @@
-1
148
0
-
- Player4Dim2
-
-
- Player4
-
+
+
Center
Center
@@ -1817,16 +1533,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player4
-
+
Center
Center
@@ -1840,12 +1552,8 @@
-1
148
0
-
- Player5Dim2
-
-
- Player5
-
+
+
Center
Center
@@ -1860,16 +1568,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player5
-
+
Center
Center
@@ -1883,12 +1587,8 @@
-1
148
0
-
- Player6Dim2
-
-
- Player6
-
+
+
Center
Center
@@ -1903,16 +1603,12 @@
28
0
-
- 1
- 1
- 1
- 0.4
-
+ 1
+ 1
+ 1
+ 0.4
-
- Player6
-
+
Center
Center
@@ -1932,24 +1628,16 @@
50
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -1977,24 +1665,16 @@
50
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2022,24 +1702,16 @@
50
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -2068,12 +1740,8 @@
42
-1
-
- LyricMainColor
-
-
- LyricHighlight
-
+
+
@@ -2083,12 +1751,8 @@
38
-1
-
- LyricSubColor
-
-
- LyricHighlight
-
+
+
@@ -2098,12 +1762,8 @@
42
-1
-
- LyricMainColor
-
-
- LyricHighlight
-
+
+
@@ -2113,12 +1773,8 @@
38
-1
-
- LyricSubColor
-
-
- LyricHighlight
-
+
+
@@ -2128,12 +1784,8 @@
42
-1
-
- LyricMainColor
-
-
- LyricHighlight
-
+
+
@@ -2143,12 +1795,8 @@
38
-1
-
- LyricSubColor
-
-
- LyricHighlight
-
+
+
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index 5329b324..bf003565 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -10,17 +10,13 @@
BG_Default
-
- BackgroundColor
-
+
SongMenu
-
- StaticColor
-
+
40
600
@@ -35,9 +31,7 @@
Menu
-
- StaticColor
-
+
40
600
@@ -52,14 +46,7 @@
SongMenuBG
-
-
- 1
- 1
- 1
- 1
-
-
+
40
40
@@ -77,12 +64,8 @@
-2.11
42
350
-
- Player1
-
-
- Player1
-
+
+
Left
Center
@@ -96,12 +79,8 @@
-2.11
42
350
-
- Player2
-
-
- Player2
-
+
+
Left
Center
@@ -115,12 +94,8 @@
-2.11
42
350
-
- Player3
-
-
- Player3
-
+
+
Left
Center
@@ -134,12 +109,8 @@
-2.11
42
350
-
- Player4
-
-
- Player4
-
+
+
Left
Center
@@ -153,12 +124,8 @@
-2.11
42
350
-
- Player5
-
-
- Player5
-
+
+
Left
Center
@@ -172,12 +139,8 @@
-2.11
42
350
-
- Player6
-
-
- Player6
-
+
+
Left
Center
@@ -191,12 +154,8 @@
0
27
340
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -213,12 +172,8 @@
0
27
830
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -235,12 +190,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Right
Center
@@ -254,12 +205,8 @@
0
27
0
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -273,12 +220,8 @@
-2.11
34
350
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Center
@@ -298,24 +241,16 @@
80
-1.01
-
- Player1Dim
-
-
- Player1
-
+
+
40
23
0
34
60
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -337,24 +272,16 @@
80
-1.01
-
- Player2Dim
-
-
- Player2
-
+
+
40
23
0
34
60
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -376,24 +303,16 @@
80
-1.01
-
- Player3Dim
-
-
- Player3
-
+
+
40
23
0
34
60
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -415,24 +334,16 @@
80
-1.01
-
- Player4Dim
-
-
- Player4
-
+
+
40
23
0
34
60
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -454,24 +365,16 @@
80
-1.01
-
- Player5Dim
-
-
- Player5
-
+
+
40
23
0
34
60
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -493,24 +396,16 @@
80
-1.01
-
- Player6Dim
-
-
- Player6
-
+
+
40
23
0
34
60
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -532,24 +427,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -571,24 +458,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -610,24 +489,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -649,24 +520,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -688,24 +551,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -727,24 +582,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -766,24 +613,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -805,24 +644,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -844,24 +675,16 @@
360
-1.01
-
- Invisible
-
-
- Invisible
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -883,24 +706,16 @@
50
0
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
75
12
0
27
142
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -928,24 +743,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -967,24 +774,16 @@
40
-2.11
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -1006,12 +805,10 @@
MedleyCalcIcon
MedleyTagIcon
-
- 1
- 1
- 1
- 0.2
-
+ 1
+ 1
+ 1
+ 0.2
6
@@ -1040,12 +837,8 @@
-1.01
39
340
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Top
@@ -1059,12 +852,8 @@
-1.01
32
340
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Top
@@ -1078,12 +867,8 @@
-1.01
28
340
-
- StaticColor
-
-
- TextSColor
-
+
+
Center
Top
@@ -1093,9 +878,7 @@
CoverBackground
-
- Visible
-
+
40
40
@@ -1107,9 +890,7 @@
CoverBackground
-
- StaticColor
-
+
40
40
@@ -1121,9 +902,7 @@
DuetIcon
-
- StaticColor
-
+
200
530
@@ -1135,9 +914,7 @@
VideoIcon
-
- StaticColor
-
+
120
530
@@ -1149,9 +926,7 @@
MedleyCalcIcon
-
- StaticColor
-
+
280
530
@@ -1163,9 +938,7 @@
MedleyTagIcon
-
- StaticColor
-
+
280
530
@@ -1209,27 +982,13 @@
30
-2.12
-
- ButtonColor
-
-
- ButtonSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
25
0
0
@@ -1267,27 +1026,13 @@
30
-2.12
-
- ButtonColor
-
-
- ButtonSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
25
0
0
@@ -1325,27 +1070,13 @@
30
-2.12
-
- ButtonColor
-
-
- ButtonSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
25
0
0
@@ -1383,27 +1114,13 @@
30
-2.12
-
- ButtonColor
-
-
- ButtonSColor
-
-
- SelectSlideHColor
-
-
- ArrowColor
-
-
- ArrowSColor
-
-
- TextColor
-
-
- TextSColor
-
+
+
+
+
+
+
+
25
0
0
@@ -1428,24 +1145,16 @@
50
CoverTile
CoverTile
-
- StaticColorAlpha
-
-
- StaticColor
-
+
+
54
5
-1.01
22
235
-
- StaticColor
-
-
- TextSColor
-
+
+
Left
Center
@@ -1455,9 +1164,7 @@
-
- Visible
-
+
4
2
@@ -1469,9 +1176,7 @@
Menu
-
- StaticColor
-
+
970
40
@@ -1483,9 +1188,7 @@
Menu
-
- StaticColor
-
+
970
550
@@ -1505,24 +1208,16 @@
25
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
0
0
0
25
220
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Left
Center
@@ -1544,24 +1239,16 @@
35
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
7
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -1583,24 +1270,16 @@
35
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
5
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -1622,24 +1301,16 @@
35
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
5
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
@@ -1661,24 +1332,16 @@
35
-1.01
-
- ButtonColor
-
-
- ButtonSColor
-
+
+
180
5
0
25
350
-
- ButtonTextColor
-
-
- ButtonTextSColor
-
+
+
Center
Center
diff --git a/Output/Themes/Ambient/Screens/ScreenTest.xml b/Output/Themes/Ambient/Screens/ScreenTest.xml
index 1f3ecc85..6958eb63 100644
--- a/Output/Themes/Ambient/Screens/ScreenTest.xml
+++ b/Output/Themes/Ambient/Screens/ScreenTest.xml
@@ -11,12 +11,10 @@
-
- 0
- 0
- 0
- 1
-
+ 0
+ 0
+ 0
+ 1
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 3e201c06..1a427034 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -94,7 +94,7 @@ namespace Vocaluxe.Base
public static EFadePlayerInfo FadePlayerInfo = EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF;
public static ECoverLoading CoverLoading = ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC;
public static ELyricStyle LyricStyle = ELyricStyle.Slide;
- public static bool LoadOldThemeFiles = false;
+ public static bool LoadOldThemeFiles;
// Sound
public static EPlaybackLib PlayBackLib = EPlaybackLib.GstreamerSharp;
diff --git a/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs b/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs
index 3589d702..7a7d7609 100644
--- a/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs
+++ b/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs
@@ -34,9 +34,7 @@ namespace Vocaluxe.Base.ThemeSystem
ok &= xmlReader.TryGetFloatValue("//root/Cursor/W", ref CursorTheme.W);
ok &= xmlReader.TryGetFloatValue("//root/Cursor/H", ref CursorTheme.H);
-
- if (!xmlReader.GetValue("//root/Cursor/Color/Name", out CursorTheme.Color.Name))
- ok &= xmlReader.Read("//root/Cursor/Color/Color", out CursorTheme.Color.Color);
+ ok &= xmlReader.Read("//root/Cursor/Color", out CursorTheme.Color);
return ok;
}
diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs
index b95f592a..0b8fe627 100644
--- a/VocaluxeLib/Menu/CButton.cs
+++ b/VocaluxeLib/Menu/CButton.cs
@@ -16,7 +16,6 @@
#endregion
using System;
-using System.Xml;
using System.Xml.Serialization;
using VocaluxeLib.Draw;
using VocaluxeLib.Xml;
@@ -170,11 +169,11 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/Skin", out _Theme.Skin, String.Empty);
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", out _Theme.SkinSelected, String.Empty);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty))
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out Color);
@@ -238,7 +237,6 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
- _Theme.Rect = Rect;
_Theme.Color.Color = Color;
_Theme.SelColor.Color = SelColor;
_Theme.Text = Text.GetTheme();
diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs
index cd2876a9..74d69227 100644
--- a/VocaluxeLib/Menu/CEqualizer.cs
+++ b/VocaluxeLib/Menu/CEqualizer.cs
@@ -16,7 +16,6 @@
#endregion
using System;
-using System.Xml;
using System.Xml.Serialization;
using VocaluxeLib.Xml;
@@ -116,15 +115,15 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/Skin", out _Theme.Skin, String.Empty);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
_ThemeLoaded &= xmlReader.TryGetIntValue(item + "/NumBars", ref _Theme.NumBars);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Space", ref Space);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Space", ref _Theme.Space);
_ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/Style", ref _Theme.Style);
@@ -168,11 +167,8 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
- _Theme.Space = Space;
_Theme.Color.Color = Color;
_Theme.MaxColor.Color = MaxColor;
- _Theme.Rect = Rect;
-
LoadTextures();
}
return _ThemeLoaded;
diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs
index 744008b8..31cd0f0e 100644
--- a/VocaluxeLib/Menu/CLyric.cs
+++ b/VocaluxeLib/Menu/CLyric.cs
@@ -135,11 +135,11 @@ namespace VocaluxeLib.Menu
string item = xmlPath + "/" + elementName;
_ThemeLoaded = true;
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _MaxW);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty))
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out _Color);
@@ -166,8 +166,6 @@ namespace VocaluxeLib.Menu
_Theme.Name = elementName;
_Theme.Color.Color = _Color;
_Theme.SColor.Color = _ColorProcessed;
- _Theme.Rect = Rect;
-
LoadTextures();
_Text = new CText(_X, _Y, _Z, _H, _MaxW, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty);
}
diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs
index 0573577d..6871c633 100644
--- a/VocaluxeLib/Menu/CNameSelection.cs
+++ b/VocaluxeLib/Menu/CNameSelection.cs
@@ -158,11 +158,11 @@ namespace VocaluxeLib.Menu
string item = xmlPath + "/" + elementName;
_ThemeLoaded = true;
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinEmptyTile", out _Theme.SkinEmptyTile, String.Empty);
@@ -192,11 +192,11 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= _Theme.Tiles.Name.Color.Get(_PartyModeID, out _ColorNameTile);
else
{
- if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _Theme.Tiles.Name.Color.Color.R))
+ if (xmlReader.TryGetFloatValue(item + "/Tiles/Name/R", ref _ColorNameTile.R))
{
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _Theme.Tiles.Name.Color.Color.G);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _Theme.Tiles.Name.Color.Color.B);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _Theme.Tiles.Name.Color.Color.A);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/G", ref _ColorNameTile.G);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/B", ref _ColorNameTile.B);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Tiles/Name/A", ref _ColorNameTile.A);
}
}
@@ -204,10 +204,8 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
-
- _Theme.Rect = Rect;
+ _Theme.Tiles.Name.Color.Color = _ColorNameTile;
_Theme.ColorEmptyTile.Color = _ColorEmptyTile;
-
LoadTextures();
}
return _ThemeLoaded;
@@ -499,7 +497,7 @@ namespace VocaluxeLib.Menu
var tileStatic = new CStatic(_PartyModeID, _TextureEmptyTile, _ColorEmptyTile, rect) {Aspect = EAspect.Crop};
var tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.Tiles.Name.Space, rect.Z, _Theme.Tiles.Name.Height, rect.W, EAlignment.Center,
_Theme.Tiles.Name.Style,
- _Theme.Tiles.Name.Font, _Theme.Tiles.Name.Color.Color, "");
+ _Theme.Tiles.Name.Font, _ColorNameTile, "");
_Tiles.Add(new CTile(tileStatic, tileText, -1));
}
}
diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs
index 2841b8ca..b8bb04d2 100644
--- a/VocaluxeLib/Menu/CParticle.cs
+++ b/VocaluxeLib/Menu/CParticle.cs
@@ -397,11 +397,11 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/Skin", out _Theme.Skin, String.Empty);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty))
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out Color);
@@ -420,7 +420,6 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
- _Theme.Rect = Rect;
_Theme.Color.Color = Color;
LoadTextures();
}
diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs
index aa10d4c6..28686a46 100644
--- a/VocaluxeLib/Menu/CPlaylist.cs
+++ b/VocaluxeLib/Menu/CPlaylist.cs
@@ -300,11 +300,11 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackground", out _Theme.SkinBackground, String.Empty);
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundSelected", out _Theme.SkinBackgroundSelected, String.Empty);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/ColorBackground", out _Theme.ColorBackground.Name, String.Empty))
_ThemeLoaded &= _Theme.ColorBackground.Get(_PartyModeID, out BackgroundColor);
else
@@ -342,7 +342,6 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
- _Theme.Rect = Rect;
_Theme.ColorBackground.Color = BackgroundColor;
_Theme.SelColorBackground.Color = BackgroundSelColor;
_Theme.Text1 = Text1.GetTheme();
diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs
index c0d1dcfa..3772aa95 100644
--- a/VocaluxeLib/Menu/CSelectSlide.cs
+++ b/VocaluxeLib/Menu/CSelectSlide.cs
@@ -287,11 +287,11 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/SkinHighlighted", out _Theme.SkinHighlighted, String.Empty);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty))
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out Color);
@@ -323,18 +323,10 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HA", ref HighlightColor.A);
}
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftX", ref RectArrowLeft.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftY", ref RectArrowLeft.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftZ", ref RectArrowLeft.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftW", ref RectArrowLeft.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftH", ref RectArrowLeft.H);
-
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightX", ref RectArrowRight.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightY", ref RectArrowRight.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightZ", ref RectArrowRight.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightW", ref RectArrowRight.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowRightH", ref RectArrowRight.H);
-
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextH", ref _Theme.TextH);
+ xmlReader.TryGetFloatValue(item + "/TextRelativeX", ref _Theme.TextRelativeX);
+ xmlReader.TryGetFloatValue(item + "/TextRelativeY", ref _Theme.TextRelativeY);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextMaxW", ref _Theme.TextMaxW);
if (xmlReader.GetValue(item + "/ArrowColor", out _Theme.ArrowColor.Name, String.Empty))
_ThemeLoaded &= _Theme.ArrowColor.Get(_PartyModeID, out ColorArrow);
else
@@ -374,17 +366,10 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSB", ref SelTextColor.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSA", ref SelTextColor.A);
}
-
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextH", ref TextH);
- if (xmlReader.TryGetFloatValue(item + "/TextRelativeX", ref TextRelativeX))
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextRelativeX", ref TextRelativeX);
- if (xmlReader.TryGetFloatValue(item + "/TextRelativeY", ref TextRelativeY))
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextRelativeY", ref TextRelativeY);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextMaxW", ref MaxW);
_ThemeLoaded &= xmlReader.GetValue(item + "/TextFont", out _Theme.TextFont, "Normal");
_ThemeLoaded &= xmlReader.TryGetEnumValue(item + "/TextStyle", ref _Theme.TextStyle);
- _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/NumVisible", ref _NumVisible);
+ _ThemeLoaded &= xmlReader.TryGetIntValue(item + "/NumVisible", ref _Theme.NumVisible);
if (_ThemeLoaded)
{
@@ -393,18 +378,9 @@ namespace VocaluxeLib.Menu
_Theme.ArrowSColor.Color = SelColorArrow;
_Theme.Color.Color = Color;
_Theme.HColor.Color = HighlightColor;
- _Theme.NumVisible = _NumVisible;
- _Theme.Rect = Rect;
- _Theme.RectArrowLeft = RectArrowLeft;
- _Theme.RectArrowRight = RectArrowRight;
_Theme.SColor.Color = SelColor;
_Theme.TextColor.Color = TextColor;
- _Theme.TextH = TextH;
- _Theme.TextMaxW = MaxW;
- _Theme.TextRelativeX = TextRelativeX;
- _Theme.TextRelativeY = TextRelativeY;
_Theme.TextSColor.Color = SelTextColor;
-
LoadTextures();
}
return _ThemeLoaded;
diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs
index 0c388a64..ad3030d8 100644
--- a/VocaluxeLib/Menu/CStatic.cs
+++ b/VocaluxeLib/Menu/CStatic.cs
@@ -124,13 +124,11 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.GetValue(item + "/Skin", out _Theme.Skin, String.Empty);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref Rect.Z);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref Rect.W);
- _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref Rect.H);
-
- _Theme.Rect = Rect;
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref _Theme.Rect.X);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref _Theme.Rect.Y);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Z", ref _Theme.Rect.Z);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/W", ref _Theme.Rect.W);
+ _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/H", ref _Theme.Rect.H);
if (xmlReader.GetValue(item + "/Color", out _Theme.Color.Name, String.Empty))
_ThemeLoaded &= _Theme.Color.Get(_PartyModeID, out Color);
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
index 56504f45..cd2b38a7 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
@@ -15,7 +15,6 @@
// along with Vocaluxe. If not, see .
#endregion
-using System.Xml;
using VocaluxeLib.PartyModes;
using VocaluxeLib.Xml;
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
index cbe38ddf..55df7707 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
@@ -19,7 +19,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
-using System.Xml;
using VocaluxeLib.Draw;
using VocaluxeLib.PartyModes;
using VocaluxeLib.Songs;
diff --git a/VocaluxeLib/Xml/CXMLReader.cs b/VocaluxeLib/Xml/CXMLReader.cs
index bd58fc2e..b75a4934 100644
--- a/VocaluxeLib/Xml/CXMLReader.cs
+++ b/VocaluxeLib/Xml/CXMLReader.cs
@@ -89,7 +89,7 @@ namespace VocaluxeLib.Xml
value = iterator.Current.GetAttribute(attribute, "");
return true;
}
- value = "";
+ value = null;
return false;
}
diff --git a/VocaluxeLib/Xml/CXmlDeserializer.cs b/VocaluxeLib/Xml/CXmlDeserializer.cs
index 9d611c54..b010943e 100644
--- a/VocaluxeLib/Xml/CXmlDeserializer.cs
+++ b/VocaluxeLib/Xml/CXmlDeserializer.cs
@@ -47,14 +47,25 @@ namespace VocaluxeLib.Xml
public bool Read(string xPath, out SThemeColor el)
{
el = new SThemeColor();
- bool ok = true;
- ok &= TryGetNormalizedFloatValue(xPath + "/R", ref el.Color.R);
- ok &= TryGetNormalizedFloatValue(xPath + "/G", ref el.Color.G);
- ok &= TryGetNormalizedFloatValue(xPath + "/B", ref el.Color.B);
- ok &= TryGetNormalizedFloatValue(xPath + "/A", ref el.Color.A);
- if (!ok)
- ok = GetValue(xPath, out el.Name) && !el.Name.Contains('<');
- return ok;
+ float val = 0;
+ if (TryGetNormalizedFloatValue(xPath + "/R", ref val))
+ el.R = val;
+ else
+ el.R = null;
+ if (TryGetNormalizedFloatValue(xPath + "/G", ref val))
+ el.G = val;
+ else
+ el.G = null;
+ if (TryGetNormalizedFloatValue(xPath + "/B", ref val))
+ el.B = val;
+ else
+ el.B = null;
+ if (TryGetNormalizedFloatValue(xPath + "/A", ref val))
+ el.A = val;
+ else
+ el.A = null;
+ GetAttribute(xPath, "Name", out el.Name);
+ return true;
}
public bool Read(string xPath, out SThemeCoverGenerator el)