remove decor from themes and add decor files

25 files changed, 393 insertions, 646 deletions

diff --git a/Makefile b/Makefile
index f1e635fd..687bc748 100644
--- a/Makefile
+++ b/Makefile
@@ -115,11 +115,15 @@ install-themes:
 	mkdir -p $(DESTDIR)$(VDRCONFDIR)/themes
 	cp themes/* $(DESTDIR)$(VDRCONFDIR)/themes
 
+install-decors:
+	mkdir -p $(DESTDIR)$(PLGRESDIR)/decors
+	cp decors/* $(DESTDIR)$(PLGRESDIR)/decors
+
 install-icons:
 	mkdir -p $(DESTDIR)$(PLGRESDIR)/icons
 	cp -r icons/* $(DESTDIR)$(PLGRESDIR)/icons
 	
-install: install-lib install-i18n install-themes install-icons
+install: install-lib install-i18n install-themes install-icons install-decors
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/baserender.c b/baserender.c
index b0a22eae..096d67fa 100644
--- a/baserender.c
+++ b/baserender.c
@@ -33,6 +33,7 @@ cFlatBaseRender::cFlatBaseRender(void) {
     decorPixmap = NULL;
     
     Config.ThemeCheckAndInit();
+    Config.DecorCheckAndInit();
 }
 
 cFlatBaseRender::~cFlatBaseRender(void) {
@@ -175,8 +176,8 @@ void cFlatBaseRender::TopBarUpdate(void) {
             if (imgLoader.LoadIcon(*topBarMenuIcon, 999, topBarHeight)) {
                 int iconTop = topBarHeight / 2 - imgLoader.Height()/2;
                 topBarIconPixmap->DrawImage(cPoint(IconLeft, iconTop), imgLoader.GetImage());
-                MenuIconWidth = imgLoader.Width();
-                TitleWidthLeft -= MenuIconWidth + marginItem;
+                MenuIconWidth = imgLoader.Width()+marginItem*2;
+                TitleWidthLeft -= MenuIconWidth + marginItem*3;
             }
         }
         
diff --git a/config.c b/config.c
index 9c850d7c..891df1ca 100644
--- a/config.c
+++ b/config.c
@@ -4,6 +4,9 @@ cFlatConfig::cFlatConfig(void) {
     logoPath = "";
     iconPath = "";
     
+    DecorCurrent = -1;
+    DecorIndex = 0;
+    
     ButtonsShowEmpty = true;
 
     ChannelIconsShow = true;
@@ -93,7 +96,6 @@ cFlatConfig::cFlatConfig(void) {
     decorProgressSignalSizeUser = 20;
 
     ThemeCurrent = "";
-    ThemeInit();
 }
 
 cFlatConfig::~cFlatConfig(void) {
@@ -164,7 +166,9 @@ bool cFlatConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "TopBarRecordingShow") == 0)                  TopBarRecordingShow = atoi(Value);
     else if (strcmp(Name, "MenuItemIconsShow") == 0)                    MenuItemIconsShow = atoi(Value);
     else if (strcmp(Name, "TopBarMenuIconShow") == 0)                   TopBarMenuIconShow = atoi(Value);
+    else if (strcmp(Name, "DecorIndex") == 0)                           DecorIndex = atoi(Value);
     else return false;
+    
     return true;
 }
 
@@ -176,41 +180,175 @@ void cFlatConfig::ThemeCheckAndInit(void) {
     }
 }
 
+void cFlatConfig::DecorCheckAndInit(void) {
+    if( DecorCurrent != DecorIndex ) {
+        DecorCurrent = DecorIndex;
+        DecorLoadCurrent();
+
+        if( decorBorderChannelByTheme ) {
+            decorBorderChannelType = decorBorderChannelTypeTheme;
+            decorBorderChannelSize = decorBorderChannelSizeTheme;
+        } else {
+            decorBorderChannelType = decorBorderChannelTypeUser;
+            decorBorderChannelSize = decorBorderChannelSizeUser;
+        }
+        
+        if( decorBorderTopBarByTheme ) {
+            decorBorderTopBarType = decorBorderTopBarTypeTheme;
+            decorBorderTopBarSize = decorBorderTopBarSizeTheme;
+        } else {
+            decorBorderTopBarType = decorBorderTopBarTypeUser;
+            decorBorderTopBarSize = decorBorderTopBarSizeUser;
+        }
+
+        if( decorBorderMessageByTheme ) {
+            decorBorderMessageType = decorBorderMessageTypeTheme;
+            decorBorderMessageSize = decorBorderMessageSizeTheme;
+        } else {
+            decorBorderMessageType = decorBorderMessageTypeUser;
+            decorBorderMessageSize = decorBorderMessageSizeUser;
+        }
+        
+        if( decorBorderVolumeByTheme ) {
+            decorBorderVolumeType = decorBorderVolumeTypeTheme;
+            decorBorderVolumeSize = decorBorderVolumeSizeTheme;
+        } else {
+            decorBorderVolumeType = decorBorderVolumeTypeUser;
+            decorBorderVolumeSize = decorBorderVolumeSizeUser;
+        }
+        
+        if( decorBorderTrackByTheme ) {
+            decorBorderTrackType = decorBorderTrackTypeTheme;
+            decorBorderTrackSize = decorBorderTrackSizeTheme;
+        } else {
+            decorBorderTrackType = decorBorderTrackTypeUser;
+            decorBorderTrackSize = decorBorderTrackSizeUser;
+        }
+        
+        if( decorBorderReplayByTheme ) {
+            decorBorderReplayType = decorBorderReplayTypeTheme;
+            decorBorderReplaySize = decorBorderReplaySizeTheme;
+        } else {
+            decorBorderReplayType = decorBorderReplayTypeUser;
+            decorBorderReplaySize = decorBorderReplaySizeUser;
+        }
+
+        if( decorBorderMenuItemByTheme ) {
+            decorBorderMenuItemType = decorBorderMenuItemTypeTheme;
+            decorBorderMenuItemSize = decorBorderMenuItemSizeTheme;
+        } else {
+            decorBorderMenuItemType = decorBorderMenuItemTypeUser;
+            decorBorderMenuItemSize = decorBorderMenuItemSizeUser;
+        }
+        
+        if( decorBorderMenuContentHeadByTheme ) {
+            decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeTheme;
+            decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeTheme;
+        } else {
+            decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeUser;
+            decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeUser;
+        }
+        
+        if( decorBorderMenuContentByTheme ) {
+            decorBorderMenuContentType = decorBorderMenuContentTypeTheme;
+            decorBorderMenuContentSize = decorBorderMenuContentSizeTheme;
+        } else {
+            decorBorderMenuContentType = decorBorderMenuContentTypeUser;
+            decorBorderMenuContentSize = decorBorderMenuContentSizeUser;
+        }
+        
+        if( decorBorderButtonByTheme ) {
+            decorBorderButtonType = decorBorderButtonTypeTheme;
+            decorBorderButtonSize = decorBorderButtonSizeTheme;
+        } else {
+            decorBorderButtonType = decorBorderButtonTypeUser;
+            decorBorderButtonSize = decorBorderButtonSizeUser;
+        }
+        
+        if( decorProgressChannelByTheme ) {
+            decorProgressChannelType = decorProgressChannelTypeTheme;
+            decorProgressChannelSize = decorProgressChannelSizeTheme;
+        } else {
+            decorProgressChannelType = decorProgressChannelTypeUser;
+            decorProgressChannelSize = decorProgressChannelSizeUser;
+        }
+        
+        if( decorProgressVolumeByTheme ) {
+            decorProgressVolumeType = decorProgressVolumeTypeTheme;
+            decorProgressVolumeSize = decorProgressVolumeSizeTheme;
+        } else {
+            decorProgressVolumeType = decorProgressVolumeTypeUser;
+            decorProgressVolumeSize = decorProgressVolumeSizeUser;
+        }
+        
+        if( decorProgressMenuItemByTheme ) {
+            decorProgressMenuItemType = decorProgressMenuItemTypeTheme;
+            decorProgressMenuItemSize = decorProgressMenuItemSizeTheme;
+        } else {
+            decorProgressMenuItemType = decorProgressMenuItemTypeUser;
+            decorProgressMenuItemSize = decorProgressMenuItemSizeUser;
+        }
+        
+        if( decorProgressReplayByTheme ) {
+            decorProgressReplayType = decorProgressReplayTypeTheme;
+            decorProgressReplaySize = decorProgressReplaySizeTheme;
+        } else {
+            decorProgressReplayType = decorProgressReplayTypeUser;
+            decorProgressReplaySize = decorProgressReplaySizeUser;
+        }
+        
+        if( decorProgressSignalByTheme ) {
+            decorProgressSignalType = decorProgressSignalTypeTheme;
+            decorProgressSignalSize = decorProgressSignalSizeTheme;
+        } else {
+            decorProgressSignalType = decorProgressSignalTypeUser;
+            decorProgressSignalSize = decorProgressSignalSizeUser;
+        }
+        
+        if( decorBorderChannelType == 0 )
+            decorBorderChannelSize = 0;
+        if( decorBorderTopBarType == 0 )
+            decorBorderTopBarSize = 0;
+        if( decorBorderMessageType == 0 )
+            decorBorderMessageSize = 0;
+        if( decorBorderVolumeType == 0 )
+            decorBorderVolumeSize = 0;
+        if( decorBorderTrackType == 0 )
+            decorBorderTrackSize = 0;
+        if( decorBorderReplayType == 0 )
+            decorBorderReplaySize = 0;
+        if( decorBorderMenuItemType == 0 )
+            decorBorderMenuItemSize = 0;
+        if( decorBorderMenuContentHeadType == 0 )
+            decorBorderMenuContentHeadSize = 0;
+        if( decorBorderMenuContentType == 0 )
+            decorBorderMenuContentSize = 0;
+        if( decorBorderButtonType == 0 )
+            decorBorderButtonSize = 0;
+    }
+}
+
 void cFlatConfig::ThemeInit(void) {
-    decorBorderChannelTypeTheme = Theme.Color(clrChannelBorderType) & 0x000000FF;
-    decorBorderChannelSizeTheme = Theme.Color(clrChannelBorderSize) & 0x000000FF;
     decorBorderChannelFg = Theme.Color(clrChannelBorderFg);
     decorBorderChannelBg = Theme.Color(clrChannelBorderBg);
 
-    decorBorderTopBarTypeTheme = Theme.Color(clrTopBarBorderType) & 0x000000FF;
-    decorBorderTopBarSizeTheme = Theme.Color(clrTopBarBorderSize) & 0x000000FF;
     decorBorderTopBarFg = Theme.Color(clrTopBarBorderFg);
     decorBorderTopBarBg = Theme.Color(clrTopBarBorderBg);
 
-    decorBorderMessageTypeTheme = Theme.Color(clrMessageBorderType) & 0x000000FF;
-    decorBorderMessageSizeTheme = Theme.Color(clrMessageBorderSize) & 0x000000FF;
     decorBorderMessageFg = Theme.Color(clrMessageBorderFg);
     decorBorderMessageBg = Theme.Color(clrMessageBorderBg);
 
-    decorBorderVolumeTypeTheme = Theme.Color(clrVolumeBorderType) & 0x000000FF;
-    decorBorderVolumeSizeTheme = Theme.Color(clrVolumeBorderSize) & 0x000000FF;
     decorBorderVolumeFg = Theme.Color(clrVolumeBorderFg);
     decorBorderVolumeBg = Theme.Color(clrVolumeBorderBg);
 
-    decorBorderTrackTypeTheme = Theme.Color(clrTrackItemBorderType) & 0x000000FF;
-    decorBorderTrackSizeTheme = Theme.Color(clrTrackItemBorderSize) & 0x000000FF;
     decorBorderTrackFg = Theme.Color(clrTrackItemBorderFg);
     decorBorderTrackBg = Theme.Color(clrTrackItemBorderBg);
     decorBorderTrackCurFg = Theme.Color(clrTrackItemCurrentBorderFg);
     decorBorderTrackCurBg = Theme.Color(clrTrackItemCurrentBorderBg);
 
-    decorBorderReplayTypeTheme = Theme.Color(clrReplayBorderType) & 0x000000FF;
-    decorBorderReplaySizeTheme = Theme.Color(clrReplayBorderSize) & 0x000000FF;
     decorBorderReplayFg = Theme.Color(clrReplayBorderFg);
     decorBorderReplayBg = Theme.Color(clrReplayBorderBg);
 
-    decorBorderMenuItemTypeTheme = Theme.Color(clrMenuItemBorderType) & 0x000000FF;
-    decorBorderMenuItemSizeTheme = Theme.Color(clrMenuItemBorderSize) & 0x000000FF;
     decorBorderMenuItemFg = Theme.Color(clrMenuItemBorderFg);
     decorBorderMenuItemBg = Theme.Color(clrMenuItemBorderBg);
     decorBorderMenuItemSelFg = Theme.Color(clrMenuItemSelableBorderFg);
@@ -218,35 +356,23 @@ void cFlatConfig::ThemeInit(void) {
     decorBorderMenuItemCurFg = Theme.Color(clrMenuItemCurrentBorderFg);
     decorBorderMenuItemCurBg = Theme.Color(clrMenuItemCurrentBorderBg);
 
-    decorBorderMenuContentHeadTypeTheme = Theme.Color(clrMenuContentHeadBorderType) & 0x000000FF;
-    decorBorderMenuContentHeadSizeTheme = Theme.Color(clrMenuContentHeadBorderSize) & 0x000000FF;
     decorBorderMenuContentHeadFg = Theme.Color(clrMenuContentHeadBorderFg);
     decorBorderMenuContentHeadBg = Theme.Color(clrMenuContentHeadBorderBg);
 
-    decorBorderMenuContentTypeTheme = Theme.Color(clrMenuContentBorderType) & 0x000000FF;
-    decorBorderMenuContentSizeTheme = Theme.Color(clrMenuContentBorderSize) & 0x000000FF;
     decorBorderMenuContentFg = Theme.Color(clrMenuContentBorderFg);
     decorBorderMenuContentBg = Theme.Color(clrMenuContentBorderBg);
 
-    decorBorderButtonTypeTheme = Theme.Color(clrButtonBorderType) & 0x000000FF;
-    decorBorderButtonSizeTheme = Theme.Color(clrButtonBorderSize) & 0x000000FF;
     decorBorderButtonFg = Theme.Color(clrButtonBorderFg);
     decorBorderButtonBg = Theme.Color(clrButtonBorderBg);
     
-    decorProgressChannelTypeTheme = Theme.Color(clrChannelProgressType) & 0x000000FF;
-    decorProgressChannelSizeTheme = Theme.Color(clrChannelProgressSize) & 0x000000FF;
     decorProgressChannelFg = Theme.Color(clrChannelProgressFg);
     decorProgressChannelBarFg = Theme.Color(clrChannelProgressBarFg);
     decorProgressChannelBg = Theme.Color(clrChannelProgressBg);
 
-    decorProgressVolumeTypeTheme = Theme.Color(clrVolumeProgressType) & 0x000000FF;
-    decorProgressVolumeSizeTheme = Theme.Color(clrVolumeProgressSize) & 0x000000FF;
     decorProgressVolumeFg = Theme.Color(clrVolumeProgressFg);
     decorProgressVolumeBarFg = Theme.Color(clrVolumeProgressBarFg);
     decorProgressVolumeBg = Theme.Color(clrVolumeProgressBg);
 
-    decorProgressMenuItemTypeTheme = Theme.Color(clrMenuItemProgressType) & 0x000000FF;
-    decorProgressMenuItemSizeTheme = Theme.Color(clrMenuItemProgressSize) & 0x000000FF;
     decorProgressMenuItemFg = Theme.Color(clrMenuItemProgressFg);
     decorProgressMenuItemBarFg = Theme.Color(clrMenuItemProgressBarFg);
     decorProgressMenuItemBg = Theme.Color(clrMenuItemProgressBg);
@@ -254,158 +380,13 @@ void cFlatConfig::ThemeInit(void) {
     decorProgressMenuItemCurBarFg = Theme.Color(clrMenuItemCurProgressBarFg);
     decorProgressMenuItemCurBg = Theme.Color(clrMenuItemCurProgressBg);
 
-    decorProgressReplayTypeTheme = Theme.Color(clrReplayProgressType) & 0x000000FF;
-    decorProgressReplaySizeTheme = Theme.Color(clrReplayProgressSize) & 0x000000FF;
     decorProgressReplayFg = Theme.Color(clrReplayProgressFg);
     decorProgressReplayBarFg = Theme.Color(clrReplayProgressBarFg);
     decorProgressReplayBg = Theme.Color(clrReplayProgressBg);
 
-    decorProgressSignalTypeTheme = Theme.Color(clrChannelSignalProgressType) & 0x000000FF;
-    decorProgressSignalSizeTheme = Theme.Color(clrChannelSignalProgressSize) & 0x000000FF;
     decorProgressSignalFg = Theme.Color(clrChannelSignalProgressFg);
     decorProgressSignalBarFg = Theme.Color(clrChannelSignalProgressBarFg);
     decorProgressSignalBg = Theme.Color(clrChannelSignalProgressBg);
-
-    if( decorBorderChannelByTheme ) {
-        decorBorderChannelType = decorBorderChannelTypeTheme;
-        decorBorderChannelSize = decorBorderChannelSizeTheme;
-    } else {
-        decorBorderChannelType = decorBorderChannelTypeUser;
-        decorBorderChannelSize = decorBorderChannelSizeUser;
-    }
-    
-    if( decorBorderTopBarByTheme ) {
-        decorBorderTopBarType = decorBorderTopBarTypeTheme;
-        decorBorderTopBarSize = decorBorderTopBarSizeTheme;
-    } else {
-        decorBorderTopBarType = decorBorderTopBarTypeUser;
-        decorBorderTopBarSize = decorBorderTopBarSizeUser;
-    }
-
-    if( decorBorderMessageByTheme ) {
-        decorBorderMessageType = decorBorderMessageTypeTheme;
-        decorBorderMessageSize = decorBorderMessageSizeTheme;
-    } else {
-        decorBorderMessageType = decorBorderMessageTypeUser;
-        decorBorderMessageSize = decorBorderMessageSizeUser;
-    }
-    
-    if( decorBorderVolumeByTheme ) {
-        decorBorderVolumeType = decorBorderVolumeTypeTheme;
-        decorBorderVolumeSize = decorBorderVolumeSizeTheme;
-    } else {
-        decorBorderVolumeType = decorBorderVolumeTypeUser;
-        decorBorderVolumeSize = decorBorderVolumeSizeUser;
-    }
-    
-    if( decorBorderTrackByTheme ) {
-        decorBorderTrackType = decorBorderTrackTypeTheme;
-        decorBorderTrackSize = decorBorderTrackSizeTheme;
-    } else {
-        decorBorderTrackType = decorBorderTrackTypeUser;
-        decorBorderTrackSize = decorBorderTrackSizeUser;
-    }
-    
-    if( decorBorderReplayByTheme ) {
-        decorBorderReplayType = decorBorderReplayTypeTheme;
-        decorBorderReplaySize = decorBorderReplaySizeTheme;
-    } else {
-        decorBorderReplayType = decorBorderReplayTypeUser;
-        decorBorderReplaySize = decorBorderReplaySizeUser;
-    }
-
-    if( decorBorderMenuItemByTheme ) {
-        decorBorderMenuItemType = decorBorderMenuItemTypeTheme;
-        decorBorderMenuItemSize = decorBorderMenuItemSizeTheme;
-    } else {
-        decorBorderMenuItemType = decorBorderMenuItemTypeUser;
-        decorBorderMenuItemSize = decorBorderMenuItemSizeUser;
-    }
-    
-    if( decorBorderMenuContentHeadByTheme ) {
-        decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeTheme;
-        decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeTheme;
-    } else {
-        decorBorderMenuContentHeadType = decorBorderMenuContentHeadTypeUser;
-        decorBorderMenuContentHeadSize = decorBorderMenuContentHeadSizeUser;
-    }
-    
-    if( decorBorderMenuContentByTheme ) {
-        decorBorderMenuContentType = decorBorderMenuContentTypeTheme;
-        decorBorderMenuContentSize = decorBorderMenuContentSizeTheme;
-    } else {
-        decorBorderMenuContentType = decorBorderMenuContentTypeUser;
-        decorBorderMenuContentSize = decorBorderMenuContentSizeUser;
-    }
-    
-    if( decorBorderButtonByTheme ) {
-        decorBorderButtonType = decorBorderButtonTypeTheme;
-        decorBorderButtonSize = decorBorderButtonSizeTheme;
-    } else {
-        decorBorderButtonType = decorBorderButtonTypeUser;
-        decorBorderButtonSize = decorBorderButtonSizeUser;
-    }
-    
-    if( decorProgressChannelByTheme ) {
-        decorProgressChannelType = decorProgressChannelTypeTheme;
-        decorProgressChannelSize = decorProgressChannelSizeTheme;
-    } else {
-        decorProgressChannelType = decorProgressChannelTypeUser;
-        decorProgressChannelSize = decorProgressChannelSizeUser;
-    }
-    
-    if( decorProgressVolumeByTheme ) {
-        decorProgressVolumeType = decorProgressVolumeTypeTheme;
-        decorProgressVolumeSize = decorProgressVolumeSizeTheme;
-    } else {
-        decorProgressVolumeType = decorProgressVolumeTypeUser;
-        decorProgressVolumeSize = decorProgressVolumeSizeUser;
-    }
-    
-    if( decorProgressMenuItemByTheme ) {
-        decorProgressMenuItemType = decorProgressMenuItemTypeTheme;
-        decorProgressMenuItemSize = decorProgressMenuItemSizeTheme;
-    } else {
-        decorProgressMenuItemType = decorProgressMenuItemTypeUser;
-        decorProgressMenuItemSize = decorProgressMenuItemSizeUser;
-    }
-    
-    if( decorProgressReplayByTheme ) {
-        decorProgressReplayType = decorProgressReplayTypeTheme;
-        decorProgressReplaySize = decorProgressReplaySizeTheme;
-    } else {
-        decorProgressReplayType = decorProgressReplayTypeUser;
-        decorProgressReplaySize = decorProgressReplaySizeUser;
-    }
-    
-    if( decorProgressSignalByTheme ) {
-        decorProgressSignalType = decorProgressSignalTypeTheme;
-        decorProgressSignalSize = decorProgressSignalSizeTheme;
-    } else {
-        decorProgressSignalType = decorProgressSignalTypeUser;
-        decorProgressSignalSize = decorProgressSignalSizeUser;
-    }
-    
-    if( decorBorderChannelType == 0 )
-        decorBorderChannelSize = 0;
-    if( decorBorderTopBarType == 0 )
-        decorBorderTopBarSize = 0;
-    if( decorBorderMessageType == 0 )
-        decorBorderMessageSize = 0;
-    if( decorBorderVolumeType == 0 )
-        decorBorderVolumeSize = 0;
-    if( decorBorderTrackType == 0 )
-        decorBorderTrackSize = 0;
-    if( decorBorderReplayType == 0 )
-        decorBorderReplaySize = 0;
-    if( decorBorderMenuItemType == 0 )
-        decorBorderMenuItemSize = 0;
-    if( decorBorderMenuContentHeadType == 0 )
-        decorBorderMenuContentHeadSize = 0;
-    if( decorBorderMenuContentType == 0 )
-        decorBorderMenuContentSize = 0;
-    if( decorBorderButtonType == 0 )
-        decorBorderButtonSize = 0;
 }
 
 void cFlatConfig::Init(void) {
@@ -417,6 +398,152 @@ void cFlatConfig::Init(void) {
     //dsyslog("skinflat: iconPath: %s", *iconPath);
 
     ThemeInit();
+    DecorCheckAndInit();
+}
+
+void cFlatConfig::DecorDescriptions(cStringList &Decors) {
+    cString decorPath = cString::sprintf("%s/decors", PLUGINRESOURCEPATH);
+
+    cReadDir d(decorPath);
+    struct dirent *e;
+    while ((e = d.Next()) != NULL) {
+        cString FileName = AddDirectory(decorPath, e->d_name);
+        cString Desc = DecorDescription(FileName);
+        Decors.Append(strdup(*Desc));
+    }    
+}
+
+cString cFlatConfig::DecorDescription(cString File) {
+    cString description;
+    FILE *f = fopen(File, "r");
+    if( f ) {
+        int line = 0;
+        char *s;
+        cReadLine ReadLine;
+        while( (s = ReadLine.Read(f)) != NULL ) {
+            line++;
+            char *p = strchr(s, '#');
+            if (p)
+                *p = 0;
+            s = stripspace(skipspace(s));
+            if (!isempty(s)) {
+                char *n = s;
+                char *v = strchr(s, '=');
+                if (v) {
+                    *v++ = 0;
+                    n = stripspace(skipspace(n));
+                    v = stripspace(skipspace(v));
+                    if (strstr(n, "Description") == n) {
+                        description = strdup(v);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return description;
+}
+
+void cFlatConfig::DecorLoadCurrent(void) {
+    cString decorPath = cString::sprintf("%s/decors", PLUGINRESOURCEPATH);
+
+    cReadDir d(decorPath);
+    struct dirent *e;
+    int index = 0;
+    while( (e = d.Next()) != NULL ) {
+        if( DecorIndex == index ) {
+            cString FileName = AddDirectory(decorPath, e->d_name);
+            DecorLoadFile( FileName );
+            break;
+        }
+        index++;
+    }    
+}
+
+void cFlatConfig::DecorLoadFile(cString File) {
+    FILE *f = fopen(File, "r");
+    if( f ) {
+        int line = 0;
+        char *s;
+        cReadLine ReadLine;
+        while( (s = ReadLine.Read(f)) != NULL ) {
+            line++;
+            char *p = strchr(s, '#');
+            if (p)
+                *p = 0;
+            s = stripspace(skipspace(s));
+            if (!isempty(s)) {
+                char *n = s;
+                char *v = strchr(s, '=');
+                if (v) {
+                    *v++ = 0;
+                    n = stripspace(skipspace(n));
+                    v = stripspace(skipspace(v));
+                    int value = atoi( v );
+                    if( strstr(n, "ChannelBorderType") == n ) {
+                        decorBorderChannelTypeTheme = value; continue; }
+                    if( strstr(n, "ChannelBorderSize") == n ) {
+                        decorBorderChannelSizeTheme = value; continue; }
+                    if( strstr(n, "TopBarBorderType") == n ) {
+                        decorBorderTopBarTypeTheme = value; continue; }
+                    if( strstr(n, "TopBarBorderSize") == n ) {
+                        decorBorderTopBarSizeTheme = value; continue; }
+                    if( strstr(n, "MessageBorderType") == n ) {
+                        decorBorderMessageTypeTheme = value; continue; }
+                    if( strstr(n, "MessageBorderSize") == n ) {
+                        decorBorderMessageSizeTheme = value; continue; }
+                    if( strstr(n, "VolumeBorderType") == n ) {
+                        decorBorderVolumeTypeTheme = value; continue; }
+                    if( strstr(n, "VolumeBorderSize") == n ) {
+                        decorBorderVolumeSizeTheme = value; continue; }
+                    if( strstr(n, "TrackItemBorderType") == n ) {
+                        decorBorderTrackTypeTheme = value; continue; }
+                    if( strstr(n, "TrackItemBorderSize") == n ) {
+                        decorBorderTrackSizeTheme = value; continue; }
+                    if( strstr(n, "ReplayBorderType") == n ) {
+                        decorBorderReplayTypeTheme = value; continue; }
+                    if( strstr(n, "ReplayBorderSize") == n ) {
+                        decorBorderReplaySizeTheme = value; continue; }
+                    if( strstr(n, "MenuItemBorderType") == n ) {
+                        decorBorderMenuItemTypeTheme = value; continue; }
+                    if( strstr(n, "MenuItemBorderSize") == n ) {
+                        decorBorderMenuItemSizeTheme = value; continue; }
+                    if( strstr(n, "MenuContentHeadBorderType") == n ) {
+                        decorBorderMenuContentHeadTypeTheme = value; continue; }
+                    if( strstr(n, "MenuContentHeadBorderSize") == n ) {
+                        decorBorderMenuContentHeadSizeTheme = value; continue; }
+                    if( strstr(n, "MenuContentBorderType") == n ) {
+                        decorBorderMenuContentTypeTheme = value; continue; }
+                    if( strstr(n, "MenuContentBorderSize") == n ) {
+                        decorBorderMenuContentSizeTheme = value; continue; }
+                    if( strstr(n, "ButtonBorderType") == n ) {
+                        decorBorderButtonTypeTheme = value; continue; }
+                    if( strstr(n, "ButtonBorderSize") == n ) {
+                        decorBorderButtonSizeTheme = value; continue; }
+                    if( strstr(n, "ChannelProgressType") == n ) {
+                        decorProgressChannelTypeTheme = value; continue; }
+                    if( strstr(n, "ChannelProgressSize") == n ) {
+                        decorProgressChannelSizeTheme = value; continue; }
+                    if( strstr(n, "VolumeProgressType") == n ) {
+                        decorProgressVolumeTypeTheme = value; continue; }
+                    if( strstr(n, "VolumeProgressSize") == n ) {
+                        decorProgressVolumeSizeTheme = value; continue; }
+                    if( strstr(n, "MenuItemProgressType") == n ) {
+                        decorProgressMenuItemTypeTheme = value; continue; }
+                    if( strstr(n, "MenuItemProgressSize") == n ) {
+                        decorProgressMenuItemSizeTheme = value; continue; }
+                    if( strstr(n, "ReplayProgressType") == n ) {
+                        decorProgressReplayTypeTheme = value; continue; }
+                    if( strstr(n, "ReplayProgressSize") == n ) {
+                        decorProgressReplaySizeTheme = value; continue; }
+                    if( strstr(n, "ChannelSignalProgressType") == n ) {
+                        decorProgressSignalTypeTheme = value; continue; }
+                    if( strstr(n, "ChannelSignalProgressSize") == n ) {
+                        decorProgressSignalSizeTheme = value; continue; }
+                }
+            }
+        }
+    }
 }
 
 void cFlatConfig::SetLogoPath(cString path) {
diff --git a/config.h b/config.h
index 4e77ada6..2005aa14 100644
--- a/config.h
+++ b/config.h
@@ -13,6 +13,8 @@ class cFlatConfig
 {
     private:
         cString checkSlashAtEnd(std::string path);
+
+        int DecorCurrent;
     public:
         cFlatConfig(void);
         ~cFlatConfig(void);
@@ -23,7 +25,13 @@ class cFlatConfig
     
         void ThemeCheckAndInit(void);
         void ThemeInit(void);
+        void DecorDescriptions(cStringList &Decors);
+        cString DecorDescription(cString File);
+        void DecorLoadFile(cString File);
+        void DecorLoadCurrent(void);
+        void DecorCheckAndInit(void);
     public:
+
         cString ThemeCurrent;
         cString logoPath;
         cString iconPath;
@@ -164,4 +172,6 @@ class cFlatConfig
         int TopBarRecordingShow;
         int MenuItemIconsShow;
         int TopBarMenuIconShow;
+        
+        int DecorIndex;
 };
diff --git a/displaymenu.c b/displaymenu.c
index 4ce767ff..2e1962a0 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -360,16 +360,12 @@ void cFlatDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool S
                     cString cIcon = GetIconName( MainMenuText(s) );
                     cImageLoader imgLoader;
                     if (imgLoader.LoadIcon(*cIcon, fontHeight)) {
-                        //printf("icon %s\n", *cIcon);
                         menuIconsPixmap->DrawImage(cPoint(xt + Config.decorBorderMenuItemSize, y), imgLoader.GetImage());
                     } else {
                         if (imgLoader.LoadIcon("menuIcons/blank", fontHeight)) {
-                            //printf("icon %s\n", *cIcon);
                             menuIconsPixmap->DrawImage(cPoint(xt + Config.decorBorderMenuItemSize, y), imgLoader.GetImage());
                         }
                     }
-                        //printf("no icon %s\n", *cIcon);
-                    
                     menuPixmap->DrawText(cPoint(fontHeight + marginItem + xt + Config.decorBorderMenuItemSize, y), s, ColorFg, ColorBg, font,
                         Width - xt - marginItem - fontHeight );
                 } else {
diff --git a/displayreplay.c b/displayreplay.c
index 9e34628e..213a727b 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -50,6 +50,8 @@ void cFlatDisplayReplay::SetRecording(const cRecording *Recording) {
 
 void cFlatDisplayReplay::SetTitle(const char *Title) {
     TopBarSetTitle(Title);
+    TopBarSetMenuIcon("menuIcons/Recordings");
+    
 }
 
 void cFlatDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
diff --git a/flat.h b/flat.h
index a7c552b8..d8db4908 100644
--- a/flat.h
+++ b/flat.h
@@ -28,8 +28,6 @@ THEME_CLR(Theme, clrTopBarTimeFont,         0xFFEEEEEE);
 THEME_CLR(Theme, clrTopBarDateFont,         0xFFA0A0A0);
 THEME_CLR(Theme, clrTopBarBorderFg,         0xC0101010);
 THEME_CLR(Theme, clrTopBarBorderBg,         0xC0101010);
-THEME_CLR(Theme, clrTopBarBorderType,       0x00000000);
-THEME_CLR(Theme, clrTopBarBorderSize,       0x00000000);
 
 THEME_CLR(Theme, clrTopBarRecordingActiveFg,  0xFF880000);
 THEME_CLR(Theme, clrTopBarRecordingActiveBg,  0xC0101010);
@@ -44,8 +42,6 @@ THEME_CLR(Theme, clrButtonBlue,             CLR_BUTTONBLUE);
 
 THEME_CLR(Theme, clrButtonBorderFg,        0xC0101010);
 THEME_CLR(Theme, clrButtonBorderBg,        0xC0101010);
-THEME_CLR(Theme, clrButtonBorderType,      0x00000000);
-THEME_CLR(Theme, clrButtonBorderSize,      0x00000000);
 
 // Messages
 THEME_CLR(Theme, clrMessageBg,              0xC0101010);
@@ -58,8 +54,6 @@ THEME_CLR(Theme, clrMessageError,           CLR_MESSAGEERROR);
 
 THEME_CLR(Theme, clrMessageBorderFg,        0xC0101010);
 THEME_CLR(Theme, clrMessageBorderBg,        0xC0101010);
-THEME_CLR(Theme, clrMessageBorderType,      0x00000000);
-THEME_CLR(Theme, clrMessageBorderSize,      0x00000000);
 
 // Channel
 THEME_CLR(Theme, clrChannelBg,              0xC0101010);
@@ -69,20 +63,14 @@ THEME_CLR(Theme, clrChannelFontEpgFollow,   0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelProgressFg,      0xFF3090B0);
 THEME_CLR(Theme, clrChannelProgressBarFg,   0xFF3090B0);
 THEME_CLR(Theme, clrChannelProgressBg,      0xC0101010);
-THEME_CLR(Theme, clrChannelProgressType,    0x00000000);
-THEME_CLR(Theme, clrChannelProgressSize,    0x0000000A);
 
 THEME_CLR(Theme, clrChannelBorderFg,        0xC03090B0);
 THEME_CLR(Theme, clrChannelBorderBg,        0xC03090B0);
-THEME_CLR(Theme, clrChannelBorderType,      0x00000000);
-THEME_CLR(Theme, clrChannelBorderSize,      0x00000000);
 
 THEME_CLR(Theme, clrChannelSignalFont,            0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelSignalProgressFg,      0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelSignalProgressBarFg,   0xFFA0A0A0);
 THEME_CLR(Theme, clrChannelSignalProgressBg,      0xC0101010);
-THEME_CLR(Theme, clrChannelSignalProgressType,    0x00000002);
-THEME_CLR(Theme, clrChannelSignalProgressSize,    0x0000000A);
 
 THEME_CLR(Theme, clrChannelRecordingPresentFg,    0xFFAA0000);
 THEME_CLR(Theme, clrChannelRecordingPresentBg,    0xC0101010);
@@ -113,13 +101,9 @@ THEME_CLR(Theme, clrMenuTextFont,           0xFFEEEEEE);
 
 THEME_CLR(Theme, clrMenuContentHeadBorderFg,        0xC03090B0);
 THEME_CLR(Theme, clrMenuContentHeadBorderBg,        0xC03090B0);
-THEME_CLR(Theme, clrMenuContentHeadBorderType,      0x00000000);
-THEME_CLR(Theme, clrMenuContentHeadBorderSize,      0x00000000);
 
 THEME_CLR(Theme, clrMenuContentBorderFg,        0xC03090B0);
 THEME_CLR(Theme, clrMenuContentBorderBg,        0xC03090B0);
-THEME_CLR(Theme, clrMenuContentBorderType,      0x00000000);
-THEME_CLR(Theme, clrMenuContentBorderSize,      0x00000000);
 
 // Menu Items
 THEME_CLR(Theme, clrMenuItemProgressFg,      0xFFEEEEEE);
@@ -128,11 +112,7 @@ THEME_CLR(Theme, clrMenuItemProgressBg,      0xC0101010);
 THEME_CLR(Theme, clrMenuItemCurProgressFg,      0xFFEEEEEE);
 THEME_CLR(Theme, clrMenuItemCurProgressBarFg,   0xFFEEEEEE);
 THEME_CLR(Theme, clrMenuItemCurProgressBg,      0xC03090B0);
-THEME_CLR(Theme, clrMenuItemProgressType,    0x00000002);
-THEME_CLR(Theme, clrMenuItemProgressSize,    0x00000014);
 
-THEME_CLR(Theme, clrMenuItemBorderType,    0x00000000);
-THEME_CLR(Theme, clrMenuItemBorderSize,    0x00000000);
 THEME_CLR(Theme, clrMenuItemBorderFg,      0xC0909090);
 THEME_CLR(Theme, clrMenuItemBorderBg,      0xC0909090);
 THEME_CLR(Theme, clrMenuItemSelableBorderFg,      0xC0101010);
@@ -150,13 +130,9 @@ THEME_CLR(Theme, clrReplayProgressBarCurFg, 0xFF3090B0);
 THEME_CLR(Theme, clrReplayProgressBg,       0xC0101010);
 THEME_CLR(Theme, clrReplayMarkFg,           0xFFEEEEEE);
 THEME_CLR(Theme, clrReplayMarkCurrentFg,    0xFF3090B0);
-THEME_CLR(Theme, clrReplayProgressType,     0x00000000);
-THEME_CLR(Theme, clrReplayProgressSize,     0x00000028);
 
 THEME_CLR(Theme, clrReplayBorderFg,         0xC0101010);
 THEME_CLR(Theme, clrReplayBorderBg,         0xC0101010);
-THEME_CLR(Theme, clrReplayBorderType,       0x00000000);
-THEME_CLR(Theme, clrReplayBorderSize,       0x00000000);
 
 // Tracks
 THEME_CLR(Theme, clrTrackItemBg,            0xC0101010);
@@ -166,8 +142,6 @@ THEME_CLR(Theme, clrTrackItemCurrentFont,   0xFFEEEEEE);
 
 THEME_CLR(Theme, clrTrackItemBorderFg,      0xC0101010);
 THEME_CLR(Theme, clrTrackItemBorderBg,      0xC0101010);
-THEME_CLR(Theme, clrTrackItemBorderType,    0x00000000);
-THEME_CLR(Theme, clrTrackItemBorderSize,    0x00000000);
 THEME_CLR(Theme, clrTrackItemCurrentBorderFg,      0xC03090B0);
 THEME_CLR(Theme, clrTrackItemCurrentBorderBg,      0xC03090B0);
 
@@ -177,13 +151,9 @@ THEME_CLR(Theme, clrVolumeFont,             0xFFEEEEEE);
 THEME_CLR(Theme, clrVolumeProgressFg,       0xFF3090B0);
 THEME_CLR(Theme, clrVolumeProgressBarFg,    0xFF3090B0);
 THEME_CLR(Theme, clrVolumeProgressBg,       0xC0101010);
-THEME_CLR(Theme, clrVolumeProgressType,    0x00000000);
-THEME_CLR(Theme, clrVolumeProgressSize,    0x0000000A);
 
 THEME_CLR(Theme, clrVolumeBorderFg,         0xC0101010);
 THEME_CLR(Theme, clrVolumeBorderBg,         0xC0101010);
-THEME_CLR(Theme, clrVolumeBorderType,       0x00000000);
-THEME_CLR(Theme, clrVolumeBorderSize,       0x00000000);
 
 class cFlat : public cSkin {
     private:
diff --git a/icons/default/menuIcons/Timers.png b/icons/default/menuIcons/Timers.png
index 954b99bb..8c63ee42 100644
--- a/icons/default/menuIcons/Timers.png
+++ b/icons/default/menuIcons/Timers.png
diff --git a/icons/default/pluginIcons/arghdirector.png b/icons/default/pluginIcons/arghdirector.png
new file mode 100644
index 00000000..060d1042
--- /dev/null
+++ b/icons/default/pluginIcons/arghdirector.png
diff --git a/icons/default/pluginIcons/dvd.png b/icons/default/pluginIcons/dvd.png
new file mode 100644
index 00000000..22e70c19
--- /dev/null
+++ b/icons/default/pluginIcons/dvd.png
diff --git a/icons/default/pluginIcons/dvdswitch.png b/icons/default/pluginIcons/dvdswitch.png
new file mode 100644
index 00000000..b938f41a
--- /dev/null
+++ b/icons/default/pluginIcons/dvdswitch.png
diff --git a/icons/default/pluginIcons/epgsearch.png b/icons/default/pluginIcons/epgsearch.png
new file mode 100644
index 00000000..179254ff
--- /dev/null
+++ b/icons/default/pluginIcons/epgsearch.png
diff --git a/icons/default/pluginIcons/epgsearchonly.png b/icons/default/pluginIcons/epgsearchonly.png
new file mode 100644
index 00000000..179254ff
--- /dev/null
+++ b/icons/default/pluginIcons/epgsearchonly.png
diff --git a/icons/default/pluginIcons/filebrowser.png b/icons/default/pluginIcons/filebrowser.png
new file mode 100644
index 00000000..e699c44f
--- /dev/null
+++ b/icons/default/pluginIcons/filebrowser.png
diff --git a/icons/default/pluginIcons/fritzbox.png b/icons/default/pluginIcons/fritzbox.png
new file mode 100644
index 00000000..21b84c15
--- /dev/null
+++ b/icons/default/pluginIcons/fritzbox.png
diff --git a/icons/default/pluginIcons/markad.png b/icons/default/pluginIcons/markad.png
new file mode 100644
index 00000000..afded9fb
--- /dev/null
+++ b/icons/default/pluginIcons/markad.png
diff --git a/icons/default/pluginIcons/music.png b/icons/default/pluginIcons/music.png
new file mode 100644
index 00000000..768102f3
--- /dev/null
+++ b/icons/default/pluginIcons/music.png
diff --git a/icons/default/pluginIcons/osdteletext.png b/icons/default/pluginIcons/osdteletext.png
new file mode 100644
index 00000000..949c8171
--- /dev/null
+++ b/icons/default/pluginIcons/osdteletext.png
diff --git a/icons/default/pluginIcons/softhddevice.png b/icons/default/pluginIcons/softhddevice.png
new file mode 100644
index 00000000..e3660a6c
--- /dev/null
+++ b/icons/default/pluginIcons/softhddevice.png
diff --git a/po/de_DE.po b/po/de_DE.po
index 4ca8bbe6..7c448f9d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-skinflat 0.0.1\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2013-11-19 21:20+0100\n"
+"POT-Creation-Date: 2013-11-21 22:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -129,6 +129,9 @@ msgstr "Lautstärke Einstellungen"
 msgid "Tracks settings"
 msgstr "Audiospur Einstellungen"
 
+msgid "Decorfile"
+msgstr "Decordatei"
+
 msgid "Show empty color-buttons"
 msgstr "Zeige leere Farbtasten"
 
@@ -153,8 +156,8 @@ msgstr "TopBar zeige Aufnahme"
 msgid "Message bottom offset"
 msgstr "Meldung unterer Abstand"
 
-msgid "TopBar border by theme?"
-msgstr "TopBar Rand vom Theme?"
+msgid "TopBar border by decor-file?"
+msgstr "TopBar Rand von Decordatei?"
 
 msgid "TopBar border type"
 msgstr "TopBar Rand Typ"
@@ -162,8 +165,8 @@ msgstr "TopBar Rand Typ"
 msgid "TopBar border size"
 msgstr "TopBar Rand Größe"
 
-msgid "Message border by theme?"
-msgstr "Meldung Rand vom Theme?"
+msgid "Message border by decor-file?"
+msgstr "Meldung Rand von Decordatei?"
 
 msgid "Message border type"
 msgstr "Meldung Rand Typ"
@@ -171,8 +174,8 @@ msgstr "Meldung Rand Typ"
 msgid "Message border size"
 msgstr "Meldung Rand Größe"
 
-msgid "Button border by theme?"
-msgstr "Tasten Rand vom Theme?"
+msgid "Button border by decor-file?"
+msgstr "Tasten Rand vom von Decordatei?"
 
 msgid "Button border type"
 msgstr "Tasten Rand Typ"
@@ -192,8 +195,8 @@ msgstr "Zeige Auflösung & Aspect"
 msgid "Show format (hd/sd)"
 msgstr "Zeige Format (hd/sd)"
 
-msgid "Channelinfo border by theme?"
-msgstr "Kanalinfo Rand vom Theme?"
+msgid "Channelinfo border by decor-file?"
+msgstr "Kanalinfo Rand von Decordatei?"
 
 msgid "Channelinfo border type"
 msgstr "Kanalinfo Rand Typ"
@@ -201,8 +204,8 @@ msgstr "Kanalinfo Rand Typ"
 msgid "Channelinfo border size"
 msgstr "Kanalinfo Rand Größe"
 
-msgid "Channelinfo progress by theme?"
-msgstr "Kanalinfo Progress vom Theme?"
+msgid "Channelinfo progress by decor-file?"
+msgstr "Kanalinfo Progress von Decordatei?"
 
 msgid "Channelinfo progress type"
 msgstr "Kanalinfo Progress Typ"
@@ -210,8 +213,8 @@ msgstr "Kanalinfo Progress Typ"
 msgid "Channelinfo progress size"
 msgstr "Kanalinfo Progress Größe"
 
-msgid "Signalquality progress by theme?"
-msgstr "Signal Progress vom Theme?"
+msgid "Signalquality progress by decor-file?"
+msgstr "Signal Progress von Decordatei?"
 
 msgid "Signalquality progress type"
 msgstr "Signal Progress Typ"
@@ -234,8 +237,8 @@ msgstr "Zeige Zusatzinfo bei Aufnahmen"
 msgid "Show additional EPG info"
 msgstr "Zeige Zusatzinfo bei EPG"
 
-msgid "Menuitem border by theme?"
-msgstr "Menüitem Rand vom Theme?"
+msgid "Menuitem border by decor-file?"
+msgstr "Menüitem Rand von Decordatei?"
 
 msgid "Menuitem border type"
 msgstr "Menüitem Rand Typ"
@@ -243,8 +246,8 @@ msgstr "Menüitem Rand Typ"
 msgid "Menuitem border size"
 msgstr "Menüitem Rand Größe"
 
-msgid "Menucont. border by theme?"
-msgstr "Menü Rand vom Theme?"
+msgid "Menucont. border by decor-file?"
+msgstr ""
 
 msgid "Menucont. border type"
 msgstr "Menü Rand Typ"
@@ -252,8 +255,8 @@ msgstr "Menü Rand Typ"
 msgid "Menucont. border size"
 msgstr "Menü Rand Größe"
 
-msgid "Menucont. head border by theme?"
-msgstr "Menükopf Rand vom Theme?"
+msgid "Menucont. head border by decor-file?"
+msgstr "Menü Rand von Decordatei?"
 
 msgid "Menucont. head border type"
 msgstr "Menükopf Rand Typ"
@@ -261,8 +264,8 @@ msgstr "Menükopf Rand Typ"
 msgid "Menucont. head border size"
 msgstr "Menükopf Rand Größe"
 
-msgid "Menuitem progress by theme?"
-msgstr "Menüitem Progress vom Theme?"
+msgid "Menuitem progress by decor-file?"
+msgstr "Menüitem Progress von Decordatei?"
 
 msgid "Menuitem progress type"
 msgstr "Menüitem Progress Typ"
@@ -270,8 +273,8 @@ msgstr "Menüitem Progress Typ"
 msgid "Menuitem progress size"
 msgstr "Menüitem Progress Größe"
 
-msgid "Replay border by theme?"
-msgstr "Replay Rand vom Theme?"
+msgid "Replay border by decor-file?"
+msgstr "Replay Rand von Decordatei?"
 
 msgid "Replay border type"
 msgstr "Replay Rand Typ"
@@ -279,14 +282,14 @@ msgstr "Replay Rand Typ"
 msgid "Replay border size"
 msgstr "Replay Rand Größe"
 
-msgid "Replay progress by theme?"
-msgstr "Replay Progress vom Theme?"
+msgid "Replay progress by decor-file?"
+msgstr "Replay Progress von Decordatei?"
 
 msgid "Replay progress size"
 msgstr "Replay Progress Größe"
 
-msgid "Volume border by theme?"
-msgstr "Lautstärke Rand vom Theme?"
+msgid "Volume border by decor-file?"
+msgstr "Lautstärke Rand von Decordatei?"
 
 msgid "Volume border type"
 msgstr "Lautstärke Rand Typ"
@@ -294,8 +297,8 @@ msgstr "Lautstärke Rand Typ"
 msgid "Volume border size"
 msgstr "Lautstärke Rand Größe"
 
-msgid "Volume progress by theme?"
-msgstr "Lautstärke Progress vom Theme?"
+msgid "Volume progress by decor-file?"
+msgstr "Lautstärke Progress von Decordatei?"
 
 msgid "Volume progress type"
 msgstr "Lautstärke Progress Typ"
@@ -303,11 +306,11 @@ msgstr "Lautstärke Progress Typ"
 msgid "Volume progress size"
 msgstr "Lautstärke Progress Größe"
 
-msgid "Tracks border by theme?"
-msgstr "Audiospur Rand vom Theme?"
+msgid "Tracks border by decor-file?"
+msgstr "Audiospur Rand von Decordatei?"
 
 msgid "Tracks border type"
 msgstr "Audiospur Rand Typ"
 
 msgid "Tracks border size"
-msgstr "Audiospur Rand Größe"
+msgstr "Audiospur Rand Größe"
\ No newline at end of file
diff --git a/setup.c b/setup.c
index bd4b2927..1627a207 100644
--- a/setup.c
+++ b/setup.c
@@ -143,6 +143,7 @@ void cFlatSetup::Store(void) {
     SetupStore("TopBarRecordingShow", Config.TopBarRecordingShow);
     SetupStore("MenuItemIconsShow", Config.MenuItemIconsShow);
     SetupStore("TopBarMenuIconShow", Config.TopBarMenuIconShow);
+    SetupStore("DecorIndex", Config.DecorIndex);
     
     Config.Init();
 }
@@ -169,6 +170,12 @@ cFlatSetupGeneral::cFlatSetupGeneral(cFlatConfig* data)  : cMenuSetupSubMenu(tr(
 void cFlatSetupGeneral::Setup(void) {
     Clear();
 
+    SetupConfig->DecorDescriptions( DecorDescriptions );
+    if( SetupConfig->DecorIndex < 0 || SetupConfig->DecorIndex > DecorDescriptions.Size() )
+        SetupConfig->DecorIndex = 0;
+    
+    Add(new cMenuEditStraItem(tr("Decorfile"), &SetupConfig->DecorIndex, DecorDescriptions.Size(), &DecorDescriptions[0]));
+
     Add(new cMenuEditBoolItem(tr("Show empty color-buttons"), &SetupConfig->ButtonsShowEmpty));
     Add(new cMenuEditBoolItem(tr("Show TopBar menu icons"), &SetupConfig->TopBarMenuIconShow));
     Add(new cMenuEditBoolItem(tr("Show Diskusage stats"), &SetupConfig->DiskUsageShow));
@@ -179,7 +186,7 @@ void cFlatSetupGeneral::Setup(void) {
     Add(new cMenuEditIntItem(tr("Message bottom offset"), &SetupConfig->MessageOffset));
 
 
-    Add(new cMenuEditBoolItem(tr("TopBar border by theme?"), &SetupConfig->decorBorderTopBarByTheme));
+    Add(new cMenuEditBoolItem(tr("TopBar border by decor-file?"), &SetupConfig->decorBorderTopBarByTheme));
     if( SetupConfig->decorBorderTopBarByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("TopBar border type"), Bordertypes[SetupConfig->decorBorderTopBarTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -190,7 +197,7 @@ void cFlatSetupGeneral::Setup(void) {
         Add(new cMenuEditIntItem(tr("TopBar border size"), &SetupConfig->decorBorderTopBarSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Message border by theme?"), &SetupConfig->decorBorderMessageByTheme));
+    Add(new cMenuEditBoolItem(tr("Message border by decor-file?"), &SetupConfig->decorBorderMessageByTheme));
     if( SetupConfig->decorBorderMessageByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Message border type"), Bordertypes[SetupConfig->decorBorderMessageTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -201,7 +208,7 @@ void cFlatSetupGeneral::Setup(void) {
         Add(new cMenuEditIntItem(tr("Message border size"), &SetupConfig->decorBorderMessageSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Button border by theme?"), &SetupConfig->decorBorderButtonByTheme));
+    Add(new cMenuEditBoolItem(tr("Button border by decor-file?"), &SetupConfig->decorBorderButtonByTheme));
     if( SetupConfig->decorBorderButtonByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Button border type"), Bordertypes[SetupConfig->decorBorderButtonTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -232,9 +239,9 @@ eOSState cFlatSetupGeneral::ProcessKey(eKeys Key) {
     }
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
-        if( strstr(ItemText, tr("TopBar border by theme?")) != NULL ||
-            strstr(ItemText, tr("Message border by theme?")) != NULL ||
-            strstr(ItemText, tr("Button border by theme?")) != NULL
+        if( strstr(ItemText, tr("TopBar border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Message border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Button border by decor-file?")) != NULL
         ) {
             ItemLastSel = Current();
             Setup();
@@ -256,7 +263,7 @@ void cFlatSetupChannelInfo::Setup(void) {
     Add(new cMenuEditBoolItem(tr("Show resolution & aspect"), &SetupConfig->ChannelResolutionAspectShow));
     Add(new cMenuEditBoolItem(tr("Show format (hd/sd)"), &SetupConfig->ChannelFormatShow));
 
-    Add(new cMenuEditBoolItem(tr("Channelinfo border by theme?"), &SetupConfig->decorBorderChannelByTheme));
+    Add(new cMenuEditBoolItem(tr("Channelinfo border by decor-file?"), &SetupConfig->decorBorderChannelByTheme));
     if( SetupConfig->decorBorderChannelByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Channelinfo border type"), Bordertypes[SetupConfig->decorBorderChannelTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -267,7 +274,7 @@ void cFlatSetupChannelInfo::Setup(void) {
         Add(new cMenuEditIntItem(tr("Channelinfo border size"), &SetupConfig->decorBorderChannelSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Channelinfo progress by theme?"), &SetupConfig->decorProgressChannelByTheme));
+    Add(new cMenuEditBoolItem(tr("Channelinfo progress by decor-file?"), &SetupConfig->decorProgressChannelByTheme));
     if( SetupConfig->decorProgressChannelByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Channelinfo progress type"), Progresstypes[SetupConfig->decorProgressChannelTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -278,7 +285,7 @@ void cFlatSetupChannelInfo::Setup(void) {
         Add(new cMenuEditIntItem(tr("Channelinfo progress size"), &SetupConfig->decorProgressChannelSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Signalquality progress by theme?"), &SetupConfig->decorProgressSignalByTheme));
+    Add(new cMenuEditBoolItem(tr("Signalquality progress by decor-file?"), &SetupConfig->decorProgressSignalByTheme));
     if( SetupConfig->decorProgressSignalByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Signalquality progress type"), Progresstypes[SetupConfig->decorProgressSignalTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -309,9 +316,9 @@ eOSState cFlatSetupChannelInfo::ProcessKey(eKeys Key) {
     }
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
-        if( strstr(ItemText, tr("Channelinfo border by theme?")) != NULL ||
-            strstr(ItemText, tr("Channelinfo progress by theme?")) != NULL ||
-            strstr(ItemText, tr("Signalquality progress by theme?")) != NULL
+        if( strstr(ItemText, tr("Channelinfo border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Channelinfo progress by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Signalquality progress by decor-file?")) != NULL
         ) {
             ItemLastSel = Current();
             Setup();
@@ -334,7 +341,7 @@ void cFlatSetupMenu::Setup(void) {
     Add(new cMenuEditBoolItem(tr("Show additional recording info"), &SetupConfig->RecordingAdditionalInfoShow));
     Add(new cMenuEditBoolItem(tr("Show additional EPG info"), &SetupConfig->EpgAdditionalInfoShow));
 
-    Add(new cMenuEditBoolItem(tr("Menuitem border by theme?"), &SetupConfig->decorBorderMenuItemByTheme));
+    Add(new cMenuEditBoolItem(tr("Menuitem border by decor-file?"), &SetupConfig->decorBorderMenuItemByTheme));
     if( SetupConfig->decorBorderMenuItemByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Menuitem border type"), Bordertypes[SetupConfig->decorBorderMenuItemTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -345,7 +352,7 @@ void cFlatSetupMenu::Setup(void) {
         Add(new cMenuEditIntItem(tr("Menuitem border size"), &SetupConfig->decorBorderMenuItemSizeUser));
     }
     
-    Add(new cMenuEditBoolItem(tr("Menucont. border by theme?"), &SetupConfig->decorBorderMenuContentByTheme));
+    Add(new cMenuEditBoolItem(tr("Menucont. border by decor-file?"), &SetupConfig->decorBorderMenuContentByTheme));
     if( SetupConfig->decorBorderMenuContentByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Menucont. border type"), Bordertypes[SetupConfig->decorBorderMenuContentTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -356,7 +363,7 @@ void cFlatSetupMenu::Setup(void) {
         Add(new cMenuEditIntItem(tr("Menucont. border size"), &SetupConfig->decorBorderMenuContentSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Menucont. head border by theme?"), &SetupConfig->decorBorderMenuContentHeadByTheme));
+    Add(new cMenuEditBoolItem(tr("Menucont. head border by decor-file?"), &SetupConfig->decorBorderMenuContentHeadByTheme));
     if( SetupConfig->decorBorderMenuContentHeadByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Menucont. head border type"), Bordertypes[SetupConfig->decorBorderMenuContentHeadTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -367,7 +374,7 @@ void cFlatSetupMenu::Setup(void) {
         Add(new cMenuEditIntItem(tr("Menucont. head border size"), &SetupConfig->decorBorderMenuContentHeadSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Menuitem progress by theme?"), &SetupConfig->decorProgressMenuItemByTheme));
+    Add(new cMenuEditBoolItem(tr("Menuitem progress by decor-file?"), &SetupConfig->decorProgressMenuItemByTheme));
     if( SetupConfig->decorProgressMenuItemByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Menuitem progress type"), Progresstypes[SetupConfig->decorProgressMenuItemTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -398,10 +405,10 @@ eOSState cFlatSetupMenu::ProcessKey(eKeys Key) {
     }
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
-        if( strstr(ItemText, tr("Menuitem border by theme?")) != NULL ||
-            strstr(ItemText, tr("Menucont. border by theme?")) != NULL ||
-            strstr(ItemText, tr("Menucont. head border by theme?")) != NULL ||
-            strstr(ItemText, tr("Menuitem progress by theme?")) != NULL
+        if( strstr(ItemText, tr("Menuitem border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Menucont. border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Menucont. head border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Menuitem progress by decor-file?")) != NULL
         ) {
             ItemLastSel = Current();
             Setup();
@@ -418,7 +425,7 @@ cFlatSetupReplay::cFlatSetupReplay(cFlatConfig* data)  : cMenuSetupSubMenu(tr("R
 void cFlatSetupReplay::Setup(void) {
     Clear();
 
-    Add(new cMenuEditBoolItem(tr("Replay border by theme?"), &SetupConfig->decorBorderReplayByTheme));
+    Add(new cMenuEditBoolItem(tr("Replay border by decor-file?"), &SetupConfig->decorBorderReplayByTheme));
     Add(new cMenuEditBoolItem(tr("Show resolution & aspect"), &SetupConfig->RecordingResolutionAspectShow));
     Add(new cMenuEditBoolItem(tr("Show format (hd/sd)"), &SetupConfig->RecordingFormatShow));
     
@@ -432,7 +439,7 @@ void cFlatSetupReplay::Setup(void) {
         Add(new cMenuEditIntItem(tr("Replay border size"), &SetupConfig->decorBorderReplaySizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Replay progress by theme?"), &SetupConfig->decorProgressReplayByTheme));
+    Add(new cMenuEditBoolItem(tr("Replay progress by decor-file?"), &SetupConfig->decorProgressReplayByTheme));
     if( SetupConfig->decorProgressReplayByTheme ) {
         cString size = cString::sprintf("%s:\t%d", tr("Replay progress size"), SetupConfig->decorProgressReplaySizeTheme);
         Add(new cOsdItem(size, osUnknown, false));
@@ -460,8 +467,8 @@ eOSState cFlatSetupReplay::ProcessKey(eKeys Key) {
     }
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
-        if( strstr(ItemText, tr("Replay border by theme?")) != NULL ||
-            strstr(ItemText, tr("Replay progress by theme?")) != NULL
+        if( strstr(ItemText, tr("Replay border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Replay progress by decor-file?")) != NULL
         ) {
             ItemLastSel = Current();
             Setup();
@@ -478,7 +485,7 @@ cFlatSetupVolume::cFlatSetupVolume(cFlatConfig* data)  : cMenuSetupSubMenu(tr("V
 void cFlatSetupVolume::Setup(void) {
     Clear();
 
-    Add(new cMenuEditBoolItem(tr("Volume border by theme?"), &SetupConfig->decorBorderVolumeByTheme));
+    Add(new cMenuEditBoolItem(tr("Volume border by decor-file?"), &SetupConfig->decorBorderVolumeByTheme));
     if( SetupConfig->decorBorderVolumeByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Volume border type"), Bordertypes[SetupConfig->decorBorderVolumeTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -489,7 +496,7 @@ void cFlatSetupVolume::Setup(void) {
         Add(new cMenuEditIntItem(tr("Volume border size"), &SetupConfig->decorBorderVolumeSizeUser));
     }
 
-    Add(new cMenuEditBoolItem(tr("Volume progress by theme?"), &SetupConfig->decorProgressVolumeByTheme));
+    Add(new cMenuEditBoolItem(tr("Volume progress by decor-file?"), &SetupConfig->decorProgressVolumeByTheme));
     if( SetupConfig->decorProgressVolumeByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Volume progress type"), Progresstypes[SetupConfig->decorProgressVolumeTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -520,8 +527,8 @@ eOSState cFlatSetupVolume::ProcessKey(eKeys Key) {
     }
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
-        if( strstr(ItemText, tr("Volume border by theme?")) != NULL ||
-            strstr(ItemText, tr("Volume progress by theme?")) != NULL
+        if( strstr(ItemText, tr("Volume border by decor-file?")) != NULL ||
+            strstr(ItemText, tr("Volume progress by decor-file?")) != NULL
         ) {
             ItemLastSel = Current();
             Setup();
@@ -538,7 +545,7 @@ cFlatSetupTracks::cFlatSetupTracks(cFlatConfig* data)  : cMenuSetupSubMenu(tr("T
 void cFlatSetupTracks::Setup(void) {
     Clear();
 
-    Add(new cMenuEditBoolItem(tr("Tracks border by theme?"), &SetupConfig->decorBorderTrackByTheme));
+    Add(new cMenuEditBoolItem(tr("Tracks border by decor-file?"), &SetupConfig->decorBorderTrackByTheme));
     if( SetupConfig->decorBorderTrackByTheme ) {
         cString type = cString::sprintf("%s:\t%s", tr("Tracks border type"), Bordertypes[SetupConfig->decorBorderTrackTypeTheme]);
         Add(new cOsdItem(type, osUnknown, false));
@@ -569,7 +576,7 @@ eOSState cFlatSetupTracks::ProcessKey(eKeys Key) {
     }
     if( Key == kLeft || Key == kRight ) {
         const char* ItemText = Get(Current())->Text();
-        if( strstr(ItemText, tr("Tracks border by theme?")) != NULL
+        if( strstr(ItemText, tr("Tracks border by decor-file?")) != NULL
         ) {
             ItemLastSel = Current();
             Setup();
diff --git a/setup.h b/setup.h
index e433091d..003ac54d 100644
--- a/setup.h
+++ b/setup.h
@@ -29,6 +29,8 @@ class cMenuSetupSubMenu : public cOsdMenu {
 };
 
 class cFlatSetupGeneral : public cMenuSetupSubMenu {
+    private:
+        cStringList DecorDescriptions;
     protected:
         void Setup(void);
     public:
diff --git a/themes/flatPlus-def_rectalpha.theme b/themes/flatPlus-def_rectalpha.theme
deleted file mode 100644
index 9a44aaff..00000000
--- a/themes/flatPlus-def_rectalpha.theme
+++ /dev/null
@@ -1,125 +0,0 @@
-Description = Default + rect alpha
-clrTopBarBg = C0101010
-clrTopBarFont = FFEEEEEE
-clrTopBarTimeFont = FFEEEEEE
-clrTopBarDateFont = FFA0A0A0
-clrTopBarBorderFg = C0101010
-clrTopBarBorderBg = C0101010
-clrTopBarBorderType = 00000004
-clrTopBarBorderSize = 0000000F
-clrButtonBg = C0101010
-clrButtonFont = FFEEEEEE
-clrButtonRed = FFBB0000
-clrButtonGreen = FF00BB00
-clrButtonYellow = FFBBBB00
-clrButtonBlue = FF0000BB
-clrButtonBorderFg = C0101010
-clrButtonBorderBg = C0101010
-clrButtonBorderType = 00000004
-clrButtonBorderSize = 0000000F
-clrMessageBg = C0101010
-clrMessageFont = FFEEEEEE
-clrMessageStatus = FF0000FF
-clrMessageInfo = FF009900
-clrMessageWarning = FFBBBB00
-clrMessageError = FFBB0000
-clrMessageBorderFg = C0101010
-clrMessageBorderBg = C0101010
-clrMessageBorderType = 00000004
-clrMessageBorderSize = 0000000F
-clrChannelBg = C0101010
-clrChannelFontTitle = FF3090B0
-clrChannelFontEpg = FFEEEEEE
-clrChannelFontEpgFollow = FFA0A0A0
-clrChannelProgressFg = FF3090B0
-clrChannelProgressBarFg = FF3090B0
-clrChannelProgressBg = C0101010
-clrChannelProgressType = 00000008
-clrChannelProgressSize = 0000000F
-clrChannelBorderFg = C03090B0
-clrChannelBorderBg = C03090B0
-clrChannelBorderType = 00000004
-clrChannelBorderSize = 0000000F
-clrChannelSignalFont = FFA0A0A0
-clrChannelSignalProgressFg = FFA0A0A0
-clrChannelSignalProgressBarFg = FFA0A0A0
-clrChannelSignalProgressBg = C0101010
-clrChannelSignalProgressType = 00000002
-clrChannelSignalProgressSize = 0000000A
-clrItemBg = C0909090
-clrItemFont = FFEEEEEE
-clrItemCurrentBg = C03090B0
-clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = C0101010
-clrItemSelableFont = FFEEEEEE
-clrScrollbarFg = FF3090B0
-clrScrollbarBarFg = FF3090B0
-clrScrollbarBg = C0101010
-clrMenuEventBg = C0101010
-clrMenuEventFontTitle = FF3090B0
-clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = C0101010
-clrMenuRecFontTitle = FF3090B0
-clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = C0101010
-clrMenuTextFont = FFEEEEEE
-clrMenuContentHeadBorderFg = C0101010
-clrMenuContentHeadBorderBg = C0101010
-clrMenuContentHeadBorderType = 00000004
-clrMenuContentHeadBorderSize = 0000000F
-clrMenuContentBorderFg = C03090B0
-clrMenuContentBorderBg = C03090B0
-clrMenuContentBorderType = 00000004
-clrMenuContentBorderSize = 0000000F
-clrMenuItemProgressFg = FFEEEEEE
-clrMenuItemProgressBarFg = FFEEEEEE
-clrMenuItemProgressBg = C0101010
-clrMenuItemCurProgressFg = FFEEEEEE
-clrMenuItemCurProgressBarFg = FFEEEEEE
-clrMenuItemCurProgressBg = C03090B0
-clrMenuItemProgressType = 00000002
-clrMenuItemProgressSize = 00000014
-clrMenuItemBorderType = 00000004
-clrMenuItemBorderSize = 0000000F
-clrMenuItemBorderFg = C0909090
-clrMenuItemBorderBg = C0909090
-clrMenuItemSelableBorderFg = C0101010
-clrMenuItemSelableBorderBg = C0101010
-clrMenuItemCurrentBorderFg = C03090B0
-clrMenuItemCurrentBorderBg = C03090B0
-clrReplayBg = C0101010
-clrReplayFont = FFEEEEEE
-clrReplayFontSpeed = FF3090B0
-clrReplayProgressFg = FFEEEEEE
-clrReplayProgressBarFg = FFEEEEEE
-clrReplayProgressBarCurFg = FF3090B0
-clrReplayProgressBg = C0101010
-clrReplayMarkFg = FFEEEEEE
-clrReplayMarkCurrentFg = FF3090B0
-clrReplayProgressType = 00000000
-clrReplayProgressSize = 00000028
-clrReplayBorderFg = C0101010
-clrReplayBorderBg = C0101010
-clrReplayBorderType = 00000004
-clrReplayBorderSize = 0000000F
-clrTrackItemBg = C0101010
-clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = C03090B0
-clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C0101010
-clrTrackItemBorderBg = C0101010
-clrTrackItemBorderType = 00000004
-clrTrackItemBorderSize = 0000000F
-clrTrackItemCurrentBorderFg = C03090B0
-clrTrackItemCurrentBorderBg = C03090B0
-clrVolumeBg = C0101010
-clrVolumeFont = FFEEEEEE
-clrVolumeProgressFg = FF3090B0
-clrVolumeProgressBarFg = FF3090B0
-clrVolumeProgressBg = C0101010
-clrVolumeProgressType = 00000008
-clrVolumeProgressSize = 0000000F
-clrVolumeBorderFg = C0101010
-clrVolumeBorderBg = C0101010
-clrVolumeBorderType = 00000004
-clrVolumeBorderSize = 0000000F
diff --git a/themes/flatPlus-def_round.theme b/themes/flatPlus-def_round.theme
deleted file mode 100644
index a4ac63a0..00000000
--- a/themes/flatPlus-def_round.theme
+++ /dev/null
@@ -1,125 +0,0 @@
-Description = Default + round
-clrTopBarBg = C0101010
-clrTopBarFont = FFEEEEEE
-clrTopBarTimeFont = FFEEEEEE
-clrTopBarDateFont = FFA0A0A0
-clrTopBarBorderFg = C0101010
-clrTopBarBorderBg = C0101010
-clrTopBarBorderType = 00000002
-clrTopBarBorderSize = 0000000F
-clrButtonBg = C0101010
-clrButtonFont = FFEEEEEE
-clrButtonRed = FFBB0000
-clrButtonGreen = FF00BB00
-clrButtonYellow = FFBBBB00
-clrButtonBlue = FF0000BB
-clrButtonBorderFg = C0101010
-clrButtonBorderBg = C0101010
-clrButtonBorderType = 00000002
-clrButtonBorderSize = 0000000F
-clrMessageBg = C0101010
-clrMessageFont = FFEEEEEE
-clrMessageStatus = FF0000FF
-clrMessageInfo = FF009900
-clrMessageWarning = FFBBBB00
-clrMessageError = FFBB0000
-clrMessageBorderFg = C0101010
-clrMessageBorderBg = C0101010
-clrMessageBorderType = 00000002
-clrMessageBorderSize = 0000000F
-clrChannelBg = C0101010
-clrChannelFontTitle = FF3090B0
-clrChannelFontEpg = FFEEEEEE
-clrChannelFontEpgFollow = FFA0A0A0
-clrChannelProgressFg = FF3090B0
-clrChannelProgressBarFg = FF3090B0
-clrChannelProgressBg = C0101010
-clrChannelProgressType = 00000003
-clrChannelProgressSize = 0000000A
-clrChannelBorderFg = C03090B0
-clrChannelBorderBg = C03090B0
-clrChannelBorderType = 00000002
-clrChannelBorderSize = 0000000F
-clrChannelSignalFont = FFA0A0A0
-clrChannelSignalProgressFg = FFA0A0A0
-clrChannelSignalProgressBarFg = FFA0A0A0
-clrChannelSignalProgressBg = C0101010
-clrChannelSignalProgressType = 00000002
-clrChannelSignalProgressSize = 0000000A
-clrItemBg = C0909090
-clrItemFont = FFEEEEEE
-clrItemCurrentBg = C03090B0
-clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = C0101010
-clrItemSelableFont = FFEEEEEE
-clrScrollbarFg = FF3090B0
-clrScrollbarBarFg = FF3090B0
-clrScrollbarBg = C0101010
-clrMenuEventBg = C0101010
-clrMenuEventFontTitle = FF3090B0
-clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = C0101010
-clrMenuRecFontTitle = FF3090B0
-clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = C0101010
-clrMenuTextFont = FFEEEEEE
-clrMenuContentHeadBorderFg = C0101010
-clrMenuContentHeadBorderBg = C0101010
-clrMenuContentHeadBorderType = 00000002
-clrMenuContentHeadBorderSize = 0000000F
-clrMenuContentBorderFg = C03090B0
-clrMenuContentBorderBg = C03090B0
-clrMenuContentBorderType = 00000002
-clrMenuContentBorderSize = 0000000F
-clrMenuItemProgressFg = FFEEEEEE
-clrMenuItemProgressBarFg = FFEEEEEE
-clrMenuItemProgressBg = C0101010
-clrMenuItemCurProgressFg = FFEEEEEE
-clrMenuItemCurProgressBarFg = FFEEEEEE
-clrMenuItemCurProgressBg = C03090B0
-clrMenuItemProgressType = 00000002
-clrMenuItemProgressSize = 00000014
-clrMenuItemBorderType = 00000002
-clrMenuItemBorderSize = 0000000F
-clrMenuItemBorderFg = C0909090
-clrMenuItemBorderBg = C0909090
-clrMenuItemSelableBorderFg = C0101010
-clrMenuItemSelableBorderBg = C0101010
-clrMenuItemCurrentBorderFg = C03090B0
-clrMenuItemCurrentBorderBg = C03090B0
-clrReplayBg = C0101010
-clrReplayFont = FFEEEEEE
-clrReplayFontSpeed = FF3090B0
-clrReplayProgressFg = FFEEEEEE
-clrReplayProgressBarFg = FFEEEEEE
-clrReplayProgressBarCurFg = FF3090B0
-clrReplayProgressBg = C0101010
-clrReplayMarkFg = FFEEEEEE
-clrReplayMarkCurrentFg = FF3090B0
-clrReplayProgressType = 00000000
-clrReplayProgressSize = 00000028
-clrReplayBorderFg = C0101010
-clrReplayBorderBg = C0101010
-clrReplayBorderType = 00000002
-clrReplayBorderSize = 0000000F
-clrTrackItemBg = C0101010
-clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = C03090B0
-clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C0101010
-clrTrackItemBorderBg = C0101010
-clrTrackItemBorderType = 00000002
-clrTrackItemBorderSize = 0000000F
-clrTrackItemCurrentBorderFg = C03090B0
-clrTrackItemCurrentBorderBg = C03090B0
-clrVolumeBg = C0101010
-clrVolumeFont = FFEEEEEE
-clrVolumeProgressFg = FF3090B0
-clrVolumeProgressBarFg = FF3090B0
-clrVolumeProgressBg = C0101010
-clrVolumeProgressType = 00000003
-clrVolumeProgressSize = 0000000A
-clrVolumeBorderFg = C0101010
-clrVolumeBorderBg = C0101010
-clrVolumeBorderType = 00000002
-clrVolumeBorderSize = 0000000F
diff --git a/themes/flatPlus-def_roundalpha.theme b/themes/flatPlus-def_roundalpha.theme
deleted file mode 100644
index 75470b66..00000000
--- a/themes/flatPlus-def_roundalpha.theme
+++ /dev/null
@@ -1,125 +0,0 @@
-Description = Default + round alpha
-clrTopBarBg = C0101010
-clrTopBarFont = FFEEEEEE
-clrTopBarTimeFont = FFEEEEEE
-clrTopBarDateFont = FFA0A0A0
-clrTopBarBorderFg = C0101010
-clrTopBarBorderBg = C0101010
-clrTopBarBorderType = 00000005
-clrTopBarBorderSize = 0000000F
-clrButtonBg = C0101010
-clrButtonFont = FFEEEEEE
-clrButtonRed = FFBB0000
-clrButtonGreen = FF00BB00
-clrButtonYellow = FFBBBB00
-clrButtonBlue = FF0000BB
-clrButtonBorderFg = C0101010
-clrButtonBorderBg = C0101010
-clrButtonBorderType = 00000005
-clrButtonBorderSize = 0000000F
-clrMessageBg = C0101010
-clrMessageFont = FFEEEEEE
-clrMessageStatus = FF0000FF
-clrMessageInfo = FF009900
-clrMessageWarning = FFBBBB00
-clrMessageError = FFBB0000
-clrMessageBorderFg = C0101010
-clrMessageBorderBg = C0101010
-clrMessageBorderType = 00000005
-clrMessageBorderSize = 0000000F
-clrChannelBg = C0101010
-clrChannelFontTitle = FF3090B0
-clrChannelFontEpg = FFEEEEEE
-clrChannelFontEpgFollow = FFA0A0A0
-clrChannelProgressFg = FF3090B0
-clrChannelProgressBarFg = FF3090B0
-clrChannelProgressBg = C0101010
-clrChannelProgressType = 00000008
-clrChannelProgressSize = 0000000F
-clrChannelBorderFg = C03090B0
-clrChannelBorderBg = C03090B0
-clrChannelBorderType = 00000005
-clrChannelBorderSize = 0000000F
-clrChannelSignalFont = FFA0A0A0
-clrChannelSignalProgressFg = FFA0A0A0
-clrChannelSignalProgressBarFg = FFA0A0A0
-clrChannelSignalProgressBg = C0101010
-clrChannelSignalProgressType = 00000002
-clrChannelSignalProgressSize = 0000000A
-clrItemBg = C0909090
-clrItemFont = FFEEEEEE
-clrItemCurrentBg = C03090B0
-clrItemCurrentFont = FFEEEEEE
-clrItemSelableBg = C0101010
-clrItemSelableFont = FFEEEEEE
-clrScrollbarFg = FF3090B0
-clrScrollbarBarFg = FF3090B0
-clrScrollbarBg = C0101010
-clrMenuEventBg = C0101010
-clrMenuEventFontTitle = FF3090B0
-clrMenuEventFontInfo = FFEEEEEE
-clrMenuRecBg = C0101010
-clrMenuRecFontTitle = FF3090B0
-clrMenuRecFontInfo = FFEEEEEE
-clrMenuTextBg = C0101010
-clrMenuTextFont = FFEEEEEE
-clrMenuContentHeadBorderFg = C0101010
-clrMenuContentHeadBorderBg = C0101010
-clrMenuContentHeadBorderType = 00000005
-clrMenuContentHeadBorderSize = 0000000F
-clrMenuContentBorderFg = C03090B0
-clrMenuContentBorderBg = C03090B0
-clrMenuContentBorderType = 00000005
-clrMenuContentBorderSize = 0000000F
-clrMenuItemProgressFg = FFEEEEEE
-clrMenuItemProgressBarFg = FFEEEEEE
-clrMenuItemProgressBg = C0101010
-clrMenuItemCurProgressFg = FFEEEEEE
-clrMenuItemCurProgressBarFg = FFEEEEEE
-clrMenuItemCurProgressBg = C03090B0
-clrMenuItemProgressType = 00000002
-clrMenuItemProgressSize = 00000014
-clrMenuItemBorderType = 00000005
-clrMenuItemBorderSize = 0000000F
-clrMenuItemBorderFg = C0909090
-clrMenuItemBorderBg = C0909090
-clrMenuItemSelableBorderFg = C0101010
-clrMenuItemSelableBorderBg = C0101010
-clrMenuItemCurrentBorderFg = C03090B0
-clrMenuItemCurrentBorderBg = C03090B0
-clrReplayBg = C0101010
-clrReplayFont = FFEEEEEE
-clrReplayFontSpeed = FF3090B0
-clrReplayProgressFg = FFEEEEEE
-clrReplayProgressBarFg = FFEEEEEE
-clrReplayProgressBarCurFg = FF3090B0
-clrReplayProgressBg = C0101010
-clrReplayMarkFg = FFEEEEEE
-clrReplayMarkCurrentFg = FF3090B0
-clrReplayProgressType = 00000000
-clrReplayProgressSize = 00000028
-clrReplayBorderFg = C0101010
-clrReplayBorderBg = C0101010
-clrReplayBorderType = 00000005
-clrReplayBorderSize = 0000000F
-clrTrackItemBg = C0101010
-clrTrackItemFont = FFEEEEEE
-clrTrackItemCurrentBg = C03090B0
-clrTrackItemCurrentFont = FFEEEEEE
-clrTrackItemBorderFg = C0101010
-clrTrackItemBorderBg = C0101010
-clrTrackItemBorderType = 00000005
-clrTrackItemBorderSize = 0000000F
-clrTrackItemCurrentBorderFg = C03090B0
-clrTrackItemCurrentBorderBg = C03090B0
-clrVolumeBg = C0101010
-clrVolumeFont = FFEEEEEE
-clrVolumeProgressFg = FF3090B0
-clrVolumeProgressBarFg = FF3090B0
-clrVolumeProgressBg = C0101010
-clrVolumeProgressType = 00000008
-clrVolumeProgressSize = 0000000F
-clrVolumeBorderFg = C0101010
-clrVolumeBorderBg = C0101010
-clrVolumeBorderType = 00000005
-clrVolumeBorderSize = 0000000F