diff --git a/Output/Cover/Ambient Blue/No Cover.png b/Output/Cover/Ambient Blue/No Cover.png
deleted file mode 100644
index 73a0e4b1..00000000
Binary files a/Output/Cover/Ambient Blue/No Cover.png and /dev/null differ
diff --git a/Output/Cover/Ambient Blue/Normal.png b/Output/Cover/Ambient Blue/Normal.png
deleted file mode 100644
index 73a0e4b1..00000000
Binary files a/Output/Cover/Ambient Blue/Normal.png and /dev/null differ
diff --git a/Output/Cover/Ambient Blue/Resources/Normal.psd b/Output/Cover/Ambient Blue/Resources/Normal.psd
deleted file mode 100644
index 5cc517a3..00000000
Binary files a/Output/Cover/Ambient Blue/Resources/Normal.psd and /dev/null differ
diff --git a/Output/Cover/Ambient Green.xml b/Output/Cover/Ambient Green.xml
deleted file mode 100644
index 3e652377..00000000
--- a/Output/Cover/Ambient Green.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
- Ambient Green
- Ambient Green
- flokuep
-
-
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.709
- 0.968
- 0.674
- 0.9
-
-
-
- 24
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.709
- 0.968
- 0.674
- 0.9
-
-
-
- -150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.709
- 0.968
- 0.674
- 0.9
-
-
-
- 150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 120
-
-
-
-
- 0.709
- 0.968
- 0.674
- 0.9
-
-
-
- -150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
diff --git a/Output/Cover/Ambient Green/No Cover.png b/Output/Cover/Ambient Green/No Cover.png
deleted file mode 100644
index 2a1612cb..00000000
Binary files a/Output/Cover/Ambient Green/No Cover.png and /dev/null differ
diff --git a/Output/Cover/Ambient Green/Normal.png b/Output/Cover/Ambient Green/Normal.png
deleted file mode 100644
index 2a1612cb..00000000
Binary files a/Output/Cover/Ambient Green/Normal.png and /dev/null differ
diff --git a/Output/Cover/Ambient Green/Resources/Normal.psd b/Output/Cover/Ambient Green/Resources/Normal.psd
deleted file mode 100644
index 8f973d02..00000000
Binary files a/Output/Cover/Ambient Green/Resources/Normal.psd and /dev/null differ
diff --git a/Output/Cover/Ambient Red.xml b/Output/Cover/Ambient Red.xml
deleted file mode 100644
index fa65f01d..00000000
--- a/Output/Cover/Ambient Red.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
- Ambient Red
- Ambient Red
- flokuep
-
-
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.968
- 0.674
- 0.674
- 0.9
-
-
-
- 24
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.968
- 0.674
- 0.674
- 0.9
-
-
-
- -150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.968
- 0.674
- 0.674
- 0.9
-
-
-
- 150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 120
-
-
-
-
- 0.968
- 0.674
- 0.674
- 0.9
-
-
-
- -150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
diff --git a/Output/Cover/Ambient Red/No Cover.png b/Output/Cover/Ambient Red/No Cover.png
deleted file mode 100644
index 1bf01057..00000000
Binary files a/Output/Cover/Ambient Red/No Cover.png and /dev/null differ
diff --git a/Output/Cover/Ambient Red/Normal.png b/Output/Cover/Ambient Red/Normal.png
deleted file mode 100644
index 1bf01057..00000000
Binary files a/Output/Cover/Ambient Red/Normal.png and /dev/null differ
diff --git a/Output/Cover/Ambient Red/Resources/Normal.psd b/Output/Cover/Ambient Red/Resources/Normal.psd
deleted file mode 100644
index db9fb4ed..00000000
Binary files a/Output/Cover/Ambient Red/Resources/Normal.psd and /dev/null differ
diff --git a/Output/Cover/Ambient Yellow.xml b/Output/Cover/Ambient Yellow.xml
deleted file mode 100644
index 7636b2fa..00000000
--- a/Output/Cover/Ambient Yellow.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
- Ambient Yellow
- Ambient Yellow
- flokuep
-
-
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.968
- 0.956
- 0.674
- 0.9
-
-
-
- 24
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 550
-
-
-
-
- 0.968
- 0.956
- 0.674
- 0.9
-
-
-
- -150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Outline
-
-
-
- 550
-
-
-
-
- 0.968
- 0.956
- 0.674
- 0.9
-
-
-
- 150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
-
-
- %TEXT%
-
- Normal
-
-
-
- 120
-
-
-
-
- 0.968
- 0.956
- 0.674
- 0.9
-
-
-
- -150
-
-
- 100
-
-
- 1
- 1
- 1
- 1
-
-
- Normal.png
-
- 1.0
-
- True
-
-
diff --git a/Output/Cover/Ambient Yellow/No Cover.png b/Output/Cover/Ambient Yellow/No Cover.png
deleted file mode 100644
index e7be3e62..00000000
Binary files a/Output/Cover/Ambient Yellow/No Cover.png and /dev/null differ
diff --git a/Output/Cover/Ambient Yellow/Normal.png b/Output/Cover/Ambient Yellow/Normal.png
deleted file mode 100644
index e7be3e62..00000000
Binary files a/Output/Cover/Ambient Yellow/Normal.png and /dev/null differ
diff --git a/Output/Cover/Ambient Yellow/Resources/Normal.psd b/Output/Cover/Ambient Yellow/Resources/Normal.psd
deleted file mode 100644
index ebc648a0..00000000
Binary files a/Output/Cover/Ambient Yellow/Resources/Normal.psd and /dev/null differ
diff --git a/Output/Cover/Ambient Blue.xml b/Output/Cover/Genius Standard.xml
similarity index 91%
rename from Output/Cover/Ambient Blue.xml
rename to Output/Cover/Genius Standard.xml
index f1f91328..e2352316 100644
--- a/Output/Cover/Ambient Blue.xml
+++ b/Output/Cover/Genius Standard.xml
@@ -1,9 +1,9 @@
- Ambient Blue
- Ambient Blue
- flokuep
+ Genius Standard
+ Genius
+ Jiiniasu
@@ -21,9 +21,9 @@
- 0.675
- 0.890
- 0.969
+ 1.000
+ 1.000
+ 1.000
0.8
@@ -40,7 +40,7 @@
1
- Normal.png
+ Cover.png
1.0
@@ -60,9 +60,9 @@
- 0.675
- 0.890
- 0.969
+ 1.000
+ 1.000
+ 1.000
0.8
@@ -79,7 +79,7 @@
1
- Normal.png
+ Cover.png
1.0
@@ -99,9 +99,9 @@
- 0.675
- 0.890
- 0.969
+ 1.000
+ 1.000
+ 1.000
0.8
@@ -118,7 +118,7 @@
1
- Normal.png
+ Cover.png
1.0
@@ -138,14 +138,14 @@
- 0.675
- 0.890
- 0.969
+ 1.000
+ 1.000
+ 1.000
0.8
- -150
+ -150
100
@@ -157,7 +157,7 @@
1
- Normal.png
+ Cover.png
1.0
diff --git a/Output/Cover/Genius/Cover.png b/Output/Cover/Genius/Cover.png
new file mode 100644
index 00000000..fdd337df
Binary files /dev/null and b/Output/Cover/Genius/Cover.png differ
diff --git a/Output/Cover/Genius/NoCover.png b/Output/Cover/Genius/NoCover.png
new file mode 100644
index 00000000..fdd337df
Binary files /dev/null and b/Output/Cover/Genius/NoCover.png differ
diff --git a/Output/PartyModes/Challenge/Themes/Default.xml b/Output/PartyModes/Challenge/Themes/Default.xml
index 5999e8cc..10e1c461 100644
--- a/Output/PartyModes/Challenge/Themes/Default.xml
+++ b/Output/PartyModes/Challenge/Themes/Default.xml
@@ -1,6 +1,6 @@
- 5
+ 6
Default
brunzel
diff --git a/Output/PartyModes/Challenge/Themes/Genius.xml b/Output/PartyModes/Challenge/Themes/Genius.xml
new file mode 100644
index 00000000..7a551898
--- /dev/null
+++ b/Output/PartyModes/Challenge/Themes/Genius.xml
@@ -0,0 +1,10 @@
+
+
+ 6
+
+ Genius
+ Jiiniasu
+ 0
+ 1
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/Challenge/Themes/Genius/Genius.xml b/Output/PartyModes/Challenge/Themes/Genius/Genius.xml
new file mode 100644
index 00000000..2db98024
--- /dev/null
+++ b/Output/PartyModes/Challenge/Themes/Genius/Genius.xml
@@ -0,0 +1,13 @@
+
+
+ 4
+
+ Genius
+ Jiiniasu
+ 0
+ 1
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml
new file mode 100644
index 00000000..97b70135
--- /dev/null
+++ b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml
@@ -0,0 +1,407 @@
+
+
+
+ PartyScreenChallengeConfig
+ 3
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENCONFIG_TITLE
+
+
+ 75
+ 105
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMPLAYERS
+
+
+ 75
+ 165
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMMICS
+
+
+ 75
+ 225
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMROUNDS
+
+
+ 75
+ 285
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMJOKERS
+
+
+ 75
+ 345
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_REFILLJOKERS
+
+
+
+
+
+
+
+
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 100
+ 700
+ 50
+ 0
+
+
+ 505
+ 105
+ 40
+ 40
+ 0
+
+
+ 1155
+ 105
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 9
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 160
+ 700
+ 50
+ 0
+
+
+ 505
+ 165
+ 40
+ 40
+ 0
+
+
+ 1155
+ 165
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 2
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 220
+ 700
+ 50
+ 0
+
+
+ 505
+ 225
+ 40
+ 40
+ 0
+
+
+ 1155
+ 225
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 10
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 280
+ 700
+ 50
+ 0
+
+
+ 505
+ 285
+ 40
+ 40
+ 0
+
+
+ 1155
+ 285
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 10
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 340
+ 700
+ 50
+ 0
+
+
+ 505
+ 345
+ 40
+ 40
+ 0
+
+
+ 1155
+ 345
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 2
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml
new file mode 100644
index 00000000..c8752d0f
--- /dev/null
+++ b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml
@@ -0,0 +1,557 @@
+
+
+
+ PartyScreenChallengeMain
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+ PopupBG
+
+
+ 0
+ 0
+ 1280
+ 720
+ -1
+
+
+
+
+
+
+ 0
+ 0
+ 100
+ 100
+ 0
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_TITLE
+
+
+ 40
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_POS
+
+
+ 50
+ 135
+ 0
+ 27
+ 130
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_PLAYERNAME
+
+
+ 260
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_NUMPLAYED
+
+
+ 340
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_WON
+
+
+ 490
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_SINGPOINTS
+
+
+ 590
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_GAMEPOINTS
+
+
+ 0
+ 0
+ 0
+ 27
+ 100
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 270
+ -1.01
+ 27
+ 380
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_POPUP_REALLYEXIT
+
+
+ 660
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+
+
+
+ 0
+ 0
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 0
+ 0
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 520
+ 0
+ 44
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_FINISH
+
+
+ 640
+ 575
+ 0
+ 31
+ 770
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 515
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_NEXT_PLAYER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml
new file mode 100644
index 00000000..2ce1d175
--- /dev/null
+++ b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml
@@ -0,0 +1,382 @@
+
+
+
+ PartyScreenChallengeNames
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENNAMES_TITLE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 40
+ 100
+ 1200
+ 50
+ 0
+
+
+ 45
+ 105
+ 40
+ 40
+ 0
+
+
+ 1195
+ 105
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 2
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlidePlayer
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 40
+ 160
+ 1200
+ 150
+ 0
+
+
+ 45
+ 210
+ 40
+ 40
+ 0
+
+
+ 1195
+ 210
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 5
+ 200
+ Outline
+ Bold
+ 8
+
+
+
+
+
+
+ 95
+ 350
+ 1200
+ 393
+ 0
+
+ CoverTile
+
+ PlayerSelector
+
+ 100
+ 100
+ 10
+ 2
+ 10
+ 10
+
+ -20
+ 17
+ Outline
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default.xml b/Output/PartyModes/ChallengeMedley/Themes/Default.xml
index 5999e8cc..10e1c461 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default.xml
@@ -1,6 +1,6 @@
- 5
+ 6
Default
brunzel
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius.xml
new file mode 100644
index 00000000..7a551898
--- /dev/null
+++ b/Output/PartyModes/ChallengeMedley/Themes/Genius.xml
@@ -0,0 +1,10 @@
+
+
+ 6
+
+ Genius
+ Jiiniasu
+ 0
+ 1
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml
new file mode 100644
index 00000000..2db98024
--- /dev/null
+++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml
@@ -0,0 +1,13 @@
+
+
+ 4
+
+ Genius
+ Jiiniasu
+ 0
+ 1
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml
new file mode 100644
index 00000000..1ddc136c
--- /dev/null
+++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml
@@ -0,0 +1,491 @@
+
+
+
+ PartyScreenChallengeMedleyConfig
+ 2
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENCONFIG_TITLE
+
+
+ 75
+ 105
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMPLAYERS
+
+
+ 75
+ 165
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMMICS
+
+
+ 75
+ 225
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMROUNDS
+
+
+ 75
+ 285
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMSONGS
+
+
+ 75
+ 345
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_SONGSOURCE
+
+
+
+
+
+
+
+
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 100
+ 700
+ 50
+ 0
+
+
+ 505
+ 105
+ 40
+ 40
+ 0
+
+
+ 1155
+ 105
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 9
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 160
+ 700
+ 50
+ 0
+
+
+ 505
+ 165
+ 40
+ 40
+ 0
+
+
+ 1155
+ 165
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 2
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 220
+ 700
+ 50
+ 0
+
+
+ 505
+ 225
+ 40
+ 40
+ 0
+
+
+ 1155
+ 225
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 10
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 280
+ 700
+ 50
+ 0
+
+
+ 505
+ 285
+ 40
+ 40
+ 0
+
+
+ 1155
+ 285
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 10
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 340
+ 700
+ 50
+ 0
+
+
+ 505
+ 345
+ 40
+ 40
+ 0
+
+
+ 1155
+ 345
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 3
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 400
+ 700
+ 50
+ 0
+
+
+ 505
+ 405
+ 40
+ 40
+ 0
+
+
+ 1155
+ 405
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 700
+ Outline
+ Bold
+ 1
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 400
+ 700
+ 50
+ 0
+
+
+ 505
+ 405
+ 40
+ 40
+ 0
+
+
+ 1155
+ 405
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 700
+ Outline
+ Bold
+ 1
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml
new file mode 100644
index 00000000..56371aea
--- /dev/null
+++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml
@@ -0,0 +1,557 @@
+
+
+
+ PartyScreenChallengeMedleyMain
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+ PopupBG
+
+
+ 0
+ 0
+ 1280
+ 720
+ -1
+
+
+
+
+
+
+ 0
+ 0
+ 100
+ 100
+ 0
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_TITLE
+
+
+ 40
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_POS
+
+
+ 50
+ 135
+ 0
+ 27
+ 130
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_PLAYERNAME
+
+
+ 260
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_NUMPLAYED
+
+
+ 340
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_WON
+
+
+ 490
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_SINGPOINTS
+
+
+ 590
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+ TR_SCREENMAIN_TABLE_GAMEPOINTS
+
+
+ 0
+ 0
+ 0
+ 27
+ 100
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 270
+ -1.01
+ 27
+ 380
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_POPUP_REALLYEXIT
+
+
+ 660
+ 135
+ 0
+ 27
+ 0
+
+
+ Right
+ Center
+
+ Outline
+
+
+
+ 0
+ 0
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 0
+ 0
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 520
+ 0
+ 44
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_FINISH
+
+
+ 640
+ 575
+ 0
+ 31
+ 770
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 515
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_NEXT_PLAYER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml
new file mode 100644
index 00000000..0b00f1de
--- /dev/null
+++ b/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml
@@ -0,0 +1,382 @@
+
+
+
+ PartyScreenChallengMedleyNames
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENNAMES_TITLE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 40
+ 100
+ 1200
+ 50
+ 0
+
+
+ 45
+ 105
+ 40
+ 40
+ 0
+
+
+ 1195
+ 105
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 2
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlidePlayer
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 40
+ 160
+ 1200
+ 150
+ 0
+
+
+ 45
+ 210
+ 40
+ 40
+ 0
+
+
+ 1195
+ 210
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 5
+ 200
+ Outline
+ Bold
+ 8
+
+
+
+
+
+
+ 95
+ 350
+ 1200
+ 393
+ 0
+
+ CoverTile
+
+ PlayerSelector
+
+ 100
+ 100
+ 10
+ 2
+ 10
+ 10
+
+ -20
+ 17
+ Outline
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/TicTacToe/Themes/Default.xml b/Output/PartyModes/TicTacToe/Themes/Default.xml
index 5999e8cc..10e1c461 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default.xml
@@ -1,6 +1,6 @@
- 5
+ 6
Default
brunzel
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius.xml b/Output/PartyModes/TicTacToe/Themes/Genius.xml
new file mode 100644
index 00000000..7a551898
--- /dev/null
+++ b/Output/PartyModes/TicTacToe/Themes/Genius.xml
@@ -0,0 +1,10 @@
+
+
+ 6
+
+ Genius
+ Jiiniasu
+ 0
+ 1
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml
new file mode 100644
index 00000000..e556735e
--- /dev/null
+++ b/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml
@@ -0,0 +1,13 @@
+
+
+ 4
+
+ Genius
+ Jiiniasu
+ 0
+ 1
+
+
+
+
+
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
new file mode 100644
index 00000000..a38e7694
--- /dev/null
+++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
@@ -0,0 +1,379 @@
+
+
+
+ PartyScreenTicTacToeConfig
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENCONFIG_TITLE
+
+
+ 75
+ 105
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_NUMFIELDS
+
+
+ 75
+ 165
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_SONGSOURCE
+
+
+ 75
+ 285
+ 0
+ 27
+ 0
+
+
+ Left
+ Center
+
+ Outline
+ TR_SCREENCONFIG_GAMEMODE
+
+
+
+
+
+
+
+
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 100
+ 700
+ 50
+ 0
+
+
+ 505
+ 105
+ 40
+ 40
+ 0
+
+
+ 1155
+ 105
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 205.33
+ Outline
+ Bold
+ 3
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 160
+ 700
+ 50
+ 0
+
+
+ 505
+ 165
+ 40
+ 40
+ 0
+
+
+ 1155
+ 165
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 205.33
+ Outline
+ Bold
+ 3
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 220
+ 700
+ 50
+ 0
+
+
+ 505
+ 225
+ 40
+ 40
+ 0
+
+
+ 1155
+ 225
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 205.33
+ Outline
+ Bold
+ 1
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 220
+ 700
+ 50
+ 0
+
+
+ 505
+ 225
+ 40
+ 40
+ 0
+
+
+ 1155
+ 225
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 205.33
+ Outline
+ Bold
+ 1
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 500
+ 280
+ 700
+ 50
+ 0
+
+
+ 505
+ 285
+ 40
+ 40
+ 0
+
+
+ 1155
+ 285
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 205.33
+ Outline
+ Bold
+ 1
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml
new file mode 100644
index 00000000..471a2294
--- /dev/null
+++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml
@@ -0,0 +1,497 @@
+
+
+
+ PartyScreenTicTacToeMain
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+ PopupBG
+
+
+ 0
+ 0
+ 1280
+ 720
+ -2
+
+
+
+ PopupBG
+
+
+ 10
+ 200
+ 100
+ 100
+ -1
+
+
+
+ PopupBG
+
+
+ 1170
+ 200
+ 100
+ 100
+ -1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_TITLE
+
+
+ 640
+ 270
+ -2.01
+ 27
+ 380
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_POPUP_REALLYEXIT
+
+
+ 640
+ 90
+ 0
+ 35
+ 0
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 640
+ 90
+ 0
+ 35
+ 0
+
+
+ Center
+ Center
+
+ Outline
+
+
+
+ 160
+ 150
+ 0
+ 35
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_NEXT_PLAYER
+
+
+ 1120
+ 150
+ 0
+ 35
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENMAIN_NEXT_PLAYER
+
+
+ 120
+ 230
+ 0
+ 35
+ 0
+
+
+ Left
+ Center
+
+ Outline
+
+
+
+ 1160
+ 230
+ 0
+ 40
+ 0
+
+
+ Right
+ Center
+
+ Outline
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml
new file mode 100644
index 00000000..1e27c09c
--- /dev/null
+++ b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml
@@ -0,0 +1,382 @@
+
+
+
+ PartyScreenTicTacToeNames
+ 1
+
+
+
+ Video
+
+
+ BG_Default
+
+
+
+
+
+
+
+
+ 0
+ 40
+ 1280
+ 45
+ 1
+
+
+
+
+
+ 640
+ 50
+ 0
+ 27
+ 0
+
+
+ Center
+ Center
+
+ Outline
+ TR_SCREENNAMES_TITLE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlide
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 40
+ 100
+ 1055
+ 50
+ 0
+
+
+ 45
+ 105
+ 40
+ 40
+ 0
+
+
+ 1050
+ 105
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 0
+ 200
+ Outline
+ Bold
+ 2
+
+
+
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+ SelectSlidePlayer
+ SelectSlideArrowLeft
+ SelectSlideArrowRight
+
+ 40
+ 160
+ 1055
+ 150
+ 0
+
+
+ 45
+ 210
+ 40
+ 40
+ 0
+
+
+ 1050
+ 210
+ 40
+ 40
+ 0
+
+
+
+
+
+
+
+ 27
+ 50
+ 5
+ 200
+ Outline
+ Bold
+ 8
+
+
+
+
+
+
+ 95
+ 350
+ 1200
+ 393
+ 0
+
+ CoverTile
+
+ PlayerSelector
+
+ 100
+ 100
+ 10
+ 2
+ 10
+ 10
+
+ -20
+ 17
+ Outline
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml
deleted file mode 100644
index 91b0c674..00000000
--- a/Output/Themes/Ambient.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 5
-
- Ambient
- bohning
- 0
- 2
-
-
- Cursor
- 40
- 40
-
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Button.png b/Output/Themes/Ambient/Button.png
deleted file mode 100644
index 47a97da5..00000000
Binary files a/Output/Themes/Ambient/Button.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Close.png b/Output/Themes/Ambient/Close.png
deleted file mode 100644
index b8b8a994..00000000
Binary files a/Output/Themes/Ambient/Close.png and /dev/null differ
diff --git a/Output/Themes/Ambient/CoverBackground.png b/Output/Themes/Ambient/CoverBackground.png
deleted file mode 100644
index 353322df..00000000
Binary files a/Output/Themes/Ambient/CoverBackground.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Cursor.png b/Output/Themes/Ambient/Cursor.png
deleted file mode 100644
index 9c9e8288..00000000
Binary files a/Output/Themes/Ambient/Cursor.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Delete.png b/Output/Themes/Ambient/Delete.png
deleted file mode 100644
index 46a686ad..00000000
Binary files a/Output/Themes/Ambient/Delete.png and /dev/null differ
diff --git a/Output/Themes/Ambient/DuetIcon.png b/Output/Themes/Ambient/DuetIcon.png
deleted file mode 100644
index 1ba7a353..00000000
Binary files a/Output/Themes/Ambient/DuetIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/EnergyBeam.png b/Output/Themes/Ambient/EnergyBeam.png
deleted file mode 100644
index 80802776..00000000
Binary files a/Output/Themes/Ambient/EnergyBeam.png and /dev/null differ
diff --git a/Output/Themes/Ambient/LyricHelper.png b/Output/Themes/Ambient/LyricHelper.png
deleted file mode 100644
index c4788bfd..00000000
Binary files a/Output/Themes/Ambient/LyricHelper.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Lyrics.png b/Output/Themes/Ambient/Lyrics.png
deleted file mode 100644
index f27b96de..00000000
Binary files a/Output/Themes/Ambient/Lyrics.png and /dev/null differ
diff --git a/Output/Themes/Ambient/MedleyCalcIcon.png b/Output/Themes/Ambient/MedleyCalcIcon.png
deleted file mode 100644
index 25b73f10..00000000
Binary files a/Output/Themes/Ambient/MedleyCalcIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/MedleyTagIcon.png b/Output/Themes/Ambient/MedleyTagIcon.png
deleted file mode 100644
index 2bf40bdc..00000000
Binary files a/Output/Themes/Ambient/MedleyTagIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Menu.png b/Output/Themes/Ambient/Menu.png
deleted file mode 100644
index c5c56a49..00000000
Binary files a/Output/Themes/Ambient/Menu.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Minus.png b/Output/Themes/Ambient/Minus.png
deleted file mode 100644
index 9bdede57..00000000
Binary files a/Output/Themes/Ambient/Minus.png and /dev/null differ
diff --git a/Output/Themes/Ambient/NextIcon.png b/Output/Themes/Ambient/NextIcon.png
deleted file mode 100644
index fb6bf6c4..00000000
Binary files a/Output/Themes/Ambient/NextIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Pause.png b/Output/Themes/Ambient/Pause.png
deleted file mode 100644
index 50e73658..00000000
Binary files a/Output/Themes/Ambient/Pause.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PauseIcon.png b/Output/Themes/Ambient/PauseIcon.png
deleted file mode 100644
index 6f9c8870..00000000
Binary files a/Output/Themes/Ambient/PauseIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PerfectNoteStar.png b/Output/Themes/Ambient/PerfectNoteStar.png
deleted file mode 100644
index 9b29e9b3..00000000
Binary files a/Output/Themes/Ambient/PerfectNoteStar.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PlayIcon.png b/Output/Themes/Ambient/PlayIcon.png
deleted file mode 100644
index 5f34140b..00000000
Binary files a/Output/Themes/Ambient/PlayIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PlayerSelector.png b/Output/Themes/Ambient/PlayerSelector.png
deleted file mode 100644
index c57ab300..00000000
Binary files a/Output/Themes/Ambient/PlayerSelector.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Plus.png b/Output/Themes/Ambient/Plus.png
deleted file mode 100644
index 5b813c53..00000000
Binary files a/Output/Themes/Ambient/Plus.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Popup.png b/Output/Themes/Ambient/Popup.png
deleted file mode 100644
index 80868001..00000000
Binary files a/Output/Themes/Ambient/Popup.png and /dev/null differ
diff --git a/Output/Themes/Ambient/PreviousIcon.png b/Output/Themes/Ambient/PreviousIcon.png
deleted file mode 100644
index 9a92bf23..00000000
Binary files a/Output/Themes/Ambient/PreviousIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Random.png b/Output/Themes/Ambient/Random.png
deleted file mode 100644
index b07ecf7b..00000000
Binary files a/Output/Themes/Ambient/Random.png and /dev/null differ
diff --git a/Output/Themes/Ambient/RepeatIcon.png b/Output/Themes/Ambient/RepeatIcon.png
deleted file mode 100644
index ecf82df1..00000000
Binary files a/Output/Themes/Ambient/RepeatIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Save.png b/Output/Themes/Ambient/Save.png
deleted file mode 100644
index 1afc3113..00000000
Binary files a/Output/Themes/Ambient/Save.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Score.png b/Output/Themes/Ambient/Score.png
deleted file mode 100644
index 98ac51e3..00000000
Binary files a/Output/Themes/Ambient/Score.png and /dev/null differ
diff --git a/Output/Themes/Ambient/ScrollDown.png b/Output/Themes/Ambient/ScrollDown.png
deleted file mode 100644
index 94bd2e14..00000000
Binary files a/Output/Themes/Ambient/ScrollDown.png and /dev/null differ
diff --git a/Output/Themes/Ambient/ScrollUp.png b/Output/Themes/Ambient/ScrollUp.png
deleted file mode 100644
index c3b4c6b9..00000000
Binary files a/Output/Themes/Ambient/ScrollUp.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlide.png b/Output/Themes/Ambient/SelectSlide.png
deleted file mode 100644
index 167beb4e..00000000
Binary files a/Output/Themes/Ambient/SelectSlide.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlideArrowLeft.png b/Output/Themes/Ambient/SelectSlideArrowLeft.png
deleted file mode 100644
index 313fe280..00000000
Binary files a/Output/Themes/Ambient/SelectSlideArrowLeft.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlideArrowRight.png b/Output/Themes/Ambient/SelectSlideArrowRight.png
deleted file mode 100644
index 7dfd68c0..00000000
Binary files a/Output/Themes/Ambient/SelectSlideArrowRight.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SelectSlidePlayer.png b/Output/Themes/Ambient/SelectSlidePlayer.png
deleted file mode 100644
index 2a100dbd..00000000
Binary files a/Output/Themes/Ambient/SelectSlidePlayer.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Sing.png b/Output/Themes/Ambient/Sing.png
deleted file mode 100644
index c7daf961..00000000
Binary files a/Output/Themes/Ambient/Sing.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
deleted file mode 100644
index 3b6e3ba8..00000000
--- a/Output/Themes/Ambient/Skin Green.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
- 4
-
- Green
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.000
- 0.750
- 0.000
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 0.600
-
-
- 0.709
- 0.968
- 0.674
- 0.300
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 0.300
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 0.709
- 0.968
- 0.674
- 0.500
-
-
- 0.709
- 0.968
- 0.674
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 0.500
-
-
- 0.800
- 1.000
- 0.811
- 0.500
-
-
- 0.800
- 1.000
- 0.811
- 0.811
-
-
-
- [Green]BG_Default.png
- [Green]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Green]BG_Video.mp4
- [Green]IntroIn.mp4
- [Green]IntroMid.mp4
- [Green]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
deleted file mode 100644
index 0f65931e..00000000
--- a/Output/Themes/Ambient/Skin Red.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
- 4
-
- Red
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.750
- 0.000
- 0.000
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 0.600
-
-
- 0.968
- 0.674
- 0.674
- 0.300
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 0.300
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 0.968
- 0.674
- 0.674
- 0.500
-
-
- 0.968
- 0.674
- 0.674
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 0.500
-
-
- 1.000
- 0.800
- 0.800
- 0.500
-
-
- 1.000
- 0.800
- 0.800
- 0.850
-
-
-
- [Red]BG_Default.png
- [Red]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Red]BG_Video.mp4
- [Red]IntroIn.mp4
- [Red]IntroMid.mp4
- [Red]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
deleted file mode 100644
index 48c2176b..00000000
--- a/Output/Themes/Ambient/Skin Yellow.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
- 4
-
- Yellow
- bohning
- 0
- 0
-
-
-
- 0.000
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 1.000
- 0.000
- 1.000
-
-
- 0.500
- 0.000
- 1.000
- 1.000
-
-
- 1.000
- 0.800
- 0.000
- 1.000
-
-
- 1.000
- 0.000
- 0.500
- 1.000
-
-
- 0.750
- 0.750
- 0.000
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 0.600
-
-
- 0.968
- 0.956
- 0.674
- 0.300
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 0.300
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 0.968
- 0.956
- 0.674
- 0.500
-
-
- 0.968
- 0.956
- 0.674
- 1.000
-
-
- 1.000
- 0.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 1.000
-
-
- 1.000
- 1.000
- 1.000
- 0.000
-
-
- 1.000
- 1.000
- 0.000
- 1.000
-
-
- 0.000
- 0.000
- 0.000
- 1.000
-
-
- 0.300
- 0.300
- 0.300
- 1.000
-
-
- 1.000
- 1.000
- 0.000
- 0.500
-
-
- 0.949
- 1.000
- 0.800
- 0.500
-
-
- 0.949
- 1.000
- 0.800
- 0.850
-
-
-
- [Yellow]BG_Default.png
- [Yellow]BG_Options.png
-
-
- CoverTile.png
- CoverBackground.png
- Cursor.png
- TimeBar.png
- TimeLine.png
- Pointer.png
- SelectSlide.png
- SelectSlidePlayer.png
- SelectSlideArrowLeft.png
- SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
- LyricHelper.png
- ToneHelper.png
- TextBG.png
- Score.png
- Star.png
- Snowflake.png
- SongMenu.png
- PerfectNoteStar.png
- Pause.png
- EnergyBeam.png
- DuetIcon.png
- VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
- MedleyCalcIcon.png
- MedleyTagIcon.png
- PlayerSelector.png
- PreviousIcon.png
- NextIcon.png
- PlayIcon.png
- PauseIcon.png
- RepeatIcon.png
- SongMenuBG.png
- Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
- ScrollUp.png
- ScrollDown.png
-
-
- [Yellow]BG_Video.mp4
- [Yellow]IntroIn.mp4
- [Yellow]IntroMid.mp4
- [Yellow]IntroOut.mp4
-
-
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Snowflake.png b/Output/Themes/Ambient/Snowflake.png
deleted file mode 100644
index 6ca81fdd..00000000
Binary files a/Output/Themes/Ambient/Snowflake.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SongMenu.png b/Output/Themes/Ambient/SongMenu.png
deleted file mode 100644
index 6e6b0c6b..00000000
Binary files a/Output/Themes/Ambient/SongMenu.png and /dev/null differ
diff --git a/Output/Themes/Ambient/SongMenuBG.png b/Output/Themes/Ambient/SongMenuBG.png
deleted file mode 100644
index a7333adb..00000000
Binary files a/Output/Themes/Ambient/SongMenuBG.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Star.png b/Output/Themes/Ambient/Star.png
deleted file mode 100644
index d866cfb6..00000000
Binary files a/Output/Themes/Ambient/Star.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TextBG.png b/Output/Themes/Ambient/TextBG.png
deleted file mode 100644
index d565435d..00000000
Binary files a/Output/Themes/Ambient/TextBG.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TimeBar.png b/Output/Themes/Ambient/TimeBar.png
deleted file mode 100644
index a3e1bf10..00000000
Binary files a/Output/Themes/Ambient/TimeBar.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TimeBar2.png b/Output/Themes/Ambient/TimeBar2.png
deleted file mode 100644
index 64b4264a..00000000
Binary files a/Output/Themes/Ambient/TimeBar2.png and /dev/null differ
diff --git a/Output/Themes/Ambient/TimeLine.png b/Output/Themes/Ambient/TimeLine.png
deleted file mode 100644
index 664fb882..00000000
Binary files a/Output/Themes/Ambient/TimeLine.png and /dev/null differ
diff --git a/Output/Themes/Ambient/ToneHelper.png b/Output/Themes/Ambient/ToneHelper.png
deleted file mode 100644
index 91dce055..00000000
Binary files a/Output/Themes/Ambient/ToneHelper.png and /dev/null differ
diff --git a/Output/Themes/Ambient/VideoIcon.png b/Output/Themes/Ambient/VideoIcon.png
deleted file mode 100644
index 4abc12a6..00000000
Binary files a/Output/Themes/Ambient/VideoIcon.png and /dev/null differ
diff --git a/Output/Themes/Ambient/VideoIconBG.png b/Output/Themes/Ambient/VideoIconBG.png
deleted file mode 100644
index ff0950fe..00000000
Binary files a/Output/Themes/Ambient/VideoIconBG.png and /dev/null differ
diff --git a/Output/Themes/Ambient/VideoIconCO.png b/Output/Themes/Ambient/VideoIconCO.png
deleted file mode 100644
index 3c76dd30..00000000
Binary files a/Output/Themes/Ambient/VideoIconCO.png and /dev/null differ
diff --git a/Output/Themes/Ambient/Warning.png b/Output/Themes/Ambient/Warning.png
deleted file mode 100644
index 208f5730..00000000
Binary files a/Output/Themes/Ambient/Warning.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Blue]BG_Default.png b/Output/Themes/Ambient/[Blue]BG_Default.png
deleted file mode 100644
index 53bd3603..00000000
Binary files a/Output/Themes/Ambient/[Blue]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Blue]BG_Options.png b/Output/Themes/Ambient/[Blue]BG_Options.png
deleted file mode 100644
index dfb174e6..00000000
Binary files a/Output/Themes/Ambient/[Blue]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Green]BG_Default.png b/Output/Themes/Ambient/[Green]BG_Default.png
deleted file mode 100644
index 77891e93..00000000
Binary files a/Output/Themes/Ambient/[Green]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Green]BG_Options.png b/Output/Themes/Ambient/[Green]BG_Options.png
deleted file mode 100644
index 44da3862..00000000
Binary files a/Output/Themes/Ambient/[Green]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Red]BG_Default.png b/Output/Themes/Ambient/[Red]BG_Default.png
deleted file mode 100644
index 61f1900b..00000000
Binary files a/Output/Themes/Ambient/[Red]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Red]BG_Options.png b/Output/Themes/Ambient/[Red]BG_Options.png
deleted file mode 100644
index 6ca46be7..00000000
Binary files a/Output/Themes/Ambient/[Red]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Yellow]BG_Default.png b/Output/Themes/Ambient/[Yellow]BG_Default.png
deleted file mode 100644
index 97dc8eb4..00000000
Binary files a/Output/Themes/Ambient/[Yellow]BG_Default.png and /dev/null differ
diff --git a/Output/Themes/Ambient/[Yellow]BG_Options.png b/Output/Themes/Ambient/[Yellow]BG_Options.png
deleted file mode 100644
index e7563e3f..00000000
Binary files a/Output/Themes/Ambient/[Yellow]BG_Options.png and /dev/null differ
diff --git a/Output/Themes/Ambient/copyright Neon Glow Icons.txt b/Output/Themes/Ambient/copyright Neon Glow Icons.txt
deleted file mode 100644
index 25a29b81..00000000
--- a/Output/Themes/Ambient/copyright Neon Glow Icons.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.webdesign-guru.co.uk/icon/neon-glow-icons/
diff --git a/Output/Themes/Ambient/notes_bg_left.png b/Output/Themes/Ambient/notes_bg_left.png
deleted file mode 100644
index 14dee215..00000000
Binary files a/Output/Themes/Ambient/notes_bg_left.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_bg_mid.png b/Output/Themes/Ambient/notes_bg_mid.png
deleted file mode 100644
index 4161d17b..00000000
Binary files a/Output/Themes/Ambient/notes_bg_mid.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_bg_right.png b/Output/Themes/Ambient/notes_bg_right.png
deleted file mode 100644
index fd3fb69a..00000000
Binary files a/Output/Themes/Ambient/notes_bg_right.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_left.png b/Output/Themes/Ambient/notes_left.png
deleted file mode 100644
index 310c7e87..00000000
Binary files a/Output/Themes/Ambient/notes_left.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_mid.png b/Output/Themes/Ambient/notes_mid.png
deleted file mode 100644
index ddf450c1..00000000
Binary files a/Output/Themes/Ambient/notes_mid.png and /dev/null differ
diff --git a/Output/Themes/Ambient/notes_right.png b/Output/Themes/Ambient/notes_right.png
deleted file mode 100644
index 681b4aa4..00000000
Binary files a/Output/Themes/Ambient/notes_right.png and /dev/null differ
diff --git a/Output/Themes/Ambient/points_bar.png b/Output/Themes/Ambient/points_bar.png
deleted file mode 100644
index e5032bc5..00000000
Binary files a/Output/Themes/Ambient/points_bar.png and /dev/null differ
diff --git a/Output/Themes/Ambient/points_bar_bg.png b/Output/Themes/Ambient/points_bar_bg.png
deleted file mode 100644
index 968860cb..00000000
Binary files a/Output/Themes/Ambient/points_bar_bg.png and /dev/null differ
diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt
index dd1ef423..3d735b97 100644
--- a/Output/Themes/Changelog/Changelog_ScreenSing.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt
@@ -1,5 +1,15 @@
ScreenSing
++++++++++
+Version 8
+
+Add:
+
+
+
+
+Skins for separated note fill graphics
+
+++++++++
Version 7
diff --git a/Output/Themes/Changelog/Changelog_SkinSystem.txt b/Output/Themes/Changelog/Changelog_SkinSystem.txt
index ce2085ae..41b5d672 100644
--- a/Output/Themes/Changelog/Changelog_SkinSystem.txt
+++ b/Output/Themes/Changelog/Changelog_SkinSystem.txt
@@ -12,9 +12,6 @@ Added videos:
-++++++++++
-
-
++++++++++
Version 2:
diff --git a/Output/Themes/Changelog/Changelog_ThemeSystem.txt b/Output/Themes/Changelog/Changelog_ThemeSystem.txt
index fceb7c3f..16b3e6b1 100644
--- a/Output/Themes/Changelog/Changelog_ThemeSystem.txt
+++ b/Output/Themes/Changelog/Changelog_ThemeSystem.txt
@@ -1,5 +1,14 @@
Theme System
+++++++++++
+Version 6
+Added to :
+
+
+
+
+Changed:
+Graphics handling of notes - background, base and fill of notes will be layered on each other without any resizing differences between the textures.
++++++++++
Version 5 (yes it's still 5!):
diff --git a/Output/Themes/Genius.xml b/Output/Themes/Genius.xml
new file mode 100644
index 00000000..f560470f
--- /dev/null
+++ b/Output/Themes/Genius.xml
@@ -0,0 +1,16 @@
+
+
+ 6
+
+ Genius
+ Jiiniasu
+ 0
+ 7
+
+
+ Cursor
+ 32
+ 32
+
+
+
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Genius/01_Standard.xml
similarity index 51%
rename from Output/Themes/Ambient/Skin Blue.xml
rename to Output/Themes/Genius/01_Standard.xml
index b1ab5aa9..d0daa747 100644
--- a/Output/Themes/Ambient/Skin Blue.xml
+++ b/Output/Themes/Genius/01_Standard.xml
@@ -2,136 +2,160 @@
4
- Blue
- bohning
+ Standard
+ Jiiniasu
0
- 0
+ 7
0.000
- 0.000
- 1.000
+ 0.580
+ 0.792
1.000
- 1.000
- 0.000
- 0.000
+ 0.882
+ 0.149
+ 0.110
1.000
0.000
- 1.000
- 0.000
+ 0.659
+ 0.533
1.000
- 0.500
- 0.000
- 1.000
+ 0.757
+ 0.160
+ 0.725
1.000
1.000
- 0.800
+ 0.870
0.000
1.000
- 1.000
- 0.000
- 0.500
+ 1.00
+ 0.322
+ 0.000
1.000
+
+ 0.980
+ 0.980
+ 0.980
+ 0.200
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
0.000
0.000
- 0.750
+ 0.000
1.000
+
+ 0.000
+ 0.000
+ 0.000
+ 0.700
+
- 0.675
- 0.890
- 0.969
+ 0.980
+ 0.980
+ 0.980
1.000
- 0.675
- 0.890
- 0.969
- 0.500
+ 0.980
+ 0.980
+ 0.980
+ 0.700
- 0.675
- 0.890
- 0.969
- 0.600
+ 0.882
+ 0.149
+ 0.110
+ 0.700
- 0.675
+ 0.890
0.890
- 0.969
+ 0.890
0.300
- 0.675
+ 0.890
0.890
- 0.969
+ 0.890
1.000
- 0.675
- 0.890
- 0.969
- 0.500
+ 0.690
+ 0.690
+ 0.690
+ 0.700
- 0.675
+ 0.890
0.890
- 0.969
+ 0.890
1.000
- 0.675
+ 0.890
0.890
- 0.969
- 1.000
+ 0.890
+ 0.500
- 0.675
+ 0.890
0.890
- 0.969
- 0.500
+ 0.890
+ 0.700
- 0.675
+ 0.890
0.890
- 0.969
- 0.500
+ 0.890
+ 1.000
- 0.675
+ 0.890
0.890
- 0.969
+ 0.890
0.300
- 0.675
+ 0.890
0.890
- 0.969
+ 0.890
1.000
- 0.675
- 0.890
- 0.969
- 0.500
+ 0.980
+ 0.980
+ 0.980
+ 1.000
+
+ 0.580
+ 0.580
+ 0.580
+ 0.700
+
- 0.675
- 0.890
- 0.969
+ 0.980
+ 0.980
+ 0.980
1.000
@@ -166,48 +190,85 @@
0.000
- 0.000
- 1.000
+ 0.580
+ 0.792
1.000
-
- 0.000
- 0.000
- 0.000
+
+ 0.882
+ 0.149
+ 0.110
1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.800
- 0.300
- 0.300
- 0.300
- 1.000
+ 0.600
+ 0.600
+ 0.600
+ 0.700
0.000
- 0.000
- 1.000
- 0.500
+ 0.580
+ 0.792
+ 0.700
+
+ 0.882
+ 0.149
+ 0.110
+ 0.700
+
- 0.800
+ 0.950
0.950
- 1.000
- 0.500
+ 0.950
+ 0.700
- 0.800
+ 0.950
0.950
- 1.000
- 0.850
+ 0.950
+ 0.900
+
+ 1.000
+ 1.000
+ 1.000
+ 0.900
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.200
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.700
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.700
+
- [Blue]BG_Default.png
- [Blue]BG_Options.png
-
+ BG_Default.png
+ BG_Default.png
+ BG_Loading.png
+
CoverTile.png
- CoverBackground.png
+ CoverTextBackground.png
Cursor.png
TimeBar.png
TimeLine.png
@@ -216,29 +277,28 @@
SelectSlidePlayer.png
SelectSlideArrowLeft.png
SelectSlideArrowRight.png
- notes_left.png
- notes_mid.png
- notes_right.png
- notes_bg_left.png
- notes_bg_mid.png
- notes_bg_right.png
- points_bar.png
- points_bar_bg.png
- Lyrics.png
+ NotesLeft.png
+ NotesMid.png
+ NotesRight.png
+ NotesFillLeft.png
+ NotesFillMid.png
+ NotesFillRight.png
+ NotesBGLeft.png
+ NotesBGMid.png
+ NotesBGRight.png
+ PointsBar.png
+ PointsBarBG.png
LyricHelper.png
ToneHelper.png
- TextBG.png
Score.png
Star.png
- Snowflake.png
SongMenu.png
- PerfectNoteStar.png
Pause.png
EnergyBeam.png
+ SearchBar.png
+ PlaylistBG.png
DuetIcon.png
VideoIcon.png
- VideoIconCO.png
- VideoIconBG.png
MedleyCalcIcon.png
MedleyTagIcon.png
PlayerSelector.png
@@ -247,22 +307,28 @@
PlayIcon.png
PauseIcon.png
RepeatIcon.png
- SongMenuBG.png
Close.png
- Delete.png
- Save.png
- Sing.png
- Minus.png
- Plus.png
- Random.png
- Popup.png
+ DeleteIcon.png
+ SaveIcon.png
+ SingIcon.png
+ MinusIcon.png
+ PlusIcon.png
+ VolUp.png
+ VolDown.png
+ RandomIcon.png
+ PopupBG.png
ScrollUp.png
ScrollDown.png
+ VocaluxeLogo.png
+ SongSelectButton.png
+ Warning.png
+ PlayerSelBG.png
+ CalibrationBG.png
- [Blue]BG_Video.mp4
- [Blue]IntroIn.mp4
- [Blue]IntroMid.mp4
- [Blue]IntroOut.mp4
+ BG_Video.mp4
+ Introin.mp4
+ IntroMid.mp4
+ IntroOut.mp4
\ No newline at end of file
diff --git a/Output/Themes/Genius/02_Ice_Blue.xml b/Output/Themes/Genius/02_Ice_Blue.xml
new file mode 100644
index 00000000..c2d71ec4
--- /dev/null
+++ b/Output/Themes/Genius/02_Ice_Blue.xml
@@ -0,0 +1,334 @@
+
+
+ 4
+
+ Ice Blue
+ Jiiniasu
+ 0
+ 7
+
+
+
+ 0.000
+ 0.580
+ 0.792
+ 1.000
+
+
+ 0.882
+ 0.149
+ 0.110
+ 1.000
+
+
+ 0.000
+ 0.659
+ 0.533
+ 1.000
+
+
+ 0.757
+ 0.160
+ 0.725
+ 1.000
+
+
+ 1.000
+ 0.870
+ 0.000
+ 1.000
+
+
+ 1.00
+ 0.322
+ 0.000
+ 1.000
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.200
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
+
+ 0.000
+ 0.000
+ 0.000
+ 1.000
+
+
+ 0.000
+ 0.000
+ 0.000
+ 0.700
+
+
+ 0.647
+ 0.949
+ 0.953
+ 1.000
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.700
+
+
+ 0.882
+ 0.149
+ 0.110
+ 0.700
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.300
+
+
+ 0.647
+ 0.949
+ 0.953
+ 1.000
+
+
+ 0.655
+ 0.737
+ 0.745
+ 0.700
+
+
+ 0.855
+ 0.937
+ 0.945
+ 1.000
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.500
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.700
+
+
+ 0.647
+ 0.949
+ 0.953
+ 1.000
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.300
+
+
+ 0.647
+ 0.949
+ 0.953
+ 1.000
+
+
+ 0.855
+ 0.937
+ 0.945
+ 1.000
+
+
+ 0.455
+ 0.537
+ 0.545
+ 0.700
+
+
+ 0.855
+ 0.937
+ 0.945
+ 1.000
+
+
+ 1.000
+ 0.000
+ 0.000
+ 1.000
+
+
+ 0.000
+ 0.000
+ 0.000
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.000
+
+
+ 0.000
+ 0.580
+ 0.792
+ 1.000
+
+
+ 0.882
+ 0.149
+ 0.110
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.800
+
+
+ 0.600
+ 0.600
+ 0.600
+ 0.700
+
+
+ 0.000
+ 0.580
+ 0.792
+ 0.700
+
+
+ 0.882
+ 0.149
+ 0.110
+ 0.700
+
+
+ 0.855
+ 0.937
+ 0.945
+ 0.700
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.900
+
+
+ 0.855
+ 0.937
+ 0.945
+ 0.900
+
+
+ 0.647
+ 0.949
+ 0.953
+ 0.200
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.700
+
+
+ 0.855
+ 0.937
+ 0.945
+ 0.700
+
+
+
+ BG_Default.png
+ BG_Default.png
+ BG_Loading.png
+
+
+ CoverTile.png
+ CoverTextBackground.png
+ Cursor.png
+ TimeBar.png
+ TimeLine.png
+ Pointer.png
+ SelectSlide.png
+ SelectSlidePlayer.png
+ SelectSlideArrowLeft.png
+ SelectSlideArrowRight.png
+ NotesLeft.png
+ NotesMid.png
+ NotesRight.png
+ NotesFillLeft.png
+ NotesFillMid.png
+ NotesFillRight.png
+ NotesBGLeft.png
+ NotesBGMid.png
+ NotesBGRight.png
+ PointsBar.png
+ PointsBarBG.png
+ LyricHelper.png
+ ToneHelper.png
+ Score.png
+ Star.png
+ SongMenu.png
+ Pause.png
+ EnergyBeam.png
+ SearchBar.png
+ PlaylistBG.png
+ DuetIcon.png
+ VideoIcon.png
+ MedleyCalcIcon.png
+ MedleyTagIcon.png
+ PlayerSelector.png
+ PreviousIcon.png
+ NextIcon.png
+ PlayIcon.png
+ PauseIcon.png
+ RepeatIcon.png
+ Close.png
+ DeleteIcon.png
+ SaveIcon.png
+ SingIcon.png
+ MinusIcon.png
+ PlusIcon.png
+ VolUp.png
+ VolDown.png
+ RandomIcon.png
+ PopupBG.png
+ ScrollUp.png
+ ScrollDown.png
+ VocaluxeLogo.png
+ SongSelectButton.png
+ Warning.png
+ PlayerSelBG.png
+ CalibrationBG.png
+
+
+ BG_Video.mp4
+ Introin.mp4
+ IntroMid.mp4
+ IntroOut.mp4
+
+
\ No newline at end of file
diff --git a/Output/Themes/Genius/03_Crimson_Red.xml b/Output/Themes/Genius/03_Crimson_Red.xml
new file mode 100644
index 00000000..87f0b965
--- /dev/null
+++ b/Output/Themes/Genius/03_Crimson_Red.xml
@@ -0,0 +1,334 @@
+
+
+ 4
+
+ Crimson Red
+ Jiiniasu
+ 0
+ 7
+
+
+
+ 0.000
+ 0.580
+ 0.792
+ 1.000
+
+
+ 0.882
+ 0.149
+ 0.110
+ 1.000
+
+
+ 0.000
+ 0.659
+ 0.533
+ 1.000
+
+
+ 0.757
+ 0.160
+ 0.725
+ 1.000
+
+
+ 1.000
+ 0.870
+ 0.000
+ 1.000
+
+
+ 1.00
+ 0.322
+ 0.000
+ 1.000
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.200
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
+
+ 0.000
+ 0.000
+ 0.000
+ 1.000
+
+
+ 0.000
+ 0.000
+ 0.000
+ 0.700
+
+
+ 0.690
+ 0.203
+ 0.302
+ 1.000
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.700
+
+
+ 0.882
+ 0.149
+ 0.110
+ 0.700
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.300
+
+
+ 0.690
+ 0.203
+ 0.302
+ 1.000
+
+
+ 0.788
+ 0.482
+ 0.533
+ 0.700
+
+
+ 0.988
+ 0.682
+ 0.733
+ 1.000
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.500
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.700
+
+
+ 0.690
+ 0.203
+ 0.302
+ 1.000
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.300
+
+
+ 0.690
+ 0.203
+ 0.302
+ 1.000
+
+
+ 0.988
+ 0.682
+ 0.733
+ 1.000
+
+
+ 0.588
+ 0.282
+ 0.333
+ 0.700
+
+
+ 0.988
+ 0.682
+ 0.733
+ 1.000
+
+
+ 1.000
+ 0.000
+ 0.000
+ 1.000
+
+
+ 0.000
+ 0.000
+ 0.000
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.000
+
+
+ 0.882
+ 0.149
+ 0.110
+ 1.000
+
+
+ 0.000
+ 0.580
+ 0.792
+ 1.000
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.800
+
+
+ 0.600
+ 0.600
+ 0.600
+ 0.700
+
+
+ 0.882
+ 0.149
+ 0.110
+ 0.700
+
+
+ 0.000
+ 0.580
+ 0.792
+ 0.700
+
+
+ 0.950
+ 0.950
+ 0.950
+ 0.700
+
+
+ 0.690
+ 0.203
+ 0.302
+ 0.900
+
+
+ 0.988
+ 0.682
+ 0.733
+ 0.900
+
+
+ 0.678
+ 0.110
+ 0.259
+ 0.200
+
+
+ 1.000
+ 1.000
+ 1.000
+ 0.700
+
+
+ 0.988
+ 0.682
+ 0.733
+ 0.700
+
+
+
+ BG_Default.png
+ BG_Default.png
+ BG_Loading.png
+
+
+ CoverTile.png
+ CoverTextBackground.png
+ Cursor.png
+ TimeBar.png
+ TimeLine.png
+ Pointer.png
+ SelectSlide.png
+ SelectSlidePlayer.png
+ SelectSlideArrowLeft.png
+ SelectSlideArrowRight.png
+ NotesLeft.png
+ NotesMid.png
+ NotesRight.png
+ NotesFillLeft.png
+ NotesFillMid.png
+ NotesFillRight.png
+ NotesBGLeft.png
+ NotesBGMid.png
+ NotesBGRight.png
+ PointsBar.png
+ PointsBarBG.png
+ LyricHelper.png
+ ToneHelper.png
+ Score.png
+ Star.png
+ SongMenu.png
+ Pause.png
+ EnergyBeam.png
+ SearchBar.png
+ PlaylistBG.png
+ DuetIcon.png
+ VideoIcon.png
+ MedleyCalcIcon.png
+ MedleyTagIcon.png
+ PlayerSelector.png
+ PreviousIcon.png
+ NextIcon.png
+ PlayIcon.png
+ PauseIcon.png
+ RepeatIcon.png
+ Close.png
+ DeleteIcon.png
+ SaveIcon.png
+ SingIcon.png
+ MinusIcon.png
+ PlusIcon.png
+ VolUp.png
+ VolDown.png
+ RandomIcon.png
+ PopupBG.png
+ ScrollUp.png
+ ScrollDown.png
+ VocaluxeLogo.png
+ SongSelectButton.png
+ Warning.png
+ PlayerSelBG.png
+ CalibrationBG.png
+
+
+ BG_Video.mp4
+ Introin.mp4
+ IntroMid.mp4
+ IntroOut.mp4
+
+
\ No newline at end of file
diff --git a/Output/Themes/Genius/BG_Default.png b/Output/Themes/Genius/BG_Default.png
new file mode 100644
index 00000000..3ab2750a
Binary files /dev/null and b/Output/Themes/Genius/BG_Default.png differ
diff --git a/Output/Themes/Genius/BG_Loading.png b/Output/Themes/Genius/BG_Loading.png
new file mode 100644
index 00000000..8f6eeb16
Binary files /dev/null and b/Output/Themes/Genius/BG_Loading.png differ
diff --git a/Output/Themes/Genius/BG_Video.mp4 b/Output/Themes/Genius/BG_Video.mp4
new file mode 100644
index 00000000..f40f3a61
Binary files /dev/null and b/Output/Themes/Genius/BG_Video.mp4 differ
diff --git a/Output/Themes/Genius/Button.png b/Output/Themes/Genius/Button.png
new file mode 100644
index 00000000..ae6003ea
Binary files /dev/null and b/Output/Themes/Genius/Button.png differ
diff --git a/Output/Themes/Genius/CalibrationBG.png b/Output/Themes/Genius/CalibrationBG.png
new file mode 100644
index 00000000..cc95bda2
Binary files /dev/null and b/Output/Themes/Genius/CalibrationBG.png differ
diff --git a/Output/Themes/Genius/Close.png b/Output/Themes/Genius/Close.png
new file mode 100644
index 00000000..07515397
Binary files /dev/null and b/Output/Themes/Genius/Close.png differ
diff --git a/Output/Themes/Genius/CoverTextBackground.png b/Output/Themes/Genius/CoverTextBackground.png
new file mode 100644
index 00000000..8b3a7db4
Binary files /dev/null and b/Output/Themes/Genius/CoverTextBackground.png differ
diff --git a/Output/Themes/Ambient/CoverTile.png b/Output/Themes/Genius/CoverTile.png
similarity index 100%
rename from Output/Themes/Ambient/CoverTile.png
rename to Output/Themes/Genius/CoverTile.png
diff --git a/Output/Themes/Genius/Cursor.png b/Output/Themes/Genius/Cursor.png
new file mode 100644
index 00000000..55069a35
Binary files /dev/null and b/Output/Themes/Genius/Cursor.png differ
diff --git a/Output/Themes/Genius/DeleteIcon.png b/Output/Themes/Genius/DeleteIcon.png
new file mode 100644
index 00000000..20dd7fe3
Binary files /dev/null and b/Output/Themes/Genius/DeleteIcon.png differ
diff --git a/Output/Themes/Genius/DuetIcon.png b/Output/Themes/Genius/DuetIcon.png
new file mode 100644
index 00000000..016d1987
Binary files /dev/null and b/Output/Themes/Genius/DuetIcon.png differ
diff --git a/Output/Themes/Genius/EnergyBeam.png b/Output/Themes/Genius/EnergyBeam.png
new file mode 100644
index 00000000..72927f3d
Binary files /dev/null and b/Output/Themes/Genius/EnergyBeam.png differ
diff --git a/Output/Themes/Genius/IntroIn.mp4 b/Output/Themes/Genius/IntroIn.mp4
new file mode 100644
index 00000000..1c53a745
Binary files /dev/null and b/Output/Themes/Genius/IntroIn.mp4 differ
diff --git a/Output/Themes/Genius/IntroMid.mp4 b/Output/Themes/Genius/IntroMid.mp4
new file mode 100644
index 00000000..6d3dfb37
Binary files /dev/null and b/Output/Themes/Genius/IntroMid.mp4 differ
diff --git a/Output/Themes/Genius/IntroOut.mp4 b/Output/Themes/Genius/IntroOut.mp4
new file mode 100644
index 00000000..dd703a12
Binary files /dev/null and b/Output/Themes/Genius/IntroOut.mp4 differ
diff --git a/Output/Themes/Genius/LyricHelper.png b/Output/Themes/Genius/LyricHelper.png
new file mode 100644
index 00000000..be09c707
Binary files /dev/null and b/Output/Themes/Genius/LyricHelper.png differ
diff --git a/Output/Themes/Genius/MedleyCalcIcon.png b/Output/Themes/Genius/MedleyCalcIcon.png
new file mode 100644
index 00000000..c861e369
Binary files /dev/null and b/Output/Themes/Genius/MedleyCalcIcon.png differ
diff --git a/Output/Themes/Genius/MedleyTagIcon.png b/Output/Themes/Genius/MedleyTagIcon.png
new file mode 100644
index 00000000..e434ffec
Binary files /dev/null and b/Output/Themes/Genius/MedleyTagIcon.png differ
diff --git a/Output/Themes/Genius/MinusIcon.png b/Output/Themes/Genius/MinusIcon.png
new file mode 100644
index 00000000..bc2c6fdc
Binary files /dev/null and b/Output/Themes/Genius/MinusIcon.png differ
diff --git a/Output/Themes/Genius/NextIcon.png b/Output/Themes/Genius/NextIcon.png
new file mode 100644
index 00000000..4ea3a217
Binary files /dev/null and b/Output/Themes/Genius/NextIcon.png differ
diff --git a/Output/Themes/Genius/NotesBGLeft.png b/Output/Themes/Genius/NotesBGLeft.png
new file mode 100644
index 00000000..0c321303
Binary files /dev/null and b/Output/Themes/Genius/NotesBGLeft.png differ
diff --git a/Output/Themes/Genius/NotesBGMid.png b/Output/Themes/Genius/NotesBGMid.png
new file mode 100644
index 00000000..989fa118
Binary files /dev/null and b/Output/Themes/Genius/NotesBGMid.png differ
diff --git a/Output/Themes/Genius/NotesBGRight.png b/Output/Themes/Genius/NotesBGRight.png
new file mode 100644
index 00000000..4d3b8238
Binary files /dev/null and b/Output/Themes/Genius/NotesBGRight.png differ
diff --git a/Output/Themes/Genius/NotesFillLeft.png b/Output/Themes/Genius/NotesFillLeft.png
new file mode 100644
index 00000000..732b0313
Binary files /dev/null and b/Output/Themes/Genius/NotesFillLeft.png differ
diff --git a/Output/Themes/Genius/NotesFillMid.png b/Output/Themes/Genius/NotesFillMid.png
new file mode 100644
index 00000000..172b394a
Binary files /dev/null and b/Output/Themes/Genius/NotesFillMid.png differ
diff --git a/Output/Themes/Genius/NotesFillRight.png b/Output/Themes/Genius/NotesFillRight.png
new file mode 100644
index 00000000..2a0c56b4
Binary files /dev/null and b/Output/Themes/Genius/NotesFillRight.png differ
diff --git a/Output/Themes/Genius/NotesLeft.png b/Output/Themes/Genius/NotesLeft.png
new file mode 100644
index 00000000..ee6365d9
Binary files /dev/null and b/Output/Themes/Genius/NotesLeft.png differ
diff --git a/Output/Themes/Genius/NotesMid.png b/Output/Themes/Genius/NotesMid.png
new file mode 100644
index 00000000..42146d41
Binary files /dev/null and b/Output/Themes/Genius/NotesMid.png differ
diff --git a/Output/Themes/Genius/NotesRight.png b/Output/Themes/Genius/NotesRight.png
new file mode 100644
index 00000000..0de874d0
Binary files /dev/null and b/Output/Themes/Genius/NotesRight.png differ
diff --git a/Output/Themes/Genius/Pause.png b/Output/Themes/Genius/Pause.png
new file mode 100644
index 00000000..2ea49e27
Binary files /dev/null and b/Output/Themes/Genius/Pause.png differ
diff --git a/Output/Themes/Genius/PauseIcon.png b/Output/Themes/Genius/PauseIcon.png
new file mode 100644
index 00000000..8cfb6723
Binary files /dev/null and b/Output/Themes/Genius/PauseIcon.png differ
diff --git a/Output/Themes/Genius/PlayIcon.png b/Output/Themes/Genius/PlayIcon.png
new file mode 100644
index 00000000..d1467b3f
Binary files /dev/null and b/Output/Themes/Genius/PlayIcon.png differ
diff --git a/Output/Themes/Genius/PlayerSelBG.png b/Output/Themes/Genius/PlayerSelBG.png
new file mode 100644
index 00000000..b8535a6c
Binary files /dev/null and b/Output/Themes/Genius/PlayerSelBG.png differ
diff --git a/Output/Themes/Genius/PlayerSelector.png b/Output/Themes/Genius/PlayerSelector.png
new file mode 100644
index 00000000..52c64145
Binary files /dev/null and b/Output/Themes/Genius/PlayerSelector.png differ
diff --git a/Output/Themes/Genius/PlaylistBG.png b/Output/Themes/Genius/PlaylistBG.png
new file mode 100644
index 00000000..50ccfb84
Binary files /dev/null and b/Output/Themes/Genius/PlaylistBG.png differ
diff --git a/Output/Themes/Genius/PlusIcon.png b/Output/Themes/Genius/PlusIcon.png
new file mode 100644
index 00000000..5f63c725
Binary files /dev/null and b/Output/Themes/Genius/PlusIcon.png differ
diff --git a/Output/Themes/Ambient/Pointer.png b/Output/Themes/Genius/Pointer.png
similarity index 100%
rename from Output/Themes/Ambient/Pointer.png
rename to Output/Themes/Genius/Pointer.png
diff --git a/Output/Themes/Genius/PointsBar.png b/Output/Themes/Genius/PointsBar.png
new file mode 100644
index 00000000..696f0192
Binary files /dev/null and b/Output/Themes/Genius/PointsBar.png differ
diff --git a/Output/Themes/Genius/PointsBarBG.png b/Output/Themes/Genius/PointsBarBG.png
new file mode 100644
index 00000000..153eaff2
Binary files /dev/null and b/Output/Themes/Genius/PointsBarBG.png differ
diff --git a/Output/Themes/Genius/PopupBG.png b/Output/Themes/Genius/PopupBG.png
new file mode 100644
index 00000000..387e33c9
Binary files /dev/null and b/Output/Themes/Genius/PopupBG.png differ
diff --git a/Output/Themes/Genius/PreviousIcon.png b/Output/Themes/Genius/PreviousIcon.png
new file mode 100644
index 00000000..df72a9d8
Binary files /dev/null and b/Output/Themes/Genius/PreviousIcon.png differ
diff --git a/Output/Themes/Genius/RandomIcon.png b/Output/Themes/Genius/RandomIcon.png
new file mode 100644
index 00000000..995270fb
Binary files /dev/null and b/Output/Themes/Genius/RandomIcon.png differ
diff --git a/Output/Themes/Genius/RepeatIcon.png b/Output/Themes/Genius/RepeatIcon.png
new file mode 100644
index 00000000..d22dc60f
Binary files /dev/null and b/Output/Themes/Genius/RepeatIcon.png differ
diff --git a/Output/Themes/Genius/SaveIcon.png b/Output/Themes/Genius/SaveIcon.png
new file mode 100644
index 00000000..9d9c2435
Binary files /dev/null and b/Output/Themes/Genius/SaveIcon.png differ
diff --git a/Output/Themes/Genius/Score.png b/Output/Themes/Genius/Score.png
new file mode 100644
index 00000000..32114cf5
Binary files /dev/null and b/Output/Themes/Genius/Score.png differ
diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml
similarity index 79%
rename from Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
rename to Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml
index f4300e82..1e40bbd6 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+++ b/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml
@@ -7,38 +7,38 @@
- Menu
-
+
+
- 49
+ 0
0
- 1181
- 42
- 0
+ 1280
+ 40
+ -1
CoverBackground
-
+
55
2
38
38
- 0
+ -2
- 410
+ 640
8
- 0
+ -2
27
769
-
+
- Left
+ Center
Center
Outline
@@ -50,18 +50,18 @@
PlayIcon
PlayIcon
- 146
- 8
- 28
- 28
- 0
+ 41
+ 5
+ 30
+ 30
+ -2
75
2
- 0
+ -2
32
142
@@ -77,18 +77,18 @@
PauseIcon
PauseIcon
- 145
- 8
- 28
- 28
- 0
+ 41
+ 5
+ 30
+ 30
+ -2
75
2
- 0
+ -2
32
142
@@ -104,18 +104,18 @@
PreviousIcon
PreviousIcon
- 100
- 2
- 38
- 38
- 0
+ 10
+ 7
+ 26
+ 26
+ -2
75
2
- 0
+ -2
32
142
@@ -131,18 +131,18 @@
NextIcon
NextIcon
- 185
- 2
- 38
- 38
- 0
+ 76
+ 7
+ 26
+ 26
+ -2
190
25
- 0
+ -2
32
142
@@ -158,18 +158,18 @@
RepeatIcon
RepeatIcon
- 225
- 2
- 38
- 38
- 0
+ 112
+ 10
+ 20
+ 20
+ -2
405
25
- 0
+ -2
32
142
@@ -182,21 +182,21 @@
- 110
- 488
+ 85
+ 380
-1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 38
+ 350
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 155
+ 1260
+ 92
-1
- 173
+ 90
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 288
+ 725
+ 120
-1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 38
+ 350
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 355
+ 1260
+ 352
-1
- 173
+ 90
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 488
+ 725
+ 380
-1
- 28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 38
+ 350
+
- Center
+ Left
Center
Outline
-
-
+
- 324
- 106
+ 625
+ 92
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 110
- 219
+ 60
+ 105
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 324
- 269
+ 625
+ 262
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 110
- 382
+ 60
+ 275
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 324
- 437
+ 625
+ 432
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 110
- 550
+ 60
+ 445
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 155
+ 1260
+ 92
-1
- 173
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 288
+ 695
+ 105
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 355
+ 1260
+ 262
-1
- 173
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 488
+ 695
+ 275
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 324
- 106
+ 625
+ 92
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 110
- 219
+ 60
+ 105
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 324
- 269
+ 625
+ 262
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 110
- 382
+ 60
+ 275
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 324
- 437
+ 625
+ 432
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 110
- 550
+ 60
+ 445
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 106
+ 1260
+ 92
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 219
+ 695
+ 105
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 269
+ 1260
+ 262
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 382
+ 695
+ 275
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
- 967
- 437
+ 1260
+ 432
-1
- 148
+ 50
0
- 0.4
+
+ 0.7
+
- Center
+ Right
Center
Normal
-
-
+
- 1173
- 550
+ 695
+ 445
-1
28
- 0
-
- 1
- 1
- 1
- 0.4
-
+ 450
+
- Center
+ Left
Center
Outline
-
-
+
@@ -1520,7 +1302,7 @@
Button
775
- 300
+ 450
150
50
-2.11
@@ -1555,7 +1337,7 @@
Button
355
- 300
+ 450
150
50
-2.11
@@ -1590,7 +1372,7 @@
Button
565
- 300
+ 450
150
50
-2.11
@@ -1626,7 +1408,7 @@
637
- 600
+ 620
1200
42
-1
@@ -1637,9 +1419,9 @@
637
- 642
+ 662
1200
- 38
+ 35
-1
@@ -1648,20 +1430,20 @@
637
- 12
+ 7
1200
42
-1
-
-
+
+
637
- 54
+ 48
1200
- 38
+ 35
-1
@@ -1670,7 +1452,7 @@
637
- 12
+ 7
1200
42
-1
@@ -1681,9 +1463,9 @@
637
- 54
+ 48
1200
- 38
+ 35
-1
@@ -1696,199 +1478,202 @@
NoteLeft
NoteMiddle
NoteRight
+ NoteFillLeft
+ NoteFillMiddle
+ NoteFillRight
NoteBackgroundLeft
NoteBackgroundMiddle
NoteBackgroundRight
Star
ToneHelper
- PerfectNoteStar
+ Star
- 35
- 350
- 1210
- 200
+ 40
+ 410
+ 1200
+ 180
-1.5
- 35
- 150
- 1210
- 175
+ 40
+ 170
+ 1200
+ 160
-1.5
- 35
- 350
- 1210
- 175
+ 40
+ 430
+ 1200
+ 160
-1.5
- 35
- 105
- 1210
- 150
+ 40
+ 130
+ 1200
+ 130
-1.5
- 35
- 268
- 1210
- 150
+ 40
+ 300
+ 1200
+ 130
-1.5
- 35
- 436
- 1210
- 150
+ 40
+ 470
+ 1200
+ 130
-1.5
- 35
- 150
- 578
- 175
+ 20
+ 170
+ 605
+ 160
-1.5
- 35
- 350
- 578
- 175
+ 20
+ 430
+ 605
+ 160
-1.5
- 678
- 150
- 578
- 175
+ 655
+ 170
+ 605
+ 160
-1.5
- 678
- 350
- 578
- 175
+ 655
+ 430
+ 605
+ 160
-1.5
- 35
- 105
- 578
- 150
+ 20
+ 130
+ 605
+ 130
-1.5
- 35
- 268
- 578
- 150
+ 20
+ 300
+ 605
+ 130
-1.5
- 35
- 436
- 578
- 150
+ 20
+ 470
+ 605
+ 130
-1.5
- 678
- 150
- 578
- 175
+ 655
+ 130
+ 605
+ 130
-1.5
- 678
- 350
- 578
- 175
+ 655
+ 300
+ 605
+ 130
-1.5
- 35
- 105
- 578
- 150
+ 20
+ 130
+ 605
+ 130
-1.5
- 35
- 268
- 578
- 150
+ 20
+ 300
+ 605
+ 130
-1.5
- 35
- 436
- 578
- 150
+ 20
+ 470
+ 605
+ 130
-1.5
- 678
- 105
- 578
- 150
+ 655
+ 130
+ 605
+ 130
-1.5
- 678
- 268
- 578
- 150
+ 655
+ 300
+ 605
+ 130
-1.5
- 678
- 436
- 578
- 150
+ 655
+ 470
+ 605
+ 130
-1.5
@@ -1900,4 +1685,4 @@
-
+
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Genius/Screens/ScreenSong.xml
similarity index 85%
rename from Output/Themes/Ambient/Screens/ScreenSong.xml
rename to Output/Themes/Genius/Screens/ScreenSong.xml
index 890173ac..1b74ad72 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Genius/Screens/ScreenSong.xml
@@ -14,13 +14,13 @@
-
+
SongMenu
-
+
- 40
+ 410
600
- 1200
+ 830
50
0
@@ -29,13 +29,28 @@
10
-
- Menu
-
+
+ VocaluxeLogo
+
40
600
- 1200
+ 360
+ 50
+ 1
+
+
+ 26
+ 10
+
+
+
+ SearchBar
+
+
+ 40
+ 600
+ 360
50
0
@@ -45,8 +60,8 @@
- SongMenuBG
-
+
+
40
40
@@ -58,11 +73,11 @@
- 1070
+ 950
65
-2.11
42
- 350
+ 280
Left
@@ -72,11 +87,11 @@
- 1070
+ 950
135
-2.11
42
- 350
+ 280
Left
@@ -86,11 +101,11 @@
- 1070
+ 950
205
-2.11
42
- 350
+ 280
Left
@@ -100,11 +115,11 @@
- 1070
+ 950
275
-2.11
42
- 350
+ 280
Left
@@ -114,11 +129,11 @@
- 1070
+ 950
345
-2.11
42
- 350
+ 280
Left
@@ -128,11 +143,11 @@
- 1070
+ 950
415
-2.11
42
- 350
+ 280
Left
@@ -147,7 +162,7 @@
0
27
340
-
+
Center
Center
@@ -155,8 +170,8 @@
Outline
- 26
- 24
+ 13
+ 33
@@ -164,8 +179,8 @@
612
0
27
- 830
-
+ 805
+
Center
Center
@@ -173,17 +188,17 @@
Outline
- 26
- 24
+ 20
+ 30
- 400
+ 100
612
0
27
0
-
+
Right
Center
@@ -192,18 +207,22 @@
TR_SCREENSONG_SEARCH
- 410
+ 90
612
0
27
- 0
-
+ 300
+
Left
- Center
+ Bottom
Outline
+
+ 14
+ 32
+
220
@@ -211,7 +230,7 @@
-2.11
34
350
-
+
Center
Center
@@ -225,13 +244,15 @@
Random
Random
- 980
+ 850
50
80
80
-1.01
- 0.5
+
+ 0.5
+
40
@@ -252,13 +273,15 @@
Random
Random
- 980
+ 850
120
80
80
-1.01
- 0.5
+
+ 0.5
+
40
@@ -279,13 +302,15 @@
Random
Random
- 980
+ 850
190
80
80
-1.01
- 0.5
+
+ 0.5
+
40
@@ -306,13 +331,15 @@
Random
Random
- 980
+ 850
260
80
80
-1.01
- 0.5
+
+ 0.5
+
40
@@ -333,13 +360,15 @@
Random
Random
- 980
+ 850
330
80
80
-1.01
- 0.5
+
+ 0.5
+
40
@@ -360,13 +389,15 @@
Random
Random
- 980
+ 850
400
80
80
-1.01
- 0.5
+
+ 0.5
+
40
@@ -384,8 +415,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
360
@@ -411,8 +442,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
235
@@ -438,8 +469,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
90
@@ -465,8 +496,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
90
@@ -492,8 +523,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
90
@@ -519,8 +550,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
225
@@ -546,8 +577,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
270
@@ -573,8 +604,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
135
@@ -630,7 +661,7 @@
Button
Button
- 985
+ 960
500
150
50
@@ -662,8 +693,8 @@
- Button
- Button
+ SongSelectButton
+ SongSelectButton
40
315
@@ -719,7 +750,7 @@
CoverTile
- CoverBackground
+
DuetIcon
VideoIcon
MedleyCalcIcon
@@ -733,7 +764,7 @@
6
4
- 4
+ 3
4
10
10
@@ -747,7 +778,7 @@
410
40
- 550
+ 410
550
-1
@@ -757,134 +788,7 @@
-1.01
39
340
-
-
- Center
- Top
-
- Outline
-
-
-
- 222
- 456
- -1.01
- 32
- 340
-
-
- Center
- Top
-
- Outline
-
-
-
- 222
- 490
- -1.01
- 28
- 340
-
-
- Center
- Top
-
- Outline
-
-
-
- CoverBackground
-
-
- 40
- 40
- 360
- 360
- -1
-
-
-
- CoverBackground
-
-
- 40
- 40
- 360
- 550
- -1
-
-
-
- DuetIcon
-
-
- 200
- 530
- 40
- 40
- -1
-
-
-
- VideoIcon
-
-
- 120
- 530
- 40
- 40
- -1
-
-
-
- MedleyCalcIcon
-
-
- 280
- 530
- 40
- 40
- -1
-
-
-
- MedleyTagIcon
-
-
- 280
- 530
- 40
- 40
- -1
-
-
-
-
- 15
- 10
- 10
-
- 410
- 40
- 830
- 550
- -1
-
-
- 410
- 40
- 555
- 550
- -1
-
-
- 222
- 416
- -1.01
- 39
- 340
-
+
Center
Top
@@ -898,7 +802,7 @@
-1.01
32
340
-
+
Center
Top
@@ -912,7 +816,7 @@
-1.01
28
340
-
+
Center
Top
@@ -921,7 +825,7 @@
- CoverBackground
+
40
@@ -932,13 +836,13 @@
- CoverBackground
-
+ CoverTextBackground
+
40
- 40
+ 410
360
- 550
+ 180
-1
@@ -986,16 +890,143 @@
-1
+
+
+ 15
+ 10
+ 10
+
+ 375
+ 42
+ 850
+ 555
+ -1
+
+
+ 375
+ 42
+ 450
+ 550
+ -1
+
+
+ 222
+ 416
+ -1.01
+ 39
+ 340
+
+
+ Center
+ Top
+
+ Outline
+
+
+
+ 222
+ 456
+ -1.01
+ 32
+ 340
+
+
+ Center
+ Top
+
+ Outline
+
+
+
+ 222
+ 490
+ -1.01
+ 28
+ 340
+
+
+ Center
+ Top
+
+ Outline
+
+
+
+
+
+
+ 40
+ 40
+ 360
+ 360
+ -1
+
+
+
+ CoverTextBackground
+
+
+ 40
+ 410
+ 360
+ 180
+ -1
+
+
+
+ DuetIcon
+
+
+ 200
+ 530
+ 40
+ 40
+ -1
+
+
+
+ VideoIcon
+
+
+ 120
+ 530
+ 40
+ 40
+ -1
+
+
+
+ MedleyCalcIcon
+
+
+ 280
+ 530
+ 40
+ 40
+ -1
+
+
+
+ MedleyTagIcon
+
+
+ 280
+ 530
+ 40
+ 40
+ -1
+
+
- Button
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
- SelectSlide
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
@@ -1023,8 +1054,8 @@
-
-
+
+
25
50
0
@@ -1034,10 +1065,10 @@
1
- Button
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
- SelectSlide
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
@@ -1065,8 +1096,8 @@
-
-
+
+
25
50
0
@@ -1076,10 +1107,10 @@
1
- Button
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
- SelectSlide
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
@@ -1091,14 +1122,14 @@
45
- 190
+ 185
30
30
-2.12
365
- 190
+ 185
30
30
-2.12
@@ -1107,8 +1138,8 @@
-
-
+
+
25
50
0
@@ -1118,10 +1149,10 @@
1
- Button
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
- SelectSlide
+ SongSelectButton
SelectSlideArrowLeft
SelectSlideArrowRight
@@ -1133,14 +1164,14 @@
45
- 100
+ 95
30
30
-2.12
365
- 100
+ 95
30
30
-2.12
@@ -1149,7 +1180,7 @@
-
+
25
50
@@ -1166,82 +1197,84 @@
- 970
- 80
- 295
- 460
+ 830
+ 90
+ 410
+ 450
-0.9
50
CoverTile
CoverTile
-
-
+
+ 0.3
+
+
54
5
-1.01
22
- 235
-
+ 351
+
Left
Center
Outline
TR_SCREENSONG_ARTIST_TITLE
-
+
- 0
- 0
+ 2
+ 2
46
46
-1
-
+
- Menu
-
+ PlaylistBG
+
- 970
+ 830
40
- 295
- 40
+ 410
+ 50
-1
-
+
- Menu
-
+ PlaylistBG
+
- 970
- 550
- 295
- 40
+ 830
+ 540
+ 410
+ 50
-1
-
+
- 975
- 45
- 220
- 25
+ 835
+ 50
+ 360
+ 30
-1.01
- 0
- 0
+ 5
+ 2
0
25
- 220
+ 350
Left
@@ -1249,14 +1282,14 @@
Outline
-
-
+
+
CloseIcon
CloseIcon
- 1215
- 42
+ 1200
+ 47
35
35
-1.01
@@ -1276,14 +1309,14 @@
Outline
-
-
+
+
SaveIcon
SaveIcon
- 1175
- 553
+ 1160
+ 548
35
35
-1.01
@@ -1303,14 +1336,14 @@
Outline
-
-
+
+
DeleteIcon
DeleteIcon
- 1215
- 553
+ 1200
+ 548
35
35
-1.01
@@ -1330,14 +1363,14 @@
Outline
-
-
+
+
SingIcon
SingIcon
- 975
- 553
+ 835
+ 548
35
35
-1.01
@@ -1357,45 +1390,45 @@
Outline
-
-
+
+
- Button
+
SelectSlideArrowLeft
SelectSlideArrowRight
SelectSlideArrowLeft
SelectSlideArrowRight
- 0
- 28
- 293
+ 52
+ 25
+ 358
24
-1.01
- 54
- 30
+ 56
+ 28
20
20
-1.02
- 271
- 30
+ 385
+ 28
20
20
-1.02
-
+
- 22.00
- 25.00
- 230.00
+ 22
+ 25
+ 370
Outline
Bold
1
diff --git a/Output/Themes/Ambient/Screens/ScreenTest.xml b/Output/Themes/Genius/Screens/ScreenTest.xml
similarity index 85%
rename from Output/Themes/Ambient/Screens/ScreenTest.xml
rename to Output/Themes/Genius/Screens/ScreenTest.xml
index 6958eb63..5f3a0e47 100644
--- a/Output/Themes/Ambient/Screens/ScreenTest.xml
+++ b/Output/Themes/Genius/Screens/ScreenTest.xml
@@ -11,11 +11,11 @@
- 0
- 0
- 0
- 1
+ 0
+ 0
+ 0
+ 1
-
+
\ No newline at end of file
diff --git a/Output/Themes/Genius/ScrollDown.png b/Output/Themes/Genius/ScrollDown.png
new file mode 100644
index 00000000..9615c7c4
Binary files /dev/null and b/Output/Themes/Genius/ScrollDown.png differ
diff --git a/Output/Themes/Genius/ScrollUp.png b/Output/Themes/Genius/ScrollUp.png
new file mode 100644
index 00000000..8b60bef1
Binary files /dev/null and b/Output/Themes/Genius/ScrollUp.png differ
diff --git a/Output/Themes/Genius/SearchBar.png b/Output/Themes/Genius/SearchBar.png
new file mode 100644
index 00000000..15aa5e4c
Binary files /dev/null and b/Output/Themes/Genius/SearchBar.png differ
diff --git a/Output/Themes/Genius/SelectSlide.png b/Output/Themes/Genius/SelectSlide.png
new file mode 100644
index 00000000..2b6205f3
Binary files /dev/null and b/Output/Themes/Genius/SelectSlide.png differ
diff --git a/Output/Themes/Genius/SelectSlideArrowLeft.png b/Output/Themes/Genius/SelectSlideArrowLeft.png
new file mode 100644
index 00000000..d4d41587
Binary files /dev/null and b/Output/Themes/Genius/SelectSlideArrowLeft.png differ
diff --git a/Output/Themes/Genius/SelectSlideArrowRight.png b/Output/Themes/Genius/SelectSlideArrowRight.png
new file mode 100644
index 00000000..84f731a0
Binary files /dev/null and b/Output/Themes/Genius/SelectSlideArrowRight.png differ
diff --git a/Output/Themes/Genius/SelectSlidePlayer.png b/Output/Themes/Genius/SelectSlidePlayer.png
new file mode 100644
index 00000000..b013c55d
Binary files /dev/null and b/Output/Themes/Genius/SelectSlidePlayer.png differ
diff --git a/Output/Themes/Genius/SingIcon.png b/Output/Themes/Genius/SingIcon.png
new file mode 100644
index 00000000..8df53e11
Binary files /dev/null and b/Output/Themes/Genius/SingIcon.png differ
diff --git a/Output/Themes/Genius/SongMenu.png b/Output/Themes/Genius/SongMenu.png
new file mode 100644
index 00000000..2cb7dce7
Binary files /dev/null and b/Output/Themes/Genius/SongMenu.png differ
diff --git a/Output/Themes/Genius/SongSelectButton.png b/Output/Themes/Genius/SongSelectButton.png
new file mode 100644
index 00000000..009912df
Binary files /dev/null and b/Output/Themes/Genius/SongSelectButton.png differ
diff --git a/Output/Themes/Genius/Star.png b/Output/Themes/Genius/Star.png
new file mode 100644
index 00000000..34e6f078
Binary files /dev/null and b/Output/Themes/Genius/Star.png differ
diff --git a/Output/Themes/Genius/TimeBar.png b/Output/Themes/Genius/TimeBar.png
new file mode 100644
index 00000000..55f2aa8f
Binary files /dev/null and b/Output/Themes/Genius/TimeBar.png differ
diff --git a/Output/Themes/Genius/TimeLine.png b/Output/Themes/Genius/TimeLine.png
new file mode 100644
index 00000000..6ff1117a
Binary files /dev/null and b/Output/Themes/Genius/TimeLine.png differ
diff --git a/Output/Themes/Genius/ToneHelper.png b/Output/Themes/Genius/ToneHelper.png
new file mode 100644
index 00000000..cef5ab73
Binary files /dev/null and b/Output/Themes/Genius/ToneHelper.png differ
diff --git a/Output/Themes/Genius/VideoIcon.png b/Output/Themes/Genius/VideoIcon.png
new file mode 100644
index 00000000..9b7edee6
Binary files /dev/null and b/Output/Themes/Genius/VideoIcon.png differ
diff --git a/Output/Themes/Genius/VocaluxeLogo.png b/Output/Themes/Genius/VocaluxeLogo.png
new file mode 100644
index 00000000..880e8b66
Binary files /dev/null and b/Output/Themes/Genius/VocaluxeLogo.png differ
diff --git a/Output/Themes/Genius/VolDown.png b/Output/Themes/Genius/VolDown.png
new file mode 100644
index 00000000..3402e6f9
Binary files /dev/null and b/Output/Themes/Genius/VolDown.png differ
diff --git a/Output/Themes/Genius/VolUp.png b/Output/Themes/Genius/VolUp.png
new file mode 100644
index 00000000..19c4a629
Binary files /dev/null and b/Output/Themes/Genius/VolUp.png differ
diff --git a/Output/Themes/Genius/Warning.png b/Output/Themes/Genius/Warning.png
new file mode 100644
index 00000000..aef9627b
Binary files /dev/null and b/Output/Themes/Genius/Warning.png differ
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 53f9a0b6..6980af2a 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -95,9 +95,9 @@ namespace Vocaluxe.Base
public struct SConfigTheme
{
- [XmlElement("Name"), DefaultValue("Ambient")] public string Theme;
- [DefaultValue("Blue")] public string Skin;
- [XmlElement("Cover"), DefaultValue("Ambient Blue")] public string CoverTheme;
+ [XmlElement("Name"), DefaultValue("Genius")] public string Theme;
+ [DefaultValue("Standard")] public string Skin;
+ [XmlElement("Cover"), DefaultValue("Genius Standard")] public string CoverTheme;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawNoteLines;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawToneHelper;
[DefaultValue(ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED)] public ETimerLook TimerLook;
diff --git a/Vocaluxe/Base/CCoverGenerator.cs b/Vocaluxe/Base/CCoverGenerator.cs
index 1ff20fa9..39034d1b 100644
--- a/Vocaluxe/Base/CCoverGenerator.cs
+++ b/Vocaluxe/Base/CCoverGenerator.cs
@@ -84,7 +84,7 @@ namespace Vocaluxe.Base
if (_WidthTrimmed < 0f)
{
string text = Text.TrimEnd(null);
- _WidthTrimmed = text.Length == Text.Length ? Width : _Graphics.MeasureString(text, _Font, -1, StringFormat.GenericTypographic).Width;
+ _WidthTrimmed = text.Length == Text.Length ? Width : _Graphics.MeasureString(text, _Font).Width;
}
return _WidthTrimmed;
}
@@ -94,7 +94,7 @@ namespace Vocaluxe.Base
public CTextElement(string text, Graphics g, Font font)
{
Text = text;
- SizeF dimensions = g.MeasureString(text, font, -1, StringFormat.GenericTypographic);
+ SizeF dimensions = g.MeasureString(text, font);
Width = dimensions.Width;
Height = (dimensions.Height + font.Height) / 2;
_Graphics = g;
diff --git a/Vocaluxe/Base/Fonts/CGlyph.cs b/Vocaluxe/Base/Fonts/CGlyph.cs
index 6b949903..f9bc02ed 100644
--- a/Vocaluxe/Base/Fonts/CGlyph.cs
+++ b/Vocaluxe/Base/Fonts/CGlyph.cs
@@ -51,7 +51,13 @@ namespace Vocaluxe.Base.Fonts
if (chr != ' ')
{
//Gets exact height and width for drawing more than 1 char. But width is to small to draw char on bitmap as e.g. italic chars will get cropped
- _BoundingBox = g.MeasureString(chrString, fo, -1, StringFormat.GenericTypographic);
+ //See https://stackoverflow.com/questions/11708621/how-to-measure-width-of-a-string-precisely
+ StringFormat format = StringFormat.GenericTypographic;
+ RectangleF rect = new RectangleF(0, 0, 1000, 1000);
+ CharacterRange[] ranges = { new CharacterRange(0, chrString.Length) };
+ format.SetMeasurableCharacterRanges(ranges);
+ _BoundingBox = g.MeasureCharacterRanges(chrString, fo, rect, format)[0].GetBounds(g).Size;
+
// ReSharper disable CompareOfFloatsByEqualityOperator
if (_BoundingBox.Height == 0)
// ReSharper restore CompareOfFloatsByEqualityOperator
diff --git a/Vocaluxe/Base/ThemeSystem/CTheme.cs b/Vocaluxe/Base/ThemeSystem/CTheme.cs
index 94c9433f..ef37438e 100644
--- a/Vocaluxe/Base/ThemeSystem/CTheme.cs
+++ b/Vocaluxe/Base/ThemeSystem/CTheme.cs
@@ -28,7 +28,7 @@ namespace Vocaluxe.Base.ThemeSystem
abstract class CTheme
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
- private const int _ThemeSystemVersion = 5;
+ private const int _ThemeSystemVersion = 6;
protected STheme _Data;
public String Name
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 7bf7e042..0ec56ba1 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -38,7 +38,7 @@ namespace Vocaluxe.Screens
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
{
- get { return 7; }
+ get { return 8; }
}
private struct STimeRect
diff --git a/VocaluxeLib/Menu/SingNotes/CNoteBars.cs b/VocaluxeLib/Menu/SingNotes/CNoteBars.cs
index ba296f94..fcf52e20 100644
--- a/VocaluxeLib/Menu/SingNotes/CNoteBars.cs
+++ b/VocaluxeLib/Menu/SingNotes/CNoteBars.cs
@@ -32,6 +32,8 @@ namespace VocaluxeLib.Menu.SingNotes
private readonly int _Player;
public readonly SRectF Rect;
private readonly SColorF _Color;
+ private readonly SColorF _NoteLinesColor;
+ private readonly SColorF _NoteBaseColor;
public float Alpha = 1;
private readonly CSongLine[] _Lines;
@@ -61,6 +63,12 @@ namespace VocaluxeLib.Menu.SingNotes
_Color = CBase.Themes.GetPlayerColor(player + 1);
+ if (!CBase.Themes.GetColor("NoteLinesColor", _PartyModeID, out _NoteLinesColor))
+ _NoteLinesColor = new SColorF(Color.Gray, 0.5f);
+
+ if (!CBase.Themes.GetColor("NoteBaseColor", _PartyModeID, out _NoteBaseColor))
+ _NoteBaseColor = new SColorF(Color.White);
+
SPlayer playerData = CBase.Game.GetPlayers()[player];
_Lines = CBase.Game.GetSong().Notes.GetVoice(playerData.VoiceNr).Lines;
_NoteLineHeight = Rect.H / CBase.Settings.GetNumNoteLines();
@@ -88,7 +96,7 @@ namespace VocaluxeLib.Menu.SingNotes
CSongLine line = _Lines[_CurrentLine];
if (CBase.Config.GetDrawNoteLines() == EOffOn.TR_CONFIG_ON)
- _DrawNoteLines(new SColorF(Color.Gray, 0.5f * Alpha));
+ _DrawNoteLines(new SColorF(_NoteLinesColor, _NoteLinesColor.A * Alpha));
float beats = line.LastNoteBeat - line.FirstNoteBeat + 1;
@@ -102,7 +110,7 @@ namespace VocaluxeLib.Menu.SingNotes
SRectF rect = _GetNoteRect(note);
_DrawNoteBG(rect, color);
- _DrawNote(rect, new SColorF(Color.White, 0.7f * Alpha), 0.7f);
+ _DrawNoteBase(rect, new SColorF(_NoteBaseColor, _NoteBaseColor.A * Alpha), 1f);
}
}
@@ -118,9 +126,9 @@ namespace VocaluxeLib.Menu.SingNotes
if (note.EndBeat == CBase.Game.GetRecordedBeat())
rect.W -= (1 - (CBase.Game.GetMidRecordedBeat() - CBase.Game.GetRecordedBeat())) * Rect.W / beats;
- float factor = (note.Hit) ? 0.7f : 0.4f;
+ float factor = (note.Hit) ? 1f : 0.6f;
- _DrawNote(rect, color, factor);
+ _DrawNoteFill(rect, color, factor);
if (note.EndBeat >= CBase.Game.GetRecordedBeat() && note.Hit && note.HitNote.Type == ENoteType.Golden)
{
@@ -186,7 +194,7 @@ namespace VocaluxeLib.Menu.SingNotes
lineRect.H = 1.5f;
for (int i = 0; i < CBase.Settings.GetNumNoteLines(); i++)
{
- lineRect.Y = Rect.Y + Rect.H / CBase.Settings.GetNumNoteLines() * (i + 1);
+ lineRect.Y = (Rect.Y + Rect.H / CBase.Settings.GetNumNoteLines() * (i + 1)) - (lineRect.H / 2);
CBase.Drawing.DrawRect(color, lineRect);
}
}
@@ -221,36 +229,64 @@ namespace VocaluxeLib.Menu.SingNotes
CBase.Drawing.DrawTexture(toneHelper, drawRect, color);
}
- private void _DrawNote(SRectF rect, SColorF color, float factor)
+ private void _DrawNote(SRectF rect, SColorF color, CTextureRef noteBegin, CTextureRef noteMiddle, CTextureRef noteEnd, float factor)
{
if (factor <= 0)
return;
- float dh = (1f - factor) * rect.H / 2;
- float dw = Math.Min(dh, rect.W / 2);
+ //Width-related variables rounded and then floored to prevent 1px gaps in notes
+ rect.X = (float)Math.Round(rect.X);
+ rect.W = (float)Math.Round(rect.W);
+
+ int dh = (int)((1f - factor) * rect.H / 2);
+ int dw = (int)Math.Min(dh, rect.W / 2);
var noteRect = new SRectF(rect.X + dw, rect.Y + dh, rect.W - 2 * dw, rect.H - 2 * dh, rect.Z);
- CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinLeft, _PartyModeID);
- CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinMiddle, _PartyModeID);
- CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinRight, _PartyModeID);
-
//Width of each of the ends (round parts)
//Need 2 of them so use minimum
- float endsW = Math.Min(noteRect.H * noteBegin.OrigAspect, noteRect.W / 2);
+ int endsW = (int)Math.Min(noteRect.H * noteBegin.OrigAspect, noteRect.W / 2);
CBase.Drawing.DrawTexture(noteBegin, new SRectF(noteRect.X, noteRect.Y, endsW, noteRect.H, noteRect.Z), color);
- var middleRect = new SRectF(noteRect.X + endsW, noteRect.Y, noteRect.W - 2 * endsW, noteRect.H, noteRect.Z);
- if (noteRect.W >= 4 * endsW)
- CBase.Drawing.DrawTexture(noteMiddle, middleRect, color);
- else
- CBase.Drawing.DrawTexture(noteMiddle, new SRectF(middleRect.X, middleRect.Y, 2 * endsW, middleRect.H, middleRect.Z), color, middleRect);
+ SRectF middleRect = new SRectF(noteRect.X + endsW, noteRect.Y, noteRect.W - 2 * endsW, noteRect.H, noteRect.Z);
+
+ int midW = (int)Math.Round(noteRect.H * noteMiddle.OrigAspect);
+
+ int midCount = (int)middleRect.W / midW;
+
+ for (int i = 0; i < midCount; ++i)
+ {
+ CBase.Drawing.DrawTexture(noteMiddle, new SRectF(middleRect.X + (i * midW), noteRect.Y, midW, noteRect.H, noteRect.Z), color);
+ }
+
+ SRectF lastMidRect = new SRectF(middleRect.X + midCount * midW, noteRect.Y, middleRect.W - (midCount * midW), noteRect.H, noteRect.Z);
+
+ CBase.Drawing.DrawTexture(noteMiddle, new SRectF(middleRect.X + (midCount * midW), middleRect.Y, midW, middleRect.H, middleRect.Z), color, lastMidRect);
CBase.Drawing.DrawTexture(noteEnd, new SRectF(noteRect.X + noteRect.W - endsW, noteRect.Y, endsW, noteRect.H, noteRect.Z), color);
}
- private void _DrawNoteBG(SRectF noteRect, SColorF color)
+ private void _DrawNoteBase(SRectF rect, SColorF color, float factor)
+ {
+ CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinLeft, _PartyModeID);
+ CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinMiddle, _PartyModeID);
+ CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinRight, _PartyModeID);
+
+ _DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
+ }
+
+ private void _DrawNoteFill(SRectF rect, SColorF color, float factor)
+ {
+
+ CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinFillLeft, _PartyModeID);
+ CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinFillMiddle, _PartyModeID);
+ CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinFillRight, _PartyModeID);
+
+ _DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
+ }
+
+ private void _DrawNoteBG(SRectF rect, SColorF color)
{
const float period = 1500; //[ms]
@@ -262,27 +298,13 @@ namespace VocaluxeLib.Menu.SingNotes
float alpha = (float)(Math.Cos(_Timer.ElapsedMilliseconds / period * Math.PI * 2) + 1) / 4 + 0.5f;
- CTextureRef noteBackgroundBegin = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundLeft, _PartyModeID);
- CTextureRef noteBackgroundMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundMiddle, _PartyModeID);
- CTextureRef noteBackgroundEnd = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundRight, _PartyModeID);
-
- float dx = noteRect.H * noteBackgroundBegin.OrigAspect;
- if (2 * dx > noteRect.W)
- dx = noteRect.W / 2;
-
var col = new SColorF(color, color.A * alpha);
- CBase.Drawing.DrawTexture(noteBackgroundBegin, new SRectF(noteRect.X, noteRect.Y, dx, noteRect.H, noteRect.Z), col);
+ CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundLeft, _PartyModeID);
+ CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundMiddle, _PartyModeID);
+ CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundRight, _PartyModeID);
- if (noteRect.W - 2 * dx >= 2 * dx)
- CBase.Drawing.DrawTexture(noteBackgroundMiddle, new SRectF(noteRect.X + dx, noteRect.Y, noteRect.W - 2 * dx, noteRect.H, noteRect.Z), col);
- else
- {
- CBase.Drawing.DrawTexture(noteBackgroundMiddle, new SRectF(noteRect.X + dx, noteRect.Y, 2 * dx, noteRect.H, noteRect.Z), col,
- new SRectF(noteRect.X + dx, noteRect.Y, noteRect.W - 2 * dx, noteRect.H, noteRect.Z));
- }
-
- CBase.Drawing.DrawTexture(noteBackgroundEnd, new SRectF(noteRect.X + noteRect.W - dx, noteRect.Y, dx, noteRect.H, noteRect.Z), col);
+ _DrawNote(rect, col, noteBegin, noteMiddle, noteEnd, 1f);
}
private void _AddGoldenNote(SRectF noteRect)
diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
index 1f70d996..2f9f7d60 100644
--- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
+++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
@@ -39,6 +39,10 @@ namespace VocaluxeLib.Menu.SingNotes
public string SkinMiddle;
public string SkinRight;
+ public string SkinFillLeft;
+ public string SkinFillMiddle;
+ public string SkinFillRight;
+
public string SkinBackgroundLeft;
public string SkinBackgroundMiddle;
public string SkinBackgroundRight;