diff --git a/Output/Themes/Genius.xml b/Output/Themes/Genius.xml
index dc170ef1..34c6482d 100644
--- a/Output/Themes/Genius.xml
+++ b/Output/Themes/Genius.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <root>
   <ThemeSystemVersion>5</ThemeSystemVersion>
   <Info>
     <Name>Genius</Name>
     <Author>Jiiniasu</Author>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>6</VersionMinor>
+    <VersionMinor>7</VersionMinor>
   </Info>
-    <Cursor>
+  <Cursor>
     <Skin>Cursor</Skin>
-    <W>18</W>
-    <H>20</H>
+    <W>32</W>
+    <H>32</H>
     <Color Name="StaticColor" />
   </Cursor>
 </root>
\ No newline at end of file
diff --git a/Output/Themes/Genius/Standard.xml b/Output/Themes/Genius/01_Standard.xml
similarity index 85%
rename from Output/Themes/Genius/Standard.xml
rename to Output/Themes/Genius/01_Standard.xml
index 378057e9..4760711a 100644
--- a/Output/Themes/Genius/Standard.xml
+++ b/Output/Themes/Genius/01_Standard.xml
@@ -5,7 +5,7 @@
     <Name>Standard</Name>
     <Author>Jiiniasu</Author>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>6</VersionMinor>
+    <VersionMinor>7</VersionMinor>
   </Info>
   <Colors>
     <Player1>
@@ -50,7 +50,7 @@
       <B>0.000</B>
       <A>1.000</A>
     </BackgroundColor>
-	<BackgroundColorAlpha>
+    <BackgroundColorAlpha>
       <R>0.000</R>
       <G>0.000</G>
       <B>0.000</B>
@@ -108,7 +108,7 @@
       <R>0.890</R>
       <G>0.890</G>
       <B>0.890</B>
-      <A>0.500</A>
+      <A>0.600</A>
     </SelectSlideColorAlpha>
     <SelectSlideSelColor>
       <R>0.890</R>
@@ -129,15 +129,21 @@
       <A>1.000</A>
     </ArrowSelColor>
     <TextColor>
-      <R>0.890</R>
-      <G>0.890</G>
-      <B>0.890</B>
-      <A>0.500</A>
+      <R>0.980</R>
+      <G>0.980</G>
+      <B>0.980</B>
+      <A>1.000</A>
     </TextColor>
+    <TextColorAlpha>
+      <R>0.980</R>
+      <G>0.980</G>
+      <B>0.980</B>
+      <A>0.500</A>
+    </TextColorAlpha>
     <TextSelColor>
-      <R>0.890</R>
-      <G>0.890</G>
-      <B>0.890</B>
+      <R>0.980</R>
+      <G>0.980</G>
+      <B>0.980</B>
       <A>1.000</A>
     </TextSelColor>
     <TextWarningColor>
@@ -176,6 +182,12 @@
       <B>0.792</B>
       <A>1.000</A>
     </LyricProcessedColor>
+    <LyricProcessedColorDuet>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>1.000</A>
+    </LyricProcessedColorDuet>
     <LyricMainColor>
       <R>1.000</R>
       <G>1.000</G>
@@ -186,7 +198,7 @@
       <R>0.600</R>
       <G>0.600</G>
       <B>0.600</B>
-      <A>0.400</A>
+      <A>0.500</A>
     </LyricSubColor>
     <LyricHelper>
       <R>0.000</R>
@@ -194,6 +206,12 @@
       <B>0.792</B>
       <A>0.500</A>
     </LyricHelper>
+    <LyricHelperDuet>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>0.500</A>
+    </LyricHelperDuet>
     <TimeBar>
       <R>0.950</R>
       <G>0.950</G>
@@ -206,6 +224,30 @@
       <B>0.950</B>
       <A>0.850</A>
     </TimeBarSentence>
+    <TimePointerColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.850</A>
+    </TimePointerColor>
+    <EmptyTileColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.200</A>
+    </EmptyTileColor>
+    <StaticAvatarColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.500</A>
+    </StaticAvatarColor>
+    <TextNameColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.500</A>
+    </TextNameColor>
   </Colors>
   <Skins>
     <BG_Default>BG_Default.png</BG_Default>
@@ -266,6 +308,7 @@
     <SongSelectButton>SongSelectButton.png</SongSelectButton>
     <Warning>Warning.png</Warning>
     <PlayerSelBG>PlayerSelBG.png</PlayerSelBG>
+    <CalibrationBG>CalibrationBG.png</CalibrationBG>
   </Skins>
   <Videos>
     <BG_Video>BG_Video.mp4</BG_Video>
diff --git a/Output/Themes/Genius/02_Ice_Blue.xml b/Output/Themes/Genius/02_Ice_Blue.xml
new file mode 100644
index 00000000..4e5e6a87
--- /dev/null
+++ b/Output/Themes/Genius/02_Ice_Blue.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <SkinSystemVersion>4</SkinSystemVersion>
+  <Info>
+    <Name>Ice Blue</Name>
+    <Author>Jiiniasu</Author>
+    <VersionMajor>0</VersionMajor>
+    <VersionMinor>7</VersionMinor>
+  </Info>
+  <Colors>
+    <Player1>
+      <R>0.000</R>
+      <G>0.580</G>
+      <B>0.792</B>
+      <A>1.000</A>
+    </Player1>
+    <Player2>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>1.000</A>
+    </Player2>
+    <Player3>
+      <R>0.000</R>
+      <G>0.659</G>
+      <B>0.533</B>
+      <A>1.000</A>
+    </Player3>
+    <Player4>
+      <R>0.757</R>
+      <G>0.160</G>
+      <B>0.725</B>
+      <A>1.000</A>
+    </Player4>
+    <Player5>
+      <R>1.000</R>
+      <G>0.870</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </Player5>
+    <Player6>
+      <R>1.00</R>
+      <G>0.322</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </Player6>
+    <BackgroundColor>
+      <R>0.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </BackgroundColor>
+    <BackgroundColorAlpha>
+      <R>0.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>0.500</A>
+    </BackgroundColorAlpha>
+    <StaticColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>1.000</A>
+    </StaticColor>
+    <StaticColorAlpha>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.500</A>
+    </StaticColorAlpha>
+    <StaticWarningColor>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>0.600</A>
+    </StaticWarningColor>
+    <ButtonColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.300</A>
+    </ButtonColor>
+    <ButtonSelColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>1.000</A>
+    </ButtonSelColor>
+    <ButtonTextColor>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>0.600</A>
+    </ButtonTextColor>
+    <ButtonTextSelColor>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>1.000</A>
+    </ButtonTextSelColor>
+    <SelectSlideColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.500</A>
+    </SelectSlideColor>
+    <SelectSlideColorAlpha>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.500</A>
+    </SelectSlideColorAlpha>
+    <SelectSlideSelColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>1.000</A>
+    </SelectSlideSelColor>
+    <ArrowColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.300</A>
+    </ArrowColor>
+    <ArrowSelColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>1.000</A>
+    </ArrowSelColor>
+    <TextColor>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>1.000</A>
+    </TextColor>
+    <TextColorAlpha>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>0.600</A>
+    </TextColorAlpha>
+    <TextSelColor>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>1.000</A>
+    </TextSelColor>
+    <TextWarningColor>
+      <R>1.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </TextWarningColor>
+    <Black>
+      <R>0.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </Black>
+    <White>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>1.000</A>
+    </White>
+    <Visible>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>1.000</A>
+    </Visible>
+    <Invisible>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.000</A>
+    </Invisible>
+    <LyricProcessedColor>
+      <R>0.000</R>
+      <G>0.580</G>
+      <B>0.792</B>
+      <A>1.000</A>
+    </LyricProcessedColor>
+    <LyricProcessedColorDuet>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>1.000</A>
+    </LyricProcessedColorDuet>
+    <LyricMainColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.800</A>
+    </LyricMainColor>
+    <LyricSubColor>
+      <R>0.600</R>
+      <G>0.600</G>
+      <B>0.600</B>
+      <A>0.500</A>
+    </LyricSubColor>
+    <LyricHelper>
+      <R>0.000</R>
+      <G>0.580</G>
+      <B>0.792</B>
+      <A>0.500</A>
+    </LyricHelper>
+    <LyricHelperDuet>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>0.500</A>
+    </LyricHelperDuet>
+    <TimeBar>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>0.500</A>
+    </TimeBar>
+    <TimeBarSentence>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.850</A>
+    </TimeBarSentence>
+    <TimePointerColor>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>0.850</A>
+    </TimePointerColor>
+    <EmptyTileColor>
+      <R>0.647</R>
+      <G>0.949</G>
+      <B>0.953</B>
+      <A>0.200</A>
+    </EmptyTileColor>
+    <StaticAvatarColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.500</A>
+    </StaticAvatarColor>
+    <TextNameColor>
+      <R>0.855</R>
+      <G>0.937</G>
+      <B>0.945</B>
+      <A>0.500</A>
+    </TextNameColor>
+  </Colors>
+  <Skins>
+    <BG_Default>BG_Default.png</BG_Default>
+    <BG_Options>BG_Default.png</BG_Options>
+    <BG_Loading>BG_Loading.png</BG_Loading>
+    <Menu>SongMenu.png</Menu>
+    <Button>Button.png</Button>
+    <CoverTile>CoverTile.png</CoverTile>
+    <CoverTextBackground>CoverTextBackground.png</CoverTextBackground>
+    <Cursor>Cursor.png</Cursor>
+    <TimeBar>TimeBar.png</TimeBar>
+    <TimeLine>TimeLine.png</TimeLine>
+    <Pointer>Pointer.png</Pointer>
+    <SelectSlide>SelectSlide.png</SelectSlide>
+    <SelectSlidePlayer>SelectSlidePlayer.png</SelectSlidePlayer>
+    <SelectSlideArrowLeft>SelectSlideArrowLeft.png</SelectSlideArrowLeft>
+    <SelectSlideArrowRight>SelectSlideArrowRight.png</SelectSlideArrowRight>
+    <NoteLeft>NotesLeft.png</NoteLeft>
+    <NoteMiddle>NotesMid.png</NoteMiddle>
+    <NoteRight>NotesRight.png</NoteRight>
+    <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
+    <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
+    <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <PointsBar>PointsBar.png</PointsBar>
+    <PointsBarBG>PointsBarBG.png</PointsBarBG>
+    <LyricHelper>LyricHelper.png</LyricHelper>
+    <ToneHelper>ToneHelper.png</ToneHelper>
+    <Score>Score.png</Score>
+    <Star>Star.png</Star>
+    <SongMenu>SongMenu.png</SongMenu>
+    <PauseBG>Pause.png</PauseBG>
+    <EnergyBeam>EnergyBeam.png</EnergyBeam>
+    <SearchBar>SearchBar.png</SearchBar>
+    <PlaylistBG>PlaylistBG.png</PlaylistBG>
+    <DuetIcon>DuetIcon.png</DuetIcon>
+    <VideoIcon>VideoIcon.png</VideoIcon>
+    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
+    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
+    <PlayerSelector>PlayerSelector.png</PlayerSelector>
+    <PreviousIcon>PreviousIcon.png</PreviousIcon>
+    <NextIcon>NextIcon.png</NextIcon>
+    <PlayIcon>PlayIcon.png</PlayIcon>
+    <PauseIcon>PauseIcon.png</PauseIcon>
+    <RepeatIcon>RepeatIcon.png</RepeatIcon>
+    <CloseIcon>Close.png</CloseIcon>
+    <DeleteIcon>DeleteIcon.png</DeleteIcon>
+    <SaveIcon>SaveIcon.png</SaveIcon>
+    <SingIcon>SingIcon.png</SingIcon>
+    <Minus>MinusIcon.png</Minus>
+    <Plus>PlusIcon.png</Plus>
+    <VolUp>VolUp.png</VolUp>
+    <VolDown>VolDown.png</VolDown>
+    <Random>RandomIcon.png</Random>
+    <PopupBG>PopupBG.png</PopupBG>
+    <ScrollUp>ScrollUp.png</ScrollUp>
+    <ScrollDown>ScrollDown.png</ScrollDown>
+    <VocaluxeLogo>VocaluxeLogo.png</VocaluxeLogo>
+    <SongSelectButton>SongSelectButton.png</SongSelectButton>
+    <Warning>Warning.png</Warning>
+    <PlayerSelBG>PlayerSelBG.png</PlayerSelBG>
+    <CalibrationBG>CalibrationBG.png</CalibrationBG>
+  </Skins>
+  <Videos>
+    <BG_Video>BG_Video.mp4</BG_Video>
+    <IntroIn>Introin.mp4</IntroIn>
+    <IntroMid>IntroMid.mp4</IntroMid>
+    <IntroOut>IntroOut.mp4</IntroOut>
+  </Videos>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Genius/03_Crimson_Red.xml b/Output/Themes/Genius/03_Crimson_Red.xml
new file mode 100644
index 00000000..46b46294
--- /dev/null
+++ b/Output/Themes/Genius/03_Crimson_Red.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <SkinSystemVersion>4</SkinSystemVersion>
+  <Info>
+    <Name>Crimson Red</Name>
+    <Author>Jiiniasu</Author>
+    <VersionMajor>0</VersionMajor>
+    <VersionMinor>7</VersionMinor>
+  </Info>
+  <Colors>
+    <Player1>
+      <R>0.000</R>
+      <G>0.580</G>
+      <B>0.792</B>
+      <A>1.000</A>
+    </Player1>
+    <Player2>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>1.000</A>
+    </Player2>
+    <Player3>
+      <R>0.000</R>
+      <G>0.659</G>
+      <B>0.533</B>
+      <A>1.000</A>
+    </Player3>
+    <Player4>
+      <R>0.757</R>
+      <G>0.160</G>
+      <B>0.725</B>
+      <A>1.000</A>
+    </Player4>
+    <Player5>
+      <R>1.000</R>
+      <G>0.870</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </Player5>
+    <Player6>
+      <R>1.00</R>
+      <G>0.322</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </Player6>
+    <BackgroundColor>
+      <R>0.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </BackgroundColor>
+    <BackgroundColorAlpha>
+      <R>0.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>0.500</A>
+    </BackgroundColorAlpha>
+    <StaticColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>1.000</A>
+    </StaticColor>
+    <StaticColorAlpha>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>0.500</A>
+    </StaticColorAlpha>
+    <StaticWarningColor>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>0.600</A>
+    </StaticWarningColor>
+    <ButtonColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>0.300</A>
+    </ButtonColor>
+    <ButtonSelColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>1.000</A>
+    </ButtonSelColor>
+    <ButtonTextColor>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>0.600</A>
+    </ButtonTextColor>
+    <ButtonTextSelColor>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>1.000</A>
+    </ButtonTextSelColor>
+    <SelectSlideColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>0.500</A>
+    </SelectSlideColor>
+    <SelectSlideColorAlpha>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>0.500</A>
+    </SelectSlideColorAlpha>
+    <SelectSlideSelColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>1.000</A>
+    </SelectSlideSelColor>
+    <ArrowColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>0.300</A>
+    </ArrowColor>
+    <ArrowSelColor>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>1.000</A>
+    </ArrowSelColor>
+    <TextColor>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>1.000</A>
+    </TextColor>
+    <TextColorAlpha>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>0.600</A>
+    </TextColorAlpha>
+    <TextSelColor>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>1.000</A>
+    </TextSelColor>
+    <TextWarningColor>
+      <R>1.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </TextWarningColor>
+    <Black>
+      <R>0.000</R>
+      <G>0.000</G>
+      <B>0.000</B>
+      <A>1.000</A>
+    </Black>
+    <White>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>1.000</A>
+    </White>
+    <Visible>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>1.000</A>
+    </Visible>
+    <Invisible>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.000</A>
+    </Invisible>
+    <LyricProcessedColor>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>1.000</A>
+    </LyricProcessedColor>
+    <LyricProcessedColorDuet>
+      <R>0.000</R>
+      <G>0.580</G>
+      <B>0.792</B>
+      <A>1.000</A>
+    </LyricProcessedColorDuet>
+    <LyricMainColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.800</A>
+    </LyricMainColor>
+    <LyricSubColor>
+      <R>0.600</R>
+      <G>0.600</G>
+      <B>0.600</B>
+      <A>0.500</A>
+    </LyricSubColor>
+    <LyricHelper>
+      <R>0.882</R>
+      <G>0.149</G>
+      <B>0.110</B>
+      <A>0.500</A>
+    </LyricHelper>
+    <LyricHelperDuet>
+      <R>0.000</R>
+      <G>0.580</G>
+      <B>0.792</B>
+      <A>0.500</A>
+    </LyricHelperDuet>
+    <TimeBar>
+      <R>0.950</R>
+      <G>0.950</G>
+      <B>0.950</B>
+      <A>0.500</A>
+    </TimeBar>
+    <TimeBarSentence>
+      <R>0.690</R>
+      <G>0.203</G>
+      <B>0.302</B>
+      <A>0.850</A>
+    </TimeBarSentence>
+    <TimePointerColor>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>0.850</A>
+    </TimePointerColor>
+    <EmptyTileColor>
+      <R>0.678</R>
+      <G>0.110</G>
+      <B>0.259</B>
+      <A>0.200</A>
+    </EmptyTileColor>
+    <StaticAvatarColor>
+      <R>1.000</R>
+      <G>1.000</G>
+      <B>1.000</B>
+      <A>0.500</A>
+    </StaticAvatarColor>
+    <TextNameColor>
+      <R>0.988</R>
+      <G>0.682</G>
+      <B>0.733</B>
+      <A>0.500</A>
+    </TextNameColor>
+  </Colors>
+  <Skins>
+    <BG_Default>BG_Default.png</BG_Default>
+    <BG_Options>BG_Default.png</BG_Options>
+    <BG_Loading>BG_Loading.png</BG_Loading>
+    <Menu>SongMenu.png</Menu>
+    <Button>Button.png</Button>
+    <CoverTile>CoverTile.png</CoverTile>
+    <CoverTextBackground>CoverTextBackground.png</CoverTextBackground>
+    <Cursor>Cursor.png</Cursor>
+    <TimeBar>TimeBar.png</TimeBar>
+    <TimeLine>TimeLine.png</TimeLine>
+    <Pointer>Pointer.png</Pointer>
+    <SelectSlide>SelectSlide.png</SelectSlide>
+    <SelectSlidePlayer>SelectSlidePlayer.png</SelectSlidePlayer>
+    <SelectSlideArrowLeft>SelectSlideArrowLeft.png</SelectSlideArrowLeft>
+    <SelectSlideArrowRight>SelectSlideArrowRight.png</SelectSlideArrowRight>
+    <NoteLeft>NotesLeft.png</NoteLeft>
+    <NoteMiddle>NotesMid.png</NoteMiddle>
+    <NoteRight>NotesRight.png</NoteRight>
+    <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
+    <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
+    <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <PointsBar>PointsBar.png</PointsBar>
+    <PointsBarBG>PointsBarBG.png</PointsBarBG>
+    <LyricHelper>LyricHelper.png</LyricHelper>
+    <ToneHelper>ToneHelper.png</ToneHelper>
+    <Score>Score.png</Score>
+    <Star>Star.png</Star>
+    <SongMenu>SongMenu.png</SongMenu>
+    <PauseBG>Pause.png</PauseBG>
+    <EnergyBeam>EnergyBeam.png</EnergyBeam>
+    <SearchBar>SearchBar.png</SearchBar>
+    <PlaylistBG>PlaylistBG.png</PlaylistBG>
+    <DuetIcon>DuetIcon.png</DuetIcon>
+    <VideoIcon>VideoIcon.png</VideoIcon>
+    <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
+    <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
+    <PlayerSelector>PlayerSelector.png</PlayerSelector>
+    <PreviousIcon>PreviousIcon.png</PreviousIcon>
+    <NextIcon>NextIcon.png</NextIcon>
+    <PlayIcon>PlayIcon.png</PlayIcon>
+    <PauseIcon>PauseIcon.png</PauseIcon>
+    <RepeatIcon>RepeatIcon.png</RepeatIcon>
+    <CloseIcon>Close.png</CloseIcon>
+    <DeleteIcon>DeleteIcon.png</DeleteIcon>
+    <SaveIcon>SaveIcon.png</SaveIcon>
+    <SingIcon>SingIcon.png</SingIcon>
+    <Minus>MinusIcon.png</Minus>
+    <Plus>PlusIcon.png</Plus>
+    <VolUp>VolUp.png</VolUp>
+    <VolDown>VolDown.png</VolDown>
+    <Random>RandomIcon.png</Random>
+    <PopupBG>PopupBG.png</PopupBG>
+    <ScrollUp>ScrollUp.png</ScrollUp>
+    <ScrollDown>ScrollDown.png</ScrollDown>
+    <VocaluxeLogo>VocaluxeLogo.png</VocaluxeLogo>
+    <SongSelectButton>SongSelectButton.png</SongSelectButton>
+    <Warning>Warning.png</Warning>
+    <PlayerSelBG>PlayerSelBG.png</PlayerSelBG>
+    <CalibrationBG>CalibrationBG.png</CalibrationBG>
+  </Skins>
+  <Videos>
+    <BG_Video>BG_Video.mp4</BG_Video>
+    <IntroIn>Introin.mp4</IntroIn>
+    <IntroMid>IntroMid.mp4</IntroMid>
+    <IntroOut>IntroOut.mp4</IntroOut>
+  </Videos>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Genius/CalibrationBG.png b/Output/Themes/Genius/CalibrationBG.png
new file mode 100644
index 00000000..cc95bda2
Binary files /dev/null and b/Output/Themes/Genius/CalibrationBG.png differ
diff --git a/Output/Themes/Genius/Cursor.png b/Output/Themes/Genius/Cursor.png
index f29af846..55069a35 100644
Binary files a/Output/Themes/Genius/Cursor.png and b/Output/Themes/Genius/Cursor.png differ
diff --git a/Output/Themes/Genius/Pause.png b/Output/Themes/Genius/Pause.png
index 70799d14..2ea49e27 100644
Binary files a/Output/Themes/Genius/Pause.png and b/Output/Themes/Genius/Pause.png differ
diff --git a/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml
index c72c04db..1e40bbd6 100644
--- a/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml
+++ b/Output/Themes/Genius/Screens/PopupScreenPlayerControl.xml
@@ -36,7 +36,7 @@
       <Z>-2</Z>
       <H>27</H>
       <MaxW>769</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -165,7 +165,7 @@
         <Z>-2</Z>
       </Rect>
       <Color Name="ButtonColor" />
-      <SelColor Name="Player1" />
+      <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>405</X>
         <Y>25</Y>
@@ -246,7 +246,7 @@
         <Z>-2</Z>
       </Rect>
       <Color Name="ButtonColor" />
-      <SelColor Name="Player1" />
+      <SelColor Name="ButtonSelColor" />
       <Text Name="Text">
         <X>315</X>
         <Y>0</Y>
diff --git a/Output/Themes/Genius/Screens/PopupScreenServerQR.xml b/Output/Themes/Genius/Screens/PopupScreenServerQR.xml
index 8eb95f46..273c4d26 100644
--- a/Output/Themes/Genius/Screens/PopupScreenServerQR.xml
+++ b/Output/Themes/Genius/Screens/PopupScreenServerQR.xml
@@ -6,7 +6,7 @@
   </Informations>
   <Backgrounds />
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticBG">
       <Skin />
       <Color >
         <R>0</R>
@@ -41,7 +41,7 @@
       <Z>-2</Z>
       <H>35</H>
       <MaxW>300</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -55,7 +55,7 @@
       <Z>-2</Z>
       <H>35</H>
       <MaxW>300</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -69,7 +69,7 @@
       <Z>-2</Z>
       <H>45</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
diff --git a/Output/Themes/Genius/Screens/PopupScreenVolumeControl.xml b/Output/Themes/Genius/Screens/PopupScreenVolumeControl.xml
index c60270d2..c158f5d0 100644
--- a/Output/Themes/Genius/Screens/PopupScreenVolumeControl.xml
+++ b/Output/Themes/Genius/Screens/PopupScreenVolumeControl.xml
@@ -10,9 +10,9 @@
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>1140</X>
+        <X>1170</X>
         <Y>680</Y>
-        <W>160</W>
+        <W>110</W>
         <H>40</H>
         <Z>-2</Z>
       </Rect>
@@ -39,28 +39,28 @@
   <Lyrics />
   <SelectSlides>
     <SelectSlide Name="SelectSlideVolume">
-      <Skin/>
+      <Skin />
       <SkinArrowLeft>VolDown</SkinArrowLeft>
       <SkinArrowRight>VolUp</SkinArrowRight>
       <SkinSelected />
       <SkinArrowLeftSelected>VolDown</SkinArrowLeftSelected>
       <SkinArrowRightSelected>VolUp</SkinArrowRightSelected>
       <Rect>
-        <X>1190</X>
+        <X>1170</X>
         <Y>685</Y>
-        <W>40</W>
+        <W>110</W>
         <H>30</H>
         <Z>-2</Z>
       </Rect>
       <RectArrowLeft>
-        <X>1155</X>
+        <X>1175</X>
         <Y>685</Y>
         <W>30</W>
         <H>30</H>
         <Z>-2</Z>
       </RectArrowLeft>
       <RectArrowRight>
-        <X>1235</X>
+        <X>1245</X>
         <Y>685</Y>
         <W>30</W>
         <H>30</H>
@@ -71,9 +71,9 @@
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
       <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
+      <TextSelColor Name="TextColor" />
       <TextH>27</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>40</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>40</TextMaxW>
       <TextFont>Outline</TextFont>
diff --git a/Output/Themes/Genius/Screens/ScreenHighscore.xml b/Output/Themes/Genius/Screens/ScreenHighscore.xml
index 1c30433f..01e77a75 100644
--- a/Output/Themes/Genius/Screens/ScreenHighscore.xml
+++ b/Output/Themes/Genius/Screens/ScreenHighscore.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -27,14 +27,14 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>60</X>
       <Y>50</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
-      <SelColor Name="StaticColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -47,8 +47,8 @@
       <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
-      <SelColor Name="StaticColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -61,8 +61,8 @@
       <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
-      <SelColor Name="StaticColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -75,7 +75,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -89,7 +89,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -103,7 +103,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -117,7 +117,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -131,7 +131,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -145,7 +145,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -159,7 +159,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -173,7 +173,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -187,7 +187,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -201,7 +201,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -215,7 +215,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -229,7 +229,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -243,7 +243,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -257,7 +257,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -271,7 +271,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -285,7 +285,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -299,7 +299,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -313,7 +313,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -327,7 +327,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -341,7 +341,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -355,7 +355,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -369,7 +369,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -383,7 +383,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -397,7 +397,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -411,7 +411,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -425,7 +425,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -439,7 +439,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -453,7 +453,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -467,7 +467,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -481,7 +481,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -495,7 +495,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -509,7 +509,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -523,7 +523,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -537,7 +537,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -551,7 +551,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -565,7 +565,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -579,7 +579,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -593,7 +593,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -607,7 +607,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -621,7 +621,7 @@
       <Z>0</Z>
       <H>35</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
diff --git a/Output/Themes/Genius/Screens/ScreenLoad.xml b/Output/Themes/Genius/Screens/ScreenLoad.xml
index 1e0a2f3d..7082b90b 100644
--- a/Output/Themes/Genius/Screens/ScreenLoad.xml
+++ b/Output/Themes/Genius/Screens/ScreenLoad.xml
@@ -15,13 +15,13 @@
   </Backgrounds>
   <Statics />
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextLoading">
       <X>640</X>
       <Y>375</Y>
       <Z>0</Z>
       <H>40</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -35,7 +35,7 @@
       <Z>0</Z>
       <H>20</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
diff --git a/Output/Themes/Genius/Screens/ScreenMain.xml b/Output/Themes/Genius/Screens/ScreenMain.xml
index a1fd697b..716fe674 100644
--- a/Output/Themes/Genius/Screens/ScreenMain.xml
+++ b/Output/Themes/Genius/Screens/ScreenMain.xml
@@ -14,17 +14,6 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="StaticMenuBar">
-      <Skin>Menu</Skin>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>49</X>
-        <Y>32</Y>
-        <W>1181</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
     <Static Name="StaticWarningProfiles">
       <Skin>Warning</Skin>
       <Color Name="StaticWarningColor" />
diff --git a/Output/Themes/Genius/Screens/ScreenNames.xml b/Output/Themes/Genius/Screens/ScreenNames.xml
index 252f6387..e84af600 100644
--- a/Output/Themes/Genius/Screens/ScreenNames.xml
+++ b/Output/Themes/Genius/Screens/ScreenNames.xml
@@ -191,7 +191,7 @@
       <Z>-3</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -237,8 +237,8 @@
       <Z>-4</Z>
       <H>20</H>
       <MaxW>205</MaxW>
-      <Color Name="TextSelColor" />
-      <SelColor Name="TextSelColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -251,8 +251,8 @@
       <Z>-4</Z>
       <H>20</H>
       <MaxW>205</MaxW>
-      <Color Name="TextSelColor" />
-      <SelColor Name="TextSelColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -265,8 +265,8 @@
       <Z>-4</Z>
       <H>20</H>
       <MaxW>205</MaxW>
-      <Color Name="TextSelColor" />
-      <SelColor Name="TextSelColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -279,8 +279,8 @@
       <Z>-4</Z>
       <H>20</H>
       <MaxW>205</MaxW>
-      <Color Name="TextSelColor" />
-      <SelColor Name="TextSelColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -293,8 +293,8 @@
       <Z>-4</Z>
       <H>20</H>
       <MaxW>205</MaxW>
-      <Color Name="TextSelColor" />
-      <SelColor Name="TextSelColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -307,8 +307,8 @@
       <Z>-4</Z>
       <H>20</H>
       <MaxW>205</MaxW>
-      <Color Name="TextSelColor" />
-      <SelColor Name="TextSelColor" />
+      <Color Name="TextColor" />
+      <SelColor Name="TextColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
@@ -424,9 +424,9 @@
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
       <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
+      <TextSelColor Name="TextColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>186</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -468,7 +468,7 @@
       <TextColor Name="TextColor" />
       <TextSelColor Name="TextSelColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>145</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -510,7 +510,7 @@
       <TextColor Name="TextColor" />
       <TextSelColor Name="TextSelColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>145</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -552,7 +552,7 @@
       <TextColor Name="TextColor" />
       <TextSelColor Name="TextSelColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>145</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -594,7 +594,7 @@
       <TextColor Name="TextColor" />
       <TextSelColor Name="TextSelColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>145</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -636,7 +636,7 @@
       <TextColor Name="TextColor" />
       <TextSelColor Name="TextSelColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>145</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -678,7 +678,7 @@
       <TextColor Name="TextColor" />
       <TextSelColor Name="TextSelColor" />
       <TextH>20</TextH>
-      <TextRelativeX>0</TextRelativeX>
+      <TextRelativeX>30</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
       <TextMaxW>145</TextMaxW>
       <TextFont>Outline</TextFont>
@@ -697,12 +697,7 @@
         <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>
@@ -716,7 +711,7 @@
           <H>17</H>
           <Font>Outline</Font>
           <Style>Bold</Style>
-          <Color Name="TextSelColor" />
+          <Color Name="TextColor" />
         </Name>
       </Tiles>
     </NameSelection>
@@ -735,8 +730,12 @@
       <Space>2</Space>
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
-      <Color Name="Player1"><A>0.2</A></Color>
-      <MaxColor Name="Player1"><A>0.4</A></MaxColor>
+      <Color Name="Player1">
+        <A>0.2</A>
+      </Color>
+      <MaxColor Name="Player1">
+        <A>0.4</A>
+      </MaxColor>
     </Equalizer>
     <Equalizer Name="EqualizerPlayer2">
       <Skin/>
@@ -751,8 +750,12 @@
       <Space>2</Space>
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
-      <Color Name="Player2"><A>0.2</A></Color>
-      <MaxColor Name="Player2"><A>0.4</A></MaxColor>
+      <Color Name="Player2">
+        <A>0.2</A>
+      </Color>
+      <MaxColor Name="Player2">
+        <A>0.4</A>
+      </MaxColor>
     </Equalizer>
     <Equalizer Name="EqualizerPlayer3">
       <Skin/>
@@ -767,8 +770,12 @@
       <Space>2</Space>
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
-      <Color Name="Player3"><A>0.2</A></Color>
-      <MaxColor Name="Player3"><A>0.4</A></MaxColor>
+      <Color Name="Player3">
+        <A>0.2</A>
+      </Color>
+      <MaxColor Name="Player3">
+        <A>0.4</A>
+      </MaxColor>
     </Equalizer>
     <Equalizer Name="EqualizerPlayer4">
       <Skin/>
@@ -783,8 +790,12 @@
       <Space>2</Space>
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
-      <Color Name="Player4"><A>0.2</A></Color>
-      <MaxColor Name="Player4"><A>0.4</A></MaxColor>
+      <Color Name="Player4">
+        <A>0.2</A>
+      </Color>
+      <MaxColor Name="Player4">
+        <A>0.4</A>
+      </MaxColor>
     </Equalizer>
     <Equalizer Name="EqualizerPlayer5">
       <Skin/>
@@ -799,8 +810,12 @@
       <Space>2</Space>
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
-      <Color Name="Player5"><A>0.2</A></Color>
-      <MaxColor Name="Player5"><A>0.4</A></MaxColor>
+      <Color Name="Player5">
+        <A>0.2</A>
+      </Color>
+      <MaxColor Name="Player5">
+        <A>0.4</A>
+      </MaxColor>
     </Equalizer>
     <Equalizer Name="EqualizerPlayer6">
       <Skin/>
@@ -815,8 +830,12 @@
       <Space>2</Space>
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
-      <Color Name="Player6"><A>0.2</A></Color>
-      <MaxColor Name="Player6"><A>0.4</A></MaxColor>
+      <Color Name="Player6">
+        <A>0.2</A>
+      </Color>
+      <MaxColor Name="Player6">
+        <A>0.4</A>
+      </MaxColor>
     </Equalizer>
   </Equalizers>
   <Playlists />
diff --git a/Output/Themes/Genius/Screens/ScreenOptions.xml b/Output/Themes/Genius/Screens/ScreenOptions.xml
index 76ca27d0..eb2b787b 100644
--- a/Output/Themes/Genius/Screens/ScreenOptions.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptions.xml
@@ -13,35 +13,8 @@
       <Color Name="BackgroundColor" />
     </Background>
   </Backgrounds>
-  <Statics>
-    <Static Name="Static1">
-      <Skin>Menu</Skin>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>32</Y>
-        <W>1180</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-  </Statics>
-  <Texts>
-    <Text Name="Text1">
-      <X>60</X>
-      <Y>43</Y>
-      <Z>0</Z>
-      <H>27</H>
-      <MaxW>0</MaxW>
-      <Color Name="Invisible" />
-      <SelColor Name="Invisible" />
-      <Align>Left</Align>
-      <ResizeAlign>Center</ResizeAlign>
-      <Style>Bold</Style>
-      <Font>Outline</Font>
-      <Text>TR_SCREENO_OPTIONS</Text>
-    </Text>
-  </Texts>
+  <Statics />
+  <Texts />
   <Buttons>
     <Button Name="ButtonOptionsGame">
       <Skin>Button</Skin>
diff --git a/Output/Themes/Genius/Screens/ScreenOptionsGame.xml b/Output/Themes/Genius/Screens/ScreenOptionsGame.xml
index cdb31a1d..2619d909 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsGame.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsGame.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -22,84 +22,18 @@
         <Y>40</Y>
         <W>1280</W>
         <H>45</H>
-        <Z>1</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static2">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>100</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static3">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>160</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static4">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>220</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static5">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>280</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static6">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>340</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static7">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>400</Y>
-        <W>460</W>
-        <H>50</H>
         <Z>0</Z>
       </Rect>
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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>
@@ -107,13 +41,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_OPTIONS</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextLanguage">
       <X>75</X>
       <Y>107</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>
@@ -121,13 +55,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_LANGUAGE</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextDebugLevel">
       <X>75</X>
       <Y>167</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>
@@ -135,13 +69,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_DEBUGLEVEL</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextSongMenu">
       <X>75</X>
       <Y>227</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>
@@ -149,13 +83,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_SONGMENU</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextSongSorting">
       <X>75</X>
       <Y>287</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>
@@ -163,13 +97,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_SONGSORTING</Text>
     </Text>
-    <Text Name="Text6">
+    <Text Name="TextTabs">
       <X>75</X>
       <Y>347</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>
@@ -177,13 +111,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_TABS</Text>
     </Text>
-    <Text Name="Text7">
+    <Text Name="TextTimerMode">
       <X>75</X>
       <Y>407</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>
@@ -191,13 +125,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOGAME_TIMERMODE</Text>
     </Text>
-    <Text Name="Text8">
+    <Text Name="TextHighScoreStyle">
       <X>75</X>
       <Y>467</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>
@@ -313,12 +247,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>
@@ -355,12 +289,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>
@@ -397,12 +331,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>
@@ -439,12 +373,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>
@@ -481,7 +415,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>
@@ -523,12 +457,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>
@@ -565,12 +499,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>
@@ -582,4 +516,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
+</Screen>
\ No newline at end of file
diff --git a/Output/Themes/Genius/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Genius/Screens/ScreenOptionsLyrics.xml
index 5e3d264d..9bdd2c86 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsLyrics.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsLyrics.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -27,13 +27,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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_SCREENOLYRICS_OPTIONS</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextLyricsStyle">
       <X>75</X>
       <Y>107</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_SCREENOLYRICS_STYLE</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextLyricsPosition">
       <X>75</X>
       <Y>167</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>
@@ -142,12 +142,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>4</NumVisible>
@@ -184,12 +184,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/Themes/Genius/Screens/ScreenOptionsRecord.xml b/Output/Themes/Genius/Screens/ScreenOptionsRecord.xml
index ab79d075..a637c853 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsRecord.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -25,7 +25,7 @@
         <Z>1</Z>
       </Rect>
     </Static>
-    <Static Name="Static2">
+    <Static Name="StaticPlayer1">
       <Skin>SingIcon</Skin>
       <Color Name="Player1" />
       <Rect>
@@ -36,7 +36,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-    <Static Name="Static3">
+    <Static Name="StaticPlayer2">
       <Skin>SingIcon</Skin>
       <Color Name="Player2" />
       <Rect>
@@ -47,7 +47,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-    <Static Name="Static4">
+    <Static Name="StaticPlayer3">
       <Skin>SingIcon</Skin>
       <Color Name="Player3" />
       <Rect>
@@ -58,7 +58,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-    <Static Name="Static5">
+    <Static Name="StaticPlayer4">
       <Skin>SingIcon</Skin>
       <Color Name="Player4" />
       <Rect>
@@ -69,7 +69,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-    <Static Name="Static6">
+    <Static Name="StaticPlayer5">
       <Skin>SingIcon</Skin>
       <Color Name="Player5" />
       <Rect>
@@ -80,7 +80,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="Static7">
+    <Static Name="StaticPlayer6">
       <Skin>SingIcon</Skin>
       <Color Name="Player6" />
       <Rect>
@@ -128,7 +128,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticEnergyPlayer3">
+    <Static Name="StaticEnergyPlayer3">
       <Skin>EnergyBeam</Skin>
       <Color Name="Visible" />
       <Rect>
@@ -150,7 +150,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticEnergyPlayer5">
+    <Static Name="StaticEnergyPlayer5">
       <Skin>EnergyBeam</Skin>
       <Color Name="Visible" />
       <Rect>
@@ -180,7 +180,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>
@@ -194,7 +194,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -208,7 +208,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -240,7 +240,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -254,21 +254,21 @@
       <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_SCREENORECORD_PLAYER_2</Text>
-	</Text>
-	<Text Name="TextPlayer3">
+    </Text>
+    <Text Name="TextPlayer3">
       <X>125</X>
       <Y>347</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>
@@ -276,132 +276,126 @@
       <Font>Outline</Font>
       <Text>TR_SCREENORECORD_PLAYER_3</Text>
     </Text>
-	<Text Name="TextPlayer4">
+    <Text Name="TextPlayer4">
       <X>125</X>
       <Y>407</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_SCREENORECORD_PLAYER_4</Text>
-	</Text>
-	<Text Name="TextPlayer5">
+    </Text>
+    <Text Name="TextPlayer5">
       <X>125</X>
       <Y>467</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_SCREENORECORD_PLAYER_5</Text>
-	</Text>
-	<Text Name="TextPlayer6">
+    </Text>
+    <Text Name="TextPlayer6">
       <X>125</X>
       <Y>527</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_SCREENORECORD_PLAYER_6</Text>
-	</Text>
+    </Text>
     <Text Name="TextDelayPlayer1">
       <X>320</X>
       <Y>227</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextDelayPlayer2">
       <X>320</X>
       <Y>287</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
-	<Text Name="TextDelayPlayer3">
+      <Text /></Text>
+    <Text Name="TextDelayPlayer3">
       <X>320</X>
       <Y>347</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextDelayPlayer4">
       <X>320</X>
       <Y>407</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
-	<Text Name="TextDelayPlayer5">
+      <Text /></Text>
+    <Text Name="TextDelayPlayer5">
       <X>320</X>
       <Y>467</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextDelayPlayer6">
       <X>320</X>
       <Y>527</Y>
       <Z>-1</Z>
       <H>27</H>
       <MaxW>100</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
   </Texts>
   <Buttons>
     <Button Name="ButtonExit">
@@ -604,7 +598,7 @@
       <TextStyle>Bold</TextStyle>
       <NumVisible>7</NumVisible>
     </SelectSlide>
-	<SelectSlide Name="SelectSlideRecordPlayer3">
+    <SelectSlide Name="SelectSlideRecordPlayer3">
       <Skin/>
       <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
       <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -688,7 +682,7 @@
       <TextStyle>Bold</TextStyle>
       <NumVisible>7</NumVisible>
     </SelectSlide>
-	<SelectSlide Name="SelectSlideRecordPlayer5">
+    <SelectSlide Name="SelectSlideRecordPlayer5">
       <Skin/>
       <SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
       <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
@@ -809,7 +803,7 @@
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
-      <TextMaxW>123.2</TextMaxW>
+      <TextMaxW>120</TextMaxW>
       <TextFont>Outline</TextFont>
       <TextStyle>Bold</TextStyle>
       <NumVisible>5</NumVisible>
@@ -832,8 +826,8 @@
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <Color Name="Player1">
-		<A>0.6</A>
-	  </Color>
+        <A>0.6</A>
+      </Color>
       <MaxColor Name="Player1" />
       <Reflection />
     </Equalizer>
@@ -851,12 +845,12 @@
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <Color Name="Player2">
-		<A>0.6</A>
-	  </Color>
+        <A>0.6</A>
+      </Color>
       <MaxColor Name="Player2" />
       <Reflection />
     </Equalizer>
-	<Equalizer Name="EqualizerPlayer3">
+    <Equalizer Name="EqualizerPlayer3">
       <Skin/>
       <Rect>
         <X>270</X>
@@ -870,12 +864,12 @@
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <Color Name="Player3">
-		<A>0.6</A>
-	  </Color>
+        <A>0.6</A>
+      </Color>
       <MaxColor Name="Player3" />
       <Reflection />
     </Equalizer>
-	<Equalizer Name="EqualizerPlayer4">
+    <Equalizer Name="EqualizerPlayer4">
       <Skin/>
       <Rect>
         <X>270</X>
@@ -889,12 +883,12 @@
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <Color Name="Player4">
-		<A>0.6</A>
-	  </Color>
+        <A>0.6</A>
+      </Color>
       <MaxColor Name="Player4" />
       <Reflection />
     </Equalizer>
-	<Equalizer Name="EqualizerPlayer5">
+    <Equalizer Name="EqualizerPlayer5">
       <Skin/>
       <Rect>
         <X>270</X>
@@ -908,12 +902,12 @@
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <Color Name="Player5">
-		<A>0.6</A>
-	  </Color>
+        <A>0.6</A>
+      </Color>
       <MaxColor Name="Player5" />
       <Reflection />
     </Equalizer>
-	<Equalizer Name="EqualizerPlayer6">
+    <Equalizer Name="EqualizerPlayer6">
       <Skin/>
       <Rect>
         <X>270</X>
@@ -927,8 +921,8 @@
       <Style>Columns</Style>
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <Color Name="Player6">
-		<A>0.6</A>
-	  </Color>
+        <A>0.6</A>
+      </Color>
       <MaxColor Name="Player6" />
       <Reflection/>
     </Equalizer>
@@ -936,4 +930,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
+</Screen>
\ No newline at end of file
diff --git a/Output/Themes/Genius/Screens/ScreenOptionsSound.xml b/Output/Themes/Genius/Screens/ScreenOptionsSound.xml
index c876c798..5464ae18 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsSound.xml
@@ -14,11 +14,11 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>00</X>
+        <X>0</X>
         <Y>40</Y>
         <W>1280</W>
         <H>45</H>
@@ -27,13 +27,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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_SCREENOSOUND_OPTIONS</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextBackgroundMusic">
       <X>75</X>
       <Y>107</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_SCREENOSOUND_BACKGROUNDMUSIC</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextBackgroundMusicVolume">
       <X>75</X>
       <Y>167</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_SCREENOSOUND_BACKGROUNDMUSICVOLUME</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextBackgroundMusicSource">
       <X>75</X>
       <Y>227</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_SCREENOSOUND_BACKGROUNDMUSICSOURCE</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextPreviewMusicVolume">
       <X>75</X>
       <Y>287</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_SCREENOSOUND_PREVIEWMUSICVOLUME</Text>
     </Text>
-    <Text Name="Text6">
+    <Text Name="TextGameMusicVolume">
       <X>75</X>
       <Y>347</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>
@@ -111,13 +111,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOSOUND_GAMEMUSICVOLUME</Text>
     </Text>
-    <Text Name="Text7">
+    <Text Name="TextKaraokeEffect">
       <X>75</X>
       <Y>407</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>
@@ -198,12 +198,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>
@@ -240,12 +240,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>
@@ -282,7 +282,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>
@@ -324,7 +324,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>
@@ -366,7 +366,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>
@@ -408,7 +408,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>
diff --git a/Output/Themes/Genius/Screens/ScreenOptionsTheme.xml b/Output/Themes/Genius/Screens/ScreenOptionsTheme.xml
index ae3df39a..b7f293cd 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsTheme.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsTheme.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -25,103 +25,15 @@
         <Z>1</Z>
       </Rect>
     </Static>
-    <Static Name="Static2">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>100</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static3">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>160</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static4">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>220</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static5">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>280</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static6">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>340</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static7">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>400</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static8">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>460</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static9">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>520</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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>
@@ -129,13 +41,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_OPTIONS</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextTheme">
       <X>75</X>
       <Y>107</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>
@@ -143,13 +55,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_THEME</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextSkin">
       <X>75</X>
       <Y>167</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>
@@ -157,13 +69,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_SKIN</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextCoverTheme">
       <X>75</X>
       <Y>227</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>
@@ -171,13 +83,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_COVERTHEME</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextNoteLines">
       <X>75</X>
       <Y>287</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>
@@ -185,13 +97,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_NOTELINES</Text>
     </Text>
-    <Text Name="Text6">
+    <Text Name="TextToneHelper">
       <X>75</X>
       <Y>347</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>
@@ -199,13 +111,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_TONEHELPER</Text>
     </Text>
-    <Text Name="Text7">
+    <Text Name="TextTimerLook">
       <X>75</X>
       <Y>407</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>
@@ -213,13 +125,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_TIMERLOOK</Text>
     </Text>
-    <Text Name="Text8">
+    <Text Name="TextFadeInfo">
       <X>75</X>
       <Y>467</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>
@@ -227,13 +139,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOTHEME_FADEINFO</Text>
     </Text>
-    <Text Name="Text9">
+    <Text Name="TextCoverLoading">
       <X>75</X>
       <Y>527</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>
@@ -314,7 +226,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>
@@ -356,7 +268,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>
@@ -398,7 +310,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>
@@ -440,7 +352,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>
@@ -482,7 +394,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>
@@ -524,7 +436,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>
@@ -566,7 +478,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>
@@ -608,7 +520,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>
diff --git a/Output/Themes/Genius/Screens/ScreenOptionsVideo.xml b/Output/Themes/Genius/Screens/ScreenOptionsVideo.xml
index 2d2c0745..30737633 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsVideo.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -25,39 +25,6 @@
         <Z>1</Z>
       </Rect>
     </Static>
-    <Static Name="Static2">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>100</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static3">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>160</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
-    <Static Name="Static4">
-      <Skin/>
-      <Color Name="Invisible" />
-      <Rect>
-        <X>50</X>
-        <Y>220</Y>
-        <W>460</W>
-        <H>50</H>
-        <Z>0</Z>
-      </Rect>
-    </Static>
     <Static Name="StaticWebcamOutput">
       <Skin/>
       <Color Name="Visible" />
@@ -71,13 +38,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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>
@@ -85,13 +52,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEO_OPTIONS</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextVideoBackgrounds">
       <X>75</X>
       <Y>107</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>
@@ -99,13 +66,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEO_VIDEOBACKGROUNDS</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextVideoPreview">
       <X>75</X>
       <Y>167</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>
@@ -113,13 +80,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEO_VIDEOPREVIEW</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextVideoInSongs">
       <X>75</X>
       <Y>227</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,13 +94,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEO_VIDEOINSONGS</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextVideosToBackground">
       <X>75</X>
       <Y>287</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>
@@ -147,7 +114,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -161,7 +128,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -277,12 +244,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>
@@ -319,12 +286,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>
@@ -361,12 +328,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>
@@ -403,12 +370,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>
@@ -445,12 +412,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>
@@ -487,7 +454,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>
@@ -504,4 +471,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
+</Screen>
\ No newline at end of file
diff --git a/Output/Themes/Genius/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Genius/Screens/ScreenOptionsVideoAdjustments.xml
index 28b6f26d..12d51947 100644
--- a/Output/Themes/Genius/Screens/ScreenOptionsVideoAdjustments.xml
+++ b/Output/Themes/Genius/Screens/ScreenOptionsVideoAdjustments.xml
@@ -18,15 +18,27 @@
       </Color>
     </Background>
   </Backgrounds>
-  <Statics />
+  <Statics>
+    <Static Name="CalibrationBG">
+      <Skin>CalibrationBG</Skin>
+      <Color Name="Visible" />
+      <Rect>
+        <X>0</X>
+        <Y>0</Y>
+        <W>1280</W>
+        <H>720</H>
+        <Z>0</Z>
+      </Rect>
+    </Static>
+  </Statics>
   <Texts>
-    <Text Name="Text1">
-      <X>0</X>
-      <Y>0</Y>
-      <Z>0</Z>
+    <Text Name="TextTopLeft">
+      <X>10</X>
+      <Y>5</Y>
+      <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -34,13 +46,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT</Text>
     </Text>
-    <Text Name="Text2">
-      <X>1280</X>
-      <Y>0</Y>
-      <Z>0</Z>
+    <Text Name="TextTopRight">
+      <X>1270</X>
+      <Y>5</Y>
+      <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -48,13 +60,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT</Text>
     </Text>
-    <Text Name="Text3">
-      <X>0</X>
-      <Y>693</Y>
-      <Z>0</Z>
+    <Text Name="TextBottomLeft">
+      <X>10</X>
+      <Y>688</Y>
+      <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -62,13 +74,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEOADJUSTMENTS_BOTTOMLEFT</Text>
     </Text>
-    <Text Name="Text4">
-      <X>1280</X>
-      <Y>693</Y>
-      <Z>0</Z>
+    <Text Name="TextBottomRight">
+      <X>1270</X>
+      <Y>688</Y>
+      <Z>-1</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -76,13 +88,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextAdjustmentNotes">
       <X>640</X>
-      <Y>320</Y>
-      <Z>0</Z>
-      <H>35</H>
+      <Y>110</Y>
+      <Z>-1</Z>
+      <H>30</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -90,13 +102,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENOVIDEOADJUSTMENTS_NOTES</Text>
     </Text>
-    <Text Name="Text6">
+    <Text Name="TextAdjustmentsNotesReset">
       <X>640</X>
-      <Y>360</Y>
-      <Z>0</Z>
-      <H>35</H>
+      <Y>580</Y>
+      <Z>-1</Z>
+      <H>30</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -121,7 +133,7 @@
       <Text Name="Text">
         <X>75</X>
         <Y>12</Y>
-        <Z>0</Z>
+        <Z>-1</Z>
         <H>27</H>
         <MaxW>142</MaxW>
         <Color Name="ButtonTextColor" />
diff --git a/Output/Themes/Genius/Screens/ScreenParty.xml b/Output/Themes/Genius/Screens/ScreenParty.xml
index 8ba3dba7..6b2a7067 100644
--- a/Output/Themes/Genius/Screens/ScreenParty.xml
+++ b/Output/Themes/Genius/Screens/ScreenParty.xml
@@ -14,11 +14,11 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
-        <X>00</X>
+        <X>0</X>
         <Y>40</Y>
         <W>1280</W>
         <H>45</H>
@@ -27,13 +27,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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_SCREENPARTY_TITLE</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextPartyModes">
       <X>75</X>
       <Y>107</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_SCREENPARTY_MODES</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextPartyDescription">
       <X>75</X>
       <Y>167</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_SCREENPARTY_DESCRIPTION</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextPartyTargetaudience">
       <X>75</X>
       <Y>227</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_SCREENPARTY_TARGETAUDIENCE</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextPartyNumTeams">
       <X>75</X>
       <Y>287</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_SCREENPARTY_NUMTEAMS</Text>
     </Text>
-    <Text Name="Text6">
+    <Text Name="TextPartyNumPlayers">
       <X>75</X>
       <Y>347</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>
@@ -111,13 +111,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPARTY_NUMPLAYERS</Text>
     </Text>
-    <Text Name="Text7">
+    <Text Name="TextPartyAuthor">
       <X>75</X>
       <Y>407</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>
@@ -125,13 +125,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPARTY_AUTHOR</Text>
     </Text>
-    <Text Name="Text8">
+    <Text Name="TextPartyVersion">
       <X>75</X>
       <Y>467</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>
@@ -145,7 +145,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -159,7 +159,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -173,7 +173,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -187,7 +187,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -201,7 +201,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -215,7 +215,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>600</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -346,7 +346,7 @@
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
       <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
+      <TextSelColor Name="TextColor" />
       <TextH>27</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
diff --git a/Output/Themes/Genius/Screens/ScreenProfiles.xml b/Output/Themes/Genius/Screens/ScreenProfiles.xml
index 8d14ac44..848d8a58 100644
--- a/Output/Themes/Genius/Screens/ScreenProfiles.xml
+++ b/Output/Themes/Genius/Screens/ScreenProfiles.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -38,13 +38,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>640</X>
       <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>
@@ -52,13 +52,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPROFILES_PROFILES</Text>
     </Text>
-    <Text Name="Text2">
+    <Text Name="TextPlayerName">
       <X>75</X>
       <Y>287</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColorAlpha" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -66,13 +66,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPROFILES_PLAYERNAME</Text>
     </Text>
-    <Text Name="Text3">
+    <Text Name="TextGameDifficulty">
       <X>75</X>
       <Y>347</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColorAlpha" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -80,13 +80,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPROFILES_GAMEDIFFICULTY</Text>
     </Text>
-    <Text Name="Text4">
+    <Text Name="TextAvatar">
       <X>75</X>
       <Y>407</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColorAlpha" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -94,13 +94,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPROFILES_AVATAR</Text>
     </Text>
-    <Text Name="Text5">
+    <Text Name="TextUserrole">
       <X>75</X>
       <Y>467</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColorAlpha" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -108,13 +108,13 @@
       <Font>Outline</Font>
       <Text>TR_SCREENPROFILES_USERROLE</Text>
     </Text>
-    <Text Name="Text6">
+    <Text Name="TextActive">
       <X>75</X>
       <Y>527</Y>
       <Z>0</Z>
       <H>27</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColorAlpha" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -134,8 +134,8 @@
         <H>50</H>
         <Z>0</Z>
       </Rect>
-      <Color Name="ButtonColor" />
-      <SelColor Name="ButtonSelColor" />
+      <Color Name="SelectSlideColor" />
+      <SelColor Name="SelectSlideSelColor" />
       <Text Name="Text">
         <X>355</X>
         <Y>10</Y>
@@ -451,7 +451,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>
@@ -493,7 +493,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>
@@ -535,7 +535,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>
diff --git a/Output/Themes/Genius/Screens/ScreenScore.xml b/Output/Themes/Genius/Screens/ScreenScore.xml
index 0049535b..d2727b00 100644
--- a/Output/Themes/Genius/Screens/ScreenScore.xml
+++ b/Output/Themes/Genius/Screens/ScreenScore.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-	<Static Name="Static1">
+    <Static Name="StaticMenuBar">
       <Skin />
       <Color Name="BackgroundColorAlpha" />
       <Rect>
@@ -25,7 +25,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP1N1">
+    <Static Name="StaticPointsBarBGP1N1">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -58,7 +58,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP1N2">
+    <Static Name="StaticPointsBarBGP1N2">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -91,7 +91,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP2N2">
+    <Static Name="StaticPointsBarBGP2N2">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -124,7 +124,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP1N3">
+    <Static Name="StaticPointsBarBGP1N3">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -157,7 +157,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP2N3">
+    <Static Name="StaticPointsBarBGP2N3">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -190,7 +190,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP3N3">
+    <Static Name="StaticPointsBarBGP3N3">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -223,7 +223,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP1N4">
+    <Static Name="StaticPointsBarBGP1N4">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -256,7 +256,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP2N4">
+    <Static Name="StaticPointsBarBGP2N4">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -289,7 +289,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP3N4">
+    <Static Name="StaticPointsBarBGP3N4">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -322,7 +322,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP4N4">
+    <Static Name="StaticPointsBarBGP4N4">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -355,7 +355,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP1N5">
+    <Static Name="StaticPointsBarBGP1N5">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -388,7 +388,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP2N5">
+    <Static Name="StaticPointsBarBGP2N5">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -421,7 +421,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP3N5">
+    <Static Name="StaticPointsBarBGP3N5">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -454,7 +454,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP4N5">
+    <Static Name="StaticPointsBarBGP4N5">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -487,7 +487,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP5N5">
+    <Static Name="StaticPointsBarBGP5N5">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -520,7 +520,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP1N6">
+    <Static Name="StaticPointsBarBGP1N6">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -553,7 +553,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP2N6">
+    <Static Name="StaticPointsBarBGP2N6">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -586,7 +586,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP3N6">
+    <Static Name="StaticPointsBarBGP3N6">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -619,7 +619,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP4N6">
+    <Static Name="StaticPointsBarBGP4N6">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -652,7 +652,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP5N6">
+    <Static Name="StaticPointsBarBGP5N6">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -685,7 +685,7 @@
         <Z>0</Z>
       </Rect>
     </Static>
-	<Static Name="StaticPointsBarBGP6N6">
+    <Static Name="StaticPointsBarBGP6N6">
       <Skin>PointsBarBG</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -720,13 +720,13 @@
     </Static>
   </Statics>
   <Texts>
-    <Text Name="Text1">
+    <Text Name="TextTitle">
       <X>60</X>
       <Y>50</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>
@@ -740,7 +740,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>
@@ -754,7 +754,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -768,7 +768,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -782,7 +782,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -796,7 +796,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -810,7 +810,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -824,7 +824,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -838,7 +838,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -852,7 +852,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -866,7 +866,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -880,7 +880,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -894,7 +894,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -908,7 +908,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -922,7 +922,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -936,7 +936,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -950,7 +950,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -964,7 +964,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -978,7 +978,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -992,7 +992,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1006,7 +1006,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1020,7 +1020,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1034,7 +1034,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1048,7 +1048,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1062,7 +1062,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1076,7 +1076,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1090,7 +1090,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1104,7 +1104,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1118,7 +1118,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1132,7 +1132,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1146,7 +1146,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1160,7 +1160,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1174,7 +1174,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1188,7 +1188,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1202,7 +1202,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1216,7 +1216,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1230,7 +1230,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1244,7 +1244,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1258,7 +1258,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1272,7 +1272,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1286,7 +1286,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1300,7 +1300,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1314,7 +1314,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1328,7 +1328,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1342,7 +1342,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1356,7 +1356,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1370,7 +1370,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1384,7 +1384,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1398,7 +1398,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1412,7 +1412,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1426,7 +1426,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1440,7 +1440,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1454,7 +1454,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1468,7 +1468,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1482,7 +1482,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1496,7 +1496,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1510,7 +1510,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1524,7 +1524,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1538,7 +1538,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1552,7 +1552,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1566,7 +1566,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1580,7 +1580,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1594,7 +1594,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1608,7 +1608,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1622,7 +1622,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1636,7 +1636,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1650,7 +1650,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1664,7 +1664,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1678,7 +1678,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1692,7 +1692,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1706,7 +1706,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1720,7 +1720,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1734,7 +1734,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1748,7 +1748,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1762,7 +1762,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1776,7 +1776,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1790,7 +1790,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1804,7 +1804,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1818,7 +1818,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1832,7 +1832,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1846,7 +1846,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1860,7 +1860,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1874,7 +1874,7 @@
       <Z>0</Z>
       <H>40</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1888,7 +1888,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>220</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Right</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1902,7 +1902,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>170</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
@@ -1916,7 +1916,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>390</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
diff --git a/Output/Themes/Genius/Screens/ScreenSing.xml b/Output/Themes/Genius/Screens/ScreenSing.xml
index b652fa4e..032a6d0f 100644
--- a/Output/Themes/Genius/Screens/ScreenSing.xml
+++ b/Output/Themes/Genius/Screens/ScreenSing.xml
@@ -77,8 +77,8 @@
     <Static Name="StaticTimeLine">
       <Skin>TimeLine</Skin>
       <Color Name="TimeBar">
-		<A>0.2</A>
-	  </Color>
+        <A>0.2</A>
+      </Color>
       <Rect>
         <X>11</X>
         <Y>707</Y>
@@ -111,7 +111,7 @@
     </Static>
     <Static Name="StaticTimePointer">
       <Skin>Pointer</Skin>
-      <Color Name="White" />
+      <Color Name="TimePointerColor" />
       <Rect>
         <X>44</X>
         <Y>706</Y>
@@ -133,11 +133,7 @@
     </Static>
     <Static Name="StaticLyricHelperDuet">
       <Skin>LyricHelper</Skin>
-      <Color Name="LyricHelper">
-	  <R>0.882</R>
-      <G>0.149</G>
-      <B>0.110</B>
-	  </Color>
+      <Color Name="LyricHelperDuet" />
       <Rect>
         <X>40</X>
         <Y>10</Y>
@@ -181,12 +177,7 @@
     </Static>
     <Static Name="StaticAvatarP1N1">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>40</X>
         <Y>352</Y>
@@ -208,12 +199,7 @@
     </Static>
     <Static Name="StaticAvatarP1N2">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>40</X>
         <Y>112</Y>
@@ -235,12 +221,7 @@
     </Static>
     <Static Name="StaticAvatarP2N2">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>40</X>
         <Y>372</Y>
@@ -262,12 +243,7 @@
     </Static>
     <Static Name="StaticAvatarP1N3">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>40</X>
         <Y>102</Y>
@@ -289,12 +265,7 @@
     </Static>
     <Static Name="StaticAvatarP2N3">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>40</X>
         <Y>272</Y>
@@ -316,12 +287,7 @@
     </Static>
     <Static Name="StaticAvatarP3N3">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>40</X>
         <Y>442</Y>
@@ -343,12 +309,7 @@
     </Static>
     <Static Name="StaticAvatarP1N4">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>112</Y>
@@ -370,12 +331,7 @@
     </Static>
     <Static Name="StaticAvatarP2N4">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>372</Y>
@@ -397,12 +353,7 @@
     </Static>
     <Static Name="StaticAvatarP3N4">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>660</X>
         <Y>112</Y>
@@ -424,12 +375,7 @@
     </Static>
     <Static Name="StaticAvatarP4N4">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>660</X>
         <Y>372</Y>
@@ -451,12 +397,7 @@
     </Static>
     <Static Name="StaticAvatarP1N5">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>102</Y>
@@ -478,12 +419,7 @@
     </Static>
     <Static Name="StaticAvatarP2N5">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>272</Y>
@@ -505,12 +441,7 @@
     </Static>
     <Static Name="StaticAvatarP3N5">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>442</Y>
@@ -532,12 +463,7 @@
     </Static>
     <Static Name="StaticAvatarP4N5">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>655</X>
         <Y>102</Y>
@@ -559,12 +485,7 @@
     </Static>
     <Static Name="StaticAvatarP5N5">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>655</X>
         <Y>272</Y>
@@ -586,12 +507,7 @@
     </Static>
     <Static Name="StaticAvatarP1N6">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>102</Y>
@@ -613,12 +529,7 @@
     </Static>
     <Static Name="StaticAvatarP2N6">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>272</Y>
@@ -640,12 +551,7 @@
     </Static>
     <Static Name="StaticAvatarP3N6">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>20</X>
         <Y>442</Y>
@@ -667,12 +573,7 @@
     </Static>
     <Static Name="StaticAvatarP4N6">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>655</X>
         <Y>102</Y>
@@ -694,12 +595,7 @@
     </Static>
     <Static Name="StaticAvatarP5N6">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>655</X>
         <Y>272</Y>
@@ -721,12 +617,7 @@
     </Static>
     <Static Name="StaticAvatarP6N6">
       <Skin/>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="StaticAvatarColor" />
       <Rect>
         <X>655</X>
         <Y>442</Y>
@@ -749,8 +640,7 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextTime">
       <X>1245</X>
       <Y>700</Y>
@@ -763,20 +653,19 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextPause">
       <X>640</X>
       <Y>350</Y>
       <Z>-2.11</Z>
       <H>40</H>
       <MaxW>0</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
-      <Font>Normal</Font>
+      <Font>Outline</Font>
       <Text>TR_SCREENSING_PAUSE</Text>
     </Text>
     <Text Name="TextDuetName1">
@@ -785,28 +674,26 @@
       <Z>-1</Z>
       <H>30</H>
       <MaxW>0</MaxW>
-      <Color Name="TextSelColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextDuetName2">
       <X>10</X>
       <Y>665</Y>
       <Z>-1</Z>
       <H>30</H>
       <MaxW>0</MaxW>
-      <Color Name="TextSelColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextMedleyCountdown">
       <X>640</X>
       <Y>10</Y>
@@ -819,701 +706,595 @@
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP1N1">
       <X>1240</X>
       <Y>332</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player1"><A>0.6</A></Color>
+      <Color Name="Player1">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player1" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP1N1">
       <X>105</X>
       <Y>360</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>950</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player1" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP1N2">
       <X>1240</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player1"><A>0.6</A></Color>
+      <Color Name="Player1">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player1" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP1N2">
       <X>105</X>
       <Y>120</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>950</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player1" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP2N2">
       <X>1240</X>
       <Y>352</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player2"><A>0.6</A></Color>
+      <Color Name="Player2">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player2" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP2N2">
       <X>105</X>
       <Y>380</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>950</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player2" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP1N3">
       <X>1240</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player1"><A>0.6</A></Color>
+      <Color Name="Player1">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player1" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP1N3">
       <X>80</X>
       <Y>105</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>950</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player1" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP2N3">
       <X>1240</X>
       <Y>262</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player2"><A>0.6</A></Color>
+      <Color Name="Player2">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player2" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP2N3">
       <X>80</X>
       <Y>275</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>950</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player2" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP3N3">
       <X>1240</X>
       <Y>432</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player3"><A>0.4</A></Color>
+      <Color Name="Player3">
+        <A>0.4</A>
+      </Color>
       <SelColor Name="Player3" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP3N3">
       <X>80</X>
       <Y>445</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>950</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player3" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP1N4">
       <X>626</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player1"><A>0.6</A></Color>
+      <Color Name="Player1">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player1" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP1N4">
       <X>85</X>
       <Y>120</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>350</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player1" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP2N4">
       <X>626</X>
       <Y>352</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player2"><A>0.6</A></Color>
+      <Color Name="Player2">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player2" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP2N4">
       <X>85</X>
       <Y>380</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>350</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player2" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP3N4">
       <X>1260</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player3"><A>0.6</A></Color>
+      <Color Name="Player3">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player3" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP3N4">
       <X>725</X>
       <Y>120</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>350</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player3" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP4N4">
       <X>1260</X>
       <Y>352</Y>
       <Z>-1</Z>
       <H>90</H>
       <MaxW>0</MaxW>
-      <Color Name="Player4"><A>0.6</A></Color>
+      <Color Name="Player4">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player4" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP4N4">
       <X>725</X>
       <Y>380</Y>
       <Z>-1</Z>
       <H>38</H>
       <MaxW>350</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player4" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP1N5">
       <X>625</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player1"><A>0.6</A></Color>
+      <Color Name="Player1">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player1" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP1N5">
       <X>60</X>
       <Y>105</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player1" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP2N5">
       <X>625</X>
       <Y>262</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player2"><A>0.6</A></Color>
+      <Color Name="Player2">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player2" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP2N5">
       <X>60</X>
       <Y>275</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player2" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP3N5">
       <X>625</X>
       <Y>432</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player3"><A>0.4</A></Color>
+      <Color Name="Player3">
+        <A>0.4</A>
+      </Color>
       <SelColor Name="Player3" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP3N5">
       <X>60</X>
       <Y>445</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player3" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP4N5">
       <X>1260</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player4"><A>0.6</A></Color>
+      <Color Name="Player4">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player4" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP4N5">
       <X>695</X>
       <Y>105</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player4" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP5N5">
       <X>1260</X>
       <Y>262</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player5"><A>0.6</A></Color>
+      <Color Name="Player5">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player5" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP5N5">
       <X>695</X>
       <Y>275</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player5" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP1N6">
       <X>625</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player1"><A>0.6</A></Color>
+      <Color Name="Player1">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player1" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP1N6">
       <X>60</X>
       <Y>105</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player1" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP2N6">
       <X>625</X>
       <Y>262</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player2"><A>0.6</A></Color>
+      <Color Name="Player2">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player2" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP2N6">
       <X>60</X>
       <Y>275</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player2" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP3N6">
       <X>625</X>
       <Y>432</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player3"><A>0.4</A></Color>
+      <Color Name="Player3">
+        <A>0.4</A>
+      </Color>
       <SelColor Name="Player3" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP3N6">
       <X>60</X>
       <Y>445</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player3" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP4N6">
       <X>1260</X>
       <Y>92</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player4"><A>0.6</A></Color>
+      <Color Name="Player4">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player4" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP4N6">
       <X>695</X>
       <Y>105</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player4" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP5N6">
       <X>1260</X>
       <Y>262</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player5"><A>0.6</A></Color>
+      <Color Name="Player5">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player5" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP5N6">
       <X>695</X>
       <Y>275</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player5" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextScoreP6N6">
       <X>1260</X>
       <Y>432</Y>
       <Z>-1</Z>
       <H>50</H>
       <MaxW>0</MaxW>
-      <Color Name="Player6"><A>0.6</A></Color>
+      <Color Name="Player6">
+        <A>0.6</A>
+      </Color>
       <SelColor Name="Player6" />
       <Align>Right</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Normal</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
     <Text Name="TextNameP6N6">
       <X>695</X>
       <Y>445</Y>
       <Z>-1</Z>
       <H>28</H>
       <MaxW>450</MaxW>
-      <Color>
-        <R>1</R>
-        <G>1</G>
-        <B>1</B>
-        <A>0.4</A>
-      </Color>
+      <Color Name="TextNameColor" />
       <SelColor Name="Player6" />
       <Align>Left</Align>
       <ResizeAlign>Center</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
-      <Text />
-    </Text>
+      <Text /></Text>
   </Texts>
   <Buttons>
     <Button Name="ButtonCancel">
@@ -1655,7 +1436,7 @@
         <Z>-1</Z>
       </Rect>
       <Color Name="LyricMainColor"/>
-      <ProcessedColor Name="Player2"/>
+      <ProcessedColor Name="LyricProcessedColorDuet"/>
     </Lyric>
     <Lyric Name="LyricSubDuet">
       <Rect>
@@ -1901,4 +1682,4 @@
   <Playlists />
   <ParticleEffects />
   <ScreenSettings />
-</Screen>
+</Screen>
\ No newline at end of file
diff --git a/Output/Themes/Genius/Screens/ScreenSong.xml b/Output/Themes/Genius/Screens/ScreenSong.xml
index fde577cb..9bfa7496 100644
--- a/Output/Themes/Genius/Screens/ScreenSong.xml
+++ b/Output/Themes/Genius/Screens/ScreenSong.xml
@@ -14,7 +14,7 @@
     </Background>
   </Backgrounds>
   <Statics>
-    <Static Name="Static1">
+    <Static Name="StaticSongMenu">
       <Skin>SongMenu</Skin>
       <Color Name="StaticColorAlpha" />
       <Rect>
@@ -29,7 +29,7 @@
         <Space>10</Space>
       </Reflection>
     </Static>
-	<Static Name="Static2">
+    <Static Name="StaticVocaluxeLogo">
       <Skin>VocaluxeLogo</Skin>
       <Color Name="White" />
       <Rect>
@@ -162,7 +162,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>340</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -180,7 +180,7 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>805</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -212,14 +212,14 @@
       <Z>0</Z>
       <H>27</H>
       <MaxW>300</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Left</Align>
       <ResizeAlign>Bottom</ResizeAlign>
       <Style>Bold</Style>
       <Font>Outline</Font>
       <Text />
-	  <Reflection>
+      <Reflection>
         <Height>14</Height>
         <Space>32</Space>
       </Reflection>
@@ -230,7 +230,7 @@
       <Z>-2.11</Z>
       <H>34</H>
       <MaxW>350</MaxW>
-      <Color Name="StaticColor" />
+      <Color Name="TextColor" />
       <SelColor Name="TextSelColor" />
       <Align>Center</Align>
       <ResizeAlign>Center</ResizeAlign>
@@ -250,7 +250,9 @@
         <H>80</H>
         <Z>-1.01</Z>
       </Rect>
-      <Color Name="Player1" ><A>0.5</A></Color>
+      <Color Name="Player1">
+        <A>0.5</A>
+      </Color>
       <SelColor Name="Player1" />
       <Text Name="Text">
         <X>40</X>
@@ -277,7 +279,9 @@
         <H>80</H>
         <Z>-1.01</Z>
       </Rect>
-      <Color Name="Player2" ><A>0.5</A></Color>
+      <Color Name="Player2">
+        <A>0.5</A>
+      </Color>
       <SelColor Name="Player2" />
       <Text Name="Text">
         <X>40</X>
@@ -304,7 +308,9 @@
         <H>80</H>
         <Z>-1.01</Z>
       </Rect>
-      <Color Name="Player3" ><A>0.5</A></Color>
+      <Color Name="Player3">
+        <A>0.5</A>
+      </Color>
       <SelColor Name="Player3" />
       <Text Name="Text">
         <X>40</X>
@@ -331,7 +337,9 @@
         <H>80</H>
         <Z>-1.01</Z>
       </Rect>
-      <Color Name="Player4" ><A>0.5</A></Color>
+      <Color Name="Player4">
+        <A>0.5</A>
+      </Color>
       <SelColor Name="Player4" />
       <Text Name="Text">
         <X>40</X>
@@ -358,7 +366,9 @@
         <H>80</H>
         <Z>-1.01</Z>
       </Rect>
-      <Color Name="Player5" ><A>0.5</A></Color>
+      <Color Name="Player5">
+        <A>0.5</A>
+      </Color>
       <SelColor Name="Player5" />
       <Text Name="Text">
         <X>40</X>
@@ -385,7 +395,9 @@
         <H>80</H>
         <Z>-1.01</Z>
       </Rect>
-      <Color Name="Player6" ><A>0.5</A></Color>
+      <Color Name="Player6">
+        <A>0.5</A>
+      </Color>
       <SelColor Name="Player6" />
       <Text Name="Text">
         <X>40</X>
@@ -776,7 +788,7 @@
           <Z>-1.01</Z>
           <H>39</H>
           <MaxW>340</MaxW>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <SelColor Name="TextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Top</ResizeAlign>
@@ -790,7 +802,7 @@
           <Z>-1.01</Z>
           <H>32</H>
           <MaxW>340</MaxW>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <SelColor Name="TextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Top</ResizeAlign>
@@ -804,7 +816,7 @@
           <Z>-1.01</Z>
           <H>28</H>
           <MaxW>340</MaxW>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <SelColor Name="TextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Top</ResizeAlign>
@@ -836,7 +848,7 @@
         </StaticTextBG>
         <StaticDuetIcon Name="StaticDuetIcon">
           <Skin>DuetIcon</Skin>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <Rect>
             <X>200</X>
             <Y>530</Y>
@@ -847,7 +859,7 @@
         </StaticDuetIcon>
         <StaticVideoIcon Name="StaticVideoIcon">
           <Skin>VideoIcon</Skin>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <Rect>
             <X>120</X>
             <Y>530</Y>
@@ -855,7 +867,7 @@
             <H>40</H>
             <Z>-1</Z>
           </Rect>
-            </StaticVideoIcon>
+        </StaticVideoIcon>
         <StaticMedleyCalcIcon Name="StaticMedleyCalcIcon">
           <Skin>MedleyCalcIcon</Skin>
           <Color Name="StaticColor" />
@@ -866,7 +878,7 @@
             <H>40</H>
             <Z>-1</Z>
           </Rect>
-            </StaticMedleyCalcIcon>
+        </StaticMedleyCalcIcon>
         <StaticMedleyTagIcon Name="StaticMedleyTagIcon">
           <Skin>MedleyTagIcon</Skin>
           <Color Name="StaticColor" />
@@ -931,7 +943,7 @@
           <Z>-1.01</Z>
           <H>28</H>
           <MaxW>340</MaxW>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <SelColor Name="TextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Top</ResizeAlign>
@@ -974,7 +986,7 @@
         </StaticDuetIcon>
         <StaticVideoIcon Name="StaticVideoIcon">
           <Skin>VideoIcon</Skin>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <Rect>
             <X>120</X>
             <Y>530</Y>
@@ -985,7 +997,7 @@
         </StaticVideoIcon>
         <StaticMedleyCalcIcon Name="StaticMedleyCalcIcon">
           <Skin>MedleyCalcIcon</Skin>
-          <Color Name="StaticColor" />
+          <Color Name="TextColor" />
           <Rect>
             <X>280</X>
             <Y>530</Y>
@@ -1022,28 +1034,28 @@
         <Y>135</Y>
         <W>360</W>
         <H>40</H>
-        <Z>-1.11</Z>
+        <Z>-2.11</Z>
       </Rect>
       <RectArrowLeft>
         <X>45</X>
         <Y>140</Y>
         <W>30</W>
         <H>30</H>
-        <Z>-1.12</Z>
+        <Z>-2.12</Z>
       </RectArrowLeft>
       <RectArrowRight>
         <X>365</X>
         <Y>140</Y>
         <W>30</W>
         <H>30</H>
-        <Z>-1.12</Z>
+        <Z>-2.12</Z>
       </RectArrowRight>
       <Color Name="ButtonColor" />
       <SelColor Name="ButtonSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextColorAlpha" />
       <TextH>25</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
@@ -1084,8 +1096,8 @@
       <SelColor Name="ButtonSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextColorAlpha" />
       <TextH>25</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
@@ -1126,8 +1138,8 @@
       <SelColor Name="ButtonSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
-      <TextSelColor Name="TextSelColor" />
+      <TextColor Name="TextColorAlpha" />
+      <TextSelColor Name="TextColorAlpha" />
       <TextH>25</TextH>
       <TextRelativeX>50</TextRelativeX>
       <TextRelativeY>0</TextRelativeY>
@@ -1168,7 +1180,7 @@
       <SelColor Name="ButtonSelColor" />
       <ArrowColor Name="ArrowColor" />
       <ArrowSelColor Name="ArrowSelColor" />
-      <TextColor Name="TextColor" />
+      <TextColor Name="TextColorAlpha" />
       <TextSelColor Name="TextSelColor" />
       <TextH>25</TextH>
       <TextRelativeX>50</TextRelativeX>
@@ -1204,14 +1216,14 @@
         <Z>-1.01</Z>
         <H>22</H>
         <MaxW>351</MaxW>
-        <Color Name="StaticColor" />
+        <Color Name="TextColor" />
         <SelColor Name="TextSelColor" />
         <Align>Left</Align>
         <ResizeAlign>Center</ResizeAlign>
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_ARTIST_TITLE</Text>
-        </Text1>
+      </Text1>
       <StaticCover Name="StaticCover">
         <Skin />
         <Color Name="Visible" />
@@ -1222,7 +1234,7 @@
           <H>46</H>
           <Z>-1</Z>
         </Rect>
-        </StaticCover>
+      </StaticCover>
       <StaticPlaylistHeader Name="StaticPlaylistHeader">
         <Skin>PlaylistBG</Skin>
         <Color Name="StaticColorAlpha" />
@@ -1233,7 +1245,7 @@
           <H>50</H>
           <Z>-1</Z>
         </Rect>
-        </StaticPlaylistHeader>
+      </StaticPlaylistHeader>
       <StaticPlaylistFooter Name="StaticPlaylistFooter">
         <Skin>PlaylistBG</Skin>
         <Color Name="StaticColorAlpha" />
@@ -1244,7 +1256,7 @@
           <H>50</H>
           <Z>-1</Z>
         </Rect>
-        </StaticPlaylistFooter>
+      </StaticPlaylistFooter>
       <ButtonPlaylistName Name="ButtonPlaylistName">
         <Skin/>
         <SkinSelected />
@@ -1270,7 +1282,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-          </Text>
+        </Text>
       </ButtonPlaylistName>
       <ButtonPlaylistClose Name="ButtonPlaylistClose">
         <Skin>CloseIcon</Skin>
@@ -1297,7 +1309,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-          </Text>
+        </Text>
       </ButtonPlaylistClose>
       <ButtonPlaylistSave Name="ButtonPlaylistSave">
         <Skin>SaveIcon</Skin>
@@ -1324,7 +1336,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-          </Text>
+        </Text>
       </ButtonPlaylistSave>
       <ButtonPlaylistDelete Name="ButtonPlaylistDelete">
         <Skin>DeleteIcon</Skin>
@@ -1351,7 +1363,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-          </Text>
+        </Text>
       </ButtonPlaylistDelete>
       <ButtonPlaylistSing Name="ButtonPlaylistSing">
         <Skin>SingIcon</Skin>
@@ -1378,7 +1390,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-          </Text>
+        </Text>
       </ButtonPlaylistSing>
       <SelectSlideGameMode Name="SelectSlideGameMode">
         <Skin />
@@ -1414,9 +1426,9 @@
         <ArrowSelColor Name="ArrowSelColor" />
         <TextColor Name="TextColor" />
         <TextSelColor Name="TextSelColor" />
-        <TextH>22.00</TextH>
-        <TextRelativeX>25.00</TextRelativeX>
-        <TextMaxW>370.00</TextMaxW>
+        <TextH>22</TextH>
+        <TextRelativeX>25</TextRelativeX>
+        <TextMaxW>370</TextMaxW>
         <TextFont>Outline</TextFont>
         <TextStyle>Bold</TextStyle>
         <NumVisible>1</NumVisible>
diff --git a/Output/Themes/Genius/Screens/ScreenTest.xml b/Output/Themes/Genius/Screens/ScreenTest.xml
index 6958eb63..5f3a0e47 100644
--- a/Output/Themes/Genius/Screens/ScreenTest.xml
+++ b/Output/Themes/Genius/Screens/ScreenTest.xml
@@ -11,11 +11,11 @@
       <Video />
       <Skin />
       <Color>
-		<R>0</R>
-		<G>0</G>
-		<B>0</B>
-		<A>1</A>
+        <R>0</R>
+        <G>0</G>
+        <B>0</B>
+        <A>1</A>
       </Color>
     </Background>
   </Backgrounds>
-</Screen>
+</Screen>
\ No newline at end of file
diff --git a/Output/Themes/Genius/ToneHelper.png b/Output/Themes/Genius/ToneHelper.png
index adb51dc5..cef5ab73 100644
Binary files a/Output/Themes/Genius/ToneHelper.png and b/Output/Themes/Genius/ToneHelper.png differ