diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
index 55c335cb..da365e48 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeConfig.xml
@@ -110,7 +110,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -145,7 +145,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
index 8e9687a6..3edf6ca5 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml
@@ -286,7 +286,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT_ROUND</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -321,7 +321,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -356,7 +356,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_EXIT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -391,7 +391,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_YES</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -426,7 +426,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NO</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -461,7 +461,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonPlayerScrollUp">
       <Skin>ScrollUp</Skin>
@@ -488,7 +488,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonRoundsScrollDown">
       <Skin>ScrollDown</Skin>
@@ -515,7 +515,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonRoundsScrollUp">
       <Skin>ScrollUp</Skin>
@@ -542,7 +542,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
index 308abc2d..a3bd1919 100644
--- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
+++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeNames.xml
@@ -68,7 +68,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -103,7 +103,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -138,7 +138,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENNAMES_BUTTON_RANDOM</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -173,7 +173,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDecreaseTeams">
       <Skin>Minus</Skin>
@@ -200,7 +200,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonIncreasePlayer">
       <Skin>Plus</Skin>
@@ -227,7 +227,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDecreasePlayer">
       <Skin>Minus</Skin>
@@ -254,7 +254,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
index 583bce35..02620808 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyConfig.xml
@@ -110,7 +110,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -145,7 +145,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
index c7ae0997..371c3e14 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml
@@ -286,7 +286,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT_ROUND</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -321,7 +321,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -356,7 +356,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_EXIT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -391,7 +391,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_YES</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -426,7 +426,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NO</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -461,7 +461,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonPlayerScrollUp">
       <Skin>ScrollUp</Skin>
@@ -488,7 +488,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonRoundsScrollDown">
       <Skin>ScrollDown</Skin>
@@ -515,7 +515,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonRoundsScrollUp">
       <Skin>ScrollUp</Skin>
@@ -542,7 +542,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
index 944cbae8..72512c94 100644
--- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
+++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyNames.xml
@@ -68,7 +68,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -103,7 +103,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -138,7 +138,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENNAMES_BUTTON_RANDOM</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -173,7 +173,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDecreaseTeams">
       <Skin>Minus</Skin>
@@ -200,7 +200,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonIncreasePlayer">
       <Skin>Plus</Skin>
@@ -227,7 +227,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDecreasePlayer">
       <Skin>Minus</Skin>
@@ -254,7 +254,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
index f5f5a02a..1d02431f 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeConfig.xml
@@ -110,7 +110,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -145,7 +145,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
index 17697d45..f4dd7cad 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeMain.xml
@@ -199,7 +199,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT_ROUND</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -234,7 +234,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -269,7 +269,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_EXIT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -304,7 +304,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_YES</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -339,7 +339,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NO</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -374,7 +374,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJokerRandomT1">
       <Skin>Random</Skin>
@@ -401,7 +401,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJokerRandomT2">
       <Skin>Random</Skin>
@@ -428,7 +428,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJokerRetryT1">
       <Skin>RepeatIcon</Skin>
@@ -455,7 +455,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJokerRetryT2">
       <Skin>RepeatIcon</Skin>
@@ -482,7 +482,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
index 69a03714..df5bc5db 100644
--- a/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
+++ b/Output/PartyModes/TicTacToe/Themes/Default/Screens/PartyScreenTicTacToeNames.xml
@@ -68,7 +68,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -103,7 +103,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_NEXT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -138,7 +138,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENNAMES_BUTTON_RANDOM</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -173,7 +173,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDecreaseTeams">
       <Skin>Minus</Skin>
@@ -200,7 +200,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonIncreasePlayer">
       <Skin>Plus</Skin>
@@ -227,7 +227,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDecreasePlayer">
       <Skin>Minus</Skin>
@@ -254,7 +254,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
index bc874bd7..f4300e82 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
@@ -71,7 +71,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonPause">
       <Skin>PauseIcon</Skin>
@@ -98,7 +98,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonPrevious">
       <Skin>PreviousIcon</Skin>
@@ -125,7 +125,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonNext">
       <Skin>NextIcon</Skin>
@@ -152,7 +152,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonRepeat">
       <Skin>RepeatIcon</Skin>
@@ -179,7 +179,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonShowVideo">
       <Skin>VideoIconCO</Skin>
@@ -206,7 +206,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonSing">
       <Skin>DuetIcon</Skin>
@@ -233,7 +233,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonToBackgroundVideo">
       <Skin>VideoIconBG</Skin>
@@ -260,7 +260,7 @@
         <Style>Bold</Style>
         <Font>Normal</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus />
diff --git a/Output/Themes/Ambient/Screens/ScreenMain.xml b/Output/Themes/Ambient/Screens/ScreenMain.xml
index 5f727e4b..a6f426e7 100644
--- a/Output/Themes/Ambient/Screens/ScreenMain.xml
+++ b/Output/Themes/Ambient/Screens/ScreenMain.xml
@@ -93,7 +93,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENMAIN_BUTTON_SING</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -128,7 +128,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENMAIN_BUTTON_PARTY</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -163,7 +163,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENMAIN_BUTTON_OPTIONS</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -198,7 +198,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENMAIN_BUTTON_PROFILES</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -233,7 +233,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_EXIT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index 851fcf5a..9b2c1e01 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -334,7 +334,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -369,7 +369,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_START</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptions.xml b/Output/Themes/Ambient/Screens/ScreenOptions.xml
index 111cb3b1..76ca27d0 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptions.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptions.xml
@@ -68,7 +68,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENO_BUTTON_GAME</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -103,7 +103,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENO_BUTTON_SOUND</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -138,7 +138,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENO_BUTTON_RECORD</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -173,7 +173,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENO_BUTTON_VIDEO</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -208,7 +208,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENO_BUTTON_LYRICS</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -243,7 +243,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENO_BUTTON_THEME</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
index a81baa24..0058725e 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
@@ -218,7 +218,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -253,7 +253,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENOGAME_BUTTON_SERVER</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
index a5c78a94..4ad2bbf6 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
@@ -96,7 +96,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index ed5c3e53..aacbc5b3 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -254,7 +254,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -289,7 +289,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENORECORD_BUTTON_DELAYTEST</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
index c351c915..ae35c3bc 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
@@ -138,7 +138,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
index 7a61fd3a..3f0e890c 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsTheme.xml
@@ -268,7 +268,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index 4c20dea6..8d43038f 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -196,7 +196,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -231,7 +231,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
index 06af78f2..28b6f26d 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideoAdjustments.xml
@@ -131,7 +131,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenParty.xml b/Output/Themes/Ambient/Screens/ScreenParty.xml
index 49c7e169..de8283d4 100644
--- a/Output/Themes/Ambient/Screens/ScreenParty.xml
+++ b/Output/Themes/Ambient/Screens/ScreenParty.xml
@@ -264,7 +264,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_START</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -299,7 +299,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
index ed27e0fc..1b052f4a 100644
--- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml
+++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml
@@ -204,7 +204,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonExit">
       <Skin>Button</Skin>
@@ -231,7 +231,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_BACK</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -266,7 +266,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_SAVE</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -301,7 +301,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENPROFILES_BUTTON_NEW</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -336,7 +336,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENPROFILES_BUTTON_DELETE</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -371,7 +371,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENPROFILES_BUTTON_WEBCAM</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -406,7 +406,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENPROFILES_BUTTON_SAVESNAPSHOT</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonDiscardSnapshot">
       <Skin>Button</Skin>
@@ -433,7 +433,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENPROFILES_BUTTON_DISCARDSNAPSHOT</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonTakeSnapshot">
       <Skin>Button</Skin>
@@ -460,7 +460,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENPROFILES_BUTTON_TAKESNAPSHOT</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index 9c2384a1..aee9420a 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -1540,7 +1540,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSING_BUTTON_CANCEL</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -1575,7 +1575,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSING_BUTTON_CONTINUE</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -1610,7 +1610,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSING_BUTTON_SKIP</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index f3c07478..d9f45cd2 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -246,7 +246,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJoker2">
       <Skin>Random</Skin>
@@ -273,7 +273,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJoker3">
       <Skin>Random</Skin>
@@ -300,7 +300,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJoker4">
       <Skin>Random</Skin>
@@ -327,7 +327,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJoker5">
       <Skin>Random</Skin>
@@ -354,7 +354,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonJoker6">
       <Skin>Random</Skin>
@@ -381,7 +381,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsClose">
       <Skin>Button</Skin>
@@ -408,7 +408,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_CANCEL</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsPlaylist">
       <Skin>Button</Skin>
@@ -435,7 +435,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_PLAYLIST</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsSing">
       <Skin>Button</Skin>
@@ -462,7 +462,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_SING</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsRandom">
       <Skin>Button</Skin>
@@ -489,7 +489,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_RANDOM</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsRandomCategory">
       <Skin>Button</Skin>
@@ -516,7 +516,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_RANDOMCAT</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsSingAll">
       <Skin>Button</Skin>
@@ -543,7 +543,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_SINGALL</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsSingAllVisible">
       <Skin>Button</Skin>
@@ -570,7 +570,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_SINGALLVISIBLE</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsOpenSelectedItem">
       <Skin>Button</Skin>
@@ -597,7 +597,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_OPEN_SELECTED_ITEM</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOpenOptions">
       <Skin/>
@@ -624,7 +624,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text />
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonStart">
       <Skin>Button</Skin>
@@ -651,7 +651,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_BUTTON_START</Text>
-        </Text>
+      </Text>
       <Reflection>
         <Height>26</Height>
         <Space>10</Space>
@@ -686,7 +686,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_RANDOMMEDLEY</Text>
-        </Text>
+      </Text>
     </Button>
     <Button Name="ButtonOptionsStartMedley">
       <Skin>Button</Skin>
@@ -713,7 +713,7 @@
         <Style>Bold</Style>
         <Font>Outline</Font>
         <Text>TR_SCREENSONG_BUTTON_STARTMEDLEY</Text>
-        </Text>
+      </Text>
     </Button>
   </Buttons>
   <SongMenus>
@@ -1122,7 +1122,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-            </Text>
+          </Text>
             </ButtonPlaylistName>
       <ButtonPlaylistClose Name="ButtonPlaylistClose">
         <Skin>CloseIcon</Skin>
@@ -1149,7 +1149,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-            </Text>
+          </Text>
             </ButtonPlaylistClose>
       <ButtonPlaylistSave Name="ButtonPlaylistSave">
         <Skin>SaveIcon</Skin>
@@ -1176,7 +1176,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-            </Text>
+          </Text>
             </ButtonPlaylistSave>
       <ButtonPlaylistDelete Name="ButtonPlaylistDelete">
         <Skin>DeleteIcon</Skin>
@@ -1203,7 +1203,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-            </Text>
+          </Text>
             </ButtonPlaylistDelete>
       <ButtonPlaylistSing Name="ButtonPlaylistSing">
         <Skin>SingIcon</Skin>
@@ -1230,7 +1230,7 @@
           <Style>Bold</Style>
           <Font>Outline</Font>
           <Text />
-            </Text>
+          </Text>
             </ButtonPlaylistSing>
       <SelectSlideGameMode>
         <Skin>Button</Skin>