release version 0.1.1

14 files changed, 225 insertions, 153 deletions

diff --git a/HISTORY b/HISTORY
index 1dfcc8a..fa9f931 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,10 +1,14 @@
 VDR Plugin 'skinflat' Revision History
 ---------------------------------------
 
-2013-XX-XX: Version 0.1.1
+2013-22-09: Version 0.1.1
 - [add] show disk usage in topbar @ menu recordings & timer
+- [add] support text progressbar in menu
+- [update] bigger replay progress bar & marks
 - [update] diplay message - position at bottom of screen
 - [update] Makefile, imageloader - use ResourceDirectory instead of ConfigDirectory
+- [update] themes less transparency
+- [update] item padding = 5 pixel (before: 2 pixel)
 
 2013-09-08: Version 0.1.0
 - [add] parameter to set channel logos path (-l --logo)
diff --git a/README b/README
index 7bd9743..ab4904e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
 Written by:                  Martin Schirrmacher <vdr.skinflat@schirrmacher.eu>
-Based on:                    skin-nOpacity from Louis Braun
+Thanks to:                    skin-nOpacity from Louis Braun
                              http://projects.vdr-developer.org/projects/skin-nopacity/
 
 Project's homepage:          http://projects.vdr-developer.org/projects/plg-skinflat/
@@ -22,7 +22,8 @@ Requirements
 
 Description
 -----------
-skinflat ist ein einfacher und schlanker Skin für VDR.
+skinflat ist ein einfacher und schlanker Skin für VDR.
+Der Skin ist schnell und komplett ohne Konfiguration.
 
 Installation 
 ------------
@@ -30,8 +31,8 @@ Installation wie bei allen VDR Plugins.
     make
     make install
 
-Für die Kanallogos empfehle ich die Logos von 3PO Repo (https://github.com/3PO/Senderlogos).
-Diese können mit folgendem Befehl heruntergeladen werden:
+Für die Kanallogos empfehle ich die Logos von 3PO Repo (https://github.com/3PO/Senderlogos).
+Diese können mit folgendem Befehl heruntergeladen werden:
     git clone https://github.com/3PO/Senderlogos.git logos
 Die Logos müssen im folgenden Ordner zur Verfügung gestellt werden:
     <vdrconfigdir>/plugins/skinflat/logos/
diff --git a/baserender.c b/baserender.c
index abbf0a8..a228dd7 100644
--- a/baserender.c
+++ b/baserender.c
@@ -82,6 +82,8 @@ void cFlatBaseRender::TopBarCreate(void) {
 
 void cFlatBaseRender::TopBarSetTitle(cString title) {
     topBarTitle = title;
+    tobBarTitleExtra1 = "";
+    tobBarTitleExtra2 = "";
     topBarUpdateTitle = true;
 }
 
@@ -334,6 +336,11 @@ void cFlatBaseRender::ProgressBarDrawInline(cPixmap *Pixmap, int Left, int Top,
         Pixmap->DrawRectangle(cRect( Left, Middle - 4, (Width * percentLeft), 8), ColorBarFg);
 }
 
+void cFlatBaseRender::ProgressBarMarksCreate(int Left, int Top, int Width, tColor ColorFg, tColor ColorBarFg, tColor ColorBg) {
+    progressBarHeight = 40;
+    ProgressBarCreate(Left, Top, Width, ColorFg, ColorBarFg, ColorBg);
+}
+
 void cFlatBaseRender::ProgressBarCreate(int Left, int Top, int Width, tColor ColorFg, tColor ColorBarFg, tColor ColorBg) {
     progressBarTop = Top;
     progressBarWidth = Width;
@@ -363,6 +370,9 @@ int cFlatBaseRender::ProgressBarHeight(void) {
     return progressBarHeight;
 }
 
+int cFlatBaseRender::ProgressBarMarksHeight(void) {
+    return 40;
+}
 
 void cFlatBaseRender::ProgressBarDrawMarks(int Current, int Total, const cMarks *Marks, tColor Color, tColor ColorCurrent) {
     progressBarColorMark = Color;
@@ -371,6 +381,11 @@ void cFlatBaseRender::ProgressBarDrawMarks(int Current, int Total, const cMarks
     
     int top = progressBarHeight / 2;
     progressBarPixmap->Fill( progressBarColorBg );
+
+    int sml = progressBarHeight / 10 * 2;
+    if( sml <= 4 )
+        sml = 4;
+    int big = progressBarHeight - sml*2 - 2;
     
     if( !Marks ) {
         progressBarColorFg = progressBarColorBarCurFg;
@@ -388,7 +403,7 @@ void cFlatBaseRender::ProgressBarDrawMarks(int Current, int Total, const cMarks
     }
 
     // the small line
-    progressBarPixmap->DrawRectangle(cRect( 0, top - 1, progressBarWidth, 2), progressBarColorFg);
+    progressBarPixmap->DrawRectangle(cRect( 0, top - sml/2, progressBarWidth, sml), progressBarColorFg);
         
     bool Start = true;
     for( const cMark *m = Marks->First(); m; m = Marks->Next(m) ) {
@@ -400,13 +415,16 @@ void cFlatBaseRender::ProgressBarDrawMarks(int Current, int Total, const cMarks
         Start = !Start;
     }
     if( !Start ) {
-        progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - 3, progressBarWidth - posMarkLast, 6), progressBarColorBarFg);
+        progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - big/2, progressBarWidth - posMarkLast, big), progressBarColorBarFg);
         if( posCurrent > posMarkLast )
-            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - 3, posCurrent - posMarkLast, 6), progressBarColorBarCurFg);
+            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - big/2, posCurrent - posMarkLast, big), progressBarColorBarCurFg);
     } else {
         // marker
-        progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - 1, posCurrent - posMarkLast, 2), progressBarColorBarCurFg);
-        progressBarPixmap->DrawRectangle(cRect( posCurrent - 3, top-3, 6, 6), progressBarColorBarCurFg);
+        progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - sml/2, posCurrent - posMarkLast, sml), progressBarColorBarCurFg);
+        progressBarPixmap->DrawRectangle(cRect( posCurrent - big/2, top - big/2, big, big), progressBarColorBarCurFg);
+
+        if( posCurrent > posMarkLast + sml/2 )
+            progressBarPixmap->DrawRectangle(cRect( posMarkLast - sml/2, 0, sml, progressBarHeight), progressBarColorMark);
     }
 }
 
@@ -417,44 +435,59 @@ int cFlatBaseRender::ProgressBarMarkPos(int P, int Total) {
 void cFlatBaseRender::ProgressBarDrawMark(int posMark, int posMarkLast, int posCurrent, bool Start, bool isCurrent)
 {
     int top = progressBarHeight / 2;
+    int sml = progressBarHeight / 10 * 2;
+    if( sml <= 4 )
+        sml = 4;
+    int big = progressBarHeight - sml*2 - 2;
     
+    int mbig = progressBarHeight*2;
+    if( progressBarHeight > 15 )
+        mbig = progressBarHeight;
+
+    // marker vertical line
+    if( posCurrent == posMark )
+        progressBarPixmap->DrawRectangle(cRect( posMark - sml, 0, sml*2, progressBarHeight), progressBarColorMarkCurrent);
+    else
+        progressBarPixmap->DrawRectangle(cRect( posMark - sml/2, 0, sml, progressBarHeight), progressBarColorMark);
+
     if( Start ) {
         if( posCurrent > posMark )
-            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - 1, posMark - posMarkLast, 2), progressBarColorBarCurFg);
+            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - sml/2, posMark - posMarkLast, sml), progressBarColorBarCurFg);
         else {
             // marker
-            progressBarPixmap->DrawRectangle(cRect( posCurrent - 3, top-3, 6, 6), progressBarColorBarCurFg);
+            progressBarPixmap->DrawRectangle(cRect( posCurrent - big/2, top - big/2, big, big), progressBarColorBarCurFg);
             if( posCurrent > posMarkLast )
-                progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - 1, posCurrent - posMarkLast, 2), progressBarColorBarCurFg);
+                progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - sml/2, posCurrent - posMarkLast, sml), progressBarColorBarCurFg);
         }
-        
+        // marker top
         if( isCurrent )
-            progressBarPixmap->DrawRectangle(cRect( posMark-5, 0, 10, 3), progressBarColorMarkCurrent);
+            progressBarPixmap->DrawRectangle(cRect( posMark - mbig/2, 0, mbig, sml), progressBarColorMarkCurrent);
         else
-            progressBarPixmap->DrawRectangle(cRect( posMark-3, 0, 6, 3), progressBarColorMark);
+            progressBarPixmap->DrawRectangle(cRect( posMark - mbig/2, 0, mbig, sml), progressBarColorMark);
     } else {
-        if( posCurrent > posMark )
-            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top-3, posMark - posMarkLast, 6), progressBarColorBarCurFg);
-        else {
-            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top-3, posMark - posMarkLast, 6), progressBarColorBarFg);
-            if( posCurrent > posMarkLast )
-                progressBarPixmap->DrawRectangle(cRect( posMarkLast, top-3, posCurrent - posMarkLast, 6), progressBarColorBarCurFg);
+        // big line
+        if( posCurrent > posMark ) {
+            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - big/2, posMark - posMarkLast, big), progressBarColorBarCurFg);
+            // draw last marker top
+            progressBarPixmap->DrawRectangle(cRect( posMarkLast - mbig/2, 0, mbig, marginItem/2), progressBarColorMark);
+        } else {
+            progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - big/2, posMark - posMarkLast, big), progressBarColorBarFg);
+            if( posCurrent > posMarkLast ) {
+                progressBarPixmap->DrawRectangle(cRect( posMarkLast, top - big/2, posCurrent - posMarkLast, big), progressBarColorBarCurFg);
+                // draw last marker top
+                progressBarPixmap->DrawRectangle(cRect( posMarkLast - mbig/2, 0, mbig, marginItem/2), progressBarColorMark);
+            }
         }
-
+        // marker bottom
         if( isCurrent )
-            progressBarPixmap->DrawRectangle(cRect( posMark-5, progressBarHeight - 3, 10, 3), progressBarColorMarkCurrent);
+            progressBarPixmap->DrawRectangle(cRect( posMark - mbig/2, progressBarHeight - sml, mbig, sml), progressBarColorMarkCurrent);
         else
-            progressBarPixmap->DrawRectangle(cRect( posMark-3, progressBarHeight - 3, 6, 3), progressBarColorMark);
+            progressBarPixmap->DrawRectangle(cRect( posMark - mbig/2, progressBarHeight - sml, mbig, sml), progressBarColorMark);
     }
     
-    if( posCurrent == posMark )
-        progressBarPixmap->DrawRectangle(cRect( posMark-2, 0, 4, progressBarHeight), progressBarColorMarkCurrent);
-    else
-        progressBarPixmap->DrawRectangle(cRect( posMark-1, 0, 2, progressBarHeight), progressBarColorMark);
-
     if( posCurrent == posMarkLast )
-        progressBarPixmap->DrawRectangle(cRect( posMarkLast-2, 0, 4, progressBarHeight), progressBarColorMarkCurrent);
+        progressBarPixmap->DrawRectangle(cRect( posMarkLast - sml, 0, sml*2, progressBarHeight), progressBarColorMarkCurrent);
     else
-        progressBarPixmap->DrawRectangle(cRect( posMarkLast-1, 0, 2, progressBarHeight), progressBarColorMark);
-        
+        progressBarPixmap->DrawRectangle(cRect( posMarkLast - sml/2, 0, sml, progressBarHeight), progressBarColorMark);
+    
 }
diff --git a/baserender.h b/baserender.h
index 4f0e3f7..04c0040 100644
--- a/baserender.h
+++ b/baserender.h
@@ -78,8 +78,10 @@ class cFlatBaseRender
         void MessageClear(void);
 
         void ProgressBarCreate(int Left, int Top, int Width, tColor ColorFg, tColor ColorBarFg, tColor ColorBg);
+        void ProgressBarMarksCreate(int Left, int Top, int Width, tColor ColorFg, tColor ColorBarFg, tColor ColorBg);
         void ProgressBarDraw(int Current, int Total);
         int ProgressBarHeight(void);
+        int ProgressBarMarksHeight(void);
         void ProgressBarDrawMarks(int Current, int Total, const cMarks *Marks, tColor Color, tColor ColorCurrent);
         void ProgressBarDrawInline(cPixmap *Pixmap, int Left, int Top, int Width, int Height, int Current, int Total, tColor ColorFg, tColor ColorBarFg, tColor ColorBg);        
         
diff --git a/displaymenu.c b/displaymenu.c
index dd8f232..864fdd0 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -8,8 +8,9 @@ cFlatDisplayMenu::cFlatDisplayMenu(void) {
 
     VideoDiskUsageState = -1;
 
-    itemHeight = fontHeight + 2;
-    itemChannelHeight = fontHeight + 2;
+    itemPadding = 5;
+    itemHeight = fontHeight + itemPadding;
+    itemChannelHeight = fontHeight + itemPadding;
     
     scrollBarWidth = 20;
     scrollBarHeight = osdHeight - (topBarHeight + buttonsHeight + marginItem*3 );
@@ -57,7 +58,7 @@ void cFlatDisplayMenu::SetScrollbar(int Total, int Offset) {
 }
 
 void cFlatDisplayMenu::Scroll(bool Up, bool Page) {
-    // Wird das Menü gescrollt oder Content?
+    // Wird das Menü gescrollt oder Content?
     if( ContentIsShown() )
     {
         bool scrolled = ContentScroll(Up, Page);
@@ -79,9 +80,9 @@ int cFlatDisplayMenu::MaxItems(void) {
 
 int cFlatDisplayMenu::ItemsHeight(void) {
     if( menuCategory == mcChannel )
-        return MaxItems() * itemChannelHeight -2;
+        return MaxItems() * itemChannelHeight -itemPadding;
 
-    return MaxItems() * itemHeight -2;
+    return MaxItems() * itemHeight -itemPadding;
 }
 
 void cFlatDisplayMenu::Clear(void) {
@@ -149,8 +150,8 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S
                     ColorBarFg = Theme.Color(clrMenuItemCurProgressBarFg);
                     ColorBg = Theme.Color(clrMenuItemCurProgressBg);
                 }
-                menuPixmap->DrawRectangle(cRect(xt - 10, y, 10, itemHeight-2), ColorBg);
-                DrawProgressBarFromText(y + (itemHeight-2)/2 - (itemHeight-2)/2, xt, colWidth, s, ColorFg, ColorBarFg, ColorBg);
+                menuPixmap->DrawRectangle(cRect(xt - 10, y, 10, itemHeight-itemPadding), ColorBg);
+                DrawProgressBarFromText(y + (itemHeight-itemPadding)/2 - (itemHeight-itemPadding)/2, xt, colWidth, s, ColorFg, ColorBarFg, ColorBg);
             } else {
                 menuPixmap->DrawText(cPoint(xt, y), s, ColorFg, ColorBg, font, menuWidth - xt);
             }
@@ -188,7 +189,7 @@ void cFlatDisplayMenu::DrawProgressBarFromText(int Top, int Left, int Width, con
     }
     if (isProgressbar) {
         double progress = (double)now/(double)total;
-        ProgressBarDrawInline(menuPixmap, Left, Top, Width, itemHeight-2, progress*total, total,
+        ProgressBarDrawInline(menuPixmap, Left, Top, Width, itemHeight-itemPadding, progress*total, total,
             ColorFg, ColorBarFg, ColorBg);
     }
 }
diff --git a/displaymenu.h b/displaymenu.h
index e3be9fc..0040e9e 100644
--- a/displaymenu.h
+++ b/displaymenu.h
@@ -16,6 +16,7 @@ class cFlatDisplayMenu : public cFlatBaseRender,  public cSkinDisplayMenu {
         cPixmap *scrollbarPixmap;
         int scrollBarTop, scrollBarWidth, scrollBarHeight;
 
+        int itemPadding;
         int itemHeight, itemChannelHeight;
 
         void DrawScrollbar(int Total, int Offset, int Shown, int Top, int Height, bool CanScrollUp, bool CanScrollDown);
diff --git a/displayreplay.c b/displayreplay.c
index d916850..204cbc0 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -12,7 +12,7 @@ cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
     labelPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight, osdWidth, labelHeight));
     iconsPixmap = osd->CreatePixmap(2, cRect(0, osdHeight - labelHeight, osdWidth, labelHeight));
     
-    ProgressBarCreate(0, osdHeight - labelHeight - ProgressBarHeight(), osdWidth,
+    ProgressBarMarksCreate(0, osdHeight - labelHeight - ProgressBarMarksHeight(), osdWidth,
         Theme.Color(clrReplayProgressFg), Theme.Color(clrReplayProgressBarFg), Theme.Color(clrReplayProgressBg));
 
     labelJump = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight - ProgressBarHeight() - marginItem - fontHeight, osdWidth, fontHeight));
diff --git a/flat.h b/flat.h
index 506557c..366c218 100644
--- a/flat.h
+++ b/flat.h
@@ -22,13 +22,13 @@ extern cTheme Theme;
 #define CLR_MESSAGEERROR                    0xFFBB0000
 
 // TopBar
-THEME_CLR(Theme, clrTopBarBg,               0xB0101010);
+THEME_CLR(Theme, clrTopBarBg,               0xD0101010);
 THEME_CLR(Theme, clrTopBarFont,             0xFFEEEEEE);
 THEME_CLR(Theme, clrTopBarTimeFont,         0xFFEEEEEE);
 THEME_CLR(Theme, clrTopBarDateFont,         0xFFA0A0A0);
 
 // Buttons
-THEME_CLR(Theme, clrButtonBg,               0xB0101010);
+THEME_CLR(Theme, clrButtonBg,               0xD0101010);
 THEME_CLR(Theme, clrButtonFont,             0xFFEEEEEE);
 THEME_CLR(Theme, clrButtonRed,              CLR_BUTTONRED);
 THEME_CLR(Theme, clrButtonGreen,            CLR_BUTTONGREEN);
@@ -36,7 +36,7 @@ THEME_CLR(Theme, clrButtonYellow,           CLR_BUTTONYELLOW);
 THEME_CLR(Theme, clrButtonBlue,             CLR_BUTTONBLUE);
 
 // Messages
-THEME_CLR(Theme, clrMessageBg,              0xB0101010);
+THEME_CLR(Theme, clrMessageBg,              0xD0101010);
 THEME_CLR(Theme, clrMessageFont,            0xFFEEEEEE);
 
 THEME_CLR(Theme, clrMessageStatus,          CLR_MESSAGESTATUS);
@@ -45,67 +45,67 @@ THEME_CLR(Theme, clrMessageWarning,         CLR_MESSAGEWARNING);
 THEME_CLR(Theme, clrMessageError,           CLR_MESSAGEERROR);
 
 // Channel
-THEME_CLR(Theme, clrChannelBg,              0xB0101010);
+THEME_CLR(Theme, clrChannelBg,              0xD0101010);
 THEME_CLR(Theme, clrChannelFontTitle,       0xFF3090B0);
 THEME_CLR(Theme, clrChannelFontEpg,         0xFFEEEEEE);
 THEME_CLR(Theme, clrChannelFontEpgFollow,   0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelProgressFg,      0xFF3090B0);
 THEME_CLR(Theme, clrChannelProgressBarFg,   0xFF3090B0);
-THEME_CLR(Theme, clrChannelProgressBg,      0xB0101010);
+THEME_CLR(Theme, clrChannelProgressBg,      0xD0101010);
 
 // Menu
-THEME_CLR(Theme, clrItemBg,                 0xB0909090);
+THEME_CLR(Theme, clrItemBg,                 0xD0909090);
 THEME_CLR(Theme, clrItemFont,               0xFFEEEEEE);
-THEME_CLR(Theme, clrItemCurrentBg,          0xB03090B0);
+THEME_CLR(Theme, clrItemCurrentBg,          0xD03090B0);
 THEME_CLR(Theme, clrItemCurrentFont,        0xFFEEEEEE);
-THEME_CLR(Theme, clrItemSelableBg,          0xB0101010);
+THEME_CLR(Theme, clrItemSelableBg,          0xD0101010);
 THEME_CLR(Theme, clrItemSelableFont,        0xFFEEEEEE);
 THEME_CLR(Theme, clrScrollbarFg,            0xFF3090B0);
 THEME_CLR(Theme, clrScrollbarBarFg,         0xFF3090B0);
-THEME_CLR(Theme, clrScrollbarBg,            0xB0101010);
+THEME_CLR(Theme, clrScrollbarBg,            0xD0101010);
 // Menu Event
-THEME_CLR(Theme, clrMenuEventBg,            0xB0101010);
+THEME_CLR(Theme, clrMenuEventBg,            0xD0101010);
 THEME_CLR(Theme, clrMenuEventFontTitle,     0xFF3090B0);
 THEME_CLR(Theme, clrMenuEventFontInfo,      0xFFEEEEEE);
 // Menu Recording
-THEME_CLR(Theme, clrMenuRecBg,              0xB0101010);
+THEME_CLR(Theme, clrMenuRecBg,              0xD0101010);
 THEME_CLR(Theme, clrMenuRecFontTitle,       0xFF3090B0);
 THEME_CLR(Theme, clrMenuRecFontInfo,        0xFFEEEEEE);
 // Menu Text (Multiline)
-THEME_CLR(Theme, clrMenuTextBg,             0xB0101010);
+THEME_CLR(Theme, clrMenuTextBg,             0xD0101010);
 THEME_CLR(Theme, clrMenuTextFont,           0xFFEEEEEE);
 
 // Menu Items
 THEME_CLR(Theme, clrMenuItemProgressFg,      0xFFEEEEEE);
 THEME_CLR(Theme, clrMenuItemProgressBarFg,   0xFFEEEEEE);
-THEME_CLR(Theme, clrMenuItemProgressBg,      0xB0101010);
+THEME_CLR(Theme, clrMenuItemProgressBg,      0xD0101010);
 THEME_CLR(Theme, clrMenuItemCurProgressFg,      0xFFEEEEEE);
 THEME_CLR(Theme, clrMenuItemCurProgressBarFg,   0xFFEEEEEE);
-THEME_CLR(Theme, clrMenuItemCurProgressBg,      0xB03090B0);
+THEME_CLR(Theme, clrMenuItemCurProgressBg,      0xD03090B0);
 
 // Replay
-THEME_CLR(Theme, clrReplayBg,               0xB0101010);
+THEME_CLR(Theme, clrReplayBg,               0xD0101010);
 THEME_CLR(Theme, clrReplayFont,             0xFFEEEEEE);
 THEME_CLR(Theme, clrReplayFontSpeed,        0xFF3090B0);
 THEME_CLR(Theme, clrReplayProgressFg,       0xFFEEEEEE);
 THEME_CLR(Theme, clrReplayProgressBarFg,    0xFFEEEEEE);
 THEME_CLR(Theme, clrReplayProgressBarCurFg, 0xFF3090B0);
-THEME_CLR(Theme, clrReplayProgressBg,       0xB0101010);
+THEME_CLR(Theme, clrReplayProgressBg,       0xD0101010);
 THEME_CLR(Theme, clrReplayMarkFg,           0xFFEEEEEE);
 THEME_CLR(Theme, clrReplayMarkCurrentFg,    0xFF3090B0);
 
 // Tracks
-THEME_CLR(Theme, clrTrackItemBg,            0xB0101010);
+THEME_CLR(Theme, clrTrackItemBg,            0xD0101010);
 THEME_CLR(Theme, clrTrackItemFont,          0xFFEEEEEE);
-THEME_CLR(Theme, clrTrackItemCurrentBg,     0xB03090B0);
+THEME_CLR(Theme, clrTrackItemCurrentBg,     0xD03090B0);
 THEME_CLR(Theme, clrTrackItemCurrentFont,   0xFFEEEEEE);
 
 // Volume
-THEME_CLR(Theme, clrVolumeBg,               0xB0101010);
+THEME_CLR(Theme, clrVolumeBg,               0xD0101010);
 THEME_CLR(Theme, clrVolumeFont,             0xFFEEEEEE);
 THEME_CLR(Theme, clrVolumeProgressFg,       0xFF3090B0);
 THEME_CLR(Theme, clrVolumeProgressBarFg,    0xFF3090B0);
-THEME_CLR(Theme, clrVolumeProgressBg,       0xB0101010);
+THEME_CLR(Theme, clrVolumeProgressBg,       0xD0101010);
 
 class cFlat : public cSkin {
     private:
diff --git a/skinflat.c b/skinflat.c
index d565bb1..1a46a3c 100644
--- a/skinflat.c
+++ b/skinflat.c
@@ -14,7 +14,7 @@
 
 #include "flat.h"
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = "skin flat";
 
 class cPluginFlat : public cPlugin {
diff --git a/themes/flat-dark+gold.theme b/themes/flat-dark+gold.theme
index 86afa7b..0f77abd 100644
--- a/themes/flat-dark+gold.theme
+++ b/themes/flat-dark+gold.theme
@@ -1,59 +1,65 @@
 Description = dark+gold
-clrTopBarBg = B0101010
+clrTopBarBg = C0101010
 clrTopBarFont = FFEEEEEE
 clrTopBarTimeFont = FFEEEEEE
 clrTopBarDateFont = FFA0A0A0
-clrButtonBg = B0101010
+clrButtonBg = C0101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFBB0000
 clrButtonGreen = FF00BB00
 clrButtonYellow = FFBBBB00
 clrButtonBlue = FF0000BB
-clrMessageBg = B0101010
+clrMessageBg = C0101010
 clrMessageFont = FFEEEEEE
 clrMessageStatus = FF0000FF
 clrMessageInfo = FF009900
 clrMessageWarning = FFBBBB00
 clrMessageError = FFBB0000
-clrChannelBg = B0101010
+clrChannelBg = C0101010
 clrChannelFontTitle = FFFFD700
 clrChannelFontEpg = FFEEEEEE
 clrChannelFontEpgFollow = FFA0A0A0
 clrChannelProgressFg = FFFFD700
 clrChannelProgressBarFg = FFFFD700
-clrChannelProgressBg = B0101010
-clrItemBg = B0909090
+clrChannelProgressBg = C0101010
+clrItemBg = C0909090
 clrItemFont = FFEEEEEE
-clrItemCurrentBg = B0FFD700
+clrItemCurrentBg = C0FFD700
 clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = B0101010
+clrItemSelableBg = C0101010
 clrItemSelableFont = FFEEEEEE
 clrScrollbarFg = FFFFD700
 clrScrollbarBarFg = FFFFD700
-clrScrollbarBg = B0101010
-clrMenuEventBg = B0101010
+clrScrollbarBg = C0101010
+clrMenuEventBg = C0101010
 clrMenuEventFontTitle = FFFFD700
 clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = B0101010
+clrMenuRecBg = C0101010
 clrMenuRecFontTitle = FFFFD700
 clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = B0101010
+clrMenuTextBg = C0101010
 clrMenuTextFont = FFEEEEEE
-clrReplayBg = B0101010
+clrMenuItemProgressFg = FFEEEEEE
+clrMenuItemProgressBarFg = FFEEEEEE
+clrMenuItemProgressBg = C0101010
+clrMenuItemCurProgressFg = FFEEEEEE
+clrMenuItemCurProgressBarFg = FFEEEEEE
+clrMenuItemCurProgressBg = C0FFD700
+clrReplayBg = C0101010
 clrReplayFont = FFEEEEEE
 clrReplayFontSpeed = FFFFD700
 clrReplayProgressFg = FFEEEEEE
 clrReplayProgressBarFg = FFEEEEEE
 clrReplayProgressBarCurFg = FFFFD700
-clrReplayProgressBg = B0101010
+clrReplayProgressBg = C0101010
 clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FFFFD700
-clrTrackItemBg = B0101010
+clrTrackItemBg = C0101010
 clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = B0FFD700
+clrTrackItemCurrentBg = C0FFD700
 clrTrackItemCurrentFont = FFEEEEEE
-clrVolumeBg = B0101010
+clrVolumeBg = C0101010
 clrVolumeFont = FFEEEEEE
 clrVolumeProgressFg = FFFFD700
 clrVolumeProgressBarFg = FFFFD700
-clrVolumeProgressBg = B0101010
+clrVolumeProgressBg = C0101010
diff --git a/themes/flat-dark+green.theme b/themes/flat-dark+green.theme
index 89a22be..b096db9 100644
--- a/themes/flat-dark+green.theme
+++ b/themes/flat-dark+green.theme
@@ -1,59 +1,65 @@
 Description = dark+green
-clrTopBarBg = B0101010
+clrTopBarBg = C0101010
 clrTopBarFont = FFEEEEEE
 clrTopBarTimeFont = FFEEEEEE
 clrTopBarDateFont = FFA0A0A0
-clrButtonBg = B0101010
+clrButtonBg = C0101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFBB0000
 clrButtonGreen = FF00BB00
 clrButtonYellow = FFBBBB00
 clrButtonBlue = FF0000BB
-clrMessageBg = B0101010
+clrMessageBg = C0101010
 clrMessageFont = FFEEEEEE
 clrMessageStatus = FF0000FF
 clrMessageInfo = FF009900
 clrMessageWarning = FFBBBB00
 clrMessageError = FFBB0000
-clrChannelBg = B0101010
+clrChannelBg = C0101010
 clrChannelFontTitle = FF00A900
 clrChannelFontEpg = FFEEEEEE
 clrChannelFontEpgFollow = FFA0A0A0
 clrChannelProgressFg = FF00A900
 clrChannelProgressBarFg = FF00A900
-clrChannelProgressBg = B0101010
-clrItemBg = B0909090
+clrChannelProgressBg = C0101010
+clrItemBg = C0909090
 clrItemFont = FFEEEEEE
-clrItemCurrentBg = B000A900
+clrItemCurrentBg = C000A900
 clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = B0101010
+clrItemSelableBg = C0101010
 clrItemSelableFont = FFEEEEEE
 clrScrollbarFg = FF00A900
 clrScrollbarBarFg = FF00A900
-clrScrollbarBg = B0101010
-clrMenuEventBg = B0101010
+clrScrollbarBg = C0101010
+clrMenuEventBg = C0101010
 clrMenuEventFontTitle = FF00A900
 clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = B0101010
+clrMenuRecBg = C0101010
 clrMenuRecFontTitle = FF00A900
 clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = B0101010
+clrMenuTextBg = C0101010
 clrMenuTextFont = FFEEEEEE
-clrReplayBg = B0101010
+clrMenuItemProgressFg = FFEEEEEE
+clrMenuItemProgressBarFg = FFEEEEEE
+clrMenuItemProgressBg = C0101010
+clrMenuItemCurProgressFg = FFEEEEEE
+clrMenuItemCurProgressBarFg = FFEEEEEE
+clrMenuItemCurProgressBg = C000A900
+clrReplayBg = C0101010
 clrReplayFont = FFEEEEEE
 clrReplayFontSpeed = FF00A900
 clrReplayProgressFg = FFEEEEEE
 clrReplayProgressBarFg = FFEEEEEE
 clrReplayProgressBarCurFg = FF00A900
-clrReplayProgressBg = B0101010
+clrReplayProgressBg = C0101010
 clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF00A900
-clrTrackItemBg = B0101010
+clrTrackItemBg = C0101010
 clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = B000A900
+clrTrackItemCurrentBg = C000A900
 clrTrackItemCurrentFont = FFEEEEEE
-clrVolumeBg = B0101010
+clrVolumeBg = C0101010
 clrVolumeFont = FFEEEEEE
 clrVolumeProgressFg = FF00A900
 clrVolumeProgressBarFg = FF00A900
-clrVolumeProgressBg = B0101010
+clrVolumeProgressBg = C0101010
diff --git a/themes/flat-dark+red.theme b/themes/flat-dark+red.theme
index f5e29a5..4a93af5 100644
--- a/themes/flat-dark+red.theme
+++ b/themes/flat-dark+red.theme
@@ -1,59 +1,65 @@
 Description = dark+red
-clrTopBarBg = B0101010
+clrTopBarBg = C0101010
 clrTopBarFont = FFEEEEEE
 clrTopBarTimeFont = FFEEEEEE
 clrTopBarDateFont = FFA0A0A0
-clrButtonBg = B0101010
+clrButtonBg = C0101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFBB0000
 clrButtonGreen = FF00BB00
 clrButtonYellow = FFBBBB00
 clrButtonBlue = FF0000BB
-clrMessageBg = B0101010
+clrMessageBg = C0101010
 clrMessageFont = FFEEEEEE
 clrMessageStatus = FF0000FF
 clrMessageInfo = FF009900
 clrMessageWarning = FFBBBB00
 clrMessageError = FFBB0000
-clrChannelBg = B0101010
+clrChannelBg = C0101010
 clrChannelFontTitle = FF950000
 clrChannelFontEpg = FFEEEEEE
 clrChannelFontEpgFollow = FFA0A0A0
 clrChannelProgressFg = FF950000
 clrChannelProgressBarFg = FF950000
-clrChannelProgressBg = B0101010
-clrItemBg = B0909090
+clrChannelProgressBg = C0101010
+clrItemBg = C0909090
 clrItemFont = FFEEEEEE
-clrItemCurrentBg = B0950000
+clrItemCurrentBg = C0950000
 clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = B0101010
+clrItemSelableBg = C0101010
 clrItemSelableFont = FFEEEEEE
 clrScrollbarFg = FF950000
 clrScrollbarBarFg = FF950000
-clrScrollbarBg = B0101010
-clrMenuEventBg = B0101010
+clrScrollbarBg = C0101010
+clrMenuEventBg = C0101010
 clrMenuEventFontTitle = FF950000
 clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = B0101010
+clrMenuRecBg = C0101010
 clrMenuRecFontTitle = FF950000
 clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = B0101010
+clrMenuTextBg = C0101010
 clrMenuTextFont = FFEEEEEE
-clrReplayBg = B0101010
+clrMenuItemProgressFg = FFEEEEEE
+clrMenuItemProgressBarFg = FFEEEEEE
+clrMenuItemProgressBg = C0101010
+clrMenuItemCurProgressFg = FFEEEEEE
+clrMenuItemCurProgressBarFg = FFEEEEEE
+clrMenuItemCurProgressBg = C0950000
+clrReplayBg = C0101010
 clrReplayFont = FFEEEEEE
 clrReplayFontSpeed = FF950000
 clrReplayProgressFg = FFEEEEEE
 clrReplayProgressBarFg = FFEEEEEE
 clrReplayProgressBarCurFg = FF950000
-clrReplayProgressBg = B0101010
+clrReplayProgressBg = C0101010
 clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF950000
-clrTrackItemBg = B0101010
+clrTrackItemBg = C0101010
 clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = B0950000
+clrTrackItemCurrentBg = C0950000
 clrTrackItemCurrentFont = FFEEEEEE
-clrVolumeBg = B0101010
+clrVolumeBg = C0101010
 clrVolumeFont = FFEEEEEE
 clrVolumeProgressFg = FF950000
 clrVolumeProgressBarFg = FF950000
-clrVolumeProgressBg = B0101010
+clrVolumeProgressBg = C0101010
diff --git a/themes/flat-default.theme b/themes/flat-default.theme
index 1225c31..ee2b546 100644
--- a/themes/flat-default.theme
+++ b/themes/flat-default.theme
@@ -1,59 +1,65 @@
 Description = Default
-clrTopBarBg = B0101010
+clrTopBarBg = C0101010
 clrTopBarFont = FFEEEEEE
 clrTopBarTimeFont = FFEEEEEE
 clrTopBarDateFont = FFA0A0A0
-clrButtonBg = B0101010
+clrButtonBg = C0101010
 clrButtonFont = FFEEEEEE
 clrButtonRed = FFBB0000
 clrButtonGreen = FF00BB00
 clrButtonYellow = FFBBBB00
 clrButtonBlue = FF0000BB
-clrMessageBg = B0101010
+clrMessageBg = C0101010
 clrMessageFont = FFEEEEEE
 clrMessageStatus = FF0000FF
 clrMessageInfo = FF009900
 clrMessageWarning = FFBBBB00
 clrMessageError = FFBB0000
-clrChannelBg = B0101010
+clrChannelBg = C0101010
 clrChannelFontTitle = FF3090B0
 clrChannelFontEpg = FFEEEEEE
 clrChannelFontEpgFollow = FFA0A0A0
 clrChannelProgressFg = FF3090B0
 clrChannelProgressBarFg = FF3090B0
-clrChannelProgressBg = B0101010
-clrItemBg = B0909090
+clrChannelProgressBg = C0101010
+clrItemBg = C0909090
 clrItemFont = FFEEEEEE
-clrItemCurrentBg = B03090B0
+clrItemCurrentBg = C03090B0
 clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = B0101010
+clrItemSelableBg = C0101010
 clrItemSelableFont = FFEEEEEE
 clrScrollbarFg = FF3090B0
 clrScrollbarBarFg = FF3090B0
-clrScrollbarBg = B0101010
-clrMenuEventBg = B0101010
+clrScrollbarBg = C0101010
+clrMenuEventBg = C0101010
 clrMenuEventFontTitle = FF3090B0
 clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = B0101010
+clrMenuRecBg = C0101010
 clrMenuRecFontTitle = FF3090B0
 clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = B0101010
+clrMenuTextBg = C0101010
 clrMenuTextFont = FFEEEEEE
-clrReplayBg = B0101010
+clrMenuItemProgressFg = FFEEEEEE
+clrMenuItemProgressBarFg = FFEEEEEE
+clrMenuItemProgressBg = C0101010
+clrMenuItemCurProgressFg = FFEEEEEE
+clrMenuItemCurProgressBarFg = FFEEEEEE
+clrMenuItemCurProgressBg = C03090B0
+clrReplayBg = C0101010
 clrReplayFont = FFEEEEEE
 clrReplayFontSpeed = FF3090B0
 clrReplayProgressFg = FFEEEEEE
 clrReplayProgressBarFg = FFEEEEEE
 clrReplayProgressBarCurFg = FF3090B0
-clrReplayProgressBg = B0101010
+clrReplayProgressBg = C0101010
 clrReplayMarkFg = FFEEEEEE
 clrReplayMarkCurrentFg = FF3090B0
-clrTrackItemBg = B0101010
+clrTrackItemBg = C0101010
 clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = B03090B0
+clrTrackItemCurrentBg = C03090B0
 clrTrackItemCurrentFont = FFEEEEEE
-clrVolumeBg = B0101010
+clrVolumeBg = C0101010
 clrVolumeFont = FFEEEEEE
 clrVolumeProgressFg = FF3090B0
 clrVolumeProgressBarFg = FF3090B0
-clrVolumeProgressBg = B0101010
+clrVolumeProgressBg = C0101010
diff --git a/themes/flat-white.theme b/themes/flat-white.theme
index b86fd60..2130432 100644
--- a/themes/flat-white.theme
+++ b/themes/flat-white.theme
@@ -1,59 +1,65 @@
 Description = white
-clrTopBarBg = BBCCCCCC
+clrTopBarBg = C0CCCCCC
 clrTopBarFont = FF222222
 clrTopBarTimeFont = FF222222
 clrTopBarDateFont = FF505050
-clrButtonBg = BBCCCCCC
+clrButtonBg = C0CCCCCC
 clrButtonFont = FF222222
 clrButtonRed = FFBB0000
 clrButtonGreen = FF00BB00
 clrButtonYellow = FFBBBB00
 clrButtonBlue = FF0000BB
-clrMessageBg = BBCCCCCC
+clrMessageBg = C0CCCCCC
 clrMessageFont = FF222222
 clrMessageStatus = FF0000FF
 clrMessageInfo = FF009900
 clrMessageWarning = FFBBBB00
 clrMessageError = FFBB0000
-clrChannelBg = BBCCCCCC
+clrChannelBg = C0CCCCCC
 clrChannelFontTitle = FF206277
 clrChannelFontEpg = FF222222
 clrChannelFontEpgFollow = FF505050
 clrChannelProgressFg = FF206277
 clrChannelProgressBarFg = FF206277
-clrChannelProgressBg = BBCCCCCC
-clrItemBg = BB808080
+clrChannelProgressBg = C0CCCCCC
+clrItemBg = C0808080
 clrItemFont = FF222222
-clrItemCurrentBg = BB3090B0
+clrItemCurrentBg = C03090B0
 clrItemCurrentFont = FF222222
-clrItemSelableBg = BBCCCCCC
+clrItemSelableBg = C0CCCCCC
 clrItemSelableFont = FF222222
 clrScrollbarFg = FF206277
-clrScrollbarBg = BBCCCCCC
+clrScrollbarBg = C0CCCCCC
 clrScrollbarBarFg = FF206277
-clrMenuEventBg = BBCCCCCC
+clrMenuEventBg = C0CCCCCC
 clrMenuEventFontTitle = FF206277
 clrMenuEventFontInfo = FF222222
-clrMenuRecBg = BBCCCCCC
+clrMenuRecBg = C0CCCCCC
 clrMenuRecFontTitle = FF206277
 clrMenuRecFontInfo = FF222222
-clrMenuTextBg = BBCCCCCC
+clrMenuTextBg = C0CCCCCC
 clrMenuTextFont = FF222222
-clrReplayBg = BBCCCCCC
+clrMenuItemProgressFg = FF222222
+clrMenuItemProgressBarFg = FF222222
+clrMenuItemProgressBg = C0CCCCCC
+clrMenuItemCurProgressFg = FF222222
+clrMenuItemCurProgressBarFg = FF222222
+clrMenuItemCurProgressBg = C03090B0
+clrReplayBg = C0CCCCCC
 clrReplayFont = FF222222
 clrReplayFontSpeed = FF3090B0
 clrReplayProgressFg = FF222222
 clrReplayProgressBarFg = FF3090B0
 clrReplayProgressBarCurFg = FF3090B0
-clrReplayProgressBg = BBCCCCCC
+clrReplayProgressBg = C0CCCCCC
 clrReplayMarkFg = FF222222
 clrReplayMarkCurrentFg = FF3090B0
-clrTrackItemBg = BBCCCCCC
+clrTrackItemBg = C0CCCCCC
 clrTrackItemFont = FF222222
-clrTrackItemCurrentBg = BB6AB0C0
+clrTrackItemCurrentBg = C06AB0C0
 clrTrackItemCurrentFont = FF222222
-clrVolumeBg = BBCCCCCC
+clrVolumeBg = C0CCCCCC
 clrVolumeFont = FF222222
 clrVolumeProgressFg = FF206277
 clrVolumeProgressBarFg = FF206277
-clrVolumeProgressBg = BBCCCCCC
+clrVolumeProgressBg = C0CCCCCC