added some color definitions and theme keep it light

70 files changed, 342 insertions, 56 deletions

diff --git a/HISTORY b/HISTORY
index 34f6a8e..ec2dd89 100644
--- a/HISTORY
+++ b/HISTORY
@@ -293,3 +293,5 @@ Version 0.1.4
   are the same, no blending effect is shown
 - updated slovak translation
 - Added cache for images and fonts
+- Changed and added some color definitions
+- Added theme "Keep it light" (thanks @Saman for providing the theme)
diff --git a/config.c b/config.c
index 65fe481..4330558 100644
--- a/config.c
+++ b/config.c
@@ -130,6 +130,7 @@ cNopacityConfig::cNopacityConfig() {
     posterWidth = 500;
     posterHeight = 750;
     menuRecFolderSize = 128;
+    useFolderPoster = 1;
     borderDetailedEPG = 30;
     borderDetailedRecordings = 30;
     menuSchedulesWindowMode = 0;
@@ -419,6 +420,7 @@ bool cNopacityConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "posterWidth") == 0)             posterWidth = atoi(Value);
     else if (strcmp(Name, "posterHeight") == 0)            posterHeight = atoi(Value);
     else if (strcmp(Name, "menuRecFolderSize") == 0)       menuRecFolderSize = atoi(Value);
+    else if (strcmp(Name, "useFolderPoster") == 0)         useFolderPoster = atoi(Value);
     else if (strcmp(Name, "borderDetailedEPG") == 0)       borderDetailedEPG = atoi(Value);
     else if (strcmp(Name, "borderDetailedRecordings") == 0) borderDetailedRecordings = atoi(Value);
     else if (strcmp(Name, "menuSchedulesWindowMode") == 0) menuSchedulesWindowMode = atoi(Value);
diff --git a/config.h b/config.h
index 905124b..e8ef390 100644
--- a/config.h
+++ b/config.h
@@ -163,6 +163,7 @@ class cNopacityConfig {
         int posterWidth;
         int posterHeight;
         int menuRecFolderSize;
+        int useFolderPoster;
         int borderDetailedEPG;
         int borderDetailedRecordings;
         int menuSchedulesWindowMode;
diff --git a/displaychannel.c b/displaychannel.c
index 7d29ffc..bf25b28 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -747,11 +747,11 @@ void cNopacityDisplayChannel::DrawProgressBar(int Current, int Total) {
         int barFullWidth = pixmapProgressBar->ViewPort().Width() - 20 - barHeight;
         double percentSeen = ((double)Current) / (double)Total;
 
-        pixmapProgressBar->DrawEllipse(cRect(9, 3, barHeight+2, barHeight+2), Theme.Color(clrProgressBarBack));
-        pixmapProgressBar->DrawEllipse(cRect(9 + barFullWidth, 3, barHeight+2, barHeight+2), Theme.Color(clrProgressBarBack));
-        pixmapProgressBar->DrawRectangle(cRect( 9 + barHeight/2, 3, barFullWidth, barHeight+1), Theme.Color(clrProgressBarBack));
-
-        pixmapProgressBar->DrawEllipse(cRect(10, 4, barHeight, barHeight), Theme.Color(clrProgressBarBlend));
+        pixmapProgressBar->DrawEllipse(cRect(9, 3, barHeight+2, barHeight+2), Theme.Color(clrChannelProgressBarBack));
+        pixmapProgressBar->DrawEllipse(cRect(9 + barFullWidth, 3, barHeight+2, barHeight+2), Theme.Color(clrChannelProgressBarBack));
+        pixmapProgressBar->DrawRectangle(cRect( 9 + barHeight/2, 3, barFullWidth, barHeight+1), Theme.Color(clrChannelProgressBarBack));
+        
+        pixmapProgressBar->DrawEllipse(cRect(10, 4, barHeight, barHeight), Theme.Color(clrChannelProgressBarBlend));
         if (Current > 0) {
             tColor colAct = DrawProgressbarBackground(10 + barHeight/2, 4, barFullWidth * percentSeen, barHeight-1);
             pixmapProgressBar->DrawEllipse(cRect(10 + barFullWidth * percentSeen, 4, barHeight, barHeight), colAct);
@@ -760,9 +760,8 @@ void cNopacityDisplayChannel::DrawProgressBar(int Current, int Total) {
 }
 
 tColor cNopacityDisplayChannel::DrawProgressbarBackground(int left, int top, int width, int height) {
-
-    tColor clr1 = Theme.Color(clrProgressBar);
-    tColor clr2 = Theme.Color(clrProgressBarBlend);
+    tColor clr1 = Theme.Color(clrChannelProgressBar);
+    tColor clr2 = Theme.Color(clrChannelProgressBarBlend);
     tColor clr = 0x00000000;
     width = (width==0)?1:width;
     int step = width / 256;
diff --git a/displaymenuview.c b/displaymenuview.c
index 50423c1..d811018 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -13,6 +13,7 @@ cNopacityDisplayMenuView::~cNopacityDisplayMenuView(void) {
     osd->DestroyPixmap(pixmapHeaderLabel);
     osd->DestroyPixmap(pixmapDate);
     osd->DestroyPixmap(pixmapFooter);
+    osd->DestroyPixmap(pixmapButtonsText);
     osd->DestroyPixmap(pixmapContent);
     osd->DestroyPixmap(pixmapScrollbar);    
     osd->DestroyPixmap(pixmapDiskUsage);
@@ -146,6 +147,7 @@ void cNopacityDisplayMenuView::CreatePixmaps(void) {
     int labelX = (config.menuAdjustLeft) ? 0 : geoManager->menuDateWidth;
     pixmapHeaderLabel = osd->CreatePixmap(2, cRect(labelX, 0, geoManager->osdWidth - geoManager->menuDateWidth, geoManager->menuHeaderHeight));
     pixmapFooter = osd->CreatePixmap(1, cRect(0, geoManager->osdHeight - geoManager->menuRssFeedHeight - geoManager->menuFooterHeight, geoManager->osdWidth, geoManager->menuFooterHeight));
+    pixmapButtonsText = osd->CreatePixmap(1, cRect(0, geoManager->osdHeight - geoManager->menuRssFeedHeight - geoManager->menuFooterHeight, geoManager->osdWidth, geoManager->menuFooterHeight));
     int drawPortWidth = geoManager->osdWidth + geoManager->menuContentWidthFull - geoManager->menuContentWidthMinimum;
     pixmapContent = osd->CreatePixmap(1, cRect(0, geoManager->menuHeaderHeight, geoManager->osdWidth, geoManager->menuContentHeight),
                                          cRect(0, 0, drawPortWidth, geoManager->menuContentHeight));
@@ -176,6 +178,7 @@ void cNopacityDisplayMenuView::CreatePixmaps(void) {
         pixmapHeaderLabel->SetAlpha(0);
         pixmapDate->SetAlpha(0);
         pixmapFooter->SetAlpha(0);
+        pixmapButtonsText->SetAlpha(0);
         pixmapContent->SetAlpha(0);
         pixmapScrollbar->SetAlpha(0);
         pixmapDiskUsage->SetAlpha(0);
@@ -191,6 +194,7 @@ void cNopacityDisplayMenuView::SetPixmapAlpha(int Alpha) {
     pixmapDate->SetAlpha(Alpha);
     pixmapContent->SetAlpha(Alpha);
     pixmapFooter->SetAlpha(Alpha);
+    pixmapButtonsText->SetAlpha(Alpha);
     pixmapScrollbar->SetAlpha(Alpha);
     pixmapDiskUsage->SetAlpha(Alpha);
     pixmapDiskUsageIcon->SetAlpha(Alpha);
@@ -312,6 +316,7 @@ void cNopacityDisplayMenuView::DrawBorderDecoration() {
     } else 
         pixmapHeader->Fill(Theme.Color(clrMenuBack));
     pixmapFooter->Fill(Theme.Color(clrMenuBack));
+    pixmapButtonsText->Fill(clrTransparent);
     
     int borderWidth = 2;
     int radius = 10;
@@ -321,6 +326,7 @@ void cNopacityDisplayMenuView::DrawBorderDecoration() {
     if (config.menuAdjustLeft) {
         //Background
         pixmapContent->DrawRectangle(cRect(0, 0, geoManager->menuContentWidthFull - radius, geoManager->menuContentHeight), Theme.Color(clrMenuBack));
+        pixmapContent->DrawRectangle(cRect(geoManager->menuContentWidthFull - radius, 0, geoManager->menuWidthScrollbar + geoManager->menuSpace + radius, geoManager->menuContentHeight), Theme.Color(clrMenuScrollBarBase));
         //Upper and lower Corner Square
         pixmapContent->DrawRectangle(cRect(geoManager->menuContentWidthFull - radius, 0, radius, radius), Theme.Color(clrMenuBack));
         pixmapContent->DrawRectangle(cRect(geoManager->menuContentWidthFull - radius, geoManager->menuContentHeight - radius, radius, radius), Theme.Color(clrMenuBack));
@@ -333,14 +339,15 @@ void cNopacityDisplayMenuView::DrawBorderDecoration() {
         if (radius-borderWidth > 2) {
             //Upper Ellipse
             pixmapContent->DrawEllipse(cRect(geoManager->menuContentWidthFull - radius, 0, radius, radius), Theme.Color(clrMenuBorder),2);
-            pixmapContent->DrawEllipse(cRect(geoManager->menuContentWidthFull - radius + borderWidth, borderWidth, radius-borderWidth, radius-borderWidth), clrTransparent, 2);
+            pixmapContent->DrawEllipse(cRect(geoManager->menuContentWidthFull - radius + borderWidth, borderWidth, radius-borderWidth, radius-borderWidth), Theme.Color(clrMenuScrollBarBase), 2);
             //Lower Ellipse
             pixmapContent->DrawEllipse(cRect(geoManager->menuContentWidthFull - radius, geoManager->menuContentHeight - radius, radius, radius), Theme.Color(clrMenuBorder),3);
-            pixmapContent->DrawEllipse(cRect(geoManager->menuContentWidthFull - radius + borderWidth, geoManager->menuContentHeight - radius, radius-borderWidth, radius-borderWidth), clrTransparent, 3);
+            pixmapContent->DrawEllipse(cRect(geoManager->menuContentWidthFull - radius + borderWidth, geoManager->menuContentHeight - radius, radius-borderWidth, radius-borderWidth), Theme.Color(clrMenuScrollBarBase), 3);
         }
     } else {
         //Background
         pixmapContent->DrawRectangle(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum + radius, 0, geoManager->menuContentWidthFull - radius, geoManager->menuContentHeight), Theme.Color(clrMenuBack));
+        pixmapContent->DrawRectangle(cRect(0, 0, geoManager->menuWidthScrollbar + geoManager->menuSpace + radius, geoManager->menuContentHeight), Theme.Color(clrMenuScrollBarBase));
         //Upper and lower Corner Square
         pixmapContent->DrawRectangle(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, 0, radius, radius), Theme.Color(clrMenuBack));
         pixmapContent->DrawRectangle(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, geoManager->menuContentHeight - radius, radius, radius), Theme.Color(clrMenuBack));
@@ -353,10 +360,10 @@ void cNopacityDisplayMenuView::DrawBorderDecoration() {
         if (radius-borderWidth > 2) {
             //Upper Ellipse
             pixmapContent->DrawEllipse(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, 0, radius, radius), Theme.Color(clrMenuBorder),1);
-            pixmapContent->DrawEllipse(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, borderWidth, radius-borderWidth, radius-borderWidth), clrTransparent, 1);
+            pixmapContent->DrawEllipse(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, borderWidth, radius-borderWidth, radius-borderWidth), Theme.Color(clrMenuScrollBarBase), 1);
             //Lower Ellipse
             pixmapContent->DrawEllipse(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, geoManager->menuContentHeight - radius, radius, radius), Theme.Color(clrMenuBorder),4);
-            pixmapContent->DrawEllipse(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, geoManager->menuContentHeight - radius, radius-borderWidth, radius-borderWidth), clrTransparent, 4);
+            pixmapContent->DrawEllipse(cRect(geoManager->osdWidth - geoManager->menuContentWidthMinimum, geoManager->menuContentHeight - radius, radius-borderWidth, radius-borderWidth), Theme.Color(clrMenuScrollBarBase), 4);
         }
     }
 }
@@ -570,8 +577,8 @@ void cNopacityDisplayMenuView::DrawButton(const char *text, eBackgroundType bgBu
     
     int textWidth = fontManager->menuButtons->Width(text);
     int textHeight = fontManager->menuButtons->Height();
-    tColor clrFontBack = (config.doBlending)?(clrTransparent):buttonColor;
-    pixmapFooter->DrawText(cPoint(left + (geoManager->menuButtonWidth-textWidth)/2, top + (geoManager->menuButtonHeight-textHeight)/2), text, fontColor, clrFontBack, fontManager->menuButtons);
+    pixmapButtonsText->DrawRectangle(cRect(left, top, geoManager->menuButtonWidth, geoManager->menuButtonHeight), clrTransparent);
+    pixmapButtonsText->DrawText(cPoint(left + (geoManager->menuButtonWidth-textWidth)/2, top + (geoManager->menuButtonHeight-textHeight)/2), text, fontColor, clrTransparent, fontManager->menuButtons);
 }
 
 void cNopacityDisplayMenuView::ClearButton(int num) {
@@ -580,6 +587,7 @@ void cNopacityDisplayMenuView::ClearButton(int num) {
     int top = 2*geoManager->menuButtonsBorder;
     int left = num * geoManager->menuButtonWidth + (2*num + 1) * geoManager->menuButtonsBorder;
     pixmapFooter->DrawRectangle(cRect(left, top, geoManager->menuButtonWidth, geoManager->menuButtonHeight), Theme.Color(clrMenuBack));
+    pixmapButtonsText->DrawRectangle(cRect(left, top, geoManager->menuButtonWidth, geoManager->menuButtonHeight), clrTransparent);
 }
 
 int cNopacityDisplayMenuView::GetTimersInitHeight(void) {
diff --git a/displaymenuview.h b/displaymenuview.h
index 4c7ea16..0c63bc2 100644
--- a/displaymenuview.h
+++ b/displaymenuview.h
@@ -15,6 +15,7 @@ class cNopacityDisplayMenuView {
         cPixmap *pixmapHeaderLabel;
         cPixmap *pixmapDate;
         cPixmap *pixmapFooter;
+        cPixmap *pixmapButtonsText;
         cPixmap *pixmapContent;
         cPixmap *pixmapScrollbar;   
         cPixmap *pixmapDiskUsage;
diff --git a/displaytracks.c b/displaytracks.c
index d79418c..3a0333c 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -96,7 +96,7 @@ void cNopacityDisplayTracks::DrawHeader(const char *Title) {
         if (back)
             pixmapHeader->DrawImage(cPoint(1, 1), *back);
     } else {
-        pixmapHeader->DrawRectangle(cRect(1, 1, width-2, height-2), Theme.Color(clrMenuItemHigh));
+        pixmapHeader->DrawRectangle(cRect(1, 1, width-2, height-2), Theme.Color(clrAudioMenuHeader));
     }
     pixmapIcon = osd->CreatePixmap(3, cRect(2, 2, menuItemHeight-2, menuItemHeight-2));
     pixmapIcon->Fill(clrTransparent);
@@ -104,7 +104,7 @@ void cNopacityDisplayTracks::DrawHeader(const char *Title) {
     cImage *imgTracks = imgCache->GetSkinIcon("skinIcons/tracks", menuItemHeight-6, menuItemHeight-6);
     if (imgTracks)
         pixmapIcon->DrawImage(cPoint(3,3), *imgTracks);
-    int clrFontBack = (config.doBlending)?clrTransparent:Theme.Color(clrMenuItemHigh);
+    int clrFontBack = (config.doBlending)?clrTransparent:Theme.Color(clrAudioMenuHeader);
     pixmapHeader->DrawText(cPoint((width - fontManager->trackHeader->Width(Title)) / 2, (menuItemHeight - fontManager->trackHeader->Height()) / 2), Title, Theme.Color(clrTracksFontHead), clrFontBack, fontManager->trackHeader);
 }
 
diff --git a/icons/light/menuIcons/Channels.png b/icons/light/menuIcons/Channels.png
new file mode 100644
index 0000000..a66188b
--- /dev/null
+++ b/icons/light/menuIcons/Channels.png
diff --git a/icons/light/menuIcons/Commands.png b/icons/light/menuIcons/Commands.png
new file mode 100644
index 0000000..835cfac
--- /dev/null
+++ b/icons/light/menuIcons/Commands.png
diff --git a/icons/light/menuIcons/Recordings.png b/icons/light/menuIcons/Recordings.png
new file mode 100644
index 0000000..c9c3265
--- /dev/null
+++ b/icons/light/menuIcons/Recordings.png
diff --git a/icons/light/menuIcons/Schedule.png b/icons/light/menuIcons/Schedule.png
new file mode 100644
index 0000000..0dcacdd
--- /dev/null
+++ b/icons/light/menuIcons/Schedule.png
diff --git a/icons/light/menuIcons/Setup.png b/icons/light/menuIcons/Setup.png
new file mode 100644
index 0000000..b7fe087
--- /dev/null
+++ b/icons/light/menuIcons/Setup.png
diff --git a/icons/light/menuIcons/Timers.png b/icons/light/menuIcons/Timers.png
new file mode 100644
index 0000000..0db22a8
--- /dev/null
+++ b/icons/light/menuIcons/Timers.png
diff --git a/icons/light/skinIcons/Channelseparator.png b/icons/light/skinIcons/Channelseparator.png
new file mode 100644
index 0000000..da8bf57
--- /dev/null
+++ b/icons/light/skinIcons/Channelseparator.png
diff --git a/icons/light/skinIcons/DiskUsage.png b/icons/light/skinIcons/DiskUsage.png
new file mode 100644
index 0000000..e54468d
--- /dev/null
+++ b/icons/light/skinIcons/DiskUsage.png
diff --git a/icons/light/skinIcons/ac3.png b/icons/light/skinIcons/ac3.png
new file mode 100644
index 0000000..416c685
--- /dev/null
+++ b/icons/light/skinIcons/ac3.png
diff --git a/icons/light/skinIcons/activetimer.png b/icons/light/skinIcons/activetimer.png
new file mode 100644
index 0000000..e944b00
--- /dev/null
+++ b/icons/light/skinIcons/activetimer.png
diff --git a/icons/light/skinIcons/activetimersmall.png b/icons/light/skinIcons/activetimersmall.png
new file mode 100644
index 0000000..138ff35
--- /dev/null
+++ b/icons/light/skinIcons/activetimersmall.png
diff --git a/icons/light/skinIcons/arrowLeftChannelSep.png b/icons/light/skinIcons/arrowLeftChannelSep.png
new file mode 100644
index 0000000..5f3ccd4
--- /dev/null
+++ b/icons/light/skinIcons/arrowLeftChannelSep.png
diff --git a/icons/light/skinIcons/arrowRightChannelSep.png b/icons/light/skinIcons/arrowRightChannelSep.png
new file mode 100644
index 0000000..8c77fe4
--- /dev/null
+++ b/icons/light/skinIcons/arrowRightChannelSep.png
diff --git a/icons/light/skinIcons/channeldelimiter.png b/icons/light/skinIcons/channeldelimiter.png
new file mode 100644
index 0000000..025413d
--- /dev/null
+++ b/icons/light/skinIcons/channeldelimiter.png
diff --git a/icons/light/skinIcons/channelsymbols.png b/icons/light/skinIcons/channelsymbols.png
new file mode 100644
index 0000000..2ba023d
--- /dev/null
+++ b/icons/light/skinIcons/channelsymbols.png
diff --git a/icons/light/skinIcons/encrypted.png b/icons/light/skinIcons/encrypted.png
new file mode 100644
index 0000000..12f0870
--- /dev/null
+++ b/icons/light/skinIcons/encrypted.png
diff --git a/icons/light/skinIcons/fwd.png b/icons/light/skinIcons/fwd.png
new file mode 100644
index 0000000..30aef68
--- /dev/null
+++ b/icons/light/skinIcons/fwd.png
diff --git a/icons/light/skinIcons/fwdInactive.png b/icons/light/skinIcons/fwdInactive.png
new file mode 100644
index 0000000..185d579
--- /dev/null
+++ b/icons/light/skinIcons/fwdInactive.png
diff --git a/icons/light/skinIcons/fwdx1.png b/icons/light/skinIcons/fwdx1.png
new file mode 100644
index 0000000..77af2ea
--- /dev/null
+++ b/icons/light/skinIcons/fwdx1.png
diff --git a/icons/light/skinIcons/fwdx2.png b/icons/light/skinIcons/fwdx2.png
new file mode 100644
index 0000000..1340ded
--- /dev/null
+++ b/icons/light/skinIcons/fwdx2.png
diff --git a/icons/light/skinIcons/fwdx3.png b/icons/light/skinIcons/fwdx3.png
new file mode 100644
index 0000000..2dca6af
--- /dev/null
+++ b/icons/light/skinIcons/fwdx3.png
diff --git a/icons/light/skinIcons/hd1080i.png b/icons/light/skinIcons/hd1080i.png
new file mode 100644
index 0000000..7a44829
--- /dev/null
+++ b/icons/light/skinIcons/hd1080i.png
diff --git a/icons/light/skinIcons/hd720p.png b/icons/light/skinIcons/hd720p.png
new file mode 100644
index 0000000..5239249
--- /dev/null
+++ b/icons/light/skinIcons/hd720p.png
diff --git a/icons/light/skinIcons/newrecording.png b/icons/light/skinIcons/newrecording.png
new file mode 100644
index 0000000..51d5f86
--- /dev/null
+++ b/icons/light/skinIcons/newrecording.png
diff --git a/icons/light/skinIcons/pause.png b/icons/light/skinIcons/pause.png
new file mode 100644
index 0000000..2e8ea5d
--- /dev/null
+++ b/icons/light/skinIcons/pause.png
diff --git a/icons/light/skinIcons/pauseInactive.png b/icons/light/skinIcons/pauseInactive.png
new file mode 100644
index 0000000..fc1a34a
--- /dev/null
+++ b/icons/light/skinIcons/pauseInactive.png
diff --git a/icons/light/skinIcons/play.png b/icons/light/skinIcons/play.png
new file mode 100644
index 0000000..b1b3a07
--- /dev/null
+++ b/icons/light/skinIcons/play.png
diff --git a/icons/light/skinIcons/playInactive.png b/icons/light/skinIcons/playInactive.png
new file mode 100644
index 0000000..11134b9
--- /dev/null
+++ b/icons/light/skinIcons/playInactive.png
diff --git a/icons/light/skinIcons/radio.png b/icons/light/skinIcons/radio.png
new file mode 100644
index 0000000..5200236
--- /dev/null
+++ b/icons/light/skinIcons/radio.png
diff --git a/icons/light/skinIcons/recfolder.png b/icons/light/skinIcons/recfolder.png
new file mode 100644
index 0000000..dcc7ee5
--- /dev/null
+++ b/icons/light/skinIcons/recfolder.png
diff --git a/icons/light/skinIcons/recordingcutted.png b/icons/light/skinIcons/recordingcutted.png
new file mode 100644
index 0000000..325b21f
--- /dev/null
+++ b/icons/light/skinIcons/recordingcutted.png
diff --git a/icons/light/skinIcons/recordingdatetime.png b/icons/light/skinIcons/recordingdatetime.png
new file mode 100644
index 0000000..f7f9471
--- /dev/null
+++ b/icons/light/skinIcons/recordingdatetime.png
diff --git a/icons/light/skinIcons/rew.png b/icons/light/skinIcons/rew.png
new file mode 100644
index 0000000..97e2b43
--- /dev/null
+++ b/icons/light/skinIcons/rew.png
diff --git a/icons/light/skinIcons/rewInactive.png b/icons/light/skinIcons/rewInactive.png
new file mode 100644
index 0000000..4935e97
--- /dev/null
+++ b/icons/light/skinIcons/rewInactive.png
diff --git a/icons/light/skinIcons/rewx1.png b/icons/light/skinIcons/rewx1.png
new file mode 100644
index 0000000..9bf0367
--- /dev/null
+++ b/icons/light/skinIcons/rewx1.png
diff --git a/icons/light/skinIcons/rewx2.png b/icons/light/skinIcons/rewx2.png
new file mode 100644
index 0000000..52fc211
--- /dev/null
+++ b/icons/light/skinIcons/rewx2.png
diff --git a/icons/light/skinIcons/rewx3.png b/icons/light/skinIcons/rewx3.png
new file mode 100644
index 0000000..d6eef15
--- /dev/null
+++ b/icons/light/skinIcons/rewx3.png
diff --git a/icons/light/skinIcons/rss.png b/icons/light/skinIcons/rss.png
new file mode 100644
index 0000000..6181dee
--- /dev/null
+++ b/icons/light/skinIcons/rss.png
diff --git a/icons/light/skinIcons/sd576i.png b/icons/light/skinIcons/sd576i.png
new file mode 100644
index 0000000..9c965ad
--- /dev/null
+++ b/icons/light/skinIcons/sd576i.png
diff --git a/icons/light/skinIcons/stereo.png b/icons/light/skinIcons/stereo.png
new file mode 100644
index 0000000..3c63f7f
--- /dev/null
+++ b/icons/light/skinIcons/stereo.png
diff --git a/icons/light/skinIcons/timerActive.png b/icons/light/skinIcons/timerActive.png
new file mode 100644
index 0000000..e62fd96
--- /dev/null
+++ b/icons/light/skinIcons/timerActive.png
diff --git a/icons/light/skinIcons/timerInactive.png b/icons/light/skinIcons/timerInactive.png
new file mode 100644
index 0000000..27c5464
--- /dev/null
+++ b/icons/light/skinIcons/timerInactive.png
diff --git a/icons/light/skinIcons/timerRecording.png b/icons/light/skinIcons/timerRecording.png
new file mode 100644
index 0000000..56d6027
--- /dev/null
+++ b/icons/light/skinIcons/timerRecording.png
diff --git a/icons/light/skinIcons/tracks.png b/icons/light/skinIcons/tracks.png
new file mode 100644
index 0000000..3a1e577
--- /dev/null
+++ b/icons/light/skinIcons/tracks.png
diff --git a/icons/light/skinIcons/vdrlogo.png b/icons/light/skinIcons/vdrlogo.png
new file mode 100644
index 0000000..9f95176
--- /dev/null
+++ b/icons/light/skinIcons/vdrlogo.png
diff --git a/imageloader.c b/imageloader.c
index 3807bbb..8a90a90 100644
--- a/imageloader.c
+++ b/imageloader.c
@@ -145,7 +145,7 @@ bool cImageLoader::FirstImageInFolder(cString Path, cString Extension, cString *
     while (file = readdir(folder)) {
         if (endswith(file->d_name, *Extension)) {
             std::string fileName = file->d_name;
-            if (!fileName.compare("cover_vdr.jpg"))
+            if (!fileName.compare(fileName.size()-8, 8, "_vdr.jpg"))
                 continue;
             if (fileName.length() > 4)
                 fileName = fileName.substr(0, fileName.length() - 4);
diff --git a/menudetailview.c b/menudetailview.c
index b935b3d..962f28f 100644
--- a/menudetailview.c
+++ b/menudetailview.c
@@ -811,7 +811,7 @@ void cNopacityMenuDetailRecordingView::DrawEPGPictures(int height) {
 void cNopacityMenuDetailRecordingView::DrawHeader(void) {
     cImageLoader imgLoader;
     int widthTextHeader = width - 2 * border;
-    if (imgLoader.LoadRecordingImage(recording->FileName())) {
+    if ((config.displayAdditionalRecEPGPictures == 1) && imgLoader.LoadRecordingImage(recording->FileName())) {
         pixmapHeader->DrawImage(cPoint(width - config.epgImageWidth - border, (headerHeight-config.epgImageHeight)/2), imgLoader.GetImage());
         if (config.roundedCorners) {
             int radius = config.cornerRadius;
diff --git a/menuitem.c b/menuitem.c
index e12eb09..a4190bf 100644
--- a/menuitem.c
+++ b/menuitem.c
@@ -561,13 +561,17 @@ void cNopacityScheduleMenuItem::DrawRemaining(int x, int y, int width) {
     if (total == 0)
         return;
     double percentSeen = (double)seen/total;
-    pixmap->DrawEllipse(cRect(x, y, 7, 7), Theme.Color(clrProgressBarBack));
-    pixmap->DrawEllipse(cRect(x+width, y, 7, 7), Theme.Color(clrProgressBarBack));
-    pixmap->DrawRectangle(cRect(x+4, y, width-1, 7), Theme.Color(clrProgressBarBack));
-    pixmap->DrawEllipse(cRect(x+1, y+1, 5, 5), Theme.Color(clrProgressBar));
+    
+    tColor clrBack = (current)?Theme.Color(clrProgressBarBackHigh):Theme.Color(clrProgressBarBack);
+    tColor clrBar = (current)?Theme.Color(clrProgressBarHigh):Theme.Color(clrProgressBar);
+    pixmap->DrawEllipse(cRect(x, y, 7, 7), clrBack);
+    pixmap->DrawEllipse(cRect(x+width, y, 7, 7), clrBack);
+    pixmap->DrawRectangle(cRect(x+4, y, width-1, 7), clrBack);
+    pixmap->DrawEllipse(cRect(x+1, y+1, 5, 5), clrBar);
+    
     if (percentSeen > 0.0)
-        pixmap->DrawEllipse(cRect(x+(width*percentSeen), y+1, 5, 5), Theme.Color(clrProgressBar));
-    pixmap->DrawRectangle(cRect(x+4, y+1, (width-1)*percentSeen, 5), Theme.Color(clrProgressBar));
+        pixmap->DrawEllipse(cRect(x+(width*percentSeen), y+1, 5, 5), clrBar);
+    pixmap->DrawRectangle(cRect(x+4, y+1, (width-1)*percentSeen, 5), clrBar);
 }
 
 // cNopacityChannelMenuItem  -------------
@@ -1100,7 +1104,7 @@ void cNopacityRecordingMenuItem::DrawBackground(void) {
 void cNopacityRecordingMenuItem::SetTextFullFolder(void) {
     tColor clrFont = (current)?Theme.Color(clrMenuFontMenuItemHigh):Theme.Color(clrMenuFontMenuItem);
     pixmapTextScroller->Fill(clrTransparent);
-    if (hasPoster || hasManualPoster)
+    if (config.useFolderPoster && (hasPoster || hasManualPoster))
         DrawPoster();
     else
         DrawFolderIcon();
@@ -1127,7 +1131,7 @@ void cNopacityRecordingMenuItem::SetTextShort(void) {
 void cNopacityRecordingMenuItem::SetTextShortFolder(void) {
     tColor clrFont = (current)?Theme.Color(clrMenuFontMenuItemHigh):Theme.Color(clrMenuFontMenuItem);
     pixmapTextScroller->Fill(clrTransparent);
-    if (hasPoster || hasManualPoster)
+    if (config.useFolderPoster && (hasPoster || hasManualPoster))
         DrawPoster();
     else
         DrawFolderIcon();
diff --git a/nopacity.c b/nopacity.c
index 59b8159..03e117c 100644
--- a/nopacity.c
+++ b/nopacity.c
@@ -19,8 +19,9 @@ static bool firstDisplay = true;
 #define CLR_GRAY                0xFF858585
 
 //CHANNELS
-#define CLR_PROGRESSBARBACK     0xDD858585
-#define CLR_PROGRESSBARBLEND    0xDD80B3FF
+#define CLR_CHANNELPROGRESSBAR  0xDD003DF5
+#define CLR_CHANNELPROGRESSBARBACK 0xDD858585
+#define CLR_CHANNELPROGRESSBARBLEND 0xDD80B3FF
 #define CLR_CHANNELSYMBOLOFF    0xDD858585
 #define CLR_CHANNELRECACTIVE    0xDDFF0000
 #define CLR_RECNEXT             0xDDFFFF00
@@ -34,6 +35,7 @@ static bool firstDisplay = true;
 
 //MENU
 #define CLR_MENUSCROLLBARBACK   0x40003DF5
+#define CLR_MENUSCROLLBARBASE   0x00000000
 #define CLR_MENUITEM            0xEE444444
 #define CLR_MENUITEMBLEND       0x90000000
 #define CLR_MENUITEMHIGHBLEND   0xEE0033FF
@@ -41,6 +43,14 @@ static bool firstDisplay = true;
 #define CLR_DISKALERT           0xDDFF0000
 #define CLR_MENUHEADER          0xDD000000
 #define CLR_MENUHEADERBLEND     0xEE0033FF
+#define CLR_AUDIOMENUHEADER     0xDD000000
+#define CLR_PROGRESSBAR         0xDD003DF5
+#define CLR_PROGRESSBARBACK     0xDD858585
+#define CLR_PROGRESSBARBLEND    0xDD80B3FF
+#define CLR_PROGRESSBARHIGH     0xDD003DF5
+#define CLR_PROGRESSBARBACKHIGH 0xDD858585
+#define CLR_PROGRESSBARBLENDHIGH 0xDD80B3FF
+
 
 //BUTTONS
 #define CLR_BUTTONRED           0x99BB0000
@@ -69,9 +79,9 @@ THEME_CLR(Theme, clrChannelEPG,             CLR_WHITE);
 THEME_CLR(Theme, clrChannelEPGInfo,         CLR_WHITE);
 THEME_CLR(Theme, clrChannelEPGNext,         CLR_GRAY);
 THEME_CLR(Theme, clrChannelEPGInfoNext,     CLR_GRAY);
-THEME_CLR(Theme, clrProgressBar,            CLR_DARKBLUE);
-THEME_CLR(Theme, clrProgressBarBack,        CLR_PROGRESSBARBACK);
-THEME_CLR(Theme, clrProgressBarBlend,       CLR_PROGRESSBARBLEND);
+THEME_CLR(Theme, clrChannelProgressBar,     CLR_CHANNELPROGRESSBAR);
+THEME_CLR(Theme, clrChannelProgressBarBack, CLR_CHANNELPROGRESSBARBACK);
+THEME_CLR(Theme, clrChannelProgressBarBlend,CLR_CHANNELPROGRESSBARBLEND);
 THEME_CLR(Theme, clrChannelSymbolOn,        CLR_DARKBLUE);
 THEME_CLR(Theme, clrChannelSymbolOff,       CLR_CHANNELSYMBOLOFF);
 THEME_CLR(Theme, clrChannelRecActive,       CLR_CHANNELRECACTIVE);
@@ -101,6 +111,7 @@ THEME_CLR(Theme, clrMenuBack,               CLR_TRANSBLACK);
 THEME_CLR(Theme, clrMenuBorder,             CLR_DARKBLUE);
 THEME_CLR(Theme, clrMenuScrollBar,          CLR_DARKBLUE);
 THEME_CLR(Theme, clrMenuScrollBarBack,      CLR_MENUSCROLLBARBACK);
+THEME_CLR(Theme, clrMenuScrollBarBase,      CLR_MENUSCROLLBARBASE);
 THEME_CLR(Theme, clrMenuItem,               CLR_MENUITEM);
 THEME_CLR(Theme, clrMenuItemBlend,          CLR_MENUITEMBLEND);
 THEME_CLR(Theme, clrMenuItemHigh,           CLR_TRANSBLACK);
@@ -123,6 +134,13 @@ THEME_CLR(Theme, clrMenuFontMenuItemTitle,  CLR_BRIGHTBLUE);
 THEME_CLR(Theme, clrMenuFontMenuItemSep,    CLR_GRAY);
 THEME_CLR(Theme, clrMenuHeader,             CLR_MENUHEADER);
 THEME_CLR(Theme, clrMenuHeaderBlend,        CLR_MENUHEADERBLEND);
+THEME_CLR(Theme, clrAudioMenuHeader,        CLR_AUDIOMENUHEADER);
+THEME_CLR(Theme, clrProgressBar,            CLR_PROGRESSBAR);
+THEME_CLR(Theme, clrProgressBarBack,        CLR_PROGRESSBARBACK);
+THEME_CLR(Theme, clrProgressBarBlend,       CLR_PROGRESSBARBLEND);
+THEME_CLR(Theme, clrProgressBarHigh,        CLR_PROGRESSBARHIGH);
+THEME_CLR(Theme, clrProgressBarBackHigh,    CLR_PROGRESSBARBACKHIGH);
+THEME_CLR(Theme, clrProgressBarBlendHigh,   CLR_PROGRESSBARBLENDHIGH);
 //BUTTONS
 THEME_CLR(Theme, clrButtonRed,              CLR_BUTTONRED);
 THEME_CLR(Theme, clrButtonRedBorder,        CLR_BUTTONREDBORDER);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c01ea10..8f63321 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-18 11:22+0200\n"
+"POT-Creation-Date: 2013-09-30 19:08+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Gabychan <gbonich@gmail.com>\n"
 "Language-Team: \n"
@@ -392,6 +392,9 @@ msgstr "Mostra imatges EPG addicionals a vista detallada gravacions"
 msgid "Folder Icon Size"
 msgstr "Mida Carpeta Icones"
 
+msgid "Use folder poster if available"
+msgstr ""
+
 msgid "Width of manually set recording poster"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 222a960..16e5ee0 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -389,6 +389,9 @@ msgstr "Weitere EPG Bilder in der detaillierten Aufnahmeansicht anzeigen"
 msgid "Folder Icon Size"
 msgstr "Order Icon Größe"
 
+msgid "Use folder poster if available"
+msgstr "Zeige Poster für Ordner falls verfügbar"
+
 msgid "Width of manually set recording poster"
 msgstr "Breite der manuell gesetzen Poster"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 3770871..551419f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: skinnopacity 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-18 11:22+0200\n"
+"POT-Creation-Date: 2013-09-30 19:08+0200\n"
 "PO-Revision-Date: 2013-03-19 22:56+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
@@ -392,6 +392,9 @@ msgstr "Mostra immagini EPG aggiuntivo nella vista dettagli registrazione"
 msgid "Folder Icon Size"
 msgstr "Dim. icona cartella"
 
+msgid "Use folder poster if available"
+msgstr ""
+
 msgid "Width of manually set recording poster"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index fff155e..044f99e 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinnopacity\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-09-18 11:50+0200\n"
+"POT-Creation-Date: 2013-09-30 19:08+0200\n"
 "PO-Revision-Date: 2013-09-16 19:34+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: \n"
@@ -389,6 +389,9 @@ msgstr "Zobrazi» ïal¹ie EPG obrázky v podrobnom zobrazení nahrávky"
 msgid "Folder Icon Size"
 msgstr "Veµkos» ikony prieèinku"
 
+msgid "Use folder poster if available"
+msgstr ""
+
 msgid "Width of manually set recording poster"
 msgstr "Ruène nastavi» ¹írku plagátov nahrávok"
 
diff --git a/setup.c b/setup.c
index 491ef4b..038780a 100644
--- a/setup.c
+++ b/setup.c
@@ -189,6 +189,7 @@ void cNopacitySetup::Store(void) {
     SetupStore("posterWidth", config.posterWidth);
     SetupStore("posterHeight", config.posterHeight);
     SetupStore("menuRecFolderSize", config.menuRecFolderSize);
+    SetupStore("useFolderPoster", config.useFolderPoster);
     SetupStore("borderDetailedEPG", config.borderDetailedEPG);
     SetupStore("borderDetailedRecordings", config.borderDetailedRecordings);
     SetupStore("menuSchedulesWindowMode", config.menuSchedulesWindowMode);
@@ -487,6 +488,7 @@ void cNopacitySetupMenuDisplayRecordings::Set(void) {
     if (tmpNopacityConfig->displayAdditionalRecEPGPictures)
         Add(new cMenuEditIntItem(cString::sprintf("%s%s", *spacer, tr("Number of EPG pictures to display")), &tmpNopacityConfig->numAdditionalRecEPGPictures, 1, 9));
     Add(new cMenuEditIntItem(tr("Folder Icon Size"), &tmpNopacityConfig->menuRecFolderSize, 30, 300));
+    Add(new cMenuEditBoolItem(tr("Use folder poster if available"), &tmpNopacityConfig->useFolderPoster));
     Add(new cMenuEditIntItem(tr("Width of manually set recording poster"), &tmpNopacityConfig->posterWidth, 100, 1000));
     Add(new cMenuEditIntItem(tr("Height of manually set recording poster"), &tmpNopacityConfig->posterHeight, 100, 1000));
     Add(new cMenuEditIntItem(tr("Adjust Font Size - Menu Item"), &tmpNopacityConfig->fontMenuitemRecordings, -20, 20));
diff --git a/themes/nOpacity-darkblue.theme b/themes/nOpacity-darkblue.theme
index 583a9f8..0526a10 100644
--- a/themes/nOpacity-darkblue.theme
+++ b/themes/nOpacity-darkblue.theme
@@ -8,9 +8,9 @@ clrChannelEPG = FFFFFFFF
 clrChannelEPGInfo = FFFFFFFF
 clrChannelEPGNext = FF858585
 clrChannelEPGInfoNext = FF858585
-clrProgressBar = DD4979b9
-clrProgressBarBack = DD858585
-clrProgressBarBlend = DD031B3C
+clrChannelProgressBar = DD4979b9
+clrChannelProgressBarBack = DD858585
+clrChannelProgressBarBlend = DD031B3C
 clrChannelSymbolOn = DD5078ab
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
@@ -36,6 +36,7 @@ clrMenuBack = DD000000
 clrMenuBorder = DD8c8c8c
 clrMenuScrollBar = DD8c8c8c
 clrMenuScrollBarBack = 40135474
+clrMenuScrollBarBase = 00000000
 clrMenuItem = DD5078AB
 clrMenuItemBlend = DD000000
 clrMenuItemHigh = DD618A9E
@@ -58,6 +59,13 @@ clrMenuFontMenuItemTitle = FFB6C6E0
 clrMenuFontMenuItemSep = FF858585
 clrMenuHeader = DD000000
 clrMenuHeaderBlend = EE135474
+clrAudioMenuHeader = DD000000
+clrProgressBar = DD4979b9
+clrProgressBarBack = DD858585
+clrProgressBarBlend = DD031B3C
+clrProgressBarHigh = DD4979b9
+clrProgressBarBackHigh = DD858585
+clrProgressBarBlendHigh = DD031B3C
 clrButtonRed = 99BB0000
 clrButtonRedBorder = FFBB0000
 clrButtonRedFont = FFFFFFFF
diff --git a/themes/nOpacity-darkgrey.theme b/themes/nOpacity-darkgrey.theme
index ba8cff7..f9ac6c8 100644
--- a/themes/nOpacity-darkgrey.theme
+++ b/themes/nOpacity-darkgrey.theme
@@ -7,9 +7,9 @@ clrChannelEPG = FFFFFFFF
 clrChannelEPGInfo = FF858585
 clrChannelEPGNext = FF858585
 clrChannelEPGInfoNext = FF858585
-clrProgressBar = DD4E78B1
-clrProgressBarBack = DD858585
-clrProgressBarBlend = DD80B3FF
+clrChannelProgressBar = DD4E78B1
+clrChannelProgressBarBack = DD858585
+clrChannelProgressBarBlend = DD80B3FF
 clrChannelSymbolOn = FFFFD700
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
@@ -35,6 +35,7 @@ clrMenuBack = BD000000
 clrMenuBorder = 64135474
 clrMenuScrollBar = 80858585
 clrMenuScrollBarBack = 32858585
+clrMenuScrollBarBase = 00000000
 clrMenuItem = 7D444444
 clrMenuItemBlend = 64000000
 clrMenuItemHigh = 7D000000
@@ -57,6 +58,13 @@ clrMenuFontMenuItemTitle = FFFFFFFF
 clrMenuFontMenuItemSep = FF858585
 clrMenuHeader = DD000000
 clrMenuHeaderBlend = 60FFFFFF
+clrAudioMenuHeader = DD000000
+clrProgressBar = DD4E78B1
+clrProgressBarBack = DD858585
+clrProgressBarBlend = DD80B3FF
+clrProgressBarHigh = DD4E78B1
+clrProgressBarBackHigh = DD858585
+clrProgressBarBlendHigh = DD80B3FF
 clrButtonRed = 99BB0000
 clrButtonRedBorder = FFBB0000
 clrButtonRedFont = FFFFFFFF
diff --git a/themes/nOpacity-darkred.theme b/themes/nOpacity-darkred.theme
index 6d65631..cb27639 100644
--- a/themes/nOpacity-darkred.theme
+++ b/themes/nOpacity-darkred.theme
@@ -8,9 +8,9 @@ clrChannelEPG = FFCCCCCC
 clrChannelEPGInfo = FFCCCCCC
 clrChannelEPGNext = FF858585
 clrChannelEPGInfoNext = FF858585
-clrProgressBar = DDBB0000
-clrProgressBarBack = DD222222
-clrProgressBarBlend = DD550000
+clrChannelProgressBar = DDBB0000
+clrChannelProgressBarBack = DD222222
+clrChannelProgressBarBlend = DD550000
 clrChannelSymbolOn = aa770000
 clrChannelSymbolOff = aa222222
 clrChannelRecActive = DDFF0000
@@ -36,6 +36,7 @@ clrMenuBack = DD000000
 clrMenuBorder = FF050505 
 clrMenuScrollBar = DD550000
 clrMenuScrollBarBack = dd000000
+clrMenuScrollBarBase = 00000000
 clrMenuItem = DD333333
 clrMenuItemBlend = DD000000
 clrMenuItemHigh = DDBB0000
@@ -58,6 +59,13 @@ clrMenuFontMenuItemTitle = FFDDDDDD
 clrMenuFontMenuItemSep = FF858585
 clrMenuHeader = DD000000
 clrMenuHeaderBlend = DDBB0000
+clrAudioMenuHeader = DD000000
+clrProgressBar = DDBB0000
+clrProgressBarBack = DD222222
+clrProgressBarBlend = DD550000
+clrProgressBarHigh = DDBB0000
+clrProgressBarBackHigh = DD222222
+clrProgressBarBlendHigh = DD550000
 clrButtonRed = 99BB0000
 clrButtonRedBorder = FF000000
 clrButtonRedFont = FFFFFFFF
diff --git a/themes/nOpacity-default.theme b/themes/nOpacity-default.theme
new file mode 100644
index 0000000..cbf2dc7
--- /dev/null
+++ b/themes/nOpacity-default.theme
@@ -0,0 +1,96 @@
+Description = Default
+clrDoBlending = FFFFFFFF
+clrChannelBackground = B0000000
+clrChannelBackBlend = B0003DF5
+clrChannelHead = FF0066FF
+clrChannelEPG = FFFFFFFF
+clrChannelEPGInfo = FFFFFFFF
+clrChannelEPGNext = FF858585
+clrChannelEPGInfoNext = FF858585
+clrChannelProgressBar = DD003DF5
+clrChannelProgressBarBack = DD858585
+clrChannelProgressBarBlend = DD80B3FF
+clrChannelSymbolOn = DD003DF5
+clrChannelSymbolOff = DD858585
+clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
+clrRecNowFont = FFFFFFFF
+clrRecNext = DDFFFF00
+clrRecNextFont = FF000000
+clrReplayBackground = B0000000
+clrReplayBackBlend = B0003DF5
+clrReplayHead = FFFFFFFF
+clrReplayDescription = FF858585
+clrReplayCurrentTotal = FF003DF5
+clrReplayProgressSeen = DD003DF5
+clrReplayProgressRest = DD858585
+clrReplayProgressSelected = FF000000
+clrReplayProgressMark = FF000000
+clrReplayProgressCurrent = 90FFFFFF
+clrReplayHighlightIcon = DD003DF5
+clrTracksFontHead = FF858585
+clrTracksFontButtons = FFFFFFFF
+clrVolumeFont = FF858585
+clrMenuBack = DD000000
+clrMenuBorder = DD003DF5
+clrMenuScrollBar = DD003DF5
+clrMenuScrollBarBack = 40003DF5
+clrMenuScrollBarBase = 00000000
+clrMenuItem = EE444444
+clrMenuItemBlend = 90000000
+clrMenuItemHigh = DD000000
+clrMenuItemHighBlend = EE0033FF
+clrSeparatorBorder = EE444444
+clrDiskAlert = DDFF0000
+clrTimersBack = EE0033FF
+clrTimersBackBlend = DD000000
+clrMenuFontHeader = FFFFFFFF
+clrMenuFontDate = FFFFFFFF
+clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontTimers = FFFFFFFF
+clrMenuFontTimersHeader = FFFFFFFF
+clrMenuFontDetailViewText = FFFFFFFF
+clrMenuFontDetailViewHeader = FF858585
+clrMenuFontDetailViewHeaderTitle = FF0066FF
+clrMenuFontMenuItem = FFFFFFFF
+clrMenuFontMenuItemHigh = FF0066FF
+clrMenuFontMenuItemTitle = FF0066FF
+clrMenuFontMenuItemSep = FF858585
+clrMenuHeader = DD000000
+clrMenuHeaderBlend = EE0033FF
+clrAudioMenuHeader = DD000000
+clrProgressBar = DD003DF5
+clrProgressBarBack = DD858585
+clrProgressBarBlend = DD80B3FF
+clrProgressBarHigh = DD003DF5
+clrProgressBarBackHigh = DD858585
+clrProgressBarBlendHigh = DD80B3FF
+clrButtonRed = 99BB0000
+clrButtonRedBorder = FFBB0000
+clrButtonRedFont = FFFFFFFF
+clrButtonGreen = 9900BB00
+clrButtonGreenBorder = FF00BB00
+clrButtonGreenFont = FFFFFFFF
+clrButtonYellow = 99BBBB00
+clrButtonYellowBorder = FFBBBB00
+clrButtonYellowFont = FFFFFFFF
+clrButtonBlue = 990000BB
+clrButtonBlueBorder = FF0000BB
+clrButtonBlueFont = FFFFFFFF
+clrRSSFeedBorder = DD003DF5
+clrRSSFeedTitle = FF0066FF
+clrRSSFeedText = FFFFFFFF
+clrRSSFeedHeaderText = FFFFFFFF
+clrRSSFeedHeaderBack = DD000000
+clrRSSFeedHeaderBackBlend = EE0033FF
+clrRSSFeedBack = EE444444
+clrRSSFeedBackBlend = 90000000
+clrMessageFontStatus = FFFFFFFF
+clrMessageFontInfo = FFFFFFFF
+clrMessageFontWarning = FFFFFFFF
+clrMessageFontError = FFFFFFFF
+clrMessageStatus = 900000FF
+clrMessageInfo = 90009900
+clrMessageWarning = 90BBBB00
+clrMessageError = 90BB0000
+clrMessageBlend = DD000000
diff --git a/themes/nOpacity-green.theme b/themes/nOpacity-green.theme
index b62fe06..b1a09c6 100644
--- a/themes/nOpacity-green.theme
+++ b/themes/nOpacity-green.theme
@@ -8,9 +8,9 @@ clrChannelEPG = FFFFFFFF
 clrChannelEPGInfo = FFFFFFFF
 clrChannelEPGNext = FF858585
 clrChannelEPGInfoNext = FF858585
-clrProgressBar = DDFFCC00
-clrProgressBarBack = DD858585
-clrProgressBarBlend = DD006600
+clrChannelProgressBar = DDFFCC00
+clrChannelProgressBarBack = DD858585
+clrChannelProgressBarBlend = DD006600
 clrChannelSymbolOn = DD006600
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
@@ -36,6 +36,7 @@ clrMenuBack = DD000000
 clrMenuBorder = DD006600
 clrMenuScrollBar = DD006600
 clrMenuScrollBarBack = AA003300
+clrMenuScrollBarBase = 00000000
 clrMenuItem = BB000000
 clrMenuItemBlend = EE006600
 clrMenuItemHigh = 22000000
@@ -58,6 +59,13 @@ clrMenuFontMenuItemTitle = FFFFFFFF
 clrMenuFontMenuItemSep = FF858585
 clrMenuHeader = DD000000
 clrMenuHeaderBlend = EE006600
+clrAudioMenuHeader = DD000000
+clrProgressBar = DDFFCC00
+clrProgressBarBack = DD858585
+clrProgressBarBlend = DD006600
+clrProgressBarHigh = DDFFCC00
+clrProgressBarBackHigh = DD858585
+clrProgressBarBlendHigh = DD006600
 clrButtonRed = 99BB0000
 clrButtonRedBorder = FFBB0000
 clrButtonRedFont = FFFFFFFF
diff --git a/themes/nOpacity-iceblue.theme b/themes/nOpacity-iceblue.theme
index 8ac4048..001de5c 100644
--- a/themes/nOpacity-iceblue.theme
+++ b/themes/nOpacity-iceblue.theme
@@ -8,9 +8,9 @@ clrChannelEPG = FF000000
 clrChannelEPGInfo = FF000000
 clrChannelEPGNext = FF474750
 clrChannelEPGInfoNext = FF474750
-clrProgressBar = DD3F5468
-clrProgressBarBack = FF000000
-clrProgressBarBlend = DD5A8998
+clrChannelProgressBar = DD3F5468
+clrChannelProgressBarBack = FF000000
+clrChannelProgressBarBlend = DD5A8998
 clrChannelSymbolOn = DD3F5468
 clrChannelSymbolOff = DD858585
 clrChannelRecActive = DDFF0000
@@ -36,6 +36,7 @@ clrMenuBack = DDFFFFFF
 clrMenuBorder = FF000000
 clrMenuScrollBar = FF000044
 clrMenuScrollBarBack = FFB2B2C7
+clrMenuScrollBarBase = 00000000
 clrMenuItem = FFB2B2C7
 clrMenuItemBlend = FFFFFFFF
 clrMenuItemHigh = FF000044
@@ -58,6 +59,13 @@ clrMenuFontMenuItemTitle = FF000000
 clrMenuFontMenuItemSep = FF000000
 clrMenuHeader = 22FFFFFF
 clrMenuHeaderBlend = FFFFFFFF
+clrAudioMenuHeader = 22FFFFFF
+clrProgressBar = DD3F5468
+clrProgressBarBack = FF000000
+clrProgressBarBlend = DD5A8998
+clrProgressBarHigh = DD3F5468
+clrProgressBarBackHigh = FF000000
+clrProgressBarBlendHigh = DD5A8998
 clrButtonRed = FFCC0000
 clrButtonRedBorder = FFCC0000
 clrButtonRedFont = FFFFFFFF
diff --git a/themes/nOpacity-light.theme b/themes/nOpacity-light.theme
new file mode 100644
index 0000000..5ffdbb5
--- /dev/null
+++ b/themes/nOpacity-light.theme
@@ -0,0 +1,97 @@
+Description = Keep it Light
+#DO BLENDING
+clrDoBlending = 00000000
+clrChannelBackground = AA000000
+clrChannelBackBlend = AA000000
+clrChannelHead = FFEEEEEE
+clrChannelEPG = FFFFFFFF
+clrChannelEPGInfo = FFE6E6E6
+clrChannelEPGNext = FFBDBDBD
+clrChannelEPGInfoNext = FFBDBDBD
+clrChannelProgressBar = DD6fac10
+clrChannelProgressBarBack = DD858585
+clrChannelProgressBarBlend = DD6fac10
+clrChannelSymbolOn = DD6fac10
+clrChannelSymbolOff = DD858585
+clrChannelRecActive = DDFF0000
+clrRecNow = DDFF0000
+clrRecNowFont = FFFFFFFF
+clrRecNext = DDFFFF00
+clrRecNextFont = FF000000
+clrReplayBackground = AA000000
+clrReplayBackBlend = AA000000
+clrReplayHead = FFFFFFFF
+clrReplayDescription = FFBBBBBB
+clrReplayCurrentTotal = FFFFFFFF
+clrReplayProgressSeen = DD6fac10
+clrReplayProgressRest = CC8c8c8c
+clrReplayProgressSelected = FF000000
+clrReplayProgressMark = FF000000
+clrReplayProgressCurrent = 90FFFFFF
+clrReplayHighlightIcon = B08c8c8c
+clrTracksFontHead = FFEEEEEE
+clrTracksFontButtons = FFFFFFFF
+clrVolumeFont = FFBDBDBD
+clrMenuBack = AA000000
+clrMenuBorder = DD8c8c8c
+clrMenuScrollBar = DD6fac10
+clrMenuScrollBarBack = AA000000
+clrMenuScrollBarBase = 00000000
+clrMenuItem = 40000000
+clrMenuItemBlend = DD000000
+clrMenuItemHigh = DD6fac10
+clrMenuItemHighBlend = EE135474
+clrSeparatorBorder = EE444444
+clrDiskAlert = DDFF0000
+clrTimersBack = AA000000
+clrTimersBackBlend = D0000000
+clrMenuFontHeader = FFFFFFFF
+clrMenuFontDate = FFFFFFFF
+clrMenuFontDiscUsage = FFFFFFFF
+clrMenuFontTimers = FFFFFFFF
+clrMenuFontTimersHeader = FFFFFFFF
+clrMenuFontDetailViewText = FFE6E6E6
+clrMenuFontDetailViewHeader = FFBDBDBD
+clrMenuFontDetailViewHeaderTitle = FFFFFFFF
+clrMenuFontMenuItem = FFFFFFFF
+clrMenuFontMenuItemHigh = FFFFFFFF
+clrMenuFontMenuItemTitle = FFFFFFFF
+clrMenuFontMenuItemSep = FFE6E6E6
+clrMenuHeader = AA000000
+clrMenuHeaderBlend = AA000000
+clrAudioMenuHeader = AA000000
+clrProgressBar = DD6fac10
+clrProgressBarBack = DD858585
+clrProgressBarBlend = DDff3300
+clrProgressBarHigh = DDff3300
+clrProgressBarBackHigh = DD858585
+clrProgressBarBlendHigh = DDff3300
+clrButtonRed = 99BB0000
+clrButtonRedBorder = 99BB0000
+clrButtonRedFont = FFFFFFFF
+clrButtonGreen = 9900BB00
+clrButtonGreenBorder = 9900BB00
+clrButtonGreenFont = FFFFFFFF
+clrButtonYellow = FFBBBB00
+clrButtonYellowBorder = FFBBBB00
+clrButtonYellowFont = FFFFFFFF
+clrButtonBlue = 990000BB
+clrButtonBlueBorder = 990000BB
+clrButtonBlueFont = FFFFFFFF
+clrRSSFeedBorder = DD8c8c8c
+clrRSSFeedTitle = FFFFFFFF
+clrRSSFeedText = FFFFFFFF
+clrRSSFeedHeaderText = FFFFFFFF
+clrRSSFeedHeaderBack = DD618A9E
+clrRSSFeedHeaderBackBlend = EE135474
+clrRSSFeedBack = DD5078AB
+clrRSSFeedBackBlend = DD000000
+clrMessageFontStatus = FFFFFFFF
+clrMessageFontInfo = FFFFFFFF
+clrMessageFontWarning = FFFFFFFF
+clrMessageFontError = FFFFFFFF
+clrMessageStatus = 900000FF
+clrMessageInfo = 90009900
+clrMessageWarning = 90BBBB00
+clrMessageError = 90BB0000
+clrMessageBlend = DD000000
diff --git a/timers.c b/timers.c
index 81f9377..a90521d 100644
--- a/timers.c
+++ b/timers.c
@@ -22,6 +22,7 @@ cNopacityTimer::~cNopacityTimer(void) {
     osd->DestroyPixmap(pixmapBackground);
     osd->DestroyPixmap(pixmap);
     osd->DestroyPixmap(pixmapLogo);
+    osd->DestroyPixmap(pixmapText);
 }
 
 void cNopacityTimer::SetGeometry(int width, int y) {
@@ -33,18 +34,21 @@ void cNopacityTimer::SetAlpha(int alpha) {
     pixmapBackground->SetAlpha(alpha);
     pixmap->SetAlpha(alpha);
     pixmapLogo->SetAlpha(alpha);
+    pixmapText->SetAlpha(alpha);
 }
 
 void cNopacityTimer::Show(void) {
     pixmapBackground->SetLayer(2);
     pixmap->SetLayer(3);
     pixmapLogo->SetLayer(4);
+    pixmapText->SetLayer(5);
 }
 
 void cNopacityTimer::Hide(void) {
     pixmapBackground->SetLayer(-1);
     pixmap->SetLayer(-1);
     pixmapLogo->SetLayer(-1);
+    pixmapText->SetLayer(-1);
 }
 
 void cNopacityTimer::CreateDate(void) {
@@ -111,11 +115,12 @@ void cNopacityTimer::CreatePixmaps(int x) {
     pixmapBackground = osd->CreatePixmap(2, cRect(x, y, width, height));
     pixmap = osd->CreatePixmap(3, cRect(x, y, width, height));
     pixmapLogo = osd->CreatePixmap(4, cRect(x, y, width, height));
+    pixmapText = osd->CreatePixmap(5, cRect(x, y, width, height));
 }
 
 void cNopacityTimer::Render(void) {
-    pixmapBackground->Fill(clrBlack);
-    tColor clrFontBack = (config.doBlending)?clrTransparent:Theme.Color(clrTimersBack);
+    pixmapBackground->Fill(clrTransparent);
+    pixmapText->Fill(clrTransparent);
     if (isTimerConflict) {
         pixmapLogo->Fill(clrTransparent);
         pixmap->Fill(Theme.Color(clrDiskAlert));
@@ -124,7 +129,6 @@ void cNopacityTimer::Render(void) {
             pixmap->DrawImage(cPoint(1,1), imgBack);
         } else {
             pixmap->DrawRectangle(cRect(1, 1, width-2, height-2), Theme.Color(clrDiskAlert));
-            clrFontBack = Theme.Color(clrDiskAlert);
         }        
         int numLines = showName.Lines();
         int textWidth = 0;
@@ -134,7 +138,7 @@ void cNopacityTimer::Render(void) {
             textWidth = fontLarge->Width(showName.GetLine(line));
             x = (width - textWidth)/2;
             y += line*fontLarge->Height();
-            pixmap->DrawText(cPoint(x, y), showName.GetLine(line), Theme.Color(clrMenuFontTimersHeader), clrFontBack, fontLarge);
+            pixmapText->DrawText(cPoint(x, y), showName.GetLine(line), Theme.Color(clrMenuFontTimersHeader), clrTransparent, fontLarge);
         }
     } else {
         DrawLogo();
@@ -145,7 +149,6 @@ void cNopacityTimer::Render(void) {
                 pixmap->DrawImage(cPoint(1,1), imgBack);
             } else {
                 pixmap->DrawRectangle(cRect(1, 1, width-2, height-2), Theme.Color(clrDiskAlert));
-                clrFontBack = Theme.Color(clrDiskAlert);
             } 
         } else {
             pixmap->Fill(Theme.Color(clrMenuBorder));
@@ -157,13 +160,13 @@ void cNopacityTimer::Render(void) {
             } 
         }
 
-        pixmap->DrawText(cPoint(5, config.timersLogoHeight), *Date, Theme.Color(clrMenuFontTimersHeader), clrFontBack, fontLarge);
+        pixmapText->DrawText(cPoint(5, config.timersLogoHeight), *Date, Theme.Color(clrMenuFontTimersHeader), clrTransparent, fontLarge);
         
         int lineHeight = font->Height();
         int yStart = config.timersLogoHeight + lineHeight + 3;
         int numLines = showName.Lines();
         for (int line=0; line<numLines; line++)
-            pixmap->DrawText(cPoint(5, yStart+line*(lineHeight-2)), showName.GetLine(line), Theme.Color(clrMenuFontTimers), clrFontBack, font);
+            pixmapText->DrawText(cPoint(5, yStart+line*(lineHeight-2)), showName.GetLine(line), Theme.Color(clrMenuFontTimers), clrTransparent, font);
     }   
 }
 
diff --git a/timers.h b/timers.h
index abf9581..df1a646 100644
--- a/timers.h
+++ b/timers.h
@@ -8,6 +8,7 @@ class cNopacityTimer : public cListObject {
         cPixmap *pixmapBackground;

         cPixmap *pixmap;

         cPixmap *pixmapLogo;

+        cPixmap *pixmapText;

         const cTimer *timer;

         int numConflicts;

         bool isTimerConflict;