From 37cef42151747db380c831cbbc465ca653b7269a Mon Sep 17 00:00:00 2001
From: Florian Kuepper <florian.kuepper@googlemail.com>
Date: Tue, 12 Jun 2012 18:21:07 +0200
Subject: [PATCH] some theme-fixes & change colors of skins (yellow skin is
 really yellow now and so on...)

---
 Output/Themes/Ambient.xml                     |   7 +-
 .../Ambient/Screens/ScreenOptionsSound.xml    |  12 +-
 Output/Themes/Ambient/Screens/ScreenSing.xml  |  15 +--
 Output/Themes/Ambient/Skin Blue.xml           |   6 +
 Output/Themes/Ambient/Skin Green.xml          | 102 +++++++++--------
 Output/Themes/Ambient/Skin Red.xml            | 104 +++++++++--------
 Output/Themes/Ambient/Skin Yellow.xml         | 108 +++++++++---------
 7 files changed, 180 insertions(+), 174 deletions(-)

diff --git a/Output/Themes/Ambient.xml b/Output/Themes/Ambient.xml
index 25940dca..a1ed18a6 100644
--- a/Output/Themes/Ambient.xml
+++ b/Output/Themes/Ambient.xml
@@ -12,9 +12,6 @@
     <Skin>Cursor</Skin>
     <W>40,000</W>
     <H>40,000</H>
-    <R>0,675</R>
-    <G>0,890</G>
-    <B>0,969</B>
-    <A>1,000</A>
+    <Color>StaticColor</Color>
   </Cursor>
-</root>
\ No newline at end of file
+</root>
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
index 35751819..756d6a5c 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
@@ -40,16 +40,10 @@
       <!--<MaxW>: Maximum text width (if exists)-->
       <!--<Color>: Text color from ColorScheme (high priority)-->
       <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <R>0,68</R>
-      <G>0,89</G>
-      <B>0,97</B>
-      <A>1,00</A>
+      <Color>StaticColor</Color>
       <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
       <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
-      <SR>0,68</SR>
-      <SG>0,89</SG>
-      <SB>0,97</SB>
-      <SA>1,00</SA>
+      <SColor>TextSColor</SColor>
       <!--<Align>: Text align: Left, Center, Right-->
       <Align>Center</Align>
       <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
@@ -394,4 +388,4 @@
       <NumVisible>1</NumVisible>
     </SelectSlideBackgroundMusicSource>
   </ScreenOptionsSound>
-</root>
\ No newline at end of file
+</root>
diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index 5a9c9359..19ad9bea 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -170,10 +170,7 @@
       <H>45</H>
       <!--<Color>: Static color from ColorScheme (high priority)-->
       <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <R>0,00</R>
-      <G>0,00</G>
-      <B>1,00</B>
-      <A>0,50</A>
+	  <Color>LyricHelper</Color>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
@@ -189,10 +186,7 @@
       <H>45</H>
       <!--<Color>: Static color from ColorScheme (high priority)-->
       <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <R>0,00</R>
-      <G>0,00</G>
-      <B>1,00</B>
-      <A>0,50</A>
+      <Color>LyricHelper</Color>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
@@ -208,10 +202,7 @@
       <H>45</H>
       <!--<Color>: Static color from ColorScheme (high priority)-->
       <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <R>0,00</R>
-      <G>0,00</G>
-      <B>1,00</B>
-      <A>0,50</A>
+      <Color>LyricHelper</Color>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml
index cdf16630..35193f64 100644
--- a/Output/Themes/Ambient/Skin Blue.xml	
+++ b/Output/Themes/Ambient/Skin Blue.xml	
@@ -250,6 +250,12 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
+    <LyricHelper>
+      <R>0,00</R>
+      <G>0,00</G>
+      <B>1,00</B>
+      <A>0,50</A>    
+    </LyricHelper>    
     <TimeBar>
       <R>0,800</R>
       <G>0,950</G>
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
index 1d3893fe..3534c3f8 100644
--- a/Output/Themes/Ambient/Skin Green.xml	
+++ b/Output/Themes/Ambient/Skin Green.xml	
@@ -120,86 +120,86 @@
     </Player6Dim2>  
     <BackgroundColor>
       <R>0,000</R>
-      <G>0,000</G>
-      <B>0,750</B>
+      <G>0,750</G>
+      <B>0,000</B>
       <A>1,000</A>
     </BackgroundColor>
     <StaticColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </StaticColor>
     <StaticWarningColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </StaticWarningColor>
     <ButtonColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>0,300</A>
     </ButtonColor>
     <ButtonSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ButtonSColor>
     <ButtonTextColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>0,500</A>
     </ButtonTextColor>
     <ButtonTextSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ButtonTextSColor>
     <SelectSlideColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </SelectSlideColor>
     <SelectSlideHColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </SelectSlideHColor>
     <SelectSlideSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>0,500</A>
     </SelectSlideSColor>
     <ArrowColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>0,300</A>
     </ArrowColor>
     <ArrowSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ArrowSColor>
     <TextColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>0,500</A>
     </TextColor>
     <TextSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,709</R>
+      <G>0,968</G>
+      <B>0,674</B>
       <A>1,000</A>
     </TextSColor>
     <TextWarningColor>
@@ -234,8 +234,8 @@
     </Invisible>
     <LyricHighlight>
       <R>0,000</R>
-      <G>0,000</G>
-      <B>1,000</B>
+      <G>1,000</G>
+      <B>0,000</B>
       <A>1,000</A>
     </LyricHighlight>
     <LyricMainColor>
@@ -250,17 +250,23 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
+    <LyricHelper>
+      <R>0,00</R>
+      <G>1,00</G>
+      <B>0,00</B>
+      <A>0,50</A>    
+    </LyricHelper>
     <TimeBar>
       <R>0,800</R>
-      <G>0,950</G>
-      <B>1,000</B>
+      <G>1,000</G>
+      <B>0,811</B>
       <A>0,500</A>
     </TimeBar>
     <TimeBarSentence>
       <R>0,800</R>
-      <G>0,950</G>
-      <B>1,000</B>
-      <A>0,850</A>
+      <G>1,000</G>
+      <B>0,811</B>
+      <A>0,811</A>
     </TimeBarSentence>
   </ColorSchemes>
   <Skins>
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
index 828c675f..80d8a302 100644
--- a/Output/Themes/Ambient/Skin Red.xml	
+++ b/Output/Themes/Ambient/Skin Red.xml	
@@ -119,87 +119,87 @@
       <A>0,400</A>
     </Player6Dim2>  
     <BackgroundColor>
-      <R>0,000</R>
+      <R>0,750</R>
       <G>0,000</G>
-      <B>0,750</B>
+      <B>0,000</B>
       <A>1,000</A>
     </BackgroundColor>
     <StaticColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </StaticColor>
     <StaticWarningColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </StaticWarningColor>
     <ButtonColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>0,300</A>
     </ButtonColor>
     <ButtonSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ButtonSColor>
     <ButtonTextColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>0,500</A>
     </ButtonTextColor>
     <ButtonTextSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ButtonTextSColor>
     <SelectSlideColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </SelectSlideColor>
     <SelectSlideHColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </SelectSlideHColor>
     <SelectSlideSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>0,500</A>
     </SelectSlideSColor>
     <ArrowColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>0,300</A>
     </ArrowColor>
     <ArrowSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ArrowSColor>
     <TextColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>0,500</A>
     </TextColor>
     <TextSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,674</G>
+      <B>0,674</B>
       <A>1,000</A>
     </TextSColor>
     <TextWarningColor>
@@ -233,9 +233,9 @@
       <A>0,000</A>
     </Invisible>
     <LyricHighlight>
-      <R>0,000</R>
+      <R>1,000</R>
       <G>0,000</G>
-      <B>1,000</B>
+      <B>0,000</B>
       <A>1,000</A>
     </LyricHighlight>
     <LyricMainColor>
@@ -250,16 +250,22 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
+    <LyricHelper>
+      <R>1,00</R>
+      <G>0,00</G>
+      <B>0,00</B>
+      <A>0,50</A>    
+    </LyricHelper>    
     <TimeBar>
-      <R>0,800</R>
-      <G>0,950</G>
-      <B>1,000</B>
+      <R>1,000</R>
+      <G>0,800</G>
+      <B>0,800</B>
       <A>0,500</A>
     </TimeBar>
     <TimeBarSentence>
-      <R>0,800</R>
-      <G>0,950</G>
-      <B>1,000</B>
+      <R>1,000</R>
+      <G>0,800</G>
+      <B>0,800</B>
       <A>0,850</A>
     </TimeBarSentence>
   </ColorSchemes>
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
index 7cbee310..5035f58b 100644
--- a/Output/Themes/Ambient/Skin Yellow.xml	
+++ b/Output/Themes/Ambient/Skin Yellow.xml	
@@ -119,87 +119,87 @@
       <A>0,400</A>
     </Player6Dim2>     
     <BackgroundColor>
-      <R>0,000</R>
-      <G>0,000</G>
-      <B>0,750</B>
+      <R>0,750</R>
+      <G>0,750</G>
+      <B>0,000</B>
       <A>1,000</A>
     </BackgroundColor>
     <StaticColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </StaticColor>
     <StaticWarningColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </StaticWarningColor>
     <ButtonColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>0,300</A>
     </ButtonColor>
     <ButtonSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ButtonSColor>
     <ButtonTextColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>0,500</A>
     </ButtonTextColor>
     <ButtonTextSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ButtonTextSColor>
     <SelectSlideColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </SelectSlideColor>
     <SelectSlideHColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </SelectSlideHColor>
     <SelectSlideSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>0,500</A>
     </SelectSlideSColor>
     <ArrowColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>0,300</A>
     </ArrowColor>
     <ArrowSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </ArrowSColor>
     <TextColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>0,500</A>
     </TextColor>
     <TextSColor>
-      <R>0,675</R>
-      <G>0,890</G>
-      <B>0,969</B>
+      <R>0,968</R>
+      <G>0,956</G>
+      <B>0,674</B>
       <A>1,000</A>
     </TextSColor>
     <TextWarningColor>
@@ -233,9 +233,9 @@
       <A>0,000</A>
     </Invisible>
     <LyricHighlight>
-      <R>0,000</R>
-      <G>0,000</G>
-      <B>1,000</B>
+      <R>1,000</R>
+      <G>1,000</G>
+      <B>0,000</B>
       <A>1,000</A>
     </LyricHighlight>
     <LyricMainColor>
@@ -250,16 +250,22 @@
       <B>0,300</B>
       <A>1,000</A>
     </LyricSubColor>
+    <LyricHelper>
+      <R>1,00</R>
+      <G>1,00</G>
+      <B>0,00</B>
+      <A>0,50</A>    
+    </LyricHelper>    
     <TimeBar>
-      <R>0,800</R>
-      <G>0,950</G>
-      <B>1,000</B>
+      <R>0,949</R>
+      <G>1,000</G>
+      <B>0,800</B>
       <A>0,500</A>
     </TimeBar>
     <TimeBarSentence>
-      <R>0,800</R>
-      <G>0,950</G>
-      <B>1,000</B>
+      <R>0,949</R>
+      <G>1,000</G>
+      <B>0,800</B>
       <A>0,850</A>
     </TimeBarSentence>
   </ColorSchemes>