adapted blackhole xml files to setup parameters

47 files changed, 477 insertions, 294 deletions

diff --git a/HISTORY b/HISTORY
index a947af5..27b8c72 100644
--- a/HISTORY
+++ b/HISTORY
@@ -160,3 +160,6 @@ Version 0.1.4
   if a string token is set
 - added token {nummenuitem} for plugin menu lists
 - fixed bug that custom int tokens were not considered in conditions
+- added possibility for skinners to define a skin setup, skin setup can
+  be done in plugin setup menu
+- made skin blackhole configurable, adapted xml files
diff --git a/config.c b/config.c
index 48605a3..ecf9467 100644
--- a/config.c
+++ b/config.c
@@ -81,6 +81,23 @@ void cDesignerConfig::ClearSkinSetups(void) {
     for (map < string, cSkinSetup* >::iterator it = skinSetups.begin(); it != skinSetups.end(); it++) {
         delete it->second;
     }
+    skinSetups.clear();
+}
+
+void cDesignerConfig::DebugSkinSetups(void) {
+    dsyslog("skindesigner: skin setups:");
+    InitSetupIterator();
+    cSkinSetup *skinSetup = NULL;
+    while (skinSetup = GetSkinSetup()) {
+        skinSetup->Debug();
+    }    
+}
+
+void cDesignerConfig::DebugSkinSetupParameters(void) {
+    dsyslog("skindesigner: skin setup parameters:");
+    for (vector<pair<string, int> >::iterator it = skinSetupParameters.begin(); it != skinSetupParameters.end(); it++) {
+        dsyslog("skindesigner: parameter %s value %d", (*it).first.c_str(), (*it).second);
+    }
 }
 
 void cDesignerConfig::ReadSkinSetup(string skin) {
@@ -123,8 +140,19 @@ void cDesignerConfig::TranslateSetup(void) {
     }
 }
 
-void cDesignerConfig::CheckUnknownSetupParameters(void) {
-    for (vector < pair <string, int> >::iterator it = unknownSetupParameters.begin(); it != unknownSetupParameters.end(); it++) {
+void cDesignerConfig::UpdateSkinSetupParameter(string name, int value) {
+    vector<pair<string,int> >::iterator hit;
+    for (hit = skinSetupParameters.begin(); hit != skinSetupParameters.end(); hit++) {
+        if (!name.compare((*hit).first)) {
+            skinSetupParameters.erase(hit);
+            break;
+        }
+    }
+    skinSetupParameters.push_back(pair<string,int>(name, value));
+}
+
+void cDesignerConfig::SetSkinSetupParameters(void) {
+    for (vector < pair <string, int> >::iterator it = skinSetupParameters.begin(); it != skinSetupParameters.end(); it++) {
         string name = (*it).first;
         int value = (*it).second;
 
@@ -159,6 +187,7 @@ void cDesignerConfig::UpdateGlobals(void) {
     if (skinSetupActiveSkin && tmplGlobals) {
         dsyslog("skindesigner: globals for skin %s adapted to skin setup", activeSkin.c_str());
         skinSetupActiveSkin->AddToGlobals(tmplGlobals);
+        tmplGlobals->Debug();
     }
 }
 
@@ -286,7 +315,7 @@ bool cDesignerConfig::SetupParse(const char *Name, const char *Value) {
     else pluginSetupParam = false;
 
     if (!pluginSetupParam) {
-        unknownSetupParameters.push_back(pair <string, int>(Name, atoi(Value)));
+        skinSetupParameters.push_back(pair <string, int>(Name, atoi(Value)));
     }
 
     return true;
diff --git a/config.h b/config.h
index 31dd065..4f8519e 100644
--- a/config.h
+++ b/config.h
@@ -32,7 +32,7 @@ private:
     map < string, map < int, string > >::iterator plugIt;
     map < string, cSkinSetup* > skinSetups;
     map < string, cSkinSetup* >::iterator setupIt;
-    vector < pair <string, int> > unknownSetupParameters;
+    vector < pair <string, int> > skinSetupParameters;
 public:
     cDesignerConfig();
     ~cDesignerConfig();
@@ -46,11 +46,14 @@ public:
     void InitSkinIterator(void) { skinIterator = skins.begin(); };
     bool GetSkin(string &skin);
     void ClearSkinSetups(void);
+    void DebugSkinSetups(void);
+    void DebugSkinSetupParameters(void);
     cSkinSetup* GetSkinSetup(string &skin);
     cSkinSetup* GetSkinSetup(void);
     void InitSetupIterator(void) { setupIt = skinSetups.begin(); };
     void TranslateSetup(void);
-    void CheckUnknownSetupParameters(void);
+    void SetSkinSetupParameters(void);
+    void UpdateSkinSetupParameter(string name, int value);
     void SetGlobals(cGlobals *globals) { tmplGlobals = globals; };
     void UpdateGlobals(void);
     void CheckDecimalPoint(void);
diff --git a/displaymenu.c b/displaymenu.c
index 510cb2f..dc5d5dc 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -71,7 +71,6 @@ void cSDDisplayMenu::SetPluginMenu(string name, int menu, int type, bool init) {
 void cSDDisplayMenu::SetTitle(const char *Title) {
     if (!doOutput)
         return;
-    esyslog("skindesigner: --------------- Set Title %s", Title);
     rootView->SetTitle(Title);
 }
 
@@ -187,7 +186,6 @@ bool cSDDisplayMenu::SetItemPlugin(map<string,string> *stringTokens, map<string,
 }
 
 void cSDDisplayMenu::SetItem(const char *Text, int Index, bool Current, bool Selectable) {
-    esyslog("skindesigner: %d: %s %s", Index, Current ? "<---Active--->" : "", Text);
     if (!doOutput)
         return;
     cDisplayMenuListView *list = rootView->GetListView();
diff --git a/libtemplate/globals.c b/libtemplate/globals.c
index 4faa710..9a94b4f 100644
--- a/libtemplate/globals.c
+++ b/libtemplate/globals.c
@@ -80,6 +80,7 @@ void cGlobals::Debug(void) {
     for (map <string, string>::iterator font = fonts.begin(); font != fonts.end(); font++) {
         dsyslog("skindesigner: Font \"%s\": \"%s\"", (font->first).c_str(), (font->second).c_str());
     }
+    /*
     for (map <string, map< string, string > >::iterator trans = translations.begin(); trans != translations.end(); trans++) {
         dsyslog("skindesigner: Translation Token %s", (trans->first).c_str());
         map< string, string > tokenTrans = trans->second;
@@ -87,4 +88,5 @@ void cGlobals::Debug(void) {
             dsyslog("skindesigner: language %s, translation %s", (transTok->first).c_str(), (transTok->second).c_str());
         }
     }
+    */
 }
diff --git a/setup.c b/setup.c
index bfffd59..a7290b1 100644
--- a/setup.c
+++ b/setup.c
@@ -34,7 +34,7 @@ eOSState cSkinDesignerSetup::ProcessKey(eKeys Key) {
     bool hadSubMenu = HasSubMenu();
     eOSState state = cMenuSetupPage::ProcessKey(Key);
     if (hadSubMenu && Key == kOk) {
-        esyslog("skindesigner: store submenu");
+        Store();
     }
     if (!hadSubMenu && (state == osUnknown || Key == kOk)) {
         if ((Key == kOk && !hadSubMenu)) {
@@ -72,7 +72,9 @@ void cSkinDesignerSetup::Store(void) {
         skinSetup->InitParameterIterator();
         cSkinSetupParameter *param = NULL;
         while (param = skinSetup->GetParameter()) {
-            SetupStore(*cString::sprintf("%s.%s", skin.c_str(), param->name.c_str()), param->value);
+            cString paramName = cString::sprintf("%s.%s", skin.c_str(), param->name.c_str());
+            SetupStore(*paramName, param->value);
+            config.UpdateSkinSetupParameter(*paramName, param->value);
         }
     }
     config.UpdateGlobals();
diff --git a/skindesigner.c b/skindesigner.c
index 60fa0b9..091209d 100644
--- a/skindesigner.c
+++ b/skindesigner.c
@@ -117,7 +117,8 @@ bool cPluginSkinDesigner::Start(void) {
         }
     }
     config.TranslateSetup();
-    config.CheckUnknownSetupParameters();
+    config.SetSkinSetupParameters();
+    config.DebugSkinSetups();
 
     if (skins.size() == 0) {
         esyslog("skindesigner: no skins found! Using default Skin LCARS!");
@@ -229,7 +230,7 @@ cString cPluginSkinDesigner::SVDRPCommand(const char *Command, const char *Optio
             config.ReadSkinSetup(skin);
         }
         config.TranslateSetup();
-        config.CheckUnknownSetupParameters();
+        config.SetSkinSetupParameters();
         activeSkin->Reload();
         ReplyCode = 250;
         return "SKINDESIGNER reload of templates and caches forced.";
diff --git a/skins/blackhole/setup.xml b/skins/blackhole/setup.xml
index 7202d58..af5d2e6 100644
--- a/skins/blackhole/setup.xml
+++ b/skins/blackhole/setup.xml
@@ -10,28 +10,54 @@
     can be configured to a value between "min" and "max". If "min" is not
     set, "0" is the minimum, if "max" is not set, "1000" is maximum.
     "displayname" is used to display the option in the setup menu.
+    The configured parameter value is the default value.
     -->
     <parameters>
-        <parameter type="bool" name="showsignal" displaytext="{tr(showsignaltext)}">0</parameter>
+        <parameter type="bool" name="showdevices" displaytext="{tr(showdevices)}">0</parameter>
         <parameter type="bool" name="showposter" displaytext="{tr(showpostertext)}">1</parameter>
+        <parameter type="bool" name="showmainmenuicons" displaytext="{tr(showmainmenuicons)}">1</parameter>
         <parameter type="int" name="fadetime" min="0" max="1000" displaytext="{tr(fadetext)}">300</parameter>
+        <parameter type="int" name="nummenuitemsmain" min="6" max="30" displaytext="{tr(nummenuitemsmain)}">10</parameter>
+        <parameter type="int" name="nummenuitems" min="6" max="30" displaytext="{tr(nummenuitems)}">10</parameter>
+        <parameter type="int" name="nummenuitemsdefault" min="6" max="30" displaytext="{tr(nummenuitemsdefault)}">16</parameter>
+        <parameter type="bool" name="showsubtitle" displaytext="{tr(showsubtitle)}">1</parameter>
     </parameters>
 
     <!--
     translations of displaytexts
     -->
     <translations>
-        <token name="tr(showsignaltext)">
-            <trans lang="en_EN">Show Signalstrength and -quality when switching channel</trans>
-            <trans lang="de_DE">Signalstärke und -qualität beim Umschalten anzeigen</trans>
+        <token name="tr(showdevices)">
+            <trans lang="en_EN">Show DVB device info when switching channel</trans>
+            <trans lang="de_DE">DVB Karten Info beim Umschalten anzeigen</trans>
         </token>
         <token name="tr(showpostertext)">
             <trans lang="en_EN">Show Poster when switching channel</trans>
             <trans lang="de_DE">Poster beim Umschalten anzeigen</trans>
         </token>
+        <token name="tr(showmainmenuicons)">
+            <trans lang="en_EN">Show Icons in Main Menu</trans>
+            <trans lang="de_DE">Icons im Hauptmenü anzeigen</trans>
+        </token>
         <token name="tr(fadetext)">
-            <trans lang="en_EN">Fade In and Out time in ms</trans>
-            <trans lang="de_DE">Fade In and Out Zeit in ms</trans>
+            <trans lang="en_EN">Fade time in ms (needs VDR restart)</trans>
+            <trans lang="de_DE">Einblendzeit in ms (erfordert VDR Neustart)</trans>
+        </token>
+        <token name="tr(nummenuitemsmain)">
+            <trans lang="en_EN">Items in main menu (needs VDR restart)</trans>
+            <trans lang="de_DE">Elemente im Hauptmenü (erfordert VDR Neustart)</trans>
+        </token>
+        <token name="tr(nummenuitems)">
+            <trans lang="en_EN">Items in sdchedules, timers, ... menus (needs VDR restart)</trans>
+            <trans lang="de_DE">Elemente in Programm, Timer, ... Menüs (erfordert VDR Neustart)</trans>
+        </token>
+        <token name="tr(nummenuitemsdefault)">
+            <trans lang="en_EN">Items in default list menu (needs VDR restart)</trans>
+            <trans lang="de_DE">Elemente im Standard ListenMenü (erfordert VDR Neustart)</trans>
+        </token>
+        <token name="tr(showsubtitle)">
+            <trans lang="en_EN">Show shorttexts in schedules menus</trans>
+            <trans lang="de_DE">Kurztexte im Programm Menü anzeigen</trans>
         </token>
     </translations>
 </setup>
diff --git a/skins/blackhole/themes/default/globals.xml b/skins/blackhole/themes/default/globals.xml
index 6eed95f..3f09c26 100644
--- a/skins/blackhole/themes/default/globals.xml
+++ b/skins/blackhole/themes/default/globals.xml
@@ -22,7 +22,6 @@
     set such a variable to 1 for true and 0 for false
     -->
     <variables>
-        <var type="int" name="fadeTime">300</var>
     </variables>
     <!--
     translations used in the skin
diff --git a/skins/blackhole/themes/default/icons/ico_back_active.svg b/skins/blackhole/themes/default/icons/ico_back_active.svg
index b18aa0b..5c50a6a 100644
--- a/skins/blackhole/themes/default/icons/ico_back_active.svg
+++ b/skins/blackhole/themes/default/icons/ico_back_active.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_back_active.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_back_active.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +49,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="49.152542"
      inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_back_active_x1.svg b/skins/blackhole/themes/default/icons/ico_back_active_x1.svg
index 0ef371c..bbda2ee 100644
--- a/skins/blackhole/themes/default/icons/ico_back_active_x1.svg
+++ b/skins/blackhole/themes/default/icons/ico_back_active_x1.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_back_active_x1.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_back_active_x1.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -57,15 +58,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="49.152542"
-     inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:cy="47.844109"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_back_active_x2.svg b/skins/blackhole/themes/default/icons/ico_back_active_x2.svg
index 5bc5822..7af4481 100644
--- a/skins/blackhole/themes/default/icons/ico_back_active_x2.svg
+++ b/skins/blackhole/themes/default/icons/ico_back_active_x2.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_back_active_x2.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_back_active_x2.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -66,15 +67,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="49.152542"
      inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_back_active_x3.svg b/skins/blackhole/themes/default/icons/ico_back_active_x3.svg
index 804f7a1..d1bef47 100644
--- a/skins/blackhole/themes/default/icons/ico_back_active_x3.svg
+++ b/skins/blackhole/themes/default/icons/ico_back_active_x3.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_back_active_x3.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_back_active_x3.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -75,15 +76,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="49.152542"
      inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_back_inactive.svg b/skins/blackhole/themes/default/icons/ico_back_inactive.svg
index 65ca34a..68be369 100644
--- a/skins/blackhole/themes/default/icons/ico_back_inactive.svg
+++ b/skins/blackhole/themes/default/icons/ico_back_inactive.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_back_inactive.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_back_inactive.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#001428;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#00284a;stop-opacity:1"
+         style="stop-color:#003c5e;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +49,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="49.152542"
      inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_cutmark_start.svg b/skins/blackhole/themes/default/icons/ico_cutmark_start.svg
index 10d0063..48c2ba7 100644
--- a/skins/blackhole/themes/default/icons/ico_cutmark_start.svg
+++ b/skins/blackhole/themes/default/icons/ico_cutmark_start.svg
@@ -13,7 +13,7 @@
    height="60"
    id="svg4410"
    version="1.1"
-   inkscape:version="0.91pre2 r13516"
+   inkscape:version="0.48.5 r10040"
    viewBox="0 0 20 60.000001"
    sodipodi:docname="ico_cutmark_start.svg">
   <defs
@@ -31,10 +31,10 @@
      inkscape:document-units="px"
      inkscape:current-layer="g5165"
      showgrid="false"
-     inkscape:window-width="1846"
-     inkscape:window-height="1058"
-     inkscape:window-x="66"
-     inkscape:window-y="-8"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4415">
@@ -84,6 +84,12 @@
            id="rect5163"
            style="opacity:1;fill:#800000;fill-opacity:1;stroke:#800000;stroke-width:1.74931276;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       </g>
+      <path
+         style="fill:#aa0000"
+         d="m 3.519685,59.740436 c -2.83822384,-0.789744 -4.24837212,-3.695526 -2.9953,-6.172178 0.5947804,-1.175563 1.9241322,-2.128627 3.3448652,-2.398063 0.3451571,-0.06546 2.2147922,-0.119014 4.1547447,-0.119014 l 3.5271861,0 0,-21.082677 0,-21.0826772 -3.277559,-0.00205 C 3.9689183,8.8810825 3.2550989,8.7351141 1.9590647,7.5925166 1.3158013,7.0254087 0.72338554,5.9229248 0.59012999,5.0449332 0.30222385,3.1479828 1.3351839,1.3732383 3.2570871,0.46279302 L 4.0511811,0.08661428 11.427803,0.05280619 c 7.852023,-0.03598691 7.823923,-0.03781394 8.276987,0.53816458 0.229454,0.29170214 0.232218,0.64095123 0.232218,29.33856123 0,26.76419 -0.01526,29.066633 -0.19444,29.340098 -0.420963,0.642471 -0.397558,0.640708 -8.353449,0.629257 -5.4874666,-0.0079 -7.4719699,-0.04786 -7.869434,-0.158451 z"
+         id="path2993"
+         inkscape:connector-curvature="0"
+         transform="matrix(1.0032441,0,0,0.9393488,432.41651,906.02347)" />
     </g>
   </g>
 </svg>
diff --git a/skins/blackhole/themes/default/icons/ico_cutmark_stop.svg b/skins/blackhole/themes/default/icons/ico_cutmark_stop.svg
index 4fc3381..41d6096 100644
--- a/skins/blackhole/themes/default/icons/ico_cutmark_stop.svg
+++ b/skins/blackhole/themes/default/icons/ico_cutmark_stop.svg
@@ -13,7 +13,7 @@
    height="60"
    id="svg4410"
    version="1.1"
-   inkscape:version="0.91pre2 r13516"
+   inkscape:version="0.48.5 r10040"
    viewBox="0 0 20 60.000001"
    sodipodi:docname="ico_cutmark_stop.svg">
   <defs
@@ -31,10 +31,10 @@
      inkscape:document-units="px"
      inkscape:current-layer="g5165"
      showgrid="false"
-     inkscape:window-width="1846"
-     inkscape:window-height="1058"
-     inkscape:window-x="66"
-     inkscape:window-y="-8"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4415">
@@ -84,6 +84,18 @@
            id="rect5163"
            style="opacity:1;fill:#800000;fill-opacity:1;stroke:#800000;stroke-width:1.74931276;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       </g>
+      <path
+         style="fill:#aa0000"
+         d="M 0.85091519,59.729752 C 0.64982404,59.641517 0.38407601,59.419967 0.26036401,59.237418 0.04070838,58.913296 0.03543308,58.225468 0.03543308,29.909449 0.03543308,1.098751 0.03694318,0.91134105 0.27165355,0.59351129 0.40157481,0.41758023 0.6619666,0.21826921 0.85030197,0.1505979 1.4004033,-0.04706056 15.228276,-0.0127743 15.980315,0.18811282 c 1.408449,0.37622972 2.534731,1.27768338 3.085096,2.46925198 0.294992,0.6386724 0.340101,0.8773257 0.340101,1.7993282 0,0.9373467 -0.0411,1.1467558 -0.347677,1.7716535 -0.423189,0.8625773 -1.332315,1.7752418 -2.130623,2.1389155 -0.929628,0.4234972 -1.892379,0.5167151 -5.346503,0.5176726 l -3.2185043,8.922e-4 0,21.0826772 0,21.082677 3.5137793,7.09e-4 c 1.932579,3.54e-4 3.823152,0.05135 4.201272,0.113278 1.52058,0.249034 2.766688,1.146842 3.412498,2.458669 0.351895,0.714801 0.388199,0.888184 0.388199,1.854019 0,0.924739 -0.04492,1.162737 -0.340101,1.801812 -0.570443,1.235036 -1.815604,2.195088 -3.238547,2.497005 -0.980546,0.20805 -14.9641015,0.165601 -15.44838981,-0.0469 l 0,-2.5e-5 z"
+         id="path2987"
+         inkscape:connector-curvature="0"
+         transform="matrix(1.0032441,0,0,0.9393488,432.41651,906.02347)" />
+      <path
+         style="fill:#aa0000"
+         d="M 3.9119451,59.797809 C 0.19680771,59.715951 0.30997061,59.765067 0.19557725,58.184801 0.0939909,56.781454 0.09298143,2.9742768 0.1945165,1.6439522 0.31082504,0.12006393 0.14135753,0.19082843 3.9262317,0.08570069 5.6202608,0.03864774 9.0520163,0.04798849 11.552355,0.1064579 l 4.54607,0.10630802 0.795398,0.39514232 c 0.951729,0.47280566 1.758455,1.29073706 2.178946,2.20921206 0.270512,0.5908743 0.295774,0.7697596 0.254353,1.8010521 -0.04037,1.005014 -0.08802,1.2167376 -0.389731,1.7315661 -0.439402,0.7497843 -1.325166,1.6129526 -1.98094,1.9304075 -0.833557,0.4035178 -1.62389,0.4899888 -5.198577,0.5687805 l -3.3956693,0.074846 0,21.0637045 0,21.063704 2.0374013,0.0081 c 3.809821,0.01522 5.972535,0.161343 6.731889,0.454852 0.841806,0.325377 1.81099,1.191339 2.279029,2.036298 0.327626,0.591473 0.349318,0.711311 0.349318,1.929846 0,1.215005 -0.02237,1.339587 -0.345121,1.922134 -0.447454,0.807625 -1.319724,1.61625 -2.168492,2.010271 -0.645838,0.299814 -0.791543,0.317066 -3.332843,0.394612 -2.960391,0.09033 -5.5826017,0.08784 -10.0014409,-0.0095 l 0,-3e-6 z"
+         id="path2989"
+         inkscape:connector-curvature="0"
+         transform="matrix(1.0032441,0,0,0.9393488,432.41651,906.02347)" />
     </g>
   </g>
 </svg>
diff --git a/skins/blackhole/themes/default/icons/ico_fwd_active.svg b/skins/blackhole/themes/default/icons/ico_fwd_active.svg
index 407397a..d1cacb5 100644
--- a/skins/blackhole/themes/default/icons/ico_fwd_active.svg
+++ b/skins/blackhole/themes/default/icons/ico_fwd_active.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_fwd_active.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_fwd_active_.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +49,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="41.185188"
      inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_fwd_active_x1.svg b/skins/blackhole/themes/default/icons/ico_fwd_active_x1.svg
index 6e0e665..6e6b723 100644
--- a/skins/blackhole/themes/default/icons/ico_fwd_active_x1.svg
+++ b/skins/blackhole/themes/default/icons/ico_fwd_active_x1.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_fwd_active_x1.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_fwd_active_x1_.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -40,12 +41,11 @@
        y2="8.9676428"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.99379431,0,0,0.99783746,98.258651,0.10780794)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140-2"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142-6" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144-1" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -65,15 +65,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="41.185188"
-     inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:cy="48.018726"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_fwd_active_x2.svg b/skins/blackhole/themes/default/icons/ico_fwd_active_x2.svg
index 9520630..2007221 100644
--- a/skins/blackhole/themes/default/icons/ico_fwd_active_x2.svg
+++ b/skins/blackhole/themes/default/icons/ico_fwd_active_x2.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_fwd_active_x2.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_fwd_active_x2_.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -40,12 +41,11 @@
        y2="8.9676428"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.99379431,0,0,0.99783746,98.258651,0.10780794)" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140-2"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142-6" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144-1" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -74,15 +74,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="41.185188"
-     inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:cy="48.018726"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_fwd_active_x3.svg b/skins/blackhole/themes/default/icons/ico_fwd_active_x3.svg
index 6f4ab38..36b75c7 100644
--- a/skins/blackhole/themes/default/icons/ico_fwd_active_x3.svg
+++ b/skins/blackhole/themes/default/icons/ico_fwd_active_x3.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_fwd_active_x3.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_fwd_active_x3_.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -49,12 +50,11 @@
        y1="14.50319"
        x2="31.460541"
        y2="3.2274182" /><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140-2"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4142-6" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4144-1" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -83,15 +83,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="41.185188"
-     inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:cy="48.018726"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_fwd_inactive.svg b/skins/blackhole/themes/default/icons/ico_fwd_inactive.svg
index 98bf185..fd121a0 100644
--- a/skins/blackhole/themes/default/icons/ico_fwd_inactive.svg
+++ b/skins/blackhole/themes/default/icons/ico_fwd_inactive.svg
@@ -17,18 +17,19 @@
    viewBox="0 0 100 100"
    style="enable-background:new 0 0 100 100;"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
-   sodipodi:docname="ico_fwd_inactive.svg"><metadata
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ico_fwd_inactive.svg"
+   width="100%"
+   height="100%"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4140"><stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#001428;stop-opacity:1;"
          offset="0"
          id="stop4142" /><stop
-         style="stop-color:#00284a;stop-opacity:1"
+         style="stop-color:#003c5e;stop-opacity:1;"
          offset="1"
          id="stop4144" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +49,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview7"
      showgrid="false"
      inkscape:zoom="5.7268259"
      inkscape:cx="49.152542"
      inkscape:cy="47.669492"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><path
      inkscape:connector-curvature="0"
diff --git a/skins/blackhole/themes/default/icons/ico_pause_active.svg b/skins/blackhole/themes/default/icons/ico_pause_active.svg
index 4a7878a..8c20614 100644
--- a/skins/blackhole/themes/default/icons/ico_pause_active.svg
+++ b/skins/blackhole/themes/default/icons/ico_pause_active.svg
@@ -18,18 +18,17 @@
    height="100"
    viewBox="0 0 100 100"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="ico_pause_active.svg"><metadata
      id="metadata45"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs43"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4173"><stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4175" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4177" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +47,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview41"
      showgrid="false"
      inkscape:zoom="3.3714286"
      inkscape:cx="26.5"
      inkscape:cy="35"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><g
      id="g3"
diff --git a/skins/blackhole/themes/default/icons/ico_pause_inactive.svg b/skins/blackhole/themes/default/icons/ico_pause_inactive.svg
index 1c70101..d67da95 100644
--- a/skins/blackhole/themes/default/icons/ico_pause_inactive.svg
+++ b/skins/blackhole/themes/default/icons/ico_pause_inactive.svg
@@ -18,18 +18,17 @@
    height="100"
    viewBox="0 0 100 100"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="ico_pause_inactive.svg"><metadata
      id="metadata45"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs43"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4173"><stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#001428;stop-opacity:1;"
          offset="0"
          id="stop4175" /><stop
-         style="stop-color:#00284a;stop-opacity:1"
+         style="stop-color:#003c5e;stop-opacity:1;"
          offset="1"
          id="stop4177" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +47,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview41"
      showgrid="false"
      inkscape:zoom="3.3714286"
      inkscape:cx="26.5"
      inkscape:cy="35"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><g
      id="g3"
diff --git a/skins/blackhole/themes/default/icons/ico_play_active.svg b/skins/blackhole/themes/default/icons/ico_play_active.svg
index af5bcb6..bcb7da2 100644
--- a/skins/blackhole/themes/default/icons/ico_play_active.svg
+++ b/skins/blackhole/themes/default/icons/ico_play_active.svg
@@ -18,18 +18,17 @@
    height="100"
    viewBox="0 0 100 100"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="ico_play_active.svg"><metadata
      id="metadata41"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs39"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4169"><stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#3c0000;stop-opacity:1;"
          offset="0"
          id="stop4171" /><stop
-         style="stop-color:#800000;stop-opacity:1"
+         style="stop-color:#c80000;stop-opacity:1;"
          offset="1"
          id="stop4173" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +47,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview37"
      showgrid="false"
      inkscape:zoom="3.9333333"
      inkscape:cx="25"
      inkscape:cy="30"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><g
      id="g3"
diff --git a/skins/blackhole/themes/default/icons/ico_play_inactive.svg b/skins/blackhole/themes/default/icons/ico_play_inactive.svg
index 582717f..5eee008 100644
--- a/skins/blackhole/themes/default/icons/ico_play_inactive.svg
+++ b/skins/blackhole/themes/default/icons/ico_play_inactive.svg
@@ -18,18 +18,17 @@
    height="100"
    viewBox="0 0 100 100"
    xml:space="preserve"
-   inkscape:version="0.91pre3 r13670"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="ico_play_inactive.svg"><metadata
      id="metadata41"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs39"><linearGradient
-       inkscape:collect="always"
        id="linearGradient4169"><stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#001428;stop-opacity:1;"
          offset="0"
          id="stop4171" /><stop
-         style="stop-color:#00284a;stop-opacity:1"
+         style="stop-color:#003c5e;stop-opacity:1;"
          offset="1"
          id="stop4173" /></linearGradient><linearGradient
        inkscape:collect="always"
@@ -48,15 +47,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
+     inkscape:window-width="1400"
+     inkscape:window-height="998"
      id="namedview37"
      showgrid="false"
      inkscape:zoom="3.9333333"
      inkscape:cx="25"
      inkscape:cy="30"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1"
      inkscape:current-layer="Capa_1" /><g
      id="g3"
diff --git a/skins/blackhole/themes/default/skinparts/progressbarback.svg b/skins/blackhole/themes/default/skinparts/progressbarback.svg
index eb07fe8..8aa4552 100644
--- a/skins/blackhole/themes/default/skinparts/progressbarback.svg
+++ b/skins/blackhole/themes/default/skinparts/progressbarback.svg
@@ -14,7 +14,7 @@
    height="30"
    id="svg5061"
    version="1.1"
-   inkscape:version="0.91pre2 r13516"
+   inkscape:version="0.48.5 r10040"
    viewBox="0 0 599.99999 30"
    sodipodi:docname="progressbarback.svg">
   <defs
@@ -32,10 +32,9 @@
          id="stop4173" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5627">
       <stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#323232;stop-opacity:1;"
          offset="0"
          id="stop5629" />
       <stop
@@ -44,10 +43,9 @@
          id="stop5631" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5619">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#323232;stop-opacity:1;"
          offset="0"
          id="stop5621" />
       <stop
@@ -103,17 +101,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.7930029"
-     inkscape:cx="307"
-     inkscape:cy="2"
+     inkscape:zoom="1.2678445"
+     inkscape:cx="277.67286"
+     inkscape:cy="-23.838292"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1846"
-     inkscape:window-height="1058"
-     inkscape:window-x="66"
-     inkscape:window-y="-8"
+     inkscape:window-width="1600"
+     inkscape:window-height="1153"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5066">
@@ -143,7 +141,7 @@
        ry="13.985651" />
     <path
        sodipodi:open="true"
-       d="m -13.968908,1023.3526 a 12.963513,14.009566 0 0 1 11.2431397,7.0125 12.963513,14.009566 0 0 1 -0.018472,14.0287 12.963513,14.009566 0 0 1 -11.261561,6.9778"
+       d="m -13.968908,1023.3526 c 7.1595473,-0.01 12.96902034,6.259 12.97582106,13.9963 0.006801,7.7372 -5.79164626,14.0155 -12.95119406,14.0228 -0.02051,10e-5 -0.04101,0 -0.06152,-10e-5"
        sodipodi:end="1.5745921"
        sodipodi:start="4.7114391"
        sodipodi:ry="14.009566"
diff --git a/skins/blackhole/themes/default/skinparts/progressbarback_replay.svg b/skins/blackhole/themes/default/skinparts/progressbarback_replay.svg
index 427e654..4cfdbd3 100644
--- a/skins/blackhole/themes/default/skinparts/progressbarback_replay.svg
+++ b/skins/blackhole/themes/default/skinparts/progressbarback_replay.svg
@@ -14,16 +14,15 @@
    height="90"
    id="svg5061"
    version="1.1"
-   inkscape:version="0.91pre2 r13516"
+   inkscape:version="0.48.5 r10040"
    viewBox="0 0 1250 90"
    sodipodi:docname="progressbarback_replay.svg">
   <defs
      id="defs5063">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5627">
       <stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#323232;stop-opacity:1;"
          offset="0"
          id="stop5629" />
       <stop
@@ -32,10 +31,9 @@
          id="stop5631" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5619">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         style="stop-color:#323232;stop-opacity:1;"
          offset="0"
          id="stop5621" />
       <stop
@@ -71,17 +69,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.7554841"
-     inkscape:cx="106.52332"
-     inkscape:cy="11.991057"
+     inkscape:zoom="0.87774205"
+     inkscape:cx="570.58359"
+     inkscape:cy="78.787158"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1846"
-     inkscape:window-height="1058"
-     inkscape:window-x="66"
-     inkscape:window-y="-8"
+     inkscape:window-width="1600"
+     inkscape:window-height="1153"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5066">
diff --git a/skins/blackhole/themes/default/skinparts/progressbarend.svg b/skins/blackhole/themes/default/skinparts/progressbarend.svg
index 13c2ae5..e0d86bf 100644
--- a/skins/blackhole/themes/default/skinparts/progressbarend.svg
+++ b/skins/blackhole/themes/default/skinparts/progressbarend.svg
@@ -14,7 +14,7 @@
    height="30"
    id="svg4191"
    version="1.1"
-   inkscape:version="0.91pre3 r13670"
+   inkscape:version="0.48.5 r10040"
    viewBox="0 0 15 30"
    sodipodi:docname="progressbarend.svg">
   <defs
@@ -47,15 +47,14 @@
        id="linearGradient4225"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-585.00008,-3.4468423e-5)"
-       x1="592.67389"
-       y1="1053.8467"
-       x2="592.67389"
-       y2="1018.0886" />
+       x1="592.52893"
+       y1="1055.7797"
+       x2="592.62555"
+       y2="1017.992" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5627">
       <stop
-         style="stop-color:#000000;stop-opacity:1"
+         style="stop-color:#323232;stop-opacity:1;"
          offset="0"
          id="stop5629" />
       <stop
@@ -73,15 +72,15 @@
      inkscape:pageshadow="2"
      inkscape:zoom="20.693842"
      inkscape:cx="-0.27737725"
-     inkscape:cy="14.43038"
+     inkscape:cy="14.527028"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
-     inkscape:window-width="1531"
-     inkscape:window-height="878"
-     inkscape:window-x="61"
-     inkscape:window-y="-8"
+     inkscape:window-width="1600"
+     inkscape:window-height="1153"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4196">
@@ -101,7 +100,7 @@
      id="layer1"
      transform="translate(0,-1022.3622)">
     <path
-       style="opacity:1;fill:url(#linearGradient4223);fill-opacity:1;stroke:url(#linearGradient4225);stroke-width:1.98086679;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient4223);fill-opacity:1;stroke:url(#linearGradient4225);stroke-width:1.98086679000000010;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4221"
        sodipodi:type="arc"
        sodipodi:cx="1.0436943"
@@ -110,7 +109,7 @@
        sodipodi:ry="14.009566"
        sodipodi:start="4.7114391"
        sodipodi:end="1.5745921"
-       d="m 1.0313805,1023.3526 a 12.963513,14.009566 0 0 1 11.2431395,7.0125 12.963513,14.009566 0 0 1 -0.01847,14.0287 12.963513,14.009566 0 0 1 -11.26156118,6.9778"
+       d="m 1.0313805,1023.3526 c 7.1595475,-0.01 12.9690205,6.259 12.9758215,13.9963 0.0068,7.7372 -5.7916464,14.0155 -12.951194,14.0228 -0.020507,10e-5 -0.041014,0 -0.0615202,-10e-5"
        sodipodi:open="true" />
   </g>
 </svg>
diff --git a/skins/blackhole/xmlfiles/displayaudiotracks.xml b/skins/blackhole/xmlfiles/displayaudiotracks.xml
index e0460b5..86ab2e1 100644
--- a/skins/blackhole/xmlfiles/displayaudiotracks.xml
+++ b/skins/blackhole/xmlfiles/displayaudiotracks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayaudiotracks SYSTEM "../../../dtd/displayaudiotracks.dtd">
 
-<displayaudiotracks x="25%" y="0" width="50%" height="100%" fadetime="{fadeTime}">
+<displayaudiotracks x="25%" y="0" width="50%" height="100%" fadetime="{fadetime}">
     <!-- Available Variables background:
     {numtracks}                     number of displayed tracks 
     -->
diff --git a/skins/blackhole/xmlfiles/displaychannel.xml b/skins/blackhole/xmlfiles/displaychannel.xml
index 545b756..0603b2c 100644
--- a/skins/blackhole/xmlfiles/displaychannel.xml
+++ b/skins/blackhole/xmlfiles/displaychannel.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displaychannel SYSTEM "../../../dtd/displaychannel.dtd">
 
-<displaychannel x="0" y="70%" width="100%" height="30%" fadetime="{fadeTime}">
+<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadetime}">
 
     <background>
         <!-- global background -->
-        <area x="0" y="0" width="100%" height="100%" layer="1">
+        <area x="0" y="70%" width="100%" height="30%" layer="1">
             <drawimage imagetype="skinpart" path="displaychannelback" x="0" y="0" width="100%" height="100%"/>
         </area>
         <!-- epg background -->
-        <area x="17%" y="36%" width="67%" height="40%" layer="2">
+        <area x="17%" y="80%" width="67%" height="14%" layer="2">
             <drawimage imagetype="skinpart" path="displaychannelbackepg" x="0" y="0" width="100%" height="100%"/>
         </area>
         <!-- watch background -->
-        <area x="86%" y="20%" width="{areaheight}*0.6" height="{areaheight}*0.6" layer="2">
+        <area x="86%" y="77%" width="{areaheight}*0.18" height="{areaheight}*0.18" layer="2">
             <drawimage imagetype="skinpart" path="watchback" x="0" y="0" width="100%" height="100%"/>
         </area>
     </background>
@@ -26,10 +26,10 @@
     {switching}                     true if a number is pressed on the remote to switch to a dedicated channel
     -->
     <channelinfo>
-        <area x="17%" y="16%" width="67%" height="18%" layer="2">
+        <area x="17%" y="74%" width="67%" height="6%" layer="2">
             <drawtext x="0" y="0" font="{semibold}" fontsize="100%" color="{clrWhite}" text="{channelnumber}  {channelname}" />
         </area>
-        <area x="2%" y="20%" width="13%" height="70%" layer="2">
+        <area x="2%" y="75%" width="13%" height="25%" layer="2">
             <drawimage cache="true" imagetype="channellogo" path="{channelid}" width="100%" height="100%" align="center" valign="center"/>
         </area>
     </channelinfo>
@@ -56,13 +56,13 @@
     {nextrecording}                    true if next Schedule will be recorded
     -->
     <epginfo>
-        <area x="17%" y="37%" width="66%" height="20%" layer="2">
+        <area x="17%" y="80%" width="66%" height="7%" layer="3">
             <drawtext name="starttime" x="1%" valign="center" font="{regular}" fontsize="80%" color="{clrWhite}" text="{currentstart}" />
             <drawtext align="right" name="elapsed" valign="center" font="{regular}" fontsize="75%" color="{clrWhite}" text="{currentelapsed}/{currentduration}min" />
             <drawtext x="{width(starttime)} + 40" y="0" width="{areawidth} - {width(starttime)} - {width(elapsed)} - 45" font="{regular}" fontsize="70%" color="{clrWhite}" text="{currenttitle}" />
             <drawtext x="{width(starttime)} + 40" y="56%" width="{areawidth} - {width(starttime)} - {width(elapsed)} - 45" font="{regular}" fontsize="45%" color="{clrWhite}" text="{currentsubtitle}" />
         </area>
-        <area x="17%" y="57%" width="66%" height="20%" layer="2">
+        <area x="17%" y="87%" width="66%" height="7%" layer="3">
             <drawtext name="starttime" x="1%" valign="center" font="{regular}" fontsize="80%" color="{clrGray}" text="{nextstart}" />
             <drawtext align="right" name="duration" valign="center" font="{regular}" fontsize="75%" color="{clrGray}" text="{nextduration}min" />
             <drawtext x="{width(starttime)} + 40" y="0" width="{areawidth} - {width(starttime)} - {width(duration)} - 45" font="{regular}" fontsize="70%" color="{clrGray}" text="{nexttitle}" />
@@ -78,16 +78,16 @@
     {remaining}                        Remaining time of current Schedule in seconds
     -->
     <progressbar>
-        <area x="67%" y="5%" width="30%" height="5%" layer="4">
+        <area x="67%" y="72%" width="30%" height="2%" layer="4">
             <drawimage imagetype="skinpart" path="progressbar" x="{areaheight}/2" y="0" width="{elapsed}/{duration}*{areawidth} - {elapsed}/{duration}*{areaheight}" height="100%"/>
         </area>
-        <area x="67%" y="5%" width="30%" height="5%" layer="5">
+        <area x="67%" y="72%" width="30%" height="2%" layer="5">
             <drawimage imagetype="skinpart" path="progressbarend" x="{areaheight}/2 + {elapsed}/{duration}*{areawidth} - {elapsed}/{duration}*{areaheight} - 1" y="0" width="{areaheight}/2" height="100%"/>
         </area>
     </progressbar>
 
     <progressbarback>
-        <area x="67%" y="5%" width="30%" height="5%" layer="3">
+        <area x="67%" y="72%" width="30%" height="2%" layer="3">
             <drawimage imagetype="skinpart" path="progressbarback" x="0" y="0" width="100%" height="100%"/>
         </area>
     </progressbarback>
@@ -102,7 +102,7 @@
     {newmails}                         true if mailbox plugin is installed and new mails are available
     -->
     <statusinfo>
-        <area x="17%" y="80%" width="67%" height="15%" layer="3">
+        <area x="17%" y="95%" width="67%" height="4%" layer="3">
             <drawimage condition="{isDolby}" imagetype="icon" path="ico_dolby" x="{areaheight}*6 + 20" y="0" width="{areaheight}*3" height="{areaheight}"/>
             <drawimage condition="{hasVT}" imagetype="icon" path="ico_videotext" x="{areaheight}*9 + 30" y="0" width="{areaheight}" height="{areaheight}"/>
             <drawimage condition="{isEncrypted}" imagetype="icon" path="ico_crypted" x="{areaheight}*10 + 40" y="0" width="{areaheight}*2" height="{areaheight}"/>
@@ -127,7 +127,7 @@
     {isWideScreen}                     true if aspect is 16:9 or 21:9
     -->
     <screenresolution>
-        <area x="17%" y="80%" width="67%" height="15%" layer="4">
+        <area x="17%" y="95%" width="67%" height="4%" layer="4">
             <drawimage imagetype="icon" path="ico_{resolution}" x="0" y="0" width="{areaheight}*3" height="{areaheight}"/>
             <drawimage condition="{isWideScreen}" imagetype="icon" path="ico_widescreen" x="{areaheight}*3 + 10" y="0" width="{areaheight}*3" height="{areaheight}"/>
         </area>
@@ -143,7 +143,7 @@
     {seppath}                           path for separator logo to use in imagetype "seplogo"
     -->
     <channelgroup>
-        <area x="17%" y="37%" width="66%" height="40%" layer="3">
+        <area x="17%" y="82%" width="66%" height="10%" layer="3">
             <drawtext x="1%" width="24%" valign="center" font="{semibold}" fontsize="40%" color="{clrWhite}" text="{prevgroup}" />
             <drawtext x="30%" width="40%" valign="center" font="{semibold}" fontsize="60%" color="{clrWhite}" text="{group}" />
             <drawtext align="right" width="25%" valign="center" font="{semibold}" fontsize="40%" color="{clrWhite}" text="{nextgroup}" />
@@ -180,6 +180,17 @@
     {devices[source]}           source of the currently tuned channel
     -->
     <devices>
+        <area condition="{showdevices}" x="56%" y="94%" width="28%" height="6%" layer="2">
+            <loop name="devices" x="0" y="0" orientation="horizontal" columnwidth="{areawidth}/{numdevices}" rowheight="{areaheight}">
+                <drawtext x="0" y="0" font="{regular}" fontsize="40%" color="{clrWhite}" text="{devices[num]}: {devices[type]}" />
+                <drawtext condition="{devices[hascam]}" align="right" y="0" font="{regular}" fontsize="40%" color="{clrWhite}" text="(CAM {devices[cam]})" />
+                <drawtext condition="{devices[recording]} ++ {devices[livetv]}" x="0" y="35%" font="{regular}" fontsize="30%" width="100%" color="{clrRed}" text="LiveTV, Recording ({devices[channelname]}) " />
+                <drawtext condition="{devices[recording]} ++ not{devices[livetv]}" x="0" y="35%" font="{regular}" fontsize="30%" width="100%" color="{clrRed}" text="Recording ({devices[channelname]}) " />
+                <drawtext condition="not{devices[recording]} ++ {devices[livetv]}" x="0" y="35%" font="{regular}" fontsize="30%" width="100%" color="{clrWhite}" text="LiveTV ({devices[channelname]}) " />
+                <drawrectangle  x="0" y="70%" width="{columnwidth} * {devices[signalstrength]} / 100 - 10 * {devices[signalstrength]} / 100" height="{rowheight}/15" color="{clrWhite}" />
+                <drawrectangle  x="0" y="85%" width="{columnwidth} * {devices[signalquality]} / 100 - 10 * {devices[signalquality]} / 100" height="{rowheight}/15" color="{clrWhite}" />
+            </loop>  
+        </area>
     </devices>
 
     <!-- Available Variables scrapercontent:
@@ -199,6 +210,12 @@
     {isbanner}                          true if image is a banner, false if it is a poster
     -->
     <scrapercontent>
+        <area condition="{showposter}++{isbanner}" x="1%" y="3%" width="{areaheight}*0.13*{mediawidth}/{mediaheight}" height="13%" layer="7">
+            <drawimage imagetype="image" path="{mediapath}" align="center" valign="center"  width="{areawidth}" height="{areaheight}"/>
+        </area>
+        <area condition="{showposter}++not{isbanner}" x="0" y="3%" width="{areaheight}*0.5*{mediawidth}/{mediaheight}" height="40%" layer="7">
+            <drawimage imagetype="image" path="{mediapath}" align="center" valign="center" width="{areawidth}" height="{areaheight}"/>
+        </area>
     </scrapercontent>
 
     <!-- Available Variables datetime:
@@ -213,10 +230,10 @@
     {year}                              year in yyyy
     -->
     <datetime>
-        <area x="17%" y="16%" width="67%" height="18%" layer="3">
-            <drawtext align="right" y="0" font="{semibold}" fontsize="100%" color="{clrWhite}" text="{daynameshort} {day}.{month}" />
+        <area x="17%" y="74%" width="67%" height="6%" layer="3">
+            <drawtext align="right" valign="center" font="{semibold}" fontsize="90%" color="{clrWhite}" text="{dayname} {day}.{month}" />
         </area>
-        <area x="86%" y="80%" width="{areaheight}*0.6" height="16%" layer="3">
+        <area x="86%" y="95%" width="{areaheight}*0.18" height="5%" layer="3">
             <drawtext align="center" y="0" font="{digital}" fontsize="100%" color="{clrWhite}" text="{time}" />
         </area>
     </datetime>
@@ -228,19 +245,19 @@
     {hmins}                  current "hourminutes" to display an hour hand
     -->
     <time>
-        <area x="86%" y="20%" width="{areaheight}*0.6" height="{areaheight}*0.6" layer="5">
+        <area x="86%" y="77%" width="{areaheight}*0.18" height="{areaheight}*0.18" layer="5">
             <drawimage imagetype="skinpart" path="watchhands/s_{sec}" x="0" y="0" width="100%" height="100%"/>
         </area>
-        <area x="86%" y="20%" width="{areaheight}*0.6" height="{areaheight}*0.6" layer="4">
+        <area x="86%" y="77%" width="{areaheight}*0.18" height="{areaheight}*0.18" layer="4">
             <drawimage imagetype="skinpart" path="watchhands/m_{min}" x="0" y="0" width="100%" height="100%"/>
         </area>
-        <area x="86%" y="20%" width="{areaheight}*0.6" height="{areaheight}*0.6" layer="3">
+        <area x="86%" y="77%" width="{areaheight}*0.18" height="{areaheight}*0.18" layer="3">
             <drawimage imagetype="skinpart" path="watchhands/h_{hmins}" x="0" y="0" width="100%" height="100%"/>
         </area>
     </time>
 
     <currentweather>
-        <area x="0" y="0" width="11%" height="16%" layer="3">
+        <area x="0" y="70%" width="11%" height="5%" layer="3">
             <drawimage name="weathericon" imagetype="icon" path="{icon}" x="{areawidth}/2 + {width(temperature)}/2 - {width(weathericon)}/2 + 5" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
             <drawtext name="temperature" x="{areawidth}/2 - {width(temperature)}/2 - {width(weathericon)}/2" valign="center" font="{light}" fontsize="80%" color="{clrWhite}" text="{temperature}°C" />
         </area>
@@ -254,13 +271,13 @@
     {error}                    true if message is a error message
     -->
     <message>
-        <area x="5%" y="25%" width="90%" height="50%" layer="6">
+        <area x="5%" y="80%" width="90%" height="15%" layer="6">
             <drawimage condition="{status}" imagetype="skinpart" path="messageblue" x="0" y="0" width="100%" height="100%" />
             <drawimage condition="{info}" imagetype="skinpart" path="messagegreen" x="0" y="0" width="100%" height="100%" />
             <drawimage condition="{warning}" imagetype="skinpart" path="messageyellow" x="0" y="0" width="100%" height="100%" />
             <drawimage condition="{error}" imagetype="skinpart" path="messagered" x="0" y="0" width="100%" height="100%" />
         </area>
-        <area x="5%" y="25%" width="90%" height="50%" layer="7">
+        <area x="5%" y="80%" width="90%" height="15%" layer="6">
             <drawtext align="center" valign="center" font="{regular}" fontsize="40%" color="{clrWhite}" text="{text}" />
         </area>
     </message>
diff --git a/skins/blackhole/xmlfiles/displaymenu.xml b/skins/blackhole/xmlfiles/displaymenu.xml
index abdcb78..04a3838 100644
--- a/skins/blackhole/xmlfiles/displaymenu.xml
+++ b/skins/blackhole/xmlfiles/displaymenu.xml
@@ -129,103 +129,103 @@
     -->
     <colorbuttons>
         <area condition="{red1}" x="0" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{red1}" x="0" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{red}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{red}" />
         </area>
         <area condition="{green1}" x="0" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{green1}" x="0" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{green}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{green}" />
         </area>
         <area condition="{yellow1}" x="0" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{yellow1}" x="0" y="90%" width="25%" height="10%" layer="4">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{yellow}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{yellow}" />
         </area>
         <area condition="{blue1}" x="0" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{blue1}" x="0" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{blue}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{blue}" />
         </area>
 
         <area condition="{red2}" x="25%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{red2}" x="25%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{red}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{red}" />
         </area>
         <area condition="{green2}" x="25%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{green2}" x="25%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{green}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{green}" />
         </area>
         <area condition="{yellow2}" x="25%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{yellow2}" x="25%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{yellow}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{yellow}" />
         </area>
         <area condition="{blue2}" x="25%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{blue2}" x="25%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{blue}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{blue}" />
         </area>
         
         <area condition="{red3}" x="50%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{red3}" x="50%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{red}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{red}" />
         </area>
         <area condition="{green3}" x="50%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{green3}" x="50%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{green}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{green}" />
         </area>
         <area condition="{yellow3}" x="50%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{yellow3}" x="50%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{yellow}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{yellow}" />
         </area>
         <area condition="{blue3}" x="50%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{blue3}" x="50%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{blue}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{blue}" />
         </area>
         
         <area condition="{red4}" x="75%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonred" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{red4}" x="75%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{red}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{red}" />
         </area>
         <area condition="{green4}" x="75%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttongreen" align="center" valign="center" width="90%" height="60%"/>
         </area>
-        <area condition="{green4}" x="75%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{green}" />
+        <area condition="{green4}" x="60%" y="90%" width="25%" height="10%" layer="3">
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{green}" />
         </area>
         <area condition="{yellow4}" x="75%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonyellow" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{yellow4}" x="75%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{yellow}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{yellow}" />
         </area>
         <area condition="{blue4}" x="75%" y="90%" width="25%" height="10%" layer="2">
-            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="75%"/>
+            <drawimage imagetype="skinpart" path="buttonblue" align="center" valign="center" width="90%" height="60%"/>
         </area>
         <area condition="{blue4}" x="75%" y="90%" width="25%" height="10%" layer="3">
-            <drawtext align="center" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{blue}" />
+            <drawtext align="center" valign="center" font="{regular}" fontsize="50%" color="{clrWhite}" text="{blue}" />
         </area>
     </colorbuttons>
     &displaymenudefault;
diff --git a/skins/blackhole/xmlfiles/displaymenuchannels.xml b/skins/blackhole/xmlfiles/displaymenuchannels.xml
index c1f8563..e4fa353 100644
--- a/skins/blackhole/xmlfiles/displaymenuchannels.xml
+++ b/skins/blackhole/xmlfiles/displaymenuchannels.xml
@@ -9,7 +9,7 @@
         </area>
     </scrollbar>
 
-    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="10">
+    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="{nummenuitems}">
         <!-- Available Variables channels menu listelement:
         {nummenuitem}             number of item in list, starts with 1
         {number}                  number of the displayed channel
diff --git a/skins/blackhole/xmlfiles/displaymenudefault.xml b/skins/blackhole/xmlfiles/displaymenudefault.xml
index a70d80a..766f02c 100644
--- a/skins/blackhole/xmlfiles/displaymenudefault.xml
+++ b/skins/blackhole/xmlfiles/displaymenudefault.xml
@@ -26,7 +26,7 @@
     <!-- IMPORTANT: menuitemwidth and determinatefont have to be defined here. menuitemwidth defines the total width of the 
     default menu items, determinatefont the function which sets the actual font to use. With that it is possible to determinate
     the correct column widths -->
-    <menuitems x="1%" y="10%" orientation="vertical" width="95%" height="80%" align="center" menuitemwidth="94%" determinatefont="column1" numlistelements="16">
+    <menuitems x="1%" y="10%" orientation="vertical" width="95%" height="80%" align="center" menuitemwidth="94%" determinatefont="column1" numlistelements="{nummenuitemsdefault}">
         <!-- Available Variables default menu listelement:
         {nummenuitem}               number of item in list, starts with 1
         {column1}                   text of column1
diff --git a/skins/blackhole/xmlfiles/displaymenumain.xml b/skins/blackhole/xmlfiles/displaymenumain.xml
index e573113..90317d4 100644
--- a/skins/blackhole/xmlfiles/displaymenumain.xml
+++ b/skins/blackhole/xmlfiles/displaymenumain.xml
@@ -189,7 +189,7 @@
     <customtokens>
     </customtokens>
 
-    <menuitems x="1%" y="10%" orientation="vertical" width="50%" height="80%" align="center" numlistelements="10">
+    <menuitems x="1%" y="10%" orientation="vertical" width="50%" height="80%" align="center" numlistelements="{nummenuitemsmain}">
         <!-- Available Variables main menu listelement:
         {nummenuitem}             number of item in list, starts with 1
         {label}                   label of menu item
@@ -203,10 +203,17 @@
                 <drawimage condition="not{current}" imagetype="skinpart" path="menubutton" x="0" y="0" width="100%" height="100%"/>
                 <drawimage condition="{current}" imagetype="skinpart" path="menubuttonactive" x="0" y="0" width="100%" height="100%"/>
             </area>
-           <area x="0" width="100%" layer="3">
+            <area condition="{showmainmenuicons}" x="1%" width="20%" layer="3">
+                <drawimage imagetype="menuicon" path="{icon}" x="1%" valign="center" width="{areaheight}*0.8" height="{areaheight}*0.8"/>
+            </area>
+            <area condition="not{showmainmenuicons}" x="0" width="100%" layer="3">
                 <drawtext condition="not{current}" x="1%" width="98%" valign="center" font="{regular}" fontsize="80%" color="{clrGray}" text="{number} {label} " />
                 <drawtext condition="{current}" x="1%" width="98%" valign="center" font="{regular}" fontsize="80%" color="{clrWhite}" text="{number} {label} " />
             </area>
+            <area condition="{showmainmenuicons}" x="0" width="100%" layer="3">
+                <drawtext condition="not{current}" x="{areaheight} + {areawidth}*0.02" width="{areawidth} - {areaheight}" valign="center" font="{regular}" fontsize="80%" color="{clrGray}" text="{number} {label} " />
+                <drawtext condition="{current}" x="{areaheight} + {areawidth}*0.02" width="{areawidth} - {areaheight}" valign="center" font="{regular}" fontsize="80%" color="{clrWhite}" text="{number} {label} " />
+            </area>
         </listelement>
         <!-- additional element which is drawn for current element -->
         <!-- Available Variables main menu currentelement:
diff --git a/skins/blackhole/xmlfiles/displaymenurecordings.xml b/skins/blackhole/xmlfiles/displaymenurecordings.xml
index 16c1bf3..f7e85b1 100644
--- a/skins/blackhole/xmlfiles/displaymenurecordings.xml
+++ b/skins/blackhole/xmlfiles/displaymenurecordings.xml
@@ -9,7 +9,7 @@
         </area>
     </scrollbar>
 
-    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="10">
+    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="{nummenuitems}">
         <!-- Available Variables recordings menu listelement:
         {nummenuitem}           number of item in list, starts with 1
         {name}                  Name of recording
diff --git a/skins/blackhole/xmlfiles/displaymenuschedules.xml b/skins/blackhole/xmlfiles/displaymenuschedules.xml
index 7bf5d29..5eca045 100644
--- a/skins/blackhole/xmlfiles/displaymenuschedules.xml
+++ b/skins/blackhole/xmlfiles/displaymenuschedules.xml
@@ -30,7 +30,7 @@
         </area>
     </scrollbar>
 
-    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="10">
+    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="{nummenuitems}">
         <!-- Available Variables schedules menu listelement:
         {nummenuitem}             number of item in list, starts with 1
         {title}                   title of event
@@ -85,14 +85,26 @@
             <area condition="not{separator}++{whatson}++not{current}" x="1%" width="50%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrGray}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatson}++not{current}" x="1%" width="50%" layer="3">
+            <areascroll condition="{showsubtitle}++not{separator}++{whatson}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="1%" width="50%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatson}++not{current}" x="1%" width="50%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatson}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="1%" width="50%" layer="3">
                 <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
             </areascroll>
             <!-- current element whatson -->
             <area condition="not{separator}++{whatson}++{current}" x="1%" width="50%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrWhite}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatson}++{current}" x="1%" width="50%" layer="3">
+            <areascroll condition="{showsubtitle}++not{separator}++{whatson}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="1%" width="50%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrWhite}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatson}++{current}" x="1%" width="50%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrWhite}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatson}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="1%" width="50%" layer="3">
                 <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrWhite}" text="{title}" />
             </areascroll>
             <!-- element whatsonnow -->
@@ -102,15 +114,27 @@
             <area condition="not{separator}++{whatsonnow}++not{current}" x="11%" width="39%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrGray}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatsonnow}++not{current}" x="11%" width="39%" layer="3">
+            <areascroll condition="{showsubtitle}++not{separator}++{whatsonnow}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatsonnow}++not{current}" x="11%" width="39%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatsonnow}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
                 <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
             </areascroll>
             <!-- current element whatsonnow -->
             <area condition="not{separator}++{whatsonnow}++{current}" x="11%" width="39%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrWhite}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatsonnow}++{current}" x="11%" width="39%" layer="3">
-                <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrWhite}" text="{title}" />
+            <areascroll condition="{showsubtitle}++not{separator}++{whatsonnow}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatsonnow}++{current}" x="11%" width="39%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatsonnow}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
             </areascroll>
             <!-- element whatsonnext -->
             <area condition="not{separator}++{whatsonnext}" x="1%" width="9%" layer="3">
@@ -119,15 +143,27 @@
             <area condition="not{separator}++{whatsonnext}++not{current}" x="11%" width="39%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrGray}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatsonnext}++not{current}" x="11%" width="39%" layer="3">
+            <areascroll condition="{showsubtitle}++not{separator}++{whatsonnext}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatsonnext}++not{current}" x="11%" width="39%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatsonnext}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
                 <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
             </areascroll>
             <!-- current element whatsonnext -->
             <area condition="not{separator}++{whatsonnext}++{current}" x="11%" width="39%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrWhite}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatsonnext}++{current}" x="11%" width="39%" layer="3">
-                <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrWhite}" text="{title}" />
+            <areascroll condition="{showsubtitle}++not{separator}++{whatsonnext}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatsonnext}++{current}" x="11%" width="39%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatsonnext}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
             </areascroll>
             <!-- element whatsonfavorites -->
             <area condition="not{separator}++{whatsonfavorites}" x="1%" width="9%" layer="3">
@@ -136,16 +172,29 @@
             <area condition="not{separator}++{whatsonfavorites}++not{current}" x="11%" width="39%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrGray}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatsonfavorites}++not{current}" x="11%" width="39%" layer="3">
+            <areascroll condition="{showsubtitle}++not{separator}++{whatsonfavorites}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
+            </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatsonfavorites}++not{current}" x="11%" width="39%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatsonfavorites}++not{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
                 <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
             </areascroll>
-            <!-- current element whatsonfavorites -->
+           <!-- current element whatsonfavorites -->
             <area condition="not{separator}++{whatsonfavorites}++{current}" x="11%" width="39%" layer="3">
                 <drawtext x="0" y="5%" font="{regular}" fontsize="35%" color="{clrWhite}" text="{start} - {stop}" />
             </area>
-            <areascroll scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium"  condition="not{separator}++{whatsonfavorites}++{current}" x="11%" width="39%" layer="3">
-                <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrWhite}" text="{title}" />
+            <areascroll condition="{showsubtitle}++not{separator}++{whatsonfavorites}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="32%" font="{regular}" fontsize="45%" color="{clrGray}" text="{title}" />
             </areascroll>
+            <area condition="{showsubtitle}++not{separator}++{whatsonfavorites}++{current}" x="11%" width="39%" layer="3">
+                <drawtext x="0" y="73%" width="98%" font="{regular}" fontsize="27%" color="{clrGray}" text="{shorttext}" />
+            </area>
+            <areascroll condition="not{showsubtitle}++not{separator}++{whatsonfavorites}++{current}" scrollelement="menutext" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="11%" width="39%" layer="3">
+                <drawtext name="menutext" x="0" y="35%" font="{regular}" fontsize="60%" color="{clrGray}" text="{title}" />
+            </areascroll>
+
            <!-- day or channel separator -->
             <area condition="{separator}" x="1%" width="50%" layer="3">
                 <drawtext x="0" valign="center" font="{regular}" fontsize="70%" color="{clrWhite}" text="{title}" />
diff --git a/skins/blackhole/xmlfiles/displaymenusetup.xml b/skins/blackhole/xmlfiles/displaymenusetup.xml
index 590f102..a86dfd4 100644
--- a/skins/blackhole/xmlfiles/displaymenusetup.xml
+++ b/skins/blackhole/xmlfiles/displaymenusetup.xml
@@ -9,7 +9,7 @@
         </area>
     </scrollbar>
 
-    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="10">
+    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="{nummenuitemsmain}">
         <!-- Available Variables setup menu listelement:
         {nummenuitem}             number of item in list, starts with 1
         {label}                   label of menu item
diff --git a/skins/blackhole/xmlfiles/displaymenutimers.xml b/skins/blackhole/xmlfiles/displaymenutimers.xml
index 7223440..8805203 100644
--- a/skins/blackhole/xmlfiles/displaymenutimers.xml
+++ b/skins/blackhole/xmlfiles/displaymenutimers.xml
@@ -9,7 +9,7 @@
         </area>
     </scrollbar>
 
-    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="10">
+    <menuitems x="1%" y="10%" orientation="vertical" width="98%" height="80%" align="center" numlistelements="{nummenuitems}">
         <!-- Available Variables channels menu listelement:
         {nummenuitem}       number of item in list, starts with 1
         {title}             Title of Timer
diff --git a/skins/blackhole/xmlfiles/displayreplay.xml b/skins/blackhole/xmlfiles/displayreplay.xml
index 6a458dd..40daef8 100644
--- a/skins/blackhole/xmlfiles/displayreplay.xml
+++ b/skins/blackhole/xmlfiles/displayreplay.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayreplay SYSTEM "../../../dtd/displayreplay.dtd">
 
-<displayreplay  x="0" y="70%" width="100%" height="30%" fadetime="{fadeTime}">
+<displayreplay  x="0" y="70%" width="100%" height="30%" fadetime="{fadetime}">
 
     <background>
        <!-- global background -->
diff --git a/skins/blackhole/xmlfiles/displayvolume.xml b/skins/blackhole/xmlfiles/displayvolume.xml
index 1b886ad..7768aff 100644
--- a/skins/blackhole/xmlfiles/displayvolume.xml
+++ b/skins/blackhole/xmlfiles/displayvolume.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayvolume SYSTEM "../../../dtd/displayvolume.dtd">
 
-<displayvolume x="79%" y="{areaheight} - {areawidth}*0.26" width="20%" height="{areawidth}*0.25" fadetime="{fadeTime}">
+<displayvolume x="79%" y="{areaheight} - {areawidth}*0.26" width="20%" height="{areawidth}*0.25" fadetime="{fadetime}">
 
     <background>
         <area x="0" y="0" width="100%" height="100%" layer="2">
diff --git a/skins/metrixhd/setup.xml b/skins/metrixhd/setup.xml
new file mode 100644
index 0000000..52bde41
--- /dev/null
+++ b/skins/metrixhd/setup.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE setup SYSTEM "../../dtd/setup.dtd">
+
+<setup>
+    <!--
+    define all your parameters here which should be configurable via
+    OSD and the skindesigner setup menu.
+    Parameters must have type "bool" or "integer". For "bool" Parameters
+    a choice yes/no is shown in the setup menu, a "integer" parameter
+    can be configured to a value between "min" and "max". If "min" is not
+    set, "0" is the minimum, if "max" is not set, "1000" is maximum.
+    "displayname" is used to display the option in the setup menu.
+    The configured parameter value is the default value.
+    -->
+    <parameters>
+        <parameter type="int" name="fadetime" min="0" max="1000" displaytext="{tr(fadetext)}">0</parameter>
+        <parameter type="bool" name="showdevices" displaytext="{tr(showdevices)}">0</parameter>
+    </parameters>
+
+    <!--
+    translations of displaytexts
+    -->
+    <translations>
+        <token name="tr(fadetext)">
+            <trans lang="en_EN">Fade time in ms (needs VDR restart)</trans>
+            <trans lang="de_DE">Einblendzeit in ms (erfordert VDR Neustart)</trans>
+        </token>
+        <token name="tr(showdevices)">
+            <trans lang="en_EN">Show DVB device info when switching channel</trans>
+            <trans lang="de_DE">DVB Karten Info beim Umschalten anzeigen</trans>
+        </token>
+    </translations>
+</setup>
diff --git a/skins/metrixhd/themes/default/globals.xml b/skins/metrixhd/themes/default/globals.xml
index 1eae5f1..1ce4251 100644
--- a/skins/metrixhd/themes/default/globals.xml
+++ b/skins/metrixhd/themes/default/globals.xml
@@ -25,8 +25,6 @@
     set such a variable to 1 for true and 0 for false
     -->
     <variables>
-        <var type="int" name="border">5</var>
-        <var type="int" name="fadeTime">0</var>
         <var type="string" name="stringglobal">hützligrütz</var>
         <var type="double" name="pi">3.14</var>
     </variables>
diff --git a/skins/metrixhd/xmlfiles/displayaudiotracks.xml b/skins/metrixhd/xmlfiles/displayaudiotracks.xml
index f37983d..8c5af98 100644
--- a/skins/metrixhd/xmlfiles/displayaudiotracks.xml
+++ b/skins/metrixhd/xmlfiles/displayaudiotracks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayaudiotracks SYSTEM "../../../dtd/displayaudiotracks.dtd">
 
-<displayaudiotracks x="25%" y="0" width="50%" height="100%" fadetime="{fadeTime}">
+<displayaudiotracks x="25%" y="0" width="50%" height="100%" fadetime="{fadetime}">
     <!-- Available Variables background:
     {numtracks}                     number of displayed tracks 
     -->
diff --git a/skins/metrixhd/xmlfiles/displaychannel.xml b/skins/metrixhd/xmlfiles/displaychannel.xml
index a7b33af..3c63a18 100644
--- a/skins/metrixhd/xmlfiles/displaychannel.xml
+++ b/skins/metrixhd/xmlfiles/displaychannel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displaychannel SYSTEM "../../../dtd/displaychannel.dtd">
 
-<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadeTime}">
+<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadetime}">
     <background>
         <!-- background infobar -->
         <area x="0" y="80%" width="100%" height="20%" layer="1">
@@ -197,10 +197,10 @@
     {devices[source]}           source of the currently tuned channel
     -->
     <devices>
-        <area x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="1">
+        <area condition="{showdevices}" x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="1">
             <fill color="{clrTransBlack}"/>
         </area>
-        <area x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="2">
+        <area condition="{showdevices}" x="70%" y="30%" width="30%" height="{areaheight}/12 * {numdevices}" layer="2">
             <loop name="devices" x="0" y="0" orientation="vertical" columnwidth="{areawidth}" rowheight="{areaheight} / {numdevices}" overflow="cut">
                 <drawtext name="label" x="5" y="0" font="{light}" fontsize="{rowheight}*0.35" color="{clrWhite}" text="{devices[num]}: {devices[type]}" />
                 <drawtext condition="{devices[hascam]}" x="{width(label)} + 15" y="0" font="{light}" fontsize="{rowheight}*0.35" color="{clrWhite}" text="(CAM {devices[cam]})" />
diff --git a/skins/metrixhd/xmlfiles/displaymessage.xml b/skins/metrixhd/xmlfiles/displaymessage.xml
index e872e95..0ff98b2 100644
--- a/skins/metrixhd/xmlfiles/displaymessage.xml
+++ b/skins/metrixhd/xmlfiles/displaymessage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!DOCTYPE displaymessage SYSTEM "../../../dtd/displaymessage.dtd">

 

-<displaymessage x="5%" y="80%" width="90%" height="15%" fadetime="{fadeTime}">

+<displaymessage x="5%" y="80%" width="90%" height="15%" fadetime="{fadetime}">

     <background>

         <area x="0" y="0" width="100%" height="100%" layer="1">

             <fill color="{clrTransBlack}" />

diff --git a/skins/metrixhd/xmlfiles/displayreplay.xml b/skins/metrixhd/xmlfiles/displayreplay.xml
index 889d51b..8853fad 100644
--- a/skins/metrixhd/xmlfiles/displayreplay.xml
+++ b/skins/metrixhd/xmlfiles/displayreplay.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayreplay SYSTEM "../../../dtd/displayreplay.dtd">
 
-<displayreplay x="0" y="0" width="100%" height="100%" fadetime="{fadeTime}">
+<displayreplay x="0" y="0" width="100%" height="100%" fadetime="{fadetime}">
     <background>
         <!-- background infobar -->
         <area x="0" y="80%" width="100%" height="20%" layer="1">
diff --git a/skins/metrixhd/xmlfiles/displayvolume.xml b/skins/metrixhd/xmlfiles/displayvolume.xml
index 6811d67..604f7e5 100644
--- a/skins/metrixhd/xmlfiles/displayvolume.xml
+++ b/skins/metrixhd/xmlfiles/displayvolume.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displayvolume SYSTEM "../../../dtd/displayvolume.dtd">
 
-<displayvolume x="20%" y="75%" width="60%" height="20%" fadetime="{fadeTime}">
+<displayvolume x="20%" y="75%" width="60%" height="20%" fadetime="{fadetime}">
     <background>
         <area x="0" y="0" width="100%" height="100%" layer="1">
             <fill color="{clrTransBlack}" />