initial git upload, based on graphlcd-0.2.0-pre2

795 files changed, 2791 insertions, 4462 deletions

diff --git a/Makefile b/Makefile
index 1df49b8..60bf203 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ export INSTALLDOCDIR = $(INSTALLPREFIX)/share/doc
 
 ### Make sure that necessary options are included:
 
-include $(VDRDIR)/Make.global
+-include $(VDRDIR)/Make.global
 
 ### Allow user defined options to overwrite defaults:
 
@@ -66,7 +66,7 @@ endif
 
 ### The object files (add further files here):
 
-OBJS = display.o layout.o logo.o logolist.o menu.o plugin.o setup.o state.o strfct.o widgets.o
+OBJS = alias.o common.o display.o i18n.o menu.o plugin.o setup.o skinconfig.o state.o strfct.o
 
 ### The main target:
 TARGETS = libvdr-$(PLUGIN).so
@@ -123,7 +123,7 @@ i18n: $(I18Nmo)
 ### Targets:
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -L$(INSTALLPREFIX)/lib -L./graphlcd-base/glcddrivers/ -L./graphlcd-base/glcdgraphics/ -shared $(OBJS) -lglcddrivers -lglcdgraphics -lstdc++ -o $@
+	$(CXX) $(CXXFLAGS) -L$(INSTALLPREFIX)/lib -L./graphlcd-base/glcddrivers/ -L./graphlcd-base/glcdgraphics/ -L./graphlcd-base/glcdskin/ -shared $(OBJS) -lglcddrivers -lglcdgraphics -lglcdskin -lstdc++ -o $@
 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..f410a98
--- /dev/null
+++ b/TODO
@@ -0,0 +1,8 @@
+- add missing objects like textbox, scrollbar
+- add dynamic behaviour to objects like scrolling and blinking
+- add special objects for external data so that other plugins can draw text and bitmaps on an area of the display that will be defined in the skin. This could be used p.e. for a spectrum analyzer or displaying id3 tags.
+- add service interface for external data objects
+- make skin variables more dynamic, p.e. evaluate positions while displaying, not only during skin loading. This should make it easier to support several display sizes with one skin.
+- DOCUMENTATION, DOCUMENTATION, DOCUMENTATION
+- fix all the small bugs that were introduced
+- all the stuff I forgot :-)
diff --git a/alias.c b/alias.c
new file mode 100644
index 0000000..4ec6265
--- /dev/null
+++ b/alias.c
@@ -0,0 +1,73 @@
+/*
+ * GraphLCD plugin for the Video Disk Recorder
+ *
+ * alias.c - alias class for converting channel id to its alias name
+ *
+ * This file is released under the GNU General Public License. Refer
+ * to the COPYING file distributed with this package.
+ *
+ * (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online.de>
+ * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+ */
+
+#include <fstream>
+
+#include "alias.h"
+#include "strfct.h"
+
+#include <vdr/tools.h>
+
+const char * kChannelAliasFileName = "channels.alias";
+
+bool cChannelAliasList::Load(const std::string & CfgPath)
+{
+    std::fstream file;
+    char readLine[1000];
+    std::string line;
+    std::string aliasFileName;
+    std::string::size_type pos;
+    std::string id;
+    std::string alias;
+
+    aliasFileName = CfgPath + "/" + kChannelAliasFileName;
+
+#if (__GNUC__ < 3)
+    file.open(aliasFileName.c_str(), std::ios::in);
+#else
+    file.open(aliasFileName.c_str(), std::ios_base::in);
+#endif
+    if (!file.is_open())
+    {
+        esyslog("graphlcd: Error opening channel alias file %s!", aliasFileName.c_str());
+        return false;
+    }
+
+    while (!file.eof())
+    {
+        file.getline(readLine, 1000);
+        line = trim(readLine);
+        if (line.length() == 0)
+            continue;
+        if (line[0] == '#')
+            continue;
+        pos = line.find(":");
+        if (pos == std::string::npos)
+            continue;
+        id = trim(line.substr(0, pos));
+        alias = trim(line.substr(pos + 1));
+        mAliases.insert(std::make_pair(id, alias));
+    }
+    file.close();
+
+    return true;
+}
+
+std::string cChannelAliasList::GetAlias(const std::string & ChannelID) const
+{
+    std::map<std::string, std::string>::const_iterator pos;
+
+    pos = mAliases.find(ChannelID);
+    if (pos != mAliases.end())
+        return pos->second;
+    return "";
+}
diff --git a/alias.h b/alias.h
new file mode 100644
index 0000000..a691cb1
--- /dev/null
+++ b/alias.h
@@ -0,0 +1,28 @@
+/*
+ * GraphLCD plugin for the Video Disk Recorder
+ *
+ * alias.h - alias class for converting channel id to its alias name
+ *
+ * This file is released under the GNU General Public License. Refer
+ * to the COPYING file distributed with this package.
+ *
+ * (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online.de>
+ * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+ */
+
+#ifndef _GRAPHLCD_ALIAS_H_
+#define _GRAPHLCD_ALIAS_H_
+
+#include <map>
+#include <string>
+
+class cChannelAliasList
+{
+private:
+    std::map<std::string, std::string> mAliases;
+public:
+    bool Load(const std::string & CfgPath);
+    std::string GetAlias(const std::string & ChannelID) const;
+};
+
+#endif
diff --git a/common.c b/common.c
new file mode 100644
index 0000000..8b03502
--- /dev/null
+++ b/common.c
@@ -0,0 +1,105 @@
+#include <time.h>
+
+#include <glcdskin/type.h>
+
+#include <vdr/plugin.h>
+
+GLCD::cType TimeType(time_t Time, const std::string &Format)
+{
+    static char result[1000];
+    struct tm tm_r, *tm;
+    tm = localtime_r(&Time, &tm_r);
+
+    if (Time > 0)
+    {
+        if (Format.length() > 0)
+        {
+            strftime(result, sizeof(result), Format.c_str(), tm);
+
+            GLCD::cType r = result;
+            return r;
+        } else
+            return Time;
+    }
+    return false;
+}
+
+GLCD::cType DurationType(int Index, const std::string &Format)
+{
+    static char result[1000];
+    if (Index > 0)
+    {
+        if (Format.length() > 0)
+        {
+            uint update = 0;
+            const char *ptr = Format.c_str();
+            char *res = result;
+            enum { normal, format } state = normal;
+            int n = 0;
+            int f = (Index % FRAMESPERSEC) + 1;
+            int s = (Index / FRAMESPERSEC);
+            int m = s / 60 % 60;
+            int h = s / 3600;
+            s %= 60;
+            while (*ptr && res < result + sizeof(result))
+            {
+                switch (state)
+                {
+                    case normal:
+                        if (*ptr == '%')
+                            state = format;
+                        else
+                            *(res++) = *ptr;
+                        break;
+
+                    case format:
+                        switch (*ptr)
+                        {
+                            case 'H':
+                                n = snprintf(res, sizeof(result) - (res - result), "%02d", h);
+                                break;
+
+                            case 'k':
+                                n = snprintf(res, sizeof(result) - (res - result), "% 2d", h);
+                                break;
+
+                            case 'M':
+                                n = snprintf(res, sizeof(result) - (res - result), "%02d", m);
+                                update = 1000*60;
+                                break;
+
+                            case 'm':
+                                n = snprintf(res, sizeof(result) - (res - result), "%d", m + (h * 60));
+                                update = 1000*60;
+                                break;
+
+                            case 'S':
+                                n = snprintf(res, sizeof(result) - (res - result), "%02d", s);
+                                update = 1000;
+                                break;
+
+                            case 'f':
+                                n = snprintf(res, sizeof(result) - (res - result), "%d", f);
+                                update = 1000;
+                                break;
+
+                            case '%':
+                                n = 1;
+                                *res = '%';
+                                break;
+                        }
+                        res += n;
+                        state = normal;
+                        break;
+                }
+                ++ptr;
+            }
+
+            GLCD::cType r = result;
+            r.SetUpdate(update);
+            return r;
+        } else
+            return (int)Index;
+    }
+    return false;
+}
diff --git a/common.h b/common.h
new file mode 100644
index 0000000..579da60
--- /dev/null
+++ b/common.h
@@ -0,0 +1,2 @@
+GLCD::cType TimeType(time_t Time, const std::string &Format);
+GLCD::cType DurationType(int Index, const std::string &Format);
diff --git a/compat.h b/compat.h
deleted file mode 100644
index 4041ed4..0000000
--- a/compat.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _GRAPHLCD_COMPAT_H_
-#define _GRAPHLCD_COMPAT_H_
-
-
-#if VDRVERSNUM < 10318
-#define TimeMs time_ms
-#else
-#define TimeMs cTimeMs::Now
-#endif
-
-#if VDRVERSNUM >= 10318
-#define Apid1() Apid(0)
-#define Apid2() Apid(1)
-#define Dpid1() Dpid(0)
-#define Dpid2() Dpid(1)
-#endif
-
-#endif
diff --git a/display.c b/display.c
index a4f98f7..d6f385b 100644
--- a/display.c
+++ b/display.c
@@ -10,18 +10,17 @@
  * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
  */
 
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/io.h>
-#include <sys/time.h>
+#include <stdlib.h>
 
 #include <algorithm>
 
 #include <glcddrivers/config.h>
 #include <glcddrivers/drivers.h>
+#include <glcdskin/parser.h>
 
 #include "display.h"
 #include "global.h"
+#include "i18n.h"
 #include "setup.h"
 #include "state.h"
 #include "strfct.h"
@@ -29,1940 +28,272 @@
 #include <vdr/tools.h>
 #include <vdr/menu.h>
 
-#include "compat.h"
-
-#define MAXLINES_MSG  4
-#define MAXLINES_TEXT 16
-#define FILENAME_EXTERNAL_TRIGGERED_SYMBOLS "/tmp/graphlcd_symbols"
-
-// tiny:     0..48
-#define MINY_T  0
-#define MAXY_T  48
-
-// small:   49..61
-#define MINY_S  (MAXY_T+1)
-#define MAXY_S  61
-
-// medium:  62..127
-#define MINY_M  (MAXY_S+1)
-#define MAXY_M  127
-
-// large:  128..
-#define MINY_L  (MAXY_M+1)
-#define MAXY_L  9999
-
-
-
-int     FRAME_SPACE_X;
-int     FRAME_SPACE_XB;
-int     FRAME_SPACE_Y;
-int     FRAME_SPACE_YB;
-int     TEXT_OFFSET_X;
-int     TEXT_OFFSET_Y_TIME;
-int     TEXT_OFFSET_Y_CHANNEL;
-int     TEXT_OFFSET_Y_TITLE;
-int     SYMBOL_SPACE;
-int     TIMEBAR_HEIGHT;
-
-
-
 cGraphLCDDisplay::cGraphLCDDisplay()
 :   cThread("glcd_display"),
-    update(false),
-    active(false),
     mLcd(NULL),
-    bitmap(NULL),
-    GraphLCDState(NULL)
+    mScreen(NULL),
+    mSkin(NULL),
+    mSkinConfig(NULL),
+    mGraphLCDState(NULL)
 {
-    cfgDir = "";
-    fontDir = "";
-    logoDir = "";
-
-    CurrTime = time(NULL);
-    LastTime = CurrTime-58;
-    CurrTimeval.tv_sec = 0;
-    CurrTimeval.tv_usec = 0;
-    timerclear(&UpdateAt);
-    LastTimeCheckSym = CurrTime;
-
-    State = Normal;
-    LastState = Normal;
-
-    menuTop = 0;
-    menuCount = 0;
-    tabCount = 0;
-    for (int i = 0; i < kMaxTabCount; i++)
-        tab[i] = 0;
-    tabMax[0] = 0;
-    tabMax[1] = 66;
-    tabMax[2] = 100;
-    tabMax[3] = 100;
-    tabMax[4] = 100;
-    tabMax[5] = 100;
-    tabMax[6] = 100;
-    tabMax[7] = 100;
-    tabMax[8] = 100;
-    tabMax[9] = 100;
-
-    showVolume = false;
+    mUpdate = false;
+    mUpdateAt = 0;
+    mLastTimeMs = 0;
 
-    logo = NULL;
-    logoList = NULL;
+    mState = StateNormal;
+    mLastState = StateNormal;
 
-    strcpy (szETSymbols, "");
-
-    nCurrentBrightness = -1;
-    LastTimeBrightness = 0;
-    bBrightnessActive = true;
+    mShowVolume = false;
 }
 
 cGraphLCDDisplay::~cGraphLCDDisplay()
 {
-    active = false;
     Cancel(3);
 
-    delete GraphLCDState;
-    delete bitmap;
-    delete logoList;
+    delete mSkin;
+    delete mSkinConfig;
+    delete mScreen;
+    delete mGraphLCDState;
 }
 
-int cGraphLCDDisplay::Init(GLCD::cDriver * Lcd, const char * CfgDir)
+bool cGraphLCDDisplay::Initialise(GLCD::cDriver * Lcd, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName)
 {
-    if (!Lcd || !CfgDir)
-        return 2;
+    std::string skinsPath;
+
+    if (!Lcd)
+        return false;
     mLcd = Lcd;
-    cfgDir = CfgDir;
-    fontDir = cfgDir + "/fonts";
-    logoDir = cfgDir + "/logos";
 
-    logoList = new cGraphLCDLogoList(logoDir.c_str(), cfgDir.c_str());
-    if (!logoList)
-    {
-        esyslog("graphlcd plugin: ERROR out of memory\n");
-        return 1;
-    }
+    mGraphLCDState = new cGraphLCDState(this);
+    if (!mGraphLCDState)
+        return false;
 
-    std::string fontListFile = cfgDir + "/fonts.conf";
-    if (fontList.Load(fontListFile) == false)
+    skinsPath = SkinsPath;
+    if (skinsPath == "")
+        skinsPath = CfgPath + "/skins";
+
+    mSkinConfig = new cGraphLCDSkinConfig(this, CfgPath, skinsPath, SkinName, mGraphLCDState);
+    if (!mSkinConfig)
     {
-        esyslog("graphlcd plugin: ERROR: Could not load %s!\n", fontListFile.c_str());
-        return 1;
+        esyslog("graphlcd plugin: ERROR creating skin config\n");
+        return false;
     }
 
     Start();
-    return 0;
+    return true;
 }
 
 void cGraphLCDDisplay::Tick(void)
 {
-    if (GraphLCDState)
-        GraphLCDState->Tick();
+    if (mGraphLCDState)
+        mGraphLCDState->Tick();
 }
 
 void cGraphLCDDisplay::Action(void)
 {
+    std::string skinFileName;
+
     if (mLcd->Init() != 0)
     {
         esyslog("graphlcd plugin: ERROR: Failed initializing display\n");
         return;
     }
 
-    bitmap = new GLCD::cBitmap(mLcd->Width(), mLcd->Height());
-    if (!bitmap)
+    mScreen = new GLCD::cBitmap(mLcd->Width(), mLcd->Height());
+    if (!mScreen)
     {
         esyslog("graphlcd plugin: ERROR creating drawing bitmap\n");
         return;
     }
 
-    largeFont = fontList.GetFont("Large Font");
-    if (largeFont == NULL)
-    {
-        esyslog("graphlcd plugin: ERROR: No \"Large Font\" specified!\n");
-        return;
-    }
-    normalFont = fontList.GetFont("Normal Font");
-    if (normalFont == NULL)
+    skinFileName = mSkinConfig->SkinPath() + "/" + mSkinConfig->SkinName() + ".skin";
+    mSkin = GLCD::XmlParse(*mSkinConfig, mSkinConfig->SkinName(), skinFileName);
+    if (!mSkin)
     {
-        esyslog("graphlcd plugin: ERROR: No \"Normal Font\" specified!\n");
+        esyslog("graphlcd plugin: ERROR loading skin\n");
         return;
     }
-    smallFont = fontList.GetFont("Small Font");
-    if (smallFont == NULL)
-    {
-        esyslog("graphlcd plugin: ERROR: No \"Small Font\" specified!\n");
-        return;
-    }
-    symbols = fontList.GetFont("Symbol Font");
-    if (symbols == NULL)
-    {
-        esyslog("graphlcd plugin: ERROR: No \"Symbol Font\" specified!\n");
-        return;
-    }
-
-    if (bitmap->Width() < 240)
-    {
-        FRAME_SPACE_X  = 0;
-        FRAME_SPACE_XB = 1;
-        TEXT_OFFSET_X  = 2;
-    }
-    else
-    {
-        FRAME_SPACE_X  = 2;
-        FRAME_SPACE_XB = 2;
-        TEXT_OFFSET_X  = 4;
-    }
-
-    if (bitmap->Height() <= MAXY_T)
-    {
-        // very small display
-        FRAME_SPACE_Y         = 0;
-        FRAME_SPACE_YB        = 1;
-        TEXT_OFFSET_Y_TIME    = 1;
-        TEXT_OFFSET_Y_CHANNEL = 1;
-        TEXT_OFFSET_Y_TITLE   = 1;
-        SYMBOL_SPACE          = 1;
-        TIMEBAR_HEIGHT        = 3;
-    }
-    else if (bitmap->Height() <= MAXY_S)
-    {
-        // small display
-        FRAME_SPACE_Y         = 0;
-        FRAME_SPACE_YB        = 1;
-        TEXT_OFFSET_Y_TIME    = 1;
-        TEXT_OFFSET_Y_CHANNEL = 3;
-        TEXT_OFFSET_Y_TITLE   = 1;
-        SYMBOL_SPACE          = 1;
-        TIMEBAR_HEIGHT        = 3;
-    }
-    else if (bitmap->Height() <= MAXY_M)
-    {
-        // medium display
-        FRAME_SPACE_Y         = 0;
-        FRAME_SPACE_YB        = 1;
-        TEXT_OFFSET_Y_TIME    = 1;
-        TEXT_OFFSET_Y_CHANNEL = 3;
-        TEXT_OFFSET_Y_TITLE   = 3;
-        SYMBOL_SPACE          = 1;
-        TIMEBAR_HEIGHT        = 3;
-    }
-    else
-    {
-        // large display
-        FRAME_SPACE_Y         = 2;
-        FRAME_SPACE_YB        = 2;
-        TEXT_OFFSET_Y_TIME    = 2;
-        TEXT_OFFSET_Y_CHANNEL = 5;
-        TEXT_OFFSET_Y_TITLE   = 5;
-        SYMBOL_SPACE          = 2;
-        TIMEBAR_HEIGHT        = 5;
-    }
-
-    GraphLCDState = new cGraphLCDState(this);
-    if (!GraphLCDState)
-        return;
+    mSkin->SetBaseSize(mScreen->Width(), mScreen->Height());
 
+    mLcd->Clear();
     mLcd->Refresh(true);
-    active = true;
-    update = true;
-    while (active)
+    mUpdate = true;
+
+    while (Running())
     {
         if (GraphLCDSetup.PluginActive)
         {
-            CurrTime = time(NULL);
+            uint64_t currTimeMs = cTimeMs::Now();
 
-            if (timerisset(&UpdateAt))
+            if (mUpdateAt != 0)
             {
                 // timed Update enabled
-                if (gettimeofday(&CurrTimeval, NULL) == 0)
-                {
-                    // get current time
-                    if (CurrTimeval.tv_sec > UpdateAt.tv_sec)
-                    {
-                        timerclear(&UpdateAt);
-                        update = true;
-                    }
-                    else if (CurrTimeval.tv_sec == UpdateAt.tv_sec &&
-                        CurrTimeval.tv_usec > UpdateAt.tv_usec)
-                    {
-                        timerclear(&UpdateAt);
-                        update = true;
-                    }
-                }
-            }
-            if (GraphLCDSetup.ShowVolume && !update && showVolume)
-            {
-                if (TimeMs() - GraphLCDState->GetVolumeState().lastChange > 2000)
+                if (currTimeMs > mUpdateAt)
                 {
-                    update = true;
-                    showVolume = false;
+                    mUpdateAt = 0;
+                    mUpdate = true;
                 }
             }
 
-            SetBrightness();
-
-            switch (State)
+            if (GraphLCDSetup.ShowVolume)
             {
-                case Normal:
-                    // check and update external triggered symbols
-                    if (GraphLCDSetup.ShowETSymbols)
-                    {
-                        if (CurrTime != LastTimeCheckSym)
-                        {
-                            update |= CheckAndUpdateSymbols();
-                            LastTimeCheckSym = CurrTime;
-                        }
-                    }
-
-                    {
-                        std::vector<cScroller>::iterator it;
-                        for (it = scroller.begin(); it != scroller.end(); it++)
-                        {
-                            if (it->NeedsUpdate())
-                                update = true;
-                        }
-                    }
+                tVolumeState volume;
+                volume = mGraphLCDState->GetVolumeState();
 
-                    // update Display if animated Logo is present, and an update is necessary
-                    if (!update && IsLogoActive() && logo->Count() > 1 &&
-                        (TimeMs() - logo->LastChange() >= logo->Delay()))
-                    {
-                        update = true;
-                    }
-
-                    // update Display every minute or due to an update
-                    if (CurrTime/60 != LastTime/60 || update)
-                    {
-                        timerclear(&UpdateAt);
-                        update = false;
-
-                        bitmap->Clear();
-                        DisplayTime();
-                        DisplayLogo();
-                        DisplayChannel();
-                        DisplaySymbols();
-                        DisplayProgramme();
-                        DisplayVolume();
-                        DisplayMessage();
-                        mLcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height(), bitmap->LineSize());
-                        mLcd->Refresh(false);
-                        LastTime = CurrTime;
-                    }
-                    else
-                    {
-#if VDRVERSNUM < 10314
-                        usleep(100000);
-#else
-                        cCondWait::SleepMs(100);
-#endif
-                    }
-                    break;
-
-                case Replay:
+                if (volume.lastChange > 0)
                 {
-                    tReplayState replay = GraphLCDState->GetReplayState();
-                    if (replay.control)
+                    if (!mShowVolume)
                     {
+                        if (currTimeMs - volume.lastChange < 2000)
                         {
-                            update = false;
-                            std::vector<cScroller>::iterator it;
-                            for (it = scroller.begin(); it != scroller.end(); it++)
-                            {
-                                if (it->NeedsUpdate())
-                                    update = true;
-                            }
-                        }
-                        // update Display if animated Logo is present, and an update is necessary
-                        if (!update && IsLogoActive() && logo->Count() > 1 &&
-                            TimeMs() - logo->LastChange() >= logo->Delay())
-                        {
-                            update = true;
-                        }
-
-                        // update Display every second or due to an update
-                        if (CurrTime != LastTime || update)
-                        {
-                            // but only, if something has changed
-#if VDRVERSNUM >= 10701
-                            if (replay.total / DEFAULTFRAMESPERSECOND != replay.totalLast / DEFAULTFRAMESPERSECOND ||
-                                replay.current / DEFAULTFRAMESPERSECOND != replay.currentLast / DEFAULTFRAMESPERSECOND ||
-                                CurrTime/60 != LastTime/60 ||
-                                update)
-#else
-                            if (replay.total / FRAMESPERSEC != replay.totalLast / FRAMESPERSEC ||
-                                replay.current / FRAMESPERSEC != replay.currentLast / FRAMESPERSEC ||
-                                CurrTime/60 != LastTime/60 ||
-                                update)
-#endif
-                            {
-                                timerclear(&UpdateAt);
-                                update = false;
-                                bitmap->Clear();
-                                DisplayTime();
-                                DisplayLogo();
-                                DisplayReplay(replay);
-                                //DisplaySymbols();
-                                DisplayVolume();
-                                DisplayMessage();
-                                mLcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height(), bitmap->LineSize());
-                                mLcd->Refresh(false);
-                                LastTime = CurrTime;
-                            }
-                            else
-                            {
-#if VDRVERSNUM < 10314
-                                usleep(100000);
-#else
-                                cCondWait::SleepMs(100);
-#endif
-                            }
-                        }
-                        else
-                        {
-#if VDRVERSNUM < 10314
-                            usleep(100000);
-#else
-                            cCondWait::SleepMs(100);
-#endif
+                            mShowVolume = true;
+                            mUpdate = true;
                         }
                     }
                     else
                     {
-                        State = Normal;
-                        Update();
-                    }
-                }
-                break;
-
-                case Menu:
-                    if (GraphLCDSetup.ShowMenu)
-                    {
-                        // update Display every minute or due to an update
-                        if (CurrTime/60 != LastTime/60 || update)
-                        {
-                            timerclear(&UpdateAt);
-                            update = false;
-
-                            bitmap->Clear();
-                            DisplayTime();
-                            DisplayMenu();
-                            DisplayTextItem();
-                            DisplayVolume();
-                            DisplayMessage();
-                            DisplayColorButtons();
-                            mLcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height(), bitmap->LineSize());
-                            mLcd->Refresh(false);
-                            LastTime = CurrTime;
-                        }
-                        else
+                        if (currTimeMs - volume.lastChange > 2000)
                         {
-#if VDRVERSNUM < 10314
-                            usleep(100000);
-#else
-                            cCondWait::SleepMs(100);
-#endif
+                            mShowVolume = false;
+                            mUpdate = true;
                         }
                     }
-                    else
-                    {
-                        //GraphLCDState.OsdClear();
-
-                        State = LastState;
-                        // activate delayed Update
-#if VDRVERSNUM < 10314
-                        usleep(100000);
-#else
-                        cCondWait::SleepMs(100);
-#endif
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-        else
-        {
-#if VDRVERSNUM < 10314
-            usleep(100000);
-#else
-            cCondWait::SleepMs(100);
-#endif
-        }
-    }
-}
-
-void cGraphLCDDisplay::SetChannel(int ChannelNumber)
-{
-    if (ChannelNumber == 0)
-        return;
-
-    mutex.Lock();
-    cChannel * ch = Channels.GetByNumber(ChannelNumber);
-    if (GraphLCDSetup.ShowLogo)
-    {
-        ePicType picType;
-
-        switch (GraphLCDSetup.ShowLogo)
-        {
-            case 1:   // auto
-                if (bitmap->Height() <= MAXY_M)
-                    picType = ptLogoMedium;
-                else
-                    picType = ptLogoLarge;
-                break;
-            case 2:   // medium
-                picType = ptLogoMedium;
-                break;
-            case 3:   // large
-                picType = ptLogoLarge;
-                break;
-            default:  // should not happen at the moment !!
-                picType = ptLogoSmall;
-                break;
-        }
-#if VDRVERSNUM >= 10300
-        char strTmp[64];
-        strcpy(strTmp, (const char *) ch->GetChannelID().ToString());
-        char * strId = strstr(strTmp, "-") + 1;
-        logo = logoList->GetLogo(strId, picType);
-#else
-        char strId[16];
-        sprintf(strId, "%d", ch->Sid());
-        logo = logoList->GetLogo(strId, picType);
-#endif
-        if (logo)
-            logo->First(TimeMs());
-    }
-    else
-    {
-        logo = NULL;
-    }
-    bBrightnessActive = true;
-    Update();
-    mutex.Unlock();
-}
-
-void cGraphLCDDisplay::SetClear()
-{
-    mutex.Lock();
-
-    textItemLines.clear();
-    textItemTop = 0;
-    tabCount = 0;
-    for (int i = 0; i < kMaxTabCount; i++)
-        tab[i] = 0;
-
-    mutex.Unlock();
-
-    if (State == Menu)
-    {
-        State = LastState;
-        // activate delayed Update
-        UpdateIn(100000);
-    }
-    else
-    {
-        Update();
-    }
-}
-
-void cGraphLCDDisplay::SetOsdTitle()
-{
-    UpdateIn(0);  // stop delayed Update
-    mutex.Lock();
-    if (State != Menu)
-    {
-        menuTop = 0;
-        LastState = State;
-        State = Menu;
-    }
-    mutex.Unlock();
-    // activate delayed Update
-    UpdateIn(100000);
-}
-
-void cGraphLCDDisplay::SetOsdItem(const char * Text)
-{
-    int iAT, t;
-    std::string str;
-    std::string::size_type pos1, pos2;
-
-    mutex.Lock();
-
-    UpdateIn(0);  // stop delayed Update
-    str = Text;
-    pos1 = 0;
-    pos2 = str.find('\t');
-    iAT = 0;
-    while (pos1 < str.length() && pos2 != std::string::npos)
-    {
-        iAT++;
-        t = std::min(normalFont->Width(str.substr(pos1), pos2 - pos1), (tabMax[iAT] * bitmap->Width()) / 100);
-        tab[iAT] = std::max(tab[iAT], t);
-        tabCount = std::max(tabCount, iAT);
-        pos1 = pos2 + 1;
-        pos2 = str.find('\t', pos1);
-    }
-    mutex.Unlock();
-}
-
-void cGraphLCDDisplay::SetOsdCurrentItem()
-{
-    UpdateIn(100000); //XXX
-}
-
-void cGraphLCDDisplay::Replaying(bool starting, eReplayMode replayMode)
-{
-    if (starting)
-    {
-        if (State != Menu)
-        {
-            State = Replay;
-        }
-        else
-        {
-            LastState = Replay;
-        }
-        if (GraphLCDSetup.ReplayLogo)
-        {
-            ePicType picType;
-
-            switch (GraphLCDSetup.ReplayLogo)
-            {
-                case 1:   // auto
-                    if (bitmap->Height() <= MAXY_M)
-                        picType = ptLogoMedium;
-                    else
-                        picType = ptLogoLarge;
-                    break;
-                case 2:   // medium
-                    picType = ptLogoMedium;
-                    break;
-                case 3:   // large
-                    picType = ptLogoLarge;
-                    break;
-                default:  // should not happen at the moment !!
-                    picType = ptLogoSmall;
-                    break;
-            }
-            switch (replayMode)
-            {
-                default:
-                case eReplayNormal :
-                    logo = logoList->GetLogo("REPLAY-VDR", picType);break;
-                case eReplayMusic  :
-                    logo = logoList->GetLogo("REPLAY-MUSIC", picType);break;
-                case eReplayDVD    :
-                    logo = logoList->GetLogo("REPLAY-DVD", picType);break;
-                case eReplayFile   :
-                    logo = logoList->GetLogo("REPLAY-FILE", picType);break;
-                case eReplayImage  :
-                    logo = logoList->GetLogo("REPLAY-IMAGE", picType);break;
-                case eReplayAudioCD:
-                    logo = logoList->GetLogo("REPLAY-AUDIOCD", picType);break;
-            }
-            if (logo)
-                logo->First(TimeMs());
-        }
-        else
-        {
-            logo = NULL;
-        }
-    }
-    else
-    {
-        if (State != Menu)
-        {
-            State = Normal;
-        }
-        else
-        {
-            LastState = Normal;
-        }
-    }
-    bBrightnessActive = true;
-    Update();
-}
-
-void cGraphLCDDisplay::SetOsdTextItem(const char * Text, bool Scroll)
-{
-    static const char * lastText = NULL;
-    tOsdState osd;
-
-    osd = GraphLCDState->GetOsdState();
-    mutex.Lock();
-    if (Text)
-    {
-        if (osd.textItem.length() == 0)
-            lastText = NULL;
-        int maxTextLen = bitmap->Width() - 2 * FRAME_SPACE_X - 2 * TEXT_OFFSET_X;
-        normalFont->WrapText(maxTextLen, 0, osd.textItem, textItemLines);
-        textItemLines.push_back("");
-        if (lastText != Text)
-        {
-            lastText = Text;
-            textItemTop = 0;
-        }
-    }
-    else
-    {
-        if (Scroll)
-        {
-            if (textItemTop > 0)
-                textItemTop--;
-        }
-        else
-        {
-            if (textItemTop < (int) textItemLines.size() - 2)
-                textItemTop++;
-        }
-    }
-    mutex.Unlock();
-    UpdateIn(100000);
-}
-
-void cGraphLCDDisplay::Update()
-{
-    update = true;
-}
-
-void cGraphLCDDisplay::DisplayTime()
-{
-    static char buffer[32];
-    static char month[16];
-    int FrameWidth, TextLen, yPos;
-    struct tm tm_r;
-
-    if (GraphLCDSetup.ShowDateTime == 1 ||
-        (GraphLCDSetup.ShowDateTime == 2 && State != Menu))
-    {
-        FrameWidth = std::max(bitmap->Width() - 2 * FRAME_SPACE_X, 1);
-        if (State == Normal || State == Replay)
-        {
-            if (IsLogoActive()) // Logo enabled & available
-            {
-                FrameWidth = std::max(FrameWidth - FRAME_SPACE_XB - logo->Width() - 2, (unsigned int) 1);
-            }
-            if (bitmap->Height() <= MAXY_M)
-            {
-                // tiny, small & medium display
-                if (IsSymbolsActive()) // Symbols enabled
-                {
-                    FrameWidth = std::max(FrameWidth - FRAME_SPACE_XB - symbols->TotalWidth(), 1);
-                }
-            }
-        }
-        yPos = FRAME_SPACE_Y;
-
-        // draw Rectangle
-        bitmap->DrawRoundRectangle(FRAME_SPACE_X, yPos,
-                                   FRAME_SPACE_X + FrameWidth - 1,
-                                   yPos + normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_TIME - 1,
-                                   GLCD::clrBlack, true, (TEXT_OFFSET_Y_TIME >= 2) ? 4 : 1);
-
-        if (CurrTime == 0)
-            time(&CurrTime);
-        tm * tm = localtime_r(&CurrTime, &tm_r);
-
-        const char *amonth = tr("JanFebMarAprMayJunJulAugSepOctNovDec");
-        amonth += Utf8SymChars(amonth, tm->tm_mon * 3);
-        strn0cpy(month, amonth, min(Utf8SymChars(amonth, 3) + 1, int(sizeof(month))));
-        snprintf(buffer, sizeof(buffer), "%s %2d.%s  %d:%02d", (const char *) WeekDayName(tm->tm_wday), tm->tm_mday, month, tm->tm_hour, tm->tm_min);
-        TextLen = normalFont->Width(buffer);
-
-        if (TextLen > std::max(FrameWidth - 2 * TEXT_OFFSET_X, 1))
-        {
-            snprintf(buffer, sizeof(buffer), "%d.%s  %d:%02d", tm->tm_mday, month, tm->tm_hour, tm->tm_min);
-            TextLen = normalFont->Width(buffer);
-        }
-
-        if (TextLen > std::max(FrameWidth - 2 * TEXT_OFFSET_X, 1))
-        {
-            snprintf(buffer, sizeof(buffer), "%d.%d. %d:%02d", tm->tm_mday, tm->tm_mon+1, tm->tm_hour, tm->tm_min);
-            TextLen = normalFont->Width(buffer);
-        }
-
-        if (TextLen > std::max(FrameWidth - 2 * TEXT_OFFSET_X, 1))
-        {
-            snprintf(buffer, sizeof(buffer), "%d:%02d", tm->tm_hour, tm->tm_min);
-            TextLen = normalFont->Width(buffer);
-        }
-
-        if (TextLen < std::max(FrameWidth - 2 * TEXT_OFFSET_X, 1))
-        {
-            bitmap->DrawText(FRAME_SPACE_X + FrameWidth - TextLen - TEXT_OFFSET_X,
-                             yPos + TEXT_OFFSET_Y_TIME,
-                             FRAME_SPACE_X + FrameWidth - 1,
-                             buffer, normalFont, GLCD::clrWhite);
-        }
-        else
-        {
-            bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X,
-                             yPos + TEXT_OFFSET_Y_TIME,
-                             FRAME_SPACE_X + FrameWidth - 1,
-                             buffer, normalFont, GLCD::clrWhite);
-        }
-    }
-}
-
-void cGraphLCDDisplay::DisplayChannel()
-{
-    int FrameWidth, yPos;
-    tChannelState channel;
-
-    channel = GraphLCDState->GetChannelState();
-    if (GraphLCDSetup.ShowChannel)
-    {
-        FrameWidth = std::max(bitmap->Width() - 2 * FRAME_SPACE_X, 1);
-        if (State == Normal)
-        {
-            if (IsLogoActive()) // Logo enabled & available
-            {
-                FrameWidth = std::max(FrameWidth - FRAME_SPACE_XB - logo->Width() - 2, (unsigned int) 1);
-            }
-            if (bitmap->Height() <= MAXY_M)
-            {
-                // tiny, small & medium display
-                if (IsSymbolsActive()) // Symbols enabled
-                {
-                    FrameWidth = std::max(FrameWidth - FRAME_SPACE_XB - symbols->TotalWidth(), 1);
                 }
             }
-        }
 
-        if (GraphLCDSetup.ShowDateTime == 1 ||
-            (GraphLCDSetup.ShowDateTime == 2 && State != Menu))
-        {
-            yPos = FRAME_SPACE_Y + normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-
-            if (bitmap->Height() >= MINY_L)
+            // update Display every minute
+            if (mState == StateNormal && currTimeMs/60000 != mLastTimeMs/60000)
             {
-                // align bottom border with logo
-                if (IsLogoActive()) // Logo enabled & available
-                {
-                    yPos += std::max((unsigned int) 0, FRAME_SPACE_Y + logo->Height() + 2 - yPos -
-                                     (normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_CHANNEL));
-                }
+                mUpdate = true;
             }
-        }
-        else
-        {
-            yPos = FRAME_SPACE_Y;
-        }
-
-        // draw Rectangle
-        bitmap->DrawRoundRectangle(FRAME_SPACE_X, yPos,
-                                   FRAME_SPACE_X + FrameWidth - 1,
-                                   yPos + normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_CHANNEL - 1,
-                                   GLCD::clrBlack, true, (TEXT_OFFSET_Y_CHANNEL >= 4) ? 4 : 1);
-
-        if (channel.strTmp.length() > 0)
-        {
-            bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X,
-                             yPos + TEXT_OFFSET_Y_CHANNEL,
-                             FRAME_SPACE_X + FrameWidth - 1,
-                             channel.strTmp, normalFont, GLCD::clrWhite);
-        }
-        else if (channel.str.length() > 0)
-        {
-            bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X,
-                             yPos + TEXT_OFFSET_Y_CHANNEL,
-                             FRAME_SPACE_X + FrameWidth - 1,
-                             channel.str, normalFont, GLCD::clrWhite);
-        }
-    }
-}
 
-bool cGraphLCDDisplay::IsLogoActive() const
-{
-    if ((State==Normal && GraphLCDSetup.ShowLogo) ||
-        (State==Replay && GraphLCDSetup.IdentifyReplayType && GraphLCDSetup.ReplayLogo))
-    {
-        return logo != NULL;
-    }
-    return false;
-}
-
-void cGraphLCDDisplay::DisplayLogo()
-{
-    int x;
-    int y;
-
-    if (IsLogoActive())
-    {
-        if (logo->Count() > 1)
-        {
-            uint64_t t = TimeMs();
-            if (t - logo->LastChange() >= logo->Delay())
+            // update Display every second in replay state
+            if (mState == StateReplay && currTimeMs/1000 != mLastTimeMs/1000)
             {
-                if (!logo->Next(t))
-                    logo->First(t);
+                mUpdate = true;
             }
-        }
-
-        x = std::max(bitmap->Width() - FRAME_SPACE_X - logo->Width() - 2, (unsigned int) 0);
-        y = FRAME_SPACE_Y;
-
-        bitmap->DrawRoundRectangle(x, y, x + logo->Width() + 1, y + logo->Height() + 1, GLCD::clrBlack, false, 1);
-        bitmap->DrawBitmap(x + 1, y + 1, *logo->GetBitmap(), GLCD::clrBlack);
-    }
-}
-
-bool cGraphLCDDisplay::IsSymbolsActive() const
-{
-    return GraphLCDSetup.ShowSymbols;
-}
-
-void cGraphLCDDisplay::DisplaySymbols()
-{
-    int yPos = 0;
-    int xPos = 0;
-    int i;
-    tChannelState channel;
-    tVolumeState volume;
-    tCardState card[MAXDEVICES];
-
-    channel = GraphLCDState->GetChannelState();
-    for (i = 0; i < MAXDEVICES; i++)
-        card[i] = GraphLCDState->GetCardState(i);
-    volume = GraphLCDState->GetVolumeState();
-
-    if (IsSymbolsActive())
-    {
-        cChannel * ch = Channels.GetByNumber(channel.number);
-        if (ch)
-        {
-            if (bitmap->Height() <= MAXY_M) // medium display
-            {
-                yPos = FRAME_SPACE_Y;
-                xPos = bitmap->Width() - FRAME_SPACE_X - symbols->TotalWidth();
-
-                if (IsLogoActive())
-                {
-                    xPos -= FRAME_SPACE_XB + logo->Width() + 2;
-                }
-
-                if (GraphLCDSetup.ShowSymbols == 1) // normal/fixed symbols
-                {
-                    // new layout:
-                    //    displays rec symbols for every card and
-                    //    2chan + dolby have their own symbols
-                    //    user triggered symbols
-
-                    int yPos2 = 0;
-
-                    // blank or 2chan or mute
-                    if (volume.value == 0)
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'M', symbols);
-                        yPos += symbols->Height('S') + SYMBOL_SPACE;
-                    }
-                    else if (ch->Apid2())
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'A', symbols);
-                        yPos += symbols->Height('A') + SYMBOL_SPACE;
-                    }
-                    else
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ' ', symbols);
-                        yPos += symbols->Height(' ') + SYMBOL_SPACE;
-                    }
-
-                    // blank or dolby
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Dpid1() ? 'D' : ' ', symbols);
-                    yPos += symbols->Height(ch->Dpid1() ? 'D' : ' ') + SYMBOL_SPACE;
-
-                    // blank or teletext
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Tpid() ? 'T' : ' ', symbols);
-                    yPos += symbols->Height(ch->Tpid() ? 'T' : ' ') + SYMBOL_SPACE;
-
-                    // blank or crypt
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Ca() ? 'C' : ' ', symbols);
-                    yPos += symbols->Height(ch->Tpid() ? 'C' : ' ') + SYMBOL_SPACE;
-
-                    // show REC symbols at the right border below the logo
-                    yPos2 = yPos;
-                    yPos = FRAME_SPACE_Y;
-                    if (GraphLCDSetup.ShowDateTime == 1 ||
-                            (GraphLCDSetup.ShowDateTime == 2 && State != Menu))
-                    {
-                        yPos += normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-                    }
-                    if (GraphLCDSetup.ShowChannel)
-                    {
-                        yPos += normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_CHANNEL + FRAME_SPACE_YB;
-                    }
-                    if (IsLogoActive())
-                    {
-                        yPos = std::max((unsigned int) yPos, FRAME_SPACE_Y + logo->Height() + 2 + FRAME_SPACE_YB);
-                    }
-
-                    yPos = std::max(yPos, yPos2);
-                    xPos = bitmap->Width() - FRAME_SPACE_X + SYMBOL_SPACE;
-                    for (i = LCDMAXCARDS - 1; i >= 0; i--)
-                    {
-                        if (card[i].recordingCount > 0)
-                        {
-                            xPos -= symbols->Width(49 + i) + SYMBOL_SPACE;
-                            bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 49 + i, symbols);
-                        }
-                    }
-
-                    // show external triggered symbols
-                    if (GraphLCDSetup.ShowETSymbols && strlen(szETSymbols) > 0)
-                    {
-                        for (i = strlen(szETSymbols) - 1; i >= 0; i--)
-                        {
-                            xPos -= symbols->Width(szETSymbols[i]) + SYMBOL_SPACE;
-                            bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, szETSymbols[i], symbols);
-                        }
-                    }
-                }
-                else // compressed symbols
-                {
-                    // old layout:
-                    //    displays only 1 rec symbol and
-                    //    a combined 2chan + dolby symbol
-
-                    // blank or teletext
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Tpid() ? 'T' : ' ', symbols);
-                    yPos += symbols->Height(ch->Tpid() ? 'T' : ' ') + SYMBOL_SPACE;
-
-                    // blank or crypt
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Ca() ? 'C' : ' ', symbols);
-                    yPos += symbols->Height(ch->Tpid() ? 'C' : ' ') + SYMBOL_SPACE;
-
-                    // blank, 2chan, dolby or combined symbol
-                    if (volume.value == 0)
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'M', symbols);
-                        yPos += symbols->Height('S') + SYMBOL_SPACE;
-                    }
-                    else if (ch->Apid2() && ch->Dpid1())
-                    {
-                        // if Apid2 and Dpid1 are set then use combined symbol
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'B', symbols);
-                        yPos += symbols->Height('B') + SYMBOL_SPACE;
-                    }
-                    else if (ch->Apid2())
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'A', symbols);
-                        yPos += symbols->Height('A') + SYMBOL_SPACE;
-                    }
-                    else if (ch->Dpid1())
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'D', symbols);
-                        yPos += symbols->Height('D') + SYMBOL_SPACE;
-                    }
-                    else
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ' ', symbols);
-                        yPos += symbols->Height(' ') + SYMBOL_SPACE;
-                    }
 
-                    // blank or rec
-                    if (cRecordControls::Active())
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, '1', symbols);
-                    }
-                    else
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ' ', symbols);
-                    }
-                }
-            }
-            else // large display
+            if (mUpdate)
             {
-                yPos = FRAME_SPACE_Y;
-                if (GraphLCDSetup.ShowDateTime == 1 ||
-                    (GraphLCDSetup.ShowDateTime == 2 && State != Menu))
-                {
-                    yPos += normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-                }
-                if (GraphLCDSetup.ShowChannel)
-                {
-                    yPos += normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_CHANNEL + FRAME_SPACE_YB;
-                }
-                if (IsLogoActive())
+                mUpdateAt = 0;
+                mUpdate = false;
+
+                mGraphLCDState->Update();
+
+                mScreen->Clear();
+                GLCD::cSkinDisplay * display = NULL;
+
+                if (mState == StateNormal)
+                    display = mSkin->GetDisplay("normal");
+                else if (mState == StateReplay)
+                    display = mSkin->GetDisplay("replay");
+                else if (mState == StateMenu)
+                    display = mSkin->GetDisplay("menu");
+                if (display)
+                    display->Render(mScreen);
+                if (mShowVolume)
                 {
-                    yPos = std::max((unsigned int) yPos, FRAME_SPACE_Y + logo->Height() + 2 + FRAME_SPACE_YB);
+                    display = mSkin->GetDisplay("volume");
+                    if (display)
+                        display->Render(mScreen);
                 }
-
-                xPos = bitmap->Width() - FRAME_SPACE_X - symbols->Width(' ');
-
-                if (GraphLCDSetup.ShowSymbols == 1) // normal/fixed symbols
+                if (GraphLCDSetup.ShowMessages && mGraphLCDState->ShowMessage())
                 {
-                    // blank or teletext
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Tpid() ? 'T' : ' ', symbols);
-                    xPos -= symbols->Width(ch->Tpid() ? 'T' : ' ') + SYMBOL_SPACE;
-
-                    // blank or dolby
-                    bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Dpid1() ? 'D' : ' ', symbols);
-                    xPos -= symbols->Width(ch->Dpid1() ? 'D' : ' ') + SYMBOL_SPACE;
-
-                    if (bitmap->Height() > MAXY_M) // with 128 pixel width only 3 symbols...
-                    {
-                        // blank or crypt
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ch->Ca()? 'C' : ' ', symbols);
-                        xPos -= symbols->Width(ch->Ca() ? 'C' : ' ') + SYMBOL_SPACE;
-                    }
-
-                    // blank or 2chan or mute
-                    if (volume.value == 0)
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'M', symbols);
-                        xPos -= symbols->Width('S') + SYMBOL_SPACE;
-                    }
-                    else if (ch->Apid2())
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'A', symbols);
-                        xPos -= symbols->Width('A') + SYMBOL_SPACE;
-                    }
-                    else
-                    {
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ' ', symbols);
-                        xPos -= symbols->Width(' ') + SYMBOL_SPACE;
-                    }
-                }
-                else // compressed symbols
-                {
-                    // crypt
-                    if (ch->Ca())
-                    {
-                        xPos -= symbols->Width('C') + SYMBOL_SPACE;
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'C', symbols);
-                    }
-
-                    // teletext
-                    if (ch->Tpid())
-                    {
-                        xPos -= symbols->Width('T') + SYMBOL_SPACE;
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'T', symbols);
-                    }
-
-                    // dolby
-                    if (ch->Dpid1())
-                    {
-                        xPos -= symbols->Width('D') + SYMBOL_SPACE;
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'D', symbols);
-                    }
-
-                    // 2chan
-                    if (ch->Apid2())
-                    {
-                        xPos -= symbols->Width('A') + SYMBOL_SPACE;
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'A', symbols);
-                    }
-
-                    // mute
-                    if (volume.value == 0)
-                    {
-                        xPos -= symbols->Width('S') + SYMBOL_SPACE;
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 'M', symbols);
-                    }
-                }
-
-                // show REC symbols at the right border of the 'next line'
-                xPos = bitmap->Width() - FRAME_SPACE_X + SYMBOL_SPACE;
-                yPos += symbols->TotalHeight() + FRAME_SPACE_YB;
-                for (i = cDevice::NumDevices() - 1; i >= 0; i--)
-                {
-                    // Just display present devices
-                    xPos -= symbols->Width(49 + i) + SYMBOL_SPACE;
-                    if (card[i].recordingCount > 0)
-                    {
-                        // Show a recording Symbol
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, 49 + i, symbols);
-                    }
-                    else
-                    {
-                        if (GraphLCDSetup.ShowNotRecording == 1)
-                        {
-                            // Do we want an empty frame around not recording card's icons?
-                            // Show an empty frame instead of the recording symbol
-                            bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, ' ', symbols);
-                        }
-                    }
-                }
-
-                // show external triggered symbols
-                if (GraphLCDSetup.ShowETSymbols && strlen(szETSymbols) > 0)
-                {
-                    for (i = strlen(szETSymbols) - 1; i >= 0; i--)
-                    {
-                        xPos -= symbols->Width(szETSymbols[i]) + SYMBOL_SPACE;
-                        bitmap->DrawCharacter(xPos, yPos, bitmap->Width() - 1, szETSymbols[i], symbols);
-                    }
+                    display = mSkin->GetDisplay("message");
+                    if (display)
+                        display->Render(mScreen);
                 }
-            }
-        }
-    }
-}
-
-void cGraphLCDDisplay::DisplayProgramme()
-{
-    struct tm tm_r;
-    char buffer[25];
-    std::string str;
-    bool showTimeBar = false;
-    int timeBarWidth = 0;
-    int timeBarValue = 0;
-    tEventState event;
-
-    event = GraphLCDState->GetEventState();
-    if (GraphLCDSetup.ShowProgram)
-    {
-        strftime(buffer, sizeof(buffer), "%R", localtime_r(&event.presentTime, &tm_r));
-        if (event.followingTime && event.followingTime != event.presentTime)
-        {
-            str = buffer;
-            if ((bitmap->Width() >= MINY_L || !IsSymbolsActive()))
-            {
-                str += " - ";
+                mLcd->SetScreen(mScreen->Data(), mScreen->Width(), mScreen->Height(), mScreen->LineSize());
+                mLcd->Refresh(false);
+                mLastTimeMs = currTimeMs;
             }
             else
             {
-                str += "-";
+                cCondWait::SleepMs(100);
             }
-            strftime(buffer, sizeof(buffer), "%R", localtime_r(&event.followingTime, &tm_r));
-            str += buffer;
-            showTimeBar = true;
-            timeBarWidth = normalFont->Width(str) - 1;
-            timeBarValue = (time(NULL) - event.presentTime) * timeBarWidth / (event.followingTime - event.presentTime);
-            if (timeBarValue > timeBarWidth)
-                timeBarValue = timeBarWidth;
-            if (timeBarValue < 0)
-                timeBarValue = 0;
         }
         else
         {
-            str = buffer;
-        }
-
-        if (!event.presentTime)
-        {
-            std::vector<cScroller>::iterator it;
-            for (it = scroller.begin(); it != scroller.end(); it++)
-            {
-                it->Reset();
-            }
-        }
-
-        if (event.presentTime)
-        {
-            if (scroller.size() < 1 ||
-                event.presentTitle != scroller[0].Text() ||
-                (scroller.size() > 1 && event.presentSubtitle != scroller[1].Text()))
-            {
-                if (bitmap->Height() <= MAXY_S)
-                {
-                    scroller.resize(1);
-
-                    int nTopY = bitmap->Height() - (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight();
-                    int nMaxX = std::max(1, bitmap->Width() - 1 - (2 * FRAME_SPACE_X));
-                    // Logo enabled & available, and text with Logo is overlapped
-                    if (IsLogoActive() && nTopY < (int) logo->Height())
-                    {
-                        nMaxX -= FRAME_SPACE_XB;
-                        nMaxX -= logo->Width();
-                        nMaxX = std::max(nMaxX-2,1);//Frame around Logo
-                    }
-                    // If symbols used, and text with symbols is overlapped
-                    if (IsSymbolsActive())
-                    {
-                        nMaxX -= FRAME_SPACE_XB;
-                        nMaxX -= symbols->TotalWidth();
-                        nMaxX = std::max(nMaxX,1);
-                    }
-
-                    scroller[0].Init(FRAME_SPACE_X + TEXT_OFFSET_X,
-                                     nTopY,
-                                     nMaxX,
-                                     largeFont, event.presentTitle);
-                }
-                else
-                {
-                    scroller.resize(2);
-
-                    scroller[0].Init(FRAME_SPACE_X + TEXT_OFFSET_X,
-                                     bitmap->Height() - 2 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - normalFont->TotalHeight(),
-                                     bitmap->Width() - 1,
-                                     largeFont, event.presentTitle);
-                    scroller[1].Init(FRAME_SPACE_X + TEXT_OFFSET_X,
-                                     bitmap->Height() - (TEXT_OFFSET_Y_TITLE-1) - normalFont->TotalHeight(),
-                                     bitmap->Width() - 1,
-                                     normalFont, event.presentSubtitle);
-                }
-            }
-            if (bitmap->Height() <= MAXY_S)
-            {
-                // tiny and small LCDs
-                bitmap->DrawText(FRAME_SPACE_X,
-                                 bitmap->Height() - 2 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - normalFont->TotalHeight(),
-                                 bitmap->Width() - 1,
-                                 str, normalFont);
-            }
-            else
-            {
-                // medium and large LCDs
-                bitmap->DrawText(FRAME_SPACE_X,
-                                 bitmap->Height() - 3 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - 2 * normalFont->TotalHeight() - (showTimeBar && GraphLCDSetup.ShowTimebar ? TIMEBAR_HEIGHT + 1 : 0),
-                                 bitmap->Width() - 1,
-                                 str, normalFont);
-                if (showTimeBar && GraphLCDSetup.ShowTimebar)
-                {
-                    bitmap->DrawRectangle(FRAME_SPACE_X,
-                                          bitmap->Height() - 3 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - normalFont->TotalHeight() - TIMEBAR_HEIGHT - 1,
-                                          FRAME_SPACE_X + timeBarWidth,
-                                          bitmap->Height() - 3 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - normalFont->TotalHeight() - 2,
-                                          GLCD::clrBlack, false);
-                    bitmap->DrawRectangle(FRAME_SPACE_X,
-                                          bitmap->Height() - 3 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - normalFont->TotalHeight() - TIMEBAR_HEIGHT - 1,
-                                          FRAME_SPACE_X + timeBarValue,
-                                          bitmap->Height() - 3 * (TEXT_OFFSET_Y_TITLE - 1) - largeFont->TotalHeight() - normalFont->TotalHeight() - 2,
-                                          GLCD::clrBlack, true);
-                }
-            }
-            // Draw Programmtext
-            {
-                std::vector<cScroller>::iterator it;
-                for (it = scroller.begin(); it != scroller.end(); it++)
-                {
-                    it->Draw(bitmap);
-                }
-            }
+            cCondWait::SleepMs(100);
         }
     }
 }
 
-bool cGraphLCDDisplay::IndexIsGreaterAsOneHour(int Index) const
-{
-#if VDRVERSNUM >= 10701
-    int h = (Index / DEFAULTFRAMESPERSECOND) / 3600;
-#else
-    int h = (Index / FRAMESPERSEC) / 3600;
-#endif
-    return h > 0;
-}
-
-const char * cGraphLCDDisplay::IndexToMS(int Index) const
+void cGraphLCDDisplay::Update()
 {
-    static char buffer[16];
-#if VDRVERSNUM >= 10701
-    int s = (Index / DEFAULTFRAMESPERSECOND);
-#else
-    int s = (Index / FRAMESPERSEC);
-#endif
-    int m = s / 60;
-    s %= 60;
-    snprintf(buffer, sizeof(buffer), "%02d:%02d", m, s);
-    return buffer;
+    mUpdate = true;
 }
 
-bool cGraphLCDDisplay::IsScrollerTextChanged(const std::vector<cScroller> & scrollers, const std::vector <std::string> & lines) const
+void cGraphLCDDisplay::UpdateIn(uint64_t msec)
 {
-    if (lines.size() == 0)
-        return true; //Different size found
-    if (scrollers.size() == 0)
-        return true; //Different size found
-
-    std::vector<cScroller>::const_iterator i = scrollers.begin();
-    std::vector<cScroller>::const_iterator e = scrollers.end();
-    std::vector<std::string>::const_iterator li = lines.begin();
-    std::vector<std::string>::const_iterator le = lines.end();
-
-    for (; e != i && le != li; ++li,++i)
+    if (msec == 0)
     {
-        if (i->Text() != (*li))
-            return true; //Different text found
+        mUpdateAt = 0;
     }
-    return false; //Text seem equal
-}
-
-void cGraphLCDDisplay::DisplayReplay(tReplayState & replay)
-{
-    int nMaxX, nProgressbarHeight, nTopY;
-    int nWidthPreMsg = 0, nWidthCurrent = 0, nWidthTotal = 0,nWidthOffset = 0;
-    std::string szPreMsg,szCurrent,szTotal;
-
-    if (bitmap->Height() >= MINY_L)
-        nProgressbarHeight = 15;
-    else if (bitmap->Height() >= MINY_M)
-        nProgressbarHeight = 9;
-    else if (bitmap->Height() >= MINY_S)
-        nProgressbarHeight = 5;
-    else
-        nProgressbarHeight = 3;
-
-    if (IsLogoActive())
-        nTopY = FRAME_SPACE_Y + logo->Height() + 2;
-    else if (GraphLCDSetup.ShowDateTime)
-        nTopY = FRAME_SPACE_Y + normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
     else
-        nTopY = FRAME_SPACE_Y;
-    if (replay.name.length() > 0)
     {
-        int lineHeight, maxLines;
-        std::vector <std::string> lines;
-
-        nMaxX = std::max(1, bitmap->Width() - (2 * FRAME_SPACE_X) - 2 * TEXT_OFFSET_X);
-        lineHeight = FRAME_SPACE_Y + largeFont->TotalHeight();
-        maxLines = std::max(0, (bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 2 - nTopY) / lineHeight);
-
-        if (maxLines == 0)
-        {
-            if (IsLogoActive())
-            {
-                // draw replayname next to logo
-                nMaxX = std::max((unsigned int) 1, nMaxX - FRAME_SPACE_X - logo->Width() - 2);
-                if (GraphLCDSetup.ShowDateTime)
-                    nTopY = FRAME_SPACE_Y + normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-                else
-                    nTopY = FRAME_SPACE_Y;
-                maxLines = (bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 2 - nTopY) / lineHeight;
-            }
-            if (maxLines <= 1)
-            {
-                // use singleline mode
-                lines.push_back(replay.name);
-            }
-            else
-                largeFont->WrapText(nMaxX, maxLines * lineHeight, replay.name, lines);
-        }
-        else if (maxLines == 1) //singleline mode
-            lines.push_back(replay.name);
-        else
-        {
-            largeFont->WrapText(nMaxX, maxLines * lineHeight, replay.name, lines);
-        }
-
-        if (scroller.size() != lines.size() ||
-            IsScrollerTextChanged(scroller,lines)) // if any text is changed
-        {
-            // Same size for Scroller and Textbuffer
-            scroller.resize(lines.size());
-
-            std::vector<cScroller>::iterator i = scroller.begin();
-            std::vector<cScroller>::const_iterator e = scroller.end();
-            std::vector<std::string>::const_iterator li = lines.begin();
-            std::vector<std::string>::const_iterator le = lines.end();
-
-            for (int n = lines.size(); e != i && le != li; ++li,++i,--n)
-            {
-                nTopY = bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - n * lineHeight - 2;
-                i->Init(FRAME_SPACE_X + TEXT_OFFSET_X, nTopY, nMaxX + FRAME_SPACE_X + TEXT_OFFSET_X, largeFont, *li);
-            }
-        }
-    }
-
-    // Draw Replaytext
-    {
-        std::vector<cScroller>::iterator it;
-        for (it = scroller.begin(); it != scroller.end(); it++)
-        {
-            it->Draw(bitmap);
-        }
-    }
-
-    // Draw Progressbar with current and total replay time
-    nTopY = bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y - nProgressbarHeight - 2;
-    nMaxX = std::max(1, bitmap->Width() - 1 - 2 * FRAME_SPACE_X);
-    // Logo enabled & available, and text with Logo is overlapped
-    if (IsLogoActive() && nTopY < (int) logo->Height())
-    {
-        nMaxX -= max(1,FRAME_SPACE_X); // Free line between Logo and progressbar
-        nMaxX -= logo->Width();
-        nMaxX = std::max(nMaxX - 2, 1); //Frame around Logo
-    }
-
-    bitmap->DrawRectangle(FRAME_SPACE_X,
-                          nTopY,
-                          FRAME_SPACE_X + nMaxX,
-                          nTopY + nProgressbarHeight,
-                          GLCD::clrBlack, false);
-
-    if (1 < replay.total && 1 < replay.current) // Don't show full progressbar for endless streams
-    {
-        bitmap->DrawRectangle(FRAME_SPACE_X,
-                              nTopY,
-                              FRAME_SPACE_X + (std::min(replay.total, replay.current) * nMaxX / replay.total),
-                              nTopY + nProgressbarHeight,
-                              GLCD::clrBlack, true);
-    }
-
-    // Draw Strings with current and total replay time
-    nTopY = bitmap->Height() - normalFont->TotalHeight() - FRAME_SPACE_Y;
-    // use same width like Progressbar
-// if (!IsLogoActive() || nTopY > logo->Height())
-// nMaxX = max(1, bitmap->Width() - 1 - (2 * FRAME_SPACE_X));
-
-    switch (replay.mode)
-    {
-        case eReplayDVD:
-            szPreMsg = tr("DVD");    break;
-        case eReplayMusic:
-            szPreMsg = tr("Music");  break;
-        case eReplayFile:
-            szPreMsg = tr("File");   break;
-        case eReplayImage:
-            szPreMsg = tr("Image");  break;
-        case eReplayAudioCD:
-            szPreMsg = tr("CD");     break;
-        default:
-            szPreMsg = tr("Replay"); break;
-    }
-
-    if (bitmap->Width() >= MINY_M)
-    {
-        szPreMsg += " : ";
-        szPreMsg += replay.loopmode;
-    }
-    else
-        szPreMsg += ":";
-
-    if (replay.mode == eReplayImage) // Image-Plugin hasn't Frames per Seconds
-    {
-        char buffer[8];
-        snprintf(buffer, sizeof(buffer), "%d", replay.current);
-        szCurrent = buffer;
-        snprintf(buffer, sizeof(buffer), "%d", replay.total);
-        szTotal = buffer;
-    }
-    else
-    {
-        if ((replay.total > 1 && IndexIsGreaterAsOneHour(replay.total)) ||
-            IndexIsGreaterAsOneHour(replay.current)) // Check if any index bigger as one hour
-        {
-            szCurrent = (const char *) IndexToHMSF(replay.current);
-            if (replay.total > 1) // Don't draw totaltime for endless streams
-                szTotal = (const char *) IndexToHMSF(replay.total);
-        }
-        else
-        {
-            // Show only minutes and seconds on short replays
-            szCurrent = (const char *) IndexToMS(replay.current);
-            if (replay.total > 1) // Don't draw totaltime for endless streams
-                szTotal = (const char *) IndexToMS(replay.total);
-        }
-    }
-    // Get width of drawable strings
-    nWidthPreMsg = normalFont->Width(szPreMsg);
-    nWidthCurrent = normalFont->Width(szCurrent);
-    if (szTotal.length()) // Don't draw empty string
-        nWidthTotal = normalFont->Width(szTotal);
-
-    // Draw depends on display width, any placeable informations
-    if (nWidthTotal && nWidthPreMsg && (nWidthPreMsg + nWidthCurrent + nWidthTotal + 5 < nMaxX))
-    {
-        // Show prefix and all position
-        nWidthOffset = bitmap->DrawText(FRAME_SPACE_X, nTopY, nMaxX, szPreMsg, normalFont);
-        bitmap->DrawText(FRAME_SPACE_X + nWidthOffset + 1, nTopY, nMaxX, szCurrent, normalFont);
-        bitmap->DrawText(nMaxX - nWidthTotal, nTopY, nMaxX, szTotal, normalFont);
-    }
-    else if (nWidthTotal && (nWidthCurrent + nWidthTotal + 5 < nMaxX))
-    {
-        // Show current and total position
-        bitmap->DrawText(FRAME_SPACE_X, nTopY, nMaxX, szCurrent, normalFont);
-        bitmap->DrawText(nMaxX - nWidthTotal, nTopY, nMaxX, szTotal, normalFont);
-    }
-    else if (!nWidthTotal && nWidthPreMsg && (nWidthPreMsg + nWidthCurrent + 1 < nMaxX))
-    {
-        // Show prefix and current position
-        nWidthOffset = bitmap->DrawText(FRAME_SPACE_X, nTopY, nMaxX, szPreMsg, normalFont);
-        bitmap->DrawText(FRAME_SPACE_X + nWidthOffset + 1, nTopY, nMaxX, szCurrent, normalFont);
-    }
-    else
-    {
-        // Show only current position
-        bitmap->DrawText(FRAME_SPACE_X, nTopY, nMaxX, szCurrent, normalFont);
+        mUpdateAt = cTimeMs::Now() + msec;
     }
 }
 
-void cGraphLCDDisplay::DisplayMenu(void)
+void cGraphLCDDisplay::Replaying(bool Starting)
 {
-    char buffer2[255];
-    char * pszTmp1;
-    char * pszTmp2;
-    int iAT, t;
-    int FrameWidth, yPos, iEntryHeight;
-    int extra = 0;
-    tOsdState osd;
-
-    osd = GraphLCDState->GetOsdState();
-
-    mutex.Lock();
-
-    FrameWidth = std::max(bitmap->Width() - 2 * FRAME_SPACE_X, 1);
-
-    if (GraphLCDSetup.ShowDateTime == 1 ||
-        (GraphLCDSetup.ShowDateTime == 2 && State != Menu))
-    {
-        yPos = FRAME_SPACE_Y + normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-    }
-    else
-    {
-        yPos = FRAME_SPACE_Y;
-    }
-
-    // draw Menu Title
-    if (osd.title.length() > 0)
+    if (Starting)
     {
-        bitmap->DrawRoundRectangle(FRAME_SPACE_X,
-                                   yPos,
-                                   FRAME_SPACE_X + FrameWidth - 1,
-                                   yPos + normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_TIME - 1,
-                                   GLCD::clrBlack, true, TEXT_OFFSET_Y_CHANNEL >= 4 ? 4 : 1);
-        bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X,
-                         yPos + TEXT_OFFSET_Y_TIME,
-                         FRAME_SPACE_X + FrameWidth - 1,
-                         osd.title, normalFont, GLCD::clrWhite);
-    }
-
-    if (!(textItemLines.size() > 0))
-    {
-        // draw Menu Entries
-        if (normalFont->TotalHeight() <= normalFont->LineHeight())
-            extra = 1;
-        iEntryHeight = normalFont->TotalHeight() + 2 * extra;
-        yPos = yPos + normalFont->TotalHeight() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-        if (GraphLCDSetup.ShowColorButtons &&
-                (osd.colorButton[0].length() > 0 || osd.colorButton[1].length() > 0 ||
-                 osd.colorButton[2].length() > 0 || osd.colorButton[3].length() > 0))
+        if (mState != StateMenu)
         {
-            menuCount = (bitmap->Height() - yPos - smallFont->TotalHeight() - 4 - FRAME_SPACE_Y / 3) / iEntryHeight;
+            mState = StateReplay;
         }
         else
         {
-            menuCount = (bitmap->Height() - yPos) / iEntryHeight;
-        }
-
-        if (osd.currentItemIndex < menuTop)
-            menuTop = osd.currentItemIndex;
-        if (osd.currentItemIndex > menuTop + menuCount - 1)
-            menuTop = std::max(0, osd.currentItemIndex + 1 - menuCount);
-
-        bitmap->DrawRectangle(0, yPos, bitmap->Width() - 1, bitmap->Height() - 1, GLCD::clrWhite, true);
-
-        for (int i = menuTop; i < std::min((int) osd.items.size(), menuTop + menuCount); i++)
-        {
-            if (i == osd.currentItemIndex)
-            {
-                bitmap->DrawRoundRectangle(FRAME_SPACE_X, yPos + (i - menuTop) * iEntryHeight,
-                                           bitmap->Width() - 1 - FRAME_SPACE_X,
-                                           yPos + (i - menuTop + 1) * iEntryHeight - 1,
-                                           GLCD::clrBlack, true, TEXT_OFFSET_Y_CHANNEL >= 4 ? 3 : 1);
-            }
-            strncopy(buffer2, osd.items[i].c_str(), sizeof(buffer2));
-            pszTmp1 = buffer2;
-            pszTmp2 = strchr(pszTmp1, '\t');
-            iAT = 0; t = 0;
-
-            while (pszTmp1 && pszTmp2)
-            {
-                *pszTmp2 = '\0';
-                bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X + t,
-                                 yPos + (i - menuTop) * iEntryHeight + extra,
-                                 std::min(FRAME_SPACE_X + TEXT_OFFSET_X + t + tab[iAT + 1], bitmap->Width() - 1 - FRAME_SPACE_X),
-                                 pszTmp1, normalFont, (i == osd.currentItemIndex) ? GLCD::clrWhite : GLCD::clrBlack);
-                pszTmp1 = pszTmp2+1;
-                pszTmp2 = strchr(pszTmp1, '\t');
-                t = t + tab[iAT + 1] + TEXT_OFFSET_X;
-                iAT++;
-            }
-
-            bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X + t,
-                             yPos + (i - menuTop) * iEntryHeight + extra,
-                             bitmap->Width() - 1 - FRAME_SPACE_X,
-                             pszTmp1, normalFont, (i == osd.currentItemIndex) ? GLCD::clrWhite : GLCD::clrBlack);
-        }
-    }
-    mutex.Unlock();
-}
-
-void cGraphLCDDisplay::DisplayMessage()
-{
-    std::vector <std::string> lines;
-    int lineCount;
-    int maxTextLen, recW, recH;
-    int entryHeight;
-    tOsdState osd;
-
-    osd = GraphLCDState->GetOsdState();
-    if (GraphLCDSetup.ShowMessages && osd.message.length() > 0)
-    {
-        maxTextLen = bitmap->Width() - 2 * FRAME_SPACE_X - 2 * FRAME_SPACE_XB - 2 * TEXT_OFFSET_X - 10;
-        entryHeight = 2 * (normalFont->TotalHeight() - normalFont->TotalAscent()) + normalFont->TotalAscent();
-        normalFont->WrapText(maxTextLen, MAXLINES_MSG * entryHeight, osd.message, lines, &recW);
-        lineCount = lines.size();
-
-        // display text
-        recH = lineCount * entryHeight + 2 * TEXT_OFFSET_Y_CHANNEL + 2 * FRAME_SPACE_YB;
-        recW = recW + 2 * TEXT_OFFSET_X + 2 * FRAME_SPACE_XB + 2 * FRAME_SPACE_X;
-        recW += (recW % 2);
-
-        bitmap->DrawRectangle((bitmap->Width() - recW) / 2,
-                              (bitmap->Height() - recH) / 2,
-                              bitmap->Width() - 1 - (bitmap->Width() - recW) / 2,
-                              bitmap->Height() - 1 - (bitmap->Height() - recH) / 2,
-                              GLCD::clrWhite, true);
-        recH = recH - 2 * FRAME_SPACE_YB;
-        recW = recW - 2 * FRAME_SPACE_XB;
-        bitmap->DrawRectangle((bitmap->Width() - recW) / 2,
-                              (bitmap->Height() - recH) / 2,
-                              bitmap->Width() - 1 - (bitmap->Width() - recW) / 2,
-                              bitmap->Height() - 1 - (bitmap->Height() - recH) / 2,
-                              GLCD::clrBlack, false);
-        recH = recH - 2 * TEXT_OFFSET_Y_CHANNEL;
-        recW = recW - 2 * TEXT_OFFSET_X;
-        for (int i = 0; i < lineCount; i++)
-        {
-            bitmap->DrawText((bitmap->Width() - normalFont->Width(lines[i])) / 2,
-                             (bitmap->Height() - recH) / 2 + i * entryHeight + (normalFont->TotalHeight() - normalFont->TotalAscent()),
-                             bitmap->Width() - (bitmap->Width() - recW) / 2,
-                             lines[i], normalFont);
+            mLastState = StateReplay;
         }
     }
-}
-
-void cGraphLCDDisplay::DisplayTextItem()
-{
-    int lineCount;
-    int iEntryHeight, iLineAnz;
-    int yPos;
-    tOsdState osd;
-
-    osd = GraphLCDState->GetOsdState();
-
-    mutex.Lock();
-    if (textItemLines.size() > 0)
+    else
     {
-        lineCount = textItemLines.size();
-
-        if (GraphLCDSetup.ShowDateTime == 1 ||
-            (GraphLCDSetup.ShowDateTime == 2 && State != Menu))
-        {
-            yPos = FRAME_SPACE_Y + normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_TIME + FRAME_SPACE_YB;
-        }
-        else
-        {
-            yPos = FRAME_SPACE_Y;
-        }
-
-        // draw Text
-        iEntryHeight = normalFont->LineHeight();
-        yPos = yPos + normalFont->TotalAscent() + 2 * TEXT_OFFSET_Y_CHANNEL + FRAME_SPACE_YB;
-        if (GraphLCDSetup.ShowColorButtons &&
-            (osd.colorButton[0].length() > 0 || osd.colorButton[1].length() > 0 ||
-            osd.colorButton[2].length() > 0 || osd.colorButton[3].length() > 0))
+        if (mState != StateMenu)
         {
-            iLineAnz = (bitmap->Height() - yPos - smallFont->TotalHeight() - 4 - FRAME_SPACE_Y / 3) / iEntryHeight;
+            mState = StateNormal;
         }
         else
         {
-            iLineAnz = (bitmap->Height() - yPos) / iEntryHeight;
-        }
-
-        int startLine = textItemTop;
-        for (int i = 0; i < std::min(lineCount, iLineAnz); i++)
-        {
-            if (i + startLine < lineCount)
-                bitmap->DrawText(FRAME_SPACE_X + TEXT_OFFSET_X,
-                                 yPos + i * iEntryHeight,
-                                 bitmap->Width() - 1 - FRAME_SPACE_X,
-                                 textItemLines[i + startLine], normalFont);
-        }
-    }
-    mutex.Unlock();
-}
-
-void cGraphLCDDisplay::DisplayColorButtons()
-{
-    int i, buttonWidth, textLen;
-    int extra = 0;
-    tOsdState osd;
-
-    osd = GraphLCDState->GetOsdState();
-
-    if (GraphLCDSetup.ShowColorButtons)
-    {
-        buttonWidth = (bitmap->Width() / 4) - (FRAME_SPACE_X ? 2 * FRAME_SPACE_X : 1);
-        if (smallFont->TotalHeight() == smallFont->TotalAscent())
-            extra = 1;
-
-        for (i = 0; i < 4; i++)
-        {
-            if (osd.colorButton[i].length() > 0)
-            {
-                bitmap->DrawRoundRectangle(i * (bitmap->Width() / 4) + FRAME_SPACE_X,
-                                           bitmap->Height() - smallFont->TotalHeight() - 2 * extra - FRAME_SPACE_Y / 3,
-                                           i * (bitmap->Width() / 4) + FRAME_SPACE_X + buttonWidth - 1,
-                                           bitmap->Height() - 1 - FRAME_SPACE_Y / 3,
-                                           GLCD::clrBlack, true, std::max(1, (smallFont->TotalHeight() + 4) / 5));
-                textLen = smallFont->Width(osd.colorButton[i]);
-                if (textLen <= buttonWidth - 2)
-                {
-                    bitmap->DrawText(i * (bitmap->Width() / 4) + (bitmap->Width() / 8) - (textLen + 1) / 2,
-                                     bitmap->Height() - smallFont->TotalHeight() - extra - FRAME_SPACE_Y / 3,
-                                     i * (bitmap->Width() / 4) + FRAME_SPACE_X + buttonWidth - 1,
-                                     osd.colorButton[i], smallFont, GLCD::clrWhite);
-                }
-                else
-                {
-                    bitmap->DrawText(i * (bitmap->Width() / 4) + FRAME_SPACE_X + 1,
-                                     bitmap->Height() - smallFont->TotalHeight() - extra - FRAME_SPACE_Y / 3,
-                                     i * (bitmap->Width() / 4) + FRAME_SPACE_X + buttonWidth - 1,
-                                     osd.colorButton[i], smallFont, GLCD::clrWhite);
-                }
-            }
-        }
-    }
-}
-
-void cGraphLCDDisplay::DisplayVolume()
-{
-    int RecW, RecH;
-    tVolumeState volume;
-
-    volume = GraphLCDState->GetVolumeState();
-
-    if (GraphLCDSetup.ShowVolume)
-    {
-        if (volume.lastChange > 0)
-        {
-            if (TimeMs() - volume.lastChange < 2000)
-            {
-                RecH = (bitmap->Height() / 5) + 2 * FRAME_SPACE_YB + 4 * FRAME_SPACE_YB;
-                RecW = bitmap->Width() / 2;
-                bitmap->DrawRoundRectangle((bitmap->Width() - RecW) / 2, // draw frame
-                                           (bitmap->Height() - RecH) / 2,
-                                           bitmap->Width() - (bitmap->Width() - RecW) / 2 - 1,
-                                           bitmap->Height() - (bitmap->Height() - RecH) / 2 - 1,
-                                           GLCD::clrWhite, true, 1);
-                RecH = RecH - 2 * FRAME_SPACE_YB;
-                RecW = RecW - 2 * FRAME_SPACE_XB;
-                bitmap->DrawRoundRectangle((bitmap->Width() - RecW) / 2, // draw box
-                                           (bitmap->Height() - RecH) / 2,
-                                           bitmap->Width() - 1 - (bitmap->Width() - RecW) / 2,
-                                           bitmap->Height() - 1 - (bitmap->Height() - RecH) / 2,
-                                           GLCD::clrBlack, false, 1);
-                RecH = RecH - 2;
-                RecW = RecW - 2;
-                if (volume.value > 0)
-                    bitmap->DrawRectangle((bitmap->Width() - RecW) / 2, // draw bar
-                                          (bitmap->Height() - RecH) / 2,
-                                          (bitmap->Width() - RecW) / 2 + (volume.value * RecW) / 255,
-                                          bitmap->Height() - 1 - (bitmap->Height() - RecH) / 2,
-                                          GLCD::clrBlack, true);
-                if (volume.value == 0)
-                {
-                    // display big mute symbol
-                    bitmap->DrawCharacter(bitmap->Width() / 2 - symbols->Width('5'),
-                                          bitmap->Height() / 2 - symbols->Height('5'),
-                                          bitmap->Width() - 1, '5', symbols);
-                    bitmap->DrawCharacter(bitmap->Width() / 2,
-                                          bitmap->Height() / 2 - symbols->Height('6'),
-                                          bitmap->Width() - 1, '6', symbols);
-                    bitmap->DrawCharacter(bitmap->Width() / 2 - symbols->Width('7'),
-                                          bitmap->Height() / 2,
-                                          bitmap->Width() - 1, '7', symbols);
-                    bitmap->DrawCharacter(bitmap->Width() / 2,
-                                          bitmap->Height() / 2,
-                                          bitmap->Width() - 1, '8', symbols);
-                }
-                showVolume = true;
-            }
+            mLastState = StateNormal;
         }
     }
+    Update();
 }
 
-void cGraphLCDDisplay::UpdateIn(long usec)
+void cGraphLCDDisplay::SetMenuClear()
 {
-    if (usec == 0)
+    mSkinConfig->SetMenuClear();
+    if (mState == StateMenu)
     {
-        timerclear(&UpdateAt);
+        mState = mLastState;
+        // activate delayed Update
+        UpdateIn(100);
     }
     else
     {
-        if (gettimeofday(&CurrTimeval, NULL) == 0)
-        {
-            // get current time
-            UpdateAt.tv_sec = CurrTimeval.tv_sec;
-            UpdateAt.tv_usec = CurrTimeval.tv_usec + usec;
-            while (UpdateAt.tv_usec >= 1000000)
-            {
-                // take care of an overflow
-                UpdateAt.tv_sec++;
-                UpdateAt.tv_usec -= 1000000;
-            }
-        }
+        Update();
     }
 }
 
-
-bool cGraphLCDDisplay::CheckAndUpdateSymbols()
+void cGraphLCDDisplay::SetMenuTitle()
 {
-    bool                bRet = false;
-    static struct stat  filestat;
-    FILE*               InFile = NULL;
-    static char         szLine[8];
-
-    if (stat(FILENAME_EXTERNAL_TRIGGERED_SYMBOLS, &filestat)==0) {
-        if (LastTimeModSym != filestat.st_mtime) {
-            InFile = fopen(FILENAME_EXTERNAL_TRIGGERED_SYMBOLS, "r");
-            if (InFile) {
-                strcpy(szETSymbols, "");
-                while (!feof(InFile) && (strlen(szETSymbols)+1<sizeof(szLine))) {
-                    strcpy(szLine, "");
-                    fgets(szLine, sizeof(szLine), InFile);
-                    compactspace(szLine);
-                    if ((strlen(szLine)==2) && (szLine[1]=='1')) {
-                        strcat(szETSymbols, ".");
-                        szETSymbols[strlen(szETSymbols)-1] = szLine[0];
-                    }
-                }
-                fclose(InFile);
-                LastTimeModSym = filestat.st_mtime;
-                bRet = true;
-            }
-        }
-    } else {
-        if ((errno == ENOENT) && (strlen(szETSymbols)>0)) {
-            strcpy(szETSymbols, "");
-            bRet = true;
-        }
+    if (mState != StateMenu)
+    {
+        mLastState = mState;
+        mState = StateMenu;
     }
-    return bRet;
+    UpdateIn(100);
 }
 
-void cGraphLCDDisplay::SetBrightness()
+void cGraphLCDDisplay::SetMenuCurrent()
 {
-    mutex.Lock();
-    bool bActive = bBrightnessActive
-                   || (State == Menu)
-                   || (GraphLCDSetup.ShowVolume && showVolume)
-                   || (GraphLCDSetup.ShowMessages && GraphLCDState->GetOsdState().message.length() > 0)
-                   || (GraphLCDSetup.BrightnessDelay == 900);
-    if (bActive)
+    if (mState != StateMenu)
     {
-        LastTimeBrightness = TimeMs();
-        bBrightnessActive = false;
-    }
-    if ((bActive ? GraphLCDSetup.BrightnessActive : GraphLCDSetup.BrightnessIdle) != nCurrentBrightness)
-    {
-        if (bActive)
-        {
-            mLcd->SetBrightness(GraphLCDSetup.BrightnessActive);
-            nCurrentBrightness = GraphLCDSetup.BrightnessActive;
-        }
-        else
-        {
-            if (GraphLCDSetup.BrightnessDelay < 1
-                || ((TimeMs() - LastTimeBrightness) > (uint64_t) (GraphLCDSetup.BrightnessDelay*1000)))
-            {
-                mLcd->SetBrightness(GraphLCDSetup.BrightnessIdle);
-                nCurrentBrightness = GraphLCDSetup.BrightnessIdle;
-            }
-        }
+        mLastState = mState;
+        mState = StateMenu;
     }
-    mutex.Unlock();
+    UpdateIn(100);
 }
diff --git a/display.h b/display.h
index f5395fa..d3c2d43 100644
--- a/display.h
+++ b/display.h
@@ -10,8 +10,8 @@
  * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
  */
 
-#ifndef GRAPHLCD_DISPLAY_H
-#define GRAPHLCD_DISPLAY_H
+#ifndef _GRAPHLCD_DISPLAY_H_
+#define _GRAPHLCD_DISPLAY_H_
 
 #include <stdint.h>
 
@@ -19,27 +19,22 @@
 #include <vector>
 
 #include <glcdgraphics/bitmap.h>
-#include <glcdgraphics/font.h>
+#include <glcddrivers/driver.h>
+#include <glcdskin/skin.h>
 
 #include "global.h"
-#include "layout.h"
-#include "logolist.h"
 #include "setup.h"
 #include "state.h"
-#include "widgets.h"
+#include "skinconfig.h"
 
 #include <vdr/thread.h>
-#include <vdr/player.h>
 
 
-#define LCDMAXCARDS 4
-static const int kMaxTabCount = 10;
-
-enum ThreadState
+enum eThreadState
 {
-    Normal,
-    Replay,
-    Menu
+    StateNormal,
+    StateReplay,
+    StateMenu
 };
 
 // Display update Thread
@@ -49,104 +44,37 @@ public:
     cGraphLCDDisplay(void);
     ~cGraphLCDDisplay(void);
 
-    int Init(GLCD::cDriver * Lcd, const char * CfgDir);
-    void Tick(void);
-
-    void SetChannel(int ChannelNumber);
-    void SetClear();
-    void SetOsdTitle();
-    void SetOsdItem(const char * Text);
-    void SetOsdCurrentItem();
-    void Recording(const cDevice * Device , const char * Name);
-    void Replaying(bool starting, eReplayMode replayMode);
-    //void SetStatusMessage(const char * Msg);
-    void SetOsdTextItem(const char * Text, bool Scroll);
-    //void SetColorButtons(const char * Red, const char * Green, const char * Yellow, const char * Blue);
-    void SetVolume(int Volume, bool Absolute);
-
+    bool Initialise(GLCD::cDriver * Lcd, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName);
+    void Tick();
     void Update();
+    void Replaying(bool Starting);
+    void SetMenuClear();
+    void SetMenuTitle();
+    void SetMenuCurrent();
+    const GLCD::cBitmap * GetScreen() const { return mScreen; }
 
 protected:
     virtual void Action();
 
 private:
-    bool update;
-    bool active;
     GLCD::cDriver * mLcd;
+    GLCD::cBitmap * mScreen;
+    GLCD::cSkin * mSkin;
+    cGraphLCDSkinConfig * mSkinConfig;
+
+    bool mUpdate;
+    uint64_t mUpdateAt;
+    uint64_t mLastTimeMs;
+
+    eThreadState mState;
+    eThreadState mLastState;
+
+    cMutex mMutex;
+    cGraphLCDState * mGraphLCDState;
+
+    bool mShowVolume;
 
-    cFontList fontList;
-    GLCD::cBitmap * bitmap;
-    const GLCD::cFont * largeFont;
-    const GLCD::cFont * normalFont;
-    const GLCD::cFont * smallFont;
-    const GLCD::cFont * symbols;
-    std::string cfgDir;
-    std::string fontDir;
-    std::string logoDir;
-
-    ThreadState State;
-    ThreadState LastState;
-
-    cMutex mutex;
-    cGraphLCDState * GraphLCDState;
-
-    int menuTop;
-    int menuCount;
-    int tabCount;
-    int tab[kMaxTabCount];
-    int tabMax[kMaxTabCount];
-
-    std::vector <std::string> textItemLines;
-    int textItemTop;
-    int textItemVisibleLines;
-
-    bool showVolume;
-
-    time_t CurrTime;
-    time_t LastTime;
-    time_t LastTimeCheckSym;
-    time_t LastTimeModSym;
-    struct timeval CurrTimeval;
-    struct timeval UpdateAt;
-
-    std::vector<cScroller> scroller;
-
-    cGraphLCDLogoList * logoList;
-    cGraphLCDLogo * logo;
-
-    char szETSymbols[32];
-
-    void DisplayChannel();
-    void DisplayTime();
-    void DisplayLogo();
-    void DisplaySymbols();
-    void DisplayProgramme();
-    void DisplayReplay(tReplayState & replay);
-    void DisplayMenu();
-    void DisplayMessage();
-    void DisplayTextItem();
-    void DisplayColorButtons();
-    void DisplayVolume();
-
-    void UpdateIn(long usec);
-    bool CheckAndUpdateSymbols();
-
-    /** Check if replay index bigger as one hour */
-    bool IndexIsGreaterAsOneHour(int Index) const;
-    /** Translate replay index to string with minute and second MM:SS */
-    const char *IndexToMS(int Index) const;
-    /** Compare Scroller with new Textbuffer*/
-    bool IsScrollerTextChanged(const std::vector<cScroller> & scroller, const std::vector <std::string> & lines) const;
-    /** Returns true if Logo loaded and active*/
-    bool IsLogoActive() const;
-    /** Returns true if Symbols loaded and active*/
-    bool IsSymbolsActive() const;
-
-    /** Set Brightness depends user activity */
-    void SetBrightness();
-    uint64_t LastTimeBrightness;
-    int nCurrentBrightness;
-    bool bBrightnessActive;
+    void UpdateIn(uint64_t msec);
 };
 
 #endif
diff --git a/global.h b/global.h
index a810180..a2f031d 100644
--- a/global.h
+++ b/global.h
@@ -13,17 +13,8 @@
 #ifndef _GRAPHLCD_GLOBAL_H_
 #define _GRAPHLCD_GLOBAL_H_
 
-
 #include <stdlib.h>
 
-#include <glcddrivers/driver.h>
-
-
-#define PLUGIN_NAME "graphlcd"
-#define SPACEWIDTH  2
-
-#define FREENULL(p) (free (p), p = NULL)
-
 template<class T> inline void clip(T & value, T min, T max)
 {
     if (value < min) value = min;
diff --git a/graphlcd/logonames.alias.1.3 b/graphlcd/channels.alias
index c9e219f..c9e219f 100644
--- a/graphlcd/logonames.alias.1.3
+++ b/graphlcd/channels.alias
diff --git a/graphlcd/fonts.conf b/graphlcd/fonts.conf
deleted file mode 120000
index 0df1c43..0000000
--- a/graphlcd/fonts.conf
+++ /dev/null
@@ -1 +0,0 @@
-fonts.conf.large
\ No newline at end of file
diff --git a/graphlcd/fonts.conf.large b/graphlcd/fonts.conf.large
deleted file mode 100644
index e976638..0000000
--- a/graphlcd/fonts.conf.large
+++ /dev/null
@@ -1,4 +0,0 @@
-Large Font = fnt:verdana-018.fnt
-Normal Font = fnt:verdanab-013.fnt
-Small Font = fnt:verdanab-009.fnt
-Symbol Font = fnt:sym11.fnt
diff --git a/graphlcd/fonts.conf.medium b/graphlcd/fonts.conf.medium
deleted file mode 100644
index 3ffe9c8..0000000
--- a/graphlcd/fonts.conf.medium
+++ /dev/null
@@ -1,4 +0,0 @@
-Large Font = fnt:f12bn.fnt
-Normal Font = fnt:f8n.fnt
-Small Font = fnt:f5n.fnt
-Symbol Font = fnt:sym7.fnt
diff --git a/graphlcd/fonts.conf.small b/graphlcd/fonts.conf.small
deleted file mode 100644
index 3ffe9c8..0000000
--- a/graphlcd/fonts.conf.small
+++ /dev/null
@@ -1,4 +0,0 @@
-Large Font = fnt:f12bn.fnt
-Normal Font = fnt:f8n.fnt
-Small Font = fnt:f5n.fnt
-Symbol Font = fnt:sym7.fnt
diff --git a/graphlcd/fonts.conf.tiny b/graphlcd/fonts.conf.tiny
deleted file mode 100644
index e289421..0000000
--- a/graphlcd/fonts.conf.tiny
+++ /dev/null
@@ -1,4 +0,0 @@
-Large Font = fnt:f8b.fnt
-Normal Font = fnt:f8n.fnt
-Small Font = fnt:f5n.fnt
-Symbol Font = fnt:sym7.fnt
diff --git a/graphlcd/fonts.conf.ttf b/graphlcd/fonts.conf.ttf
deleted file mode 100644
index b53dc5e..0000000
--- a/graphlcd/fonts.conf.ttf
+++ /dev/null
@@ -1,4 +0,0 @@
-Large Font = ft2:verdana.ttf:18
-Normal Font = ft2:verdanab.ttf:13
-Small Font = ft2:verdanab.ttf:9
-Symbol Font = fnt:sym11.fnt
diff --git a/graphlcd/fonts/f12b.fnt b/graphlcd/fonts/f12b.fnt
index ca2776d..c5379ff 100644
--- a/graphlcd/fonts/f12b.fnt
+++ b/graphlcd/fonts/f12b.fnt
diff --git a/graphlcd/fonts/f12bn.fnt b/graphlcd/fonts/f12bn.fnt
index bf7f41e..55899a9 100644
--- a/graphlcd/fonts/f12bn.fnt
+++ b/graphlcd/fonts/f12bn.fnt
diff --git a/graphlcd/fonts/f17b.fnt b/graphlcd/fonts/f17b.fnt
index a025765..a6c0e78 100644
--- a/graphlcd/fonts/f17b.fnt
+++ b/graphlcd/fonts/f17b.fnt
diff --git a/graphlcd/fonts/f5n.fnt b/graphlcd/fonts/f5n.fnt
index 9e8814b..cc151e5 100644
--- a/graphlcd/fonts/f5n.fnt
+++ b/graphlcd/fonts/f5n.fnt
diff --git a/graphlcd/fonts/f8b.fnt b/graphlcd/fonts/f8b.fnt
index ea6cc08..a9c882b 100644
--- a/graphlcd/fonts/f8b.fnt
+++ b/graphlcd/fonts/f8b.fnt
diff --git a/graphlcd/fonts/f8n.fnt b/graphlcd/fonts/f8n.fnt
index fdd0362..8663403 100644
--- a/graphlcd/fonts/f8n.fnt
+++ b/graphlcd/fonts/f8n.fnt
diff --git a/graphlcd/fonts/verdana-012.fnt b/graphlcd/fonts/verdana-012.fnt
new file mode 100644
index 0000000..538d9f2
--- /dev/null
+++ b/graphlcd/fonts/verdana-012.fnt
diff --git a/graphlcd/fonts/verdana-014.fnt b/graphlcd/fonts/verdana-014.fnt
new file mode 100644
index 0000000..2603797
--- /dev/null
+++ b/graphlcd/fonts/verdana-014.fnt
diff --git a/graphlcd/fonts/verdana-015.fnt b/graphlcd/fonts/verdana-015.fnt
new file mode 100644
index 0000000..bf501f5
--- /dev/null
+++ b/graphlcd/fonts/verdana-015.fnt
diff --git a/graphlcd/fonts/verdana-022.fnt b/graphlcd/fonts/verdana-022.fnt
new file mode 100644
index 0000000..fd62316
--- /dev/null
+++ b/graphlcd/fonts/verdana-022.fnt
diff --git a/graphlcd/logonames.alias b/graphlcd/logonames.alias
deleted file mode 120000
index b47422c..0000000
--- a/graphlcd/logonames.alias
+++ /dev/null
@@ -1 +0,0 @@
-logonames.alias.1.3
\ No newline at end of file
diff --git a/graphlcd/logonames.alias.1.2 b/graphlcd/logonames.alias.1.2
deleted file mode 100644
index a73e53a..0000000
--- a/graphlcd/logonames.alias.1.2
+++ /dev/null
@@ -1,301 +0,0 @@
-8:PREMIERE START

-9:PREMIERE4

-10:PREMIERE1

-11:PREMIERE2

-12:ANIMAL PLANET

-13:PLANET

-14:DISCOVERY CHANNEL

-15:CLASSICA

-16:PREMIERE SERIE

-17:PREMIERE SPORT1

-18:PREMIERE DIREKT PORTAL

-19:JUNIOR

-20:PREMIERE7

-21:BEATE-UHSE.TV

-22:HEIMATKANAL

-23:PREMIERE KRIMI

-27:PREMIERE SPORT2

-28:FOX KIDS

-29:REMIERE5

-32:SONNENKLAR TV

-34:DISNEY CHANNEL

-40:HSE24

-41:PREMIERE6

-42:13TH STREET

-43:PREMIERE3

-46:SAT1

-47:N24

-48:SAT1 SCHWEIZ

-51:TELE 5

-53:PREMIERE AUSTRIA

-54:LASTMINUTE

-160:ROCK ANTENNE

-161:ERF RADIO

-169:SUNSHINE LIVE

-170:ANTENNE BAYERN

-208:PREMIERE DIREKT 2

-209:PREMIERE DIREKT 3

-210:PREMIERE DIREKT 3

-211:PREMIERE DIREKT 3

-212:PREMIERE DIREKT 3

-240:PREMIERE DIREKT 1

-241:PREMIERE DIREKT 1

-242:PREMIERE DIREKT 1

-243:PREMIERE DIREKT 2

-244:PREMIERE DIREKT 2

-245:PREMIERE DIREKT 2

-513:PREMIERE EROTIK

-514:ONTV

-515:MGM

-516:PREMIERE NOSTALGIE

-518:GOLDSTAR TV

-769:TV TRAVEL SHOP

-772:TV BERLIN

-775:FRANKEN SAT

-778:PREMIERE EROTIK 1

-779:PREMIERE EROTIK 2

-897:NEUN LIVE

-898:PRO SIEBEN

-899:KABEL 1

-900:DSF

-2004:RTL4

-2005:RTL5

-2020:ANIMAL PLANET

-2025:EUROSPORT

-2030:BBC PRIME

-2035:HALLMARK

-2051:RTL RADIO

-3982:RTBF SAT

-3994:RTL TELE LETZEBURG

-4009:X-ZONE

-4011:NED1

-4012:NED2

-4013:NED3

-4020:YAM FM

-4030:RTL FM

-5004:NET5

-5005:SBS6

-5015:TMF

-5025:BVN

-5050:YORIN FM

-5055:KINK FM

-5070:SKY RADIO NL

-5072:RADIO 538

-5085:RADIO 10 GOLD

-5095:VERONICA RADIO

-7268:OTTO SHOP

-8004:EURONEWS

-8151:EUROSPORT

-8156:LCI

-8353:KTO

-8355:MATCH TV

-8501:FRANCE5

-8505:BLOOMBERG TV

-8506:LCP

-8529:RIRE ET CHANSONS

-8536:NRJ

-8537:EUROPE 2

-8544:VIBRATION

-8545:CONTACT FM

-8548:CHERIE FM

-8549:ALOUETTE

-8550:VOLTAGE

-8552:ADO FM

-8553:RSR COULEUR 3

-8559:MEDIA TROPICAL

-8612:CANAL CLUB

-8613:BEUR TV

-8801:FRANCE2

-8802:FRANCE3

-8906:DISNEY CHANNEL

-8907:PLAYHOUSE DISNEY

-8910:MOTORS TV

-9011:ALGERIE

-9012:TV5 EUROPE

-9014:ESC1-EGYPT

-9015:RAI 1

-9017:RTP INT

-9018:TV7

-9019:ARTE

-9021:AL JAZEERA

-9030:2M MAROC

-9301:FESTIVAL

-9302:HISTOIRE

-9307:LIVE 1

-10001:TVE INT

-10002:RTM-MAROC

-10010:EUROSPORT

-10020:DW-TV

-10030:CNBC EUROPE

-12003:RTL TELEVISION

-12020:RTL 2

-12040:SUPER RTL

-12060:VOX

-12080:RTL SHOP

-12085:RTL AUSTRIA

-12100:QVC GERMANY

-12120:VIVA PLUS

-12160:BLOOMBERG TV

-12199:LIBERTY TV

-12200:CNBC EUROPE

-12240:TV5 EUROPE

-12280:LIBERTY TV

-12301:TV6

-12320:WISHLINE

-12340:BBC WORLD

-12341:CFN RFC

-12600:BAHN TV

-12601:K-TV

-12602:XXP

-12614:RHEIN MAIN TV

-12650:RADIO MARIA

-12660:HITRADIO FFH

-12661:PLANET RADIO

-12662:HARMONY FM

-12730:N-TV

-12732:VIVA

-12750:HOERZU DIGITAL

-13001:ORF 1

-13002:ORF 2

-13003:ORF 2 WIEN

-13004:ORF 2 NIEDEROESTERREICH

-13005:ORF 2 BURGENLAND

-13006:ORF 2 OBEROESTERREICH

-13007:ORF 2 SALZBURG

-13008:ORF 2 TIROL

-13009:ORF 2 VORARLBERG

-13010:ORF 2 STEIERMARK

-13011:ORF 2 KAERNTEN

-13012:ATVPLUS

-13013:TW1

-13021:OESTERREICH 1

-13033:OESTERREICH 3

-13034:FM4

-17020:AB MOTEURS

-17021:AB1

-17022:ANIMAUX

-17024:ZIK

-17027:BBC WORLD

-17028:RFM-TV

-17029:FASHION TV

-17030:ACTION

-17032:CINE BOX

-20001:PRO SIEBEN SCHWEIZ

-20002:PRO SIEBEN AUSTRIA

-20003:KABEL 1 SCHWEIZ

-20004:KABEL 1 AUSTRIA

-20005:SAT1 AUSTRIA

-20312:ANIMAL PLANET

-20316:FOX KIDS

-20319:HALLMARK

-20321:EUROSPORT

-20322:MTV CENTRAL

-20323:HALLMARK

-20328:BBC PRIME

-28006:ZDF

-28007:3SAT

-28008:KIKA

-28009:EUROSPORT

-28011:ZDF INFOKANAL

-28012:DEUTSCHKANDRADIO BERLIN

-28013:DEUTSCHLANDFUNK KOELN

-28014:ZDF DOKUKANAL

-28015:EURONEWS

-28016:ZDF THEATERKANAL

-28017:OESTERREICH 1

-28106:DAS ERSTE

-28107:BAYERISCHES FERNSEHEN

-28108:HESSEN FERNSEHEN

-28109:ARTE

-28110:SR FERNSEHEN SW

-28111:WDR

-28112:BR-ALPHA

-28113:SUEDWEST FS BW

-28114:PHOENIX

-28120:BAYERN4 KLASSIK

-28121:B5 AKTUELL

-28122:HR SKYLINE

-28123:HR2

-28124:HR KLASSIK

-28125:YOU FM

-28126:BAYERN1

-28127:NDR INFO

-28128:NORDWEST RADIO

-28129:SR 1

-28201:EINS EXTRA

-28202:EINS FESTIVAL

-28203:EINS MUXX

-28204:MDR FERNSEHEN

-28205:RBB BRANDENBURG

-28206:RBB BERLIN

-28207:NDR KULTUR

-28208:MDR FIGARO

-28209:FRITZ

-28210:JUMP

-28211:MDR INFO

-28212:SPUTNIK

-28213:RADIO MULTIKULTI

-28214:SWR2

-28215:WDR3

-28216:WDR5

-28224:NDR FERNSEHEN MV

-28225:NDR FERNSEHEN HH

-28226:NDR FERNSEHEN NDS

-28227:NDR FERNSEHEN SH

-28228:MDR FERNSEHEN S

-28229:MDR FERNSEHEN SA

-28230:MDR FERNSEHEN TH

-28231:SUEDWEST FS RP

-28305:WDR

-28306:WDR

-28307:WDR

-28308:WDR

-28309:WDR

-28310:WDR

-28311:WDR

-28312:WDR

-28521:CARTOON NETWORK

-28522:CNN INT

-28640:MTV 2 POP CHANNEL

-28652:MTV F

-28653:MTV CENTRAL

-28654:MTV HITS

-28655:MTV BASE

-28656:VH1

-28657:VH1 CLASSIC

-28658:NICKELODEON

-28659:MTV 2

-28664:MTV HITS

-28665:MTV BASE

-28666:VH1

-28669:MTV 2

-28800:RTL AUSTRIA

-28805:VOX AUSTRIA

-28810:RTL 2 AUSTRIA

-28815:SUPER RTL AUSTRIA

-29801:FOX KIDS

-29802:DISNEY CHANNEL

-29803:PLAYHOUSE DISNEY

-29955:FOX

-29956:AXN

-29963:CADENA DIAL

-30051:REALMADRID TV

-30201:TVC INT

-30210:CNN+

-30222:TV GALICIA

-30400:CANAL+

-30403:DISNEY CHANNEL

-30405:40 TV

-30500:CARTOON NETWORK

-30503:EUROSPORT

-30602:CANAL+ ...30

-30603:PLAYBOY

-30611:FOX NEWS

-31210:BTV

-31230:TV6

-61900:BIBEL TV

-61911:TRW AM

-61912:RADIO MARIA

-61920:TANGO TV

-61963:RAZE TV

-61980:FREE-X TV

diff --git a/graphlcd/logos/1-2-3 TV_l.glcd b/graphlcd/logos/channels/1-2-3 TV_l.glcd
index ddb538f..ddb538f 100644
--- a/graphlcd/logos/1-2-3 TV_l.glcd
+++ b/graphlcd/logos/channels/1-2-3 TV_l.glcd
diff --git a/graphlcd/logos/123SAT_l.glcd b/graphlcd/logos/channels/123SAT_l.glcd
index 84ed40f..84ed40f 100644
--- a/graphlcd/logos/123SAT_l.glcd
+++ b/graphlcd/logos/channels/123SAT_l.glcd
diff --git a/graphlcd/logos/13TH STREET_l.glcd b/graphlcd/logos/channels/13TH STREET_l.glcd
index 6c1186e..6c1186e 100644
--- a/graphlcd/logos/13TH STREET_l.glcd
+++ b/graphlcd/logos/channels/13TH STREET_l.glcd
diff --git a/graphlcd/logos/13TH STREET_m.glcd b/graphlcd/logos/channels/13TH STREET_m.glcd
index 99967b7..99967b7 100644
--- a/graphlcd/logos/13TH STREET_m.glcd
+++ b/graphlcd/logos/channels/13TH STREET_m.glcd
diff --git a/graphlcd/logos/2M MAROC_m.glcd b/graphlcd/logos/channels/2M MAROC_m.glcd
index 07b58c7..07b58c7 100644
--- a/graphlcd/logos/2M MAROC_m.glcd
+++ b/graphlcd/logos/channels/2M MAROC_m.glcd
diff --git a/graphlcd/logos/3NET_l.glcd b/graphlcd/logos/channels/3NET_l.glcd
index 373524f..373524f 100644
--- a/graphlcd/logos/3NET_l.glcd
+++ b/graphlcd/logos/channels/3NET_l.glcd
diff --git a/graphlcd/logos/3NET_m.glcd b/graphlcd/logos/channels/3NET_m.glcd
index c3c3d15..c3c3d15 100644
--- a/graphlcd/logos/3NET_m.glcd
+++ b/graphlcd/logos/channels/3NET_m.glcd
diff --git a/graphlcd/logos/3SAT_l.glcd b/graphlcd/logos/channels/3SAT_l.glcd
index 2e6a090..2e6a090 100644
--- a/graphlcd/logos/3SAT_l.glcd
+++ b/graphlcd/logos/channels/3SAT_l.glcd
diff --git a/graphlcd/logos/3SAT_m.glcd b/graphlcd/logos/channels/3SAT_m.glcd
index 0e36114..0e36114 100644
--- a/graphlcd/logos/3SAT_m.glcd
+++ b/graphlcd/logos/channels/3SAT_m.glcd
diff --git a/graphlcd/logos/40 TV_m.glcd b/graphlcd/logos/channels/40 TV_m.glcd
index d5b2b32..d5b2b32 100644
--- a/graphlcd/logos/40 TV_m.glcd
+++ b/graphlcd/logos/channels/40 TV_m.glcd
diff --git a/graphlcd/logos/AB MOTEURS_l.glcd b/graphlcd/logos/channels/AB MOTEURS_l.glcd
index 30cd306..30cd306 100644
--- a/graphlcd/logos/AB MOTEURS_l.glcd
+++ b/graphlcd/logos/channels/AB MOTEURS_l.glcd
diff --git a/graphlcd/logos/AB MOTEURS_m.glcd b/graphlcd/logos/channels/AB MOTEURS_m.glcd
index 295a143..295a143 100644
--- a/graphlcd/logos/AB MOTEURS_m.glcd
+++ b/graphlcd/logos/channels/AB MOTEURS_m.glcd
diff --git a/graphlcd/logos/AB1_l.glcd b/graphlcd/logos/channels/AB1_l.glcd
index 5512b78..5512b78 100644
--- a/graphlcd/logos/AB1_l.glcd
+++ b/graphlcd/logos/channels/AB1_l.glcd
diff --git a/graphlcd/logos/AB1_m.glcd b/graphlcd/logos/channels/AB1_m.glcd
index 8dbea74..8dbea74 100644
--- a/graphlcd/logos/AB1_m.glcd
+++ b/graphlcd/logos/channels/AB1_m.glcd
diff --git a/graphlcd/logos/ACTION_m.glcd b/graphlcd/logos/channels/ACTION_m.glcd
index 202f153..202f153 100644
--- a/graphlcd/logos/ACTION_m.glcd
+++ b/graphlcd/logos/channels/ACTION_m.glcd
diff --git a/graphlcd/logos/ADO FM_l.glcd b/graphlcd/logos/channels/ADO FM_l.glcd
index de4b32c..de4b32c 100644
--- a/graphlcd/logos/ADO FM_l.glcd
+++ b/graphlcd/logos/channels/ADO FM_l.glcd
diff --git a/graphlcd/logos/ADO FM_m.glcd b/graphlcd/logos/channels/ADO FM_m.glcd
index 8c0b06c..8c0b06c 100644
--- a/graphlcd/logos/ADO FM_m.glcd
+++ b/graphlcd/logos/channels/ADO FM_m.glcd
diff --git a/graphlcd/logos/AL JAZEERA_l.glcd b/graphlcd/logos/channels/AL JAZEERA_l.glcd
index 76ba7c8..76ba7c8 100644
--- a/graphlcd/logos/AL JAZEERA_l.glcd
+++ b/graphlcd/logos/channels/AL JAZEERA_l.glcd
diff --git a/graphlcd/logos/AL JAZEERA_m.glcd b/graphlcd/logos/channels/AL JAZEERA_m.glcd
index 54132b6..54132b6 100644
--- a/graphlcd/logos/AL JAZEERA_m.glcd
+++ b/graphlcd/logos/channels/AL JAZEERA_m.glcd
diff --git a/graphlcd/logos/ALGERIE_l.glcd b/graphlcd/logos/channels/ALGERIE_l.glcd
index 941578e..941578e 100644
--- a/graphlcd/logos/ALGERIE_l.glcd
+++ b/graphlcd/logos/channels/ALGERIE_l.glcd
diff --git a/graphlcd/logos/ALGERIE_m.glcd b/graphlcd/logos/channels/ALGERIE_m.glcd
index 387c98f..387c98f 100644
--- a/graphlcd/logos/ALGERIE_m.glcd
+++ b/graphlcd/logos/channels/ALGERIE_m.glcd
diff --git a/graphlcd/logos/ALOUETTE_l.glcd b/graphlcd/logos/channels/ALOUETTE_l.glcd
index 03f5cc4..03f5cc4 100644
--- a/graphlcd/logos/ALOUETTE_l.glcd
+++ b/graphlcd/logos/channels/ALOUETTE_l.glcd
diff --git a/graphlcd/logos/ALOUETTE_m.glcd b/graphlcd/logos/channels/ALOUETTE_m.glcd
index e1b8c38..e1b8c38 100644
--- a/graphlcd/logos/ALOUETTE_m.glcd
+++ b/graphlcd/logos/channels/ALOUETTE_m.glcd
diff --git a/graphlcd/logos/ANIMAL PLANET_l.glcd b/graphlcd/logos/channels/ANIMAL PLANET_l.glcd
index bf7bf4b..bf7bf4b 100644
--- a/graphlcd/logos/ANIMAL PLANET_l.glcd
+++ b/graphlcd/logos/channels/ANIMAL PLANET_l.glcd
diff --git a/graphlcd/logos/ANIMAL PLANET_m.glcd b/graphlcd/logos/channels/ANIMAL PLANET_m.glcd
index 7c5cf8f..7c5cf8f 100644
--- a/graphlcd/logos/ANIMAL PLANET_m.glcd
+++ b/graphlcd/logos/channels/ANIMAL PLANET_m.glcd
diff --git a/graphlcd/logos/ANIMAUX_l.glcd b/graphlcd/logos/channels/ANIMAUX_l.glcd
index da5b6a5..da5b6a5 100644
--- a/graphlcd/logos/ANIMAUX_l.glcd
+++ b/graphlcd/logos/channels/ANIMAUX_l.glcd
diff --git a/graphlcd/logos/ANTENNE BAYERN_l.glcd b/graphlcd/logos/channels/ANTENNE BAYERN_l.glcd
index b38bfaf..b38bfaf 100644
--- a/graphlcd/logos/ANTENNE BAYERN_l.glcd
+++ b/graphlcd/logos/channels/ANTENNE BAYERN_l.glcd
diff --git a/graphlcd/logos/ANTENNE BAYERN_m.glcd b/graphlcd/logos/channels/ANTENNE BAYERN_m.glcd
index 2bca2b4..2bca2b4 100644
--- a/graphlcd/logos/ANTENNE BAYERN_m.glcd
+++ b/graphlcd/logos/channels/ANTENNE BAYERN_m.glcd
diff --git a/graphlcd/logos/ANTENNE BAYERN_v2_m.glcd b/graphlcd/logos/channels/ANTENNE BAYERN_v2_m.glcd
index 9ca0433..9ca0433 100644
--- a/graphlcd/logos/ANTENNE BAYERN_v2_m.glcd
+++ b/graphlcd/logos/channels/ANTENNE BAYERN_v2_m.glcd
diff --git a/graphlcd/logos/ARTE_l.glcd b/graphlcd/logos/channels/ARTE_l.glcd
index c2f575e..c2f575e 100644
--- a/graphlcd/logos/ARTE_l.glcd
+++ b/graphlcd/logos/channels/ARTE_l.glcd
diff --git a/graphlcd/logos/ARTE_m.glcd b/graphlcd/logos/channels/ARTE_m.glcd
index ca150b1..ca150b1 100644
--- a/graphlcd/logos/ARTE_m.glcd
+++ b/graphlcd/logos/channels/ARTE_m.glcd
diff --git a/graphlcd/logos/ATVPLUS_l.glcd b/graphlcd/logos/channels/ATVPLUS_l.glcd
index 6751fc1..6751fc1 100644
--- a/graphlcd/logos/ATVPLUS_l.glcd
+++ b/graphlcd/logos/channels/ATVPLUS_l.glcd
diff --git a/graphlcd/logos/ATVPLUS_m.glcd b/graphlcd/logos/channels/ATVPLUS_m.glcd
index a5bc829..a5bc829 100644
--- a/graphlcd/logos/ATVPLUS_m.glcd
+++ b/graphlcd/logos/channels/ATVPLUS_m.glcd
diff --git a/graphlcd/logos/AXN_l.glcd b/graphlcd/logos/channels/AXN_l.glcd
index 8eb1880..8eb1880 100644
--- a/graphlcd/logos/AXN_l.glcd
+++ b/graphlcd/logos/channels/AXN_l.glcd
diff --git a/graphlcd/logos/AXN_m.glcd b/graphlcd/logos/channels/AXN_m.glcd
index ddfd81a..ddfd81a 100644
--- a/graphlcd/logos/AXN_m.glcd
+++ b/graphlcd/logos/channels/AXN_m.glcd
diff --git a/graphlcd/logos/B5 AKTUELL_l.glcd b/graphlcd/logos/channels/B5 AKTUELL_l.glcd
index 95830b7..95830b7 100644
--- a/graphlcd/logos/B5 AKTUELL_l.glcd
+++ b/graphlcd/logos/channels/B5 AKTUELL_l.glcd
diff --git a/graphlcd/logos/B5 AKTUELL_m.glcd b/graphlcd/logos/channels/B5 AKTUELL_m.glcd
index 6c8a481..6c8a481 100644
--- a/graphlcd/logos/B5 AKTUELL_m.glcd
+++ b/graphlcd/logos/channels/B5 AKTUELL_m.glcd
diff --git a/graphlcd/logos/B5 AKTUELL_v2_m.glcd b/graphlcd/logos/channels/B5 AKTUELL_v2_m.glcd
index 554903a..554903a 100644
--- a/graphlcd/logos/B5 AKTUELL_v2_m.glcd
+++ b/graphlcd/logos/channels/B5 AKTUELL_v2_m.glcd
diff --git a/graphlcd/logos/BAHN TV_l.glcd b/graphlcd/logos/channels/BAHN TV_l.glcd
index bf92d26..bf92d26 100644
--- a/graphlcd/logos/BAHN TV_l.glcd
+++ b/graphlcd/logos/channels/BAHN TV_l.glcd
diff --git a/graphlcd/logos/BAHN TV_m.glcd b/graphlcd/logos/channels/BAHN TV_m.glcd
index cef8da8..cef8da8 100644
--- a/graphlcd/logos/BAHN TV_m.glcd
+++ b/graphlcd/logos/channels/BAHN TV_m.glcd
diff --git a/graphlcd/logos/BAHN TV_v2_m.glcd b/graphlcd/logos/channels/BAHN TV_v2_m.glcd
index fea2765..fea2765 100644
--- a/graphlcd/logos/BAHN TV_v2_m.glcd
+++ b/graphlcd/logos/channels/BAHN TV_v2_m.glcd
diff --git a/graphlcd/logos/BAYERISCHES FERNSEHEN_l.glcd b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_l.glcd
index c0b93e6..c0b93e6 100644
--- a/graphlcd/logos/BAYERISCHES FERNSEHEN_l.glcd
+++ b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_l.glcd
diff --git a/graphlcd/logos/BAYERISCHES FERNSEHEN_m.glcd b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_m.glcd
index a224e95..a224e95 100644
--- a/graphlcd/logos/BAYERISCHES FERNSEHEN_m.glcd
+++ b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_m.glcd
diff --git a/graphlcd/logos/BAYERISCHES FERNSEHEN_v2_l.glcd b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_v2_l.glcd
index ad7d919..ad7d919 100644
--- a/graphlcd/logos/BAYERISCHES FERNSEHEN_v2_l.glcd
+++ b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_v2_l.glcd
diff --git a/graphlcd/logos/BAYERISCHES FERNSEHEN_v2_m.glcd b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_v2_m.glcd
index 9b6b4f2..9b6b4f2 100644
--- a/graphlcd/logos/BAYERISCHES FERNSEHEN_v2_m.glcd
+++ b/graphlcd/logos/channels/BAYERISCHES FERNSEHEN_v2_m.glcd
diff --git a/graphlcd/logos/BAYERN1_l.glcd b/graphlcd/logos/channels/BAYERN1_l.glcd
index e308876..e308876 100644
--- a/graphlcd/logos/BAYERN1_l.glcd
+++ b/graphlcd/logos/channels/BAYERN1_l.glcd
diff --git a/graphlcd/logos/BAYERN1_m.glcd b/graphlcd/logos/channels/BAYERN1_m.glcd
index e3bf771..e3bf771 100644
--- a/graphlcd/logos/BAYERN1_m.glcd
+++ b/graphlcd/logos/channels/BAYERN1_m.glcd
diff --git a/graphlcd/logos/BAYERN4 KLASSIK_l.glcd b/graphlcd/logos/channels/BAYERN4 KLASSIK_l.glcd
index 72670c2..72670c2 100644
--- a/graphlcd/logos/BAYERN4 KLASSIK_l.glcd
+++ b/graphlcd/logos/channels/BAYERN4 KLASSIK_l.glcd
diff --git a/graphlcd/logos/BAYERN4 KLASSIK_m.glcd b/graphlcd/logos/channels/BAYERN4 KLASSIK_m.glcd
index d6d720d..d6d720d 100644
--- a/graphlcd/logos/BAYERN4 KLASSIK_m.glcd
+++ b/graphlcd/logos/channels/BAYERN4 KLASSIK_m.glcd
diff --git a/graphlcd/logos/BBC PRIME_l.glcd b/graphlcd/logos/channels/BBC PRIME_l.glcd
index c53afba..c53afba 100644
--- a/graphlcd/logos/BBC PRIME_l.glcd
+++ b/graphlcd/logos/channels/BBC PRIME_l.glcd
diff --git a/graphlcd/logos/BBC PRIME_m.glcd b/graphlcd/logos/channels/BBC PRIME_m.glcd
index 0ea7b4d..0ea7b4d 100644
--- a/graphlcd/logos/BBC PRIME_m.glcd
+++ b/graphlcd/logos/channels/BBC PRIME_m.glcd
diff --git a/graphlcd/logos/BBC WORLD_l.glcd b/graphlcd/logos/channels/BBC WORLD_l.glcd
index 8c4c191..8c4c191 100644
--- a/graphlcd/logos/BBC WORLD_l.glcd
+++ b/graphlcd/logos/channels/BBC WORLD_l.glcd
diff --git a/graphlcd/logos/BBC WORLD_m.glcd b/graphlcd/logos/channels/BBC WORLD_m.glcd
index 71b132f..71b132f 100644
--- a/graphlcd/logos/BBC WORLD_m.glcd
+++ b/graphlcd/logos/channels/BBC WORLD_m.glcd
diff --git a/graphlcd/logos/BBC WORLD_v2_l.glcd b/graphlcd/logos/channels/BBC WORLD_v2_l.glcd
index ccf90a2..ccf90a2 100644
--- a/graphlcd/logos/BBC WORLD_v2_l.glcd
+++ b/graphlcd/logos/channels/BBC WORLD_v2_l.glcd
diff --git a/graphlcd/logos/BBC WORLD_v2_m.glcd b/graphlcd/logos/channels/BBC WORLD_v2_m.glcd
index 7c52215..7c52215 100644
--- a/graphlcd/logos/BBC WORLD_v2_m.glcd
+++ b/graphlcd/logos/channels/BBC WORLD_v2_m.glcd
diff --git a/graphlcd/logos/BEATE-UHSE.TV_l.glcd b/graphlcd/logos/channels/BEATE-UHSE.TV_l.glcd
index 0040c04..0040c04 100644
--- a/graphlcd/logos/BEATE-UHSE.TV_l.glcd
+++ b/graphlcd/logos/channels/BEATE-UHSE.TV_l.glcd
diff --git a/graphlcd/logos/BEATE-UHSE.TV_m.glcd b/graphlcd/logos/channels/BEATE-UHSE.TV_m.glcd
index 40a8589..40a8589 100644
--- a/graphlcd/logos/BEATE-UHSE.TV_m.glcd
+++ b/graphlcd/logos/channels/BEATE-UHSE.TV_m.glcd
diff --git a/graphlcd/logos/BEATE-UHSE.TV_v2_l.glcd b/graphlcd/logos/channels/BEATE-UHSE.TV_v2_l.glcd
index 7981193..7981193 100644
--- a/graphlcd/logos/BEATE-UHSE.TV_v2_l.glcd
+++ b/graphlcd/logos/channels/BEATE-UHSE.TV_v2_l.glcd
diff --git a/graphlcd/logos/BEUR TV_l.glcd b/graphlcd/logos/channels/BEUR TV_l.glcd
index 314a4b0..314a4b0 100644
--- a/graphlcd/logos/BEUR TV_l.glcd
+++ b/graphlcd/logos/channels/BEUR TV_l.glcd
diff --git a/graphlcd/logos/BEUR TV_m.glcd b/graphlcd/logos/channels/BEUR TV_m.glcd
index 3caa32d..3caa32d 100644
--- a/graphlcd/logos/BEUR TV_m.glcd
+++ b/graphlcd/logos/channels/BEUR TV_m.glcd
diff --git a/graphlcd/logos/BEUR TV_v2_m.glcd b/graphlcd/logos/channels/BEUR TV_v2_m.glcd
index 07f548e..07f548e 100644
--- a/graphlcd/logos/BEUR TV_v2_m.glcd
+++ b/graphlcd/logos/channels/BEUR TV_v2_m.glcd
diff --git a/graphlcd/logos/BIBEL TV_l.glcd b/graphlcd/logos/channels/BIBEL TV_l.glcd
index 3b62042..3b62042 100644
--- a/graphlcd/logos/BIBEL TV_l.glcd
+++ b/graphlcd/logos/channels/BIBEL TV_l.glcd
diff --git a/graphlcd/logos/BIBEL TV_m.glcd b/graphlcd/logos/channels/BIBEL TV_m.glcd
index 30967af..30967af 100644
--- a/graphlcd/logos/BIBEL TV_m.glcd
+++ b/graphlcd/logos/channels/BIBEL TV_m.glcd
diff --git a/graphlcd/logos/BIBEL TV_v2_m.glcd b/graphlcd/logos/channels/BIBEL TV_v2_m.glcd
index c9d9045..c9d9045 100644
--- a/graphlcd/logos/BIBEL TV_v2_m.glcd
+++ b/graphlcd/logos/channels/BIBEL TV_v2_m.glcd
diff --git a/graphlcd/logos/BLOOMBERG TV_l.glcd b/graphlcd/logos/channels/BLOOMBERG TV_l.glcd
index f693de2..f693de2 100644
--- a/graphlcd/logos/BLOOMBERG TV_l.glcd
+++ b/graphlcd/logos/channels/BLOOMBERG TV_l.glcd
diff --git a/graphlcd/logos/BLOOMBERG TV_m.glcd b/graphlcd/logos/channels/BLOOMBERG TV_m.glcd
index 22dc275..22dc275 100644
--- a/graphlcd/logos/BLOOMBERG TV_m.glcd
+++ b/graphlcd/logos/channels/BLOOMBERG TV_m.glcd
diff --git a/graphlcd/logos/BR-ALPHA_l.glcd b/graphlcd/logos/channels/BR-ALPHA_l.glcd
index 89f455a..89f455a 100644
--- a/graphlcd/logos/BR-ALPHA_l.glcd
+++ b/graphlcd/logos/channels/BR-ALPHA_l.glcd
diff --git a/graphlcd/logos/BR-ALPHA_m.glcd b/graphlcd/logos/channels/BR-ALPHA_m.glcd
index 9b48f64..9b48f64 100644
--- a/graphlcd/logos/BR-ALPHA_m.glcd
+++ b/graphlcd/logos/channels/BR-ALPHA_m.glcd
diff --git a/graphlcd/logos/BR-ALPHA_v2_l.glcd b/graphlcd/logos/channels/BR-ALPHA_v2_l.glcd
index bcb323b..bcb323b 100644
--- a/graphlcd/logos/BR-ALPHA_v2_l.glcd
+++ b/graphlcd/logos/channels/BR-ALPHA_v2_l.glcd
diff --git a/graphlcd/logos/BR-ALPHA_v2_m.glcd b/graphlcd/logos/channels/BR-ALPHA_v2_m.glcd
index 9c1fa3d..9c1fa3d 100644
--- a/graphlcd/logos/BR-ALPHA_v2_m.glcd
+++ b/graphlcd/logos/channels/BR-ALPHA_v2_m.glcd
diff --git a/graphlcd/logos/BR-ALPHA_v3_m.glcd b/graphlcd/logos/channels/BR-ALPHA_v3_m.glcd
index 6de0d94..6de0d94 100644
--- a/graphlcd/logos/BR-ALPHA_v3_m.glcd
+++ b/graphlcd/logos/channels/BR-ALPHA_v3_m.glcd
diff --git a/graphlcd/logos/BTV4_l.glcd b/graphlcd/logos/channels/BTV4_l.glcd
index e82ca00..e82ca00 100644
--- a/graphlcd/logos/BTV4_l.glcd
+++ b/graphlcd/logos/channels/BTV4_l.glcd
diff --git a/graphlcd/logos/BTV4_m.glcd b/graphlcd/logos/channels/BTV4_m.glcd
index 4d5e9da..4d5e9da 100644
--- a/graphlcd/logos/BTV4_m.glcd
+++ b/graphlcd/logos/channels/BTV4_m.glcd
diff --git a/graphlcd/logos/BTV4_v2_l.glcd b/graphlcd/logos/channels/BTV4_v2_l.glcd
index c059759..c059759 100644
--- a/graphlcd/logos/BTV4_v2_l.glcd
+++ b/graphlcd/logos/channels/BTV4_v2_l.glcd
diff --git a/graphlcd/logos/BTV_l.glcd b/graphlcd/logos/channels/BTV_l.glcd
index ffdf278..ffdf278 100644
--- a/graphlcd/logos/BTV_l.glcd
+++ b/graphlcd/logos/channels/BTV_l.glcd
diff --git a/graphlcd/logos/BTV_m.glcd b/graphlcd/logos/channels/BTV_m.glcd
index f270770..f270770 100644
--- a/graphlcd/logos/BTV_m.glcd
+++ b/graphlcd/logos/channels/BTV_m.glcd
diff --git a/graphlcd/logos/BVN_l.glcd b/graphlcd/logos/channels/BVN_l.glcd
index c8df29a..c8df29a 100644
--- a/graphlcd/logos/BVN_l.glcd
+++ b/graphlcd/logos/channels/BVN_l.glcd
diff --git a/graphlcd/logos/BVN_m.glcd b/graphlcd/logos/channels/BVN_m.glcd
index 132502b..132502b 100644
--- a/graphlcd/logos/BVN_m.glcd
+++ b/graphlcd/logos/channels/BVN_m.glcd
diff --git a/graphlcd/logos/BVN_v2_m.glcd b/graphlcd/logos/channels/BVN_v2_m.glcd
index 014673e..014673e 100644
--- a/graphlcd/logos/BVN_v2_m.glcd
+++ b/graphlcd/logos/channels/BVN_v2_m.glcd
diff --git a/graphlcd/logos/CADENA DIAL_l.glcd b/graphlcd/logos/channels/CADENA DIAL_l.glcd
index 7cf6255..7cf6255 100644
--- a/graphlcd/logos/CADENA DIAL_l.glcd
+++ b/graphlcd/logos/channels/CADENA DIAL_l.glcd
diff --git a/graphlcd/logos/CADENA DIAL_m.glcd b/graphlcd/logos/channels/CADENA DIAL_m.glcd
index b2ec34a..b2ec34a 100644
--- a/graphlcd/logos/CADENA DIAL_m.glcd
+++ b/graphlcd/logos/channels/CADENA DIAL_m.glcd
diff --git a/graphlcd/logos/CANAL 24 HORAS_l.glcd b/graphlcd/logos/channels/CANAL 24 HORAS_l.glcd
index d725461..d725461 100644
--- a/graphlcd/logos/CANAL 24 HORAS_l.glcd
+++ b/graphlcd/logos/channels/CANAL 24 HORAS_l.glcd
diff --git a/graphlcd/logos/CANAL 24 HORAS_m.glcd b/graphlcd/logos/channels/CANAL 24 HORAS_m.glcd
index a71b55e..a71b55e 100644
--- a/graphlcd/logos/CANAL 24 HORAS_m.glcd
+++ b/graphlcd/logos/channels/CANAL 24 HORAS_m.glcd
diff --git a/graphlcd/logos/CANAL CANARIAS_l.glcd b/graphlcd/logos/channels/CANAL CANARIAS_l.glcd
index 2c0f53d..2c0f53d 100644
--- a/graphlcd/logos/CANAL CANARIAS_l.glcd
+++ b/graphlcd/logos/channels/CANAL CANARIAS_l.glcd
diff --git a/graphlcd/logos/CANAL CANARIAS_m.glcd b/graphlcd/logos/channels/CANAL CANARIAS_m.glcd
index 5870208..5870208 100644
--- a/graphlcd/logos/CANAL CANARIAS_m.glcd
+++ b/graphlcd/logos/channels/CANAL CANARIAS_m.glcd
diff --git a/graphlcd/logos/CANAL CANARIAS_v2_m.glcd b/graphlcd/logos/channels/CANAL CANARIAS_v2_m.glcd
index f6b64c8..f6b64c8 100644
--- a/graphlcd/logos/CANAL CANARIAS_v2_m.glcd
+++ b/graphlcd/logos/channels/CANAL CANARIAS_v2_m.glcd
diff --git a/graphlcd/logos/CANAL CLUB_l.glcd b/graphlcd/logos/channels/CANAL CLUB_l.glcd
index 069af7c..069af7c 100644
--- a/graphlcd/logos/CANAL CLUB_l.glcd
+++ b/graphlcd/logos/channels/CANAL CLUB_l.glcd
diff --git a/graphlcd/logos/CANAL CLUB_m.glcd b/graphlcd/logos/channels/CANAL CLUB_m.glcd
index ba74083..ba74083 100644
--- a/graphlcd/logos/CANAL CLUB_m.glcd
+++ b/graphlcd/logos/channels/CANAL CLUB_m.glcd
diff --git a/graphlcd/logos/CANAL CLUB_v2_m.glcd b/graphlcd/logos/channels/CANAL CLUB_v2_m.glcd
index 8bafd90..8bafd90 100644
--- a/graphlcd/logos/CANAL CLUB_v2_m.glcd
+++ b/graphlcd/logos/channels/CANAL CLUB_v2_m.glcd
diff --git a/graphlcd/logos/CANAL+ ...30_m.glcd b/graphlcd/logos/channels/CANAL+ ...30_m.glcd
index eeb7d70..eeb7d70 100644
--- a/graphlcd/logos/CANAL+ ...30_m.glcd
+++ b/graphlcd/logos/channels/CANAL+ ...30_m.glcd
diff --git a/graphlcd/logos/CANAL+_m.glcd b/graphlcd/logos/channels/CANAL+_m.glcd
index 8e87caf..8e87caf 100644
--- a/graphlcd/logos/CANAL+_m.glcd
+++ b/graphlcd/logos/channels/CANAL+_m.glcd
diff --git a/graphlcd/logos/CARTOON NETWORK_l.glcd b/graphlcd/logos/channels/CARTOON NETWORK_l.glcd
index 1d315e0..1d315e0 100644
--- a/graphlcd/logos/CARTOON NETWORK_l.glcd
+++ b/graphlcd/logos/channels/CARTOON NETWORK_l.glcd
diff --git a/graphlcd/logos/CARTOON NETWORK_m.glcd b/graphlcd/logos/channels/CARTOON NETWORK_m.glcd
index c5b7b30..c5b7b30 100644
--- a/graphlcd/logos/CARTOON NETWORK_m.glcd
+++ b/graphlcd/logos/channels/CARTOON NETWORK_m.glcd
diff --git a/graphlcd/logos/CFN RFC_l.glcd b/graphlcd/logos/channels/CFN RFC_l.glcd
index 87d510e..87d510e 100644
--- a/graphlcd/logos/CFN RFC_l.glcd
+++ b/graphlcd/logos/channels/CFN RFC_l.glcd
diff --git a/graphlcd/logos/CFN RFC_m.glcd b/graphlcd/logos/channels/CFN RFC_m.glcd
index 94ed328..94ed328 100644
--- a/graphlcd/logos/CFN RFC_m.glcd
+++ b/graphlcd/logos/channels/CFN RFC_m.glcd
diff --git a/graphlcd/logos/CHERIE FM_l.glcd b/graphlcd/logos/channels/CHERIE FM_l.glcd
index d227f27..d227f27 100644
--- a/graphlcd/logos/CHERIE FM_l.glcd
+++ b/graphlcd/logos/channels/CHERIE FM_l.glcd
diff --git a/graphlcd/logos/CHERIE FM_m.glcd b/graphlcd/logos/channels/CHERIE FM_m.glcd
index fc14a17..fc14a17 100644
--- a/graphlcd/logos/CHERIE FM_m.glcd
+++ b/graphlcd/logos/channels/CHERIE FM_m.glcd
diff --git a/graphlcd/logos/CHRONOS_l.glcd b/graphlcd/logos/channels/CHRONOS_l.glcd
index 67d8418..67d8418 100644
--- a/graphlcd/logos/CHRONOS_l.glcd
+++ b/graphlcd/logos/channels/CHRONOS_l.glcd
diff --git a/graphlcd/logos/CHRONOS_m.glcd b/graphlcd/logos/channels/CHRONOS_m.glcd
index ec0fe09..ec0fe09 100644
--- a/graphlcd/logos/CHRONOS_m.glcd
+++ b/graphlcd/logos/channels/CHRONOS_m.glcd
diff --git a/graphlcd/logos/CINE BOX_m.glcd b/graphlcd/logos/channels/CINE BOX_m.glcd
index 442f234..442f234 100644
--- a/graphlcd/logos/CINE BOX_m.glcd
+++ b/graphlcd/logos/channels/CINE BOX_m.glcd
diff --git a/graphlcd/logos/CLASSICA_l.glcd b/graphlcd/logos/channels/CLASSICA_l.glcd
index f241e7b..f241e7b 100644
--- a/graphlcd/logos/CLASSICA_l.glcd
+++ b/graphlcd/logos/channels/CLASSICA_l.glcd
diff --git a/graphlcd/logos/CLASSICA_m.glcd b/graphlcd/logos/channels/CLASSICA_m.glcd
index e2f174f..e2f174f 100644
--- a/graphlcd/logos/CLASSICA_m.glcd
+++ b/graphlcd/logos/channels/CLASSICA_m.glcd
diff --git a/graphlcd/logos/CLUB TELEACHAT_l.glcd b/graphlcd/logos/channels/CLUB TELEACHAT_l.glcd
index 50a260d..50a260d 100644
--- a/graphlcd/logos/CLUB TELEACHAT_l.glcd
+++ b/graphlcd/logos/channels/CLUB TELEACHAT_l.glcd
diff --git a/graphlcd/logos/CLUB TELEACHAT_m.glcd b/graphlcd/logos/channels/CLUB TELEACHAT_m.glcd
index a1ec468..a1ec468 100644
--- a/graphlcd/logos/CLUB TELEACHAT_m.glcd
+++ b/graphlcd/logos/channels/CLUB TELEACHAT_m.glcd
diff --git a/graphlcd/logos/CLUB TELEACHAT_v2_m.glcd b/graphlcd/logos/channels/CLUB TELEACHAT_v2_m.glcd
index e129033..e129033 100644
--- a/graphlcd/logos/CLUB TELEACHAT_v2_m.glcd
+++ b/graphlcd/logos/channels/CLUB TELEACHAT_v2_m.glcd
diff --git a/graphlcd/logos/CNBC EUROPE_l.glcd b/graphlcd/logos/channels/CNBC EUROPE_l.glcd
index f9ec19f..f9ec19f 100644
--- a/graphlcd/logos/CNBC EUROPE_l.glcd
+++ b/graphlcd/logos/channels/CNBC EUROPE_l.glcd
diff --git a/graphlcd/logos/CNBC EUROPE_m.glcd b/graphlcd/logos/channels/CNBC EUROPE_m.glcd
index 3245855..3245855 100644
--- a/graphlcd/logos/CNBC EUROPE_m.glcd
+++ b/graphlcd/logos/channels/CNBC EUROPE_m.glcd
diff --git a/graphlcd/logos/CNBC_l.glcd b/graphlcd/logos/channels/CNBC_l.glcd
index 14a2d09..14a2d09 100644
--- a/graphlcd/logos/CNBC_l.glcd
+++ b/graphlcd/logos/channels/CNBC_l.glcd
diff --git a/graphlcd/logos/CNBC_m.glcd b/graphlcd/logos/channels/CNBC_m.glcd
index bf88ac7..bf88ac7 100644
--- a/graphlcd/logos/CNBC_m.glcd
+++ b/graphlcd/logos/channels/CNBC_m.glcd
diff --git a/graphlcd/logos/CNN INT_l.glcd b/graphlcd/logos/channels/CNN INT_l.glcd
index 9c9dde6..9c9dde6 100644
--- a/graphlcd/logos/CNN INT_l.glcd
+++ b/graphlcd/logos/channels/CNN INT_l.glcd
diff --git a/graphlcd/logos/CNN INT_m.glcd b/graphlcd/logos/channels/CNN INT_m.glcd
index 823483a..823483a 100644
--- a/graphlcd/logos/CNN INT_m.glcd
+++ b/graphlcd/logos/channels/CNN INT_m.glcd
diff --git a/graphlcd/logos/CNN+_m.glcd b/graphlcd/logos/channels/CNN+_m.glcd
index fe93af9..fe93af9 100644
--- a/graphlcd/logos/CNN+_m.glcd
+++ b/graphlcd/logos/channels/CNN+_m.glcd
diff --git a/graphlcd/logos/CONTACT FM_l.glcd b/graphlcd/logos/channels/CONTACT FM_l.glcd
index 39edf44..39edf44 100644
--- a/graphlcd/logos/CONTACT FM_l.glcd
+++ b/graphlcd/logos/channels/CONTACT FM_l.glcd
diff --git a/graphlcd/logos/CONTACT FM_m.glcd b/graphlcd/logos/channels/CONTACT FM_m.glcd
index e67d16a..e67d16a 100644
--- a/graphlcd/logos/CONTACT FM_m.glcd
+++ b/graphlcd/logos/channels/CONTACT FM_m.glcd
diff --git a/graphlcd/logos/DAS ERSTE_l.glcd b/graphlcd/logos/channels/DAS ERSTE_l.glcd
index dd38c2f..dd38c2f 100644
--- a/graphlcd/logos/DAS ERSTE_l.glcd
+++ b/graphlcd/logos/channels/DAS ERSTE_l.glcd
diff --git a/graphlcd/logos/DAS ERSTE_m.glcd b/graphlcd/logos/channels/DAS ERSTE_m.glcd
index 95b8549..95b8549 100644
--- a/graphlcd/logos/DAS ERSTE_m.glcd
+++ b/graphlcd/logos/channels/DAS ERSTE_m.glcd
diff --git a/graphlcd/logos/DAS ERSTE_v2_l.glcd b/graphlcd/logos/channels/DAS ERSTE_v2_l.glcd
index 3fb4ed8..3fb4ed8 100644
--- a/graphlcd/logos/DAS ERSTE_v2_l.glcd
+++ b/graphlcd/logos/channels/DAS ERSTE_v2_l.glcd
diff --git a/graphlcd/logos/DAS VIERTE_l.glcd b/graphlcd/logos/channels/DAS VIERTE_l.glcd
index 250b7ac..250b7ac 100644
--- a/graphlcd/logos/DAS VIERTE_l.glcd
+++ b/graphlcd/logos/channels/DAS VIERTE_l.glcd
diff --git a/graphlcd/logos/DEUTSCHLANDFUNK KOELN_l.glcd b/graphlcd/logos/channels/DEUTSCHLANDFUNK KOELN_l.glcd
index 068eb5d..068eb5d 100644
--- a/graphlcd/logos/DEUTSCHLANDFUNK KOELN_l.glcd
+++ b/graphlcd/logos/channels/DEUTSCHLANDFUNK KOELN_l.glcd
diff --git a/graphlcd/logos/DEUTSCHLANDFUNK KOELN_m.glcd b/graphlcd/logos/channels/DEUTSCHLANDFUNK KOELN_m.glcd
index cfcde86..cfcde86 100644
--- a/graphlcd/logos/DEUTSCHLANDFUNK KOELN_m.glcd
+++ b/graphlcd/logos/channels/DEUTSCHLANDFUNK KOELN_m.glcd
diff --git a/graphlcd/logos/DEUTSCHLANDFUNK KOELN_v2_m.glcd b/graphlcd/logos/channels/DEUTSCHLANDFUNK KOELN_v2_m.glcd
index 7907ad2..7907ad2 100644
--- a/graphlcd/logos/DEUTSCHLANDFUNK KOELN_v2_m.glcd
+++ b/graphlcd/logos/channels/DEUTSCHLANDFUNK KOELN_v2_m.glcd
diff --git a/graphlcd/logos/DEUTSCHLANDRADIO BERLIN_l.glcd b/graphlcd/logos/channels/DEUTSCHLANDRADIO BERLIN_l.glcd
index 2a8e007..2a8e007 100644
--- a/graphlcd/logos/DEUTSCHLANDRADIO BERLIN_l.glcd
+++ b/graphlcd/logos/channels/DEUTSCHLANDRADIO BERLIN_l.glcd
diff --git a/graphlcd/logos/DEUTSCHLANDRADIO BERLIN_m.glcd b/graphlcd/logos/channels/DEUTSCHLANDRADIO BERLIN_m.glcd
index bd35774..bd35774 100644
--- a/graphlcd/logos/DEUTSCHLANDRADIO BERLIN_m.glcd
+++ b/graphlcd/logos/channels/DEUTSCHLANDRADIO BERLIN_m.glcd
diff --git a/graphlcd/logos/DEUTSCHLANDRADIO BERLIN_v2_m.glcd b/graphlcd/logos/channels/DEUTSCHLANDRADIO BERLIN_v2_m.glcd
index 19947a2..19947a2 100644
--- a/graphlcd/logos/DEUTSCHLANDRADIO BERLIN_v2_m.glcd
+++ b/graphlcd/logos/channels/DEUTSCHLANDRADIO BERLIN_v2_m.glcd
diff --git a/graphlcd/logos/DISCOVERY CHANNEL_l.glcd b/graphlcd/logos/channels/DISCOVERY CHANNEL_l.glcd
index 1871981..1871981 100644
--- a/graphlcd/logos/DISCOVERY CHANNEL_l.glcd
+++ b/graphlcd/logos/channels/DISCOVERY CHANNEL_l.glcd
diff --git a/graphlcd/logos/DISCOVERY CHANNEL_m.glcd b/graphlcd/logos/channels/DISCOVERY CHANNEL_m.glcd
index fa9b349..fa9b349 100644
--- a/graphlcd/logos/DISCOVERY CHANNEL_m.glcd
+++ b/graphlcd/logos/channels/DISCOVERY CHANNEL_m.glcd
diff --git a/graphlcd/logos/DISCOVERY CHANNEL_v2_l.glcd b/graphlcd/logos/channels/DISCOVERY CHANNEL_v2_l.glcd
index cb9518d..cb9518d 100644
--- a/graphlcd/logos/DISCOVERY CHANNEL_v2_l.glcd
+++ b/graphlcd/logos/channels/DISCOVERY CHANNEL_v2_l.glcd
diff --git a/graphlcd/logos/DISNEY CHANNEL_l.glcd b/graphlcd/logos/channels/DISNEY CHANNEL_l.glcd
index ed63bcf..ed63bcf 100644
--- a/graphlcd/logos/DISNEY CHANNEL_l.glcd
+++ b/graphlcd/logos/channels/DISNEY CHANNEL_l.glcd
diff --git a/graphlcd/logos/DISNEY CHANNEL_m.glcd b/graphlcd/logos/channels/DISNEY CHANNEL_m.glcd
index 1e8267e..1e8267e 100644
--- a/graphlcd/logos/DISNEY CHANNEL_m.glcd
+++ b/graphlcd/logos/channels/DISNEY CHANNEL_m.glcd
diff --git a/graphlcd/logos/DISNEY CHANNEL_v2_l.glcd b/graphlcd/logos/channels/DISNEY CHANNEL_v2_l.glcd
index cbc7820..cbc7820 100644
--- a/graphlcd/logos/DISNEY CHANNEL_v2_l.glcd
+++ b/graphlcd/logos/channels/DISNEY CHANNEL_v2_l.glcd
diff --git a/graphlcd/logos/DISNEY PLAYHOUSE_l.glcd b/graphlcd/logos/channels/DISNEY PLAYHOUSE_l.glcd
index 778ad44..778ad44 100644
--- a/graphlcd/logos/DISNEY PLAYHOUSE_l.glcd
+++ b/graphlcd/logos/channels/DISNEY PLAYHOUSE_l.glcd
diff --git a/graphlcd/logos/DISNEY TOON +1_l.glcd b/graphlcd/logos/channels/DISNEY TOON +1_l.glcd
index 5b1c984..5b1c984 100644
--- a/graphlcd/logos/DISNEY TOON +1_l.glcd
+++ b/graphlcd/logos/channels/DISNEY TOON +1_l.glcd
diff --git a/graphlcd/logos/DISNEY TOON_l.glcd b/graphlcd/logos/channels/DISNEY TOON_l.glcd
index 910501c..910501c 100644
--- a/graphlcd/logos/DISNEY TOON_l.glcd
+++ b/graphlcd/logos/channels/DISNEY TOON_l.glcd
diff --git a/graphlcd/logos/DSF_l.glcd b/graphlcd/logos/channels/DSF_l.glcd
index 3848a34..3848a34 100644
--- a/graphlcd/logos/DSF_l.glcd
+++ b/graphlcd/logos/channels/DSF_l.glcd
diff --git a/graphlcd/logos/DSF_m.glcd b/graphlcd/logos/channels/DSF_m.glcd
index 4a2c1e8..4a2c1e8 100644
--- a/graphlcd/logos/DSF_m.glcd
+++ b/graphlcd/logos/channels/DSF_m.glcd
diff --git a/graphlcd/logos/DW-TV_l.glcd b/graphlcd/logos/channels/DW-TV_l.glcd
index 5d2c3ef..5d2c3ef 100644
--- a/graphlcd/logos/DW-TV_l.glcd
+++ b/graphlcd/logos/channels/DW-TV_l.glcd
diff --git a/graphlcd/logos/DW-TV_m.glcd b/graphlcd/logos/channels/DW-TV_m.glcd
index 6eb1153..6eb1153 100644
--- a/graphlcd/logos/DW-TV_m.glcd
+++ b/graphlcd/logos/channels/DW-TV_m.glcd
diff --git a/graphlcd/logos/E ENTERTAINMENT_l.glcd b/graphlcd/logos/channels/E ENTERTAINMENT_l.glcd
index d7cb2ff..d7cb2ff 100644
--- a/graphlcd/logos/E ENTERTAINMENT_l.glcd
+++ b/graphlcd/logos/channels/E ENTERTAINMENT_l.glcd
diff --git a/graphlcd/logos/EINS EXTRA_l.glcd b/graphlcd/logos/channels/EINS EXTRA_l.glcd
index 5d27520..5d27520 100644
--- a/graphlcd/logos/EINS EXTRA_l.glcd
+++ b/graphlcd/logos/channels/EINS EXTRA_l.glcd
diff --git a/graphlcd/logos/EINS EXTRA_m.glcd b/graphlcd/logos/channels/EINS EXTRA_m.glcd
index c56e446..c56e446 100644
--- a/graphlcd/logos/EINS EXTRA_m.glcd
+++ b/graphlcd/logos/channels/EINS EXTRA_m.glcd
diff --git a/graphlcd/logos/EINS EXTRA_v2_l.glcd b/graphlcd/logos/channels/EINS EXTRA_v2_l.glcd
index 0c6c5f5..0c6c5f5 100644
--- a/graphlcd/logos/EINS EXTRA_v2_l.glcd
+++ b/graphlcd/logos/channels/EINS EXTRA_v2_l.glcd
diff --git a/graphlcd/logos/EINS EXTRA_v3_l.glcd b/graphlcd/logos/channels/EINS EXTRA_v3_l.glcd
index 8d28095..8d28095 100644
--- a/graphlcd/logos/EINS EXTRA_v3_l.glcd
+++ b/graphlcd/logos/channels/EINS EXTRA_v3_l.glcd
diff --git a/graphlcd/logos/EINS FESTIVAL_l.glcd b/graphlcd/logos/channels/EINS FESTIVAL_l.glcd
index 57377a8..57377a8 100644
--- a/graphlcd/logos/EINS FESTIVAL_l.glcd
+++ b/graphlcd/logos/channels/EINS FESTIVAL_l.glcd
diff --git a/graphlcd/logos/EINS FESTIVAL_m.glcd b/graphlcd/logos/channels/EINS FESTIVAL_m.glcd
index ccec283..ccec283 100644
--- a/graphlcd/logos/EINS FESTIVAL_m.glcd
+++ b/graphlcd/logos/channels/EINS FESTIVAL_m.glcd
diff --git a/graphlcd/logos/EINS FESTIVAL_v2_l.glcd b/graphlcd/logos/channels/EINS FESTIVAL_v2_l.glcd
index c9b7fd4..c9b7fd4 100644
--- a/graphlcd/logos/EINS FESTIVAL_v2_l.glcd
+++ b/graphlcd/logos/channels/EINS FESTIVAL_v2_l.glcd
diff --git a/graphlcd/logos/EINS MUXX_l.glcd b/graphlcd/logos/channels/EINS MUXX_l.glcd
index 5ff62b5..5ff62b5 100644
--- a/graphlcd/logos/EINS MUXX_l.glcd
+++ b/graphlcd/logos/channels/EINS MUXX_l.glcd
diff --git a/graphlcd/logos/EINS MUXX_m.glcd b/graphlcd/logos/channels/EINS MUXX_m.glcd
index 8e4beca..8e4beca 100644
--- a/graphlcd/logos/EINS MUXX_m.glcd
+++ b/graphlcd/logos/channels/EINS MUXX_m.glcd
diff --git a/graphlcd/logos/EINS MUXX_v2_l.glcd b/graphlcd/logos/channels/EINS MUXX_v2_l.glcd
index 4669887..4669887 100644
--- a/graphlcd/logos/EINS MUXX_v2_l.glcd
+++ b/graphlcd/logos/channels/EINS MUXX_v2_l.glcd
diff --git a/graphlcd/logos/ERF RADIO_l.glcd b/graphlcd/logos/channels/ERF RADIO_l.glcd
index ca71505..ca71505 100644
--- a/graphlcd/logos/ERF RADIO_l.glcd
+++ b/graphlcd/logos/channels/ERF RADIO_l.glcd
diff --git a/graphlcd/logos/ERF RADIO_m.glcd b/graphlcd/logos/channels/ERF RADIO_m.glcd
index 5b76db4..5b76db4 100644
--- a/graphlcd/logos/ERF RADIO_m.glcd
+++ b/graphlcd/logos/channels/ERF RADIO_m.glcd
diff --git a/graphlcd/logos/ESC1-EGYPT_l.glcd b/graphlcd/logos/channels/ESC1-EGYPT_l.glcd
index 2a3a7c9..2a3a7c9 100644
--- a/graphlcd/logos/ESC1-EGYPT_l.glcd
+++ b/graphlcd/logos/channels/ESC1-EGYPT_l.glcd
diff --git a/graphlcd/logos/ESPN CLASSIC SPORT_l.glcd b/graphlcd/logos/channels/ESPN CLASSIC SPORT_l.glcd
index 6c44801..6c44801 100644
--- a/graphlcd/logos/ESPN CLASSIC SPORT_l.glcd
+++ b/graphlcd/logos/channels/ESPN CLASSIC SPORT_l.glcd
diff --git a/graphlcd/logos/ETB SAT_l.glcd b/graphlcd/logos/channels/ETB SAT_l.glcd
index e100d18..e100d18 100644
--- a/graphlcd/logos/ETB SAT_l.glcd
+++ b/graphlcd/logos/channels/ETB SAT_l.glcd
diff --git a/graphlcd/logos/ETB SAT_m.glcd b/graphlcd/logos/channels/ETB SAT_m.glcd
index 5fc3657..5fc3657 100644
--- a/graphlcd/logos/ETB SAT_m.glcd
+++ b/graphlcd/logos/channels/ETB SAT_m.glcd
diff --git a/graphlcd/logos/EURONEWS_l.glcd b/graphlcd/logos/channels/EURONEWS_l.glcd
index ef51c05..ef51c05 100644
--- a/graphlcd/logos/EURONEWS_l.glcd
+++ b/graphlcd/logos/channels/EURONEWS_l.glcd
diff --git a/graphlcd/logos/EURONEWS_m.glcd b/graphlcd/logos/channels/EURONEWS_m.glcd
index 85367d1..85367d1 100644
--- a/graphlcd/logos/EURONEWS_m.glcd
+++ b/graphlcd/logos/channels/EURONEWS_m.glcd
diff --git a/graphlcd/logos/EUROPE 2_l.glcd b/graphlcd/logos/channels/EUROPE 2_l.glcd
index 3020976..3020976 100644
--- a/graphlcd/logos/EUROPE 2_l.glcd
+++ b/graphlcd/logos/channels/EUROPE 2_l.glcd
diff --git a/graphlcd/logos/EUROPE 2_m.glcd b/graphlcd/logos/channels/EUROPE 2_m.glcd
index 688bea3..688bea3 100644
--- a/graphlcd/logos/EUROPE 2_m.glcd
+++ b/graphlcd/logos/channels/EUROPE 2_m.glcd
diff --git a/graphlcd/logos/EUROSPORT_l.glcd b/graphlcd/logos/channels/EUROSPORT_l.glcd
index 3a929f0..3a929f0 100644
--- a/graphlcd/logos/EUROSPORT_l.glcd
+++ b/graphlcd/logos/channels/EUROSPORT_l.glcd
diff --git a/graphlcd/logos/EUROSPORT_m.glcd b/graphlcd/logos/channels/EUROSPORT_m.glcd
index c41f51d..c41f51d 100644
--- a/graphlcd/logos/EUROSPORT_m.glcd
+++ b/graphlcd/logos/channels/EUROSPORT_m.glcd
diff --git a/graphlcd/logos/EXTRA 1_l.glcd b/graphlcd/logos/channels/EXTRA 1_l.glcd
index 694c965..694c965 100644
--- a/graphlcd/logos/EXTRA 1_l.glcd
+++ b/graphlcd/logos/channels/EXTRA 1_l.glcd
diff --git a/graphlcd/logos/EXTREME SPORTS_l.glcd b/graphlcd/logos/channels/EXTREME SPORTS_l.glcd
index 4d43a09..4d43a09 100644
--- a/graphlcd/logos/EXTREME SPORTS_l.glcd
+++ b/graphlcd/logos/channels/EXTREME SPORTS_l.glcd
diff --git a/graphlcd/logos/FAB_l.glcd b/graphlcd/logos/channels/FAB_l.glcd
index a048767..a048767 100644
--- a/graphlcd/logos/FAB_l.glcd
+++ b/graphlcd/logos/channels/FAB_l.glcd
diff --git a/graphlcd/logos/FAB_m.glcd b/graphlcd/logos/channels/FAB_m.glcd
index 3d290ed..3d290ed 100644
--- a/graphlcd/logos/FAB_m.glcd
+++ b/graphlcd/logos/channels/FAB_m.glcd
diff --git a/graphlcd/logos/FAB_v2_m.glcd b/graphlcd/logos/channels/FAB_v2_m.glcd
index f964628..f964628 100644
--- a/graphlcd/logos/FAB_v2_m.glcd
+++ b/graphlcd/logos/channels/FAB_v2_m.glcd
diff --git a/graphlcd/logos/FASHION TV_l.glcd b/graphlcd/logos/channels/FASHION TV_l.glcd
index bc8e4ec..bc8e4ec 100644
--- a/graphlcd/logos/FASHION TV_l.glcd
+++ b/graphlcd/logos/channels/FASHION TV_l.glcd
diff --git a/graphlcd/logos/FASHION TV_m.glcd b/graphlcd/logos/channels/FASHION TV_m.glcd
index 897fd5f..897fd5f 100644
--- a/graphlcd/logos/FASHION TV_m.glcd
+++ b/graphlcd/logos/channels/FASHION TV_m.glcd
diff --git a/graphlcd/logos/FASHION TV_v2_m.glcd b/graphlcd/logos/channels/FASHION TV_v2_m.glcd
index 7c89848..7c89848 100644
--- a/graphlcd/logos/FASHION TV_v2_m.glcd
+++ b/graphlcd/logos/channels/FASHION TV_v2_m.glcd
diff --git a/graphlcd/logos/FESTIVAL 1_l.glcd b/graphlcd/logos/channels/FESTIVAL 1_l.glcd
index d3e1b46..d3e1b46 100644
--- a/graphlcd/logos/FESTIVAL 1_l.glcd
+++ b/graphlcd/logos/channels/FESTIVAL 1_l.glcd
diff --git a/graphlcd/logos/FESTIVAL_m.glcd b/graphlcd/logos/channels/FESTIVAL_m.glcd
index 25fcea3..25fcea3 100644
--- a/graphlcd/logos/FESTIVAL_m.glcd
+++ b/graphlcd/logos/channels/FESTIVAL_m.glcd
diff --git a/graphlcd/logos/FM4_l.glcd b/graphlcd/logos/channels/FM4_l.glcd
index af43c43..af43c43 100644
--- a/graphlcd/logos/FM4_l.glcd
+++ b/graphlcd/logos/channels/FM4_l.glcd
diff --git a/graphlcd/logos/FM4_m.glcd b/graphlcd/logos/channels/FM4_m.glcd
index 80b9664..80b9664 100644
--- a/graphlcd/logos/FM4_m.glcd
+++ b/graphlcd/logos/channels/FM4_m.glcd
diff --git a/graphlcd/logos/FOX KIDS_l.glcd b/graphlcd/logos/channels/FOX KIDS_l.glcd
index faac38a..faac38a 100644
--- a/graphlcd/logos/FOX KIDS_l.glcd
+++ b/graphlcd/logos/channels/FOX KIDS_l.glcd
diff --git a/graphlcd/logos/FOX KIDS_m.glcd b/graphlcd/logos/channels/FOX KIDS_m.glcd
index 6a681a1..6a681a1 100644
--- a/graphlcd/logos/FOX KIDS_m.glcd
+++ b/graphlcd/logos/channels/FOX KIDS_m.glcd
diff --git a/graphlcd/logos/FOX KIDS_v2_l.glcd b/graphlcd/logos/channels/FOX KIDS_v2_l.glcd
index 008f6c6..008f6c6 100644
--- a/graphlcd/logos/FOX KIDS_v2_l.glcd
+++ b/graphlcd/logos/channels/FOX KIDS_v2_l.glcd
diff --git a/graphlcd/logos/FOX KIDS_v2_m.glcd b/graphlcd/logos/channels/FOX KIDS_v2_m.glcd
index 09ad0b2..09ad0b2 100644
--- a/graphlcd/logos/FOX KIDS_v2_m.glcd
+++ b/graphlcd/logos/channels/FOX KIDS_v2_m.glcd
diff --git a/graphlcd/logos/FOX NEWS_m.glcd b/graphlcd/logos/channels/FOX NEWS_m.glcd
index 82d60f9..82d60f9 100644
--- a/graphlcd/logos/FOX NEWS_m.glcd
+++ b/graphlcd/logos/channels/FOX NEWS_m.glcd
diff --git a/graphlcd/logos/FOX_m.glcd b/graphlcd/logos/channels/FOX_m.glcd
index 73b376b..73b376b 100644
--- a/graphlcd/logos/FOX_m.glcd
+++ b/graphlcd/logos/channels/FOX_m.glcd
diff --git a/graphlcd/logos/FRANCE2_l.glcd b/graphlcd/logos/channels/FRANCE2_l.glcd
index a01db87..a01db87 100644
--- a/graphlcd/logos/FRANCE2_l.glcd
+++ b/graphlcd/logos/channels/FRANCE2_l.glcd
diff --git a/graphlcd/logos/FRANCE2_m.glcd b/graphlcd/logos/channels/FRANCE2_m.glcd
index 8658df7..8658df7 100644
--- a/graphlcd/logos/FRANCE2_m.glcd
+++ b/graphlcd/logos/channels/FRANCE2_m.glcd
diff --git a/graphlcd/logos/FRANCE3_l.glcd b/graphlcd/logos/channels/FRANCE3_l.glcd
index fbea5ba..fbea5ba 100644
--- a/graphlcd/logos/FRANCE3_l.glcd
+++ b/graphlcd/logos/channels/FRANCE3_l.glcd
diff --git a/graphlcd/logos/FRANCE3_m.glcd b/graphlcd/logos/channels/FRANCE3_m.glcd
index 421e4e3..421e4e3 100644
--- a/graphlcd/logos/FRANCE3_m.glcd
+++ b/graphlcd/logos/channels/FRANCE3_m.glcd
diff --git a/graphlcd/logos/FRANCE5_l.glcd b/graphlcd/logos/channels/FRANCE5_l.glcd
index bc3132a..bc3132a 100644
--- a/graphlcd/logos/FRANCE5_l.glcd
+++ b/graphlcd/logos/channels/FRANCE5_l.glcd
diff --git a/graphlcd/logos/FRANCE5_m.glcd b/graphlcd/logos/channels/FRANCE5_m.glcd
index 03cdbd3..03cdbd3 100644
--- a/graphlcd/logos/FRANCE5_m.glcd
+++ b/graphlcd/logos/channels/FRANCE5_m.glcd
diff --git a/graphlcd/logos/FRANKEN SAT_l.glcd b/graphlcd/logos/channels/FRANKEN SAT_l.glcd
index 9def4ca..9def4ca 100644
--- a/graphlcd/logos/FRANKEN SAT_l.glcd
+++ b/graphlcd/logos/channels/FRANKEN SAT_l.glcd
diff --git a/graphlcd/logos/FRANKEN SAT_m.glcd b/graphlcd/logos/channels/FRANKEN SAT_m.glcd
index 4e0be7e..4e0be7e 100644
--- a/graphlcd/logos/FRANKEN SAT_m.glcd
+++ b/graphlcd/logos/channels/FRANKEN SAT_m.glcd
diff --git a/graphlcd/logos/FREE-X TV_l.glcd b/graphlcd/logos/channels/FREE-X TV_l.glcd
index d84a6d9..d84a6d9 100644
--- a/graphlcd/logos/FREE-X TV_l.glcd
+++ b/graphlcd/logos/channels/FREE-X TV_l.glcd
diff --git a/graphlcd/logos/FREE-X TV_m.glcd b/graphlcd/logos/channels/FREE-X TV_m.glcd
index c98bdc5..c98bdc5 100644
--- a/graphlcd/logos/FREE-X TV_m.glcd
+++ b/graphlcd/logos/channels/FREE-X TV_m.glcd
diff --git a/graphlcd/logos/FRITZ_l.glcd b/graphlcd/logos/channels/FRITZ_l.glcd
index e84e499..e84e499 100644
--- a/graphlcd/logos/FRITZ_l.glcd
+++ b/graphlcd/logos/channels/FRITZ_l.glcd
diff --git a/graphlcd/logos/FRITZ_m.glcd b/graphlcd/logos/channels/FRITZ_m.glcd
index 894fda0..894fda0 100644
--- a/graphlcd/logos/FRITZ_m.glcd
+++ b/graphlcd/logos/channels/FRITZ_m.glcd
diff --git a/graphlcd/logos/GAMES TV_l.glcd b/graphlcd/logos/channels/GAMES TV_l.glcd
index b6c862e..b6c862e 100644
--- a/graphlcd/logos/GAMES TV_l.glcd
+++ b/graphlcd/logos/channels/GAMES TV_l.glcd
diff --git a/graphlcd/logos/GOLDSTAR TV_l.glcd b/graphlcd/logos/channels/GOLDSTAR TV_l.glcd
index 75f6b4b..75f6b4b 100644
--- a/graphlcd/logos/GOLDSTAR TV_l.glcd
+++ b/graphlcd/logos/channels/GOLDSTAR TV_l.glcd
diff --git a/graphlcd/logos/GOLDSTAR TV_m.glcd b/graphlcd/logos/channels/GOLDSTAR TV_m.glcd
index 82b0f94..82b0f94 100644
--- a/graphlcd/logos/GOLDSTAR TV_m.glcd
+++ b/graphlcd/logos/channels/GOLDSTAR TV_m.glcd
diff --git a/graphlcd/logos/GOLDSTAR TV_v2_l.glcd b/graphlcd/logos/channels/GOLDSTAR TV_v2_l.glcd
index 0bc73d4..0bc73d4 100644
--- a/graphlcd/logos/GOLDSTAR TV_v2_l.glcd
+++ b/graphlcd/logos/channels/GOLDSTAR TV_v2_l.glcd
diff --git a/graphlcd/logos/GOLDSTAR TV_v2_m.glcd b/graphlcd/logos/channels/GOLDSTAR TV_v2_m.glcd
index bdc8533..bdc8533 100644
--- a/graphlcd/logos/GOLDSTAR TV_v2_m.glcd
+++ b/graphlcd/logos/channels/GOLDSTAR TV_v2_m.glcd
diff --git a/graphlcd/logos/GUTE LAUNE TV_l.glcd b/graphlcd/logos/channels/GUTE LAUNE TV_l.glcd
index afdc9d8..afdc9d8 100644
--- a/graphlcd/logos/GUTE LAUNE TV_l.glcd
+++ b/graphlcd/logos/channels/GUTE LAUNE TV_l.glcd
diff --git a/graphlcd/logos/HALLMARK_l.glcd b/graphlcd/logos/channels/HALLMARK_l.glcd
index 820f67c..820f67c 100644
--- a/graphlcd/logos/HALLMARK_l.glcd
+++ b/graphlcd/logos/channels/HALLMARK_l.glcd
diff --git a/graphlcd/logos/HARMONY FM_l.glcd b/graphlcd/logos/channels/HARMONY FM_l.glcd
index c7c061e..c7c061e 100644
--- a/graphlcd/logos/HARMONY FM_l.glcd
+++ b/graphlcd/logos/channels/HARMONY FM_l.glcd
diff --git a/graphlcd/logos/HARMONY FM_m.glcd b/graphlcd/logos/channels/HARMONY FM_m.glcd
index 8829b03..8829b03 100644
--- a/graphlcd/logos/HARMONY FM_m.glcd
+++ b/graphlcd/logos/channels/HARMONY FM_m.glcd
diff --git a/graphlcd/logos/HARMONY FM_v2_m.glcd b/graphlcd/logos/channels/HARMONY FM_v2_m.glcd
index c32ec0f..c32ec0f 100644
--- a/graphlcd/logos/HARMONY FM_v2_m.glcd
+++ b/graphlcd/logos/channels/HARMONY FM_v2_m.glcd
diff --git a/graphlcd/logos/HEIMATKANAL_l.glcd b/graphlcd/logos/channels/HEIMATKANAL_l.glcd
index 8c0161f..8c0161f 100644
--- a/graphlcd/logos/HEIMATKANAL_l.glcd
+++ b/graphlcd/logos/channels/HEIMATKANAL_l.glcd
diff --git a/graphlcd/logos/HEIMATKANAL_m.glcd b/graphlcd/logos/channels/HEIMATKANAL_m.glcd
index f1224e4..f1224e4 100644
--- a/graphlcd/logos/HEIMATKANAL_m.glcd
+++ b/graphlcd/logos/channels/HEIMATKANAL_m.glcd
diff --git a/graphlcd/logos/HEIMATKANAL_v2_l.glcd b/graphlcd/logos/channels/HEIMATKANAL_v2_l.glcd
index 643d68a..643d68a 100644
--- a/graphlcd/logos/HEIMATKANAL_v2_l.glcd
+++ b/graphlcd/logos/channels/HEIMATKANAL_v2_l.glcd
diff --git a/graphlcd/logos/HESSEN FERNSEHEN_l.glcd b/graphlcd/logos/channels/HESSEN FERNSEHEN_l.glcd
index c2df34e..c2df34e 100644
--- a/graphlcd/logos/HESSEN FERNSEHEN_l.glcd
+++ b/graphlcd/logos/channels/HESSEN FERNSEHEN_l.glcd
diff --git a/graphlcd/logos/HESSEN FERNSEHEN_m.glcd b/graphlcd/logos/channels/HESSEN FERNSEHEN_m.glcd
index 24ed6bc..24ed6bc 100644
--- a/graphlcd/logos/HESSEN FERNSEHEN_m.glcd
+++ b/graphlcd/logos/channels/HESSEN FERNSEHEN_m.glcd
diff --git a/graphlcd/logos/HESSEN FERNSEHEN_v2_l.glcd b/graphlcd/logos/channels/HESSEN FERNSEHEN_v2_l.glcd
index afb1d56..afb1d56 100644
--- a/graphlcd/logos/HESSEN FERNSEHEN_v2_l.glcd
+++ b/graphlcd/logos/channels/HESSEN FERNSEHEN_v2_l.glcd
diff --git a/graphlcd/logos/HISTOIRE_m.glcd b/graphlcd/logos/channels/HISTOIRE_m.glcd
index 7343fc8..7343fc8 100644
--- a/graphlcd/logos/HISTOIRE_m.glcd
+++ b/graphlcd/logos/channels/HISTOIRE_m.glcd
diff --git a/graphlcd/logos/HISTORY CHANNEL_l.glcd b/graphlcd/logos/channels/HISTORY CHANNEL_l.glcd
index e175a6a..e175a6a 100644
--- a/graphlcd/logos/HISTORY CHANNEL_l.glcd
+++ b/graphlcd/logos/channels/HISTORY CHANNEL_l.glcd
diff --git a/graphlcd/logos/HIT CHANNEL 1025_l.glcd b/graphlcd/logos/channels/HIT CHANNEL 1025_l.glcd
index 278358a..278358a 100644
--- a/graphlcd/logos/HIT CHANNEL 1025_l.glcd
+++ b/graphlcd/logos/channels/HIT CHANNEL 1025_l.glcd
diff --git a/graphlcd/logos/HIT CHANNEL 1025_m.glcd b/graphlcd/logos/channels/HIT CHANNEL 1025_m.glcd
index da73db3..da73db3 100644
--- a/graphlcd/logos/HIT CHANNEL 1025_m.glcd
+++ b/graphlcd/logos/channels/HIT CHANNEL 1025_m.glcd
diff --git a/graphlcd/logos/HITRADIO FFH_l.glcd b/graphlcd/logos/channels/HITRADIO FFH_l.glcd
index b5fd57e..b5fd57e 100644
--- a/graphlcd/logos/HITRADIO FFH_l.glcd
+++ b/graphlcd/logos/channels/HITRADIO FFH_l.glcd
diff --git a/graphlcd/logos/HITRADIO FFH_m.glcd b/graphlcd/logos/channels/HITRADIO FFH_m.glcd
index 3701543..3701543 100644
--- a/graphlcd/logos/HITRADIO FFH_m.glcd
+++ b/graphlcd/logos/channels/HITRADIO FFH_m.glcd
diff --git a/graphlcd/logos/HOERZU DIGITAL_l.glcd b/graphlcd/logos/channels/HOERZU DIGITAL_l.glcd
index 703c47b..703c47b 100644
--- a/graphlcd/logos/HOERZU DIGITAL_l.glcd
+++ b/graphlcd/logos/channels/HOERZU DIGITAL_l.glcd
diff --git a/graphlcd/logos/HOERZU DIGITAL_m.glcd b/graphlcd/logos/channels/HOERZU DIGITAL_m.glcd
index fefd209..fefd209 100644
--- a/graphlcd/logos/HOERZU DIGITAL_m.glcd
+++ b/graphlcd/logos/channels/HOERZU DIGITAL_m.glcd
diff --git a/graphlcd/logos/HOLLYWOOD CINEMA_l.glcd b/graphlcd/logos/channels/HOLLYWOOD CINEMA_l.glcd
index c7ce748..c7ce748 100644
--- a/graphlcd/logos/HOLLYWOOD CINEMA_l.glcd
+++ b/graphlcd/logos/channels/HOLLYWOOD CINEMA_l.glcd
diff --git a/graphlcd/logos/HOLLYWOOD CINEMA_m.glcd b/graphlcd/logos/channels/HOLLYWOOD CINEMA_m.glcd
index bd9f7bd..bd9f7bd 100644
--- a/graphlcd/logos/HOLLYWOOD CINEMA_m.glcd
+++ b/graphlcd/logos/channels/HOLLYWOOD CINEMA_m.glcd
diff --git a/graphlcd/logos/HR CHRONOS_l.glcd b/graphlcd/logos/channels/HR CHRONOS_l.glcd
index 67d8418..67d8418 100644
--- a/graphlcd/logos/HR CHRONOS_l.glcd
+++ b/graphlcd/logos/channels/HR CHRONOS_l.glcd
diff --git a/graphlcd/logos/HR KLASSIK_l.glcd b/graphlcd/logos/channels/HR KLASSIK_l.glcd
index 8e992a9..8e992a9 100644
--- a/graphlcd/logos/HR KLASSIK_l.glcd
+++ b/graphlcd/logos/channels/HR KLASSIK_l.glcd
diff --git a/graphlcd/logos/HR KLASSIK_m.glcd b/graphlcd/logos/channels/HR KLASSIK_m.glcd
index 4712db5..4712db5 100644
--- a/graphlcd/logos/HR KLASSIK_m.glcd
+++ b/graphlcd/logos/channels/HR KLASSIK_m.glcd
diff --git a/graphlcd/logos/HR KLASSIK_v2_m.glcd b/graphlcd/logos/channels/HR KLASSIK_v2_m.glcd
index 36e403c..36e403c 100644
--- a/graphlcd/logos/HR KLASSIK_v2_m.glcd
+++ b/graphlcd/logos/channels/HR KLASSIK_v2_m.glcd
diff --git a/graphlcd/logos/HR SKYLINE_l.glcd b/graphlcd/logos/channels/HR SKYLINE_l.glcd
index 593a856..593a856 100644
--- a/graphlcd/logos/HR SKYLINE_l.glcd
+++ b/graphlcd/logos/channels/HR SKYLINE_l.glcd
diff --git a/graphlcd/logos/HR SKYLINE_m.glcd b/graphlcd/logos/channels/HR SKYLINE_m.glcd
index 96bb038..96bb038 100644
--- a/graphlcd/logos/HR SKYLINE_m.glcd
+++ b/graphlcd/logos/channels/HR SKYLINE_m.glcd
diff --git a/graphlcd/logos/HR SKYLINE_v2_m.glcd b/graphlcd/logos/channels/HR SKYLINE_v2_m.glcd
index 1661dfc..1661dfc 100644
--- a/graphlcd/logos/HR SKYLINE_v2_m.glcd
+++ b/graphlcd/logos/channels/HR SKYLINE_v2_m.glcd
diff --git a/graphlcd/logos/HR1_l.glcd b/graphlcd/logos/channels/HR1_l.glcd
index 952f1b7..952f1b7 100644
--- a/graphlcd/logos/HR1_l.glcd
+++ b/graphlcd/logos/channels/HR1_l.glcd
diff --git a/graphlcd/logos/HR1_m.glcd b/graphlcd/logos/channels/HR1_m.glcd
index 6ef4da1..6ef4da1 100644
--- a/graphlcd/logos/HR1_m.glcd
+++ b/graphlcd/logos/channels/HR1_m.glcd
diff --git a/graphlcd/logos/HR2_l.glcd b/graphlcd/logos/channels/HR2_l.glcd
index 54b049d..54b049d 100644
--- a/graphlcd/logos/HR2_l.glcd
+++ b/graphlcd/logos/channels/HR2_l.glcd
diff --git a/graphlcd/logos/HR2_m.glcd b/graphlcd/logos/channels/HR2_m.glcd
index 11cf851..11cf851 100644
--- a/graphlcd/logos/HR2_m.glcd
+++ b/graphlcd/logos/channels/HR2_m.glcd
diff --git a/graphlcd/logos/HSE24_l.glcd b/graphlcd/logos/channels/HSE24_l.glcd
index 4a50bd1..4a50bd1 100644
--- a/graphlcd/logos/HSE24_l.glcd
+++ b/graphlcd/logos/channels/HSE24_l.glcd
diff --git a/graphlcd/logos/HSE24_m.glcd b/graphlcd/logos/channels/HSE24_m.glcd
index 00371d0..00371d0 100644
--- a/graphlcd/logos/HSE24_m.glcd
+++ b/graphlcd/logos/channels/HSE24_m.glcd
diff --git a/graphlcd/logos/HSE24_v2_m.glcd b/graphlcd/logos/channels/HSE24_v2_m.glcd
index 374a9cb..374a9cb 100644
--- a/graphlcd/logos/HSE24_v2_m.glcd
+++ b/graphlcd/logos/channels/HSE24_v2_m.glcd
diff --git a/graphlcd/logos/HUNDERT6 RADIO_l.glcd b/graphlcd/logos/channels/HUNDERT6 RADIO_l.glcd
index 67d3792..67d3792 100644
--- a/graphlcd/logos/HUNDERT6 RADIO_l.glcd
+++ b/graphlcd/logos/channels/HUNDERT6 RADIO_l.glcd
diff --git a/graphlcd/logos/HUNDERT6 RADIO_m.glcd b/graphlcd/logos/channels/HUNDERT6 RADIO_m.glcd
index af348fc..af348fc 100644
--- a/graphlcd/logos/HUNDERT6 RADIO_m.glcd
+++ b/graphlcd/logos/channels/HUNDERT6 RADIO_m.glcd
diff --git a/graphlcd/logos/JUMP_l.glcd b/graphlcd/logos/channels/JUMP_l.glcd
index 981cb59..981cb59 100644
--- a/graphlcd/logos/JUMP_l.glcd
+++ b/graphlcd/logos/channels/JUMP_l.glcd
diff --git a/graphlcd/logos/JUMP_m.glcd b/graphlcd/logos/channels/JUMP_m.glcd
index 2bf8ed7..2bf8ed7 100644
--- a/graphlcd/logos/JUMP_m.glcd
+++ b/graphlcd/logos/channels/JUMP_m.glcd
diff --git a/graphlcd/logos/JUNIOR_l.glcd b/graphlcd/logos/channels/JUNIOR_l.glcd
index 8981830..8981830 100644
--- a/graphlcd/logos/JUNIOR_l.glcd
+++ b/graphlcd/logos/channels/JUNIOR_l.glcd
diff --git a/graphlcd/logos/JUNIOR_m.glcd b/graphlcd/logos/channels/JUNIOR_m.glcd
index 9fd377b..9fd377b 100644
--- a/graphlcd/logos/JUNIOR_m.glcd
+++ b/graphlcd/logos/channels/JUNIOR_m.glcd
diff --git a/graphlcd/logos/JUNIOR_v2_l.glcd b/graphlcd/logos/channels/JUNIOR_v2_l.glcd
index 26c3666..26c3666 100644
--- a/graphlcd/logos/JUNIOR_v2_l.glcd
+++ b/graphlcd/logos/channels/JUNIOR_v2_l.glcd
diff --git a/graphlcd/logos/K TOON_l.glcd b/graphlcd/logos/channels/K TOON_l.glcd
index 936273a..936273a 100644
--- a/graphlcd/logos/K TOON_l.glcd
+++ b/graphlcd/logos/channels/K TOON_l.glcd
diff --git a/graphlcd/logos/K TOON_m.glcd b/graphlcd/logos/channels/K TOON_m.glcd
index be284ee..be284ee 100644
--- a/graphlcd/logos/K TOON_m.glcd
+++ b/graphlcd/logos/channels/K TOON_m.glcd
diff --git a/graphlcd/logos/K TOON_v2_m.glcd b/graphlcd/logos/channels/K TOON_v2_m.glcd
index d2c3a4c..d2c3a4c 100644
--- a/graphlcd/logos/K TOON_v2_m.glcd
+++ b/graphlcd/logos/channels/K TOON_v2_m.glcd
diff --git a/graphlcd/logos/K-TV_l.glcd b/graphlcd/logos/channels/K-TV_l.glcd
index b22e83c..b22e83c 100644
--- a/graphlcd/logos/K-TV_l.glcd
+++ b/graphlcd/logos/channels/K-TV_l.glcd
diff --git a/graphlcd/logos/K-TV_m.glcd b/graphlcd/logos/channels/K-TV_m.glcd
index 42a98f0..42a98f0 100644
--- a/graphlcd/logos/K-TV_m.glcd
+++ b/graphlcd/logos/channels/K-TV_m.glcd
diff --git a/graphlcd/logos/K-TV_v2_m.glcd b/graphlcd/logos/channels/K-TV_v2_m.glcd
index 9e07882..9e07882 100644
--- a/graphlcd/logos/K-TV_v2_m.glcd
+++ b/graphlcd/logos/channels/K-TV_v2_m.glcd
diff --git a/graphlcd/logos/KABEL 1 AUSTRIA_l.glcd b/graphlcd/logos/channels/KABEL 1 AUSTRIA_l.glcd
index 628df5e..628df5e 100644
--- a/graphlcd/logos/KABEL 1 AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/KABEL 1 AUSTRIA_l.glcd
diff --git a/graphlcd/logos/KABEL 1 AUSTRIA_m.glcd b/graphlcd/logos/channels/KABEL 1 AUSTRIA_m.glcd
index b57f2bd..b57f2bd 100644
--- a/graphlcd/logos/KABEL 1 AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/KABEL 1 AUSTRIA_m.glcd
diff --git a/graphlcd/logos/KABEL 1 SCHWEIZ_l.glcd b/graphlcd/logos/channels/KABEL 1 SCHWEIZ_l.glcd
index 063c594..063c594 100644
--- a/graphlcd/logos/KABEL 1 SCHWEIZ_l.glcd
+++ b/graphlcd/logos/channels/KABEL 1 SCHWEIZ_l.glcd
diff --git a/graphlcd/logos/KABEL 1 SCHWEIZ_m.glcd b/graphlcd/logos/channels/KABEL 1 SCHWEIZ_m.glcd
index 97ad2c7..97ad2c7 100644
--- a/graphlcd/logos/KABEL 1 SCHWEIZ_m.glcd
+++ b/graphlcd/logos/channels/KABEL 1 SCHWEIZ_m.glcd
diff --git a/graphlcd/logos/KABEL 1_l.glcd b/graphlcd/logos/channels/KABEL 1_l.glcd
index 2413092..2413092 100644
--- a/graphlcd/logos/KABEL 1_l.glcd
+++ b/graphlcd/logos/channels/KABEL 1_l.glcd
diff --git a/graphlcd/logos/KABEL 1_m.glcd b/graphlcd/logos/channels/KABEL 1_m.glcd
index 5be531b..5be531b 100644
--- a/graphlcd/logos/KABEL 1_m.glcd
+++ b/graphlcd/logos/channels/KABEL 1_m.glcd
diff --git a/graphlcd/logos/KIKA_l.glcd b/graphlcd/logos/channels/KIKA_l.glcd
index 4cba709..4cba709 100644
--- a/graphlcd/logos/KIKA_l.glcd
+++ b/graphlcd/logos/channels/KIKA_l.glcd
diff --git a/graphlcd/logos/KIKA_m.glcd b/graphlcd/logos/channels/KIKA_m.glcd
index 96f71c9..96f71c9 100644
--- a/graphlcd/logos/KIKA_m.glcd
+++ b/graphlcd/logos/channels/KIKA_m.glcd
diff --git a/graphlcd/logos/KINK FM_l.glcd b/graphlcd/logos/channels/KINK FM_l.glcd
index d1b9e99..d1b9e99 100644
--- a/graphlcd/logos/KINK FM_l.glcd
+++ b/graphlcd/logos/channels/KINK FM_l.glcd
diff --git a/graphlcd/logos/KINK FM_m.glcd b/graphlcd/logos/channels/KINK FM_m.glcd
index f9ddd52..f9ddd52 100644
--- a/graphlcd/logos/KINK FM_m.glcd
+++ b/graphlcd/logos/channels/KINK FM_m.glcd
diff --git a/graphlcd/logos/KINOWELT_l.glcd b/graphlcd/logos/channels/KINOWELT_l.glcd
index e0f4f33..e0f4f33 100644
--- a/graphlcd/logos/KINOWELT_l.glcd
+++ b/graphlcd/logos/channels/KINOWELT_l.glcd
diff --git a/graphlcd/logos/KRIMICO_l.glcd b/graphlcd/logos/channels/KRIMICO_l.glcd
index 20d6a99..20d6a99 100644
--- a/graphlcd/logos/KRIMICO_l.glcd
+++ b/graphlcd/logos/channels/KRIMICO_l.glcd
diff --git a/graphlcd/logos/KRIMICO_m.glcd b/graphlcd/logos/channels/KRIMICO_m.glcd
index cdff586..cdff586 100644
--- a/graphlcd/logos/KRIMICO_m.glcd
+++ b/graphlcd/logos/channels/KRIMICO_m.glcd
diff --git a/graphlcd/logos/KTO_l.glcd b/graphlcd/logos/channels/KTO_l.glcd
index a6c3170..a6c3170 100644
--- a/graphlcd/logos/KTO_l.glcd
+++ b/graphlcd/logos/channels/KTO_l.glcd
diff --git a/graphlcd/logos/KTO_m.glcd b/graphlcd/logos/channels/KTO_m.glcd
index 4222646..4222646 100644
--- a/graphlcd/logos/KTO_m.glcd
+++ b/graphlcd/logos/channels/KTO_m.glcd
diff --git a/graphlcd/logos/L1MBURG_l.glcd b/graphlcd/logos/channels/L1MBURG_l.glcd
index 0e50e3a..0e50e3a 100644
--- a/graphlcd/logos/L1MBURG_l.glcd
+++ b/graphlcd/logos/channels/L1MBURG_l.glcd
diff --git a/graphlcd/logos/L1MBURG_m.glcd b/graphlcd/logos/channels/L1MBURG_m.glcd
index 984a117..984a117 100644
--- a/graphlcd/logos/L1MBURG_m.glcd
+++ b/graphlcd/logos/channels/L1MBURG_m.glcd
diff --git a/graphlcd/logos/LASTMINUTE_l.glcd b/graphlcd/logos/channels/LASTMINUTE_l.glcd
index 252d343..252d343 100644
--- a/graphlcd/logos/LASTMINUTE_l.glcd
+++ b/graphlcd/logos/channels/LASTMINUTE_l.glcd
diff --git a/graphlcd/logos/LASTMINUTE_m.glcd b/graphlcd/logos/channels/LASTMINUTE_m.glcd
index cefd1fa..cefd1fa 100644
--- a/graphlcd/logos/LASTMINUTE_m.glcd
+++ b/graphlcd/logos/channels/LASTMINUTE_m.glcd
diff --git a/graphlcd/logos/LASTMINUTE_v2_m.glcd b/graphlcd/logos/channels/LASTMINUTE_v2_m.glcd
index 60bbb84..60bbb84 100644
--- a/graphlcd/logos/LASTMINUTE_v2_m.glcd
+++ b/graphlcd/logos/channels/LASTMINUTE_v2_m.glcd
diff --git a/graphlcd/logos/LCI_m.glcd b/graphlcd/logos/channels/LCI_m.glcd
index 69c0db2..69c0db2 100644
--- a/graphlcd/logos/LCI_m.glcd
+++ b/graphlcd/logos/channels/LCI_m.glcd
diff --git a/graphlcd/logos/LCP_l.glcd b/graphlcd/logos/channels/LCP_l.glcd
index a216ea8..a216ea8 100644
--- a/graphlcd/logos/LCP_l.glcd
+++ b/graphlcd/logos/channels/LCP_l.glcd
diff --git a/graphlcd/logos/LIBERTY TV_l.glcd b/graphlcd/logos/channels/LIBERTY TV_l.glcd
index c905a56..c905a56 100644
--- a/graphlcd/logos/LIBERTY TV_l.glcd
+++ b/graphlcd/logos/channels/LIBERTY TV_l.glcd
diff --git a/graphlcd/logos/LIBERTY TV_m.glcd b/graphlcd/logos/channels/LIBERTY TV_m.glcd
index e4ea29d..e4ea29d 100644
--- a/graphlcd/logos/LIBERTY TV_m.glcd
+++ b/graphlcd/logos/channels/LIBERTY TV_m.glcd
diff --git a/graphlcd/logos/LIBERTY TV_v2_m.glcd b/graphlcd/logos/channels/LIBERTY TV_v2_m.glcd
index 6eafbc9..6eafbc9 100644
--- a/graphlcd/logos/LIBERTY TV_v2_m.glcd
+++ b/graphlcd/logos/channels/LIBERTY TV_v2_m.glcd
diff --git a/graphlcd/logos/LIVE 1_m.glcd b/graphlcd/logos/channels/LIVE 1_m.glcd
index 39ad718..39ad718 100644
--- a/graphlcd/logos/LIVE 1_m.glcd
+++ b/graphlcd/logos/channels/LIVE 1_m.glcd
diff --git a/graphlcd/logos/MATCH TV_m.glcd b/graphlcd/logos/channels/MATCH TV_m.glcd
index c2e9462..c2e9462 100644
--- a/graphlcd/logos/MATCH TV_m.glcd
+++ b/graphlcd/logos/channels/MATCH TV_m.glcd
diff --git a/graphlcd/logos/MAXIMA FM_l.glcd b/graphlcd/logos/channels/MAXIMA FM_l.glcd
index 42cf233..42cf233 100644
--- a/graphlcd/logos/MAXIMA FM_l.glcd
+++ b/graphlcd/logos/channels/MAXIMA FM_l.glcd
diff --git a/graphlcd/logos/MAXIMA FM_m.glcd b/graphlcd/logos/channels/MAXIMA FM_m.glcd
index 16753a3..16753a3 100644
--- a/graphlcd/logos/MAXIMA FM_m.glcd
+++ b/graphlcd/logos/channels/MAXIMA FM_m.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN SA_l.glcd b/graphlcd/logos/channels/MDR FERNSEHEN SA_l.glcd
index 3f684e2..3f684e2 100644
--- a/graphlcd/logos/MDR FERNSEHEN SA_l.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN SA_l.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN SA_m.glcd b/graphlcd/logos/channels/MDR FERNSEHEN SA_m.glcd
index 80635a9..80635a9 100644
--- a/graphlcd/logos/MDR FERNSEHEN SA_m.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN SA_m.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN S_l.glcd b/graphlcd/logos/channels/MDR FERNSEHEN S_l.glcd
index 5742792..5742792 100644
--- a/graphlcd/logos/MDR FERNSEHEN S_l.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN S_l.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN S_m.glcd b/graphlcd/logos/channels/MDR FERNSEHEN S_m.glcd
index a4779f4..a4779f4 100644
--- a/graphlcd/logos/MDR FERNSEHEN S_m.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN S_m.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN TH_l.glcd b/graphlcd/logos/channels/MDR FERNSEHEN TH_l.glcd
index 10fee6b..10fee6b 100644
--- a/graphlcd/logos/MDR FERNSEHEN TH_l.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN TH_l.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN TH_m.glcd b/graphlcd/logos/channels/MDR FERNSEHEN TH_m.glcd
index 7fef753..7fef753 100644
--- a/graphlcd/logos/MDR FERNSEHEN TH_m.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN TH_m.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN_l.glcd b/graphlcd/logos/channels/MDR FERNSEHEN_l.glcd
index b13f745..b13f745 100644
--- a/graphlcd/logos/MDR FERNSEHEN_l.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN_l.glcd
diff --git a/graphlcd/logos/MDR FERNSEHEN_m.glcd b/graphlcd/logos/channels/MDR FERNSEHEN_m.glcd
index 6c173bd..6c173bd 100644
--- a/graphlcd/logos/MDR FERNSEHEN_m.glcd
+++ b/graphlcd/logos/channels/MDR FERNSEHEN_m.glcd
diff --git a/graphlcd/logos/MDR FIGARO_l.glcd b/graphlcd/logos/channels/MDR FIGARO_l.glcd
index 33fce31..33fce31 100644
--- a/graphlcd/logos/MDR FIGARO_l.glcd
+++ b/graphlcd/logos/channels/MDR FIGARO_l.glcd
diff --git a/graphlcd/logos/MDR FIGARO_m.glcd b/graphlcd/logos/channels/MDR FIGARO_m.glcd
index 870aa21..870aa21 100644
--- a/graphlcd/logos/MDR FIGARO_m.glcd
+++ b/graphlcd/logos/channels/MDR FIGARO_m.glcd
diff --git a/graphlcd/logos/MDR FIGARO_v2_m.glcd b/graphlcd/logos/channels/MDR FIGARO_v2_m.glcd
index 9421c8d..9421c8d 100644
--- a/graphlcd/logos/MDR FIGARO_v2_m.glcd
+++ b/graphlcd/logos/channels/MDR FIGARO_v2_m.glcd
diff --git a/graphlcd/logos/MDR INFO_l.glcd b/graphlcd/logos/channels/MDR INFO_l.glcd
index 7bd47b2..7bd47b2 100644
--- a/graphlcd/logos/MDR INFO_l.glcd
+++ b/graphlcd/logos/channels/MDR INFO_l.glcd
diff --git a/graphlcd/logos/MDR INFO_m.glcd b/graphlcd/logos/channels/MDR INFO_m.glcd
index 8d5158a..8d5158a 100644
--- a/graphlcd/logos/MDR INFO_m.glcd
+++ b/graphlcd/logos/channels/MDR INFO_m.glcd
diff --git a/graphlcd/logos/MEDIA TROPICAL_l.glcd b/graphlcd/logos/channels/MEDIA TROPICAL_l.glcd
index a8f0761..a8f0761 100644
--- a/graphlcd/logos/MEDIA TROPICAL_l.glcd
+++ b/graphlcd/logos/channels/MEDIA TROPICAL_l.glcd
diff --git a/graphlcd/logos/MEDIA TROPICAL_m.glcd b/graphlcd/logos/channels/MEDIA TROPICAL_m.glcd
index 33ae45e..33ae45e 100644
--- a/graphlcd/logos/MEDIA TROPICAL_m.glcd
+++ b/graphlcd/logos/channels/MEDIA TROPICAL_m.glcd
diff --git a/graphlcd/logos/MGM_l.glcd b/graphlcd/logos/channels/MGM_l.glcd
index 671a722..671a722 100644
--- a/graphlcd/logos/MGM_l.glcd
+++ b/graphlcd/logos/channels/MGM_l.glcd
diff --git a/graphlcd/logos/MGM_m.glcd b/graphlcd/logos/channels/MGM_m.glcd
index 3a7aee8..3a7aee8 100644
--- a/graphlcd/logos/MGM_m.glcd
+++ b/graphlcd/logos/channels/MGM_m.glcd
diff --git a/graphlcd/logos/MOTORS TV_l.glcd b/graphlcd/logos/channels/MOTORS TV_l.glcd
index bfb4ca8..bfb4ca8 100644
--- a/graphlcd/logos/MOTORS TV_l.glcd
+++ b/graphlcd/logos/channels/MOTORS TV_l.glcd
diff --git a/graphlcd/logos/MOTORS TV_m.glcd b/graphlcd/logos/channels/MOTORS TV_m.glcd
index de02e3e..de02e3e 100644
--- a/graphlcd/logos/MOTORS TV_m.glcd
+++ b/graphlcd/logos/channels/MOTORS TV_m.glcd
diff --git a/graphlcd/logos/MOTORS TV_v2_m.glcd b/graphlcd/logos/channels/MOTORS TV_v2_m.glcd
index 34e196c..34e196c 100644
--- a/graphlcd/logos/MOTORS TV_v2_m.glcd
+++ b/graphlcd/logos/channels/MOTORS TV_v2_m.glcd
diff --git a/graphlcd/logos/MTV 2 POP CHANNEL_l.glcd b/graphlcd/logos/channels/MTV 2 POP CHANNEL_l.glcd
index 118119d..118119d 100644
--- a/graphlcd/logos/MTV 2 POP CHANNEL_l.glcd
+++ b/graphlcd/logos/channels/MTV 2 POP CHANNEL_l.glcd
diff --git a/graphlcd/logos/MTV 2 POP CHANNEL_m.glcd b/graphlcd/logos/channels/MTV 2 POP CHANNEL_m.glcd
index f262291..f262291 100644
--- a/graphlcd/logos/MTV 2 POP CHANNEL_m.glcd
+++ b/graphlcd/logos/channels/MTV 2 POP CHANNEL_m.glcd
diff --git a/graphlcd/logos/MTV 2_l.glcd b/graphlcd/logos/channels/MTV 2_l.glcd
index 22cebd0..22cebd0 100644
--- a/graphlcd/logos/MTV 2_l.glcd
+++ b/graphlcd/logos/channels/MTV 2_l.glcd
diff --git a/graphlcd/logos/MTV BASE_l.glcd b/graphlcd/logos/channels/MTV BASE_l.glcd
index c486eb5..c486eb5 100644
--- a/graphlcd/logos/MTV BASE_l.glcd
+++ b/graphlcd/logos/channels/MTV BASE_l.glcd
diff --git a/graphlcd/logos/MTV BASE_m.glcd b/graphlcd/logos/channels/MTV BASE_m.glcd
index f2f3ce4..f2f3ce4 100644
--- a/graphlcd/logos/MTV BASE_m.glcd
+++ b/graphlcd/logos/channels/MTV BASE_m.glcd
diff --git a/graphlcd/logos/MTV CENTRAL_l.glcd b/graphlcd/logos/channels/MTV CENTRAL_l.glcd
index 3fb8e3f..3fb8e3f 100644
--- a/graphlcd/logos/MTV CENTRAL_l.glcd
+++ b/graphlcd/logos/channels/MTV CENTRAL_l.glcd
diff --git a/graphlcd/logos/MTV CENTRAL_m.glcd b/graphlcd/logos/channels/MTV CENTRAL_m.glcd
index f2de32b..f2de32b 100644
--- a/graphlcd/logos/MTV CENTRAL_m.glcd
+++ b/graphlcd/logos/channels/MTV CENTRAL_m.glcd
diff --git a/graphlcd/logos/MTV CENTRAL_v2_m.glcd b/graphlcd/logos/channels/MTV CENTRAL_v2_m.glcd
index 6f5fa72..6f5fa72 100644
--- a/graphlcd/logos/MTV CENTRAL_v2_m.glcd
+++ b/graphlcd/logos/channels/MTV CENTRAL_v2_m.glcd
diff --git a/graphlcd/logos/MTV DANCE_l.glcd b/graphlcd/logos/channels/MTV DANCE_l.glcd
index be83922..be83922 100644
--- a/graphlcd/logos/MTV DANCE_l.glcd
+++ b/graphlcd/logos/channels/MTV DANCE_l.glcd
diff --git a/graphlcd/logos/MTV F_l.glcd b/graphlcd/logos/channels/MTV F_l.glcd
index f140bf6..f140bf6 100644
--- a/graphlcd/logos/MTV F_l.glcd
+++ b/graphlcd/logos/channels/MTV F_l.glcd
diff --git a/graphlcd/logos/MTV HITS_l.glcd b/graphlcd/logos/channels/MTV HITS_l.glcd
index c15ec4d..c15ec4d 100644
--- a/graphlcd/logos/MTV HITS_l.glcd
+++ b/graphlcd/logos/channels/MTV HITS_l.glcd
diff --git a/graphlcd/logos/MTV HITS_m.glcd b/graphlcd/logos/channels/MTV HITS_m.glcd
index bdc6a67..bdc6a67 100644
--- a/graphlcd/logos/MTV HITS_m.glcd
+++ b/graphlcd/logos/channels/MTV HITS_m.glcd
diff --git a/graphlcd/logos/MTV_l.glcd b/graphlcd/logos/channels/MTV_l.glcd
index 487d888..487d888 100644
--- a/graphlcd/logos/MTV_l.glcd
+++ b/graphlcd/logos/channels/MTV_l.glcd
diff --git a/graphlcd/logos/MULTIVISION_m.glcd b/graphlcd/logos/channels/MULTIVISION_m.glcd
index 33a286a..33a286a 100644
--- a/graphlcd/logos/MULTIVISION_m.glcd
+++ b/graphlcd/logos/channels/MULTIVISION_m.glcd
diff --git a/graphlcd/logos/N-TV_l.glcd b/graphlcd/logos/channels/N-TV_l.glcd
index 1183167..1183167 100644
--- a/graphlcd/logos/N-TV_l.glcd
+++ b/graphlcd/logos/channels/N-TV_l.glcd
diff --git a/graphlcd/logos/N-TV_m.glcd b/graphlcd/logos/channels/N-TV_m.glcd
index 872793f..872793f 100644
--- a/graphlcd/logos/N-TV_m.glcd
+++ b/graphlcd/logos/channels/N-TV_m.glcd
diff --git a/graphlcd/logos/N-TV_v2_m.glcd b/graphlcd/logos/channels/N-TV_v2_m.glcd
index e063715..e063715 100644
--- a/graphlcd/logos/N-TV_v2_m.glcd
+++ b/graphlcd/logos/channels/N-TV_v2_m.glcd
diff --git a/graphlcd/logos/N24_l.glcd b/graphlcd/logos/channels/N24_l.glcd
index 0fd10c9..0fd10c9 100644
--- a/graphlcd/logos/N24_l.glcd
+++ b/graphlcd/logos/channels/N24_l.glcd
diff --git a/graphlcd/logos/N24_m.glcd b/graphlcd/logos/channels/N24_m.glcd
index c5f839e..c5f839e 100644
--- a/graphlcd/logos/N24_m.glcd
+++ b/graphlcd/logos/channels/N24_m.glcd
diff --git a/graphlcd/logos/N24_v2_l.glcd b/graphlcd/logos/channels/N24_v2_l.glcd
index c556010..c556010 100644
--- a/graphlcd/logos/N24_v2_l.glcd
+++ b/graphlcd/logos/channels/N24_v2_l.glcd
diff --git a/graphlcd/logos/NASN_l.glcd b/graphlcd/logos/channels/NASN_l.glcd
index cdba969..cdba969 100644
--- a/graphlcd/logos/NASN_l.glcd
+++ b/graphlcd/logos/channels/NASN_l.glcd
diff --git a/graphlcd/logos/NATIONAL GEOGRAPHIC_l.glcd b/graphlcd/logos/channels/NATIONAL GEOGRAPHIC_l.glcd
index c90abe7..c90abe7 100644
--- a/graphlcd/logos/NATIONAL GEOGRAPHIC_l.glcd
+++ b/graphlcd/logos/channels/NATIONAL GEOGRAPHIC_l.glcd
diff --git a/graphlcd/logos/NBC_l.glcd b/graphlcd/logos/channels/NBC_l.glcd
index cba7b8e..cba7b8e 100644
--- a/graphlcd/logos/NBC_l.glcd
+++ b/graphlcd/logos/channels/NBC_l.glcd
diff --git a/graphlcd/logos/NBC_m.glcd b/graphlcd/logos/channels/NBC_m.glcd
index f0a5e68..f0a5e68 100644
--- a/graphlcd/logos/NBC_m.glcd
+++ b/graphlcd/logos/channels/NBC_m.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN HH_l.glcd b/graphlcd/logos/channels/NDR FERNSEHEN HH_l.glcd
index 5d93658..5d93658 100644
--- a/graphlcd/logos/NDR FERNSEHEN HH_l.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN HH_l.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN HH_m.glcd b/graphlcd/logos/channels/NDR FERNSEHEN HH_m.glcd
index 7784e4b..7784e4b 100644
--- a/graphlcd/logos/NDR FERNSEHEN HH_m.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN HH_m.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN MV_l.glcd b/graphlcd/logos/channels/NDR FERNSEHEN MV_l.glcd
index b0b82fe..b0b82fe 100644
--- a/graphlcd/logos/NDR FERNSEHEN MV_l.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN MV_l.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN MV_m.glcd b/graphlcd/logos/channels/NDR FERNSEHEN MV_m.glcd
index 7e0a763..7e0a763 100644
--- a/graphlcd/logos/NDR FERNSEHEN MV_m.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN MV_m.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN NDS_l.glcd b/graphlcd/logos/channels/NDR FERNSEHEN NDS_l.glcd
index 1960b76..1960b76 100644
--- a/graphlcd/logos/NDR FERNSEHEN NDS_l.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN NDS_l.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN NDS_m.glcd b/graphlcd/logos/channels/NDR FERNSEHEN NDS_m.glcd
index 77db508..77db508 100644
--- a/graphlcd/logos/NDR FERNSEHEN NDS_m.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN NDS_m.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN SH_l.glcd b/graphlcd/logos/channels/NDR FERNSEHEN SH_l.glcd
index d834fa4..d834fa4 100644
--- a/graphlcd/logos/NDR FERNSEHEN SH_l.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN SH_l.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN SH_m.glcd b/graphlcd/logos/channels/NDR FERNSEHEN SH_m.glcd
index e1e30b8..e1e30b8 100644
--- a/graphlcd/logos/NDR FERNSEHEN SH_m.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN SH_m.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN_l.glcd b/graphlcd/logos/channels/NDR FERNSEHEN_l.glcd
index 999ad4d..999ad4d 100644
--- a/graphlcd/logos/NDR FERNSEHEN_l.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN_l.glcd
diff --git a/graphlcd/logos/NDR FERNSEHEN_m.glcd b/graphlcd/logos/channels/NDR FERNSEHEN_m.glcd
index aeb6eb8..aeb6eb8 100644
--- a/graphlcd/logos/NDR FERNSEHEN_m.glcd
+++ b/graphlcd/logos/channels/NDR FERNSEHEN_m.glcd
diff --git a/graphlcd/logos/NDR INFO_l.glcd b/graphlcd/logos/channels/NDR INFO_l.glcd
index 33998e7..33998e7 100644
--- a/graphlcd/logos/NDR INFO_l.glcd
+++ b/graphlcd/logos/channels/NDR INFO_l.glcd
diff --git a/graphlcd/logos/NDR INFO_m.glcd b/graphlcd/logos/channels/NDR INFO_m.glcd
index f903c2d..f903c2d 100644
--- a/graphlcd/logos/NDR INFO_m.glcd
+++ b/graphlcd/logos/channels/NDR INFO_m.glcd
diff --git a/graphlcd/logos/NDR KULTUR_l.glcd b/graphlcd/logos/channels/NDR KULTUR_l.glcd
index c3f54ef..c3f54ef 100644
--- a/graphlcd/logos/NDR KULTUR_l.glcd
+++ b/graphlcd/logos/channels/NDR KULTUR_l.glcd
diff --git a/graphlcd/logos/NDR KULTUR_m.glcd b/graphlcd/logos/channels/NDR KULTUR_m.glcd
index 25530cf..25530cf 100644
--- a/graphlcd/logos/NDR KULTUR_m.glcd
+++ b/graphlcd/logos/channels/NDR KULTUR_m.glcd
diff --git a/graphlcd/logos/NED1_l.glcd b/graphlcd/logos/channels/NED1_l.glcd
index cc646c9..cc646c9 100644
--- a/graphlcd/logos/NED1_l.glcd
+++ b/graphlcd/logos/channels/NED1_l.glcd
diff --git a/graphlcd/logos/NED1_m.glcd b/graphlcd/logos/channels/NED1_m.glcd
index 5d3c4f7..5d3c4f7 100644
--- a/graphlcd/logos/NED1_m.glcd
+++ b/graphlcd/logos/channels/NED1_m.glcd
diff --git a/graphlcd/logos/NED2_l.glcd b/graphlcd/logos/channels/NED2_l.glcd
index cc4b26b..cc4b26b 100644
--- a/graphlcd/logos/NED2_l.glcd
+++ b/graphlcd/logos/channels/NED2_l.glcd
diff --git a/graphlcd/logos/NED2_m.glcd b/graphlcd/logos/channels/NED2_m.glcd
index d125a6b..d125a6b 100644
--- a/graphlcd/logos/NED2_m.glcd
+++ b/graphlcd/logos/channels/NED2_m.glcd
diff --git a/graphlcd/logos/NED3_l.glcd b/graphlcd/logos/channels/NED3_l.glcd
index 83a391f..83a391f 100644
--- a/graphlcd/logos/NED3_l.glcd
+++ b/graphlcd/logos/channels/NED3_l.glcd
diff --git a/graphlcd/logos/NED3_m.glcd b/graphlcd/logos/channels/NED3_m.glcd
index 35b3235..35b3235 100644
--- a/graphlcd/logos/NED3_m.glcd
+++ b/graphlcd/logos/channels/NED3_m.glcd
diff --git a/graphlcd/logos/NET5_l.glcd b/graphlcd/logos/channels/NET5_l.glcd
index 373524f..373524f 100644
--- a/graphlcd/logos/NET5_l.glcd
+++ b/graphlcd/logos/channels/NET5_l.glcd
diff --git a/graphlcd/logos/NET5_m.glcd b/graphlcd/logos/channels/NET5_m.glcd
index e3a7db3..e3a7db3 100644
--- a/graphlcd/logos/NET5_m.glcd
+++ b/graphlcd/logos/channels/NET5_m.glcd
diff --git a/graphlcd/logos/NEUN LIVE_l.glcd b/graphlcd/logos/channels/NEUN LIVE_l.glcd
index 42f21c1..42f21c1 100644
--- a/graphlcd/logos/NEUN LIVE_l.glcd
+++ b/graphlcd/logos/channels/NEUN LIVE_l.glcd
diff --git a/graphlcd/logos/NEUN LIVE_m.glcd b/graphlcd/logos/channels/NEUN LIVE_m.glcd
index b871163..b871163 100644
--- a/graphlcd/logos/NEUN LIVE_m.glcd
+++ b/graphlcd/logos/channels/NEUN LIVE_m.glcd
diff --git a/graphlcd/logos/NEUN LIVE_v2_m.glcd b/graphlcd/logos/channels/NEUN LIVE_v2_m.glcd
index f0d6e86..f0d6e86 100644
--- a/graphlcd/logos/NEUN LIVE_v2_m.glcd
+++ b/graphlcd/logos/channels/NEUN LIVE_v2_m.glcd
diff --git a/graphlcd/logos/NICKELODEON_l.glcd b/graphlcd/logos/channels/NICKELODEON_l.glcd
index f2fdc89..f2fdc89 100644
--- a/graphlcd/logos/NICKELODEON_l.glcd
+++ b/graphlcd/logos/channels/NICKELODEON_l.glcd
diff --git a/graphlcd/logos/NICKELODEON_m.glcd b/graphlcd/logos/channels/NICKELODEON_m.glcd
index 8253643..8253643 100644
--- a/graphlcd/logos/NICKELODEON_m.glcd
+++ b/graphlcd/logos/channels/NICKELODEON_m.glcd
diff --git a/graphlcd/logos/NICK_l.glcd b/graphlcd/logos/channels/NICK_l.glcd
index cf6dbda..cf6dbda 100644
--- a/graphlcd/logos/NICK_l.glcd
+++ b/graphlcd/logos/channels/NICK_l.glcd
diff --git a/graphlcd/logos/NORDWEST RADIO_l.glcd b/graphlcd/logos/channels/NORDWEST RADIO_l.glcd
index c48ee07..c48ee07 100644
--- a/graphlcd/logos/NORDWEST RADIO_l.glcd
+++ b/graphlcd/logos/channels/NORDWEST RADIO_l.glcd
diff --git a/graphlcd/logos/NORDWEST RADIO_m.glcd b/graphlcd/logos/channels/NORDWEST RADIO_m.glcd
index 895000f..895000f 100644
--- a/graphlcd/logos/NORDWEST RADIO_m.glcd
+++ b/graphlcd/logos/channels/NORDWEST RADIO_m.glcd
diff --git a/graphlcd/logos/NORDWEST RADIO_v2_m.glcd b/graphlcd/logos/channels/NORDWEST RADIO_v2_m.glcd
index 4c7a50e..4c7a50e 100644
--- a/graphlcd/logos/NORDWEST RADIO_v2_m.glcd
+++ b/graphlcd/logos/channels/NORDWEST RADIO_v2_m.glcd
diff --git a/graphlcd/logos/NRJ_l.glcd b/graphlcd/logos/channels/NRJ_l.glcd
index 7df7c0a..7df7c0a 100644
--- a/graphlcd/logos/NRJ_l.glcd
+++ b/graphlcd/logos/channels/NRJ_l.glcd
diff --git a/graphlcd/logos/NRJ_m.glcd b/graphlcd/logos/channels/NRJ_m.glcd
index 5424d41..5424d41 100644
--- a/graphlcd/logos/NRJ_m.glcd
+++ b/graphlcd/logos/channels/NRJ_m.glcd
diff --git a/graphlcd/logos/OESTERREICH 1_l.glcd b/graphlcd/logos/channels/OESTERREICH 1_l.glcd
index 4d35400..4d35400 100644
--- a/graphlcd/logos/OESTERREICH 1_l.glcd
+++ b/graphlcd/logos/channels/OESTERREICH 1_l.glcd
diff --git a/graphlcd/logos/OESTERREICH 1_m.glcd b/graphlcd/logos/channels/OESTERREICH 1_m.glcd
index 6c8a132..6c8a132 100644
--- a/graphlcd/logos/OESTERREICH 1_m.glcd
+++ b/graphlcd/logos/channels/OESTERREICH 1_m.glcd
diff --git a/graphlcd/logos/OESTERREICH 3_l.glcd b/graphlcd/logos/channels/OESTERREICH 3_l.glcd
index 59d4519..59d4519 100644
--- a/graphlcd/logos/OESTERREICH 3_l.glcd
+++ b/graphlcd/logos/channels/OESTERREICH 3_l.glcd
diff --git a/graphlcd/logos/OESTERREICH 3_m.glcd b/graphlcd/logos/channels/OESTERREICH 3_m.glcd
index 22e7b3a..22e7b3a 100644
--- a/graphlcd/logos/OESTERREICH 3_m.glcd
+++ b/graphlcd/logos/channels/OESTERREICH 3_m.glcd
diff --git a/graphlcd/logos/ONTV_l.glcd b/graphlcd/logos/channels/ONTV_l.glcd
index 3d30545..3d30545 100644
--- a/graphlcd/logos/ONTV_l.glcd
+++ b/graphlcd/logos/channels/ONTV_l.glcd
diff --git a/graphlcd/logos/ONTV_m.glcd b/graphlcd/logos/channels/ONTV_m.glcd
index dd1dd72..dd1dd72 100644
--- a/graphlcd/logos/ONTV_m.glcd
+++ b/graphlcd/logos/channels/ONTV_m.glcd
diff --git a/graphlcd/logos/ONTV_v2_m.glcd b/graphlcd/logos/channels/ONTV_v2_m.glcd
index c7f75b6..c7f75b6 100644
--- a/graphlcd/logos/ONTV_v2_m.glcd
+++ b/graphlcd/logos/channels/ONTV_v2_m.glcd
diff --git a/graphlcd/logos/ONYX TV_l.glcd b/graphlcd/logos/channels/ONYX TV_l.glcd
index 928a766..928a766 100644
--- a/graphlcd/logos/ONYX TV_l.glcd
+++ b/graphlcd/logos/channels/ONYX TV_l.glcd
diff --git a/graphlcd/logos/ONYX TV_m.glcd b/graphlcd/logos/channels/ONYX TV_m.glcd
index 10f3bdb..10f3bdb 100644
--- a/graphlcd/logos/ONYX TV_m.glcd
+++ b/graphlcd/logos/channels/ONYX TV_m.glcd
diff --git a/graphlcd/logos/ORF 1_l.glcd b/graphlcd/logos/channels/ORF 1_l.glcd
index 457b7db..457b7db 100644
--- a/graphlcd/logos/ORF 1_l.glcd
+++ b/graphlcd/logos/channels/ORF 1_l.glcd
diff --git a/graphlcd/logos/ORF 1_m.glcd b/graphlcd/logos/channels/ORF 1_m.glcd
index 48346ac..48346ac 100644
--- a/graphlcd/logos/ORF 1_m.glcd
+++ b/graphlcd/logos/channels/ORF 1_m.glcd
diff --git a/graphlcd/logos/ORF 2 BURGENLAND_l.glcd b/graphlcd/logos/channels/ORF 2 BURGENLAND_l.glcd
index 3c76598..3c76598 100644
--- a/graphlcd/logos/ORF 2 BURGENLAND_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 BURGENLAND_l.glcd
diff --git a/graphlcd/logos/ORF 2 BURGENLAND_m.glcd b/graphlcd/logos/channels/ORF 2 BURGENLAND_m.glcd
index cdaeb84..cdaeb84 100644
--- a/graphlcd/logos/ORF 2 BURGENLAND_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 BURGENLAND_m.glcd
diff --git a/graphlcd/logos/ORF 2 KAERNTEN_l.glcd b/graphlcd/logos/channels/ORF 2 KAERNTEN_l.glcd
index 17e701b..17e701b 100644
--- a/graphlcd/logos/ORF 2 KAERNTEN_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 KAERNTEN_l.glcd
diff --git a/graphlcd/logos/ORF 2 KAERNTEN_m.glcd b/graphlcd/logos/channels/ORF 2 KAERNTEN_m.glcd
index 2ce5f2a..2ce5f2a 100644
--- a/graphlcd/logos/ORF 2 KAERNTEN_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 KAERNTEN_m.glcd
diff --git a/graphlcd/logos/ORF 2 NIEDEROESTERREICH_l.glcd b/graphlcd/logos/channels/ORF 2 NIEDEROESTERREICH_l.glcd
index 5e3e6c6..5e3e6c6 100644
--- a/graphlcd/logos/ORF 2 NIEDEROESTERREICH_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 NIEDEROESTERREICH_l.glcd
diff --git a/graphlcd/logos/ORF 2 NIEDEROESTERREICH_m.glcd b/graphlcd/logos/channels/ORF 2 NIEDEROESTERREICH_m.glcd
index ffc2413..ffc2413 100644
--- a/graphlcd/logos/ORF 2 NIEDEROESTERREICH_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 NIEDEROESTERREICH_m.glcd
diff --git a/graphlcd/logos/ORF 2 OBEROESTERREICH_l.glcd b/graphlcd/logos/channels/ORF 2 OBEROESTERREICH_l.glcd
index feed851..feed851 100644
--- a/graphlcd/logos/ORF 2 OBEROESTERREICH_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 OBEROESTERREICH_l.glcd
diff --git a/graphlcd/logos/ORF 2 OBEROESTERREICH_m.glcd b/graphlcd/logos/channels/ORF 2 OBEROESTERREICH_m.glcd
index 2435717..2435717 100644
--- a/graphlcd/logos/ORF 2 OBEROESTERREICH_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 OBEROESTERREICH_m.glcd
diff --git a/graphlcd/logos/ORF 2 SALZBURG_l.glcd b/graphlcd/logos/channels/ORF 2 SALZBURG_l.glcd
index 929c0f2..929c0f2 100644
--- a/graphlcd/logos/ORF 2 SALZBURG_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 SALZBURG_l.glcd
diff --git a/graphlcd/logos/ORF 2 SALZBURG_m.glcd b/graphlcd/logos/channels/ORF 2 SALZBURG_m.glcd
index 74b04ad..74b04ad 100644
--- a/graphlcd/logos/ORF 2 SALZBURG_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 SALZBURG_m.glcd
diff --git a/graphlcd/logos/ORF 2 STEIERMARK_l.glcd b/graphlcd/logos/channels/ORF 2 STEIERMARK_l.glcd
index 43bb361..43bb361 100644
--- a/graphlcd/logos/ORF 2 STEIERMARK_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 STEIERMARK_l.glcd
diff --git a/graphlcd/logos/ORF 2 STEIERMARK_m.glcd b/graphlcd/logos/channels/ORF 2 STEIERMARK_m.glcd
index 2f76745..2f76745 100644
--- a/graphlcd/logos/ORF 2 STEIERMARK_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 STEIERMARK_m.glcd
diff --git a/graphlcd/logos/ORF 2 TIROL_l.glcd b/graphlcd/logos/channels/ORF 2 TIROL_l.glcd
index 60589aa..60589aa 100644
--- a/graphlcd/logos/ORF 2 TIROL_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 TIROL_l.glcd
diff --git a/graphlcd/logos/ORF 2 TIROL_m.glcd b/graphlcd/logos/channels/ORF 2 TIROL_m.glcd
index afae7e3..afae7e3 100644
--- a/graphlcd/logos/ORF 2 TIROL_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 TIROL_m.glcd
diff --git a/graphlcd/logos/ORF 2 VORARLBERG_l.glcd b/graphlcd/logos/channels/ORF 2 VORARLBERG_l.glcd
index f79b383..f79b383 100644
--- a/graphlcd/logos/ORF 2 VORARLBERG_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 VORARLBERG_l.glcd
diff --git a/graphlcd/logos/ORF 2 VORARLBERG_m.glcd b/graphlcd/logos/channels/ORF 2 VORARLBERG_m.glcd
index 72c984d..72c984d 100644
--- a/graphlcd/logos/ORF 2 VORARLBERG_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 VORARLBERG_m.glcd
diff --git a/graphlcd/logos/ORF 2 WIEN_l.glcd b/graphlcd/logos/channels/ORF 2 WIEN_l.glcd
index ec61614..ec61614 100644
--- a/graphlcd/logos/ORF 2 WIEN_l.glcd
+++ b/graphlcd/logos/channels/ORF 2 WIEN_l.glcd
diff --git a/graphlcd/logos/ORF 2 WIEN_m.glcd b/graphlcd/logos/channels/ORF 2 WIEN_m.glcd
index cf4c07e..cf4c07e 100644
--- a/graphlcd/logos/ORF 2 WIEN_m.glcd
+++ b/graphlcd/logos/channels/ORF 2 WIEN_m.glcd
diff --git a/graphlcd/logos/ORF 2_l.glcd b/graphlcd/logos/channels/ORF 2_l.glcd
index 6fbe451..6fbe451 100644
--- a/graphlcd/logos/ORF 2_l.glcd
+++ b/graphlcd/logos/channels/ORF 2_l.glcd
diff --git a/graphlcd/logos/ORF 2_m.glcd b/graphlcd/logos/channels/ORF 2_m.glcd
index a28cb0d..a28cb0d 100644
--- a/graphlcd/logos/ORF 2_m.glcd
+++ b/graphlcd/logos/channels/ORF 2_m.glcd
diff --git a/graphlcd/logos/ORF2 RADIO_l.glcd b/graphlcd/logos/channels/ORF2 RADIO_l.glcd
index 65d086e..65d086e 100644
--- a/graphlcd/logos/ORF2 RADIO_l.glcd
+++ b/graphlcd/logos/channels/ORF2 RADIO_l.glcd
diff --git a/graphlcd/logos/ORF2 RADIO_m.glcd b/graphlcd/logos/channels/ORF2 RADIO_m.glcd
index b42e7d5..b42e7d5 100644
--- a/graphlcd/logos/ORF2 RADIO_m.glcd
+++ b/graphlcd/logos/channels/ORF2 RADIO_m.glcd
diff --git a/graphlcd/logos/OTTO SHOP_l.glcd b/graphlcd/logos/channels/OTTO SHOP_l.glcd
index d915a35..d915a35 100644
--- a/graphlcd/logos/OTTO SHOP_l.glcd
+++ b/graphlcd/logos/channels/OTTO SHOP_l.glcd
diff --git a/graphlcd/logos/OTTO SHOP_m.glcd b/graphlcd/logos/channels/OTTO SHOP_m.glcd
index a4d832b..a4d832b 100644
--- a/graphlcd/logos/OTTO SHOP_m.glcd
+++ b/graphlcd/logos/channels/OTTO SHOP_m.glcd
diff --git a/graphlcd/logos/PHOENIX_l.glcd b/graphlcd/logos/channels/PHOENIX_l.glcd
index 15fe77a..15fe77a 100644
--- a/graphlcd/logos/PHOENIX_l.glcd
+++ b/graphlcd/logos/channels/PHOENIX_l.glcd
diff --git a/graphlcd/logos/PHOENIX_m.glcd b/graphlcd/logos/channels/PHOENIX_m.glcd
index ee8c873..ee8c873 100644
--- a/graphlcd/logos/PHOENIX_m.glcd
+++ b/graphlcd/logos/channels/PHOENIX_m.glcd
diff --git a/graphlcd/logos/PHOENIX_v2_l.glcd b/graphlcd/logos/channels/PHOENIX_v2_l.glcd
index 91298f0..91298f0 100644
--- a/graphlcd/logos/PHOENIX_v2_l.glcd
+++ b/graphlcd/logos/channels/PHOENIX_v2_l.glcd
diff --git a/graphlcd/logos/PHOENIX_v2_m.glcd b/graphlcd/logos/channels/PHOENIX_v2_m.glcd
index df84f07..df84f07 100644
--- a/graphlcd/logos/PHOENIX_v2_m.glcd
+++ b/graphlcd/logos/channels/PHOENIX_v2_m.glcd
diff --git a/graphlcd/logos/PLANET RADIO_l.glcd b/graphlcd/logos/channels/PLANET RADIO_l.glcd
index a7d211b..a7d211b 100644
--- a/graphlcd/logos/PLANET RADIO_l.glcd
+++ b/graphlcd/logos/channels/PLANET RADIO_l.glcd
diff --git a/graphlcd/logos/PLANET RADIO_m.glcd b/graphlcd/logos/channels/PLANET RADIO_m.glcd
index 3328bd5..3328bd5 100644
--- a/graphlcd/logos/PLANET RADIO_m.glcd
+++ b/graphlcd/logos/channels/PLANET RADIO_m.glcd
diff --git a/graphlcd/logos/PLANET_l.glcd b/graphlcd/logos/channels/PLANET_l.glcd
index b75675c..b75675c 100644
--- a/graphlcd/logos/PLANET_l.glcd
+++ b/graphlcd/logos/channels/PLANET_l.glcd
diff --git a/graphlcd/logos/PLANET_m.glcd b/graphlcd/logos/channels/PLANET_m.glcd
index 610bb82..610bb82 100644
--- a/graphlcd/logos/PLANET_m.glcd
+++ b/graphlcd/logos/channels/PLANET_m.glcd
diff --git a/graphlcd/logos/PLAYBOY TV_l.glcd b/graphlcd/logos/channels/PLAYBOY TV_l.glcd
index 184f5ff..184f5ff 100644
--- a/graphlcd/logos/PLAYBOY TV_l.glcd
+++ b/graphlcd/logos/channels/PLAYBOY TV_l.glcd
diff --git a/graphlcd/logos/PLAYBOY_m.glcd b/graphlcd/logos/channels/PLAYBOY_m.glcd
index 6b26e08..6b26e08 100644
--- a/graphlcd/logos/PLAYBOY_m.glcd
+++ b/graphlcd/logos/channels/PLAYBOY_m.glcd
diff --git a/graphlcd/logos/PLAYHOUSE DISNEY_m.glcd b/graphlcd/logos/channels/PLAYHOUSE DISNEY_m.glcd
index f39bdf4..f39bdf4 100644
--- a/graphlcd/logos/PLAYHOUSE DISNEY_m.glcd
+++ b/graphlcd/logos/channels/PLAYHOUSE DISNEY_m.glcd
diff --git a/graphlcd/logos/PLUS 1_l.glcd b/graphlcd/logos/channels/PLUS 1_l.glcd
index 2f90c49..2f90c49 100644
--- a/graphlcd/logos/PLUS 1_l.glcd
+++ b/graphlcd/logos/channels/PLUS 1_l.glcd
diff --git a/graphlcd/logos/PREMIERE AUSTRIA_l.glcd b/graphlcd/logos/channels/PREMIERE AUSTRIA_l.glcd
index fec540c..fec540c 100644
--- a/graphlcd/logos/PREMIERE AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE AUSTRIA_l.glcd
diff --git a/graphlcd/logos/PREMIERE AUSTRIA_m.glcd b/graphlcd/logos/channels/PREMIERE AUSTRIA_m.glcd
index 695e4be..695e4be 100644
--- a/graphlcd/logos/PREMIERE AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE AUSTRIA_m.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT PORTAL_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT PORTAL_l.glcd
index 3451743..3451743 100644
--- a/graphlcd/logos/PREMIERE DIREKT PORTAL_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT PORTAL_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT PORTAL_m.glcd b/graphlcd/logos/channels/PREMIERE DIREKT PORTAL_m.glcd
index f37c6f0..f37c6f0 100644
--- a/graphlcd/logos/PREMIERE DIREKT PORTAL_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT PORTAL_m.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT1_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT1_l.glcd
index 3dcbf95..3dcbf95 100644
--- a/graphlcd/logos/PREMIERE DIREKT1_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT1_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT1_m.glcd b/graphlcd/logos/channels/PREMIERE DIREKT1_m.glcd
index 867542e..867542e 100644
--- a/graphlcd/logos/PREMIERE DIREKT1_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT1_m.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT1_v2_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT1_v2_l.glcd
index 174bcd6..174bcd6 100644
--- a/graphlcd/logos/PREMIERE DIREKT1_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT1_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT2_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT2_l.glcd
index 47634fa..47634fa 100644
--- a/graphlcd/logos/PREMIERE DIREKT2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT2_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT2_m.glcd b/graphlcd/logos/channels/PREMIERE DIREKT2_m.glcd
index 06458ff..06458ff 100644
--- a/graphlcd/logos/PREMIERE DIREKT2_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT2_m.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT2_v2_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT2_v2_l.glcd
index 4541045..4541045 100644
--- a/graphlcd/logos/PREMIERE DIREKT2_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT2_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT3_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT3_l.glcd
index 561baac..561baac 100644
--- a/graphlcd/logos/PREMIERE DIREKT3_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT3_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT3_m.glcd b/graphlcd/logos/channels/PREMIERE DIREKT3_m.glcd
index bf95d30..bf95d30 100644
--- a/graphlcd/logos/PREMIERE DIREKT3_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT3_m.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT3_v2_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT3_v2_l.glcd
index 5956684..5956684 100644
--- a/graphlcd/logos/PREMIERE DIREKT3_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT3_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT4_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT4_l.glcd
index be12a52..be12a52 100644
--- a/graphlcd/logos/PREMIERE DIREKT4_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT4_l.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT4_m.glcd b/graphlcd/logos/channels/PREMIERE DIREKT4_m.glcd
index 8bd5202..8bd5202 100644
--- a/graphlcd/logos/PREMIERE DIREKT4_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT4_m.glcd
diff --git a/graphlcd/logos/PREMIERE DIREKT4_v2_l.glcd b/graphlcd/logos/channels/PREMIERE DIREKT4_v2_l.glcd
index e1fb8b1..e1fb8b1 100644
--- a/graphlcd/logos/PREMIERE DIREKT4_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE DIREKT4_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 1_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 1_l.glcd
index d0ba7a2..d0ba7a2 100644
--- a/graphlcd/logos/PREMIERE EROTIK 1_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 1_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 1_m.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 1_m.glcd
index d74ba3e..d74ba3e 100644
--- a/graphlcd/logos/PREMIERE EROTIK 1_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 1_m.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 1_v2_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 1_v2_l.glcd
index 9d36610..9d36610 100644
--- a/graphlcd/logos/PREMIERE EROTIK 1_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 1_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 2_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 2_l.glcd
index 72654b1..72654b1 100644
--- a/graphlcd/logos/PREMIERE EROTIK 2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 2_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 2_m.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 2_m.glcd
index e54786c..e54786c 100644
--- a/graphlcd/logos/PREMIERE EROTIK 2_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 2_m.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 2_v2_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 2_v2_l.glcd
index d78779e..d78779e 100644
--- a/graphlcd/logos/PREMIERE EROTIK 2_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 2_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 3_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 3_l.glcd
index 65fa3da..65fa3da 100644
--- a/graphlcd/logos/PREMIERE EROTIK 3_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 3_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 3_m.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 3_m.glcd
index 2287287..2287287 100644
--- a/graphlcd/logos/PREMIERE EROTIK 3_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 3_m.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 3_v2_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 3_v2_l.glcd
index 48fc074..48fc074 100644
--- a/graphlcd/logos/PREMIERE EROTIK 3_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 3_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 4_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 4_l.glcd
index 87d3375..87d3375 100644
--- a/graphlcd/logos/PREMIERE EROTIK 4_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 4_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 4_m.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 4_m.glcd
index b312a53..b312a53 100644
--- a/graphlcd/logos/PREMIERE EROTIK 4_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 4_m.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK 4_v2_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK 4_v2_l.glcd
index 4242389..4242389 100644
--- a/graphlcd/logos/PREMIERE EROTIK 4_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK 4_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK_l.glcd b/graphlcd/logos/channels/PREMIERE EROTIK_l.glcd
index d6ab077..d6ab077 100644
--- a/graphlcd/logos/PREMIERE EROTIK_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK_l.glcd
diff --git a/graphlcd/logos/PREMIERE EROTIK_m.glcd b/graphlcd/logos/channels/PREMIERE EROTIK_m.glcd
index c57aa32..c57aa32 100644
--- a/graphlcd/logos/PREMIERE EROTIK_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE EROTIK_m.glcd
diff --git a/graphlcd/logos/PREMIERE KRIMI_l.glcd b/graphlcd/logos/channels/PREMIERE KRIMI_l.glcd
index 46ea4f2..46ea4f2 100644
--- a/graphlcd/logos/PREMIERE KRIMI_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE KRIMI_l.glcd
diff --git a/graphlcd/logos/PREMIERE KRIMI_m.glcd b/graphlcd/logos/channels/PREMIERE KRIMI_m.glcd
index 60e809f..60e809f 100644
--- a/graphlcd/logos/PREMIERE KRIMI_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE KRIMI_m.glcd
diff --git a/graphlcd/logos/PREMIERE NOSTALGIE_l.glcd b/graphlcd/logos/channels/PREMIERE NOSTALGIE_l.glcd
index 2fe949f..2fe949f 100644
--- a/graphlcd/logos/PREMIERE NOSTALGIE_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE NOSTALGIE_l.glcd
diff --git a/graphlcd/logos/PREMIERE NOSTALGIE_m.glcd b/graphlcd/logos/channels/PREMIERE NOSTALGIE_m.glcd
index 2d69c17..2d69c17 100644
--- a/graphlcd/logos/PREMIERE NOSTALGIE_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE NOSTALGIE_m.glcd
diff --git a/graphlcd/logos/PREMIERE NOSTALGIE_v2_l.glcd b/graphlcd/logos/channels/PREMIERE NOSTALGIE_v2_l.glcd
index 0c0fa92..0c0fa92 100644
--- a/graphlcd/logos/PREMIERE NOSTALGIE_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE NOSTALGIE_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE SERIE_l.glcd b/graphlcd/logos/channels/PREMIERE SERIE_l.glcd
index 22d4b46..22d4b46 100644
--- a/graphlcd/logos/PREMIERE SERIE_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE SERIE_l.glcd
diff --git a/graphlcd/logos/PREMIERE SERIE_m.glcd b/graphlcd/logos/channels/PREMIERE SERIE_m.glcd
index 12d0903..12d0903 100644
--- a/graphlcd/logos/PREMIERE SERIE_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE SERIE_m.glcd
diff --git a/graphlcd/logos/PREMIERE SERIE_v2_l.glcd b/graphlcd/logos/channels/PREMIERE SERIE_v2_l.glcd
index 0ebb263..0ebb263 100644
--- a/graphlcd/logos/PREMIERE SERIE_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE SERIE_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE SPORT1_l.glcd b/graphlcd/logos/channels/PREMIERE SPORT1_l.glcd
index c6547c2..c6547c2 100644
--- a/graphlcd/logos/PREMIERE SPORT1_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE SPORT1_l.glcd
diff --git a/graphlcd/logos/PREMIERE SPORT1_m.glcd b/graphlcd/logos/channels/PREMIERE SPORT1_m.glcd
index df7c5c8..df7c5c8 100644
--- a/graphlcd/logos/PREMIERE SPORT1_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE SPORT1_m.glcd
diff --git a/graphlcd/logos/PREMIERE SPORT1_v2_l.glcd b/graphlcd/logos/channels/PREMIERE SPORT1_v2_l.glcd
index 4012c0f..4012c0f 100644
--- a/graphlcd/logos/PREMIERE SPORT1_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE SPORT1_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE SPORT2_l.glcd b/graphlcd/logos/channels/PREMIERE SPORT2_l.glcd
index c99afc7..c99afc7 100644
--- a/graphlcd/logos/PREMIERE SPORT2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE SPORT2_l.glcd
diff --git a/graphlcd/logos/PREMIERE SPORT2_m.glcd b/graphlcd/logos/channels/PREMIERE SPORT2_m.glcd
index 10088bd..10088bd 100644
--- a/graphlcd/logos/PREMIERE SPORT2_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE SPORT2_m.glcd
diff --git a/graphlcd/logos/PREMIERE SPORT2_v2_l.glcd b/graphlcd/logos/channels/PREMIERE SPORT2_v2_l.glcd
index 308a08d..308a08d 100644
--- a/graphlcd/logos/PREMIERE SPORT2_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE SPORT2_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE START_l.glcd b/graphlcd/logos/channels/PREMIERE START_l.glcd
index a4d4dd2..a4d4dd2 100644
--- a/graphlcd/logos/PREMIERE START_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE START_l.glcd
diff --git a/graphlcd/logos/PREMIERE START_m.glcd b/graphlcd/logos/channels/PREMIERE START_m.glcd
index fc0a473..fc0a473 100644
--- a/graphlcd/logos/PREMIERE START_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE START_m.glcd
diff --git a/graphlcd/logos/PREMIERE START_v2_l.glcd b/graphlcd/logos/channels/PREMIERE START_v2_l.glcd
index dba4dda..dba4dda 100644
--- a/graphlcd/logos/PREMIERE START_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE START_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE1_l.glcd b/graphlcd/logos/channels/PREMIERE1_l.glcd
index d96b181..d96b181 100644
--- a/graphlcd/logos/PREMIERE1_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE1_l.glcd
diff --git a/graphlcd/logos/PREMIERE1_m.glcd b/graphlcd/logos/channels/PREMIERE1_m.glcd
index dfaaad9..dfaaad9 100644
--- a/graphlcd/logos/PREMIERE1_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE1_m.glcd
diff --git a/graphlcd/logos/PREMIERE1_v2_l.glcd b/graphlcd/logos/channels/PREMIERE1_v2_l.glcd
index 5ff3581..5ff3581 100644
--- a/graphlcd/logos/PREMIERE1_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE1_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE2_l.glcd b/graphlcd/logos/channels/PREMIERE2_l.glcd
index 3633669..3633669 100644
--- a/graphlcd/logos/PREMIERE2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE2_l.glcd
diff --git a/graphlcd/logos/PREMIERE2_m.glcd b/graphlcd/logos/channels/PREMIERE2_m.glcd
index e54d94d..e54d94d 100644
--- a/graphlcd/logos/PREMIERE2_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE2_m.glcd
diff --git a/graphlcd/logos/PREMIERE2_v2_l.glcd b/graphlcd/logos/channels/PREMIERE2_v2_l.glcd
index 0426fd9..0426fd9 100644
--- a/graphlcd/logos/PREMIERE2_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE2_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE3_l.glcd b/graphlcd/logos/channels/PREMIERE3_l.glcd
index ed3c2bf..ed3c2bf 100644
--- a/graphlcd/logos/PREMIERE3_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE3_l.glcd
diff --git a/graphlcd/logos/PREMIERE3_m.glcd b/graphlcd/logos/channels/PREMIERE3_m.glcd
index 40895d4..40895d4 100644
--- a/graphlcd/logos/PREMIERE3_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE3_m.glcd
diff --git a/graphlcd/logos/PREMIERE3_v2_l.glcd b/graphlcd/logos/channels/PREMIERE3_v2_l.glcd
index 11ae7da..11ae7da 100644
--- a/graphlcd/logos/PREMIERE3_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE3_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE4_l.glcd b/graphlcd/logos/channels/PREMIERE4_l.glcd
index 04ad87b..04ad87b 100644
--- a/graphlcd/logos/PREMIERE4_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE4_l.glcd
diff --git a/graphlcd/logos/PREMIERE4_m.glcd b/graphlcd/logos/channels/PREMIERE4_m.glcd
index 92acc8b..92acc8b 100644
--- a/graphlcd/logos/PREMIERE4_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE4_m.glcd
diff --git a/graphlcd/logos/PREMIERE4_v2_l.glcd b/graphlcd/logos/channels/PREMIERE4_v2_l.glcd
index 5ed2de1..5ed2de1 100644
--- a/graphlcd/logos/PREMIERE4_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE4_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE5_l.glcd b/graphlcd/logos/channels/PREMIERE5_l.glcd
index 8e124a9..8e124a9 100644
--- a/graphlcd/logos/PREMIERE5_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE5_l.glcd
diff --git a/graphlcd/logos/PREMIERE5_m.glcd b/graphlcd/logos/channels/PREMIERE5_m.glcd
index 10da971..10da971 100644
--- a/graphlcd/logos/PREMIERE5_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE5_m.glcd
diff --git a/graphlcd/logos/PREMIERE5_v2_l.glcd b/graphlcd/logos/channels/PREMIERE5_v2_l.glcd
index b33f00a..b33f00a 100644
--- a/graphlcd/logos/PREMIERE5_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE5_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE6_l.glcd b/graphlcd/logos/channels/PREMIERE6_l.glcd
index e003ee7..e003ee7 100644
--- a/graphlcd/logos/PREMIERE6_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE6_l.glcd
diff --git a/graphlcd/logos/PREMIERE6_m.glcd b/graphlcd/logos/channels/PREMIERE6_m.glcd
index 81c04cb..81c04cb 100644
--- a/graphlcd/logos/PREMIERE6_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE6_m.glcd
diff --git a/graphlcd/logos/PREMIERE6_v2_l.glcd b/graphlcd/logos/channels/PREMIERE6_v2_l.glcd
index ed0dfdd..ed0dfdd 100644
--- a/graphlcd/logos/PREMIERE6_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE6_v2_l.glcd
diff --git a/graphlcd/logos/PREMIERE7_l.glcd b/graphlcd/logos/channels/PREMIERE7_l.glcd
index 24e672d..24e672d 100644
--- a/graphlcd/logos/PREMIERE7_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE7_l.glcd
diff --git a/graphlcd/logos/PREMIERE7_m.glcd b/graphlcd/logos/channels/PREMIERE7_m.glcd
index d7b41ce..d7b41ce 100644
--- a/graphlcd/logos/PREMIERE7_m.glcd
+++ b/graphlcd/logos/channels/PREMIERE7_m.glcd
diff --git a/graphlcd/logos/PREMIERE7_v2_l.glcd b/graphlcd/logos/channels/PREMIERE7_v2_l.glcd
index be4259c..be4259c 100644
--- a/graphlcd/logos/PREMIERE7_v2_l.glcd
+++ b/graphlcd/logos/channels/PREMIERE7_v2_l.glcd
diff --git a/graphlcd/logos/PRO SIEBEN AUSTRIA_l.glcd b/graphlcd/logos/channels/PRO SIEBEN AUSTRIA_l.glcd
index 5978029..5978029 100644
--- a/graphlcd/logos/PRO SIEBEN AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN AUSTRIA_l.glcd
diff --git a/graphlcd/logos/PRO SIEBEN AUSTRIA_m.glcd b/graphlcd/logos/channels/PRO SIEBEN AUSTRIA_m.glcd
index 2662f32..2662f32 100644
--- a/graphlcd/logos/PRO SIEBEN AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN AUSTRIA_m.glcd
diff --git a/graphlcd/logos/PRO SIEBEN SCHWEIZ_l.glcd b/graphlcd/logos/channels/PRO SIEBEN SCHWEIZ_l.glcd
index 86fe673..86fe673 100644
--- a/graphlcd/logos/PRO SIEBEN SCHWEIZ_l.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN SCHWEIZ_l.glcd
diff --git a/graphlcd/logos/PRO SIEBEN SCHWEIZ_m.glcd b/graphlcd/logos/channels/PRO SIEBEN SCHWEIZ_m.glcd
index 84dab91..84dab91 100644
--- a/graphlcd/logos/PRO SIEBEN SCHWEIZ_m.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN SCHWEIZ_m.glcd
diff --git a/graphlcd/logos/PRO SIEBEN_l.glcd b/graphlcd/logos/channels/PRO SIEBEN_l.glcd
index 742bca5..742bca5 100644
--- a/graphlcd/logos/PRO SIEBEN_l.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN_l.glcd
diff --git a/graphlcd/logos/PRO SIEBEN_m.glcd b/graphlcd/logos/channels/PRO SIEBEN_m.glcd
index 8793dfe..8793dfe 100644
--- a/graphlcd/logos/PRO SIEBEN_m.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN_m.glcd
diff --git a/graphlcd/logos/PRO SIEBEN_v2_l.glcd b/graphlcd/logos/channels/PRO SIEBEN_v2_l.glcd
index 730d452..730d452 100644
--- a/graphlcd/logos/PRO SIEBEN_v2_l.glcd
+++ b/graphlcd/logos/channels/PRO SIEBEN_v2_l.glcd
diff --git a/graphlcd/logos/PULS_l.glcd b/graphlcd/logos/channels/PULS_l.glcd
index 1179844..1179844 100644
--- a/graphlcd/logos/PULS_l.glcd
+++ b/graphlcd/logos/channels/PULS_l.glcd
diff --git a/graphlcd/logos/PULS_m.glcd b/graphlcd/logos/channels/PULS_m.glcd
index 16379cd..16379cd 100644
--- a/graphlcd/logos/PULS_m.glcd
+++ b/graphlcd/logos/channels/PULS_m.glcd
diff --git a/graphlcd/logos/QVC GERMANY_l.glcd b/graphlcd/logos/channels/QVC GERMANY_l.glcd
index 414b626..414b626 100644
--- a/graphlcd/logos/QVC GERMANY_l.glcd
+++ b/graphlcd/logos/channels/QVC GERMANY_l.glcd
diff --git a/graphlcd/logos/QVC GERMANY_m.glcd b/graphlcd/logos/channels/QVC GERMANY_m.glcd
index 0f12f0b..0f12f0b 100644
--- a/graphlcd/logos/QVC GERMANY_m.glcd
+++ b/graphlcd/logos/channels/QVC GERMANY_m.glcd
diff --git a/graphlcd/logos/RADIO 10 GOLD_l.glcd b/graphlcd/logos/channels/RADIO 10 GOLD_l.glcd
index ac5f5a4..ac5f5a4 100644
--- a/graphlcd/logos/RADIO 10 GOLD_l.glcd
+++ b/graphlcd/logos/channels/RADIO 10 GOLD_l.glcd
diff --git a/graphlcd/logos/RADIO 10 GOLD_m.glcd b/graphlcd/logos/channels/RADIO 10 GOLD_m.glcd
index 727d3e1..727d3e1 100644
--- a/graphlcd/logos/RADIO 10 GOLD_m.glcd
+++ b/graphlcd/logos/channels/RADIO 10 GOLD_m.glcd
diff --git a/graphlcd/logos/RADIO 538_l.glcd b/graphlcd/logos/channels/RADIO 538_l.glcd
index 73bc2e5..73bc2e5 100644
--- a/graphlcd/logos/RADIO 538_l.glcd
+++ b/graphlcd/logos/channels/RADIO 538_l.glcd
diff --git a/graphlcd/logos/RADIO 538_m.glcd b/graphlcd/logos/channels/RADIO 538_m.glcd
index 0d4480c..0d4480c 100644
--- a/graphlcd/logos/RADIO 538_m.glcd
+++ b/graphlcd/logos/channels/RADIO 538_m.glcd
diff --git a/graphlcd/logos/RADIO MARIA_l.glcd b/graphlcd/logos/channels/RADIO MARIA_l.glcd
index 2d126a9..2d126a9 100644
--- a/graphlcd/logos/RADIO MARIA_l.glcd
+++ b/graphlcd/logos/channels/RADIO MARIA_l.glcd
diff --git a/graphlcd/logos/RADIO MARIA_m.glcd b/graphlcd/logos/channels/RADIO MARIA_m.glcd
index bea7de8..bea7de8 100644
--- a/graphlcd/logos/RADIO MARIA_m.glcd
+++ b/graphlcd/logos/channels/RADIO MARIA_m.glcd
diff --git a/graphlcd/logos/RADIO MARIA_v2_m.glcd b/graphlcd/logos/channels/RADIO MARIA_v2_m.glcd
index ada6d4f..ada6d4f 100644
--- a/graphlcd/logos/RADIO MARIA_v2_m.glcd
+++ b/graphlcd/logos/channels/RADIO MARIA_v2_m.glcd
diff --git a/graphlcd/logos/RADIO MULTIKULTI_l.glcd b/graphlcd/logos/channels/RADIO MULTIKULTI_l.glcd
index a8b4810..a8b4810 100644
--- a/graphlcd/logos/RADIO MULTIKULTI_l.glcd
+++ b/graphlcd/logos/channels/RADIO MULTIKULTI_l.glcd
diff --git a/graphlcd/logos/RADIO MULTIKULTI_m.glcd b/graphlcd/logos/channels/RADIO MULTIKULTI_m.glcd
index 108ba5e..108ba5e 100644
--- a/graphlcd/logos/RADIO MULTIKULTI_m.glcd
+++ b/graphlcd/logos/channels/RADIO MULTIKULTI_m.glcd
diff --git a/graphlcd/logos/RADIO MULTIKULTI_v2_m.glcd b/graphlcd/logos/channels/RADIO MULTIKULTI_v2_m.glcd
index 472042f..472042f 100644
--- a/graphlcd/logos/RADIO MULTIKULTI_v2_m.glcd
+++ b/graphlcd/logos/channels/RADIO MULTIKULTI_v2_m.glcd
diff --git a/graphlcd/logos/RADIOEINS_l.glcd b/graphlcd/logos/channels/RADIOEINS_l.glcd
index 5c64eb1..5c64eb1 100644
--- a/graphlcd/logos/RADIOEINS_l.glcd
+++ b/graphlcd/logos/channels/RADIOEINS_l.glcd
diff --git a/graphlcd/logos/RADIOEINS_m.glcd b/graphlcd/logos/channels/RADIOEINS_m.glcd
index 6178251..6178251 100644
--- a/graphlcd/logos/RADIOEINS_m.glcd
+++ b/graphlcd/logos/channels/RADIOEINS_m.glcd
diff --git a/graphlcd/logos/RAI 1_l.glcd b/graphlcd/logos/channels/RAI 1_l.glcd
index c51b809..c51b809 100644
--- a/graphlcd/logos/RAI 1_l.glcd
+++ b/graphlcd/logos/channels/RAI 1_l.glcd
diff --git a/graphlcd/logos/RAI 1_m.glcd b/graphlcd/logos/channels/RAI 1_m.glcd
index 0f8541f..0f8541f 100644
--- a/graphlcd/logos/RAI 1_m.glcd
+++ b/graphlcd/logos/channels/RAI 1_m.glcd
diff --git a/graphlcd/logos/RAI 1_v2_m.glcd b/graphlcd/logos/channels/RAI 1_v2_m.glcd
index 4f408da..4f408da 100644
--- a/graphlcd/logos/RAI 1_v2_m.glcd
+++ b/graphlcd/logos/channels/RAI 1_v2_m.glcd
diff --git a/graphlcd/logos/RAI 2_l.glcd b/graphlcd/logos/channels/RAI 2_l.glcd
index a1b5ae6..a1b5ae6 100644
--- a/graphlcd/logos/RAI 2_l.glcd
+++ b/graphlcd/logos/channels/RAI 2_l.glcd
diff --git a/graphlcd/logos/RAI 2_m.glcd b/graphlcd/logos/channels/RAI 2_m.glcd
index a82f388..a82f388 100644
--- a/graphlcd/logos/RAI 2_m.glcd
+++ b/graphlcd/logos/channels/RAI 2_m.glcd
diff --git a/graphlcd/logos/RAI 2_v2_m.glcd b/graphlcd/logos/channels/RAI 2_v2_m.glcd
index 57565ea..57565ea 100644
--- a/graphlcd/logos/RAI 2_v2_m.glcd
+++ b/graphlcd/logos/channels/RAI 2_v2_m.glcd
diff --git a/graphlcd/logos/RAI 3_l.glcd b/graphlcd/logos/channels/RAI 3_l.glcd
index f28bbb6..f28bbb6 100644
--- a/graphlcd/logos/RAI 3_l.glcd
+++ b/graphlcd/logos/channels/RAI 3_l.glcd
diff --git a/graphlcd/logos/RAI 3_m.glcd b/graphlcd/logos/channels/RAI 3_m.glcd
index 98d981d..98d981d 100644
--- a/graphlcd/logos/RAI 3_m.glcd
+++ b/graphlcd/logos/channels/RAI 3_m.glcd
diff --git a/graphlcd/logos/RAI 3_v2_m.glcd b/graphlcd/logos/channels/RAI 3_v2_m.glcd
index 525be2b..525be2b 100644
--- a/graphlcd/logos/RAI 3_v2_m.glcd
+++ b/graphlcd/logos/channels/RAI 3_v2_m.glcd
diff --git a/graphlcd/logos/RAZE TV_l.glcd b/graphlcd/logos/channels/RAZE TV_l.glcd
index 9848ef7..9848ef7 100644
--- a/graphlcd/logos/RAZE TV_l.glcd
+++ b/graphlcd/logos/channels/RAZE TV_l.glcd
diff --git a/graphlcd/logos/RAZE TV_m.glcd b/graphlcd/logos/channels/RAZE TV_m.glcd
index 87ebafb..87ebafb 100644
--- a/graphlcd/logos/RAZE TV_m.glcd
+++ b/graphlcd/logos/channels/RAZE TV_m.glcd
diff --git a/graphlcd/logos/RAZE TV_v2_m.glcd b/graphlcd/logos/channels/RAZE TV_v2_m.glcd
index 514d35f..514d35f 100644
--- a/graphlcd/logos/RAZE TV_v2_m.glcd
+++ b/graphlcd/logos/channels/RAZE TV_v2_m.glcd
diff --git a/graphlcd/logos/RBB BERLIN_l.glcd b/graphlcd/logos/channels/RBB BERLIN_l.glcd
index 6b14c51..6b14c51 100644
--- a/graphlcd/logos/RBB BERLIN_l.glcd
+++ b/graphlcd/logos/channels/RBB BERLIN_l.glcd
diff --git a/graphlcd/logos/RBB BERLIN_m.glcd b/graphlcd/logos/channels/RBB BERLIN_m.glcd
index 521ea31..521ea31 100644
--- a/graphlcd/logos/RBB BERLIN_m.glcd
+++ b/graphlcd/logos/channels/RBB BERLIN_m.glcd
diff --git a/graphlcd/logos/RBB BRANDENBURG_l.glcd b/graphlcd/logos/channels/RBB BRANDENBURG_l.glcd
index 7b30016..7b30016 100644
--- a/graphlcd/logos/RBB BRANDENBURG_l.glcd
+++ b/graphlcd/logos/channels/RBB BRANDENBURG_l.glcd
diff --git a/graphlcd/logos/RBB BRANDENBURG_m.glcd b/graphlcd/logos/channels/RBB BRANDENBURG_m.glcd
index 98fe110..98fe110 100644
--- a/graphlcd/logos/RBB BRANDENBURG_m.glcd
+++ b/graphlcd/logos/channels/RBB BRANDENBURG_m.glcd
diff --git a/graphlcd/logos/REALMADRID_l.glcd b/graphlcd/logos/channels/REALMADRID_l.glcd
index 1b57228..1b57228 100644
--- a/graphlcd/logos/REALMADRID_l.glcd
+++ b/graphlcd/logos/channels/REALMADRID_l.glcd
diff --git a/graphlcd/logos/REALMADRID_m.glcd b/graphlcd/logos/channels/REALMADRID_m.glcd
index 40c4d80..40c4d80 100644
--- a/graphlcd/logos/REALMADRID_m.glcd
+++ b/graphlcd/logos/channels/REALMADRID_m.glcd
diff --git a/graphlcd/logos/RFM-TV_m.glcd b/graphlcd/logos/channels/RFM-TV_m.glcd
index eb731f7..eb731f7 100644
--- a/graphlcd/logos/RFM-TV_m.glcd
+++ b/graphlcd/logos/channels/RFM-TV_m.glcd
diff --git a/graphlcd/logos/RHEIN MAIN TV_l.glcd b/graphlcd/logos/channels/RHEIN MAIN TV_l.glcd
index d539d6b..d539d6b 100644
--- a/graphlcd/logos/RHEIN MAIN TV_l.glcd
+++ b/graphlcd/logos/channels/RHEIN MAIN TV_l.glcd
diff --git a/graphlcd/logos/RHEIN MAIN TV_m.glcd b/graphlcd/logos/channels/RHEIN MAIN TV_m.glcd
index b1ddd98..b1ddd98 100644
--- a/graphlcd/logos/RHEIN MAIN TV_m.glcd
+++ b/graphlcd/logos/channels/RHEIN MAIN TV_m.glcd
diff --git a/graphlcd/logos/RHEIN MAIN TV_v2_m.glcd b/graphlcd/logos/channels/RHEIN MAIN TV_v2_m.glcd
index 121942f..121942f 100644
--- a/graphlcd/logos/RHEIN MAIN TV_v2_m.glcd
+++ b/graphlcd/logos/channels/RHEIN MAIN TV_v2_m.glcd
diff --git a/graphlcd/logos/RIRE ET CHANSONS_l.glcd b/graphlcd/logos/channels/RIRE ET CHANSONS_l.glcd
index 47a0168..47a0168 100644
--- a/graphlcd/logos/RIRE ET CHANSONS_l.glcd
+++ b/graphlcd/logos/channels/RIRE ET CHANSONS_l.glcd
diff --git a/graphlcd/logos/RIRE ET CHANSONS_m.glcd b/graphlcd/logos/channels/RIRE ET CHANSONS_m.glcd
index 149cbd8..149cbd8 100644
--- a/graphlcd/logos/RIRE ET CHANSONS_m.glcd
+++ b/graphlcd/logos/channels/RIRE ET CHANSONS_m.glcd
diff --git a/graphlcd/logos/ROCK ANTENNE_l.glcd b/graphlcd/logos/channels/ROCK ANTENNE_l.glcd
index 1a7f249..1a7f249 100644
--- a/graphlcd/logos/ROCK ANTENNE_l.glcd
+++ b/graphlcd/logos/channels/ROCK ANTENNE_l.glcd
diff --git a/graphlcd/logos/ROCK ANTENNE_m.glcd b/graphlcd/logos/channels/ROCK ANTENNE_m.glcd
index 5ef1b5d..5ef1b5d 100644
--- a/graphlcd/logos/ROCK ANTENNE_m.glcd
+++ b/graphlcd/logos/channels/ROCK ANTENNE_m.glcd
diff --git a/graphlcd/logos/ROCK ANTENNE_v2_m.glcd b/graphlcd/logos/channels/ROCK ANTENNE_v2_m.glcd
index c1a67d7..c1a67d7 100644
--- a/graphlcd/logos/ROCK ANTENNE_v2_m.glcd
+++ b/graphlcd/logos/channels/ROCK ANTENNE_v2_m.glcd
diff --git a/graphlcd/logos/RSR COULEUR 3_l.glcd b/graphlcd/logos/channels/RSR COULEUR 3_l.glcd
index 7179318..7179318 100644
--- a/graphlcd/logos/RSR COULEUR 3_l.glcd
+++ b/graphlcd/logos/channels/RSR COULEUR 3_l.glcd
diff --git a/graphlcd/logos/RSR COULEUR 3_m.glcd b/graphlcd/logos/channels/RSR COULEUR 3_m.glcd
index bcd4494..bcd4494 100644
--- a/graphlcd/logos/RSR COULEUR 3_m.glcd
+++ b/graphlcd/logos/channels/RSR COULEUR 3_m.glcd
diff --git a/graphlcd/logos/RTBF SAT_l.glcd b/graphlcd/logos/channels/RTBF SAT_l.glcd
index 3e3bab1..3e3bab1 100644
--- a/graphlcd/logos/RTBF SAT_l.glcd
+++ b/graphlcd/logos/channels/RTBF SAT_l.glcd
diff --git a/graphlcd/logos/RTBF SAT_m.glcd b/graphlcd/logos/channels/RTBF SAT_m.glcd
index f84b460..f84b460 100644
--- a/graphlcd/logos/RTBF SAT_m.glcd
+++ b/graphlcd/logos/channels/RTBF SAT_m.glcd
diff --git a/graphlcd/logos/RTL 2 AUSTRIA_l.glcd b/graphlcd/logos/channels/RTL 2 AUSTRIA_l.glcd
index a054c59..a054c59 100644
--- a/graphlcd/logos/RTL 2 AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/RTL 2 AUSTRIA_l.glcd
diff --git a/graphlcd/logos/RTL 2 AUSTRIA_m.glcd b/graphlcd/logos/channels/RTL 2 AUSTRIA_m.glcd
index 13f12a1..13f12a1 100644
--- a/graphlcd/logos/RTL 2 AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/RTL 2 AUSTRIA_m.glcd
diff --git a/graphlcd/logos/RTL 2_l.glcd b/graphlcd/logos/channels/RTL 2_l.glcd
index a054c59..a054c59 100644
--- a/graphlcd/logos/RTL 2_l.glcd
+++ b/graphlcd/logos/channels/RTL 2_l.glcd
diff --git a/graphlcd/logos/RTL 2_m.glcd b/graphlcd/logos/channels/RTL 2_m.glcd
index 13f12a1..13f12a1 100644
--- a/graphlcd/logos/RTL 2_m.glcd
+++ b/graphlcd/logos/channels/RTL 2_m.glcd
diff --git a/graphlcd/logos/RTL AUSTRIA_l.glcd b/graphlcd/logos/channels/RTL AUSTRIA_l.glcd
index 5c54cfe..5c54cfe 100644
--- a/graphlcd/logos/RTL AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/RTL AUSTRIA_l.glcd
diff --git a/graphlcd/logos/RTL AUSTRIA_m.glcd b/graphlcd/logos/channels/RTL AUSTRIA_m.glcd
index 8c51123..8c51123 100644
--- a/graphlcd/logos/RTL AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/RTL AUSTRIA_m.glcd
diff --git a/graphlcd/logos/RTL AUSTRIA_v2_m.glcd b/graphlcd/logos/channels/RTL AUSTRIA_v2_m.glcd
index 25ee6ea..25ee6ea 100644
--- a/graphlcd/logos/RTL AUSTRIA_v2_m.glcd
+++ b/graphlcd/logos/channels/RTL AUSTRIA_v2_m.glcd
diff --git a/graphlcd/logos/RTL FM_l.glcd b/graphlcd/logos/channels/RTL FM_l.glcd
index a483538..a483538 100644
--- a/graphlcd/logos/RTL FM_l.glcd
+++ b/graphlcd/logos/channels/RTL FM_l.glcd
diff --git a/graphlcd/logos/RTL FM_m.glcd b/graphlcd/logos/channels/RTL FM_m.glcd
index f480738..f480738 100644
--- a/graphlcd/logos/RTL FM_m.glcd
+++ b/graphlcd/logos/channels/RTL FM_m.glcd
diff --git a/graphlcd/logos/RTL RADIO_l.glcd b/graphlcd/logos/channels/RTL RADIO_l.glcd
index d72fc78..d72fc78 100644
--- a/graphlcd/logos/RTL RADIO_l.glcd
+++ b/graphlcd/logos/channels/RTL RADIO_l.glcd
diff --git a/graphlcd/logos/RTL RADIO_m.glcd b/graphlcd/logos/channels/RTL RADIO_m.glcd
index 865126e..865126e 100644
--- a/graphlcd/logos/RTL RADIO_m.glcd
+++ b/graphlcd/logos/channels/RTL RADIO_m.glcd
diff --git a/graphlcd/logos/RTL SHOP_l.glcd b/graphlcd/logos/channels/RTL SHOP_l.glcd
index 18241d6..18241d6 100644
--- a/graphlcd/logos/RTL SHOP_l.glcd
+++ b/graphlcd/logos/channels/RTL SHOP_l.glcd
diff --git a/graphlcd/logos/RTL SHOP_m.glcd b/graphlcd/logos/channels/RTL SHOP_m.glcd
index 0fd8fcc..0fd8fcc 100644
--- a/graphlcd/logos/RTL SHOP_m.glcd
+++ b/graphlcd/logos/channels/RTL SHOP_m.glcd
diff --git a/graphlcd/logos/RTL SHOP_v2_m.glcd b/graphlcd/logos/channels/RTL SHOP_v2_m.glcd
index 1a3c945..1a3c945 100644
--- a/graphlcd/logos/RTL SHOP_v2_m.glcd
+++ b/graphlcd/logos/channels/RTL SHOP_v2_m.glcd
diff --git a/graphlcd/logos/RTL TELE LETZEBURG_l.glcd b/graphlcd/logos/channels/RTL TELE LETZEBURG_l.glcd
index 3381dfb..3381dfb 100644
--- a/graphlcd/logos/RTL TELE LETZEBURG_l.glcd
+++ b/graphlcd/logos/channels/RTL TELE LETZEBURG_l.glcd
diff --git a/graphlcd/logos/RTL TELE LETZEBURG_m.glcd b/graphlcd/logos/channels/RTL TELE LETZEBURG_m.glcd
index 4b4b4dc..4b4b4dc 100644
--- a/graphlcd/logos/RTL TELE LETZEBURG_m.glcd
+++ b/graphlcd/logos/channels/RTL TELE LETZEBURG_m.glcd
diff --git a/graphlcd/logos/RTL TELE LETZEBURG_v2_l.glcd b/graphlcd/logos/channels/RTL TELE LETZEBURG_v2_l.glcd
index 9a29b21..9a29b21 100644
--- a/graphlcd/logos/RTL TELE LETZEBURG_v2_l.glcd
+++ b/graphlcd/logos/channels/RTL TELE LETZEBURG_v2_l.glcd
diff --git a/graphlcd/logos/RTL TELEVISION_l.glcd b/graphlcd/logos/channels/RTL TELEVISION_l.glcd
index 5c54cfe..5c54cfe 100644
--- a/graphlcd/logos/RTL TELEVISION_l.glcd
+++ b/graphlcd/logos/channels/RTL TELEVISION_l.glcd
diff --git a/graphlcd/logos/RTL TELEVISION_m.glcd b/graphlcd/logos/channels/RTL TELEVISION_m.glcd
index 9b13aa2..9b13aa2 100644
--- a/graphlcd/logos/RTL TELEVISION_m.glcd
+++ b/graphlcd/logos/channels/RTL TELEVISION_m.glcd
diff --git a/graphlcd/logos/RTL4_l.glcd b/graphlcd/logos/channels/RTL4_l.glcd
index b84524f..b84524f 100644
--- a/graphlcd/logos/RTL4_l.glcd
+++ b/graphlcd/logos/channels/RTL4_l.glcd
diff --git a/graphlcd/logos/RTL4_m.glcd b/graphlcd/logos/channels/RTL4_m.glcd
index 81c34b5..81c34b5 100644
--- a/graphlcd/logos/RTL4_m.glcd
+++ b/graphlcd/logos/channels/RTL4_m.glcd
diff --git a/graphlcd/logos/RTL5_l.glcd b/graphlcd/logos/channels/RTL5_l.glcd
index ab42540..ab42540 100644
--- a/graphlcd/logos/RTL5_l.glcd
+++ b/graphlcd/logos/channels/RTL5_l.glcd
diff --git a/graphlcd/logos/RTL5_m.glcd b/graphlcd/logos/channels/RTL5_m.glcd
index 351a26a..351a26a 100644
--- a/graphlcd/logos/RTL5_m.glcd
+++ b/graphlcd/logos/channels/RTL5_m.glcd
diff --git a/graphlcd/logos/RTM-MAROC_l.glcd b/graphlcd/logos/channels/RTM-MAROC_l.glcd
index ff303d1..ff303d1 100644
--- a/graphlcd/logos/RTM-MAROC_l.glcd
+++ b/graphlcd/logos/channels/RTM-MAROC_l.glcd
diff --git a/graphlcd/logos/RTP INT_l.glcd b/graphlcd/logos/channels/RTP INT_l.glcd
index 51695de..51695de 100644
--- a/graphlcd/logos/RTP INT_l.glcd
+++ b/graphlcd/logos/channels/RTP INT_l.glcd
diff --git a/graphlcd/logos/RTP INT_m.glcd b/graphlcd/logos/channels/RTP INT_m.glcd
index 4b7263b..4b7263b 100644
--- a/graphlcd/logos/RTP INT_m.glcd
+++ b/graphlcd/logos/channels/RTP INT_m.glcd
diff --git a/graphlcd/logos/SAILING CHANNEL_l.glcd b/graphlcd/logos/channels/SAILING CHANNEL_l.glcd
index 20f8b7e..20f8b7e 100644
--- a/graphlcd/logos/SAILING CHANNEL_l.glcd
+++ b/graphlcd/logos/channels/SAILING CHANNEL_l.glcd
diff --git a/graphlcd/logos/SAT1 AUSTRIA_l.glcd b/graphlcd/logos/channels/SAT1 AUSTRIA_l.glcd
index 041b996..041b996 100644
--- a/graphlcd/logos/SAT1 AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/SAT1 AUSTRIA_l.glcd
diff --git a/graphlcd/logos/SAT1 AUSTRIA_m.glcd b/graphlcd/logos/channels/SAT1 AUSTRIA_m.glcd
index 2882006..2882006 100644
--- a/graphlcd/logos/SAT1 AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/SAT1 AUSTRIA_m.glcd
diff --git a/graphlcd/logos/SAT1 AUSTRIA_v2_m.glcd b/graphlcd/logos/channels/SAT1 AUSTRIA_v2_m.glcd
index fea6fb2..fea6fb2 100644
--- a/graphlcd/logos/SAT1 AUSTRIA_v2_m.glcd
+++ b/graphlcd/logos/channels/SAT1 AUSTRIA_v2_m.glcd
diff --git a/graphlcd/logos/SAT1 SCHWEIZ_l.glcd b/graphlcd/logos/channels/SAT1 SCHWEIZ_l.glcd
index 6c7469d..6c7469d 100644
--- a/graphlcd/logos/SAT1 SCHWEIZ_l.glcd
+++ b/graphlcd/logos/channels/SAT1 SCHWEIZ_l.glcd
diff --git a/graphlcd/logos/SAT1 SCHWEIZ_m.glcd b/graphlcd/logos/channels/SAT1 SCHWEIZ_m.glcd
index d3a5dec..d3a5dec 100644
--- a/graphlcd/logos/SAT1 SCHWEIZ_m.glcd
+++ b/graphlcd/logos/channels/SAT1 SCHWEIZ_m.glcd
diff --git a/graphlcd/logos/SAT1_l.glcd b/graphlcd/logos/channels/SAT1_l.glcd
index bfcead0..bfcead0 100644
--- a/graphlcd/logos/SAT1_l.glcd
+++ b/graphlcd/logos/channels/SAT1_l.glcd
diff --git a/graphlcd/logos/SAT1_m.glcd b/graphlcd/logos/channels/SAT1_m.glcd
index f57e0ff..f57e0ff 100644
--- a/graphlcd/logos/SAT1_m.glcd
+++ b/graphlcd/logos/channels/SAT1_m.glcd
diff --git a/graphlcd/logos/animated/SAT1_l.glcd b/graphlcd/logos/channels/SAT1_v2_l.glcd
index 32b1cf6..32b1cf6 100644
--- a/graphlcd/logos/animated/SAT1_l.glcd
+++ b/graphlcd/logos/channels/SAT1_v2_l.glcd
diff --git a/graphlcd/logos/SBS6_l.glcd b/graphlcd/logos/channels/SBS6_l.glcd
index d2893da..d2893da 100644
--- a/graphlcd/logos/SBS6_l.glcd
+++ b/graphlcd/logos/channels/SBS6_l.glcd
diff --git a/graphlcd/logos/SBS6_m.glcd b/graphlcd/logos/channels/SBS6_m.glcd
index 8b10d0f..8b10d0f 100644
--- a/graphlcd/logos/SBS6_m.glcd
+++ b/graphlcd/logos/channels/SBS6_m.glcd
diff --git a/graphlcd/logos/SILVERLINE_l.glcd b/graphlcd/logos/channels/SILVERLINE_l.glcd
index 9536a08..9536a08 100644
--- a/graphlcd/logos/SILVERLINE_l.glcd
+++ b/graphlcd/logos/channels/SILVERLINE_l.glcd
diff --git a/graphlcd/logos/SKY RADIO NL_l.glcd b/graphlcd/logos/channels/SKY RADIO NL_l.glcd
index 5bf1fef..5bf1fef 100644
--- a/graphlcd/logos/SKY RADIO NL_l.glcd
+++ b/graphlcd/logos/channels/SKY RADIO NL_l.glcd
diff --git a/graphlcd/logos/SKY RADIO NL_m.glcd b/graphlcd/logos/channels/SKY RADIO NL_m.glcd
index d55eac7..d55eac7 100644
--- a/graphlcd/logos/SKY RADIO NL_m.glcd
+++ b/graphlcd/logos/channels/SKY RADIO NL_m.glcd
diff --git a/graphlcd/logos/SONNENKLAR TV_l.glcd b/graphlcd/logos/channels/SONNENKLAR TV_l.glcd
index 31491c9..31491c9 100644
--- a/graphlcd/logos/SONNENKLAR TV_l.glcd
+++ b/graphlcd/logos/channels/SONNENKLAR TV_l.glcd
diff --git a/graphlcd/logos/SONNENKLAR TV_m.glcd b/graphlcd/logos/channels/SONNENKLAR TV_m.glcd
index c0d3943..c0d3943 100644
--- a/graphlcd/logos/SONNENKLAR TV_m.glcd
+++ b/graphlcd/logos/channels/SONNENKLAR TV_m.glcd
diff --git a/graphlcd/logos/SONNENKLAR TV_v2_m.glcd b/graphlcd/logos/channels/SONNENKLAR TV_v2_m.glcd
index 588c83a..588c83a 100644
--- a/graphlcd/logos/SONNENKLAR TV_v2_m.glcd
+++ b/graphlcd/logos/channels/SONNENKLAR TV_v2_m.glcd
diff --git a/graphlcd/logos/SPIEGEL TV XXP_l.glcd b/graphlcd/logos/channels/SPIEGEL TV XXP_l.glcd
index 0b937d6..0b937d6 100644
--- a/graphlcd/logos/SPIEGEL TV XXP_l.glcd
+++ b/graphlcd/logos/channels/SPIEGEL TV XXP_l.glcd
diff --git a/graphlcd/logos/SPUTNIK_l.glcd b/graphlcd/logos/channels/SPUTNIK_l.glcd
index 08467e4..08467e4 100644
--- a/graphlcd/logos/SPUTNIK_l.glcd
+++ b/graphlcd/logos/channels/SPUTNIK_l.glcd
diff --git a/graphlcd/logos/SPUTNIK_m.glcd b/graphlcd/logos/channels/SPUTNIK_m.glcd
index 4e40b73..4e40b73 100644
--- a/graphlcd/logos/SPUTNIK_m.glcd
+++ b/graphlcd/logos/channels/SPUTNIK_m.glcd
diff --git a/graphlcd/logos/SPUTNIK_v2_l.glcd b/graphlcd/logos/channels/SPUTNIK_v2_l.glcd
index c785171..c785171 100644
--- a/graphlcd/logos/SPUTNIK_v2_l.glcd
+++ b/graphlcd/logos/channels/SPUTNIK_v2_l.glcd
diff --git a/graphlcd/logos/SPUTNIK_v2_m.glcd b/graphlcd/logos/channels/SPUTNIK_v2_m.glcd
index 2f45511..2f45511 100644
--- a/graphlcd/logos/SPUTNIK_v2_m.glcd
+++ b/graphlcd/logos/channels/SPUTNIK_v2_m.glcd
diff --git a/graphlcd/logos/SR 1_l.glcd b/graphlcd/logos/channels/SR 1_l.glcd
index 92ec5cc..92ec5cc 100644
--- a/graphlcd/logos/SR 1_l.glcd
+++ b/graphlcd/logos/channels/SR 1_l.glcd
diff --git a/graphlcd/logos/SR 1_m.glcd b/graphlcd/logos/channels/SR 1_m.glcd
index b852f51..b852f51 100644
--- a/graphlcd/logos/SR 1_m.glcd
+++ b/graphlcd/logos/channels/SR 1_m.glcd
diff --git a/graphlcd/logos/SR FERNSEHEN SW_l.glcd b/graphlcd/logos/channels/SR FERNSEHEN SW_l.glcd
index a543eda..a543eda 100644
--- a/graphlcd/logos/SR FERNSEHEN SW_l.glcd
+++ b/graphlcd/logos/channels/SR FERNSEHEN SW_l.glcd
diff --git a/graphlcd/logos/SR FERNSEHEN SW_m.glcd b/graphlcd/logos/channels/SR FERNSEHEN SW_m.glcd
index a320e1d..a320e1d 100644
--- a/graphlcd/logos/SR FERNSEHEN SW_m.glcd
+++ b/graphlcd/logos/channels/SR FERNSEHEN SW_m.glcd
diff --git a/graphlcd/logos/SR FERNSEHEN SW_v2_m.glcd b/graphlcd/logos/channels/SR FERNSEHEN SW_v2_m.glcd
index 942a6a7..942a6a7 100644
--- a/graphlcd/logos/SR FERNSEHEN SW_v2_m.glcd
+++ b/graphlcd/logos/channels/SR FERNSEHEN SW_v2_m.glcd
diff --git a/graphlcd/logos/STUDIO UNIVERSAL_l.glcd b/graphlcd/logos/channels/STUDIO UNIVERSAL_l.glcd
index 83bf5e9..83bf5e9 100644
--- a/graphlcd/logos/STUDIO UNIVERSAL_l.glcd
+++ b/graphlcd/logos/channels/STUDIO UNIVERSAL_l.glcd
diff --git a/graphlcd/logos/STUDIO UNIVERSAL_m.glcd b/graphlcd/logos/channels/STUDIO UNIVERSAL_m.glcd
index 5161ac6..5161ac6 100644
--- a/graphlcd/logos/STUDIO UNIVERSAL_m.glcd
+++ b/graphlcd/logos/channels/STUDIO UNIVERSAL_m.glcd
diff --git a/graphlcd/logos/SUEDWEST FS BW_l.glcd b/graphlcd/logos/channels/SUEDWEST FS BW_l.glcd
index db4a379..db4a379 100644
--- a/graphlcd/logos/SUEDWEST FS BW_l.glcd
+++ b/graphlcd/logos/channels/SUEDWEST FS BW_l.glcd
diff --git a/graphlcd/logos/SUEDWEST FS BW_m.glcd b/graphlcd/logos/channels/SUEDWEST FS BW_m.glcd
index aad0a8b..aad0a8b 100644
--- a/graphlcd/logos/SUEDWEST FS BW_m.glcd
+++ b/graphlcd/logos/channels/SUEDWEST FS BW_m.glcd
diff --git a/graphlcd/logos/SUEDWEST FS BW_v2_l.glcd b/graphlcd/logos/channels/SUEDWEST FS BW_v2_l.glcd
index 8ba6648..8ba6648 100644
--- a/graphlcd/logos/SUEDWEST FS BW_v2_l.glcd
+++ b/graphlcd/logos/channels/SUEDWEST FS BW_v2_l.glcd
diff --git a/graphlcd/logos/SUEDWEST FS RP_l.glcd b/graphlcd/logos/channels/SUEDWEST FS RP_l.glcd
index 59529d2..59529d2 100644
--- a/graphlcd/logos/SUEDWEST FS RP_l.glcd
+++ b/graphlcd/logos/channels/SUEDWEST FS RP_l.glcd
diff --git a/graphlcd/logos/SUEDWEST FS RP_m.glcd b/graphlcd/logos/channels/SUEDWEST FS RP_m.glcd
index ef6109d..ef6109d 100644
--- a/graphlcd/logos/SUEDWEST FS RP_m.glcd
+++ b/graphlcd/logos/channels/SUEDWEST FS RP_m.glcd
diff --git a/graphlcd/logos/SUEDWEST FS RP_v2_l.glcd b/graphlcd/logos/channels/SUEDWEST FS RP_v2_l.glcd
index 6a2302a..6a2302a 100644
--- a/graphlcd/logos/SUEDWEST FS RP_v2_l.glcd
+++ b/graphlcd/logos/channels/SUEDWEST FS RP_v2_l.glcd
diff --git a/graphlcd/logos/SUNSHINE LIVE_l.glcd b/graphlcd/logos/channels/SUNSHINE LIVE_l.glcd
index fd152b0..fd152b0 100644
--- a/graphlcd/logos/SUNSHINE LIVE_l.glcd
+++ b/graphlcd/logos/channels/SUNSHINE LIVE_l.glcd
diff --git a/graphlcd/logos/SUNSHINE LIVE_m.glcd b/graphlcd/logos/channels/SUNSHINE LIVE_m.glcd
index 39d0871..39d0871 100644
--- a/graphlcd/logos/SUNSHINE LIVE_m.glcd
+++ b/graphlcd/logos/channels/SUNSHINE LIVE_m.glcd
diff --git a/graphlcd/logos/SUNSHINE LIVE_v2_m.glcd b/graphlcd/logos/channels/SUNSHINE LIVE_v2_m.glcd
index a8a92f4..a8a92f4 100644
--- a/graphlcd/logos/SUNSHINE LIVE_v2_m.glcd
+++ b/graphlcd/logos/channels/SUNSHINE LIVE_v2_m.glcd
diff --git a/graphlcd/logos/SUPER RTL AUSTRIA_l.glcd b/graphlcd/logos/channels/SUPER RTL AUSTRIA_l.glcd
index fbb8a0f..fbb8a0f 100644
--- a/graphlcd/logos/SUPER RTL AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/SUPER RTL AUSTRIA_l.glcd
diff --git a/graphlcd/logos/SUPER RTL AUSTRIA_m.glcd b/graphlcd/logos/channels/SUPER RTL AUSTRIA_m.glcd
index 5caba7c..5caba7c 100644
--- a/graphlcd/logos/SUPER RTL AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/SUPER RTL AUSTRIA_m.glcd
diff --git a/graphlcd/logos/SUPER RTL_l.glcd b/graphlcd/logos/channels/SUPER RTL_l.glcd
index fbb8a0f..fbb8a0f 100644
--- a/graphlcd/logos/SUPER RTL_l.glcd
+++ b/graphlcd/logos/channels/SUPER RTL_l.glcd
diff --git a/graphlcd/logos/SUPER RTL_m.glcd b/graphlcd/logos/channels/SUPER RTL_m.glcd
index 24fb28b..24fb28b 100644
--- a/graphlcd/logos/SUPER RTL_m.glcd
+++ b/graphlcd/logos/channels/SUPER RTL_m.glcd
diff --git a/graphlcd/logos/SUPER RTL_v2_l.glcd b/graphlcd/logos/channels/SUPER RTL_v2_l.glcd
index 2e08d09..2e08d09 100644
--- a/graphlcd/logos/SUPER RTL_v2_l.glcd
+++ b/graphlcd/logos/channels/SUPER RTL_v2_l.glcd
diff --git a/graphlcd/logos/SWR2_l.glcd b/graphlcd/logos/channels/SWR2_l.glcd
index 2925575..2925575 100644
--- a/graphlcd/logos/SWR2_l.glcd
+++ b/graphlcd/logos/channels/SWR2_l.glcd
diff --git a/graphlcd/logos/SWR2_m.glcd b/graphlcd/logos/channels/SWR2_m.glcd
index c874f4c..c874f4c 100644
--- a/graphlcd/logos/SWR2_m.glcd
+++ b/graphlcd/logos/channels/SWR2_m.glcd
diff --git a/graphlcd/logos/SWR2_v2_m.glcd b/graphlcd/logos/channels/SWR2_v2_m.glcd
index 224d21d..224d21d 100644
--- a/graphlcd/logos/SWR2_v2_m.glcd
+++ b/graphlcd/logos/channels/SWR2_v2_m.glcd
diff --git a/graphlcd/logos/Sat1 SCHWEIZ_v2_m.glcd b/graphlcd/logos/channels/Sat1 SCHWEIZ_v2_m.glcd
index a01a9e0..a01a9e0 100644
--- a/graphlcd/logos/Sat1 SCHWEIZ_v2_m.glcd
+++ b/graphlcd/logos/channels/Sat1 SCHWEIZ_v2_m.glcd
diff --git a/graphlcd/logos/TANGO TV_l.glcd b/graphlcd/logos/channels/TANGO TV_l.glcd
index e90433a..e90433a 100644
--- a/graphlcd/logos/TANGO TV_l.glcd
+++ b/graphlcd/logos/channels/TANGO TV_l.glcd
diff --git a/graphlcd/logos/TANGO TV_m.glcd b/graphlcd/logos/channels/TANGO TV_m.glcd
index 402945a..402945a 100644
--- a/graphlcd/logos/TANGO TV_m.glcd
+++ b/graphlcd/logos/channels/TANGO TV_m.glcd
diff --git a/graphlcd/logos/TELE 5_l.glcd b/graphlcd/logos/channels/TELE 5_l.glcd
index 2ecac47..2ecac47 100644
--- a/graphlcd/logos/TELE 5_l.glcd
+++ b/graphlcd/logos/channels/TELE 5_l.glcd
diff --git a/graphlcd/logos/TELE 5_m.glcd b/graphlcd/logos/channels/TELE 5_m.glcd
index 0409527..0409527 100644
--- a/graphlcd/logos/TELE 5_m.glcd
+++ b/graphlcd/logos/channels/TELE 5_m.glcd
diff --git a/graphlcd/logos/TELE 5_v2_m.glcd b/graphlcd/logos/channels/TELE 5_v2_m.glcd
index cdbb250..cdbb250 100644
--- a/graphlcd/logos/TELE 5_v2_m.glcd
+++ b/graphlcd/logos/channels/TELE 5_v2_m.glcd
diff --git a/graphlcd/logos/TMF_l.glcd b/graphlcd/logos/channels/TMF_l.glcd
index 5f32063..5f32063 100644
--- a/graphlcd/logos/TMF_l.glcd
+++ b/graphlcd/logos/channels/TMF_l.glcd
diff --git a/graphlcd/logos/TMF_m.glcd b/graphlcd/logos/channels/TMF_m.glcd
index 70b2d0e..70b2d0e 100644
--- a/graphlcd/logos/TMF_m.glcd
+++ b/graphlcd/logos/channels/TMF_m.glcd
diff --git a/graphlcd/logos/TRACE TV_l.glcd b/graphlcd/logos/channels/TRACE TV_l.glcd
index c9bfb2a..c9bfb2a 100644
--- a/graphlcd/logos/TRACE TV_l.glcd
+++ b/graphlcd/logos/channels/TRACE TV_l.glcd
diff --git a/graphlcd/logos/TRW AM_l.glcd b/graphlcd/logos/channels/TRW AM_l.glcd
index ffdfad5..ffdfad5 100644
--- a/graphlcd/logos/TRW AM_l.glcd
+++ b/graphlcd/logos/channels/TRW AM_l.glcd
diff --git a/graphlcd/logos/TRW AM_m.glcd b/graphlcd/logos/channels/TRW AM_m.glcd
index c2b8d15..c2b8d15 100644
--- a/graphlcd/logos/TRW AM_m.glcd
+++ b/graphlcd/logos/channels/TRW AM_m.glcd
diff --git a/graphlcd/logos/TV 5_l.glcd b/graphlcd/logos/channels/TV 5_l.glcd
index ee181f5..ee181f5 100644
--- a/graphlcd/logos/TV 5_l.glcd
+++ b/graphlcd/logos/channels/TV 5_l.glcd
diff --git a/graphlcd/logos/TV BERLIN_l.glcd b/graphlcd/logos/channels/TV BERLIN_l.glcd
index 32de271..32de271 100644
--- a/graphlcd/logos/TV BERLIN_l.glcd
+++ b/graphlcd/logos/channels/TV BERLIN_l.glcd
diff --git a/graphlcd/logos/TV BERLIN_m.glcd b/graphlcd/logos/channels/TV BERLIN_m.glcd
index 84c5d07..84c5d07 100644
--- a/graphlcd/logos/TV BERLIN_m.glcd
+++ b/graphlcd/logos/channels/TV BERLIN_m.glcd
diff --git a/graphlcd/logos/TV BERLIN_v2_l.glcd b/graphlcd/logos/channels/TV BERLIN_v2_l.glcd
index 5b0839f..5b0839f 100644
--- a/graphlcd/logos/TV BERLIN_v2_l.glcd
+++ b/graphlcd/logos/channels/TV BERLIN_v2_l.glcd
diff --git a/graphlcd/logos/TV BERLIN_v2_m.glcd b/graphlcd/logos/channels/TV BERLIN_v2_m.glcd
index a26a9db..a26a9db 100644
--- a/graphlcd/logos/TV BERLIN_v2_m.glcd
+++ b/graphlcd/logos/channels/TV BERLIN_v2_m.glcd
diff --git a/graphlcd/logos/TV BERLIN_v3_m.glcd b/graphlcd/logos/channels/TV BERLIN_v3_m.glcd
index 779b35e..779b35e 100644
--- a/graphlcd/logos/TV BERLIN_v3_m.glcd
+++ b/graphlcd/logos/channels/TV BERLIN_v3_m.glcd
diff --git a/graphlcd/logos/TV GALICIA_m.glcd b/graphlcd/logos/channels/TV GALICIA_m.glcd
index 2f8c65a..2f8c65a 100644
--- a/graphlcd/logos/TV GALICIA_m.glcd
+++ b/graphlcd/logos/channels/TV GALICIA_m.glcd
diff --git a/graphlcd/logos/TV GUSTO_l.glcd b/graphlcd/logos/channels/TV GUSTO_l.glcd
index d344f37..d344f37 100644
--- a/graphlcd/logos/TV GUSTO_l.glcd
+++ b/graphlcd/logos/channels/TV GUSTO_l.glcd
diff --git a/graphlcd/logos/TV TRAVEL SHOP_l.glcd b/graphlcd/logos/channels/TV TRAVEL SHOP_l.glcd
index ba4fd8a..ba4fd8a 100644
--- a/graphlcd/logos/TV TRAVEL SHOP_l.glcd
+++ b/graphlcd/logos/channels/TV TRAVEL SHOP_l.glcd
diff --git a/graphlcd/logos/TV TRAVEL SHOP_m.glcd b/graphlcd/logos/channels/TV TRAVEL SHOP_m.glcd
index e143ea2..e143ea2 100644
--- a/graphlcd/logos/TV TRAVEL SHOP_m.glcd
+++ b/graphlcd/logos/channels/TV TRAVEL SHOP_m.glcd
diff --git a/graphlcd/logos/TV TRAVEL SHOP_v2_m.glcd b/graphlcd/logos/channels/TV TRAVEL SHOP_v2_m.glcd
index c38eab2..c38eab2 100644
--- a/graphlcd/logos/TV TRAVEL SHOP_v2_m.glcd
+++ b/graphlcd/logos/channels/TV TRAVEL SHOP_v2_m.glcd
diff --git a/graphlcd/logos/TV5 EUROPE_l.glcd b/graphlcd/logos/channels/TV5 EUROPE_l.glcd
index 55d1905..55d1905 100644
--- a/graphlcd/logos/TV5 EUROPE_l.glcd
+++ b/graphlcd/logos/channels/TV5 EUROPE_l.glcd
diff --git a/graphlcd/logos/TV5 EUROPE_m.glcd b/graphlcd/logos/channels/TV5 EUROPE_m.glcd
index 11a32ae..11a32ae 100644
--- a/graphlcd/logos/TV5 EUROPE_m.glcd
+++ b/graphlcd/logos/channels/TV5 EUROPE_m.glcd
diff --git a/graphlcd/logos/TV6_l.glcd b/graphlcd/logos/channels/TV6_l.glcd
index ff202ab..ff202ab 100644
--- a/graphlcd/logos/TV6_l.glcd
+++ b/graphlcd/logos/channels/TV6_l.glcd
diff --git a/graphlcd/logos/TV6_m.glcd b/graphlcd/logos/channels/TV6_m.glcd
index bc14ec3..bc14ec3 100644
--- a/graphlcd/logos/TV6_m.glcd
+++ b/graphlcd/logos/channels/TV6_m.glcd
diff --git a/graphlcd/logos/TV7_l.glcd b/graphlcd/logos/channels/TV7_l.glcd
index 30c8d92..30c8d92 100644
--- a/graphlcd/logos/TV7_l.glcd
+++ b/graphlcd/logos/channels/TV7_l.glcd
diff --git a/graphlcd/logos/TVC INT_l.glcd b/graphlcd/logos/channels/TVC INT_l.glcd
index c809267..c809267 100644
--- a/graphlcd/logos/TVC INT_l.glcd
+++ b/graphlcd/logos/channels/TVC INT_l.glcd
diff --git a/graphlcd/logos/TVC INT_m.glcd b/graphlcd/logos/channels/TVC INT_m.glcd
index c528d62..c528d62 100644
--- a/graphlcd/logos/TVC INT_m.glcd
+++ b/graphlcd/logos/channels/TVC INT_m.glcd
diff --git a/graphlcd/logos/TVE INT_l.glcd b/graphlcd/logos/channels/TVE INT_l.glcd
index f8056bc..f8056bc 100644
--- a/graphlcd/logos/TVE INT_l.glcd
+++ b/graphlcd/logos/channels/TVE INT_l.glcd
diff --git a/graphlcd/logos/TVE INT_m.glcd b/graphlcd/logos/channels/TVE INT_m.glcd
index a38ddbd..a38ddbd 100644
--- a/graphlcd/logos/TVE INT_m.glcd
+++ b/graphlcd/logos/channels/TVE INT_m.glcd
diff --git a/graphlcd/logos/TW1_l.glcd b/graphlcd/logos/channels/TW1_l.glcd
index 5928b5f..5928b5f 100644
--- a/graphlcd/logos/TW1_l.glcd
+++ b/graphlcd/logos/channels/TW1_l.glcd
diff --git a/graphlcd/logos/TW1_m.glcd b/graphlcd/logos/channels/TW1_m.glcd
index fabea79..fabea79 100644
--- a/graphlcd/logos/TW1_m.glcd
+++ b/graphlcd/logos/channels/TW1_m.glcd
diff --git a/graphlcd/logos/TW1_v2_m.glcd b/graphlcd/logos/channels/TW1_v2_m.glcd
index ac93a8c..ac93a8c 100644
--- a/graphlcd/logos/TW1_v2_m.glcd
+++ b/graphlcd/logos/channels/TW1_v2_m.glcd
diff --git a/graphlcd/logos/V8_l.glcd b/graphlcd/logos/channels/V8_l.glcd
index 6cadbf8..6cadbf8 100644
--- a/graphlcd/logos/V8_l.glcd
+++ b/graphlcd/logos/channels/V8_l.glcd
diff --git a/graphlcd/logos/V8_m.glcd b/graphlcd/logos/channels/V8_m.glcd
index c51daf9..c51daf9 100644
--- a/graphlcd/logos/V8_m.glcd
+++ b/graphlcd/logos/channels/V8_m.glcd
diff --git a/graphlcd/logos/VERONICA RADIO_l.glcd b/graphlcd/logos/channels/VERONICA RADIO_l.glcd
index a34e1fa..a34e1fa 100644
--- a/graphlcd/logos/VERONICA RADIO_l.glcd
+++ b/graphlcd/logos/channels/VERONICA RADIO_l.glcd
diff --git a/graphlcd/logos/VERONICA RADIO_m.glcd b/graphlcd/logos/channels/VERONICA RADIO_m.glcd
index 01767c2..01767c2 100644
--- a/graphlcd/logos/VERONICA RADIO_m.glcd
+++ b/graphlcd/logos/channels/VERONICA RADIO_m.glcd
diff --git a/graphlcd/logos/VH1 CLASSIC_l.glcd b/graphlcd/logos/channels/VH1 CLASSIC_l.glcd
index 63cb4a9..63cb4a9 100644
--- a/graphlcd/logos/VH1 CLASSIC_l.glcd
+++ b/graphlcd/logos/channels/VH1 CLASSIC_l.glcd
diff --git a/graphlcd/logos/VH1 CLASSIC_m.glcd b/graphlcd/logos/channels/VH1 CLASSIC_m.glcd
index c2ca403..c2ca403 100644
--- a/graphlcd/logos/VH1 CLASSIC_m.glcd
+++ b/graphlcd/logos/channels/VH1 CLASSIC_m.glcd
diff --git a/graphlcd/logos/VH1_l.glcd b/graphlcd/logos/channels/VH1_l.glcd
index b48d07c..b48d07c 100644
--- a/graphlcd/logos/VH1_l.glcd
+++ b/graphlcd/logos/channels/VH1_l.glcd
diff --git a/graphlcd/logos/VH1_m.glcd b/graphlcd/logos/channels/VH1_m.glcd
index a092a41..a092a41 100644
--- a/graphlcd/logos/VH1_m.glcd
+++ b/graphlcd/logos/channels/VH1_m.glcd
diff --git a/graphlcd/logos/VIBRATION_l.glcd b/graphlcd/logos/channels/VIBRATION_l.glcd
index ddba5c6..ddba5c6 100644
--- a/graphlcd/logos/VIBRATION_l.glcd
+++ b/graphlcd/logos/channels/VIBRATION_l.glcd
diff --git a/graphlcd/logos/VIBRATION_m.glcd b/graphlcd/logos/channels/VIBRATION_m.glcd
index 7118bc7..7118bc7 100644
--- a/graphlcd/logos/VIBRATION_m.glcd
+++ b/graphlcd/logos/channels/VIBRATION_m.glcd
diff --git a/graphlcd/logos/VIVA PLUS_l.glcd b/graphlcd/logos/channels/VIVA PLUS_l.glcd
index 8e9d4d0..8e9d4d0 100644
--- a/graphlcd/logos/VIVA PLUS_l.glcd
+++ b/graphlcd/logos/channels/VIVA PLUS_l.glcd
diff --git a/graphlcd/logos/VIVA PLUS_m.glcd b/graphlcd/logos/channels/VIVA PLUS_m.glcd
index fc087da..fc087da 100644
--- a/graphlcd/logos/VIVA PLUS_m.glcd
+++ b/graphlcd/logos/channels/VIVA PLUS_m.glcd
diff --git a/graphlcd/logos/VIVA PLUS_v2_m.glcd b/graphlcd/logos/channels/VIVA PLUS_v2_m.glcd
index c823d68..c823d68 100644
--- a/graphlcd/logos/VIVA PLUS_v2_m.glcd
+++ b/graphlcd/logos/channels/VIVA PLUS_v2_m.glcd
diff --git a/graphlcd/logos/VIVA_l.glcd b/graphlcd/logos/channels/VIVA_l.glcd
index b0ebf2c..b0ebf2c 100644
--- a/graphlcd/logos/VIVA_l.glcd
+++ b/graphlcd/logos/channels/VIVA_l.glcd
diff --git a/graphlcd/logos/VIVA_m.glcd b/graphlcd/logos/channels/VIVA_m.glcd
index 2cd6258..2cd6258 100644
--- a/graphlcd/logos/VIVA_m.glcd
+++ b/graphlcd/logos/channels/VIVA_m.glcd
diff --git a/graphlcd/logos/VOLTAGE_l.glcd b/graphlcd/logos/channels/VOLTAGE_l.glcd
index f5e5ea8..f5e5ea8 100644
--- a/graphlcd/logos/VOLTAGE_l.glcd
+++ b/graphlcd/logos/channels/VOLTAGE_l.glcd
diff --git a/graphlcd/logos/VOLTAGE_m.glcd b/graphlcd/logos/channels/VOLTAGE_m.glcd
index 8e45857..8e45857 100644
--- a/graphlcd/logos/VOLTAGE_m.glcd
+++ b/graphlcd/logos/channels/VOLTAGE_m.glcd
diff --git a/graphlcd/logos/VOX AUSTRIA_l.glcd b/graphlcd/logos/channels/VOX AUSTRIA_l.glcd
index 6a884a5..6a884a5 100644
--- a/graphlcd/logos/VOX AUSTRIA_l.glcd
+++ b/graphlcd/logos/channels/VOX AUSTRIA_l.glcd
diff --git a/graphlcd/logos/VOX AUSTRIA_m.glcd b/graphlcd/logos/channels/VOX AUSTRIA_m.glcd
index 11049d8..11049d8 100644
--- a/graphlcd/logos/VOX AUSTRIA_m.glcd
+++ b/graphlcd/logos/channels/VOX AUSTRIA_m.glcd
diff --git a/graphlcd/logos/VOX_l.glcd b/graphlcd/logos/channels/VOX_l.glcd
index 6a884a5..6a884a5 100644
--- a/graphlcd/logos/VOX_l.glcd
+++ b/graphlcd/logos/channels/VOX_l.glcd
diff --git a/graphlcd/logos/VOX_m.glcd b/graphlcd/logos/channels/VOX_m.glcd
index 1202e85..1202e85 100644
--- a/graphlcd/logos/VOX_m.glcd
+++ b/graphlcd/logos/channels/VOX_m.glcd
diff --git a/graphlcd/logos/VOX_v2_m.glcd b/graphlcd/logos/channels/VOX_v2_m.glcd
index f2a3bd2..f2a3bd2 100644
--- a/graphlcd/logos/VOX_v2_m.glcd
+++ b/graphlcd/logos/channels/VOX_v2_m.glcd
diff --git a/graphlcd/logos/WDR3_l.glcd b/graphlcd/logos/channels/WDR3_l.glcd
index 12264fb..12264fb 100644
--- a/graphlcd/logos/WDR3_l.glcd
+++ b/graphlcd/logos/channels/WDR3_l.glcd
diff --git a/graphlcd/logos/WDR3_m.glcd b/graphlcd/logos/channels/WDR3_m.glcd
index dcc883a..dcc883a 100644
--- a/graphlcd/logos/WDR3_m.glcd
+++ b/graphlcd/logos/channels/WDR3_m.glcd
diff --git a/graphlcd/logos/WDR5_l.glcd b/graphlcd/logos/channels/WDR5_l.glcd
index f38cde9..f38cde9 100644
--- a/graphlcd/logos/WDR5_l.glcd
+++ b/graphlcd/logos/channels/WDR5_l.glcd
diff --git a/graphlcd/logos/WDR5_m.glcd b/graphlcd/logos/channels/WDR5_m.glcd
index 7a2f3c8..7a2f3c8 100644
--- a/graphlcd/logos/WDR5_m.glcd
+++ b/graphlcd/logos/channels/WDR5_m.glcd
diff --git a/graphlcd/logos/WDR_l.glcd b/graphlcd/logos/channels/WDR_l.glcd
index b44031c..b44031c 100644
--- a/graphlcd/logos/WDR_l.glcd
+++ b/graphlcd/logos/channels/WDR_l.glcd
diff --git a/graphlcd/logos/WDR_m.glcd b/graphlcd/logos/channels/WDR_m.glcd
index 7bad7c0..7bad7c0 100644
--- a/graphlcd/logos/WDR_m.glcd
+++ b/graphlcd/logos/channels/WDR_m.glcd
diff --git a/graphlcd/logos/WDR_v2_l.glcd b/graphlcd/logos/channels/WDR_v2_l.glcd
index f1af02a..f1af02a 100644
--- a/graphlcd/logos/WDR_v2_l.glcd
+++ b/graphlcd/logos/channels/WDR_v2_l.glcd
diff --git a/graphlcd/logos/WDR_v2_m.glcd b/graphlcd/logos/channels/WDR_v2_m.glcd
index 0dd0d82..0dd0d82 100644
--- a/graphlcd/logos/WDR_v2_m.glcd
+++ b/graphlcd/logos/channels/WDR_v2_m.glcd
diff --git a/graphlcd/logos/WDR_v3_m.glcd b/graphlcd/logos/channels/WDR_v3_m.glcd
index 0f04d43..0f04d43 100644
--- a/graphlcd/logos/WDR_v3_m.glcd
+++ b/graphlcd/logos/channels/WDR_v3_m.glcd
diff --git a/graphlcd/logos/WEIN TV_l.glcd b/graphlcd/logos/channels/WEIN TV_l.glcd
index b537280..b537280 100644
--- a/graphlcd/logos/WEIN TV_l.glcd
+++ b/graphlcd/logos/channels/WEIN TV_l.glcd
diff --git a/graphlcd/logos/WETTER FERNSEHEN_l.glcd b/graphlcd/logos/channels/WETTER FERNSEHEN_l.glcd
index 0095d81..0095d81 100644
--- a/graphlcd/logos/WETTER FERNSEHEN_l.glcd
+++ b/graphlcd/logos/channels/WETTER FERNSEHEN_l.glcd
diff --git a/graphlcd/logos/WISHLINE_l.glcd b/graphlcd/logos/channels/WISHLINE_l.glcd
index d9d6b5c..d9d6b5c 100644
--- a/graphlcd/logos/WISHLINE_l.glcd
+++ b/graphlcd/logos/channels/WISHLINE_l.glcd
diff --git a/graphlcd/logos/WISHLINE_m.glcd b/graphlcd/logos/channels/WISHLINE_m.glcd
index 2d281a8..2d281a8 100644
--- a/graphlcd/logos/WISHLINE_m.glcd
+++ b/graphlcd/logos/channels/WISHLINE_m.glcd
diff --git a/graphlcd/logos/X-ZONE_l.glcd b/graphlcd/logos/channels/X-ZONE_l.glcd
index 43c1866..43c1866 100644
--- a/graphlcd/logos/X-ZONE_l.glcd
+++ b/graphlcd/logos/channels/X-ZONE_l.glcd
diff --git a/graphlcd/logos/X-ZONE_m.glcd b/graphlcd/logos/channels/X-ZONE_m.glcd
index e8ff623..e8ff623 100644
--- a/graphlcd/logos/X-ZONE_m.glcd
+++ b/graphlcd/logos/channels/X-ZONE_m.glcd
diff --git a/graphlcd/logos/XXL_l.glcd b/graphlcd/logos/channels/XXL_l.glcd
index 3232a51..3232a51 100644
--- a/graphlcd/logos/XXL_l.glcd
+++ b/graphlcd/logos/channels/XXL_l.glcd
diff --git a/graphlcd/logos/XXL_m.glcd b/graphlcd/logos/channels/XXL_m.glcd
index 04d1224..04d1224 100644
--- a/graphlcd/logos/XXL_m.glcd
+++ b/graphlcd/logos/channels/XXL_m.glcd
diff --git a/graphlcd/logos/XXP_l.glcd b/graphlcd/logos/channels/XXP_l.glcd
index 70d2d28..70d2d28 100644
--- a/graphlcd/logos/XXP_l.glcd
+++ b/graphlcd/logos/channels/XXP_l.glcd
diff --git a/graphlcd/logos/XXP_m.glcd b/graphlcd/logos/channels/XXP_m.glcd
index 84eb572..84eb572 100644
--- a/graphlcd/logos/XXP_m.glcd
+++ b/graphlcd/logos/channels/XXP_m.glcd
diff --git a/graphlcd/logos/XXP_v2_m.glcd b/graphlcd/logos/channels/XXP_v2_m.glcd
index 55b0897..55b0897 100644
--- a/graphlcd/logos/XXP_v2_m.glcd
+++ b/graphlcd/logos/channels/XXP_v2_m.glcd
diff --git a/graphlcd/logos/YAM FM_l.glcd b/graphlcd/logos/channels/YAM FM_l.glcd
index e6206b7..e6206b7 100644
--- a/graphlcd/logos/YAM FM_l.glcd
+++ b/graphlcd/logos/channels/YAM FM_l.glcd
diff --git a/graphlcd/logos/YAM FM_m.glcd b/graphlcd/logos/channels/YAM FM_m.glcd
index f059f03..f059f03 100644
--- a/graphlcd/logos/YAM FM_m.glcd
+++ b/graphlcd/logos/channels/YAM FM_m.glcd
diff --git a/graphlcd/logos/YORIN FM_l.glcd b/graphlcd/logos/channels/YORIN FM_l.glcd
index 5d1d13e..5d1d13e 100644
--- a/graphlcd/logos/YORIN FM_l.glcd
+++ b/graphlcd/logos/channels/YORIN FM_l.glcd
diff --git a/graphlcd/logos/YORIN FM_m.glcd b/graphlcd/logos/channels/YORIN FM_m.glcd
index 66d2eee..66d2eee 100644
--- a/graphlcd/logos/YORIN FM_m.glcd
+++ b/graphlcd/logos/channels/YORIN FM_m.glcd
diff --git a/graphlcd/logos/YOU FM_l.glcd b/graphlcd/logos/channels/YOU FM_l.glcd
index a038514..a038514 100644
--- a/graphlcd/logos/YOU FM_l.glcd
+++ b/graphlcd/logos/channels/YOU FM_l.glcd
diff --git a/graphlcd/logos/YOU FM_m.glcd b/graphlcd/logos/channels/YOU FM_m.glcd
index e99fd9c..e99fd9c 100644
--- a/graphlcd/logos/YOU FM_m.glcd
+++ b/graphlcd/logos/channels/YOU FM_m.glcd
diff --git a/graphlcd/logos/ZDF DOKU-KIKA_l.glcd b/graphlcd/logos/channels/ZDF DOKU-KIKA_l.glcd
index e542a01..e542a01 100644
--- a/graphlcd/logos/ZDF DOKU-KIKA_l.glcd
+++ b/graphlcd/logos/channels/ZDF DOKU-KIKA_l.glcd
diff --git a/graphlcd/logos/ZDF DOKU-KIKA_m.glcd b/graphlcd/logos/channels/ZDF DOKU-KIKA_m.glcd
index 552d2f9..552d2f9 100644
--- a/graphlcd/logos/ZDF DOKU-KIKA_m.glcd
+++ b/graphlcd/logos/channels/ZDF DOKU-KIKA_m.glcd
diff --git a/graphlcd/logos/ZDF DOKUKANAL_l.glcd b/graphlcd/logos/channels/ZDF DOKUKANAL_l.glcd
index 2ccd76e..2ccd76e 100644
--- a/graphlcd/logos/ZDF DOKUKANAL_l.glcd
+++ b/graphlcd/logos/channels/ZDF DOKUKANAL_l.glcd
diff --git a/graphlcd/logos/ZDF DOKUKANAL_m.glcd b/graphlcd/logos/channels/ZDF DOKUKANAL_m.glcd
index d822d2d..d822d2d 100644
--- a/graphlcd/logos/ZDF DOKUKANAL_m.glcd
+++ b/graphlcd/logos/channels/ZDF DOKUKANAL_m.glcd
diff --git a/graphlcd/logos/ZDF DOKUKANAL_v2_l.glcd b/graphlcd/logos/channels/ZDF DOKUKANAL_v2_l.glcd
index b3f0dda..b3f0dda 100644
--- a/graphlcd/logos/ZDF DOKUKANAL_v2_l.glcd
+++ b/graphlcd/logos/channels/ZDF DOKUKANAL_v2_l.glcd
diff --git a/graphlcd/logos/ZDF DOKUKANAL_v2_m.glcd b/graphlcd/logos/channels/ZDF DOKUKANAL_v2_m.glcd
index 93dac7b..93dac7b 100644
--- a/graphlcd/logos/ZDF DOKUKANAL_v2_m.glcd
+++ b/graphlcd/logos/channels/ZDF DOKUKANAL_v2_m.glcd
diff --git a/graphlcd/logos/ZDF INFO-3SAT_l.glcd b/graphlcd/logos/channels/ZDF INFO-3SAT_l.glcd
index 1bb5c30..1bb5c30 100644
--- a/graphlcd/logos/ZDF INFO-3SAT_l.glcd
+++ b/graphlcd/logos/channels/ZDF INFO-3SAT_l.glcd
diff --git a/graphlcd/logos/ZDF INFO-3SAT_m.glcd b/graphlcd/logos/channels/ZDF INFO-3SAT_m.glcd
index fce44d8..fce44d8 100644
--- a/graphlcd/logos/ZDF INFO-3SAT_m.glcd
+++ b/graphlcd/logos/channels/ZDF INFO-3SAT_m.glcd
diff --git a/graphlcd/logos/ZDF INFOKANAL_l.glcd b/graphlcd/logos/channels/ZDF INFOKANAL_l.glcd
index 7ba43e8..7ba43e8 100644
--- a/graphlcd/logos/ZDF INFOKANAL_l.glcd
+++ b/graphlcd/logos/channels/ZDF INFOKANAL_l.glcd
diff --git a/graphlcd/logos/ZDF INFOKANAL_m.glcd b/graphlcd/logos/channels/ZDF INFOKANAL_m.glcd
index 58ebe28..58ebe28 100644
--- a/graphlcd/logos/ZDF INFOKANAL_m.glcd
+++ b/graphlcd/logos/channels/ZDF INFOKANAL_m.glcd
diff --git a/graphlcd/logos/ZDF INFOKANAL_v2_l.glcd b/graphlcd/logos/channels/ZDF INFOKANAL_v2_l.glcd
index 5f515b9..5f515b9 100644
--- a/graphlcd/logos/ZDF INFOKANAL_v2_l.glcd
+++ b/graphlcd/logos/channels/ZDF INFOKANAL_v2_l.glcd
diff --git a/graphlcd/logos/ZDF INFOKANAL_v2_m.glcd b/graphlcd/logos/channels/ZDF INFOKANAL_v2_m.glcd
index 1a35629..1a35629 100644
--- a/graphlcd/logos/ZDF INFOKANAL_v2_m.glcd
+++ b/graphlcd/logos/channels/ZDF INFOKANAL_v2_m.glcd
diff --git a/graphlcd/logos/ZDF THEATERKANAL_l.glcd b/graphlcd/logos/channels/ZDF THEATERKANAL_l.glcd
index 30caeee..30caeee 100644
--- a/graphlcd/logos/ZDF THEATERKANAL_l.glcd
+++ b/graphlcd/logos/channels/ZDF THEATERKANAL_l.glcd
diff --git a/graphlcd/logos/ZDF THEATERKANAL_v2_l.glcd b/graphlcd/logos/channels/ZDF THEATERKANAL_v2_l.glcd
index 8e0cd92..8e0cd92 100644
--- a/graphlcd/logos/ZDF THEATERKANAL_v2_l.glcd
+++ b/graphlcd/logos/channels/ZDF THEATERKANAL_v2_l.glcd
diff --git a/graphlcd/logos/ZDF THEATERKANAL_v2_m.glcd b/graphlcd/logos/channels/ZDF THEATERKANAL_v2_m.glcd
index 646e9a4..646e9a4 100644
--- a/graphlcd/logos/ZDF THEATERKANAL_v2_m.glcd
+++ b/graphlcd/logos/channels/ZDF THEATERKANAL_v2_m.glcd
diff --git a/graphlcd/logos/ZDF_THEATERKANAL_m.glcd b/graphlcd/logos/channels/ZDF_THEATERKANAL_m.glcd
index 8363a6c..8363a6c 100644
--- a/graphlcd/logos/ZDF_THEATERKANAL_m.glcd
+++ b/graphlcd/logos/channels/ZDF_THEATERKANAL_m.glcd
diff --git a/graphlcd/logos/ZDF_l.glcd b/graphlcd/logos/channels/ZDF_l.glcd
index 4529df6..4529df6 100644
--- a/graphlcd/logos/ZDF_l.glcd
+++ b/graphlcd/logos/channels/ZDF_l.glcd
diff --git a/graphlcd/logos/ZDF_m.glcd b/graphlcd/logos/channels/ZDF_m.glcd
index bc57463..bc57463 100644
--- a/graphlcd/logos/ZDF_m.glcd
+++ b/graphlcd/logos/channels/ZDF_m.glcd
diff --git a/graphlcd/logos/ZIK_l.glcd b/graphlcd/logos/channels/ZIK_l.glcd
index 98315b7..98315b7 100644
--- a/graphlcd/logos/ZIK_l.glcd
+++ b/graphlcd/logos/channels/ZIK_l.glcd
diff --git a/graphlcd/logos/ZIK_m.glcd b/graphlcd/logos/channels/ZIK_m.glcd
index 3def476..3def476 100644
--- a/graphlcd/logos/ZIK_m.glcd
+++ b/graphlcd/logos/channels/ZIK_m.glcd
diff --git a/graphlcd/logos/animated/REPLAY-CD_l.glcd b/graphlcd/logos/replay/animated/replay-cd_l.glcd
index 9c09643..9c09643 100644
--- a/graphlcd/logos/animated/REPLAY-CD_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-cd_l.glcd
diff --git a/graphlcd/logos/animated/REPLAY-DVD_l.glcd b/graphlcd/logos/replay/animated/replay-dvd_l.glcd
index 0385097..0385097 100644
--- a/graphlcd/logos/animated/REPLAY-DVD_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-dvd_l.glcd
diff --git a/graphlcd/logos/animated/REPLAY-FILE_l.glcd b/graphlcd/logos/replay/animated/replay-file_l.glcd
index fd2e9d6..fd2e9d6 100644
--- a/graphlcd/logos/animated/REPLAY-FILE_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-file_l.glcd
diff --git a/graphlcd/logos/animated/REPLAY-IMAGE_l.glcd b/graphlcd/logos/replay/animated/replay-image_l.glcd
index f5b5270..f5b5270 100644
--- a/graphlcd/logos/animated/REPLAY-IMAGE_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-image_l.glcd
diff --git a/graphlcd/logos/animated/REPLAY-MUSIC_l.glcd b/graphlcd/logos/replay/animated/replay-music_l.glcd
index 8013bb3..8013bb3 100644
--- a/graphlcd/logos/animated/REPLAY-MUSIC_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-music_l.glcd
diff --git a/graphlcd/logos/animated/REPLAY-VDR_l.glcd b/graphlcd/logos/replay/animated/replay-vdr_l.glcd
index 5144e13..5144e13 100644
--- a/graphlcd/logos/animated/REPLAY-VDR_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-vdr_l.glcd
diff --git a/graphlcd/logos/animated/REPLAY-VDR_m.glcd b/graphlcd/logos/replay/animated/replay-vdr_m.glcd
index 4e81191..4e81191 100644
--- a/graphlcd/logos/animated/REPLAY-VDR_m.glcd
+++ b/graphlcd/logos/replay/animated/replay-vdr_m.glcd
diff --git a/graphlcd/logos/animated/REPLAY-VDR_v2_l.glcd b/graphlcd/logos/replay/animated/replay-vdr_v2_l.glcd
index 07c7f03..07c7f03 100644
--- a/graphlcd/logos/animated/REPLAY-VDR_v2_l.glcd
+++ b/graphlcd/logos/replay/animated/replay-vdr_v2_l.glcd
diff --git a/graphlcd/logos/REPLAY-CD_l.glcd b/graphlcd/logos/replay/replay-cd_l.glcd
index 95ef265..95ef265 100644
--- a/graphlcd/logos/REPLAY-CD_l.glcd
+++ b/graphlcd/logos/replay/replay-cd_l.glcd
diff --git a/graphlcd/logos/REPLAY-CD_m.glcd b/graphlcd/logos/replay/replay-cd_m.glcd
index 2bd4022..2bd4022 100644
--- a/graphlcd/logos/REPLAY-CD_m.glcd
+++ b/graphlcd/logos/replay/replay-cd_m.glcd
diff --git a/graphlcd/logos/REPLAY-CD-v2_l.glcd b/graphlcd/logos/replay/replay-cd_v2_l.glcd
index 2e8453f..2e8453f 100644
--- a/graphlcd/logos/REPLAY-CD-v2_l.glcd
+++ b/graphlcd/logos/replay/replay-cd_v2_l.glcd
diff --git a/graphlcd/logos/REPLAY-CD-v2_m.glcd b/graphlcd/logos/replay/replay-cd_v2_m.glcd
index fb7d75a..fb7d75a 100644
--- a/graphlcd/logos/REPLAY-CD-v2_m.glcd
+++ b/graphlcd/logos/replay/replay-cd_v2_m.glcd
diff --git a/graphlcd/logos/REPLAY-DVD_l.glcd b/graphlcd/logos/replay/replay-dvd_l.glcd
index af19b0f..af19b0f 100644
--- a/graphlcd/logos/REPLAY-DVD_l.glcd
+++ b/graphlcd/logos/replay/replay-dvd_l.glcd
diff --git a/graphlcd/logos/REPLAY-DVD_m.glcd b/graphlcd/logos/replay/replay-dvd_m.glcd
index 6d43fa8..6d43fa8 100644
--- a/graphlcd/logos/REPLAY-DVD_m.glcd
+++ b/graphlcd/logos/replay/replay-dvd_m.glcd
diff --git a/graphlcd/logos/REPLAY-DVD-v2_l.glcd b/graphlcd/logos/replay/replay-dvd_v2_l.glcd
index 5b7af21..5b7af21 100644
--- a/graphlcd/logos/REPLAY-DVD-v2_l.glcd
+++ b/graphlcd/logos/replay/replay-dvd_v2_l.glcd
diff --git a/graphlcd/logos/REPLAY-FILE_l.glcd b/graphlcd/logos/replay/replay-file_l.glcd
index cf60fc4..cf60fc4 100644
--- a/graphlcd/logos/REPLAY-FILE_l.glcd
+++ b/graphlcd/logos/replay/replay-file_l.glcd
diff --git a/graphlcd/logos/REPLAY-FILE_m.glcd b/graphlcd/logos/replay/replay-file_m.glcd
index 3a397c1..3a397c1 100644
--- a/graphlcd/logos/REPLAY-FILE_m.glcd
+++ b/graphlcd/logos/replay/replay-file_m.glcd
diff --git a/graphlcd/logos/REPLAY-IMAGE_l.glcd b/graphlcd/logos/replay/replay-image_l.glcd
index 6f9ddd1..6f9ddd1 100644
--- a/graphlcd/logos/REPLAY-IMAGE_l.glcd
+++ b/graphlcd/logos/replay/replay-image_l.glcd
diff --git a/graphlcd/logos/REPLAY-IMAGE_m.glcd b/graphlcd/logos/replay/replay-image_m.glcd
index 3f240e5..3f240e5 100644
--- a/graphlcd/logos/REPLAY-IMAGE_m.glcd
+++ b/graphlcd/logos/replay/replay-image_m.glcd
diff --git a/graphlcd/logos/REPLAY-MUSIC_l.glcd b/graphlcd/logos/replay/replay-music_l.glcd
index f1b2266..f1b2266 100644
--- a/graphlcd/logos/REPLAY-MUSIC_l.glcd
+++ b/graphlcd/logos/replay/replay-music_l.glcd
diff --git a/graphlcd/logos/REPLAY-MUSIC_m.glcd b/graphlcd/logos/replay/replay-music_m.glcd
index 1ea4d01..1ea4d01 100644
--- a/graphlcd/logos/REPLAY-MUSIC_m.glcd
+++ b/graphlcd/logos/replay/replay-music_m.glcd
diff --git a/graphlcd/logos/REPLAY-VDR_l.glcd b/graphlcd/logos/replay/replay-vdr_l.glcd
index d879417..d879417 100644
--- a/graphlcd/logos/REPLAY-VDR_l.glcd
+++ b/graphlcd/logos/replay/replay-vdr_l.glcd
diff --git a/graphlcd/logos/REPLAY-VDR_m.glcd b/graphlcd/logos/replay/replay-vdr_m.glcd
index 7d3a947..7d3a947 100644
--- a/graphlcd/logos/REPLAY-VDR_m.glcd
+++ b/graphlcd/logos/replay/replay-vdr_m.glcd
diff --git a/graphlcd/skins/default/default.skin b/graphlcd/skins/default/default.skin
new file mode 100644
index 0000000..b47505e
--- /dev/null
+++ b/graphlcd/skins/default/default.skin
@@ -0,0 +1,212 @@
+<?xml version="1.0"?>
+<skin version="1.0" name="default">
+  <font id="FontInfo" url="fnt:f12bn.fnt" condition="le({ScreenHeight},64)"/>
+  <font id="FontChannel" url="fnt:f12bn.fnt" condition="le({ScreenHeight},64)"/>
+  <font id="FontMenuTitle" url="fnt:f8n.fnt" condition="le({ScreenHeight},64)"/>
+  <font id="FontMenuItem" url="fnt:f8n.fnt" condition="le({ScreenHeight},64)"/>
+  <font id="FontMenuButton" url="fnt:f5n.fnt" condition="le({ScreenHeight},64)"/>
+  <font id="FontTimes" url="fnt:f8n.fnt" condition="le({ScreenHeight},64)"/>
+
+  <font id="FontTimes" url="fnt:verdana-014.fnt"/>
+  <font id="FontInfo" url="fnt:verdana-018.fnt"/>
+  <font id="FontChannel" url="fnt:verdana-022.fnt"/>
+  <font id="FontMenuTitle" url="fnt:verdana-015.fnt"/>
+  <font id="FontMenuItem" url="fnt:verdana-012.fnt"/>
+  <font id="FontMenuButton" url="fnt:verdanab-009.fnt"/>
+
+  <variable id="LineThickness" value="1" condition="le({ScreenHeight},64)"/>
+  <variable id="LineThickness" value="2"/>
+
+  <variable id="LogoW" value="40" condition="le({ScreenHeight},64)"/>
+  <variable id="LogoW" value="64"/>
+  <variable id="LogoH" value="29" condition="le({ScreenHeight},64)"/>
+  <variable id="LogoH" value="48"/>
+  <variable id="LogoX" value="mul(-1,#LogoW)"/>
+  <variable id="ChannelLogo" value="'{ConfigPath}/logos/channels/{ChannelAlias}_m.glcd'" condition="le({ScreenHeight},64)"/>
+  <variable id="ChannelLogo" value="'{ConfigPath}/logos/channels/{ChannelAlias}_l.glcd'"/>
+
+  <variable id="SymbolW" value="ImageWidth('symbols/empty_small.pbm')" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolW" value="ImageWidth('symbols/empty.pbm')"/>
+  <variable id="SymbolH" value="ImageHeight('symbols/empty_small.pbm')" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolH" value="ImageHeight('symbols/empty.pbm')"/>
+  <variable id="SymbolPitch" value="add(#SymbolW,1)"/>
+  <variable id="SymbolTeletext" value="'symbols/teletext_small.pbm'" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolTeletext" value="'symbols/teletext.pbm'"/>
+  <variable id="SymbolDolby" value="'symbols/dolby_small.pbm'" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolDolby" value="'symbols/dolby.pbm'"/>
+  <variable id="SymbolScrambled" value="'symbols/scrambled_small.pbm'" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolScrambled" value="'symbols/scrambled.pbm'"/>
+  <variable id="SymbolMute" value="'symbols/mute_small.pbm'" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolMute" value="'symbols/mute.pbm'"/>
+  <variable id="SymbolRecording" value="'symbols/recording_small.pbm'" condition="le({ScreenHeight},64)"/>
+  <variable id="SymbolRecording" value="'symbols/recording.pbm'"/>
+
+  <display id="normal">
+    <variable id="TimeBarW" value="FontTextWidth('FontTimes','00:00 - 00:00')"/>
+    <variable id="TimeBarY" value="add(#LogoH,#LineThickness,FontLineHeight('FontTimes'),1)"/>
+    <text x1="0" x2="-1" y1="0" y2="-1" color="black" align="left" font="FontChannel">
+    {ChannelNumber} {ChannelName}
+    </text>
+    <block condition="{SettingShowChannelLogo}">
+      <rectangle x1="#LogoX" y1="0" width="#LogoW" height="#LogoH" color="white" filled="yes"/>
+      <image x="#LogoX" y="0" color="black" path="#ChannelLogo"/>
+      <rectangle x1="sub(#LogoX,#LineThickness)" width="#LineThickness" y1="0" height="#LogoH" color="black" filled="yes"/>
+      <text x1="0" x2="sub(#LogoX,#LineThickness,2)" y1="sub(#LogoH,FontLineHeight('FontInfo'))" y2="-1" color="black" align="left" font="FontInfo">
+      {DateTime:%a %d.%m.}
+      </text>
+      <text x1="0" x2="sub(#LogoX,#LineThickness,2)" y1="sub(#LogoH,FontLineHeight('FontInfo'))" y2="-1" color="black" align="right" font="FontInfo">
+      {DateTime:%H\:%M}
+      </text>
+    </block>
+    <block condition="not({SettingShowChannelLogo})">
+      <text x1="0" x2="-1" y1="sub(#LogoH,FontLineHeight('FontInfo'))" y2="-1" color="black" align="left" font="FontInfo">
+      {DateTime:%a %d.%m.}
+      </text>
+      <text x1="0" x2="-1" y1="sub(#LogoH,FontLineHeight('FontInfo'))" y2="-1" color="black" align="right" font="FontInfo">
+      {DateTime:%H\:%M}
+      </text>
+    </block>
+    <rectangle x1="0" x2="-1" y1="#LogoH" height="#LineThickness" color="black" filled="yes"/>
+    <block condition="{SettingShowSymbols}">
+      <image x="mul(-4,#SymbolPitch)" y="add(#LogoH,#LineThickness,1)" color="black" path="#SymbolTeletext" condition="{ChannelHasTeletext}"/>
+      <image x="mul(-3,#SymbolPitch)" y="add(#LogoH,#LineThickness,1)" color="black" path="#SymbolDolby" condition="{ChannelHasDolby}"/>
+      <image x="mul(-2,#SymbolPitch)" y="add(#LogoH,#LineThickness,1)" color="black" path="#SymbolScrambled" condition="{ChannelIsEncrypted}"/>
+      <image x="mul(-1,#SymbolPitch)" y="add(#LogoH,#LineThickness,1)" color="black" path="#SymbolMute" condition="{VolumeIsMute}"/>
+    </block>
+    <block condition="{SettingShowTimebar}">
+      <text x1="0" x2="-1" y1="add(#LogoH,#LineThickness)" y2="-1" color="black" align="left" font="FontTimes">
+      {PresentStartDateTime:%H\:%M} - {FollowingStartDateTime:%H\:%M}
+      </text>
+      <rectangle x1="0" width="#TimeBarW" y1="#TimeBarY" height="6" color="black"/>
+      <progress x1="2" width="sub(#TimeBarW,4)" y1="add(#TimeBarY,2)" height="2" color="black" direction="0" current="{PresentProgress}" total="{PresentDuration}"/>
+    </block>
+
+    <variable id="RecordingsTextY" value="mul(-1,FontLineHeight('FontTimes'))"/>
+    <variable id="RecordingsLineY" value="sub(sub(#RecordingsTextY,#LineThickness),1)"/>
+    <variable id="RecordingsSymbolY" value="add(#RecordingsTextY,div(sub(FontLineHeight('FontTimes'),#SymbolH),2))"/>
+    <variable id="PresentTextY" value="sub(sub(#RecordingsLineY,FontLineHeight('FontInfo')),2)"/>
+
+    <text x1="0" x2="-1" y1="#PresentTextY" height="FontLineHeight('FontInfo')" color="black" align="left" font="FontInfo">
+    {PresentTitle}
+    </text>
+    <rectangle x1="0" x2="-1" y1="#RecordingsLineY" height="#LineThickness" color="black" filled="yes"/>
+    <image x="0" y="#RecordingsSymbolY" color="black" path="#SymbolRecording" condition="{IsRecording}"/>
+    <text x1="add(#SymbolW,2)" x2="-1" y1="#RecordingsTextY" height="FontLineHeight('FontTimes')" color="black" align="left" font="FontTimes">
+    {Recordings}
+    </text>
+  </display>
+  <display id="volume">
+    <variable id="VolumeBarX" value="20"/>
+    <variable id="VolumeBarW" value="sub({ScreenWidth},mul(2,#VolumeBarX))"/>
+    <variable id="VolumeBarH" value="30"/>
+    <variable id="VolumeBarY" value="div(sub({ScreenHeight},#VolumeBarH),2)"/>
+    <variable id="MuteImage" value="'images/mute.pbm'"/>
+    <variable id="MuteImageW" value="ImageWidth(#MuteImage)"/>
+    <variable id="MuteImageH" value="ImageHeight(#MuteImage)"/>
+    <rectangle x1="#VolumeBarX" y1="#VolumeBarY" width="#VolumeBarW" height="#VolumeBarH" color="white" filled="yes" radius="3"/>
+    <rectangle x1="add(#VolumeBarX,2)" y1="add(#VolumeBarY,2)" width="sub(#VolumeBarW,4)" height="sub(#VolumeBarH,4)" color="black" radius="2"/>
+    <block condition="not({VolumeIsMute})">
+      <progress x1="add(#VolumeBarX,4)" y1="add(#VolumeBarY,4)" width="sub(#VolumeBarW,8)" height="sub(#VolumeBarH,8)" color="black" direction="0" current="{VolumeCurrent}" total="{VolumeTotal}"/>
+    </block>
+    <block condition="{VolumeIsMute}">
+      <image x="div(sub({ScreenWidth},#MuteImageW),2)" y="div(sub({ScreenHeight},#MuteImageH),2)" color="black" path="#MuteImage"/>
+    </block>
+  </display>
+  <display id="message">
+    <variable id="MessageX" value="10"/>
+    <variable id="MessageW" value="sub({ScreenWidth},mul(2,#MessageX))"/>
+    <variable id="MessageTextH" value="mul(4,FontLineHeight('FontInfo'))"/>
+    <variable id="MessageH" value="add(#MessageTextH,8)"/>
+    <variable id="MessageY" value="div(sub({ScreenHeight},#MessageH),2)"/>
+    <variable id="MessageBitmap" value="'images/message.pbm'"/>
+    <variable id="MessageBitmapW" value="ImageWidth(#MessageBitmap)"/>
+    <variable id="MessageBitmapH" value="ImageHeight(#MessageBitmap)"/>
+    <rectangle x1="#MessageX" y1="#MessageY" width="#MessageW" height="#MessageH" color="white" filled="yes" radius="3"/>
+    <rectangle x1="add(#MessageX,2)" y1="add(#MessageY,2)" width="sub(#MessageW,4)" height="sub(#MessageH,4)" color="black" radius="2"/>
+    <block condition="lt(#MessageBitmapH,sub(#MessageH,12))">
+      <image x1="add(#MessageX,6)" y1="add(#MessageY,6)" color="black" path="#MessageBitmap"/>
+      <text x1="add(add(#MessageX,10),#MessageBitmapW)" y1="add(#MessageY,4)" width="sub(sub(#MessageW,14),#MessageBitmapW)" height="#MessageTextH" color="black" align="left" multiline="yes" font="FontInfo">
+      {Message}
+      </text>
+    </block>
+    <block condition="ge(#MessageBitmapH,sub(#MessageH,12))">
+      <text x1="add(#MessageX,4)" y1="add(#MessageY,4)" width="sub(#MessageW,8)" height="#MessageTextH" color="black" align="left" multiline="yes" font="FontInfo">
+      {Message}
+      </text>
+    </block>
+  </display>
+  <display id="replay">
+    <variable id="ReplayProgressH" value="14"/>
+    <variable id="ReplayProgressGap" value="1"/>
+    <variable id="ReplayTimeY" value="mul(FontLineHeight('FontInfo'),-1)"/>
+    <variable id="ReplayProgressY" value="sub(#ReplayTimeY,#ReplayProgressH,#ReplayProgressGap)"/>
+    <variable id="ReplayLogo" value="'{ConfigPath}/logos/replay/replay-{ReplayMode}_m.glcd'" condition="le({ScreenHeight},64)"/>
+    <variable id="ReplayLogo" value="'{ConfigPath}/logos/replay/replay-{ReplayMode}_l.glcd'"/>
+    <block condition="{SettingShowReplayLogo}">
+      <image x="#LogoX" y="0" color="black" path="#ReplayLogo"/>
+      <rectangle x1="sub(#LogoX,#LineThickness)" width="#LineThickness" y1="0" height="#LogoH" color="black" filled="yes"/>
+      <rectangle x1="sub(#LogoX,#LineThickness)" x2="-1" y1="#LogoH" height="#LineThickness" color="black" filled="yes"/>
+      <text x1="0" x2="sub(#LogoX,#LineThickness,2)" y1="0" y2="#ReplayProgressY" color="black" align="left" multiline="yes" font="FontInfo">
+      {ReplayTitle}
+      </text>
+    </block>
+    <block condition="not({SettingShowReplayLogo})">
+      <text x1="0" x2="-1" y1="0" y2="#ReplayProgressY" color="black" align="left" multiline="yes" font="FontInfo">
+      {ReplayTitle}
+      </text>
+    </block>
+    <rectangle x1="0" y1="#ReplayProgressY" width="15" height="14" color="black"/>
+    <image x="1" y="add(#ReplayProgressY,1)" color="black" path="symbols/replay-play.pbm" condition="{ReplayIsPlaying}"/>
+    <image x="1" y="add(#ReplayProgressY,1)" color="black" path="symbols/replay-pause.pbm" condition="{ReplayIsPausing}"/>
+    <image x="1" y="add(#ReplayProgressY,1)" color="black" path="symbols/replay-fast-fwd.pbm" condition="{ReplayIsFastForward}"/>
+    <image x="1" y="add(#ReplayProgressY,1)" color="black" path="symbols/replay-fast-rwd.pbm" condition="{ReplayIsFastRewind}"/>
+    <image x="1" y="add(#ReplayProgressY,1)" color="black" path="symbols/replay-slow-fwd.pbm" condition="{ReplayIsSlowForward}"/>
+    <image x="1" y="add(#ReplayProgressY,1)" color="black" path="symbols/replay-slow-rwd.pbm" condition="{ReplayIsSlowRewind}"/>
+    <rectangle x1="14" x2="-1" y1="#ReplayProgressY" height="#ReplayProgressH" color="black"/>
+    <progress x1="16" x2="-3" y1="add(#ReplayProgressY,2)" height="sub(#ReplayProgressH,4)" color="black" direction="0" current="{ReplayPosition}" total="{ReplayDuration}"/>
+    <text x1="0" x2="-1" y1="#ReplayTimeY" y2="-1" color="black" align="left" font="FontInfo">
+    {ReplayPositionIndex:%H\:%M\:%S}
+    </text>
+    <text x1="0" x2="-1" y1="#ReplayTimeY" y2="-1" color="black" align="right" font="FontInfo">
+    {ReplayDurationIndex:%H\:%M\:%S}
+    </text>
+  </display>
+  <display id="menu">
+    <variable id="ButtonPitch" value="div({ScreenWidth},4)"/>
+    <variable id="ButtonWidth" value="sub(#ButtonPitch,2)"/>
+    <variable id="ButtonHeight" value="add(FontLineHeight('FontMenuButton'),2)"/>
+    <variable id="ButtonY" value="mul(#ButtonHeight,-1)"/>
+    <variable id="ItemHeight" value="FontLineHeight('FontMenuItem')"/>
+    <variable id="ArrowBitmap" value="'images/arrow_small.pbm'" condition="le({ScreenHeight},64)"/>
+    <variable id="ArrowBitmap" value="'images/arrow.pbm'"/>
+    <variable id="ArrowWidth" value="ImageWidth(#ArrowBitmap)"/>
+    <variable id="ArrowHeight" value="ImageHeight(#ArrowBitmap)"/>
+    <variable id="ArrowY" value="div(sub(#ItemHeight,#ArrowHeight),2)" condition="le({ScreenHeight},64)"/>
+    <variable id="ArrowY" value="add(div(sub(#ItemHeight,#ArrowHeight),2),2)"/>
+
+    <text x1="0" x2="-1" height="FontLineHeight('FontMenuTitle')" color="black" font="FontMenuTitle">{MenuTitle}</text>
+    <rectangle x1="0" y1="add(FontLineHeight('FontMenuTitle'),2)" x2="-1" height="#LineThickness" color="black" filled="yes"/>
+    <list x1="0" y1="add(FontLineHeight('FontMenuTitle'),4)" x2="-1" y2="#ButtonY">
+      <item height="#ItemHeight"/>
+      <text x1="#ArrowWidth" x2="-1" y1="0" height="#ItemHeight" color="black" font="FontMenuItem">{MenuItem}</text>
+      <image x="0" y="#ArrowY" color="black" path="#ArrowBitmap" condition="{IsMenuCurrent}"/>
+      <text x1="#ArrowWidth" x2="-1" y1="0" height="#ItemHeight" color="black" font="FontMenuItem">{MenuCurrent}</text>
+    </list>
+    <block condition="{ButtonRed}">
+      <rectangle x1="add(mul(#ButtonPitch,0),1)" y1="#ButtonY" width="#ButtonWidth" height="#ButtonHeight" color="black" filled="yes" radius="2"/>
+      <text x1="add(mul(#ButtonPitch,0),2)" y1="#ButtonY" width="sub(#ButtonPitch,4)" height="#ButtonHeight" color="white" align="center" font="FontMenuButton">{ButtonRed}</text>
+    </block>
+    <block condition="{ButtonGreen}">
+      <rectangle x1="add(mul(#ButtonPitch,1),1)" y1="#ButtonY" width="#ButtonWidth" height="#ButtonHeight" color="black" filled="yes" radius="2"/>
+      <text x1="add(mul(#ButtonPitch,1),2)" y1="#ButtonY" width="sub(#ButtonPitch,4)" height="#ButtonHeight" color="white" align="center" font="FontMenuButton">{ButtonGreen}</text>
+    </block>
+    <block condition="{ButtonYellow}">
+      <rectangle x1="add(mul(#ButtonPitch,2),1)" y1="#ButtonY" width="#ButtonWidth" height="#ButtonHeight" color="black" filled="yes" radius="2"/>
+      <text x1="add(mul(#ButtonPitch,2),2)" y1="#ButtonY" width="sub(#ButtonPitch,4)" height="#ButtonHeight" color="white" align="center" font="FontMenuButton">{ButtonYellow}</text>
+    </block>
+    <block condition="{ButtonBlue}">
+      <rectangle x1="add(mul(#ButtonPitch,3),1)" y1="#ButtonY" width="#ButtonWidth" height="#ButtonHeight" color="black" filled="yes" radius="2"/>
+      <text x1="add(mul(#ButtonPitch,3),2)" y1="#ButtonY" width="sub(#ButtonPitch,4)" height="#ButtonHeight" color="white" align="center" font="FontMenuButton">{ButtonBlue}</text>
+    </block>
+  </display>
+</skin>
diff --git a/graphlcd/skins/default/images/arrow.pbm b/graphlcd/skins/default/images/arrow.pbm
new file mode 100644
index 0000000..2ea2c0f
--- /dev/null
+++ b/graphlcd/skins/default/images/arrow.pbm
diff --git a/graphlcd/skins/default/images/arrow_small.pbm b/graphlcd/skins/default/images/arrow_small.pbm
new file mode 100644
index 0000000..b02a42b
--- /dev/null
+++ b/graphlcd/skins/default/images/arrow_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+8 7
+þÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/images/message.pbm b/graphlcd/skins/default/images/message.pbm
new file mode 100644
index 0000000..a8ff675
--- /dev/null
+++ b/graphlcd/skins/default/images/message.pbm
diff --git a/graphlcd/skins/default/images/mute.pbm b/graphlcd/skins/default/images/mute.pbm
new file mode 100644
index 0000000..f19b0fa
--- /dev/null
+++ b/graphlcd/skins/default/images/mute.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+23 22
+À‡`Í0Ù0±
`aÀÁ
�}ƒAÎÆÁ�lÁ�8Á�8Á�lÁÎÆÁ}ƒA
�@Á
`a0±0Ù`ÍÀ‡
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/dolby.pbm b/graphlcd/skins/default/symbols/dolby.pbm
new file mode 100644
index 0000000..7273c86
--- /dev/null
+++ b/graphlcd/skins/default/symbols/dolby.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+þþžò†Â†Â‚‚‚‚‚‚†Â†Âžòþþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/dolby_small.pbm b/graphlcd/skins/default/symbols/dolby_small.pbm
new file mode 100644
index 0000000..a4a72f9
--- /dev/null
+++ b/graphlcd/skins/default/symbols/dolby_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ûÿ»¿›?Š?›?»¿ûÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/empty.pbm b/graphlcd/skins/default/symbols/empty.pbm
new file mode 100644
index 0000000..2fbee34
--- /dev/null
+++ b/graphlcd/skins/default/symbols/empty.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþ€€€€€€€€€ÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/empty_small.pbm b/graphlcd/skins/default/symbols/empty_small.pbm
new file mode 100644
index 0000000..fe8389b
--- /dev/null
+++ b/graphlcd/skins/default/symbols/empty_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿ€?€?€?€9€7ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/multilanguage.pbm b/graphlcd/skins/default/symbols/multilanguage.pbm
new file mode 100644
index 0000000..0b6c317
--- /dev/null
+++ b/graphlcd/skins/default/symbols/multilanguage.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþ€€œr¶Ú¢Š¶Úœr€€ÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/multilanguage_small.pbm b/graphlcd/skins/default/symbols/multilanguage_small.pbm
new file mode 100644
index 0000000..3435bfd
--- /dev/null
+++ b/graphlcd/skins/default/symbols/multilanguage_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿþ€?»¿ª¿»¿€?ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/mute.pbm b/graphlcd/skins/default/symbols/mute.pbm
new file mode 100644
index 0000000..d88a206
--- /dev/null
+++ b/graphlcd/skins/default/symbols/mute.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+vœ0
ðÐ
ð0œv
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/mute_small.pbm b/graphlcd/skins/default/symbols/mute_small.pbm
new file mode 100644
index 0000000..f86fc93
--- /dev/null
+++ b/graphlcd/skins/default/symbols/mute_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+G_)Ÿ%)ŸG_
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording.pbm b/graphlcd/skins/default/symbols/recording.pbm
new file mode 100644
index 0000000..b13c220
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþÿþÌfÕÞÕÞÌÞÕÞÕÞÔfÿþÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording2.pbm b/graphlcd/skins/default/symbols/recording2.pbm
new file mode 100644
index 0000000..569dc17
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording2.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþÿþãžíníîãÞë¾í~íÿþÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording2_small.pbm b/graphlcd/skins/default/symbols/recording2_small.pbm
new file mode 100644
index 0000000..b52adb7
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording2_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿœ¯¿Ÿ®ÿ¬?ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording3.pbm b/graphlcd/skins/default/symbols/recording3.pbm
new file mode 100644
index 0000000..af1e5da
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording3.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþÿþãžíníîãÞëîínížÿþÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording3_small.pbm b/graphlcd/skins/default/symbols/recording3_small.pbm
new file mode 100644
index 0000000..1383772
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording3_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿœ¯¿ž¯¿¬ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording4.pbm b/graphlcd/skins/default/symbols/recording4.pbm
new file mode 100644
index 0000000..cfc18b7
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording4.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþÿþã¾í¾í~ã^ëíÞíÞÿþÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording4_small.pbm b/graphlcd/skins/default/symbols/recording4_small.pbm
new file mode 100644
index 0000000..33300e6
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording4_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿŸ®ÿ�¬?¯ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/recording_small.pbm b/graphlcd/skins/default/symbols/recording_small.pbm
new file mode 100644
index 0000000..b378aae
--- /dev/null
+++ b/graphlcd/skins/default/symbols/recording_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿ™?«™«©?ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/replay-fast-fwd.pbm b/graphlcd/skins/default/symbols/replay-fast-fwd.pbm
new file mode 100644
index 0000000..a5dfa47
--- /dev/null
+++ b/graphlcd/skins/default/symbols/replay-fast-fwd.pbm
diff --git a/graphlcd/skins/default/symbols/replay-fast-rwd.pbm b/graphlcd/skins/default/symbols/replay-fast-rwd.pbm
new file mode 100644
index 0000000..bccfb9c
--- /dev/null
+++ b/graphlcd/skins/default/symbols/replay-fast-rwd.pbm
diff --git a/graphlcd/skins/default/symbols/replay-pause.pbm b/graphlcd/skins/default/symbols/replay-pause.pbm
new file mode 100644
index 0000000..5a45410
--- /dev/null
+++ b/graphlcd/skins/default/symbols/replay-pause.pbm
diff --git a/graphlcd/skins/default/symbols/replay-play.pbm b/graphlcd/skins/default/symbols/replay-play.pbm
new file mode 100644
index 0000000..9808fa2
--- /dev/null
+++ b/graphlcd/skins/default/symbols/replay-play.pbm
diff --git a/graphlcd/skins/default/symbols/replay-slow-fwd.pbm b/graphlcd/skins/default/symbols/replay-slow-fwd.pbm
new file mode 100644
index 0000000..5187921
--- /dev/null
+++ b/graphlcd/skins/default/symbols/replay-slow-fwd.pbm
diff --git a/graphlcd/skins/default/symbols/replay-slow-rwd.pbm b/graphlcd/skins/default/symbols/replay-slow-rwd.pbm
new file mode 100644
index 0000000..a069fa4
--- /dev/null
+++ b/graphlcd/skins/default/symbols/replay-slow-rwd.pbm
diff --git a/graphlcd/skins/default/symbols/scrambled.pbm b/graphlcd/skins/default/symbols/scrambled.pbm
new file mode 100644
index 0000000..50d6fd1
--- /dev/null
+++ b/graphlcd/skins/default/symbols/scrambled.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþ€€€r€Ú¿Š˜Ú˜r€€ÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/scrambled_small.pbm b/graphlcd/skins/default/symbols/scrambled_small.pbm
new file mode 100644
index 0000000..56c7af7
--- /dev/null
+++ b/graphlcd/skins/default/symbols/scrambled_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿ€?ƒ¿¾¿“¿€?ÿÿ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/teletext.pbm b/graphlcd/skins/default/symbols/teletext.pbm
new file mode 100644
index 0000000..c1bfccd
--- /dev/null
+++ b/graphlcd/skins/default/symbols/teletext.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+15 11
+ÿþ€€¿ú€¿ú€¿ú€€ÿþ
\ No newline at end of file
diff --git a/graphlcd/skins/default/symbols/teletext_small.pbm b/graphlcd/skins/default/symbols/teletext_small.pbm
new file mode 100644
index 0000000..825ce98
--- /dev/null
+++ b/graphlcd/skins/default/symbols/teletext_small.pbm
@@ -0,0 +1,4 @@
+P4
+# Created by Paint Shop Pro 5
+11 7
+ÿÿ€?¿¿€?¿¿€?ÿÿ
\ No newline at end of file
diff --git a/i18n.c b/i18n.c
index 0d75e2e..76757b3 100644
--- a/i18n.c
+++ b/i18n.c
@@ -30,941 +30,785 @@
 
 const tI18nPhrase Phrases[] =
 {
-    {
-        "Output to graphic LCD",// English
-        "Ausgabe auf einem Grafik-LCD",// Deutsch
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Affichage sur un écran LCD",// Français
-        "",// TODO Norsk
-        "Ohjaa graafista LCD-näyttöä",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Ecran grafic LCD/VFD",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Plugin active",
-        "Plugin aktiv",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Plugin actif",
-        "",// TODO Norsk
-        "Laajennos aktiivinen",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Plugin activat",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "JanFebMarAprMayJunJulAugSepOctNovDec",
-        "JanFebMärAprMaiJunJulAugSepOktNovDez",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "JanFevMarAvrMaiJunJuiAouSepOctNovDec",
-        "",// TODO Norsk
-        "TamHelMaaHuhTouKesHeiEloSyyLokMarJou",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "IanFebMarAprMaiIunIulAugSepOctNoiDec",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Date/Time",
-        "Zeige Datum/Uhrzeit",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher Date/Heure",
-        "",// TODO Norsk
-        "Näytä päivämäärä/kello",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã Data/Ora",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "not in menu",
-        "nicht im Menu",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "pas dans le menu"
-        "",// TODO Norsk
-        "ei valikossa",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "nu în meniu",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Channel",
-        "Zeige Kanal",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher le nom de la Chaine",
-        "",// TODO Norsk
-        "Näytä kanava",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã canalul",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Logo",
-        "Zeige Logo",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher le Logo",
-        "",// TODO Norsk
-        "Näytä logo",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã logo",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Logo on Replay",
-        "Zeige Logo bei Wiedergabe",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher le Logo en lecture",
-        "",// TODO Norsk
-        "Näytä logo toistotilassa",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã logo în timpul redãrii",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Symbols",
-        "Zeige Symbole",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher les Symboles",
-        "",// TODO Norsk
-        "Näytä symbolit",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã simboluri",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show ET Symbols",
-        "Zeige ET Symbole",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher les Symboles ET",
-        "",// TODO Norsk
-        "Näytä ET-symbolit",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã simboluri externe",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Program",
-        "Zeige Programm",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher les programmes",
-        "",// TODO Norsk
-        "Näytä ohjelma",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã programul",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Timebar",
-        "Zeige Zeitbalken",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher la barre de progression",
-        "",// TODO Norsk
-        "Näytä aikajana",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã linia timp",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Menu",
-        "Zeige Menüs",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher le menu",
-        "",// TODO Norsk
-        "Näytä valikko",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã meniuri",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Messages",
-        "Zeige Nachrichten",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher les messages",
-        "",// TODO Norsk
-        "Näytä viestit",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã mesaje",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Color Buttons",
-        "Zeige farbige Tasten",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher les boutons couleurs",
-        "",// TODO Norsk
-        "Näytä väripainikkeet",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã butoanele colorate",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show Volume",
-        "Zeige Lautstärke",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher le Volume",
-        "",// TODO Norsk
-        "Näytä äänenvoimakkuus",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã volumul",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "compressed",
-        "komprimiert",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Compressé",
-        "",// TODO Norsk
-        "pakattu",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "comprimat",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "auto",
-        "auto",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "auto",
-        "",// TODO Norsk
-        "automaattinen",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "auto",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "medium",
-        "mittel",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "moyen",
-        "",// TODO Norsk
-        "keskikokoinen",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "mediu",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "large",
-        "groß",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "grand",
-        "",// TODO Norsk
-        "suuri",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "mare",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Show free Cards",
-        "Zeige freie Karten",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Afficher les cartes disponibles",
-        "",// TODO Norsk
-        "Näytä vapaat vastaanottimet",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Aratã receptoare libere",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Replay",
-        "Spiele",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Lecture",
-        "",// TODO Norsk
-        "Toistotila",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Redare",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "DVD",
-        "DVD",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "DVD",
-        "",// TODO Norsk
-        "DVD",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "DVD",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Music",
-        "Musik",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Musique",
-        "",// TODO Norsk
-        "Musiikki",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Muzicã",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "File",
-        "Datei",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Fichier:",
-        "",// TODO Norsk
-        "Tiedostot",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Fiºier",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Image",
-        "Bild",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Image",
-        "",// TODO Norsk
-        "Kuvat",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Imagine",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "CD",
-        "CD",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "CD",
-        "",// TODO Norsk
-        "CD",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "CD",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Unknown title",
-        "Unbekannter Titel",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Titre inconnu",
-        "",// TODO Norsk
-        "Tuntematon nimi",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Titlu necunoscut",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Identify replay type",
-        "Wiedergabetyp erkennen",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Identifier le type de lecture",
-        "",// TODO Norsk
-        "Tunnista toistotilan tyyppi",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Identificarea tipului redãrii",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Modify replay string",
-        "Wiedergabetext verändern",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Modifier la chaine de lecture",
-        "",// TODO Norsk
-        "Muokkaa toistotilan merkkijonoa",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Modifica textul redãrii",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Scroll text lines",
-        "Textzeilen scrollen",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Faire défiler le texte",
-        "",// TODO Norsk
-        "Vieritä tekstirivejä",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Deruleazã liniile text",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Scroll speed",
-        "Scrollgeschwindigkeit",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Vitesse de défilement",
-        "",// TODO Norsk
-        "Vieritysnopeus",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Viteza derulãrii",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Scroll time interval",
-        "Zeitabstand beim Scrollen",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Intervalle de défilement",
-        "",// TODO Norsk
-        "Vierityksen päivitysväli",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Interval derulare",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "never",
-        "niemals",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "jamais",
-        "",// TODO Norsk
-        "ei koskaan",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "niciodatã",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "once",
-        "einmal",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "une fois",
-        "",// TODO Norsk
-        "kerran",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "odatã",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "always",
-        "ständig",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "toujours",
-        "",// TODO Norsk
-        "aina",// Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "întotdeauna",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Brightness on user activity",
-        "Helligkeit bei Nutzeraktivität",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Luminosité en utilisation",
-        "",// TODO Norsk
-        "",// TODO Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Luminozitate la utilizare",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Brightness on user inactivity",
-        "Helligkeit bei Nutzerinaktivität",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Luminosité en non-utilisation",
-        "",// TODO Norsk
-        "",// TODO Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Luminozitate la inactivitate",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    {
-        "Brightness delay [s]",
-        "Verzögerung der Helligkeit [s]",
-        "",// TODO Slovenski
-        "",// TODO Italiano
-        "",// TODO Nederlands
-        "",// TODO Português
-        "Delai de Luminosité [s]",
-        "",// TODO Norsk
-        "",// TODO Suomi
-        "",// TODO Polski
-        "",// TODO Español
-        "",// TODO Ellinika
-        "",// TODO Svenska
-        "Limita luminozitate",// Românã
-        "",// TODO Magyar
-        "",// TODO Català
-#if VDRVERSNUM > 10302
-        "",// TODO Russian
-# if VDRVERSNUM > 10307
-        "",// TODO Croatian
-# endif
-#endif
-    },
-    { NULL }
+	{
+		"Output to graphic LCD",// English
+		"Ausgabe auf einem Grafik-LCD",// Deutsch
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Affichage sur un écran LCD",// Français
+		"",// TODO Norsk
+		"Ohjaa graafista LCD-näyttöä",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Ecran grafic LCD/VFD",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Plugin active",
+		"Plugin aktiv",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Plugin actif",
+		"",// TODO Norsk
+		"Laajennos aktiivinen",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Plugin activat",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"JanFebMarAprMayJunJulAugSepOctNovDec",
+		"JanFebMärAprMaiJunJulAugSepOktNovDez",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"JanFevMarAvrMaiJunJuiAouSepOctNovDec",
+		"",// TODO Norsk
+		"TamHelMaaHuhTouKesHeiEloSyyLokMarJou",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"IanFebMarAprMaiIunIulAugSepOctNoiDec",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Date/Time",
+		"Zeige Datum/Uhrzeit",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher Date/Heure",
+		"",// TODO Norsk
+		"Näytä päivämäärä/kello",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã Data/Ora",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"not in menu",
+		"nicht im Menu",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"pas dans le menu"
+		"",// TODO Norsk
+		"ei valikossa",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"nu în meniu",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Channel",
+		"Zeige Kanal",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher le nom de la Chaine",
+		"",// TODO Norsk
+		"Näytä kanava",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã canalul",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Logo",
+		"Zeige Logo",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher le Logo",
+		"",// TODO Norsk
+		"Näytä logo",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã logo",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Logo on Replay",
+		"Zeige Logo bei Wiedergabe",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher le Logo en lecture",
+		"",// TODO Norsk
+		"Näytä logo toistotilassa",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã logo în timpul redãrii",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Symbols",
+		"Zeige Symbole",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher les Symboles",
+		"",// TODO Norsk
+		"Näytä symbolit",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã simboluri",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show ET Symbols",
+		"Zeige ET Symbole",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher les Symboles ET",
+		"",// TODO Norsk
+		"Näytä ET-symbolit",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã simboluri externe",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Program",
+		"Zeige Programm",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher les programmes",
+		"",// TODO Norsk
+		"Näytä ohjelma",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã programul",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Timebar",
+		"Zeige Zeitbalken",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher la barre de progression",
+		"",// TODO Norsk
+		"Näytä aikajana",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã linia timp",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Menu",
+		"Zeige Menüs",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher le menu",
+		"",// TODO Norsk
+		"Näytä valikko",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã meniuri",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Messages",
+		"Zeige Nachrichten",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher les messages",
+		"",// TODO Norsk
+		"Näytä viestit",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã mesaje",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Color Buttons",
+		"Zeige farbige Tasten",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher les boutons couleurs",
+		"",// TODO Norsk
+		"Näytä väripainikkeet",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã butoanele colorate",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show Volume",
+		"Zeige Lautstärke",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher le Volume",
+		"",// TODO Norsk
+		"Näytä äänenvoimakkuus",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã volumul",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"compressed",
+		"komprimiert",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Compressé",
+		"",// TODO Norsk
+		"pakattu",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"comprimat",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"auto",
+		"auto",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"auto",
+		"",// TODO Norsk
+		"automaattinen",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"auto",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"medium",
+		"mittel",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"moyen",
+		"",// TODO Norsk
+		"keskikokoinen",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"mediu",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"large",
+		"groß",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"grand",
+		"",// TODO Norsk
+		"suuri",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"mare",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Show free Cards",
+		"Zeige freie Karten",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Afficher les cartes disponibles",
+		"",// TODO Norsk
+		"Näytä vapaat vastaanottimet",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Aratã receptoare libere",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Replay",
+		"Spiele",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Lecture",
+		"",// TODO Norsk
+		"Toistotila",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Redare",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"DVD",
+		"DVD",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"DVD",
+		"",// TODO Norsk
+		"DVD",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"DVD",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Music",
+		"Musik",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Musique",
+		"",// TODO Norsk
+		"Musiikki",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Muzicã",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"File",
+		"Datei",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Fichier:",
+		"",// TODO Norsk
+		"Tiedostot",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Fiºier",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Image",
+		"Bild",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Image",
+		"",// TODO Norsk
+		"Kuvat",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Imagine",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"CD",
+		"CD",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"CD",
+		"",// TODO Norsk
+		"CD",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"CD",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Unknown title",
+		"Unbekannter Titel",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Titre inconnu",
+		"",// TODO Norsk
+		"Tuntematon nimi",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Titlu necunoscut",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Identify replay type",
+		"Wiedergabetyp erkennen",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Identifier le type de lecture",
+		"",// TODO Norsk
+		"Tunnista toistotilan tyyppi",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Identificarea tipului redãrii",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Modify replay string",
+		"Wiedergabetext verändern",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Modifier la chaine de lecture",
+		"",// TODO Norsk
+		"Muokkaa toistotilan merkkijonoa",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Modifica textul redãrii",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Scroll text lines",
+		"Textzeilen scrollen",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Faire défiler le texte",
+		"",// TODO Norsk
+		"Vieritä tekstirivejä",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Deruleazã liniile text",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Scroll speed",
+		"Scrollgeschwindigkeit",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Vitesse de défilement",
+		"",// TODO Norsk
+		"Vieritysnopeus",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Viteza derulãrii",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Scroll time interval",
+		"Zeitabstand beim Scrollen",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Intervalle de défilement",
+		"",// TODO Norsk
+		"Vierityksen päivitysväli",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Interval derulare",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"never",
+		"niemals",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"jamais",
+		"",// TODO Norsk
+		"ei koskaan",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"niciodatã",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"once",
+		"einmal",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"une fois",
+		"",// TODO Norsk
+		"kerran",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"odatã",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"always",
+		"ständig",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"toujours",
+		"",// TODO Norsk
+		"aina",// Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"întotdeauna",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Brightness on user activity",
+		"Helligkeit bei Nutzeraktivität",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Luminosité en utilisation",
+		"",// TODO Norsk
+		"",// TODO Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Luminozitate la utilizare",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Brightness on user inactivity",
+		"Helligkeit bei Nutzerinaktivität",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Luminosité en non-utilisation",
+		"",// TODO Norsk
+		"",// TODO Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Luminozitate la inactivitate",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{
+		"Brightness delay [s]",
+		"Verzögerung der Helligkeit [s]",
+		"",// TODO Slovenski
+		"",// TODO Italiano
+		"",// TODO Nederlands
+		"",// TODO Português
+		"Delai de Luminosité [s]",
+		"",// TODO Norsk
+		"",// TODO Suomi
+		"",// TODO Polski
+		"",// TODO Español
+		"",// TODO Ellinika
+		"",// TODO Svenska
+		"Limita luminozitate",// Românã
+		"",// TODO Magyar
+		"",// TODO Català
+		"",// TODO Russian
+		"",// TODO Croatian
+	},
+	{ NULL }
 };
diff --git a/i18n.h b/i18n.h
index 97d9f7f..c765b22 100644
--- a/i18n.h
+++ b/i18n.h
@@ -1,7 +1,7 @@
 /*
- *  GraphLCD plugin for the Video Disk Recorder
+ * GraphLCD plugin for the Video Disk Recorder
  *
- *  i18n.h  -  Internationalization
+ * i18n.h - Internationalization
  *
  * This file is released under the GNU General Public License. Refer
  * to the COPYING file distributed with this package.
diff --git a/layout.c b/layout.c
deleted file mode 100644
index 254fbb1..0000000
--- a/layout.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * GraphLCD plugin for Video Disc Recorder
- *
- * layout.c  -  layout classes
- *
- * This file is released under the GNU General Public License. Refer
- * to the COPYING file distributed with this package.
- *
- * (c) 2005 Andreas Regel <andreas.regel AT powarman.de>
- */
-
-#include <syslog.h>
-
-#include <fstream>
-
-#include "global.h"
-#include "layout.h"
-#include "strfct.h"
-
-#include <vdr/config.h>
-#include <vdr/i18n.h>
-#include <vdr/plugin.h>
-
-
-cFontElement::cFontElement(const std::string & fontName)
-:   name(fontName),
-    type(0),
-    file(""),
-    size(0)
-{
-}
-
-bool cFontElement::Load(const std::string & url)
-{
-    if (url.find("fnt:") == 0)
-    {
-        type = ftFNT;
-        if (url[4] == '/')
-            file = url.substr(4);
-        else
-        {
-            file = cPlugin::ConfigDirectory(PLUGIN_NAME);
-            file += "/fonts/";
-            file += url.substr(4);
-        }
-        size = 0;
-        return font.LoadFNT(file);
-    }
-    else if (url.find("ft2:") == 0)
-    {
-        type = ftFT2;
-        std::string::size_type pos = url.find(":", 4);
-        if (pos == std::string::npos)
-        {
-            syslog(LOG_ERR, "cFontElement::Load(): No font size specified in %s\n", url.c_str());
-            return false;
-        }
-        std::string tmp = url.substr(pos + 1);
-        size = atoi(tmp.c_str());
-        if (url[4] == '/')
-            file = url.substr(4, pos - 4);
-        else
-        {
-            file = cPlugin::ConfigDirectory(PLUGIN_NAME);
-            file += "/fonts/";
-            file += url.substr(4, pos - 4);
-        }
-#if APIVERSNUM >= 10503
-		return font.LoadFT2(file, cCharSetConv::SystemCharacterTable(), size);
-#else
-        return font.LoadFT2(file, I18nCharSets()[Setup.OSDLanguage], size);
-#endif
-    }
-    else
-    {
-        syslog(LOG_ERR, "cFontElement::Load(): Unknown font type in %s\n", url.c_str());
-        return false;
-    }
-}
-
-
-cFontList::cFontList()
-{
-}
-
-cFontList::~cFontList()
-{
-    std::list <cFontElement *>::iterator it;
-    cFontElement * elem;
-
-    for (it = fonts.begin(); it != fonts.end(); it++)
-    {
-        elem = *it;
-        delete elem;
-    }
-    fonts.clear();
-}
-
-bool cFontList::Load(const std::string & fileName)
-{
-    std::fstream file;
-    char readLine[1000];
-    std::string line;
-
-#if (__GNUC__ < 3)
-    file.open(fileName.c_str(), std::ios::in);
-#else
-    file.open(fileName.c_str(), std::ios_base::in);
-#endif
-    if (!file.is_open())
-        return false;
-
-    while (!file.eof())
-    {
-        file.getline(readLine, 1000);
-        line = trim(readLine);
-        if (line.length() == 0)
-            continue;
-        if (line[0] == '#')
-            continue;
-        Parse(line);
-    }
-
-    file.close();
-    return true;
-}
-
-bool cFontList::Parse(const std::string & line)
-{
-    std::string::size_type pos;
-    std::string fontName;
-    std::string fontUrl;
-    cFontElement * elem;
-
-    pos = line.find("=");
-    if (pos == std::string::npos)
-        return false;
-    fontName = trim(line.substr(0, pos));
-    fontUrl = trim(line.substr(pos + 1));
-    //printf("%s = %s\n", fontName.c_str(), fontUrl.c_str());
-
-    elem = new cFontElement(fontName);
-    if (elem->Load(fontUrl))
-    {
-        fonts.push_back(elem);
-        return true;
-    }
-    else
-    {
-        delete elem;
-        return false;
-    }
-}
-
-const GLCD::cFont * cFontList::GetFont(const std::string & name) const
-{
-    std::list <cFontElement *>::const_iterator it;
-    cFontElement * elem;
-
-    for (it = fonts.begin(); it != fonts.end(); it++)
-    {
-        elem = *it;
-        if (elem->Name() == name)
-        {
-            return elem->Font();
-        }
-    }
-    return NULL;
-}
-
diff --git a/layout.h b/layout.h
deleted file mode 100644
index 95269a8..0000000
--- a/layout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * GraphLCD plugin for Video Disc Recorder
- *
- * layout.h  -  layout classes
- *
- * This file is released under the GNU General Public License. Refer
- * to the COPYING file distributed with this package.
- *
- * (c) 2005 Andreas Regel <andreas.regel AT powarman.de>
- */
-
-#include <list>
-#include <string>
-
-#include <glcdgraphics/font.h>
-
-typedef enum
-{
-    ftFNT,
-    ftFT2
-} eFontTypes;
-
-class cFontElement
-{
-private:
-    std::string name;
-    int type;
-    std::string file;
-    int size;
-    GLCD::cFont font;
-public:
-    cFontElement(const std::string & fontName);
-    bool Load(const std::string & url);
-
-    const std::string & Name() const { return name; }
-    int Type() const { return type; }
-    const std::string & File() const { return file; }
-    int Size() const { return size; }
-    const GLCD::cFont * Font() const { return &font; }
-};
-
-
-class cFontList
-{
-private:
-    std::list <cFontElement *> fonts;
-public:
-    cFontList();
-    ~cFontList();
-    bool Load(const std::string & fileName);
-    bool Parse(const std::string & line);
-
-    const GLCD::cFont * GetFont(const std::string & name) const;
-};
diff --git a/logo.c b/logo.c
deleted file mode 100644
index 3be6198..0000000
--- a/logo.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *  GraphLCD plugin for the Video Disk Recorder
- *
- *  logo.c  -  logo class
- *
- *  (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online de>
- **/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program;                                              *
- *   if not, write to the Free Software Foundation, Inc.,                  *
- *   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *
- *                                                                         *
- ***************************************************************************/
-
-#include "logo.h"
-
-cGraphLCDLogo::cGraphLCDLogo(const std::string & id)
-:   GLCD::cImage(),
-    id(id)
-{
-}
-
diff --git a/logo.h b/logo.h
deleted file mode 100644
index 0b213ba..0000000
--- a/logo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *  GraphLCD plugin for the Video Disk Recorder
- *
- *  logo.h  -  logo class
- *
- *  (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online de>
- **/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program;                                              *
- *   if not, write to the Free Software Foundation, Inc.,                  *
- *   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _GRAPHLCD_LOGO_H_
-#define _GRAPHLCD_LOGO_H_
-
-#include <string>
-
-#include <glcdgraphics/image.h>
-
-class cGraphLCDLogo : public GLCD::cImage
-{
-private:
-    std::string id;
-public:
-    cGraphLCDLogo(const std::string & id);
-    const std::string & ID() const { return id; }
-};
-
-#endif
diff --git a/logolist.c b/logolist.c
deleted file mode 100644
index 2491f7f..0000000
--- a/logolist.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- *  GraphLCD plugin for the Video Disk Recorder
- *
- *  logolist.c  -  logo list class
- *
- *  (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online de>
- **/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program;                                              *
- *   if not, write to the Free Software Foundation, Inc.,                  *
- *   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *
- *                                                                         *
- ***************************************************************************/
-
-#include <fstream>
-
-#include <glcdgraphics/bitmap.h>
-#include <glcdgraphics/image.h>
-#include <glcdgraphics/glcd.h>
-
-#include "logolist.h"
-#include "strfct.h"
-
-#include <vdr/tools.h>
-
-const char * kGLCDFileExtension = ".glcd";
-const char * kAliasFileName = "logonames.alias";
-
-cGraphLCDLogoList::cGraphLCDLogoList(const std::string & logodir, const std::string & cfgdir)
-{
-    std::fstream file;
-    char readLine[1000];
-    std::string line;
-    std::string aliasFileName;
-    std::string::size_type pos;
-    tAliasListElement * newAlias;
-
-    logoDir = logodir;
-    aliasFileName = AddDirectory(cfgdir.c_str(), kAliasFileName);
-
-#if (__GNUC__ < 3)
-    file.open(aliasFileName.c_str(), std::ios::in);
-#else
-    file.open(aliasFileName.c_str(), std::ios_base::in);
-#endif
-    if (!file.is_open())
-        return;
-
-    while (!file.eof())
-    {
-        file.getline(readLine, 1000);
-        line = trim(readLine);
-        if (line.length() == 0)
-            continue;
-        if (line[0] == '#')
-            continue;
-        pos = line.find(":");
-        if (pos == std::string::npos)
-            continue;
-        newAlias = new tAliasListElement;
-        if (newAlias)
-        {
-            newAlias->channelID = trim(line.substr(0, pos));
-            newAlias->fileName = trim(line.substr(pos + 1));
-            aliasList.push_back(newAlias);
-        }
-    }
-    file.close();
-/*
-     std::list <tAliasListElement *>::iterator it;
-     for (it = aliasList.begin(); it != aliasList.end(); it++)
-     {
-      newAlias = *it;
-      printf(">>>>>> AliasList:  >%s< : >%s<\n", newAlias->channelID.c_str(), newAlias->fileName.c_str());
-     }
-*/
-}
-
-cGraphLCDLogoList::~cGraphLCDLogoList()
-{
-    std::list <tAliasListElement *>::iterator itAlias;
-    std::list <cGraphLCDLogo *>::iterator itLogo;
-
-    for (itAlias = aliasList.begin(); itAlias != aliasList.end(); itAlias++)
-    {
-        delete *itAlias;
-    }
-    aliasList.empty();
-
-    for (itLogo = logoList.begin(); itLogo != logoList.end(); itLogo++)
-    {
-        delete *itLogo;
-    }
-    logoList.empty();
-}
-
-std::string cGraphLCDLogoList::CreateFullFileName(const std::string & baseName, ePicType type)
-{
-    std::string tmp;
-
-    tmp = AddDirectory(logoDir.c_str(), baseName.c_str());
-
-    switch (type)
-    {
-        case ptPictureFixed:  // do not attach anything
-            break;
-        case ptLogoSmall:
-            tmp += "_s";
-            break;
-        case ptLogoMedium:
-            tmp += "_m";
-            break;
-        case ptLogoLarge:
-            tmp += "_l";
-            break;
-    }
-    tmp += kGLCDFileExtension;
-
-    return tmp;
-}
-
-cGraphLCDLogo * cGraphLCDLogoList::GetLogo(const std::string & chID, ePicType type)
-{
-    std::list <cGraphLCDLogo *>::iterator itLogo;
-    std::list <tAliasListElement *>::iterator itAlias;
-    std::string logoFileName = "";
-    cGraphLCDLogo * newLogo;
-    GLCD::cGLCDFile glcd;
-
-    for (itLogo = logoList.begin(); itLogo != logoList.end(); itLogo++)
-    {
-        if ((*itLogo)->ID() == chID)
-        {
-            return *itLogo;
-        }
-    }
-
-    for (itAlias = aliasList.begin(); itAlias != aliasList.end(); itAlias++)
-    {
-        if ((*itAlias)->channelID == chID)
-        {
-            logoFileName = CreateFullFileName((*itAlias)->fileName, type);
-            break;
-        }
-    }
-    if (itAlias == aliasList.end())
-        logoFileName = CreateFullFileName(chID, type);
-
-    // try to load logo
-    newLogo = new cGraphLCDLogo(chID);
-    if (glcd.Load(*newLogo, logoFileName))
-    {
-        logoList.push_back(newLogo);
-        return newLogo;
-    }
-    else
-    {
-        delete newLogo;
-        return NULL;
-    }
-    return NULL;
-}
diff --git a/logolist.h b/logolist.h
deleted file mode 100644
index 47044c4..0000000
--- a/logolist.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *  GraphLCD plugin for the Video Disk Recorder
- *
- *  logolist.h  -  logo list class
- *
- *  (c) 2001-2004 Carsten Siebholz <c.siebholz AT t-online de>
- **/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program;                                              *
- *   if not, write to the Free Software Foundation, Inc.,                  *
- *   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _GRAPHLCD_LOGOLIST_H_
-#define _GRAPHLCD_LOGOLIST_H_
-
-#include <list>
-
-#include "logo.h"
-
-enum ePicType
-{
-    ptPictureFixed,
-    ptLogoSmall,
-    ptLogoMedium,
-    ptLogoLarge
-};
-
-class cGraphLCDLogoList
-{
-private:
-    struct tAliasListElement
-    {
-        std::string channelID;
-        std::string fileName;
-    };
-
-    std::string logoDir;
-    std::list <cGraphLCDLogo *> logoList;
-    std::list <tAliasListElement *> aliasList;
-
-    std::string CreateFullFileName(const std::string & baseName, ePicType type);
-
-public:
-    cGraphLCDLogoList(const std::string & logodir, const std::string & cfgdir);
-    ~cGraphLCDLogoList();
-
-    cGraphLCDLogo * GetLogo(const std::string & chID, ePicType type);
-};
-
-#endif
diff --git a/menu.c b/menu.c
index b3b6e07..5551a9a 100644
--- a/menu.c
+++ b/menu.c
@@ -30,75 +30,64 @@
 
 cGraphLCDMenuSetup::cGraphLCDMenuSetup()
 {
-    static const char * showDateTimeValues[3];
-    showDateTimeValues[0] = trVDR("no");
-    showDateTimeValues[1] = trVDR("yes");
-    showDateTimeValues[2] = tr("not in menu");
-    static const char * showSymbolsValues[3];
-    showSymbolsValues[0] = trVDR("no");
-    showSymbolsValues[1] = trVDR("yes");
-    showSymbolsValues[2] = tr("compressed");
-    static const char * showLogoValues[4];
-    showLogoValues[0] = trVDR("no");
-    showLogoValues[1] = tr("auto");
-    showLogoValues[2] = tr("medium");
-    showLogoValues[3] = tr("large");
-    static const char * scrollModeValues[3];
-    scrollModeValues[0] = tr("never");
-    scrollModeValues[1] = tr("once");
-    scrollModeValues[2] = tr("always");
+	static const char * showDateTimeValues[3];
+	showDateTimeValues[0] = tr("no");
+	showDateTimeValues[1] = tr("yes");
+	showDateTimeValues[2] = tr("not in menu");
+	static const char * scrollModeValues[3];
+	scrollModeValues[0] = tr("never");
+	scrollModeValues[1] = tr("once");
+	scrollModeValues[2] = tr("always");
 
-    newGraphLCDSetup = GraphLCDSetup;
+	newGraphLCDSetup = GraphLCDSetup;
 
-    Add(new cMenuEditBoolItem(tr("Plugin active"), &newGraphLCDSetup.PluginActive));
-    Add(new cMenuEditStraItem(tr("Show Date/Time"), &newGraphLCDSetup.ShowDateTime, 3, showDateTimeValues));
-    Add(new cMenuEditBoolItem(tr("Show Channel"), &newGraphLCDSetup.ShowChannel));
-    Add(new cMenuEditStraItem(tr("Show Logo"), &newGraphLCDSetup.ShowLogo, 4, showLogoValues));
-    Add(new cMenuEditStraItem(tr("Show Symbols"), &newGraphLCDSetup.ShowSymbols, 3, showSymbolsValues));
-    Add(new cMenuEditBoolItem(tr("Show ET Symbols"), &newGraphLCDSetup.ShowETSymbols));
-    Add(new cMenuEditBoolItem(tr("Show Program"), &newGraphLCDSetup.ShowProgram));
-    Add(new cMenuEditBoolItem(tr("Show Timebar"), &newGraphLCDSetup.ShowTimebar));
-    Add(new cMenuEditBoolItem(tr("Show Menu"), &newGraphLCDSetup.ShowMenu));
-    Add(new cMenuEditBoolItem(tr("Show Messages"), &newGraphLCDSetup.ShowMessages));
-    Add(new cMenuEditBoolItem(tr("Show Color Buttons"), &newGraphLCDSetup.ShowColorButtons));
-    Add(new cMenuEditBoolItem(tr("Show Volume"), &newGraphLCDSetup.ShowVolume));
-    Add(new cMenuEditBoolItem(tr("Show free Cards"), &newGraphLCDSetup.ShowNotRecording));
-    Add(new cMenuEditBoolItem(tr("Identify replay type"), &newGraphLCDSetup.IdentifyReplayType));
-    if (newGraphLCDSetup.IdentifyReplayType)
-    {
-        Add(new cMenuEditBoolItem(tr("Modify replay string"), &newGraphLCDSetup.ModifyReplayString));
-        Add(new cMenuEditStraItem(tr("Show Logo on Replay"), &newGraphLCDSetup.ReplayLogo, 4, showLogoValues));
-    }
-    Add(new cMenuEditStraItem(tr("Scroll text lines"), &newGraphLCDSetup.ScrollMode, 3, scrollModeValues));
-    Add(new cMenuEditIntItem(tr("Scroll speed"), &newGraphLCDSetup.ScrollSpeed, 1, 10));
-    Add(new cMenuEditIntItem(tr("Scroll time interval"), &newGraphLCDSetup.ScrollTime, 100, 2000));
-    Add(new cMenuEditIntItem(tr("Brightness on user activity"), &newGraphLCDSetup.BrightnessActive, 0, 100));
-    Add(new cMenuEditIntItem(tr("Brightness on user inactivity"), &newGraphLCDSetup.BrightnessIdle, 0, 100));
-    Add(new cMenuEditIntItem(tr("Brightness delay [s]"), &newGraphLCDSetup.BrightnessDelay, 0, 600));
+	Add(new cMenuEditBoolItem(tr("Plugin active"), &newGraphLCDSetup.PluginActive));
+	Add(new cMenuEditStraItem(tr("Show Date/Time"), &newGraphLCDSetup.ShowDateTime, 3, showDateTimeValues));
+	Add(new cMenuEditBoolItem(tr("Show Channel"), &newGraphLCDSetup.ShowChannel));
+	Add(new cMenuEditBoolItem(tr("Show Channel Logo"), &newGraphLCDSetup.ShowChannelLogo));
+	Add(new cMenuEditBoolItem(tr("Show Symbols"), &newGraphLCDSetup.ShowSymbols));
+	Add(new cMenuEditBoolItem(tr("Show Program"), &newGraphLCDSetup.ShowProgram));
+	Add(new cMenuEditBoolItem(tr("Show Timebar"), &newGraphLCDSetup.ShowTimebar));
+	Add(new cMenuEditBoolItem(tr("Show Menu"), &newGraphLCDSetup.ShowMenu));
+	Add(new cMenuEditBoolItem(tr("Show Messages"), &newGraphLCDSetup.ShowMessages));
+	Add(new cMenuEditBoolItem(tr("Show Color Buttons"), &newGraphLCDSetup.ShowColorButtons));
+	Add(new cMenuEditBoolItem(tr("Show Volume"), &newGraphLCDSetup.ShowVolume));
+	Add(new cMenuEditBoolItem(tr("Show free Cards"), &newGraphLCDSetup.ShowNotRecording));
+	Add(new cMenuEditBoolItem(tr("Identify replay type"), &newGraphLCDSetup.IdentifyReplayType));
+	if (newGraphLCDSetup.IdentifyReplayType)
+	{
+		Add(new cMenuEditBoolItem(tr("Modify replay string"), &newGraphLCDSetup.ModifyReplayString));
+		Add(new cMenuEditBoolItem(tr("Show Logo on Replay"), &newGraphLCDSetup.ShowReplayLogo));
+	}
+	Add(new cMenuEditStraItem(tr("Scroll text lines"), &newGraphLCDSetup.ScrollMode, 3, scrollModeValues));
+	Add(new cMenuEditIntItem(tr("Scroll speed"), &newGraphLCDSetup.ScrollSpeed, 1, 10));
+	Add(new cMenuEditIntItem(tr("Scroll time interval"), &newGraphLCDSetup.ScrollTime, 100, 2000));
+	Add(new cMenuEditIntItem(tr("Brightness on user activity"), &newGraphLCDSetup.BrightnessActive, 0, 100));
+	Add(new cMenuEditIntItem(tr("Brightness on user inactivity"), &newGraphLCDSetup.BrightnessIdle, 0, 100));
+	Add(new cMenuEditIntItem(tr("Brightness delay [s]"), &newGraphLCDSetup.BrightnessDelay, 0, 600));
 }
 
 void cGraphLCDMenuSetup::Store()
 {
-    SetupStore("PluginActive", GraphLCDSetup.PluginActive  = newGraphLCDSetup.PluginActive);
-    SetupStore("ShowDateTime",GraphLCDSetup.ShowDateTime = newGraphLCDSetup.ShowDateTime);
-    SetupStore("ShowChannel", GraphLCDSetup.ShowChannel = newGraphLCDSetup.ShowChannel);
-    SetupStore("ShowLogo",    GraphLCDSetup.ShowLogo = newGraphLCDSetup.ShowLogo);
-    SetupStore("ShowSymbols", GraphLCDSetup.ShowSymbols = newGraphLCDSetup.ShowSymbols);
-    SetupStore("ShowETSymbols",GraphLCDSetup.ShowETSymbols = newGraphLCDSetup.ShowETSymbols);
-    SetupStore("ShowProgram", GraphLCDSetup.ShowProgram = newGraphLCDSetup.ShowProgram);
-    SetupStore("ShowTimebar", GraphLCDSetup.ShowTimebar = newGraphLCDSetup.ShowTimebar);
-    SetupStore("ShowMenu",    GraphLCDSetup.ShowMenu = newGraphLCDSetup.ShowMenu);
-    SetupStore("ShowMessages",GraphLCDSetup.ShowMessages = newGraphLCDSetup.ShowMessages);
-    SetupStore("ShowColorButtons",GraphLCDSetup.ShowColorButtons = newGraphLCDSetup.ShowColorButtons);
-    SetupStore("ShowVolume",  GraphLCDSetup.ShowVolume = newGraphLCDSetup.ShowVolume);
-    SetupStore("ShowNotRecording", GraphLCDSetup.ShowNotRecording = newGraphLCDSetup.ShowNotRecording);
-    SetupStore("IdentifyReplayType", GraphLCDSetup.IdentifyReplayType = newGraphLCDSetup.IdentifyReplayType);
-    SetupStore("ReplayLogo", GraphLCDSetup.ReplayLogo = newGraphLCDSetup.ReplayLogo);
-    SetupStore("ModifyReplayString", GraphLCDSetup.ModifyReplayString = newGraphLCDSetup.ModifyReplayString);
-    SetupStore("ScrollMode", GraphLCDSetup.ScrollMode = newGraphLCDSetup.ScrollMode);
-    SetupStore("ScrollSpeed", GraphLCDSetup.ScrollSpeed = newGraphLCDSetup.ScrollSpeed);
-    SetupStore("ScrollTime", GraphLCDSetup.ScrollTime = newGraphLCDSetup.ScrollTime);
-    SetupStore("BrightnessActive", GraphLCDSetup.BrightnessActive = newGraphLCDSetup.BrightnessActive);
-    SetupStore("BrightnessIdle", GraphLCDSetup.BrightnessIdle = newGraphLCDSetup.BrightnessIdle);
-    SetupStore("BrightnessDelay", GraphLCDSetup.BrightnessDelay = newGraphLCDSetup.BrightnessDelay);
+	SetupStore("PluginActive", GraphLCDSetup.PluginActive  = newGraphLCDSetup.PluginActive);
+	SetupStore("ShowDateTime",GraphLCDSetup.ShowDateTime = newGraphLCDSetup.ShowDateTime);
+	SetupStore("ShowChannel", GraphLCDSetup.ShowChannel = newGraphLCDSetup.ShowChannel);
+	SetupStore("ShowChannelLogo", GraphLCDSetup.ShowChannelLogo = newGraphLCDSetup.ShowChannelLogo);
+	SetupStore("ShowSymbols", GraphLCDSetup.ShowSymbols = newGraphLCDSetup.ShowSymbols);
+	SetupStore("ShowProgram", GraphLCDSetup.ShowProgram = newGraphLCDSetup.ShowProgram);
+	SetupStore("ShowTimebar", GraphLCDSetup.ShowTimebar = newGraphLCDSetup.ShowTimebar);
+	SetupStore("ShowMenu",    GraphLCDSetup.ShowMenu = newGraphLCDSetup.ShowMenu);
+	SetupStore("ShowMessages",GraphLCDSetup.ShowMessages = newGraphLCDSetup.ShowMessages);
+	SetupStore("ShowColorButtons",GraphLCDSetup.ShowColorButtons = newGraphLCDSetup.ShowColorButtons);
+	SetupStore("ShowVolume",  GraphLCDSetup.ShowVolume = newGraphLCDSetup.ShowVolume);
+	SetupStore("ShowNotRecording", GraphLCDSetup.ShowNotRecording = newGraphLCDSetup.ShowNotRecording);
+	SetupStore("IdentifyReplayType", GraphLCDSetup.IdentifyReplayType = newGraphLCDSetup.IdentifyReplayType);
+	SetupStore("ReplayLogo", GraphLCDSetup.ShowReplayLogo = newGraphLCDSetup.ShowReplayLogo);
+	SetupStore("ModifyReplayString", GraphLCDSetup.ModifyReplayString = newGraphLCDSetup.ModifyReplayString);
+	SetupStore("ScrollMode", GraphLCDSetup.ScrollMode = newGraphLCDSetup.ScrollMode);
+	SetupStore("ScrollSpeed", GraphLCDSetup.ScrollSpeed = newGraphLCDSetup.ScrollSpeed);
+	SetupStore("ScrollTime", GraphLCDSetup.ScrollTime = newGraphLCDSetup.ScrollTime);
+	SetupStore("BrightnessActive", GraphLCDSetup.BrightnessActive = newGraphLCDSetup.BrightnessActive);
+	SetupStore("BrightnessIdle", GraphLCDSetup.BrightnessIdle = newGraphLCDSetup.BrightnessIdle);
+	SetupStore("BrightnessDelay", GraphLCDSetup.BrightnessDelay = newGraphLCDSetup.BrightnessDelay);
 }
diff --git a/menu.h b/menu.h
index 0e125bf..6055a08 100644
--- a/menu.h
+++ b/menu.h
@@ -1,5 +1,5 @@
 /**
- *  GraphLCD plugin for the Video Disk Recorder
+ *  GraphLCD plugin for the Video Disk Recorder 
  *
  *  menu.h  -  setup menu class
  *
@@ -36,11 +36,11 @@
 class cGraphLCDMenuSetup : public cMenuSetupPage
 {
 private:
-    cGraphLCDSetup newGraphLCDSetup;
+  cGraphLCDSetup newGraphLCDSetup;
 protected:
-    virtual void Store();
+  virtual void Store();
 public:
-    cGraphLCDMenuSetup();
+  cGraphLCDMenuSetup();
 };
 
 #endif
diff --git a/plugin.c b/plugin.c
index 3fd90d4..be9607f 100644
--- a/plugin.c
+++ b/plugin.c
@@ -17,12 +17,14 @@
 
 #include "display.h"
 #include "global.h"
+#include "i18n.h"
 #include "menu.h"
 
 #include <vdr/plugin.h>
 
 
-static const char *VERSION        = "0.1.6";
+static const char * kPluginName = "graphlcd";
+static const char *VERSION        = "0.2.0-pre2";
 static const char *DESCRIPTION    = "Output to graphic LCD";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -35,6 +37,8 @@ private:
     // Add any member variables or functions you may need here.
     std::string mConfigName;
     std::string mDisplayName;
+    std::string mSkinsPath;
+    std::string mSkinName;
     GLCD::cDriver * mLcd;
     cGraphLCDDisplay * mDisplay;
 
@@ -57,10 +61,12 @@ public:
 
 cPluginGraphLCD::cPluginGraphLCD()
 :   mConfigName(""),
-    mDisplayName("")
+    mDisplayName(""),
+    mSkinsPath(""),
+    mSkinName(""),
+    mLcd(NULL),
+    mDisplay(NULL)
 {
-    mLcd = NULL;
-    mDisplay = NULL;
 }
 
 cPluginGraphLCD::~cPluginGraphLCD()
@@ -74,21 +80,24 @@ cPluginGraphLCD::~cPluginGraphLCD()
 const char * cPluginGraphLCD::CommandLineHelp()
 {
     return "  -c CFG,   --config=CFG   use CFG as driver config file\n"
-           "  -d DISP,  --display=DISP use display DISP for output\n";
+           "  -d DISP,  --display=DISP use display DISP for output\n"
+           "  -s SKIN,  --skin=SKIN    use skin SKIN (default is \"default\")\n";
 }
 
 bool cPluginGraphLCD::ProcessArgs(int argc, char * argv[])
 {
     static struct option long_options[] =
     {
-        {"config",  required_argument, NULL, 'c'},
-        {"display", required_argument, NULL, 'd'},
+        {"config",    required_argument, NULL, 'c'},
+        {"display",   required_argument, NULL, 'd'},
+        {"skinspath", required_argument, NULL, 'p'},
+        {"skin",      required_argument, NULL, 's'},
         {NULL}
     };
 
     int c;
     int option_index = 0;
-    while ((c = getopt_long(argc, argv, "c:d:", long_options, &option_index)) != -1)
+    while ((c = getopt_long(argc, argv, "c:d:p:s:", long_options, &option_index)) != -1)
     {
         switch (c)
         {
@@ -100,6 +109,14 @@ bool cPluginGraphLCD::ProcessArgs(int argc, char * argv[])
                 mDisplayName = optarg;
                 break;
 
+            case 'p':
+                mSkinsPath = optarg;
+                break;
+
+            case 's':
+                mSkinName = optarg;
+                break;
+
             default:
                 return false;
         }
@@ -113,6 +130,8 @@ bool cPluginGraphLCD::Initialize()
     unsigned int displayNumber = 0;
     const char * cfgDir;
 
+    RegisterI18n(Phrases);
+
     if (mConfigName.length() == 0)
     {
         mConfigName = kDefaultConfigFile;
@@ -158,14 +177,16 @@ bool cPluginGraphLCD::Initialize()
         return false;
     }
 
-    cfgDir = ConfigDirectory(PLUGIN_NAME);
+    cfgDir = ConfigDirectory(kPluginName);
     if (!cfgDir)
         return false;
 
     mDisplay = new cGraphLCDDisplay();
     if (!mDisplay)
         return false;
-    if (mDisplay->Init(mLcd, cfgDir) != 0)
+    if (mSkinName == "")
+        mSkinName = "default";
+    if (!mDisplay->Initialise(mLcd, cfgDir, mSkinsPath, mSkinName))
         return false;
 
     return true;
@@ -183,11 +204,7 @@ bool cPluginGraphLCD::Start()
             dsyslog ("graphlcd plugin: display thread ready");
             return true;
         }
-#if VDRVERSNUM < 10314
-        usleep(100000);
-#else
         cCondWait::SleepMs(100);
-#endif
     }
     dsyslog ("graphlcd plugin: timeout while waiting for display thread");
     return false;
@@ -218,9 +235,8 @@ bool cPluginGraphLCD::SetupParse(const char * Name, const char * Value)
     if      (!strcasecmp(Name, "PluginActive")) GraphLCDSetup.PluginActive = atoi(Value);
     else if (!strcasecmp(Name, "ShowDateTime")) GraphLCDSetup.ShowDateTime = atoi(Value);
     else if (!strcasecmp(Name, "ShowChannel")) GraphLCDSetup.ShowChannel = atoi(Value);
-    else if (!strcasecmp(Name, "ShowLogo")) GraphLCDSetup.ShowLogo = atoi(Value);
+    else if (!strcasecmp(Name, "ShowChannelLogo")) GraphLCDSetup.ShowChannelLogo = atoi(Value);
     else if (!strcasecmp(Name, "ShowSymbols")) GraphLCDSetup.ShowSymbols = atoi(Value);
-    else if (!strcasecmp(Name, "ShowETSymbols")) GraphLCDSetup.ShowETSymbols = atoi(Value);
     else if (!strcasecmp(Name, "ShowProgram")) GraphLCDSetup.ShowProgram = atoi(Value);
     else if (!strcasecmp(Name, "ShowTimebar")) GraphLCDSetup.ShowTimebar = atoi(Value);
     else if (!strcasecmp(Name, "ShowMenu")) GraphLCDSetup.ShowMenu = atoi(Value);
@@ -230,7 +246,7 @@ bool cPluginGraphLCD::SetupParse(const char * Name, const char * Value)
     else if (!strcasecmp(Name, "ShowNotRecording")) GraphLCDSetup.ShowNotRecording = atoi(Value);
     else if (!strcasecmp(Name, "IdentifyReplayType")) GraphLCDSetup.IdentifyReplayType = atoi(Value);
     else if (!strcasecmp(Name, "ModifyReplayString")) GraphLCDSetup.ModifyReplayString = atoi(Value);
-    else if (!strcasecmp(Name, "ReplayLogo")) GraphLCDSetup.ReplayLogo = atoi(Value);
+    else if (!strcasecmp(Name, "ShowReplayLogo")) GraphLCDSetup.ShowReplayLogo = atoi(Value);
     else if (!strcasecmp(Name, "ScrollMode")) GraphLCDSetup.ScrollMode = atoi(Value);
     else if (!strcasecmp(Name, "ScrollSpeed")) GraphLCDSetup.ScrollSpeed = atoi(Value);
     else if (!strcasecmp(Name, "ScrollTime")) GraphLCDSetup.ScrollTime = atoi(Value);
diff --git a/setup.c b/setup.c
index 6f3e57c..0ae387f 100644
--- a/setup.c
+++ b/setup.c
@@ -31,28 +31,27 @@
 cGraphLCDSetup GraphLCDSetup;
 
 cGraphLCDSetup::cGraphLCDSetup(void)
-:   PluginActive(1),
-    ShowDateTime(1),
-    ShowChannel(1),
-    ShowLogo(1),
-    ShowSymbols(1),
-    ShowETSymbols(0),
-    ShowProgram(1),
-    ShowTimebar(1),
-    ShowMenu(1),
-    ShowMessages(1),
-    ShowColorButtons(1),
-    ShowVolume(1),
-    ShowNotRecording(0),
-    IdentifyReplayType(1),
-    ModifyReplayString(1),
-    ReplayLogo(1),
-    ScrollMode(0),
-    ScrollSpeed(2),
-    ScrollTime(500),
-    BrightnessActive(100),
-    BrightnessIdle(100),
-    BrightnessDelay(30)
+:	PluginActive(1),
+	ShowDateTime(1),
+	ShowChannel(1),
+	ShowChannelLogo(1),
+	ShowSymbols(1),
+	ShowProgram(1),
+	ShowTimebar(1),
+	ShowMenu(1),
+	ShowMessages(1),
+	ShowColorButtons(1),
+	ShowVolume(1),
+	ShowNotRecording(0),
+	IdentifyReplayType(1),
+	ModifyReplayString(1),
+	ShowReplayLogo(1),
+	ScrollMode(0),
+	ScrollSpeed(2),
+	ScrollTime(500),
+	BrightnessActive(100),
+	BrightnessIdle(100),
+	BrightnessDelay(30)
 {
 }
 
@@ -62,32 +61,31 @@ cGraphLCDSetup::~cGraphLCDSetup(void)
 
 cGraphLCDSetup & cGraphLCDSetup::operator=(const cGraphLCDSetup & setup)
 {
-    CopyFrom(&setup);
-    return *this;
+	CopyFrom(&setup);
+	return *this;
 }
 
 void cGraphLCDSetup::CopyFrom(const cGraphLCDSetup * source)
 {
-    PluginActive = source->PluginActive;
-    ShowDateTime = source->ShowDateTime;
-    ShowChannel = source->ShowChannel;
-    ShowLogo = source->ShowLogo;
-    ShowSymbols = source->ShowSymbols;
-    ShowETSymbols = source->ShowETSymbols;
-    ShowProgram = source->ShowProgram;
-    ShowTimebar = source->ShowTimebar;
-    ShowMenu = source->ShowMenu;
-    ShowMessages = source->ShowMessages;
-    ShowColorButtons = source->ShowColorButtons;
-    ShowVolume = source->ShowVolume;
-    ShowNotRecording = source->ShowNotRecording;
-    IdentifyReplayType = source->IdentifyReplayType;
-    ModifyReplayString = source->ModifyReplayString;
-    ReplayLogo = source->ReplayLogo;
-    ScrollMode = source->ScrollMode;
-    ScrollSpeed = source->ScrollSpeed;
-    ScrollTime = source->ScrollTime;
-    BrightnessActive = source->BrightnessActive;
-    BrightnessIdle = source->BrightnessIdle;
-    BrightnessDelay = source->BrightnessDelay;
+	PluginActive = source->PluginActive;
+	ShowDateTime = source->ShowDateTime;
+	ShowChannel = source->ShowChannel;
+	ShowChannelLogo = source->ShowChannelLogo;
+	ShowSymbols = source->ShowSymbols;
+	ShowProgram = source->ShowProgram;
+	ShowTimebar = source->ShowTimebar;
+	ShowMenu = source->ShowMenu;
+	ShowMessages = source->ShowMessages;
+	ShowColorButtons = source->ShowColorButtons;
+	ShowVolume = source->ShowVolume;
+	ShowNotRecording = source->ShowNotRecording;
+	IdentifyReplayType = source->IdentifyReplayType;
+	ModifyReplayString = source->ModifyReplayString;
+	ShowReplayLogo = source->ShowReplayLogo;
+	ScrollMode = source->ScrollMode;
+	ScrollSpeed = source->ScrollSpeed;
+	ScrollTime = source->ScrollTime;
+	BrightnessActive = source->BrightnessActive;
+	BrightnessIdle = source->BrightnessIdle;
+	BrightnessDelay = source->BrightnessDelay;
 }
diff --git a/setup.h b/setup.h
index 184aa02..a76f9cb 100644
--- a/setup.h
+++ b/setup.h
@@ -32,34 +32,33 @@
 class cGraphLCDSetup
 {
 public:
-    int PluginActive;
-    int ShowDateTime;
-    int ShowChannel;
-    int ShowLogo;
-    int ShowSymbols;
-    int ShowETSymbols;
-    int ShowProgram;
-    int ShowTimebar;
-    int ShowMenu;
-    int ShowMessages;
-    int ShowColorButtons;
-    int ShowVolume;
-    int ShowNotRecording; // Empty frame around not recording card's empty icons?
-    int IdentifyReplayType;
-    int ModifyReplayString;
-    int ReplayLogo;
-    int ScrollMode;
-    int ScrollSpeed;
-    int ScrollTime;
-    int BrightnessActive;
-    int BrightnessIdle;
-    int BrightnessDelay;
+	int PluginActive;
+	int ShowDateTime;
+	int ShowChannel;
+	int ShowChannelLogo;
+	int ShowSymbols;
+	int ShowProgram;
+	int ShowTimebar;
+	int ShowMenu;
+	int ShowMessages;
+	int ShowColorButtons;
+	int ShowVolume;
+	int ShowNotRecording; // Empty frame around not recording card's empty icons?
+	int IdentifyReplayType;
+	int ModifyReplayString;
+	int ShowReplayLogo;
+	int ScrollMode;
+	int ScrollSpeed;
+	int ScrollTime;
+	int BrightnessActive;
+	int BrightnessIdle;
+	int BrightnessDelay;
 
 public:
-    cGraphLCDSetup(void);
-    virtual ~cGraphLCDSetup(void);
-    cGraphLCDSetup & operator= (const cGraphLCDSetup & setup);
-    void CopyFrom(const cGraphLCDSetup * source);
+	cGraphLCDSetup(void);
+	virtual ~cGraphLCDSetup(void);
+	cGraphLCDSetup & operator= (const cGraphLCDSetup & setup);
+	void CopyFrom(const cGraphLCDSetup * source);
 };
 
 extern cGraphLCDSetup GraphLCDSetup;
diff --git a/skinconfig.c b/skinconfig.c
new file mode 100644
index 0000000..423429d
--- /dev/null
+++ b/skinconfig.c
@@ -0,0 +1,672 @@
+/*
+ * GraphLCD plugin for the Video Disk Recorder
+ *
+ * skinconfig.c - skin config class that implements all the callbacks
+ *
+ * This file is released under the GNU General Public License. Refer
+ * to the COPYING file distributed with this package.
+ *
+ * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+ */
+
+#include <glcdskin/config.h>
+#include <glcdskin/type.h>
+#include <glcdskin/string.h>
+
+#include "common.h"
+#include "display.h"
+#include "state.h"
+#include "skinconfig.h"
+
+typedef enum _eTokenId
+{
+	// current channel
+	tokPrivateChannelStart,
+    tokChannelNumber,
+    tokChannelName,
+    tokChannelShortName,
+    tokChannelProvider,
+    tokChannelPortal,
+    tokChannelSource,
+    tokChannelID,
+    tokHasTeletext,
+    tokChannelHasTeletext,
+    tokHasMultilang,
+    tokChannelHasMultilang,
+    tokHasDolby,
+    tokChannelHasDolby,
+    tokIsEncrypted,
+    tokChannelIsEncrypted,
+    tokIsRadio,
+    tokChannelIsRadio,
+    tokChannelAlias,
+    tokPrivateChannelEnd,
+
+	tokPrivateRecordingStart,
+	tokIsRecording,
+	tokRecordings,
+	tokPrivateRecordingEnd,
+
+    // present event
+    tokPrivatePresentStart,
+    tokPresentValid,
+    tokPresentStartDateTime,
+    tokPresentVpsDateTime,
+    tokPresentEndDateTime,
+    tokPresentDuration,
+    tokPresentProgress,
+    tokPresentRemaining,
+    tokPresentTitle,
+    tokPresentShortText,
+    tokPresentDescription,
+    tokPrivatePresentEnd,
+
+    // following event
+    tokPrivateFollowingStart,
+    tokFollowingValid,
+    tokFollowingStartDateTime,
+    tokFollowingVpsDateTime,
+    tokFollowingEndDateTime,
+    tokFollowingDuration,
+    tokFollowingTitle,
+    tokFollowingShortText,
+    tokFollowingDescription,
+    tokPrivateFollowingEnd,
+
+    // volume display
+    tokPrivateVolumeStart,
+    tokVolumeCurrent,
+    tokVolumeTotal,
+    tokIsMute,
+    tokVolumeIsMute,
+    tokPrivateVolumeEnd,
+
+    tokPrivateReplayStart,
+    tokReplayTitle,
+    tokReplayPositionIndex,
+    tokReplayDurationIndex,
+    tokIsPlaying,
+    tokReplayIsPlaying,
+    tokIsFastForward,
+    tokReplayIsFastForward,
+    tokIsFastRewind,
+    tokReplayIsFastRewind,
+    tokIsSlowForward,
+    tokReplayIsSlowForward,
+    tokIsSlowRewind,
+    tokReplayIsSlowRewind,
+    tokIsPausing,
+    tokReplayIsPausing,
+    tokReplayPosition,
+    tokReplayDuration,
+    tokReplayRemaining,
+    tokReplayMode,
+    tokReplayIsShuffle,
+    tokReplayIsLoop,
+    tokPrivateReplayEnd,
+
+    tokPrivateOsdStart,
+    tokMessage,
+    tokMenuTitle,
+    tokMenuItem,
+    tokMenuCurrent,
+    tokIsMenuCurrent,
+    tokButtonRed,
+    tokButtonGreen,
+    tokButtonYellow,
+    tokButtonBlue,
+	tokPrivateOsdEnd,
+
+    tokDateTime,
+    tokConfigPath,
+    tokSkinPath,
+    tokScreenWidth,
+    tokScreenHeight,
+
+    tokPrivateSettingStart,
+    tokSettingShowChannelLogo,
+    tokSettingShowReplayLogo,
+    tokSettingShowSymbols,
+    tokSettingShowTimebar,
+    tokPrivateSettingEnd,
+
+    tokCountToken
+} eTokenId;
+
+static const std::string Tokens[tokCountToken] =
+{
+    "privateChannelStart",
+    "ChannelNumber",
+    "ChannelName",
+    "ChannelShortName",
+    "ChannelProvider",
+    "ChannelPortal",
+    "ChannelSource",
+    "ChannelID",
+    "HasTeletext",
+    "ChannelHasTeletext",
+    "HasMultilang",
+    "ChannelHasMultilang",
+    "HasDolby",
+    "ChannelHasDolby",
+    "IsEncrypted",
+    "ChannelIsEncrypted",
+    "IsRadio",
+    "ChannelIsRadio",
+    "ChannelAlias",
+    "privateChannelEnd",
+
+	"privateRecordingStart",
+	"IsRecording",
+	"Recordings",
+	"privateRecordingEnd",
+
+    "privatePresentStart",
+    "PresentValid",
+    "PresentStartDateTime",
+    "PresentVpsDateTime",
+    "PresentEndDateTime",
+    "PresentDuration",
+    "PresentProgress",
+    "PresentRemaining",
+    "PresentTitle",
+    "PresentShortText",
+    "PresentDescription",
+    "privatePresentEnd",
+
+    "privateFollowingStart",
+    "FollowingValid",
+    "FollowingStartDateTime",
+    "FollowingVpsDateTime",
+    "FollowingEndDateTime",
+    "FollowingDuration",
+    "FollowingTitle",
+    "FollowingShortText",
+    "FollowingDescription",
+    "privateFollowingEnd",
+
+    "privateVolumeStart",
+    "VolumeCurrent",
+    "VolumeTotal",
+    "IsMute",
+    "VolumeIsMute",
+    "privateVolumeEnd",
+
+    "privateReplayStart",
+    "ReplayTitle",
+    "ReplayPositionIndex",
+    "ReplayDurationIndex",
+    "IsPlaying",
+    "ReplayIsPlaying",
+    "IsFastForward",
+    "ReplayIsFastForward",
+    "IsFastRewind",
+    "ReplayIsFastRewind",
+    "IsSlowForward",
+    "ReplayIsSlowForward",
+    "IsSlowRewind",
+    "ReplayIsSlowRewind",
+    "IsPausing",
+    "ReplayIsPausing",
+    "ReplayPosition",
+    "ReplayDuration",
+    "ReplayRemaining",
+    "ReplayMode",
+    "ReplayIsShuffle",
+    "ReplayIsLoop",
+    "privateReplayEnd",
+
+    "privateOsdStart",
+    "Message",
+    "MenuTitle",
+    "MenuItem",
+    "MenuCurrent",
+    "IsMenuCurrent",
+    "ButtonRed",
+    "ButtonGreen",
+    "ButtonYellow",
+    "ButtonBlue",
+    "privateOsdEnd",
+
+    "DateTime",
+    "ConfigPath",
+    "SkinPath",
+    "ScreenWidth",
+    "ScreenHeight",
+
+    "privateSettingStart",
+    "SettingShowChannelLogo",
+    "SettingShowReplayLogo",
+    "SettingShowSymbols",
+    "SettingShowTimebar",
+    "privateSettingEnd"
+};
+
+cGraphLCDSkinConfig::cGraphLCDSkinConfig(const cGraphLCDDisplay * Display, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName, cGraphLCDState * State)
+{
+    mDisplay = Display;
+    mConfigPath = CfgPath;
+    mSkinPath = SkinsPath + "/" + SkinName;
+    mSkinName = SkinName;
+    mState = State;
+    mAliasList.Load(CfgPath);
+}
+
+cGraphLCDSkinConfig::~cGraphLCDSkinConfig()
+{
+}
+
+std::string cGraphLCDSkinConfig::SkinPath(void)
+{
+    return mSkinPath;
+}
+
+std::string cGraphLCDSkinConfig::FontPath(void)
+{
+    return mConfigPath + "/fonts";
+}
+
+std::string cGraphLCDSkinConfig::CharSet(void)
+{
+    return "iso-8859-15";
+}
+
+std::string cGraphLCDSkinConfig::Translate(const std::string & Text)
+{
+    return Text;
+}
+
+GLCD::cType cGraphLCDSkinConfig::GetToken(const GLCD::tSkinToken & Token)
+{
+    if (Token.Id > tokPrivateChannelStart && Token.Id < tokPrivateChannelEnd)
+    {
+        tChannel channel = mState->GetChannelInfo();
+        switch (Token.Id)
+        {
+            case tokChannelNumber:
+                return channel.number;
+            case tokChannelName:
+                return channel.name;
+            case tokChannelShortName:
+                return channel.shortName;
+            case tokChannelProvider:
+                return channel.provider;
+            case tokChannelPortal:
+                return channel.portal;
+            case tokChannelSource:
+                return channel.source;
+            case tokChannelID:
+                return (GLCD::cType) (const char *) channel.id.ToString();
+            case tokHasTeletext:
+            case tokChannelHasTeletext:
+                return channel.hasTeletext;
+            case tokHasMultilang:
+            case tokChannelHasMultilang:
+                return channel.hasMultiLanguage;
+            case tokHasDolby:
+            case tokChannelHasDolby:
+                return channel.hasDolby;
+            case tokIsEncrypted:
+            case tokChannelIsEncrypted:
+                return channel.isEncrypted;
+            case tokIsRadio:
+            case tokChannelIsRadio:
+                return channel.isRadio;
+            case tokChannelAlias:
+            {
+                char tmp[64];
+                std::string alias;
+
+                sprintf(tmp, "%d-%d-%d", channel.id.Nid(), channel.id.Tid(), channel.id.Sid());
+                alias = mAliasList.GetAlias(tmp);
+                return alias;
+            }
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivateRecordingStart && Token.Id < tokPrivateRecordingEnd)
+    {
+        switch (Token.Id)
+        {
+            case tokIsRecording:
+            {
+                if (Token.Attrib.Type == GLCD::aNumber)
+                    return mState->IsRecording(Token.Attrib.Number);
+                return mState->IsRecording(-1);
+            }
+            case tokRecordings:
+            {
+                if (Token.Attrib.Type == GLCD::aNumber)
+                    return mState->Recordings(Token.Attrib.Number);
+                return mState->Recordings(-1);
+            }
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivatePresentStart && Token.Id < tokPrivatePresentEnd)
+    {
+        tEvent event = mState->GetPresentEvent();
+        switch (Token.Id)
+        {
+            case tokPresentValid:
+                return event.valid;
+            case tokPresentStartDateTime:
+                return TimeType(event.startTime, Token.Attrib.Text);
+            case tokPresentVpsDateTime:
+                return TimeType(event.vpsTime, Token.Attrib.Text);
+            case tokPresentEndDateTime:
+                return TimeType(event.startTime + event.duration, Token.Attrib.Text);
+            case tokPresentDuration:
+                return DurationType(event.duration * FRAMESPERSEC, Token.Attrib.Text);
+            case tokPresentProgress:
+                return DurationType((time(NULL) - event.startTime) * FRAMESPERSEC, Token.Attrib.Text);
+            case tokPresentRemaining:
+                if ((time(NULL) - event.startTime) < event.duration)
+                {
+                    return DurationType((event.duration - (time(NULL) - event.startTime)) * FRAMESPERSEC, Token.Attrib.Text);
+                }
+                return false;
+            case tokPresentTitle:
+                return event.title;
+            case tokPresentShortText:
+                return event.shortText;
+            case tokPresentDescription:
+                return event.description;
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivateFollowingStart && Token.Id < tokPrivateFollowingEnd)
+    {
+        tEvent event = mState->GetFollowingEvent();
+        switch (Token.Id)
+        {
+            case tokFollowingValid:
+                return event.valid;
+            case tokFollowingStartDateTime:
+                return TimeType(event.startTime, Token.Attrib.Text);
+            case tokFollowingVpsDateTime:
+                return TimeType(event.vpsTime, Token.Attrib.Text);
+            case tokFollowingEndDateTime:
+                return TimeType(event.startTime + event.duration, Token.Attrib.Text);
+            case tokFollowingDuration:
+                return DurationType(event.duration * FRAMESPERSEC, Token.Attrib.Text);
+            case tokFollowingTitle:
+                return event.title;
+            case tokFollowingShortText:
+                return event.shortText;
+            case tokFollowingDescription:
+                return event.description;
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivateVolumeStart && Token.Id < tokPrivateVolumeEnd)
+    {
+        tVolumeState volume = mState->GetVolumeState();
+        switch (Token.Id)
+        {
+            case tokVolumeCurrent:
+                return volume.value;
+            case tokVolumeTotal:
+                return 255;
+            case tokIsMute:
+            case tokVolumeIsMute:
+                return volume.value == 0;
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivateReplayStart && Token.Id < tokPrivateReplayEnd)
+    {
+        tReplayState replay = mState->GetReplayState();
+        switch (Token.Id)
+        {
+            case tokReplayTitle:
+                return replay.name;
+            case tokReplayPositionIndex:
+                return DurationType(replay.current, Token.Attrib.Text);
+            case tokReplayDurationIndex:
+                return DurationType(replay.total, Token.Attrib.Text);
+            case tokReplayPosition:
+                return replay.current;
+            case tokReplayDuration:
+                return replay.total;
+            case tokReplayRemaining:
+                return DurationType(replay.total - replay.current, Token.Attrib.Text);
+            case tokIsPlaying:
+            case tokReplayIsPlaying:
+                return replay.play && replay.speed == -1;
+            case tokIsPausing:
+            case tokReplayIsPausing:
+                return !replay.play && replay.speed == -1;
+            case tokIsFastForward:
+            case tokReplayIsFastForward:
+                if (replay.play && replay.forward && replay.speed != -1)
+                {
+                    return Token.Attrib.Type == GLCD::aNumber
+                        ? (GLCD::cType) (replay.speed == Token.Attrib.Number)
+                        : (GLCD::cType) true;
+                }
+                return false;
+            case tokIsFastRewind:
+            case tokReplayIsFastRewind:
+                if (replay.play && !replay.forward && replay.speed != -1)
+                {
+                    return Token.Attrib.Type == GLCD::aNumber
+                        ? (GLCD::cType) (replay.speed == Token.Attrib.Number)
+                        : (GLCD::cType) true;
+                }
+                return false;
+            case tokIsSlowForward:
+            case tokReplayIsSlowForward:
+                if (!replay.play && replay.forward && replay.speed != -1)
+                {
+                    return Token.Attrib.Type == GLCD::aNumber
+                        ? (GLCD::cType) (replay.speed == Token.Attrib.Number)
+                        : (GLCD::cType) true;
+                }
+                return false;
+            case tokIsSlowRewind:
+            case tokReplayIsSlowRewind:
+                if (!replay.play && !replay.forward && replay.speed != -1)
+                {
+                    return Token.Attrib.Type == GLCD::aNumber
+                        ? (GLCD::cType) (replay.speed == Token.Attrib.Number)
+                        : (GLCD::cType) true;
+                }
+                return false;
+            case tokReplayMode:
+                switch (replay.mode)
+                {
+                    case eReplayAudioCD:
+                        return "cd";
+                    case eReplayDVD:
+                        return "dvd";
+                    case eReplayFile:
+                        return "file";
+                    case eReplayImage:
+                        return "image";
+                    case eReplayMusic:
+                        return "music";
+                    default:
+                        return "vdr";
+                }
+            case tokReplayIsShuffle:
+            case tokReplayIsLoop:
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivateOsdStart && Token.Id < tokPrivateOsdEnd)
+    {
+        tOsdState osd = mState->GetOsdState();
+        switch (Token.Id)
+        {
+            case tokMessage:
+                return osd.message;
+            case tokMenuTitle:
+                return osd.title;
+            case tokMenuItem:
+            case tokMenuCurrent:
+            case tokIsMenuCurrent:
+            {
+                if (osd.items.size() == 0
+                  || osd.currentItemIndex == -1)
+                {
+                    return false;
+                }
+                int maxItems = Token.MaxItems;
+                if (maxItems > (int) osd.items.size())
+                    maxItems = osd.items.size();
+                int currentIndex = maxItems / 2;
+                if (osd.currentItemIndex < currentIndex)
+                    currentIndex = osd.currentItemIndex;
+                int topIndex = osd.currentItemIndex - currentIndex;
+                if ((topIndex + maxItems) > (int) osd.items.size())
+                {
+                    currentIndex += (topIndex + maxItems) - osd.items.size();
+                    topIndex = osd.currentItemIndex - currentIndex;
+                }
+                if (Token.Id == tokMenuItem)
+                {
+                    if (Token.Index < maxItems && Token.Index != currentIndex)
+                        return osd.items[topIndex + Token.Index];
+                }
+                else if (Token.Id == tokMenuCurrent)
+                {
+                    if (Token.Index < maxItems && Token.Index == currentIndex)
+                        return osd.items[topIndex + Token.Index];
+                }
+                else if (Token.Id == tokIsMenuCurrent)
+                {
+                    if (Token.Index < maxItems && Token.Index == currentIndex)
+                        return true;
+                }
+                return false;
+            }
+            case tokButtonRed:
+                return osd.redButton;
+            case tokButtonGreen:
+                return osd.greenButton;
+            case tokButtonYellow:
+                return osd.yellowButton;
+            case tokButtonBlue:
+                return osd.blueButton;
+            default:
+                break;
+        }
+    }
+    else if (Token.Id > tokPrivateSettingStart && Token.Id < tokPrivateSettingEnd)
+    {
+        switch (Token.Id)
+        {
+            case tokSettingShowChannelLogo:
+                if (GraphLCDSetup.ShowChannelLogo)
+                    return true;
+                return false;
+            case tokSettingShowReplayLogo:
+                if (GraphLCDSetup.ShowReplayLogo)
+                    return true;
+                return false;
+            case tokSettingShowSymbols:
+                if (GraphLCDSetup.ShowSymbols)
+                    return true;
+                return false;
+            case tokSettingShowTimebar:
+                if (GraphLCDSetup.ShowTimebar)
+                    return true;
+                return false;
+            default:
+                break;
+        }
+    }
+    else
+    {
+        switch (Token.Id)
+        {
+            case tokDateTime:
+                return TimeType(time(NULL), Token.Attrib.Text);
+            case tokConfigPath:
+                return mConfigPath;
+            case tokSkinPath:
+                return mSkinPath;
+            case tokScreenWidth:
+            {
+                const GLCD::cBitmap * bitmap = mDisplay->GetScreen();
+                return bitmap->Width();
+            }
+            case tokScreenHeight:
+            {
+                const GLCD::cBitmap * bitmap = mDisplay->GetScreen();
+                return bitmap->Height();
+            }
+            default:
+                break;
+        }
+    }
+    return "";
+}
+
+int cGraphLCDSkinConfig::GetTokenId(const std::string & Name)
+{
+    int i;
+
+    for (i = 0; i < tokCountToken; i++)
+    {
+        if (Name == Tokens[i])
+            return i;
+    }
+    esyslog("graphlcd: unknown token %s", Name.c_str());
+    return tokCountToken;
+}
+
+int cGraphLCDSkinConfig::GetTabPosition(int Index, int MaxWidth, const GLCD::cFont & Font)
+{
+    if (mTabs.size() == 0)
+    {
+        int i;
+        tOsdState osd = mState->GetOsdState();
+
+        for (i = 0; i < (int) osd.items.size(); i++)
+        {
+            int iTab, t;
+            std::string str;
+            std::string::size_type pos1, pos2;
+
+            str = osd.items[i];
+            pos1 = 0;
+            pos2 = str.find('\t');
+            iTab = 0;
+            while (pos1 < str.length() && pos2 != std::string::npos)
+            {
+                t = Font.Width(str.substr(pos1), pos2 - pos1);
+                if (iTab == 0 && t > (MaxWidth * 66) / 100)
+                    t = (MaxWidth * 66) / 100;
+                if (iTab < (int) mTabs.size())
+                {
+                    if (mTabs[iTab] < t)
+                        mTabs[iTab] = t;
+                }
+                else
+                {
+                    mTabs.push_back(t);
+                }
+                pos1 = pos2 + 1;
+                pos2 = str.find('\t', pos1);
+                iTab++;
+            }
+        }
+    }
+
+    if (Index < (int) mTabs.size())
+        return mTabs[Index];
+    return 0;
+}
+
+void cGraphLCDSkinConfig::SetMenuClear()
+{
+    mTabs.clear();
+}
diff --git a/skinconfig.h b/skinconfig.h
new file mode 100644
index 0000000..26ccb7c
--- /dev/null
+++ b/skinconfig.h
@@ -0,0 +1,44 @@
+/*
+ * GraphLCD plugin for the Video Disk Recorder
+ *
+ * skinconfig.h - skin config class that implements all the callbacks
+ *
+ * This file is released under the GNU General Public License. Refer
+ * to the COPYING file distributed with this package.
+ *
+ * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+ */
+
+#ifndef _GRAPHLCD_SKINCONFIG_H_
+#define _GRAPHLCD_SKINCONFIG_H_
+
+#include "alias.h"
+
+class cGraphLCDSkinConfig : public GLCD::cSkinConfig
+{
+private:
+    const cGraphLCDDisplay * mDisplay;
+    std::string mConfigPath;
+    std::string mSkinPath;
+    std::string mSkinName;
+    cGraphLCDState * mState;
+    cChannelAliasList mAliasList;
+    std::vector <int> mTabs;
+
+public:
+    cGraphLCDSkinConfig(const cGraphLCDDisplay * Display, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName, cGraphLCDState * State);
+    virtual ~cGraphLCDSkinConfig();
+    void SetMenuClear();
+
+    virtual std::string SkinPath(void);
+    virtual std::string FontPath(void);
+    virtual std::string CharSet(void);
+    virtual std::string Translate(const std::string & Text);
+    virtual GLCD::cType GetToken(const GLCD::tSkinToken & Token);
+    virtual int GetTokenId(const std::string & Name);
+    virtual int GetTabPosition(int Index, int MaxWidth, const GLCD::cFont & Font);
+
+    const std::string & SkinName(void) const { return mSkinName; }
+};
+
+#endif
diff --git a/state.c b/state.c
index 34446a3..c9a05d9 100644
--- a/state.c
+++ b/state.c
@@ -17,53 +17,60 @@
 #include <vdr/eitscan.h>
 #include <vdr/i18n.h>
 
-#include "compat.h"
 
 cGraphLCDState::cGraphLCDState(cGraphLCDDisplay * Display)
 :   mDisplay(Display),
     first(true),
     tickUsed(false)
 {
-    channel.number = 0;
-    channel.str = "";
-    channel.strTmp = "";
-
-    event.presentTime = 0;
-    event.presentTitle = "";
-    event.presentSubtitle = "";
-    event.followingTime = 0;
-    event.followingTitle = "";
-    event.followingSubtitle = "";
-
-    replay.name = "";
-    replay.loopmode = "";
-    replay.control = NULL;
-    replay.mode = eReplayNormal;
-    replay.current = 0;
-#if VDRVERSNUM >= 10701
-    replay.currentLast = DEFAULTFRAMESPERSECOND;
-#else
-    replay.currentLast = FRAMESPERSEC;
-#endif
-    replay.total = 0;
-    replay.totalLast = 1;
-
-    for (int i = 0; i < MAXDEVICES; i++)
-    {
-        card[i].recordingCount = 0;
-        card[i].recordingName = "";
-    }
-
-    osd.currentItem = "";
-    osd.title = "";
-    for (int i = 0; i < 4; i++)
-        osd.colorButton[i] = "";
-    osd.message = "";
-    osd.textItem = "";
-    osd.currentItemIndex = 0;
-
-    volume.value = -1;
-    volume.lastChange = 0;
+    mChannel.id = tChannelID::InvalidID;
+    mChannel.number = 0;
+    mChannel.name = "";
+    mChannel.shortName = "";
+    mChannel.provider = "";
+    mChannel.portal = "";
+    mChannel.source = "";
+    mChannel.hasTeletext = false;
+    mChannel.hasMultiLanguage = false;
+    mChannel.hasDolby = false;
+    mChannel.isEncrypted = false;
+    mChannel.isRadio = false;
+
+    mPresent.valid = false;
+    mPresent.startTime = 0;
+    mPresent.vpsTime = 0;
+    mPresent.duration = 0;
+    mPresent.title = "";
+    mPresent.shortText = "";
+    mPresent.description = "";
+
+    mFollowing.valid = false;
+    mFollowing.startTime = 0;
+    mFollowing.vpsTime = 0;
+    mFollowing.duration = 0;
+    mFollowing.title = "";
+    mFollowing.shortText = "";
+    mFollowing.description = "";
+
+    mReplay.name = "";
+    mReplay.loopmode = "";
+    mReplay.control = NULL;
+    mReplay.mode = eReplayNormal;
+    mReplay.current = 0;
+    mReplay.total = 0;
+
+    mOsd.currentItem = "";
+    mOsd.title = "";
+    mOsd.redButton = "";
+    mOsd.greenButton = "";
+    mOsd.yellowButton = "";
+    mOsd.blueButton = "";
+    mOsd.message = "";
+    mOsd.textItem = "";
+    mOsd.currentItemIndex = -1;
+
+    mVolume.value = -1;
+    mVolume.lastChange = 0;
 
     SetChannel(cDevice::CurrentChannel());
 }
@@ -87,34 +94,41 @@ void cGraphLCDState::ChannelSwitch(const cDevice * Device, int ChannelNumber)
     }
 }
 
-#if VDRVERSNUM < 10338
-void cGraphLCDState::Recording(const cDevice * Device, const char * Name)
-#else
 void cGraphLCDState::Recording(const cDevice * Device, const char * Name, const char *FileName, bool On)
-#endif
 {
     //printf("graphlcd plugin: cGraphLCDState::Recording %d %s\n", Device->CardIndex(), Name);
     if (GraphLCDSetup.PluginActive)
     {
+        std::vector <tRecording>::iterator it;
+
         mutex.Lock();
-#if VDRVERSNUM < 10338
-        if (Name)
-#else
+        it = mRecordings.begin();
+        while (it != mRecordings.end())
+        {
+            if (it->deviceNumber == Device->DeviceNumber()
+                && it->fileName == FileName)
+            {
+                break;
+            }
+            it++;
+        }
+
         if (On)
-#endif
         {
-            card[Device->DeviceNumber()].recordingCount++;
-#if VDRVERSNUM < 10338
-            card[Device->DeviceNumber()].recordingName = Name;
-#else
-            card[Device->DeviceNumber()].recordingName = Name ? Name : "";
-#endif
+            if (it == mRecordings.end())
+            {
+                tRecording rec;
+
+                rec.deviceNumber = Device->DeviceNumber();
+                rec.name = Name;
+                rec.fileName = FileName;
+                mRecordings.push_back(rec);
+            }
         }
         else
         {
-            if (card[Device->DeviceNumber()].recordingCount > 0)
-                card[Device->DeviceNumber()].recordingCount--;
-            card[Device->DeviceNumber()].recordingName = "";
+            if (it != mRecordings.end())
+                mRecordings.erase(it);
         }
         mutex.Unlock();
 
@@ -122,31 +136,19 @@ void cGraphLCDState::Recording(const cDevice * Device, const char * Name, const
     }
 }
 
-#if VDRVERSNUM < 10338
-void cGraphLCDState::Replaying(const cControl * Control, const char * Name)
-#else
 void cGraphLCDState::Replaying(const cControl * Control, const char * Name, const char *FileName, bool On)
-#endif
 {
     //printf("graphlcd plugin: cGraphLCDState::Replaying %s\n", Name);
     if (GraphLCDSetup.PluginActive)
     {
-#if VDRVERSNUM < 10338
-        if (Name)
-#else
         if (On)
-#endif
         {
             mutex.Lock();
-            replay.control = (cControl *) Control;
-            replay.mode = eReplayNormal;
-            replay.name = "";
-            replay.loopmode = "";
-#if VDRVERSNUM < 10338
-            if (!isempty(Name))
-#else
+            mReplay.control = (cControl *) Control;
+            mReplay.mode = eReplayNormal;
+            mReplay.name = "";
+            mReplay.loopmode = "";
             if (Name && !isempty(Name))
-#endif
             {
                 if (GraphLCDSetup.IdentifyReplayType)
                 {
@@ -173,15 +175,15 @@ void cGraphLCDState::Replaying(const cControl * Control, const char * Name, cons
                         {
                             unsigned int j;
                             // get loopmode
-                            replay.loopmode = Name;
-                            replay.loopmode = replay.loopmode.substr (0, 5);
-                            if (replay.loopmode[2] == '.')
-                                replay.loopmode.erase (2, 1);
-                            if (replay.loopmode[1] == '.')
-                                replay.loopmode.erase (1, 1);
-                            if (replay.loopmode[1] == ']')
-                                replay.loopmode = "";
-                            //printf ("loopmode=<%s>\n", replay.loopmode.c_str ());
+                            mReplay.loopmode = Name;
+                            mReplay.loopmode = mReplay.loopmode.substr (0, 5);
+                            if (mReplay.loopmode[2] == '.')
+                                mReplay.loopmode.erase (2, 1);
+                            if (mReplay.loopmode[1] == '.')
+                                mReplay.loopmode.erase (1, 1);
+                            if (mReplay.loopmode[1] == ']')
+                                mReplay.loopmode = "";
+                            //printf ("loopmode=<%s>\n", mReplay.loopmode.c_str ());
                             for (j=0;*(Name+i+j) != '\0';++j) //trim name
                             {
                                 if (*(Name+i+j)!=' ')
@@ -190,13 +192,13 @@ void cGraphLCDState::Replaying(const cControl * Control, const char * Name, cons
 
                             if (strlen(Name+i+j) > 0)
                             { //if name isn't empty, then copy
-                                replay.name = Name + i + j;
+                                mReplay.name = Name + i + j;
                             }
                             else
                             { //if Name empty, set fallback title
-                                replay.name = tr("Unknown title");
+                                mReplay.name = tr("Unknown title");
                             }
-                            replay.mode = eReplayMusic;
+                            mReplay.mode = eReplayMusic;
                         }
                     }
                     ///////////////////////////////////////////////////////////////////////
@@ -230,24 +232,24 @@ void cGraphLCDState::Replaying(const cControl * Control, const char * Name, cons
 
                                 if (strlen(Name+i+j) > 0)
                                 { // if name isn't empty, then copy
-                                    replay.name = Name + i + j;
+                                    mReplay.name = Name + i + j;
                                     // replace all '_' with ' '
-                                    replace(replay.name.begin(), replay.name.end(), '_', ' ');
-                                    for (j = 0, b = true; j < replay.name.length(); ++j)
+                                    replace(mReplay.name.begin(), mReplay.name.end(), '_', ' ');
+                                    for (j = 0, b = true; j < mReplay.name.length(); ++j)
                                     {
                                         // KAPITALIZE -> Kaptialize
-                                        if (replay.name[j] == ' ')
+                                        if (mReplay.name[j] == ' ')
                                             b = true;
                                         else if (b)
                                             b = false;
-                                        else replay.name[j] = tolower(replay.name[j]);
+                                        else mReplay.name[j] = tolower(mReplay.name[j]);
                                     }
                                 }
                                 else
                                 { //if Name empty, set fallback title
-                                    replay.name = tr("Unknown title");
+                                    mReplay.name = tr("Unknown title");
                                 }
-                                replay.mode = eReplayDVD;
+                                mReplay.mode = eReplayDVD;
                             }
                         }
                     }
@@ -265,7 +267,7 @@ void cGraphLCDState::Replaying(const cControl * Control, const char * Name, cons
                                     // look for file extentsion like .xxx or .xxxx
                                     if (slen>5 && ((*(Name+slen-4) == '.') || (*(Name+slen-5) == '.')))
                                     {
-                                        replay.mode = eReplayFile;
+                                        mReplay.mode = eReplayFile;
                                     }
                                     else
                                     {
@@ -274,7 +276,7 @@ void cGraphLCDState::Replaying(const cControl * Control, const char * Name, cons
                                 }
                                 case '~':
                                 {
-                                    replay.name = Name + i + 1;
+                                    mReplay.name = Name + i + 1;
                                     bFound = true;
                                     i = 0;
                                 }
@@ -286,47 +288,37 @@ void cGraphLCDState::Replaying(const cControl * Control, const char * Name, cons
 
                     if (0 == strncmp(Name,"[image] ",8))
                     {
-                        if (replay.mode != eReplayFile) //if'nt already Name stripped-down as filename
-                            replay.name = Name + 8;
-                        replay.mode = eReplayImage;
+                        if (mReplay.mode != eReplayFile) //if'nt already Name stripped-down as filename
+                            mReplay.name = Name + 8;
+                        mReplay.mode = eReplayImage;
                         bFound = true;
                     }
                     else if (0 == strncmp(Name,"[audiocd] ",10))
                     {
-                        replay.name = Name + 10;
-                        replay.mode = eReplayAudioCD;
+                        mReplay.name = Name + 10;
+                        mReplay.mode = eReplayAudioCD;
                         bFound = true;
                     }
                     if (!bFound || !GraphLCDSetup.ModifyReplayString)
                     {
-                        replay.name = Name;
+                        mReplay.name = Name;
                     }
                 }
                 else
                 {
-                    replay.name = Name;
+                    mReplay.name = Name;
                 }
             }
-#if VDRVERSNUM >= 10701
-            replay.currentLast = DEFAULTFRAMESPERSECOND;
-#else
-            replay.currentLast = FRAMESPERSEC;
-#endif
-            replay.totalLast = 1;
             mutex.Unlock();
         }
         else
         {
             mutex.Lock();
-            replay.control = NULL;
+            mReplay.control = NULL;
             mutex.Unlock();
-            SetChannel(channel.number);
+            SetChannel(mChannel.number);
         }
-#if VDRVERSNUM < 10338
-        mDisplay->Replaying(Name ? true : false, replay.mode);
-#else
-        mDisplay->Replaying(On, replay.mode);
-#endif
+        mDisplay->Replaying(On);
     }
 }
 
@@ -337,21 +329,17 @@ void cGraphLCDState::SetVolume(int Volume, bool Absolute)
     {
         mutex.Lock();
 
-#if VDRVERSNUM < 10402
-        volume.value = Volume;
-#else
         if (!Absolute)
         {
-            volume.value += Volume;
+            mVolume.value += Volume;
         }
         else
         {
-            volume.value = Volume;
+            mVolume.value = Volume;
         }
-#endif
         if (!first)
         {
-            volume.lastChange = cTimeMs::Now();
+            mVolume.lastChange = cTimeMs::Now();
             mutex.Unlock();
             mDisplay->Update();
         }
@@ -373,15 +361,16 @@ void cGraphLCDState::Tick()
 
         tickUsed = true;
 
-        if (replay.control)
+        if (mReplay.control)
         {
-            if (replay.control->GetIndex(replay.current, replay.total, false))
+            mReplay.control->GetReplayMode(mReplay.play, mReplay.forward, mReplay.speed);
+            if (mReplay.control->GetIndex(mReplay.current, mReplay.total, false))
             {
-                replay.total = (replay.total == 0) ? 1 : replay.total;
+                mReplay.total = (mReplay.total == 0) ? 1 : mReplay.total;
             }
             else
             {
-                replay.control = NULL;
+                mReplay.control = NULL;
             }
         }
 
@@ -391,52 +380,54 @@ void cGraphLCDState::Tick()
 
 void cGraphLCDState::OsdClear()
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdClear\n");
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdClear\n");
     if (GraphLCDSetup.PluginActive)
     {
         mutex.Lock();
 
-        channel.strTmp = "";
-
-        osd.title = "";
-        osd.items.clear();
-        for (int i = 0; i < 4; i++)
-            osd.colorButton[i] = "";
-        osd.message = "";
-        osd.textItem = "";
+        mOsd.title = "";
+        mOsd.items.clear();
+        mOsd.currentItem = "";
+        mOsd.currentItemIndex = -1;
+        mOsd.redButton = "";
+        mOsd.greenButton = "";
+        mOsd.yellowButton = "";
+        mOsd.blueButton = "";
+        mOsd.message = "";
+        mOsd.textItem = "";
 
         mutex.Unlock();
-        mDisplay->SetClear();
+        mDisplay->SetMenuClear();
     }
 }
 
 void cGraphLCDState::OsdTitle(const char * Title)
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdTitle '%s'\n", Title);
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdTitle '%s'\n", Title);
     if (GraphLCDSetup.PluginActive)
     {
         mutex.Lock();
 
-        osd.message = "";
-        osd.title = "";
+        mOsd.message = "";
+        mOsd.title = "";
         if (Title)
         {
-            osd.title = Title;
+            mOsd.title = Title;
             // remove the time
-            std::string::size_type pos = osd.title.find('\t');
+            std::string::size_type pos = mOsd.title.find('\t');
             if (pos != std::string::npos)
-                osd.title.resize(pos);
-            osd.title = compactspace(osd.title);
+                mOsd.title.resize(pos);
+            mOsd.title = compactspace(mOsd.title);
         }
 
         mutex.Unlock();
-        mDisplay->SetOsdTitle();
+        mDisplay->SetMenuTitle();
     }
 }
 
 void cGraphLCDState::OsdStatusMessage(const char * Message)
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdStatusMessage '%s'\n", Message);
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdStatusMessage '%s'\n", Message);
     if (GraphLCDSetup.PluginActive)
     {
         if (GraphLCDSetup.ShowMessages)
@@ -444,9 +435,9 @@ void cGraphLCDState::OsdStatusMessage(const char * Message)
             mutex.Lock();
 
             if (Message)
-                osd.message = compactspace(Message);
+                mOsd.message = compactspace(Message);
             else
-                osd.message = "";
+                mOsd.message = "";
 
             mutex.Unlock();
             mDisplay->Update();
@@ -456,24 +447,26 @@ void cGraphLCDState::OsdStatusMessage(const char * Message)
 
 void cGraphLCDState::OsdHelpKeys(const char * Red, const char * Green, const char * Yellow, const char * Blue)
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdHelpKeys %s - %s - %s - %s\n", Red, Green, Yellow, Blue);
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdHelpKeys %s - %s - %s - %s\n", Red, Green, Yellow, Blue);
     if (GraphLCDSetup.PluginActive)
     {
         if (GraphLCDSetup.ShowColorButtons)
         {
             mutex.Lock();
 
-            for (int i = 0; i < 4; i++)
-                osd.colorButton[i] = "";
+            mOsd.redButton = "";
+            mOsd.greenButton = "";
+            mOsd.yellowButton = "";
+            mOsd.blueButton = "";
 
             if (Red)
-                osd.colorButton[0] = compactspace(Red);
+                mOsd.redButton = compactspace(Red);
             if (Green)
-                osd.colorButton[1] = compactspace(Green);
+                mOsd.greenButton = compactspace(Green);
             if (Yellow)
-                osd.colorButton[2] = compactspace(Yellow);
+                mOsd.yellowButton = compactspace(Yellow);
             if (Blue)
-                osd.colorButton[3] = compactspace(Blue);
+                mOsd.blueButton = compactspace(Blue);
 
             mutex.Unlock();
         }
@@ -482,106 +475,88 @@ void cGraphLCDState::OsdHelpKeys(const char * Red, const char * Green, const cha
 
 void cGraphLCDState::OsdItem(const char * Text, int Index)
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdItem %s, %d\n", Text, Index);
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdItem %s, %d\n", Text, Index);
     if (GraphLCDSetup.PluginActive)
     {
         if (GraphLCDSetup.ShowMenu)
         {
             mutex.Lock();
 
-            osd.message = "";
+            mOsd.message = "";
 
             if (Text)
-                osd.items.push_back(Text);
+                mOsd.items.push_back(Text);
 
             mutex.Unlock();
-            if (Text)
-                mDisplay->SetOsdItem(Text);
+            //if (Text)
+            //    mDisplay->SetOsdItem(Text);
         }
     }
 }
 
 void cGraphLCDState::OsdCurrentItem(const char * Text)
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdCurrentItem %s\n", Text);
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdCurrentItem %s\n", Text);
     if (GraphLCDSetup.PluginActive)
     {
         if (GraphLCDSetup.ShowMenu)
         {
-            int tabs;
-            std::string::size_type pos;
-
             mutex.Lock();
 
-            osd.message = "";
-            osd.currentItem = "";
+            mOsd.message = "";
+            mOsd.currentItem = "";
             if (Text)
             {
-                osd.currentItem = Text;
+                uint32_t i;
 
-                // count nr of tabs in text
-                tabs = 0;
-                for (unsigned int i = 0; i < osd.currentItem.length(); i++)
+                mOsd.currentItem = Text;
+                mOsd.currentItemIndex = -1;
+                for (i = 0; i < mOsd.items.size(); i++)
                 {
-                    if (osd.currentItem[i] == '\t')
-                        tabs++;
+                    if (mOsd.items[i].compare(mOsd.currentItem) == 0)
+                    {
+                        mOsd.currentItemIndex = i;
+                        break;
+                    }
                 }
-                if (tabs == 1)
+                if (i == mOsd.items.size())
                 {
-                    // only one tab => prob. Setup Menu
-                    pos = osd.currentItem.find('\t');
-                    osd.currentItemIndex = 0;
-                    if (pos != std::string::npos)
+                    // maybe this is a settings menu with edit items, so
+                    // just one tab
+                    std::string::size_type pos = mOsd.currentItem.find('\t');
+                    if (pos != std::string::npos && pos == mOsd.currentItem.rfind('\t'))
                     {
-                        for (unsigned int i = 0; i < osd.items.size(); i++)
+                        for (i = 0; i < mOsd.items.size(); i++)
                         {
-                            if (osd.items[i].find(osd.currentItem.c_str(), 0, pos) == 0)
+                            if (mOsd.items[i].compare(0, pos, mOsd.currentItem, 0, pos) == 0)
                             {
-                                osd.currentItemIndex = i;
-                                osd.items[i] = osd.currentItem;
+                                mOsd.items[i] = mOsd.currentItem;
+                                mOsd.currentItemIndex = i;
                                 break;
                             }
                         }
                     }
                 }
-                else
-                {
-                    osd.currentItemIndex = 0;
-                    for (unsigned int i = 0; i < osd.items.size(); i++)
-                    {
-                        if (osd.items[i].compare(osd.currentItem) == 0)
-                        {
-                            osd.currentItemIndex = i;
-                            break;
-                        }
-                    }
-                }
             }
             mutex.Unlock();
             if (Text)
-                mDisplay->SetOsdCurrentItem();
+                mDisplay->SetMenuCurrent();
         }
     }
 }
 
 void cGraphLCDState::OsdTextItem(const char * Text, bool Scroll)
 {
-    //printf("graphlcd plugin: cGraphLCDState::OsdTextItem %s %d\n", Text, Scroll);
+    //esyslog("graphlcd plugin: cGraphLCDState::OsdTextItem %s %d\n", Text, Scroll);
     if (GraphLCDSetup.PluginActive)
     {
         mutex.Lock();
         if (Text)
         {
-            osd.textItem = trim(Text);
-#if 0
-            // replace '\n' with ' '
-            for (unsigned int i = 0; i < osd.textItem.length(); i++)
-                if (osd.textItem[i] == '\n' && (i + 1) < osd.textItem.length() && osd.textItem[i + 1] != '\n')
-                    osd.textItem[i] = ' ';
-#endif
+            mOsd.textItem = trim(Text);
         }
         mutex.Unlock();
-        mDisplay->SetOsdTextItem(Text, Scroll);
+        //mDisplay->SetOsdTextItem(Text, Scroll);
     }
 }
 
@@ -591,18 +566,6 @@ void cGraphLCDState::OsdChannel(const char * Text)
     //printf("graphlcd plugin: cGraphLCDState::OsdChannel %s\n", Text);
     if (GraphLCDSetup.PluginActive)
     {
-        mutex.Lock();
-        if (Text)
-        {
-            channel.strTmp = Text;
-            channel.strTmp = compactspace(channel.strTmp);
-        }
-        else
-        {
-            channel.strTmp = "";
-        }
-        mutex.Unlock();
-
         if (Text)
             mDisplay->Update();
     }
@@ -616,143 +579,191 @@ void cGraphLCDState::OsdProgramme(time_t PresentTime, const char * PresentTitle,
     //printf("graphlcd plugin: cGraphLCDState::OsdProgramme FST: %s\n", FollowingSubtitle);
     if (GraphLCDSetup.PluginActive)
     {
-        mutex.Lock();
-        event.presentTime = PresentTime;
-        event.presentTitle = "";
-        if (!isempty(PresentTitle))
-            event.presentTitle = PresentTitle;
-        event.presentSubtitle = "";
-        if (!isempty(PresentSubtitle))
-            event.presentSubtitle = PresentSubtitle;
-
-        event.followingTime = FollowingTime;
-        event.followingTitle = "";
-        if (!isempty(FollowingTitle))
-            event.followingTitle = FollowingTitle;
-        event.followingSubtitle = "";
-        if (!isempty(FollowingSubtitle))
-            event.followingSubtitle = FollowingSubtitle;
-        mutex.Unlock();
         mDisplay->Update();
     }
 }
 
 void cGraphLCDState::SetChannel(int ChannelNumber)
 {
-    char tmp[16];
-
     if (ChannelNumber == 0)
         return;
 
     mutex.Lock();
 
-    channel.number = ChannelNumber;
-    cChannel * ch = Channels.GetByNumber(channel.number);
-    channel.id = ch->GetChannelID();
-    sprintf(tmp, "%d ", channel.number);
-    channel.str = tmp;
-    channel.str += ch->Name();
-    event.presentTime = 0;
-    event.followingTime = 0;
+    mChannel.number = ChannelNumber;
+    mPresent.startTime = 0;
+    mFollowing.startTime = 0;
 
     mutex.Unlock();
 
-    mDisplay->SetChannel(ChannelNumber);
+    mDisplay->Update();
 }
 
-void cGraphLCDState::GetProgramme()
+void cGraphLCDState::UpdateChannelInfo(void)
 {
+    if (mChannel.number == 0)
+        return;
+
     mutex.Lock();
-#if VDRVERSNUM < 10300
-    const cEventInfo * present = NULL, * following = NULL;
-    cMutexLock mutexLock;
-    const cSchedules * schedules = cSIProcessor::Schedules(mutexLock);
-    if (channel.id.Valid())
+
+    cChannel * ch = Channels.GetByNumber(mChannel.number);
+    if (ch)
+    {
+        mChannel.id = ch->GetChannelID();
+        mChannel.name = ch->Name();
+        mChannel.shortName = ch->ShortName(true);
+        mChannel.provider = ch->Provider();
+        mChannel.portal = ch->PortalName();
+        mChannel.source = Sources.Get(ch->Source())->Description();
+        mChannel.hasTeletext = ch->Tpid() != 0;
+        mChannel.hasMultiLanguage = ch->Apid(1) != 0;
+        mChannel.hasDolby = ch->Dpid(0) != 0;
+        mChannel.isEncrypted = ch->Ca() != 0;
+        mChannel.isRadio = (ch->Vpid() == 0) || (ch->Vpid() == 1) || (ch->Vpid() == 0x1FFF);
+    }
+    else
+    {
+        mChannel.id = tChannelID::InvalidID;
+        mChannel.name = tr("*** Invalid Channel ***");
+        mChannel.shortName = tr("*** Invalid Channel ***");
+        mChannel.provider = "";
+        mChannel.portal = "";
+        mChannel.source = "";
+        mChannel.hasTeletext = false;
+        mChannel.hasMultiLanguage = false;
+        mChannel.hasDolby = false;
+        mChannel.isEncrypted = false;
+        mChannel.isRadio = false;
+    }
+
+    mutex.Unlock();
+}
+
+void cGraphLCDState::UpdateEventInfo(void)
+{
+    mutex.Lock();
+    const cEvent * present = NULL, * following = NULL;
+    cSchedulesLock schedulesLock;
+
+    // reset event data to empty values
+    mPresent.valid = false;
+    mPresent.startTime = 0;
+    mPresent.vpsTime = 0;
+    mPresent.duration = 0;
+    mPresent.title = "";
+    mPresent.shortText = "";
+    mPresent.description = "";
+
+    mFollowing.valid = false;
+    mFollowing.startTime = 0;
+    mFollowing.vpsTime = 0;
+    mFollowing.duration = 0;
+    mFollowing.title = "";
+    mFollowing.shortText = "";
+    mFollowing.description = "";
+
+    const cSchedules * schedules = cSchedules::Schedules(schedulesLock);
+    if (mChannel.id.Valid())
     {
         if (schedules)
         {
-            const cSchedule * schedule = schedules->GetSchedule(channel.id);
+            const cSchedule * schedule = schedules->GetSchedule(mChannel.id);
             if (schedule)
             {
                 if ((present = schedule->GetPresentEvent()) != NULL)
                 {
-                    event.presentTime = present->GetTime();
-                    event.presentTitle = "";
-                    if (!isempty(present->GetTitle()))
-                        event.presentTitle = present->GetTitle();
-                    event.presentSubtitle = "";
-                    if (!isempty(present->GetSubtitle()))
-                        event.presentSubtitle = present->GetSubtitle();
+                    mPresent.valid = true;
+                    mPresent.startTime = present->StartTime();
+                    mPresent.vpsTime = present->Vps();
+                    mPresent.duration = present->Duration();
+                    mPresent.title = "";
+                    if (present->Title())
+                        mPresent.title = present->Title();
+                    mPresent.shortText = "";
+                    if (present->ShortText())
+                        mPresent.shortText = present->ShortText();
+                    mPresent.description = "";
+                    if (present->Description())
+                        mPresent.description = present->Description();
                 }
                 if ((following = schedule->GetFollowingEvent()) != NULL)
                 {
-                    event.followingTime = following->GetTime();
-                    event.followingTitle = "";
-                    if (!isempty(following->GetTitle()))
-                        event.followingTitle = following->GetTitle();
-                    event.followingSubtitle = "";
-                    if (!isempty(following->GetSubtitle()))
-                        event.followingSubtitle = following->GetSubtitle();
+                    mFollowing.valid = true;
+                    mFollowing.startTime = following->StartTime();
+                    mFollowing.vpsTime = following->Vps();
+                    mFollowing.duration = following->Duration();
+                    mFollowing.title = "";
+                    if (following->Title())
+                        mFollowing.title = following->Title();
+                    mFollowing.shortText = "";
+                    if (following->ShortText())
+                        mFollowing.shortText = following->ShortText();
+                    mFollowing.description = "";
+                    if (following->Description())
+                        mFollowing.description = following->Description();
                 }
             }
         }
     }
-#else
-    const cEvent * present = NULL, * following = NULL;
-    cSchedulesLock schedulesLock;
-    const cSchedules * schedules = cSchedules::Schedules(schedulesLock);
-    if (channel.id.Valid())
+    mutex.Unlock();
+}
+
+void cGraphLCDState::UpdateReplayInfo(void)
+{
+    mutex.Lock();
+    if (!tickUsed)
     {
-        if (schedules)
+        if (mReplay.control)
         {
-            const cSchedule * schedule = schedules->GetSchedule(channel.id);
-            if (schedule)
+            mReplay.control->GetReplayMode(mReplay.play, mReplay.forward, mReplay.speed);
+            if (mReplay.control->GetIndex(mReplay.current, mReplay.total, false))
             {
-                if ((present = schedule->GetPresentEvent()) != NULL)
-                {
-                    event.presentTime = present->StartTime();
-                    event.presentTitle = "";
-                    if (!isempty(present->Title()))
-                        event.presentTitle = present->Title();
-                    event.presentSubtitle = "";
-                    if (!isempty(present->ShortText()))
-                        event.presentSubtitle = present->ShortText();
-                }
-                if ((following = schedule->GetFollowingEvent()) != NULL)
-                {
-                    event.followingTime = following->StartTime();
-                    event.followingTitle = "";
-                    if (!isempty(following->Title()))
-                        event.followingTitle = following->Title();
-                    event.followingSubtitle = "";
-                    if (!isempty(following->ShortText()))
-                        event.followingSubtitle = following->ShortText();
-                }
+                mReplay.total = (mReplay.total == 0) ? 1 : mReplay.total;
+            }
+            else
+            {
+                mReplay.control = NULL;
             }
         }
     }
-#endif
     mutex.Unlock();
 }
 
-tChannelState cGraphLCDState::GetChannelState()
+void cGraphLCDState::Update()
+{
+    UpdateChannelInfo();
+    UpdateEventInfo();
+    UpdateReplayInfo();
+}
+
+tChannel cGraphLCDState::GetChannelInfo()
+{
+    tChannel ret;
+
+    mutex.Lock();
+    ret = mChannel;
+    mutex.Unlock();
+
+    return ret;
+}
+
+tEvent cGraphLCDState::GetPresentEvent()
 {
-    tChannelState ret;
+    tEvent ret;
 
     mutex.Lock();
-    ret = channel;
+    ret = mPresent;
     mutex.Unlock();
 
     return ret;
 }
 
-tEventState cGraphLCDState::GetEventState()
+tEvent cGraphLCDState::GetFollowingEvent()
 {
-    tEventState ret;
+    tEvent ret;
 
-    GetProgramme();
     mutex.Lock();
-    ret = event;
+    ret = mFollowing;
     mutex.Unlock();
 
     return ret;
@@ -763,40 +774,33 @@ tReplayState cGraphLCDState::GetReplayState()
     tReplayState ret;
 
     mutex.Lock();
+    ret = mReplay;
+    mutex.Unlock();
 
-    if (tickUsed)
+    return ret;
+}
+
+bool cGraphLCDState::IsRecording(int CardNumber)
+{
+    bool ret = false;
+    std::vector <tRecording>::iterator it;
+
+    mutex.Lock();
+    if (CardNumber == -1 && mRecordings.size() > 0)
     {
-        if (replay.control)
-        {
-            ret = replay;
-            replay.currentLast = replay.current;
-            replay.totalLast = replay.total;
-        }
-        else
-        {
-            ret = replay;
-        }
+        ret = true;
     }
     else
     {
-        if (replay.control)
+        it = mRecordings.begin();
+        while (it != mRecordings.end())
         {
-            if (replay.control->GetIndex(replay.current, replay.total, false))
-            {
-                replay.total = (replay.total == 0) ? 1 : replay.total;
-                ret = replay;
-                replay.currentLast = replay.current;
-                replay.totalLast = replay.total;
-            }
-            else
+            if (it->deviceNumber == CardNumber)
             {
-                replay.control = NULL;
-                ret = replay;
+                ret = true;
+                break;
             }
-        }
-        else
-        {
-            ret = replay;
+            it++;
         }
     }
     mutex.Unlock();
@@ -804,12 +808,23 @@ tReplayState cGraphLCDState::GetReplayState()
     return ret;
 }
 
-tCardState cGraphLCDState::GetCardState(int number)
+std::string cGraphLCDState::Recordings(int CardNumber)
 {
-    tCardState ret;
+    std::string ret = "";
+    std::vector <tRecording>::iterator it;
 
     mutex.Lock();
-    ret = card[number];
+    it = mRecordings.begin();
+    while (it != mRecordings.end())
+    {
+        if (CardNumber == -1 || it->deviceNumber == CardNumber)
+        {
+            if (ret.length() > 0)
+                ret += "\n";
+            ret += it->name;
+        }
+        it++;
+    }
     mutex.Unlock();
 
     return ret;
@@ -820,7 +835,7 @@ tOsdState cGraphLCDState::GetOsdState()
     tOsdState ret;
 
     mutex.Lock();
-    ret = osd;
+    ret = mOsd;
     mutex.Unlock();
 
     return ret;
@@ -831,8 +846,18 @@ tVolumeState cGraphLCDState::GetVolumeState()
     tVolumeState ret;
 
     mutex.Lock();
-    ret = volume;
+    ret = mVolume;
     mutex.Unlock();
 
     return ret;
 }
+
+bool cGraphLCDState::ShowMessage()
+{
+    bool ret;
+
+    mutex.Lock();
+    ret = mOsd.message.length() > 0;
+    mutex.Unlock();
+    return ret;
+}
diff --git a/state.h b/state.h
index 35e79f2..608139d 100644
--- a/state.h
+++ b/state.h
@@ -9,28 +9,37 @@
 #ifndef _GRAPHLCD_STATE_H_
 #define _GRAPHLCD_STATE_H_
 
-#include <stdint.h>
-#include <string.h>
+#include <map>
+#include <string>
 
 #include <vdr/status.h>
 
 
-struct tChannelState
+struct tChannel
 {
     tChannelID id;
     int number;
-    std::string str;
-    std::string strTmp;
+    std::string name;
+    std::string shortName;
+    std::string provider;
+    std::string portal;
+    std::string source;
+    bool hasTeletext;
+    bool hasMultiLanguage;
+    bool hasDolby;
+    bool isEncrypted;
+    bool isRadio;
 };
 
-struct tEventState
+struct tEvent
 {
-    time_t presentTime;
-    std::string presentTitle;
-    std::string presentSubtitle;
-    time_t followingTime;
-    std::string followingTitle;
-    std::string followingSubtitle;
+    bool valid;
+    time_t startTime;
+    time_t vpsTime;
+    int duration;
+    std::string title;
+    std::string shortText;
+    std::string description;
 };
 
 enum eReplayMode
@@ -50,15 +59,17 @@ struct tReplayState
     cControl * control;
     eReplayMode mode;
     int current;
-    int currentLast;
     int total;
-    int totalLast;
+    bool play;
+    bool forward;
+    int speed;
 };
 
-struct tCardState
+struct tRecording
 {
-    int recordingCount;
-    std::string recordingName;
+    int deviceNumber;
+    std::string name;
+    std::string fileName;
 };
 
 struct tOsdState
@@ -66,7 +77,10 @@ struct tOsdState
     std::string currentItem;
     std::vector <std::string> items;
     std::string title;
-    std::string colorButton[4];
+    std::string redButton;
+    std::string greenButton;
+    std::string yellowButton;
+    std::string blueButton;
     std::string textItem;
     std::string message;
     int currentItemIndex;
@@ -89,24 +103,22 @@ private:
 
     cMutex mutex;
 
-    tChannelState channel;
-    tEventState event;
-    tReplayState replay;
-    tCardState card[MAXDEVICES];
-    tOsdState osd;
-    tVolumeState volume;
+    tChannel mChannel;
+    tEvent mPresent;
+    tEvent mFollowing;
+    tReplayState mReplay;
+    std::vector <tRecording> mRecordings;
+    tOsdState mOsd;
+    tVolumeState mVolume;
 
     void SetChannel(int ChannelNumber);
-    void GetProgramme();
+    void UpdateChannelInfo(void);
+    void UpdateEventInfo(void);
+    void UpdateReplayInfo(void);
 protected:
     virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-#if VDRVERSNUM < 10338
-    virtual void Recording(const cDevice *Device, const char *Name);
-    virtual void Replaying(const cControl *Control, const char *Name);
-#else
     virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
     virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
-#endif
     virtual void SetVolume(int Volume, bool Absolute);
     virtual void OsdClear();
     virtual void OsdTitle(const char *Title);
@@ -122,13 +134,17 @@ public:
     cGraphLCDState(cGraphLCDDisplay * Display);
     virtual ~cGraphLCDState();
 
+    void Update();
     void Tick();
-    tChannelState GetChannelState();
-    tEventState GetEventState();
+    tChannel GetChannelInfo();
+    tEvent GetPresentEvent();
+    tEvent GetFollowingEvent();
     tReplayState GetReplayState();
-    tCardState GetCardState(int number);
+    bool IsRecording(int CardNumber);
+    std::string Recordings(int CardNumber);
     tOsdState GetOsdState();
     tVolumeState GetVolumeState();
+    bool ShowMessage();
 };
 
 #endif
diff --git a/strfct.c b/strfct.c
index fd49086..adafae1 100644
--- a/strfct.c
+++ b/strfct.c
@@ -34,58 +34,58 @@
 
 char * strncopy(char * dest , const char * src , size_t n)
 {
-    strncpy(dest, src, n);
-    if (strlen(src) >= n)
-    {
-        *(dest + n - 1) = 0;
-    }
-    return dest;
+  strncpy(dest, src, n);
+  if (strlen(src) >= n)
+  {
+    *(dest + n - 1) = 0;
+  }
+  return dest;
 }
 
 
 std::string trim(const std::string & s)
 {
-    std::string::size_type start, end;
+	std::string::size_type start, end;
 
-    start = 0;
-    while (start < s.length())
-    {
-        if (!isspace(s[start]))
-            break;
-        start++;
-    }
-    end = s.length() - 1;
-    while (end >= 0)
-    {
-        if (!isspace(s[end]))
-            break;
-        end--;
-    }
-    return s.substr(start, end - start + 1);
+	start = 0;
+	while (start < s.length())
+	{
+		if (!isspace(s[start]))
+			break;
+		start++;
+	}
+	end = s.length() - 1;
+	while (end >= 0)
+	{
+		if (!isspace(s[end]))
+			break;
+		end--;
+	}
+	return s.substr(start, end - start + 1);
 }
 
 std::string compactspace(const std::string & s)
 {
-    std::string str = "";
-    std::string tmp;
-    unsigned int pos = 0;
-    unsigned int cnt = 0;
-    tmp = trim(s);
-    while (pos < tmp.length())
+  std::string str = "";
+  std::string tmp;
+  unsigned int pos = 0;
+  unsigned int cnt = 0;
+  tmp = trim(s);
+  while (pos < tmp.length())
+  {
+    if (!isspace(tmp[pos]))
+    {
+      str += tmp[pos];
+      cnt = 0;
+    }
+    else if (cnt == 0)
     {
-        if (!isspace(tmp[pos]))
-        {
-            str += tmp[pos];
-            cnt = 0;
-        }
-        else if (cnt == 0)
-        {
-            str += tmp[pos];
-            cnt++;
-        }
-        else
-            cnt++;
-        pos++;
+      str += tmp[pos];
+      cnt++;
     }
-    return str;
+    else
+      cnt++;
+    pos++;
+  }
+  return str;
 }
diff --git a/widgets.c b/widgets.c
deleted file mode 100644
index 68193d5..0000000
--- a/widgets.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "setup.h"
-#include "widgets.h"
-
-#include <vdr/config.h>
-#include <vdr/tools.h>
-
-#include "compat.h"
-
-
-cScroller::cScroller()
-{
-    Reset();
-}
-
-void cScroller::Reset()
-{
-    x = 0;
-    y = 0;
-    xmax = 0;
-    font = NULL;
-    text = "";
-    active = false;
-    update = false;
-    position = 0;
-    increment = 0;
-    lastUpdate = 0;
-}
-
-bool cScroller::NeedsUpdate()
-{
-    if (active &&
-        TimeMs() - lastUpdate > (uint64_t) GraphLCDSetup.ScrollTime)
-    {
-        update = true;
-        return true;
-    }
-    return false;
-}
-
-void cScroller::Init(int X, int Y, int Xmax, const GLCD::cFont * Font, const std::string & Text)
-{
-    x = X;
-    y = Y;
-    xmax = Xmax;
-    font = Font;
-    text = Text;
-    increment = GraphLCDSetup.ScrollSpeed;
-    position = 0;
-    if (GraphLCDSetup.ScrollMode != 0 &&
-        font->Width(text) > xmax - x + 1)
-        active = true;
-    else
-        active = false;
-    update = false;
-    lastUpdate = TimeMs() + 2000;
-}
-
-void cScroller::Draw(GLCD::cBitmap * bitmap)
-{
-    if (!active)
-    {
-        bitmap->DrawText(x, y, xmax, text, font);
-    }
-    else
-    {
-        if (update)
-        {
-            if (increment > 0)
-            {
-                if (font->Width(text) - position + font->TotalWidth() * 5 < increment)
-                {
-                    increment = 0;
-                    position = 0;
-                }
-            }
-            else
-            {
-                if (GraphLCDSetup.ScrollMode == 2)
-                {
-                    increment = GraphLCDSetup.ScrollSpeed;
-                }
-                else
-                {
-                    active = false;
-                }
-            }
-            position += increment;
-            lastUpdate = TimeMs();
-            update = false;
-        }
-        bitmap->DrawText(x, y, xmax, text, font, GLCD::clrBlack, true, position);
-        if (font->Width(text) - position <= xmax - x + 10 + font->TotalWidth() * 5)
-            bitmap->DrawText(x + font->Width(text) - position + font->TotalWidth() * 5, y, xmax, text, font);
-    }
-}
diff --git a/widgets.h b/widgets.h
deleted file mode 100644
index d6fd3a4..0000000
--- a/widgets.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *  GraphLCD plugin for the Video Disk Recorder
- *
- *  widgets.h  -  display widgets
- *
- *  (c) 2004 Andreas Regel <andreas.regel AT powarman de>
- **/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program;                                              *
- *   if not, write to the Free Software Foundation, Inc.,                  *
- *   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _GRAPHLCD_WIDGETS_H_
-#define _GRAPHLCD_WIDGETS_H_
-
-#include <stdint.h>
-
-#include <string>
-
-#include <glcdgraphics/bitmap.h>
-#include <glcdgraphics/font.h>
-
-class cScroller
-{
-private:
-    int x;
-    int y;
-    int xmax;
-    const GLCD::cFont * font;
-    std::string text;
-    bool active;
-    bool update;
-    int position;
-    int increment;
-    uint64_t lastUpdate;
-public:
-    cScroller();
-    const std::string & Text() const { return text; }
-    bool NeedsUpdate();
-    void Reset();
-    void Init(int x, int y, int xmax, const GLCD::cFont * font, const std::string & text);
-    void Draw(GLCD::cBitmap * bitmap);
-};
-
-#endif
-