diff --git a/src/gui/epgplus.h b/src/gui/epgplus.h
index 0dd02bca7..4d2c097fc 100644
--- a/src/gui/epgplus.h
+++ b/src/gui/epgplus.h
@@ -1,37 +1,29 @@
 /*
-        Neutrino-GUI  -   DBoxII-Project
+	Neutrino-GUI  -   DBoxII-Project
 
-        Copyright (C) 2001 Steffen Hehn 'McClean'
-        Copyright (C) 2004 Martin Griep 'vivamiga'
+	Copyright (C) 2001 Steffen Hehn 'McClean'
+	Copyright (C) 2004 Martin Griep 'vivamiga'
+	Copyright (C) 2017 Sven Hoefer
 
-        Kommentar:
+	License: GPL
 
-        Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
-        Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert
-        auf der Client-Server Idee, diese GUI ist also von der direkten DBox-
-        Steuerung getrennt. Diese wird dann von Daemons uebernommen.
+	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.
 
-        License: GPL
-
-        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., 675 Mass Ave, Cambridge, MA 02139, USA.
+	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., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
-#ifndef __EPGPLUS_HPP__
-#define __EPGPLUS_HPP__
+#ifndef __epgplus__
+#define __epgplus__
 
 #include "widget/menue.h"
 
@@ -45,506 +37,488 @@ struct button_label;
 
 class EpgPlus
 {
-//// types, inner classes
-public:
-  enum FontSettingID
-  {
-    EPGPlus_header_font = 0,
-    EPGPlus_timeline_fonttime,
-    EPGPlus_timeline_fontdate,
-    EPGPlus_channelentry_font,
-    EPGPlus_channelevententry_font,
-    EPGPlus_footer_fontbouquetchannelname,
-    EPGPlus_footer_fonteventdescription,
-    EPGPlus_footer_fonteventshortdescription,
-    EPGPlus_footer_fontbuttons,
-    NumberOfFontSettings
-  };
-
-  enum SizeSettingID
-  {
-    EPGPlus_channelentry_width = 0,
-    EPGPlus_channelentry_separationlineheight,
-    EPGPlus_slider_width,
-    EPGPlus_horgap1_height,
-    EPGPlus_horgap2_height,
-    EPGPlus_vergap1_width,
-    EPGPlus_vergap2_width,
-	 NumberOfSizeSettings
-  };
-
-	struct FontSetting
-	{
-		FontSettingID     settingID;
-		const char*       style;
-		int               size;
-	};
-
-	struct SizeSetting
-	{
-		SizeSettingID     settingID;
-		int               size;
-	};
-
-
-  enum TViewMode
-  {
-    ViewMode_Stretch,
-    ViewMode_Scroll
-  };
-
-  enum TSwapMode
-  {
-    SwapMode_ByPage,
-    SwapMode_ByBouquet
-  };
-
-  class Footer;
-
-  class Header
-  {
-  //// construction / destruction
-  public:
-    Header ( CFrameBuffer* frameBuffer , int x , int y , int width);
-
-    ~Header();
-
-  //// methods
-  public:
-    static void init();
-
-    void paint(const char * Name = NULL);
-
-    static int getUsedHeight();
-
-  //// attributes
-  public:
-    CFrameBuffer* frameBuffer;
-
-    int x;
-    int y;
-    int width;
-
-    static Font* font;
-  };
-
-
-  class TimeLine
-  {
-  //// construction / destruction
-  public:
-    TimeLine ( CFrameBuffer* frameBuffer , int x , int y , int width , int startX , int durationX);
-
-    ~TimeLine();
-
-  //// methods
-  public:
-    static void init();
-
-    void paint ( time_t startTime , int    duration);
-
-    void paintMark ( time_t startTime , int    duration , int    x , int    width);
-
-    void paintGrid();
-
-    void clearMark();
-
-    static int getUsedHeight();
-
-  //// attributes
-  public:
-    CFrameBuffer* frameBuffer;
-
-    int currentDuration;
-
-    int x;
-    int y;
-    int width;
-
-    static Font* fontTime;
-    static Font* fontDate;
-
-    int startX;
-    int durationX;
-  };
+	//// types, inner classes
+	public:
+		enum FontSettingID
+		{
+			EPGPlus_header_font = 0,
+			EPGPlus_timeline_fonttime,
+			EPGPlus_timeline_fontdate,
+			EPGPlus_channelentry_font,
+			EPGPlus_channelevententry_font,
+			EPGPlus_footer_fontbouquetchannelname,
+			EPGPlus_footer_fonteventdescription,
+			EPGPlus_footer_fonteventshortdescription,
+			EPGPlus_footer_fontbuttons,
+			NumberOfFontSettings
+		};
+
+		enum SizeSettingID
+		{
+			EPGPlus_channelentry_width = 0,
+			EPGPlus_channelentry_separationlineheight,
+			EPGPlus_slider_width,
+			EPGPlus_horgap1_height,
+			EPGPlus_horgap2_height,
+			EPGPlus_vergap1_width,
+			EPGPlus_vergap2_width,
+			NumberOfSizeSettings
+		};
+
+		struct FontSetting
+		{
+			FontSettingID	settingID;
+			const char*	style;
+			int		size;
+		};
+
+		struct SizeSetting
+		{
+			SizeSettingID	settingID;
+			int		size;
+		};
+
+		enum TViewMode
+		{
+			ViewMode_Stretch,
+			ViewMode_Scroll
+		};
+
+		enum TSwapMode
+		{
+			SwapMode_ByPage,
+			SwapMode_ByBouquet
+		};
+
+		class Footer;
+
+		class Header
+		{
+			//// construction / destruction
+			public:
+				Header(CFrameBuffer* frameBuffer,
+					int x,
+					int y,
+					int width);
+
+				~Header();
+
+			//// methods
+			public:
+				static void init();
+
+				void paint(const char * Name = NULL);
+
+				static int getUsedHeight();
+
+			//// attributes
+			public:
+				CFrameBuffer* frameBuffer;
+
+				int x;
+				int y;
+				int width;
+
+				static Font* font;
+		};
+
+
+		class TimeLine
+		{
+			//// construction / destruction
+			public:
+				TimeLine(CFrameBuffer* frameBuffer,
+					int x,
+					int y,
+					int width,
+					int startX,
+					int durationX);
+
+				~TimeLine();
+
+			//// methods
+			public:
+				static void init();
+
+				void paint(time_t startTime, int duration);
+
+				void paintMark(time_t startTime, int duration, int x, int width);
+
+				void paintGrid();
+
+				void clearMark();
+
+				static int getUsedHeight();
+
+			//// attributes
+			public:
+				CFrameBuffer* frameBuffer;
 
-  class ChannelEventEntry
-  {
-  //// construction / destruction
-  public:
-    ChannelEventEntry
-      ( const CChannelEvent* channelEvent
-      , CFrameBuffer* frameBuffer
-      , TimeLine* timeLine
-      , Footer* footer
-      , int x
-      , int y
-      , int width
-      );
+				int currentDuration;
 
-  ~ChannelEventEntry();
+				int x;
+				int y;
+				int width;
 
-  //// methods
-  public:
-    static void init();
+				static Font* fontTime;
+				static Font* fontDate;
 
-    bool isSelected
-      ( time_t selectedTime
-      ) const;
+				int startX;
+				int durationX;
+		};
 
-    void paint
-      ( bool isSelected
-      , bool toggleColor
-      );
+		class ChannelEventEntry
+		{
+			//// construction / destruction
+			public:
+				ChannelEventEntry(const CChannelEvent* channelEvent,
+					CFrameBuffer* frameBuffer,
+					TimeLine* timeLine,
+					Footer* footer,
+					int x,
+					int y,
+					int width);
 
-    static int getUsedHeight();
+				~ChannelEventEntry();
 
-  //// attributes
-  public:
-    CChannelEvent channelEvent;
+			//// methods
+			public:
+				static void init();
 
-    CFrameBuffer* frameBuffer;
-    TimeLine* timeLine;
-    Footer* footer;
+				bool isSelected(time_t selectedTime) const;
 
-    int x;
-    int y;
-    int width;
-    static int separationLineHeight;
+				void paint(bool isSelected, bool toggleColor);
 
-    static Font* font;
-  };
+				static int getUsedHeight();
 
-  typedef std::vector<ChannelEventEntry*> TCChannelEventEntries;
+			//// attributes
+			public:
+				CChannelEvent channelEvent;
 
-  class ChannelEntry
-  {
-  //// construction / destruction
-  public:
-    ChannelEntry
-      ( const CZapitChannel* channel
-      , int index
-      , CFrameBuffer* frameBuffer
-      , Footer* footer
-      , CBouquetList* bouquetList
-      , int x
-      , int y
-      , int width
-      );
+				CFrameBuffer* frameBuffer;
+				TimeLine* timeLine;
+				Footer* footer;
 
-    ~ChannelEntry();
+				int x;
+				int y;
+				int width;
+				static int separationLineHeight;
 
-  //// methods
-  public:
-    static void init();
+				static Font* font;
+		};
 
-    void paint
-      ( bool   isSelected
-      , time_t selectedTime
-      );
+		typedef std::vector<ChannelEventEntry*> TCChannelEventEntries;
 
-    static int getUsedHeight();
+		class ChannelEntry
+		{
+			//// construction / destruction
+			public:
+				ChannelEntry(const CZapitChannel* channel,
+					int index,
+					CFrameBuffer* frameBuffer,
+					Footer* footer,
+					CBouquetList* bouquetList,
+					int x,
+					int y,
+					int width);
 
-  //// attributes
-  public:
-    const CZapitChannel * channel;
-    std::string displayName;
-    int index;
-
-    CFrameBuffer* frameBuffer;
-    Footer* footer;
-    CBouquetList* bouquetList;
-
-    int x;
-    int y;
-    int width;
-    static int separationLineHeight;
-
-    static Font* font;
-
-    TCChannelEventEntries      channelEventEntries;
-  };
-
-  typedef std::vector<ChannelEntry*> TChannelEntries;
-
-  class Footer
-  {
-  //// construction / destruction
-  public:
-    Footer
-      ( CFrameBuffer* frameBuffer
-      , int x
-      , int y
-      , int width
-      , int height
-      );
+				~ChannelEntry();
 
-    ~Footer();
+			//// methods
+			public:
+				static void init();
 
-  //// methods
-  public:
-    static void init();
+				void paint(bool isSelected, time_t selectedTime);
 
-    void setBouquetChannelName
-      ( const std::string& newBouquetName
-      , const std::string& newChannelName
-      );
+				static int getUsedHeight();
 
-    void paintEventDetails
-      ( const std::string& description
-      , const std::string& shortDescription
-      );
+			//// attributes
+			public:
+				const CZapitChannel * channel;
+				std::string displayName;
+				int index;
 
-    void paintButtons
-      ( button_label* buttonLabels
-      , int numberOfButtons
-      );
+				CFrameBuffer* frameBuffer;
+				Footer* footer;
+				CBouquetList* bouquetList;
 
-    static int getUsedHeight();
+				int x;
+				int y;
+				int width;
+				static int separationLineHeight;
 
-  //// attributes
-  public:
-    CFrameBuffer* frameBuffer;
+				static Font* font;
 
-    int x;
-    int y;
-    int width;
-    int buttonHeight;
+				TCChannelEventEntries channelEventEntries;
+		};
 
-    static Font*  fontBouquetChannelName;
-    static Font*  fontEventDescription;
-    static Font*  fontEventShortDescription;
-    static Font*  fontButtons;
+		typedef std::vector<ChannelEntry*> TChannelEntries;
 
-    static int color;
+		class Footer
+		{
+			//// construction / destruction
+			public:
+				Footer(CFrameBuffer* frameBuffer,
+					int x,
+					int y,
+					int width,
+					int height);
 
-    std::string currentBouquetName;
-    std::string currentChannelName;
-  };
+				~Footer();
 
+			//// methods
+			public:
+				static void init();
 
-  class MenuTargetAddReminder : public CMenuTarget
-	{
-		public:
-			MenuTargetAddReminder ( EpgPlus* epgPlus);
+				void setBouquetChannelName(const std::string& newBouquetName, const std::string& newChannelName);
 
-		public:
-			int exec ( CMenuTarget* parent , const std::string& actionKey);
+				void paintEventDetails(const std::string& description, const std::string& shortDescription);
 
-		private:
-			EpgPlus* epgPlus;
+				void paintButtons(button_label* buttonLabels, int numberOfButtons);
 
-	};
+				static int getUsedHeight();
 
-	class MenuTargetAddRecordTimer : public CMenuTarget
-	{
-		public:
-			MenuTargetAddRecordTimer ( EpgPlus* epgPlus);
+			//// attributes
+			public:
+				CFrameBuffer* frameBuffer;
 
-		public:
-			int exec ( CMenuTarget* parent , const std::string& actionKey);
+				int x;
+				int y;
+				int width;
+				int buttonHeight;
 
-		private:
-			EpgPlus* epgPlus;
+				static Font* fontBouquetChannelName;
+				static Font* fontEventDescription;
+				static Font* fontEventShortDescription;
+				static Font* fontButtons;
 
-	};
+				static int color;
 
-	class MenuTargetRefreshEpg : public CMenuTarget
-	{
-		public:
-			MenuTargetRefreshEpg ( EpgPlus* epgPlus);
+				std::string currentBouquetName;
+				std::string currentChannelName;
+		};
 
-		public:
-			int exec ( CMenuTarget* parent , const std::string& actionKey);
+		class MenuTargetAddReminder : public CMenuTarget
+		{
+			public:
+				MenuTargetAddReminder(EpgPlus* epgPlus);
 
-		private:
-			EpgPlus* epgPlus;
+			public:
+				int exec(CMenuTarget* parent, const std::string& actionKey);
 
-	};
+			private:
+				EpgPlus* epgPlus;
 
-  class MenuOptionChooserSwitchSwapMode : public CMenuOptionChooser
-	{
-		public:
-			MenuOptionChooserSwitchSwapMode ( EpgPlus* epgPlus);
+		};
 
-			virtual ~MenuOptionChooserSwitchSwapMode();
+		class MenuTargetAddRecordTimer : public CMenuTarget
+		{
+			public:
+				MenuTargetAddRecordTimer(EpgPlus* epgPlus);
 
-		public:
-      int exec
-			( CMenuTarget* parent);
+			public:
+				int exec(CMenuTarget* parent, const std::string& actionKey);
 
-		private:
-      int oldTimingMenuSettings;
-      TSwapMode oldSwapMode;
-			EpgPlus* epgPlus;
-  };
+			private:
+				EpgPlus* epgPlus;
 
-  class MenuOptionChooserSwitchViewMode : public CMenuOptionChooser
-	{
-		public:
-			MenuOptionChooserSwitchViewMode ( EpgPlus* epgPlus);
+		};
 
-			virtual ~MenuOptionChooserSwitchViewMode();
+		class MenuTargetRefreshEpg : public CMenuTarget
+		{
+			public:
+				MenuTargetRefreshEpg(EpgPlus* epgPlus);
 
-		public:
-      int exec ( CMenuTarget* parent);
+			public:
+				int exec(CMenuTarget* parent, const std::string& actionKey);
 
-		private:
-      int oldTimingMenuSettings;
-  };
+			private:
+				EpgPlus* epgPlus;
 
-	class MenuTargetSettings : public CMenuTarget
-	{
-		public:
-			MenuTargetSettings ( EpgPlus* epgPlus);
+		};
 
-		public:
-			int exec ( CMenuTarget* parent , const std::string& actionKey);
+		class MenuOptionChooserSwitchSwapMode : public CMenuOptionChooser
+		{
+			public:
+				MenuOptionChooserSwitchSwapMode(EpgPlus* epgPlus);
 
-		private:
-			EpgPlus* epgPlus;
-	};
+				virtual ~MenuOptionChooserSwitchSwapMode();
 
-	typedef time_t DurationSetting;
+			public:
+				int exec(CMenuTarget* parent);
 
-/*
-	struct Settings
-	{
-		Settings ( bool doInit = true);
+			private:
+				EpgPlus* epgPlus;
+				int oldTimingMenuSettings;
+				TSwapMode oldSwapMode;
+		};
 
-		virtual ~Settings();
+		class MenuOptionChooserSwitchViewMode : public CMenuOptionChooser
+		{
+			public:
+				MenuOptionChooserSwitchViewMode(EpgPlus* epgPlus);
 
-		FontSetting*    fontSettings;
-		SizeSetting*    sizeSettings;
-		DurationSetting durationSetting;
-	};
-  typedef std::map<int, Font*> Fonts;
-  typedef std::map<int, int>   Sizes;
-  static Font * fonts[NumberOfFontSettings];
-  static int  sizes[NumberOfSizeSettings];
-*/
+				virtual ~MenuOptionChooserSwitchViewMode();
 
-  friend class EpgPlus::MenuOptionChooserSwitchSwapMode;
-  friend class EpgPlus::MenuOptionChooserSwitchViewMode;
-  friend class EpgPlus::ChannelEntry;
-  friend class EpgPlus::ChannelEventEntry;
+			public:
+				int exec(CMenuTarget* parent);
 
-//// construction / destruction
-public:
-  EpgPlus();
-  ~EpgPlus();
+			private:
+				int oldTimingMenuSettings;
+		};
 
-//// methods
-public:
-  void init();
-  void free();
+		class MenuTargetSettings : public CMenuTarget
+		{
+			public:
+				MenuTargetSettings(EpgPlus* epgPlus);
 
-  int exec ( CChannelList* channelList , int selectedChannelIndex , CBouquetList* bouquetList);
+			public:
+				int exec(CMenuTarget* parent, const std::string& actionKey);
 
-private:
-  static std::string getTimeString ( const time_t& time , const std::string& format);
+			private:
+				EpgPlus* epgPlus;
+		};
 
-  TCChannelEventEntries::const_iterator getSelectedEvent() const;
+		typedef time_t DurationSetting;
 
-  void createChannelEntries ( int selectedChannelEntryIndex);
-  void paint();
-  void paintChannelEntry ( int position);
-  void hide();
-
-//// properties
-private:
-  CFrameBuffer*   frameBuffer;
-
-  TChannelEntries displayedChannelEntries;
+		/*
+		struct Settings
+		{
+			Settings(bool doInit = true);
 
-  Header*         header;
-  TimeLine*       timeLine;
-
-  CChannelList*   channelList;
-  CBouquetList*   bouquetList;
-
-  Footer*         footer;
-
-  ChannelEntry*   selectedChannelEntry;
-  time_t          selectedTime;
-
-  int             channelListStartIndex;
-  int             maxNumberOfDisplayableEntries; // maximal number of displayable entrys
-
-  time_t          startTime;
-  time_t          firstStartTime;
-  static time_t   duration;
-
-  int             entryHeight;
-
-  TViewMode       currentViewMode;
-  TSwapMode       currentSwapMode;
-
-  int             headerX;
-  int             headerY;
-  int             headerWidth;
-
-  int             usableScreenWidth;
-  int             usableScreenHeight;
-  int             usableScreenX;
-  int             usableScreenY;
-
-  int             timeLineX;
-  int             timeLineY;
-  int             timeLineWidth;
-
-  int             channelsTableX;
-  int             channelsTableY;
-  static int      channelsTableWidth;
-  int             channelsTableHeight;
-
-  int             eventsTableX;
-  int             eventsTableY;
-  int             eventsTableWidth;
-  int             eventsTableHeight;
-
-  int             sliderX;
-  int             sliderY;
-  static int      sliderWidth;
-  int             sliderHeight;
-  static int      sliderBackColor;
-  static int      sliderKnobColor;
-
-  int             footerX;
-  int             footerY;
-  int             footerWidth;
-
-  int             horGap1X;
-  int             horGap1Y;
-  int             horGap1Width;
-  int             horGap2X;
-  int             horGap2Y;
-  int             horGap2Width;
-  int             verGap1X;
-  int             verGap1Y;
-  int             verGap1Height;
-  int             verGap2X;
-  int             verGap2Y;
-  int             verGap2Height;
-
-  static int      horGap1Height;
-  static int      horGap2Height;
-  static int      verGap1Width;
-  static int      verGap2Width;
-
-  static int      horGap1Color;
-  static int      horGap2Color;
-  static int      verGap1Color;
-  static int      verGap2Color;
+			virtual ~Settings();
 
-  bool            refreshAll;
-  bool            refreshFooterButtons;
+			FontSetting*	fontSettings;
+			SizeSetting*	sizeSettings;
+			DurationSetting	durationSetting;
+		};
+		typedef std::map<int, Font*> Fonts;
+		typedef std::map<int, int> Sizes;
+		static Font * fonts[NumberOfFontSettings];
+		static int sizes[NumberOfSizeSettings];
+		*/
+
+		friend class EpgPlus::ChannelEventEntry;
+		friend class EpgPlus::ChannelEntry;
+		friend class EpgPlus::MenuOptionChooserSwitchSwapMode;
+		friend class EpgPlus::MenuOptionChooserSwitchViewMode;
+
+	//// construction / destruction
+	public:
+		EpgPlus();
+		~EpgPlus();
+
+	//// methods
+	public:
+		void init();
+		void free();
+
+		int exec(CChannelList* channelList, int selectedChannelIndex, CBouquetList* bouquetList);
+
+	private:
+		static std::string getTimeString(const time_t& time, const std::string& format);
+
+		TCChannelEventEntries::const_iterator getSelectedEvent() const;
+
+		void createChannelEntries(int selectedChannelEntryIndex);
+		void paint();
+		void paintChannelEntry(int position);
+		void hide();
+
+	//// properties
+	private:
+		CFrameBuffer*	frameBuffer;
+
+		TChannelEntries	displayedChannelEntries;
+
+		Header*		header;
+		TimeLine*	timeLine;
+
+		CChannelList*	channelList;
+		CBouquetList*	bouquetList;
+
+		Footer*		footer;
+
+		ChannelEntry*	selectedChannelEntry;
+		time_t		selectedTime;
+
+		int		channelListStartIndex;
+		int		maxNumberOfDisplayableEntries; // maximal number of displayable entrys
+
+		time_t		startTime;
+		time_t		firstStartTime;
+		static time_t	duration;
+
+		int		entryHeight;
+
+		TViewMode	currentViewMode;
+		TSwapMode	currentSwapMode;
+
+		int		headerX;
+		int		headerY;
+		int		headerWidth;
+
+		int		usableScreenWidth;
+		int		usableScreenHeight;
+		int		usableScreenX;
+		int		usableScreenY;
+
+		int		timeLineX;
+		int		timeLineY;
+		int		timeLineWidth;
+
+		int		channelsTableX;
+		int		channelsTableY;
+		static int	channelsTableWidth;
+		int		channelsTableHeight;
+
+		int		eventsTableX;
+		int		eventsTableY;
+		int		eventsTableWidth;
+		int		eventsTableHeight;
+
+		int		sliderX;
+		int		sliderY;
+		static int	sliderWidth;
+		int		sliderHeight;
+		static int	sliderBackColor;
+		static int	sliderKnobColor;
+
+		int		footerX;
+		int		footerY;
+		int		footerWidth;
+
+		int		horGap1X;
+		int		horGap1Y;
+		int		horGap1Width;
+		int		horGap2X;
+		int		horGap2Y;
+		int		horGap2Width;
+		int		verGap1X;
+		int		verGap1Y;
+		int		verGap1Height;
+		int		verGap2X;
+		int		verGap2Y;
+		int		verGap2Height;
+
+		static int	horGap1Height;
+		static int	horGap2Height;
+		static int	verGap1Width;
+		static int	verGap2Width;
+
+		static int	horGap1Color;
+		static int	horGap2Color;
+		static int	verGap1Color;
+		static int	verGap2Color;
+
+		bool		refreshAll;
+		bool		refreshFooterButtons;
 };
 
 class CEPGplusHandler : public CMenuTarget
 {
 	public:
-		int exec( CMenuTarget* parent,  const std::string &actionKey);
+		int exec(CMenuTarget* parent, const std::string &actionKey);
 };
 
-#endif
+#endif // __epgplus__