diff --git a/Output/PartyModes/Challenge/Themes/Default/Default.xml b/Output/PartyModes/Challenge/Themes/Default/Default.xml
index f4299579..52a8859e 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Default.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Default.xml
@@ -3,14 +3,11 @@
   <SkinSystemVersion>4</SkinSystemVersion>
   <Info>
     <Name>Default</Name>
-    <Author>brunzel</Author>
+    <Author>Jiiniasu</Author>
     <VersionMajor>0</VersionMajor>
     <VersionMinor>1</VersionMinor>
   </Info>
-  <Colors>
-  </Colors>
-  <Skins>
-  </Skins>
-  <Videos>
-  </Videos>
+  <Colors />
+  <Skins />
+  <Videos />
 </root>
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
index 64e3adad..97b70135 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
@@ -14,26 +14,26 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -41,13 +41,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_TITLE</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextNumPlayers">
       <X>75</X>
       <Y>105</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -55,13 +55,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMPLAYERS</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextNumMics">
       <X>75</X>
       <Y>165</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -69,13 +69,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMMICS</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextNumRounds">
       <X>75</X>
       <Y>225</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -83,13 +83,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMROUNDS</Text>
     </Text>
-	<Text Name="Text5">
+	<Text Name="TextNumJokers">
       <X>75</X>
       <Y>285</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -97,13 +97,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMJOKERS</Text>
     </Text>
-	<Text Name="Text6">
+	<Text Name="TextRefillJokers">
       <X>75</X>
       <Y>345</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -127,7 +127,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -162,7 +162,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -209,7 +209,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>105</Y>
         <W>40</W>
         <H>40</H>
@@ -219,12 +219,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>9</NumVisible>
@@ -251,7 +251,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>165</Y>
         <W>40</W>
         <H>40</H>
@@ -261,12 +261,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>2</NumVisible>
@@ -293,7 +293,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>225</Y>
         <W>40</W>
         <H>40</H>
@@ -303,12 +303,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>10</NumVisible>
@@ -335,7 +335,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>285</Y>
         <W>40</W>
         <H>40</H>
@@ -345,12 +345,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>10</NumVisible>
@@ -377,7 +377,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>345</Y>
         <W>40</W>
         <H>40</H>
@@ -387,12 +387,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>2</NumVisible>
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index 1c67c701..c8752d0f 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -14,15 +14,15 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
     <Static Name="StaticPopupBG">
@@ -49,13 +49,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -65,11 +65,11 @@
     </Text>
     <Text Name="TextPosition">
       <X>40</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -79,11 +79,11 @@
     </Text>
     <Text Name="TextPlayerName">
       <X>50</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>130</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -93,11 +93,11 @@
     </Text>
     <Text Name="TextNumPlayed">
       <X>260</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -107,11 +107,11 @@
     </Text>
     <Text Name="TextWon">
       <X>340</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -121,11 +121,11 @@
     </Text>
     <Text Name="TextSingPoints">
       <X>490</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -135,11 +135,11 @@
     </Text>
     <Text Name="TextGamePoints">
       <X>590</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -153,7 +153,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -163,11 +163,11 @@
     </Text>
     <Text Name="TextPopupReallyExit">
       <X>640</X>
-      <Y>265</Y>
+      <Y>270</Y>
       <Z>-1.01</Z>
       <H>27</H>
       <MaxW>380</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -177,11 +177,11 @@
     </Text>
     <Text Name="TextRoundNumber">
       <X>660</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -195,7 +195,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -209,7 +209,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -223,7 +223,7 @@
       <Z>0</Z>
       <H>44</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -237,7 +237,7 @@
       <Z>0</Z>
       <H>31</H>
       <MaxW>770</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -251,7 +251,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -310,7 +310,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -345,7 +345,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -380,7 +380,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -415,7 +415,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -441,7 +441,7 @@
       <SkinSelected>ScrollDown</SkinSelected>
       <Rect>
         <X>281</X>
-        <Y>515</Y>
+        <Y>495</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -468,7 +468,7 @@
       <SkinSelected>ScrollUp</SkinSelected>
       <Rect>
         <X>281</X>
-        <Y>94</Y>
+        <Y>110</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -495,7 +495,7 @@
       <SkinSelected>ScrollDown</SkinSelected>
       <Rect>
         <X>954</X>
-        <Y>515</Y>
+        <Y>470</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -522,7 +522,7 @@
       <SkinSelected>ScrollUp</SkinSelected>
       <Rect>
         <X>954</X>
-        <Y>94</Y>
+        <Y>110</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -554,4 +554,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
index 5980e6d3..2ce1d175 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
@@ -14,26 +14,26 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -48,7 +48,7 @@
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>145</X>
-        <Y>625</Y>
+        <Y>600</Y>
         <W>150</W>
         <H>50</H>
         <Z>0</Z>
@@ -57,7 +57,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -83,7 +83,7 @@
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>985</X>
-        <Y>625</Y>
+        <Y>600</Y>
         <W>150</W>
         <H>50</H>
         <Z>0</Z>
@@ -92,7 +92,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -118,7 +118,7 @@
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>565</X>
-        <Y>625</Y>
+        <Y>600</Y>
         <W>150</W>
         <H>50</H>
         <Z>0</Z>
@@ -127,7 +127,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -282,7 +282,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1195</X>
         <Y>105</Y>
         <W>40</W>
         <H>40</H>
@@ -292,12 +292,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>2</NumVisible>
@@ -324,7 +324,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1195</X>
         <Y>210</Y>
         <W>40</W>
         <H>40</H>
@@ -334,12 +334,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>5</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>8</NumVisible>
@@ -349,29 +349,24 @@
   <NameSelections>
     <NameSelection Name="NameSelection">
       <Rect>
-        <X>42</X>
-        <Y>327</Y>
+        <X>95</X>
+        <Y>350</Y>
         <W>1200</W>
         <H>393</H>
         <Z>0</Z>
       </Rect>
       <SkinEmptyTile>CoverTile</SkinEmptyTile>
-      <ColorEmptyTile>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.2</A>
-      </ColorEmptyTile>
+      <ColorEmptyTile Name="EmptyTileColor" />
       <SkinTileSelected>PlayerSelector</SkinTileSelected>
       <Tiles>
         <W>100</W>
         <H>100</H>
         <NumW>10</NumW>
         <NumH>2</NumH>
-        <SpaceW>20.71</SpaceW>
-        <SpaceH>30</SpaceH>
+        <SpaceW>10</SpaceW>
+        <SpaceH>10</SpaceH>
         <Name>
-          <Space>2</Space>
+          <Space>-20</Space>
           <H>17</H>
           <Font>Outline</Font>
           <Style>Bold</Style>
diff --git a/Output/PartyModes/Challenge/Themes/Genius.xml b/Output/PartyModes/Challenge/Themes/Genius.xml
deleted file mode 100644
index 7a551898..00000000
--- a/Output/PartyModes/Challenge/Themes/Genius.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <ThemeSystemVersion>6</ThemeSystemVersion>
-  <Info>
-    <Name>Genius</Name>
-    <Author>Jiiniasu</Author>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </Info>
-</root>
\ No newline at end of file
diff --git a/Output/PartyModes/Challenge/Themes/Genius/Genius.xml b/Output/PartyModes/Challenge/Themes/Genius/Genius.xml
deleted file mode 100644
index 2db98024..00000000
--- a/Output/PartyModes/Challenge/Themes/Genius/Genius.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <SkinSystemVersion>4</SkinSystemVersion>
-  <Info>
-    <Name>Genius</Name>
-    <Author>Jiiniasu</Author>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </Info>
-  <Colors />
-  <Skins />
-  <Videos />
-</root>
\ 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
deleted file mode 100644
index 97b70135..00000000
--- a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeConfig.xml
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenChallengeConfig</ScreenName>
-    <ScreenVersion>3</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_TITLE</Text>
-    </Text>
-    <Text Name="TextNumPlayers">
-      <X>75</X>
-      <Y>105</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMPLAYERS</Text>
-    </Text>
-    <Text Name="TextNumMics">
-      <X>75</X>
-      <Y>165</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMMICS</Text>
-    </Text>
-    <Text Name="TextNumRounds">
-      <X>75</X>
-      <Y>225</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMROUNDS</Text>
-    </Text>
-	<Text Name="TextNumJokers">
-      <X>75</X>
-      <Y>285</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMJOKERS</Text>
-    </Text>
-	<Text Name="TextRefillJokers">
-      <X>75</X>
-      <Y>345</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_REFILLJOKERS</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonNext">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>985</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides>
-    <SelectSlide Name="SelectSlideNumPlayers">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>100</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>9</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideNumMics">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>160</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>165</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>165</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideNumRounds">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>220</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>10</NumVisible>
-    </SelectSlide>
-	<SelectSlide Name="SelectSlideNumJokers">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>280</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>285</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>285</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>10</NumVisible>
-    </SelectSlide>
-	<SelectSlide Name="SelectSlideRefillJokers">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>340</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>345</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>345</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-  </SelectSlides>
-  <SingNotes />
-  <NameSelections />
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
\ 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
deleted file mode 100644
index c8752d0f..00000000
--- a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeMain.xml
+++ /dev/null
@@ -1,557 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenChallengeMain</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticPopupBG">
-      <Skin>PopupBG</Skin>
-      <Color Name="StaticColor" />
-      <Rect>
-        <X>0</X>
-        <Y>0</Y>
-        <W>1280</W>
-        <H>720</H>
-        <Z>-1</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticNextPlayer">
-      <Skin/>
-      <Color Name="Visible" />
-      <Rect>
-        <X>0</X>
-        <Y>0</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TITLE</Text>
-    </Text>
-    <Text Name="TextPosition">
-      <X>40</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_POS</Text>
-    </Text>
-    <Text Name="TextPlayerName">
-      <X>50</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>130</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_PLAYERNAME</Text>
-    </Text>
-    <Text Name="TextNumPlayed">
-      <X>260</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_NUMPLAYED</Text>
-    </Text>
-    <Text Name="TextWon">
-      <X>340</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_WON</Text>
-    </Text>
-    <Text Name="TextSingPoints">
-      <X>490</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_SINGPOINTS</Text>
-    </Text>
-    <Text Name="TextGamePoints">
-      <X>590</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_GAMEPOINTS</Text>
-    </Text>
-    <Text Name="TextNextPlayer">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>100</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextPopupReallyExit">
-      <X>640</X>
-      <Y>270</Y>
-      <Z>-1.01</Z>
-      <H>27</H>
-      <MaxW>380</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_POPUP_REALLYEXIT</Text>
-    </Text>
-    <Text Name="TextRoundNumber">
-      <X>660</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextRoundPlayer">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextRoundScore">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextFinishMessage">
-      <X>640</X>
-      <Y>520</Y>
-      <Z>0</Z>
-      <H>44</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_FINISH</Text>
-    </Text>
-    <Text Name="TextFinishPlayerWin">
-      <X>640</X>
-      <Y>575</Y>
-      <Z>0</Z>
-      <H>31</H>
-      <MaxW>770</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextNextPlayerMessage">
-      <X>640</X>
-      <Y>515</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_NEXT_PLAYER</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonNextRound">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>1030</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT_ROUND</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>100</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonExit">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>100</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_EXIT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPopupYes">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>665</X>
-        <Y>360</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>-1.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_YES</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPopupNo">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>465</X>
-        <Y>360</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>-1.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NO</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPlayerScrollDown">
-      <Skin>ScrollDown</Skin>
-      <SkinSelected>ScrollDown</SkinSelected>
-      <Rect>
-        <X>281</X>
-        <Y>495</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonPlayerScrollUp">
-      <Skin>ScrollUp</Skin>
-      <SkinSelected>ScrollUp</SkinSelected>
-      <Rect>
-        <X>281</X>
-        <Y>110</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonRoundsScrollDown">
-      <Skin>ScrollDown</Skin>
-      <SkinSelected>ScrollDown</SkinSelected>
-      <Rect>
-        <X>954</X>
-        <Y>470</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonRoundsScrollUp">
-      <Skin>ScrollUp</Skin>
-      <SkinSelected>ScrollUp</SkinSelected>
-      <Rect>
-        <X>954</X>
-        <Y>110</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides />
-  <SingNotes />
-  <NameSelections />
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
diff --git a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml
deleted file mode 100644
index 2ce1d175..00000000
--- a/Output/PartyModes/Challenge/Themes/Genius/Screens/PartyScreenChallengeNames.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenChallengeNames</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENNAMES_TITLE</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonNext">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>985</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonRandom">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>565</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_SCREENNAMES_BUTTON_RANDOM</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonIncreaseTeams">
-      <Skin>Plus</Skin>
-      <SkinSelected>Plus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonDecreaseTeams">
-      <Skin>Minus</Skin>
-      <SkinSelected>Minus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonIncreasePlayer">
-      <Skin>Plus</Skin>
-      <SkinSelected>Plus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonDecreasePlayer">
-      <Skin>Minus</Skin>
-      <SkinSelected>Minus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides>
-    <SelectSlide Name="SelectSlideTeams">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>40</X>
-        <Y>100</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>45</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1195</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlidePlayer">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlidePlayer</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>40</X>
-        <Y>160</Y>
-        <W>1200</W>
-        <H>150</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>45</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1195</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>5</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>8</NumVisible>
-    </SelectSlide>
-  </SelectSlides>
-  <SingNotes />
-  <NameSelections>
-    <NameSelection Name="NameSelection">
-      <Rect>
-        <X>95</X>
-        <Y>350</Y>
-        <W>1200</W>
-        <H>393</H>
-        <Z>0</Z>
-      </Rect>
-      <SkinEmptyTile>CoverTile</SkinEmptyTile>
-      <ColorEmptyTile Name="EmptyTileColor" />
-      <SkinTileSelected>PlayerSelector</SkinTileSelected>
-      <Tiles>
-        <W>100</W>
-        <H>100</H>
-        <NumW>10</NumW>
-        <NumH>2</NumH>
-        <SpaceW>10</SpaceW>
-        <SpaceH>10</SpaceH>
-        <Name>
-          <Space>-20</Space>
-          <H>17</H>
-          <Font>Outline</Font>
-          <Style>Bold</Style>
-          <Color Name="TextColor" />
-        </Name>
-      </Tiles>
-    </NameSelection>
-  </NameSelections>
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Default.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Default.xml
index f4299579..52a8859e 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Default.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Default.xml
@@ -3,14 +3,11 @@
   <SkinSystemVersion>4</SkinSystemVersion>
   <Info>
     <Name>Default</Name>
-    <Author>brunzel</Author>
+    <Author>Jiiniasu</Author>
     <VersionMajor>0</VersionMajor>
     <VersionMinor>1</VersionMinor>
   </Info>
-  <Colors>
-  </Colors>
-  <Skins>
-  </Skins>
-  <Videos>
-  </Videos>
+  <Colors />
+  <Skins />
+  <Videos />
 </root>
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
index 021cff22..1ddc136c 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
@@ -14,26 +14,26 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -41,13 +41,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_TITLE</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextNumPlayers">
       <X>75</X>
       <Y>105</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -55,13 +55,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMPLAYERS</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextNumMics">
       <X>75</X>
       <Y>165</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -69,13 +69,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMMICS</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextNumRounds">
       <X>75</X>
       <Y>225</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -83,13 +83,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMROUNDS</Text>
     </Text>
-    <Text Name="Text5">
+	<Text Name="TextNumSongs">
       <X>75</X>
       <Y>285</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -97,13 +97,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMSONGS</Text>
     </Text>
-    <Text Name="Text6">
+	<Text Name="TextSongSource">
       <X>75</X>
       <Y>345</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -127,7 +127,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -162,7 +162,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -209,7 +209,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>105</Y>
         <W>40</W>
         <H>40</H>
@@ -219,12 +219,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>9</NumVisible>
@@ -251,7 +251,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>165</Y>
         <W>40</W>
         <H>40</H>
@@ -261,12 +261,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>2</NumVisible>
@@ -293,7 +293,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>225</Y>
         <W>40</W>
         <H>40</H>
@@ -303,17 +303,17 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>10</NumVisible>
     </SelectSlide>
-    <SelectSlide Name="SelectSlideNumSongs">
+	<SelectSlide Name="SelectSlideNumSongs">
       <Skin/>
       <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
       <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -335,7 +335,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>285</Y>
         <W>40</W>
         <H>40</H>
@@ -345,17 +345,17 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>10</NumVisible>
     </SelectSlide>
-    <SelectSlide Name="SelectSlideSongSource">
+	<SelectSlide Name="SelectSlideSongSource">
       <Skin/>
       <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
       <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -377,7 +377,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>345</Y>
         <W>40</W>
         <H>40</H>
@@ -387,12 +387,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>3</NumVisible>
@@ -419,7 +419,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>405</Y>
         <W>40</W>
         <H>40</H>
@@ -429,7 +429,7 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
@@ -461,7 +461,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>405</Y>
         <W>40</W>
         <H>40</H>
@@ -471,7 +471,7 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
@@ -488,4 +488,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
+</Screen>
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
index c1279d0d..56371aea 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
@@ -14,15 +14,15 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
     <Static Name="StaticPopupBG">
@@ -49,13 +49,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -65,11 +65,11 @@
     </Text>
     <Text Name="TextPosition">
       <X>40</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -79,11 +79,11 @@
     </Text>
     <Text Name="TextPlayerName">
       <X>50</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>130</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -93,11 +93,11 @@
     </Text>
     <Text Name="TextNumPlayed">
       <X>260</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -107,11 +107,11 @@
     </Text>
     <Text Name="TextWon">
       <X>340</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -121,11 +121,11 @@
     </Text>
     <Text Name="TextSingPoints">
       <X>490</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -135,11 +135,11 @@
     </Text>
     <Text Name="TextGamePoints">
       <X>590</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -153,7 +153,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -163,11 +163,11 @@
     </Text>
     <Text Name="TextPopupReallyExit">
       <X>640</X>
-      <Y>265</Y>
+      <Y>270</Y>
       <Z>-1.01</Z>
       <H>27</H>
       <MaxW>380</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -177,11 +177,11 @@
     </Text>
     <Text Name="TextRoundNumber">
       <X>660</X>
-      <Y>102</Y>
+      <Y>135</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -195,7 +195,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -209,7 +209,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -223,7 +223,7 @@
       <Z>0</Z>
       <H>44</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -237,7 +237,7 @@
       <Z>0</Z>
       <H>31</H>
       <MaxW>770</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -251,7 +251,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -275,7 +275,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -310,7 +310,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -345,7 +345,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -380,7 +380,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -415,7 +415,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -441,7 +441,7 @@
       <SkinSelected>ScrollDown</SkinSelected>
       <Rect>
         <X>281</X>
-        <Y>515</Y>
+        <Y>495</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -468,7 +468,7 @@
       <SkinSelected>ScrollUp</SkinSelected>
       <Rect>
         <X>281</X>
-        <Y>94</Y>
+        <Y>110</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -495,7 +495,7 @@
       <SkinSelected>ScrollDown</SkinSelected>
       <Rect>
         <X>954</X>
-        <Y>515</Y>
+        <Y>470</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
@@ -522,7 +522,7 @@
       <SkinSelected>ScrollUp</SkinSelected>
       <Rect>
         <X>954</X>
-        <Y>94</Y>
+        <Y>110</Y>
         <W>28</W>
         <H>15</H>
         <Z>-0.01</Z>
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
index 2292a076..0b00f1de 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
-    <ScreenName>PartyScreenChallengeMedleyNames</ScreenName>
+    <ScreenName>PartyScreenChallengMedleyNames</ScreenName>
     <ScreenVersion>1</ScreenVersion>
   </Informations>
   <Backgrounds>
@@ -14,26 +14,26 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -48,7 +48,7 @@
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>145</X>
-        <Y>625</Y>
+        <Y>600</Y>
         <W>150</W>
         <H>50</H>
         <Z>0</Z>
@@ -57,7 +57,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -83,7 +83,7 @@
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>985</X>
-        <Y>625</Y>
+        <Y>600</Y>
         <W>150</W>
         <H>50</H>
         <Z>0</Z>
@@ -92,7 +92,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -118,7 +118,7 @@
       <SkinSelected>Button</SkinSelected>
       <Rect>
         <X>565</X>
-        <Y>625</Y>
+        <Y>600</Y>
         <W>150</W>
         <H>50</H>
         <Z>0</Z>
@@ -127,7 +127,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -282,7 +282,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1195</X>
         <Y>105</Y>
         <W>40</W>
         <H>40</H>
@@ -292,12 +292,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>2</NumVisible>
@@ -324,7 +324,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1195</X>
         <Y>210</Y>
         <W>40</W>
         <H>40</H>
@@ -334,12 +334,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>5</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>8</NumVisible>
@@ -349,29 +349,24 @@
   <NameSelections>
     <NameSelection Name="NameSelection">
       <Rect>
-        <X>42</X>
-        <Y>327</Y>
+        <X>95</X>
+        <Y>350</Y>
         <W>1200</W>
         <H>393</H>
         <Z>0</Z>
       </Rect>
       <SkinEmptyTile>CoverTile</SkinEmptyTile>
-      <ColorEmptyTile>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.2</A>
-      </ColorEmptyTile>
+      <ColorEmptyTile Name="EmptyTileColor" />
       <SkinTileSelected>PlayerSelector</SkinTileSelected>
       <Tiles>
         <W>100</W>
         <H>100</H>
         <NumW>10</NumW>
         <NumH>2</NumH>
-        <SpaceW>20.71</SpaceW>
-        <SpaceH>30</SpaceH>
+        <SpaceW>10</SpaceW>
+        <SpaceH>10</SpaceH>
         <Name>
-          <Space>2</Space>
+          <Space>-20</Space>
           <H>17</H>
           <Font>Outline</Font>
           <Style>Bold</Style>
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius.xml
deleted file mode 100644
index 7a551898..00000000
--- a/Output/PartyModes/ChallengeMedley/Themes/Genius.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <ThemeSystemVersion>6</ThemeSystemVersion>
-  <Info>
-    <Name>Genius</Name>
-    <Author>Jiiniasu</Author>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </Info>
-</root>
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml b/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml
deleted file mode 100644
index 2db98024..00000000
--- a/Output/PartyModes/ChallengeMedley/Themes/Genius/Genius.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <SkinSystemVersion>4</SkinSystemVersion>
-  <Info>
-    <Name>Genius</Name>
-    <Author>Jiiniasu</Author>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </Info>
-  <Colors />
-  <Skins />
-  <Videos />
-</root>
\ 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
deleted file mode 100644
index 1ddc136c..00000000
--- a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyConfig.xml
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenChallengeMedleyConfig</ScreenName>
-    <ScreenVersion>2</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_TITLE</Text>
-    </Text>
-    <Text Name="TextNumPlayers">
-      <X>75</X>
-      <Y>105</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMPLAYERS</Text>
-    </Text>
-    <Text Name="TextNumMics">
-      <X>75</X>
-      <Y>165</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMMICS</Text>
-    </Text>
-    <Text Name="TextNumRounds">
-      <X>75</X>
-      <Y>225</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMROUNDS</Text>
-    </Text>
-	<Text Name="TextNumSongs">
-      <X>75</X>
-      <Y>285</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMSONGS</Text>
-    </Text>
-	<Text Name="TextSongSource">
-      <X>75</X>
-      <Y>345</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_SONGSOURCE</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonNext">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>985</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides>
-    <SelectSlide Name="SelectSlideNumPlayers">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>100</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>9</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideNumMics">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>160</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>165</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>165</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideNumRounds">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>220</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>10</NumVisible>
-    </SelectSlide>
-	<SelectSlide Name="SelectSlideNumSongs">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>280</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>285</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>285</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>10</NumVisible>
-    </SelectSlide>
-	<SelectSlide Name="SelectSlideSongSource">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>340</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>345</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>345</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>3</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlidePlaylist">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>400</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>405</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>405</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>700</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>1</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideCategory">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>400</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>405</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>405</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>700</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>1</NumVisible>
-    </SelectSlide>
-  </SelectSlides>
-  <SingNotes />
-  <NameSelections />
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
\ 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
deleted file mode 100644
index 56371aea..00000000
--- a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyMain.xml
+++ /dev/null
@@ -1,557 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenChallengeMedleyMain</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticPopupBG">
-      <Skin>PopupBG</Skin>
-      <Color Name="StaticColor" />
-      <Rect>
-        <X>0</X>
-        <Y>0</Y>
-        <W>1280</W>
-        <H>720</H>
-        <Z>-1</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticNextPlayer">
-      <Skin/>
-      <Color Name="Visible" />
-      <Rect>
-        <X>0</X>
-        <Y>0</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TITLE</Text>
-    </Text>
-    <Text Name="TextPosition">
-      <X>40</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_POS</Text>
-    </Text>
-    <Text Name="TextPlayerName">
-      <X>50</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>130</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_PLAYERNAME</Text>
-    </Text>
-    <Text Name="TextNumPlayed">
-      <X>260</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_NUMPLAYED</Text>
-    </Text>
-    <Text Name="TextWon">
-      <X>340</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_WON</Text>
-    </Text>
-    <Text Name="TextSingPoints">
-      <X>490</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_SINGPOINTS</Text>
-    </Text>
-    <Text Name="TextGamePoints">
-      <X>590</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TABLE_GAMEPOINTS</Text>
-    </Text>
-    <Text Name="TextNextPlayer">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>100</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextPopupReallyExit">
-      <X>640</X>
-      <Y>270</Y>
-      <Z>-1.01</Z>
-      <H>27</H>
-      <MaxW>380</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_POPUP_REALLYEXIT</Text>
-    </Text>
-    <Text Name="TextRoundNumber">
-      <X>660</X>
-      <Y>135</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextRoundPlayer">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextRoundScore">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextFinishMessage">
-      <X>640</X>
-      <Y>520</Y>
-      <Z>0</Z>
-      <H>44</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_FINISH</Text>
-    </Text>
-    <Text Name="TextFinishPlayerWin">
-      <X>640</X>
-      <Y>575</Y>
-      <Z>0</Z>
-      <H>31</H>
-      <MaxW>770</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextNextPlayerMessage">
-      <X>640</X>
-      <Y>515</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_NEXT_PLAYER</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonNextRound">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>1030</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT_ROUND</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>100</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonExit">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>100</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_EXIT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPopupYes">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>665</X>
-        <Y>360</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>-1.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_YES</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPopupNo">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>465</X>
-        <Y>360</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>-1.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NO</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPlayerScrollDown">
-      <Skin>ScrollDown</Skin>
-      <SkinSelected>ScrollDown</SkinSelected>
-      <Rect>
-        <X>281</X>
-        <Y>495</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonPlayerScrollUp">
-      <Skin>ScrollUp</Skin>
-      <SkinSelected>ScrollUp</SkinSelected>
-      <Rect>
-        <X>281</X>
-        <Y>110</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonRoundsScrollDown">
-      <Skin>ScrollDown</Skin>
-      <SkinSelected>ScrollDown</SkinSelected>
-      <Rect>
-        <X>954</X>
-        <Y>470</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonRoundsScrollUp">
-      <Skin>ScrollUp</Skin>
-      <SkinSelected>ScrollUp</SkinSelected>
-      <Rect>
-        <X>954</X>
-        <Y>110</Y>
-        <W>28</W>
-        <H>15</H>
-        <Z>-0.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides />
-  <SingNotes />
-  <NameSelections />
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
\ 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
deleted file mode 100644
index 0b00f1de..00000000
--- a/Output/PartyModes/ChallengeMedley/Themes/Genius/Screens/PartyScreenChallengeMedleyNames.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenChallengMedleyNames</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENNAMES_TITLE</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonNext">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>985</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonRandom">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>565</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_SCREENNAMES_BUTTON_RANDOM</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonIncreaseTeams">
-      <Skin>Plus</Skin>
-      <SkinSelected>Plus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonDecreaseTeams">
-      <Skin>Minus</Skin>
-      <SkinSelected>Minus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonIncreasePlayer">
-      <Skin>Plus</Skin>
-      <SkinSelected>Plus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonDecreasePlayer">
-      <Skin>Minus</Skin>
-      <SkinSelected>Minus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides>
-    <SelectSlide Name="SelectSlideTeams">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>40</X>
-        <Y>100</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>45</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1195</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlidePlayer">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlidePlayer</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>40</X>
-        <Y>160</Y>
-        <W>1200</W>
-        <H>150</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>45</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1195</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>5</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>8</NumVisible>
-    </SelectSlide>
-  </SelectSlides>
-  <SingNotes />
-  <NameSelections>
-    <NameSelection Name="NameSelection">
-      <Rect>
-        <X>95</X>
-        <Y>350</Y>
-        <W>1200</W>
-        <H>393</H>
-        <Z>0</Z>
-      </Rect>
-      <SkinEmptyTile>CoverTile</SkinEmptyTile>
-      <ColorEmptyTile Name="EmptyTileColor" />
-      <SkinTileSelected>PlayerSelector</SkinTileSelected>
-      <Tiles>
-        <W>100</W>
-        <H>100</H>
-        <NumW>10</NumW>
-        <NumH>2</NumH>
-        <SpaceW>10</SpaceW>
-        <SpaceH>10</SpaceH>
-        <Name>
-          <Space>-20</Space>
-          <H>17</H>
-          <Font>Outline</Font>
-          <Style>Bold</Style>
-          <Color Name="TextColor" />
-        </Name>
-      </Tiles>
-    </NameSelection>
-  </NameSelections>
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
\ No newline at end of file
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Default.xml b/Output/PartyModes/TicTacToe/Themes/Default/Default.xml
index f4299579..52a8859e 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Default.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Default.xml
@@ -3,14 +3,11 @@
   <SkinSystemVersion>4</SkinSystemVersion>
   <Info>
     <Name>Default</Name>
-    <Author>brunzel</Author>
+    <Author>Jiiniasu</Author>
     <VersionMajor>0</VersionMajor>
     <VersionMinor>1</VersionMinor>
   </Info>
-  <Colors>
-  </Colors>
-  <Skins>
-  </Skins>
-  <Videos>
-  </Videos>
+  <Colors />
+  <Skins />
+  <Videos />
 </root>
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
index bf570d8d..4ac70497 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>PartyScreenTicTacToeConfig</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
+    <ScreenVersion>2</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -14,26 +14,26 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -41,13 +41,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_TITLE</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextNumFields">
       <X>75</X>
       <Y>105</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -55,33 +55,19 @@
       <Font>Outline</Font>
       <Text>TR_SCREENCONFIG_NUMFIELDS</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextRefillJoker">
       <X>75</X>
       <Y>165</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_SONGSOURCE</Text>
-    </Text>
-    <Text Name="Text4">
-      <X>75</X>
-      <Y>285</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_GAMEMODE</Text>
+      <Text>TR_SCREENCONFIG_REFILLJOKER</Text>
     </Text>
   </Texts>
   <Buttons>
@@ -99,7 +85,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -134,7 +120,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -181,7 +167,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>105</Y>
         <W>40</W>
         <H>40</H>
@@ -191,7 +177,7 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
@@ -201,7 +187,7 @@
       <TextStyle>Bold</TextStyle>
       <NumVisible>3</NumVisible>
     </SelectSlide>
-    <SelectSlide Name="SelectSlideSongSource">
+    <SelectSlide Name="SelectSlideRefillJokers">
       <Skin/>
       <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
       <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -223,7 +209,7 @@
         <Z>0</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1170</X>
+        <X>1155</X>
         <Y>165</Y>
         <W>40</W>
         <H>40</H>
@@ -233,7 +219,7 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
@@ -241,133 +227,7 @@
       <TextMaxW>205.33</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
-      <NumVisible>3</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlidePlaylist">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>220</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1170</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>1</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideCategory">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>220</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1170</X>
-        <Y>225</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>1</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideGameMode">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>280</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>285</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1170</X>
-        <Y>285</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>1</NumVisible>
+      <NumVisible>2</NumVisible>
     </SelectSlide>
   </SelectSlides>
   <SingNotes />
@@ -376,4 +236,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
index f4dd7cad..471a2294 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
@@ -14,15 +14,15 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
     <Static Name="StaticPopupBG">
@@ -60,13 +60,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -76,11 +76,11 @@
     </Text>
     <Text Name="TextPopupReallyExit">
       <X>640</X>
-      <Y>265</Y>
+      <Y>270</Y>
       <Z>-2.01</Z>
       <H>27</H>
       <MaxW>380</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -94,7 +94,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -108,7 +108,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -188,7 +188,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -223,7 +223,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -258,7 +258,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -293,7 +293,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -328,7 +328,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -363,7 +363,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -494,4 +494,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
\ No newline at end of file
+</Screen>
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
index 583ea0bc..1e27c09c 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
@@ -14,26 +14,26 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="StaticColor" />
+    <Static Name="StaticMenuBar">
+      <Skin />
+      <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>40</X>
+        <X>0</X>
         <Y>40</Y>
-        <W>1200</W>
-        <H>50</H>
-        <Z>0</Z>
+        <W>1280</W>
+        <H>45</H>
+        <Z>1</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
-      <Y>48</Y>
+      <Y>50</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -57,7 +57,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -92,7 +92,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -127,7 +127,7 @@
       <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>75</X>
-        <Y>10</Y>
+        <Y>12</Y>
         <Z>0</Z>
         <H>27</H>
         <MaxW>142</MaxW>
@@ -206,7 +206,7 @@
       <Skin>Plus</Skin>
       <SkinSelected>Plus</SkinSelected>
       <Rect>
-        <X>1210</X>
+        <X>1180</X>
         <Y>210</Y>
         <W>40</W>
         <H>40</H>
@@ -233,7 +233,7 @@
       <Skin>Minus</Skin>
       <SkinSelected>Minus</SkinSelected>
       <Rect>
-        <X>1160</X>
+        <X>1130</X>
         <Y>210</Y>
         <W>40</W>
         <H>40</H>
@@ -270,7 +270,7 @@
       <Rect>
         <X>40</X>
         <Y>100</Y>
-        <W>1100</W>
+        <W>1055</W>
         <H>50</H>
         <Z>0</Z>
       </Rect>
@@ -292,12 +292,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>2</NumVisible>
@@ -312,7 +312,7 @@
       <Rect>
         <X>40</X>
         <Y>160</Y>
-        <W>1100</W>
+        <W>1055</W>
         <H>150</H>
         <Z>0</Z>
       </Rect>
@@ -334,12 +334,12 @@
       <SelColor Name="SelectSlideSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>5</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
+      <TextMaxW>200</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>8</NumVisible>
@@ -349,29 +349,24 @@
   <NameSelections>
     <NameSelection Name="NameSelection">
       <Rect>
-        <X>42</X>
-        <Y>327</Y>
+        <X>95</X>
+        <Y>350</Y>
         <W>1200</W>
         <H>393</H>
         <Z>0</Z>
       </Rect>
       <SkinEmptyTile>CoverTile</SkinEmptyTile>
-      <ColorEmptyTile>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.2</A>
-      </ColorEmptyTile>
+      <ColorEmptyTile Name="EmptyTileColor" />
       <SkinTileSelected>PlayerSelector</SkinTileSelected>
       <Tiles>
         <W>100</W>
         <H>100</H>
         <NumW>10</NumW>
         <NumH>2</NumH>
-        <SpaceW>20.71</SpaceW>
-        <SpaceH>30</SpaceH>
+        <SpaceW>10</SpaceW>
+        <SpaceH>10</SpaceH>
         <Name>
-          <Space>2</Space>
+          <Space>-20</Space>
           <H>17</H>
           <Font>Outline</Font>
           <Style>Bold</Style>
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeSongs.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml
similarity index 100%
rename from Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeSongs.xml
rename to Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeSongs.xml
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius.xml b/Output/PartyModes/TicTacToe/Themes/Genius.xml
deleted file mode 100644
index 7a551898..00000000
--- a/Output/PartyModes/TicTacToe/Themes/Genius.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <ThemeSystemVersion>6</ThemeSystemVersion>
-  <Info>
-    <Name>Genius</Name>
-    <Author>Jiiniasu</Author>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </Info>
-</root>
\ No newline at end of file
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml
deleted file mode 100644
index e556735e..00000000
--- a/Output/PartyModes/TicTacToe/Themes/Genius/Genius.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <SkinSystemVersion>4</SkinSystemVersion>
-  <Info>
-    <Name>Genius</Name>
-    <Author>Jiiniasu</Author>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </Info>
-  <Colors />
-  <Skins />
-  <Videos />
-</root>
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
deleted file mode 100644
index 4ac70497..00000000
--- a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeConfig.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenTicTacToeConfig</ScreenName>
-    <ScreenVersion>2</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_TITLE</Text>
-    </Text>
-    <Text Name="TextNumFields">
-      <X>75</X>
-      <Y>105</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_NUMFIELDS</Text>
-    </Text>
-    <Text Name="TextRefillJoker">
-      <X>75</X>
-      <Y>165</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENCONFIG_REFILLJOKER</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonNext">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>985</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>600</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides>
-    <SelectSlide Name="SelectSlideNumFields">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>100</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>3</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlideRefillJokers">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>500</X>
-        <Y>160</Y>
-        <W>700</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>505</X>
-        <Y>165</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1155</X>
-        <Y>165</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>205.33</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-  </SelectSlides>
-  <SingNotes />
-  <NameSelections />
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml
deleted file mode 100644
index 471a2294..00000000
--- a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeMain.xml
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenTicTacToeMain</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticPopupBG">
-      <Skin>PopupBG</Skin>
-      <Color Name="StaticColor" />
-      <Rect>
-        <X>0</X>
-        <Y>0</Y>
-        <W>1280</W>
-        <H>720</H>
-        <Z>-2</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticAvatarT1">
-      <Skin>PopupBG</Skin>
-      <Color Name="StaticColor" />
-      <Rect>
-        <X>10</X>
-        <Y>200</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>-1</Z>
-      </Rect>
-    </Static>
-    <Static Name="StaticAvatarT2">
-      <Skin>PopupBG</Skin>
-      <Color Name="StaticColor" />
-      <Rect>
-        <X>1170</X>
-        <Y>200</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>-1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_TITLE</Text>
-    </Text>
-    <Text Name="TextPopupReallyExit">
-      <X>640</X>
-      <Y>270</Y>
-      <Z>-2.01</Z>
-      <H>27</H>
-      <MaxW>380</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_POPUP_REALLYEXIT</Text>
-    </Text>
-    <Text Name="TextTeamChoosing">
-      <X>640</X>
-      <Y>90</Y>
-      <Z>0</Z>
-      <H>35</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextFinishMessage">
-      <X>640</X>
-      <Y>90</Y>
-      <Z>0</Z>
-      <H>35</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextNextPlayerT1">
-      <X>160</X>
-      <Y>150</Y>
-      <Z>0</Z>
-      <H>35</H>
-      <MaxW>0</MaxW>
-      <Color Name="Player1" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_NEXT_PLAYER</Text>
-    </Text>
-    <Text Name="TextNextPlayerT2">
-      <X>1120</X>
-      <Y>150</Y>
-      <Z>0</Z>
-      <H>35</H>
-      <MaxW>0</MaxW>
-      <Color Name="Player2" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENMAIN_NEXT_PLAYER</Text>
-    </Text>
-    <Text Name="TextNextPlayerNameT1">
-      <X>120</X>
-      <Y>230</Y>
-      <Z>0</Z>
-      <H>35</H>
-      <MaxW>0</MaxW>
-      <Color Name="Player1" />
-      <SelColor Name="TextSelColor" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-    <Text Name="TextNextPlayerNameT2">
-      <X>1160</X>
-      <Y>230</Y>
-      <Z>0</Z>
-      <H>40</H>
-      <MaxW>0</MaxW>
-      <Color Name="Player2" />
-      <SelColor Name="TextSelColor" />
-      <Align>Right</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text />
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonNextRound">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>1030</X>
-        <Y>625</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT_ROUND</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>100</X>
-        <Y>625</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonExit">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>100</X>
-        <Y>625</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_EXIT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPopupYes">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>665</X>
-        <Y>360</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>-2.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_YES</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonPopupNo">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>465</X>
-        <Y>360</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>-2.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NO</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonField">
-      <Skin>CoverTile</Skin>
-      <SkinSelected>CoverTile</SkinSelected>
-      <Rect>
-        <X>0</X>
-        <Y>0</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>-1.01</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonJokerRandomT1">
-      <Skin>Random</Skin>
-      <SkinSelected>Random</SkinSelected>
-      <Rect>
-        <X>10</X>
-        <Y>320</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="Player1" ><A>0.5</A></Color>
-      <SelColor Name="Player1" />
-      <Text Name="Text">
-        <X>50</X>
-        <Y>25</Y>
-        <Z>0</Z>
-        <H>50</H>
-        <MaxW>50</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonJokerRandomT2">
-      <Skin>Random</Skin>
-      <SkinSelected>Random</SkinSelected>
-      <Rect>
-        <X>1170</X>
-        <Y>320</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="Player2" ><A>0.5</A></Color>
-      <SelColor Name="Player2" />
-      <Text Name="Text">
-        <X>50</X>
-        <Y>25</Y>
-        <Z>0</Z>
-        <H>50</H>
-        <MaxW>50</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonJokerRetryT1">
-      <Skin>RepeatIcon</Skin>
-      <SkinSelected>RepeatIcon</SkinSelected>
-      <Rect>
-        <X>110</X>
-        <Y>320</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="Player1" ><A>0.5</A></Color>
-      <SelColor Name="Player1" />
-      <Text Name="Text">
-        <X>48</X>
-        <Y>25</Y>
-        <Z>0</Z>
-        <H>50</H>
-        <MaxW>50</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonJokerRetryT2">
-      <Skin>RepeatIcon</Skin>
-      <SkinSelected>RepeatIcon</SkinSelected>
-      <Rect>
-        <X>1070</X>
-        <Y>320</Y>
-        <W>100</W>
-        <H>100</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="Player2" ><A>0.5</A></Color>
-      <SelColor Name="Player2" />
-      <Text Name="Text">
-        <X>48</X>
-        <Y>25</Y>
-        <Z>0</Z>
-        <H>50</H>
-        <MaxW>50</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides />
-  <SingNotes />
-  <NameSelections />
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
diff --git a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml
deleted file mode 100644
index 1e27c09c..00000000
--- a/Output/PartyModes/TicTacToe/Themes/Genius/Screens/PartyScreenTicTacToeNames.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Informations>
-    <ScreenName>PartyScreenTicTacToeNames</ScreenName>
-    <ScreenVersion>1</ScreenVersion>
-  </Informations>
-  <Backgrounds>
-    <Background Name="Background1">
-      <Type>Video</Type>
-      <SlideShowTextures />
-      <Video>BG_Video</Video>
-      <Skin>BG_Default</Skin>
-      <Color Name="BackgroundColor" />
-    </Background>
-  </Backgrounds>
-  <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin />
-      <Color Name="BackgroundColorAlpha" />
-      <Rect>
-        <X>0</X>
-        <Y>40</Y>
-        <W>1280</W>
-        <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="TextTitle">
-      <X>640</X>
-      <Y>50</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="TextColor" />
-      <SelColor Name="TextSelColor" />
-      <Align>Center</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENNAMES_TITLE</Text>
-    </Text>
-  </Texts>
-  <Buttons>
-    <Button Name="ButtonBack">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>625</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_BACK</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonNext">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>985</X>
-        <Y>625</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_BUTTON_NEXT</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonRandom">
-      <Skin>Button</Skin>
-      <SkinSelected>Button</SkinSelected>
-      <Rect>
-        <X>565</X>
-        <Y>625</Y>
-        <W>150</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>12</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text>TR_SCREENNAMES_BUTTON_RANDOM</Text>
-      </Text>
-      <Reflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </Reflection>
-      <SelReflection>
-        <Height>26</Height>
-        <Space>10</Space>
-      </SelReflection>
-    </Button>
-    <Button Name="ButtonIncreaseTeams">
-      <Skin>Plus</Skin>
-      <SkinSelected>Plus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonDecreaseTeams">
-      <Skin>Minus</Skin>
-      <SkinSelected>Minus</SkinSelected>
-      <Rect>
-        <X>145</X>
-        <Y>1200</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonIncreasePlayer">
-      <Skin>Plus</Skin>
-      <SkinSelected>Plus</SkinSelected>
-      <Rect>
-        <X>1180</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-    <Button Name="ButtonDecreasePlayer">
-      <Skin>Minus</Skin>
-      <SkinSelected>Minus</SkinSelected>
-      <Rect>
-        <X>1130</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
-      <Text Name="Text">
-        <X>75</X>
-        <Y>10</Y>
-        <Z>0</Z>
-        <H>27</H>
-        <MaxW>142</MaxW>
-        <Color Name="ButtonTextColor" />
-        <SelColor Name="ButtonTextSelColor" />
-        <Align>Center</Align>
-        <ResizeAlign>Center</ResizeAlign>
-        <Style>Bold</Style>
-        <Font>Outline</Font>
-        <Text />
-      </Text>
-    </Button>
-  </Buttons>
-  <SongMenus />
-  <Lyrics />
-  <SelectSlides>
-    <SelectSlide Name="SelectSlideTeams">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlide</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>40</X>
-        <Y>100</Y>
-        <W>1055</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>45</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1050</X>
-        <Y>105</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>2</NumVisible>
-    </SelectSlide>
-    <SelectSlide Name="SelectSlidePlayer">
-      <Skin/>
-      <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
-      <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
-      <SkinSelected>SelectSlidePlayer</SkinSelected>
-      <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
-      <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
-      <Rect>
-        <X>40</X>
-        <Y>160</Y>
-        <W>1055</W>
-        <H>150</H>
-        <Z>0</Z>
-      </Rect>
-      <RectArrowLeft>
-        <X>45</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowLeft>
-      <RectArrowRight>
-        <X>1050</X>
-        <Y>210</Y>
-        <W>40</W>
-        <H>40</H>
-        <Z>0</Z>
-      </RectArrowRight>
-      <Color Name="SelectSlideColor" />
-      <SelColor Name="SelectSlideSelColor" />
-      <ArrowColor Name="ArrowColor" />
-      <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColorAlpha" />
-      <TextSelColor Name="TextSelColor" />
-      <TextH>27</TextH>
-      <TextRelativeX>50</TextRelativeX>
-      <TextRelativeY>5</TextRelativeY>
-      <TextMaxW>200</TextMaxW>
-      <TextFont>Outline</TextFont>
-      <TextStyle>Bold</TextStyle>
-      <NumVisible>8</NumVisible>
-    </SelectSlide>
-  </SelectSlides>
-  <SingNotes />
-  <NameSelections>
-    <NameSelection Name="NameSelection">
-      <Rect>
-        <X>95</X>
-        <Y>350</Y>
-        <W>1200</W>
-        <H>393</H>
-        <Z>0</Z>
-      </Rect>
-      <SkinEmptyTile>CoverTile</SkinEmptyTile>
-      <ColorEmptyTile Name="EmptyTileColor" />
-      <SkinTileSelected>PlayerSelector</SkinTileSelected>
-      <Tiles>
-        <W>100</W>
-        <H>100</H>
-        <NumW>10</NumW>
-        <NumH>2</NumH>
-        <SpaceW>10</SpaceW>
-        <SpaceH>10</SpaceH>
-        <Name>
-          <Space>-20</Space>
-          <H>17</H>
-          <Font>Outline</Font>
-          <Style>Bold</Style>
-          <Color Name="TextColor" />
-        </Name>
-      </Tiles>
-    </NameSelection>
-  </NameSelections>
-  <Equalizers />
-  <Playlists />
-  <ParticleEffects />
-  <ScreenSettings />
-</Screen>
\ No newline at end of file