diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index e623da57..0a93a7c7 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -50,138 +50,6 @@
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
-
@@ -409,1924 +277,6 @@
TR_SCREENMAIN_NEXT_PLAYER
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 1.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 2.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 3.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 4.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 5.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 6.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 7.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 8.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 9.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- 10.
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_PLAYERNAME
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_NUMPLAYED
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_WON
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_SINGPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
- TR_SCREENMAIN_TABLE_GAMEPOINTS
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-
-
- 0
- 0
- 0
- 0
- 0
-
-
- Left
- Top
-
-
-
-