diff --git a/Output/Themes/Changelog/Changelog_ScreenSing.txt b/Output/Themes/Changelog/Changelog_ScreenSing.txt
index d86c8747..38ce8c20 100644
--- a/Output/Themes/Changelog/Changelog_ScreenSing.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenSing.txt
@@ -1,5 +1,18 @@
 ScreenSing
 
++++++++++
+Version 11
+
+Add:
+<TextPauseSongName>
+
++++++++++
+Version 10
+
+Add:
+<StaticShortInfoTop>
+<TextShortInfoTop>
+
 +++++++++
 Version 9
 
diff --git a/Output/Themes/Vocaluxe 2024/01_Standard.xml b/Output/Themes/Vocaluxe 2024/01_Standard.xml
index 45311157..8b69ac05 100644
--- a/Output/Themes/Vocaluxe 2024/01_Standard.xml	
+++ b/Output/Themes/Vocaluxe 2024/01_Standard.xml	
@@ -337,6 +337,15 @@
     <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
     <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
     <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
     <PointsBar>PointsBar.png</PointsBar>
     <PointsBarBG>PointsBarBG.png</PointsBarBG>
     <LyricHelper>LyricHelper.png</LyricHelper>
@@ -349,6 +358,7 @@
     <SearchBar>SearchBar.png</SearchBar>
     <PlaylistBG>PlaylistBG.png</PlaylistBG>
     <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
diff --git a/Output/Themes/Vocaluxe 2024/02.xml b/Output/Themes/Vocaluxe 2024/02.xml
index cfa4f752..93248793 100644
--- a/Output/Themes/Vocaluxe 2024/02.xml	
+++ b/Output/Themes/Vocaluxe 2024/02.xml	
@@ -337,6 +337,15 @@
     <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
     <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
     <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
     <PointsBar>PointsBar.png</PointsBar>
     <PointsBarBG>PointsBarBG.png</PointsBarBG>
     <LyricHelper>LyricHelper.png</LyricHelper>
@@ -349,6 +358,7 @@
     <SearchBar>SearchBar.png</SearchBar>
     <PlaylistBG>PlaylistBG.png</PlaylistBG>
     <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
diff --git a/Output/Themes/Vocaluxe 2024/03.xml b/Output/Themes/Vocaluxe 2024/03.xml
index 30160d26..74d30611 100644
--- a/Output/Themes/Vocaluxe 2024/03.xml	
+++ b/Output/Themes/Vocaluxe 2024/03.xml	
@@ -337,6 +337,15 @@
     <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
     <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
     <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
     <PointsBar>PointsBar.png</PointsBar>
     <PointsBarBG>PointsBarBG.png</PointsBarBG>
     <LyricHelper>LyricHelper.png</LyricHelper>
@@ -349,6 +358,7 @@
     <SearchBar>SearchBar.png</SearchBar>
     <PlaylistBG>PlaylistBG.png</PlaylistBG>
     <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
diff --git a/Output/Themes/Vocaluxe 2024/04.xml b/Output/Themes/Vocaluxe 2024/04.xml
index 77032064..43a84ebe 100644
--- a/Output/Themes/Vocaluxe 2024/04.xml	
+++ b/Output/Themes/Vocaluxe 2024/04.xml	
@@ -337,6 +337,15 @@
     <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
     <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
     <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
     <PointsBar>PointsBar.png</PointsBar>
     <PointsBarBG>PointsBarBG.png</PointsBarBG>
     <LyricHelper>LyricHelper.png</LyricHelper>
@@ -349,6 +358,7 @@
     <SearchBar>SearchBar.png</SearchBar>
     <PlaylistBG>PlaylistBG.png</PlaylistBG>
     <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
diff --git a/Output/Themes/Vocaluxe 2024/05.xml b/Output/Themes/Vocaluxe 2024/05.xml
index 04e8bdd1..d6e0f581 100644
--- a/Output/Themes/Vocaluxe 2024/05.xml	
+++ b/Output/Themes/Vocaluxe 2024/05.xml	
@@ -337,6 +337,15 @@
     <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
     <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
     <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
     <PointsBar>PointsBar.png</PointsBar>
     <PointsBarBG>PointsBarBG.png</PointsBarBG>
     <LyricHelper>LyricHelper.png</LyricHelper>
@@ -349,6 +358,7 @@
     <SearchBar>SearchBar.png</SearchBar>
     <PlaylistBG>PlaylistBG.png</PlaylistBG>
     <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
diff --git a/Output/Themes/Vocaluxe 2024/06.xml b/Output/Themes/Vocaluxe 2024/06.xml
index b777758b..2110d75c 100644
--- a/Output/Themes/Vocaluxe 2024/06.xml	
+++ b/Output/Themes/Vocaluxe 2024/06.xml	
@@ -337,6 +337,15 @@
     <NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
     <NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
     <NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
+    <RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
+    <RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
+    <RapNoteRight>RapNotesRight.png</RapNoteRight>
+    <RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
+    <RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
+    <RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
+    <RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
+    <RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
+    <RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
     <PointsBar>PointsBar.png</PointsBar>
     <PointsBarBG>PointsBarBG.png</PointsBarBG>
     <LyricHelper>LyricHelper.png</LyricHelper>
@@ -349,6 +358,7 @@
     <SearchBar>SearchBar.png</SearchBar>
     <PlaylistBG>PlaylistBG.png</PlaylistBG>
     <DuetIcon>DuetIcon.png</DuetIcon>
+    <RapIcon>RapIcon.png</RapIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
diff --git a/Output/Themes/Vocaluxe 2024/RapIcon.png b/Output/Themes/Vocaluxe 2024/RapIcon.png
new file mode 100644
index 00000000..cb8676f4
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapIcon.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesBGLeft.png b/Output/Themes/Vocaluxe 2024/RapNotesBGLeft.png
new file mode 100644
index 00000000..0c321303
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesBGLeft.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesBGMid.png b/Output/Themes/Vocaluxe 2024/RapNotesBGMid.png
new file mode 100644
index 00000000..989fa118
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesBGMid.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesBGRight.png b/Output/Themes/Vocaluxe 2024/RapNotesBGRight.png
new file mode 100644
index 00000000..4d3b8238
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesBGRight.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesFillLeft.png b/Output/Themes/Vocaluxe 2024/RapNotesFillLeft.png
new file mode 100644
index 00000000..732b0313
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesFillLeft.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesFillMid.png b/Output/Themes/Vocaluxe 2024/RapNotesFillMid.png
new file mode 100644
index 00000000..172b394a
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesFillMid.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesFillRight.png b/Output/Themes/Vocaluxe 2024/RapNotesFillRight.png
new file mode 100644
index 00000000..2a0c56b4
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesFillRight.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesLeft.png b/Output/Themes/Vocaluxe 2024/RapNotesLeft.png
new file mode 100644
index 00000000..ee6365d9
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesLeft.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesMid.png b/Output/Themes/Vocaluxe 2024/RapNotesMid.png
new file mode 100644
index 00000000..42146d41
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesMid.png differ
diff --git a/Output/Themes/Vocaluxe 2024/RapNotesRight.png b/Output/Themes/Vocaluxe 2024/RapNotesRight.png
new file mode 100644
index 00000000..0de874d0
Binary files /dev/null and b/Output/Themes/Vocaluxe 2024/RapNotesRight.png differ
diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenSing.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenSing.xml
index 44badc9c..a3e0b439 100644
--- a/Output/Themes/Vocaluxe 2024/Screens/ScreenSing.xml	
+++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenSing.xml	
@@ -2,7 +2,7 @@
 <Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Informations>
     <ScreenName>ScreenSing</ScreenName>
-    <ScreenVersion>10</ScreenVersion>
+    <ScreenVersion>11</ScreenVersion>
   </Informations>
   <Backgrounds>
     <Background Name="Background1">
@@ -694,6 +694,20 @@
       <Font>Outline</Font>
       <Text>TR_SCREENSING_PAUSE</Text>
     </Text>
+    <Text Name="TextPauseSongName">
+      <X>640</X>
+      <Y>10</Y>
+      <Z>-2.11</Z>
+      <H>40</H>
+      <MaxW>0</MaxW>
+      <Color Name="White" />
+      <SelColor Name="White" />
+      <Align>Center</Align>
+      <ResizeAlign>Center</ResizeAlign>
+      <Style>Bold</Style>
+      <Font>Normal</Font>
+      <Text></Text>
+    </Text>
     <Text Name="TextDuetName1">
       <X>10</X>
       <Y>55</Y>
@@ -1580,6 +1594,15 @@
       <SkinBackgroundLeft>NoteBackgroundLeft</SkinBackgroundLeft>
       <SkinBackgroundMiddle>NoteBackgroundMiddle</SkinBackgroundMiddle>
       <SkinBackgroundRight>NoteBackgroundRight</SkinBackgroundRight>
+      <SkinRapLeft>RapNoteLeft</SkinRapLeft>
+      <SkinRapMiddle>RapNoteMiddle</SkinRapMiddle>
+      <SkinRapRight>RapNoteRight</SkinRapRight>
+      <SkinRapFillLeft>RapNoteFillLeft</SkinRapFillLeft>
+      <SkinRapFillMiddle>RapNoteFillMiddle</SkinRapFillMiddle>
+      <SkinRapFillRight>RapNoteFillRight</SkinRapFillRight>
+      <SkinRapBackgroundLeft>RapNoteBackgroundLeft</SkinRapBackgroundLeft>
+      <SkinRapBackgroundMiddle>RapNoteBackgroundMiddle</SkinRapBackgroundMiddle>
+      <SkinRapBackgroundRight>RapNoteBackgroundRight</SkinRapBackgroundRight>
       <SkinGoldenStar>Star</SkinGoldenStar>
       <SkinToneHelper>ToneHelper</SkinToneHelper>
       <SkinPerfectNoteStart>Star</SkinPerfectNoteStart>
diff --git a/Output/Themes/Vocaluxe 2024/Screens/ScreenSong.xml b/Output/Themes/Vocaluxe 2024/Screens/ScreenSong.xml
index ad26c314..b80cc556 100644
--- a/Output/Themes/Vocaluxe 2024/Screens/ScreenSong.xml	
+++ b/Output/Themes/Vocaluxe 2024/Screens/ScreenSong.xml	
@@ -213,8 +213,8 @@
       <Font>Outline</Font>
       <Text />
       <Reflection>
-        <Height>13</Height>
-        <Space>33</Space>
+        <Height>20</Height>
+        <Space>30</Space>
       </Reflection>
     </Text>
     <Text Name="TextSearchBarTitle">
@@ -245,8 +245,8 @@
       <Font>Outline</Font>
       <Text />
       <Reflection>
-        <Height>13</Height>
-        <Space>33</Space>
+        <Height>14</Height>
+        <Space>32</Space>
       </Reflection>
     </Text>
     <Text Name="TextOptionsTitle">
@@ -846,6 +846,7 @@
       <CoverBackground>CoverTile</CoverBackground>
       <CoverBigBackground />
       <DuetIcon>DuetIcon</DuetIcon>
+      <RapIcon>RapIcon</RapIcon>
       <VideoIcon>VideoIcon</VideoIcon>
       <MedleyCalcIcon>MedleyCalcIcon</MedleyCalcIcon>
       <MedleyTagIcon>MedleyTagIcon</MedleyTagIcon>
@@ -958,18 +959,29 @@
           <Skin>DuetIcon</Skin>
           <Color Name="StaticColor" />
           <Rect>
-            <X>200</X>
+            <X>160</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
             <Z>-1</Z>
           </Rect>
         </StaticDuetIcon>
+        <StaticRapIcon Name="StaticRapIcon">
+          <Skin>RapIcon</Skin>
+          <Color Name="StaticColor" />
+          <Rect>
+            <X>240</X>
+            <Y>530</Y>
+            <W>40</W>
+            <H>40</H>
+            <Z>-1</Z>
+          </Rect>
+        </StaticRapIcon>
         <StaticVideoIcon Name="StaticVideoIcon">
           <Skin>VideoIcon</Skin>
           <Color Name="StaticColor" />
           <Rect>
-            <X>120</X>
+            <X>80</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
@@ -980,7 +992,7 @@
           <Skin>MedleyCalcIcon</Skin>
           <Color Name="StaticColor" />
           <Rect>
-            <X>280</X>
+            <X>320</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
@@ -991,7 +1003,7 @@
           <Skin>MedleyTagIcon</Skin>
           <Color Name="StaticColor" />
           <Rect>
-            <X>280</X>
+            <X>320</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
@@ -1099,18 +1111,29 @@
           <Skin>DuetIcon</Skin>
           <Color Name="StaticColor" />
           <Rect>
-            <X>200</X>
+            <X>160</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
             <Z>-1</Z>
           </Rect>
         </StaticDuetIcon>
+        <StaticRapIcon Name="StaticRapIcon">
+          <Skin>RapIcon</Skin>
+          <Color Name="StaticColor" />
+          <Rect>
+            <X>240</X>
+            <Y>530</Y>
+            <W>40</W>
+            <H>40</H>
+            <Z>-1</Z>
+          </Rect>
+        </StaticRapIcon>
         <StaticVideoIcon Name="StaticVideoIcon">
           <Skin>VideoIcon</Skin>
           <Color Name="TextColor" />
           <Rect>
-            <X>120</X>
+            <X>80</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
@@ -1121,7 +1144,7 @@
           <Skin>MedleyCalcIcon</Skin>
           <Color Name="TextColor" />
           <Rect>
-            <X>280</X>
+            <X>320</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
@@ -1132,7 +1155,7 @@
           <Skin>MedleyTagIcon</Skin>
           <Color Name="StaticColor" />
           <Rect>
-            <X>280</X>
+            <X>320</X>
             <Y>530</Y>
             <W>40</W>
             <H>40</H>
@@ -1416,7 +1439,7 @@
           <H>35</H>
           <Z>-1.01</Z>
         </Rect>
-        <Color Name="TextColor" />
+        <Color Name="ButtonColor" />
         <SelColor Name="ButtonSelColor" />
         <Text Name="Text">
           <X>180</X>
@@ -1443,7 +1466,7 @@
           <H>35</H>
           <Z>-1.01</Z>
         </Rect>
-        <Color Name="TextColor" />
+        <Color Name="ButtonColor" />
         <SelColor Name="ButtonSelColor" />
         <Text Name="Text">
           <X>180</X>
@@ -1451,7 +1474,7 @@
           <Z>0</Z>
           <H>25</H>
           <MaxW>350</MaxW>
-          <Color Name="TextColor" />
+          <Color Name="ButtonTextColor" />
           <SelColor Name="ButtonTextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Center</ResizeAlign>
@@ -1470,7 +1493,7 @@
           <H>35</H>
           <Z>-1.01</Z>
         </Rect>
-        <Color Name="TextColor" />
+        <Color Name="ButtonColor" />
         <SelColor Name="ButtonSelColor" />
         <Text Name="Text">
           <X>180</X>
@@ -1478,7 +1501,7 @@
           <Z>0</Z>
           <H>25</H>
           <MaxW>350</MaxW>
-          <Color Name="TextColor" />
+          <Color Name="ButtonTextColor" />
           <SelColor Name="ButtonTextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Center</ResizeAlign>
@@ -1497,7 +1520,7 @@
           <H>35</H>
           <Z>-1.01</Z>
         </Rect>
-        <Color Name="TextColor" />
+        <Color Name="ButtonColor" />
         <SelColor Name="ButtonSelColor" />
         <Text Name="Text">
           <X>180</X>
@@ -1505,7 +1528,7 @@
           <Z>0</Z>
           <H>25</H>
           <MaxW>350</MaxW>
-          <Color Name="TextColor" />
+          <Color Name="ButtonTextColor" />
           <SelColor Name="ButtonTextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Center</ResizeAlign>
@@ -1524,7 +1547,7 @@
           <H>35</H>
           <Z>-1.01</Z>
         </Rect>
-        <Color Name="TextColor" />
+        <Color Name="ButtonColor" />
         <SelColor Name="ButtonSelColor" />
         <Text Name="Text">
           <X>180</X>
@@ -1532,7 +1555,7 @@
           <Z>0</Z>
           <H>25</H>
           <MaxW>350</MaxW>
-          <Color Name="TextColor" />
+          <Color Name="ButtonTextColor" />
           <SelColor Name="ButtonTextSelColor" />
           <Align>Center</Align>
           <ResizeAlign>Center</ResizeAlign>