diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index bff4d209b..184a6edbf 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -9,3 +9,6 @@ SUBDIRS = \
 	slider \
 	status \
 	various
+
+install-data-hook:
+	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo
diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index 985e41593..415fbd568 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -123,8 +123,8 @@ int CInfoMenu::showMenu()
 	mf->setHint(NEUTRINO_ICON_HINT_HDD_INFO, LOCALE_MENU_HINT_HDD_INFO);
 	info->addItem(mf);
 
-	//add I_TYPE_INFORMATION plugins
-	info->integratePlugins(CPlugins::I_TYPE_INFORMATION, 1);
+	//add PLUGIN_INTEGRATION_INFORMATION plugins
+	info->integratePlugins(PLUGIN_INTEGRATION_INFORMATION, 1);
 
 	int res = info->exec(NULL, "");
 	delete info;
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index 1bdeb95d8..c6a47c195 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -266,9 +266,9 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
  		//adding personalized items
 		personalize->addPersonalizedItems();
 		
-		//add I_TYPE_MULTIMEDIA plugins
+		//add PLUGIN_INTEGRATION_MULTIMEDIA plugins
 		unsigned int nextShortcut = (unsigned int)media->getNextShortcut();
-		media->integratePlugins(CPlugins::I_TYPE_MULTIMEDIA, nextShortcut, enabled);
+		media->integratePlugins(PLUGIN_INTEGRATION_MULTIMEDIA, nextShortcut, enabled);
 
 		res = media->exec(NULL, "");
 		delete media;
diff --git a/src/gui/ni_menu.cpp b/src/gui/ni_menu.cpp
index 494fa0568..43aaa0cf6 100644
--- a/src/gui/ni_menu.cpp
+++ b/src/gui/ni_menu.cpp
@@ -455,8 +455,8 @@ int CNIMenu::show()
 	mf->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SUPPORT);
 	ni_menu->addItem(mf);
 
-	//add I_TYPE_NI_MENU plugins
-	ni_menu->integratePlugins(CPlugins::I_TYPE_NI_MENU, shortcut);
+	//add PLUGIN_INTEGRATION_NI_MENU plugins
+	ni_menu->integratePlugins(PLUGIN_INTEGRATION_NI_MENU, shortcut);
 
 	int res = ni_menu->exec(NULL, "");
 
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 33e743300..2d0b91384 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -4,38 +4,28 @@
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Homepage: http://dbox.cyberphoria.org/
 
-	Kommentar:
-
-	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.
-
-
 	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 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.
+	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.
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <plugin.h>
-
 #include <gui/pluginlist.h>
+#include <gui/plugins.h>
 #include <gui/components/cc.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/icons.h>
@@ -59,8 +49,6 @@
 #include <zapit/client/zapittools.h>
 #include <system/helpers.h>
 
-#include "plugins.h"
-
 extern CPlugins       * g_Plugins;    /* neutrino.cpp */
 
 CPluginList::CPluginList(const neutrino_locale_t Title, const uint32_t listtype)
@@ -111,7 +99,7 @@ int CPluginList::exec(CMenuTarget* parent, const std::string &actionKey)
 	int nop = g_Plugins->getNumberOfPlugins();
 
 	for(int count = 0; count < nop; count++) {
-		if ((g_Plugins->getType(count) & pluginlisttype) && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == CPlugins::I_TYPE_DISABLED)) {
+		if ((g_Plugins->getType(count) & pluginlisttype) && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == PLUGIN_INTEGRATION_DISABLED)) {
 			neutrino_msg_t d_key = g_Plugins->getKey(count);
 			keyhelper.get(&key, &dummy, d_key);
 			CMenuForwarder *f = new CMenuForwarder(std::string(g_Plugins->getName(count)), true, NULL, this, to_string(count).c_str(), key);
@@ -170,7 +158,7 @@ int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
 	if (!g_Plugins->getScriptOutput().empty())
 		ShowMsg(LOCALE_PLUGINS_RESULT, g_Plugins->getScriptOutput(), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_SHELL);
 
-	if (g_Plugins->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
+	if (g_Plugins->getIntegration(sel) == PLUGIN_INTEGRATION_DISABLED)
 		return menu_return::RETURN_EXIT;
 
 	return menu_return::RETURN_REPAINT;
diff --git a/src/gui/pluginlist.h b/src/gui/pluginlist.h
index 37477366f..ff725b1d7 100644
--- a/src/gui/pluginlist.h
+++ b/src/gui/pluginlist.h
@@ -4,29 +4,20 @@
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Homepage: http://dbox.cyberphoria.org/
 
-	Kommentar:
-
-	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.
-
-
 	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 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.
+	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.
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __pluginlist__
@@ -41,7 +32,6 @@
 
 class CPluginList : public CMenuTarget
 {
-
 	private:
 		neutrino_locale_t title;
 		uint32_t pluginlisttype;
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index f6924a63b..832aaaa39 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -8,19 +8,18 @@
 
 	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 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.
+	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.
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -193,18 +192,10 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 	plugin_data->key = CRCInput::RC_nokey;
 	plugin_data->name = "";
 	plugin_data->description = "";
-#if 0
-	plugin_data->fb = false;
-	plugin_data->rc = false;
-	plugin_data->lcd = false;
-	plugin_data->vtxtpid = false;
-	plugin_data->showpig = false;
-	plugin_data->needoffset = false;
-#endif
 	plugin_data->shellwindow = false;
 	plugin_data->hide = false;
 	plugin_data->type = CPlugins::P_TYPE_DISABLED;
-	plugin_data->integration = CPlugins::I_TYPE_DISABLED;
+	plugin_data->integration = PLUGIN_INTEGRATION_DISABLED;
 	plugin_data->hinticon = NEUTRINO_ICON_HINT_PLUGIN;
 
 	std::string _hintIcon = plugin_data->plugindir + "/" + plugin_data->filename + "_hint.png";
@@ -260,34 +251,8 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 		}
 		else if (cmd == "integration")
 		{
-			plugin_data->integration = getPluginIntegration(atoi(parm));
+			plugin_data->integration = atoi(parm);
 		}
-#if 0
-		else if (cmd == "needfb")
-		{
-			plugin_data->fb = atoi(parm);
-		}
-		else if (cmd == "needrc")
-		{
-			plugin_data->rc = atoi(parm);
-		}
-		else if (cmd == "needlcd")
-		{
-			plugin_data->lcd = atoi(parm);
-		}
-		else if (cmd == "needvtxtpid")
-		{
-			plugin_data->vtxtpid = atoi(parm);
-		}
-		else if (cmd == "pigon")
-		{
-			plugin_data->showpig = atoi(parm);
-		}
-		else if (cmd == "needoffsets")
-		{
-			plugin_data->needoffset = atoi(parm);
-		}
-#endif
 		else if (cmd == "shellwindow")
 		{
 			plugin_data->shellwindow = atoi(parm);
@@ -300,7 +265,6 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 		{
 			reject = atoi(parm);
 		}
-
 	}
 
 	inFile.close();
@@ -321,28 +285,6 @@ bool CPlugins::parseCfg(plugin *plugin_data)
 	return !reject;
 }
 
-#if 0
-PluginParam * CPlugins::makeParam(const char * const id, const char * const value, PluginParam * const next)
-{
-	PluginParam * startparam = new PluginParam;
-
-	startparam->next = next;
-	startparam->id   = id;
-	startparam->val  = strdup(value);
-
-	return startparam;
-}
-
-PluginParam * CPlugins::makeParam(const char * const id, const int value, PluginParam * const next)
-{
-	char aval[10];
-
-	sprintf(aval, "%d", value);
-
-	return makeParam(id, aval, next);
-}
-#endif
-
 void CPlugins::startPlugin_by_name(const std::string & name)
 {
 	for (int i = 0; i <  (int) plugin_list.size(); i++)
@@ -362,7 +304,6 @@ void CPlugins::startPlugin(const char * const filename)
 		startPlugin(pluginnr);
 	else
 		printf("[CPlugins] could not find %s\n", filename);
-
 }
 
 void CPlugins::popenScriptPlugin(const char * script)
@@ -551,38 +492,6 @@ CPlugins::p_type_t CPlugins::getPluginType(int type)
 	}
 }
 
-CPlugins::i_type_t CPlugins::getPluginIntegration(int integration)
-{
-	switch (integration)
-	{
-	case INTEGRATION_TYPE_DISABLED:
-		return I_TYPE_DISABLED;
-		break;
-	/*
-	case INTEGRATION_TYPE_MAIN:
-		return I_TYPE_MAIN;
-		break;
-	*/
-	case INTEGRATION_TYPE_MULTIMEDIA:
-		return I_TYPE_MULTIMEDIA;
-		break;
-	case INTEGRATION_TYPE_SETTING:
-		return I_TYPE_SETTING;
-		break;
-	case INTEGRATION_TYPE_SERVICE:
-		return I_TYPE_SERVICE;
-		break;
-	case INTEGRATION_TYPE_INFORMATION:
-		return I_TYPE_INFORMATION;
-		break;
-	case INTEGRATION_TYPE_NI_MENU: //NI
-		return I_TYPE_NI_MENU;
-		break;
-	default:
-		return I_TYPE_DISABLED;
-	}
-}
-
 neutrino_msg_t CPlugins::getPluginKey(std::string key)
 {
 	if (key == "red")
diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index 169e26381..2da7ea22a 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -4,29 +4,20 @@
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Homepage: http://dbox.cyberphoria.org/
 
-	Kommentar:
-
-	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.
-
-
 	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 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.
+	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.
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __plugins__
@@ -42,35 +33,20 @@
 class CFrameBuffer;
 class CPlugins
 {
-
 	public:
-	typedef enum p_type
-	{
-		P_TYPE_DISABLED = 0x1,
-		P_TYPE_GAME     = 0x2,
-		P_TYPE_TOOL     = 0x4,
-		P_TYPE_SCRIPT   = 0x8,
-		P_TYPE_LUA      = 0x10,
-		P_TYPE_NO_GAME  = P_TYPE_TOOL|P_TYPE_SCRIPT|P_TYPE_LUA
-	}
-	p_type_t;
-
-	typedef enum i_type
-	{
-		I_TYPE_DISABLED		= 0x1,
-		/*
-		I_TYPE_MAIN		= 0x2,
-		*/
-		I_TYPE_MULTIMEDIA	= 0x4,
-		I_TYPE_SETTING		= 0x8,
-		I_TYPE_SERVICE		= 0x10,
-		I_TYPE_INFORMATION	= 0x20,
-		I_TYPE_NI_MENU		= 0x400 //NI
-	}
-	i_type_t;
+		// neutrino-internal plugin-type conversion
+		typedef enum p_type
+		{
+			P_TYPE_DISABLED	= 0x1,
+			P_TYPE_GAME	= 0x2,
+			P_TYPE_TOOL	= 0x4,
+			P_TYPE_SCRIPT	= 0x8,
+			P_TYPE_LUA	= 0x10,
+			P_TYPE_NO_GAME	= P_TYPE_TOOL|P_TYPE_SCRIPT|P_TYPE_LUA
+		}
+		p_type_t;
 
 	private:
-
 		CFrameBuffer	*frameBuffer;
 
 		struct plugin
@@ -87,16 +63,7 @@ class CPlugins
 			std::string description;         // UTF-8 encoded
 			std::string depend;
 			CPlugins::p_type_t type;
-			CPlugins::i_type_t integration;
-#if 0
-			bool fb;
-			bool rc;
-			bool lcd;
-			bool vtxtpid;
-			int posx, posy, sizex, sizey;
-			bool showpig;
-			bool needoffset;
-#endif
+			int integration;
 			bool shellwindow;
 			bool hide;
 			bool operator< (const plugin& a) const
@@ -116,8 +83,8 @@ class CPlugins
 		bool plugin_exists(const std::string & filename);
 		int find_plugin(const std::string & filename);
 		CPlugins::p_type_t getPluginType(int type);
-		CPlugins::i_type_t getPluginIntegration(int integration);
 		neutrino_msg_t getPluginKey(std::string key="auto");
+
 	public:
 		CPlugins();
 		~CPlugins();
@@ -126,11 +93,6 @@ class CPlugins
 
 		void setPluginDir(const std::string & dir) { plugin_dir = dir; }
 
-#if 0
-		PluginParam * makeParam(const char * const id, const char * const value, PluginParam * const next);
-		PluginParam * makeParam(const char * const id, const int          value, PluginParam * const next);
-#endif
-
 		inline       int           getNumberOfPlugins  (void            ) const { return plugin_list.size()                    ; }
 		inline const char *        getName             (const int number) const { return plugin_list[number].name.c_str()      ; }
 		inline const char *        getPluginFile       (const int number) const { return plugin_list[number].pluginfile.c_str(); }
diff --git a/src/gui/rc_lock.cpp b/src/gui/rc_lock.cpp
index 5fb380dec..a103ddefa 100644
--- a/src/gui/rc_lock.cpp
+++ b/src/gui/rc_lock.cpp
@@ -128,8 +128,8 @@ void CRCLock::lockRC()
 			if (lockIcon == NULL)
 			{
 				lockIcon = new CComponentsPicture(
-					g_settings.screen_StartX + 10,
-					g_settings.screen_StartY + 10,
+					g_settings.screen_StartX + OFFSET_INNER_MID,
+					g_settings.screen_StartY + OFFSET_INNER_MID,
 					NEUTRINO_ICON_RCLOCK);
 				lockIcon->doPaintBg(false);
 			}
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index f32ad245d..51d3547b2 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -355,7 +355,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 				if (g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA])
 					show = show || g_Plugins->getType(count) == CPlugins::P_TYPE_LUA;
 
-				if (show && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == CPlugins::I_TYPE_DISABLED))
+				if (show && !g_Plugins->isHidden(count) && (g_Plugins->getIntegration(count) == PLUGIN_INTEGRATION_DISABLED))
 				{
 					menu_items++;
 					neutrino_msg_t d_key = g_Plugins->getKey(count);
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 4511f0e09..8ff889706 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1058,7 +1058,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 	return retval;
 }
 
-void CMenuWidget::integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut, bool enabled)
+void CMenuWidget::integratePlugins(int integration, const unsigned int shortcut, bool enabled)
 {
 	bool separatorline = false;
 	unsigned int number_of_plugins = (unsigned int) g_Plugins->getNumberOfPlugins();
@@ -1225,7 +1225,7 @@ void CMenuWidget::calcSize()
 	//scrollbar width
 	scrollbar_width=0;
 	if (total_pages > 1)
-		scrollbar_width = scrollbar_width;
+		scrollbar_width = SCROLLBAR_WIDTH;
 
 	full_width = width + scrollbar_width + OFFSET_SHADOW;
 	full_height = height + fbutton_height + OFFSET_SHADOW + OFFSET_INTER; // hintbox is handled separately
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index ce736ada3..2060ca8d8 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -616,7 +616,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
 		virtual void hide();
 		virtual int exec(CMenuTarget* parent, const std::string & actionKey);
 		virtual const char *getName();
-		virtual void integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut=CRCInput::RC_nokey, bool enabled=true);
+		virtual void integratePlugins(int integration, const unsigned int shortcut=CRCInput::RC_nokey, bool enabled=true);
 		void setSelected(const int &Preselected){ selected = Preselected; };
 		void initSelectable();
 		int getSelected()const { return selected; };
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 7dd9d0c81..1ee99b49b 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -114,16 +114,16 @@ void CNeutrinoApp::InitMenu()
 
 	personalize.addPersonalizedItems();
 
-	//add I_TYPE_SETTING plugins
+	//add PLUGIN_INTEGRATION_SETTING plugins
 	unsigned int nextShortcut;
 	CMenuWidget &menuSettings = personalize.getWidget(MENU_SETTINGS);
 	nextShortcut = (unsigned int)menuSettings.getNextShortcut();
-	menuSettings.integratePlugins(CPlugins::I_TYPE_SETTING, nextShortcut);
+	menuSettings.integratePlugins(PLUGIN_INTEGRATION_SETTING, nextShortcut);
 
-	//add I_TYPE_SERVICE plugins
+	//add PLUGIN_INTEGRATION_SERVICE plugins
 	CMenuWidget &menuService = personalize.getWidget(MENU_SERVICE);
 	nextShortcut = (unsigned int)menuService.getNextShortcut();
-	menuService.integratePlugins(CPlugins::I_TYPE_SERVICE, nextShortcut);
+	menuService.integratePlugins(PLUGIN_INTEGRATION_SERVICE, nextShortcut);
 }
 
 //init main menu
diff --git a/src/plugin.h b/src/plugin.h
index 316f8234c..1e1bb4d14 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -1,61 +1,29 @@
 
-#ifndef TPLUGIN_H
-#define TPLUGIN_H
+#ifndef __plugin_h__
+#define __plugin_h__
 
-typedef struct _PluginParam
+// plugin type as defined in plugin's cfg
+enum
 {
-	const char          * id;
-	char                * val;
-	struct _PluginParam * next;
+	PLUGIN_TYPE_DISABLED	= 0,
+	PLUGIN_TYPE_GAME	= 1,
+	PLUGIN_TYPE_TOOL	= 2,
+	PLUGIN_TYPE_SCRIPT	= 3,
+	PLUGIN_TYPE_LUA		= 4
+};
 
-} PluginParam;
-
-typedef int	(*PluginExec)( PluginParam *par );
-/* das dlsym kann auf PluginExec gecastet werden */
-
-/* NOTE : alle Plugins haben uebergangs-weise neue und alte schnittstelle */
-/* neues Symbol : plugin_exec */
-/* es muessen nur benutzte ids gesetzt werden : nicht genannt = nicht benutzt */
-
-/* fixed ID definitions */
-#define	P_ID_FBUFFER	"fd_framebuffer"
-#define	P_ID_RCINPUT	"fd_rcinput"
-#define	P_ID_LCD		"fd_lcd"
-#define	P_ID_NOPIG		"no_pig"		// 1: plugin dont show internal pig
-#define P_ID_VTXTPID	"pid_vtxt"
-#define P_ID_PROXY		"proxy"			// set proxy for save into highscore
-#define P_ID_PROXY_USER	"proxy_user"	// format "user:pass"
-#define P_ID_HSCORE		"hscore"		// highscore-server (as url)
-#define P_ID_VFORMAT	"video_format"	// videoformat (0 = auto, 1 = 16:9, 2 = 4:3)
-#define P_ID_OFF_X		"off_x"			// screen-top-offset x
-#define P_ID_OFF_Y		"off_y"			// screen-top-offset y
-#define P_ID_END_X		"end_x"			// screen-end-offset x
-#define P_ID_END_Y		"end_y"			// screen-end-offset y
-#define	P_ID_RCBLK_ANF	"rcblk_anf"		// Key-Repeatblocker Anfang
-#define	P_ID_RCBLK_REP	"rcblk_rep"     // Key-Repeatblocker Wiederholung
-
-typedef enum plugin_type
+// plugin integration as defined in plugin's cfg
+enum
 {
-	PLUGIN_TYPE_DISABLED = 0,
-	PLUGIN_TYPE_GAME     = 1,
-	PLUGIN_TYPE_TOOL     = 2,
-	PLUGIN_TYPE_SCRIPT   = 3,
-	PLUGIN_TYPE_LUA      = 4
-}
-plugin_type_t;
-
-typedef enum integration_type
-{
-	INTEGRATION_TYPE_DISABLED	= 0,
+	PLUGIN_INTEGRATION_DISABLED	= 0,
 	/*
-	INTEGRATION_TYPE_MAIN		= 1,
+	PLUGIN_INTEGRATION_MAIN		= 1,
 	*/
-	INTEGRATION_TYPE_MULTIMEDIA	= 2,
-	INTEGRATION_TYPE_SETTING	= 3,
-	INTEGRATION_TYPE_SERVICE	= 4,
-	INTEGRATION_TYPE_INFORMATION	= 5,
-	INTEGRATION_TYPE_NI_MENU	= 10 //NI
-}
-integration_type_t;
+	PLUGIN_INTEGRATION_MULTIMEDIA	= 2,
+	PLUGIN_INTEGRATION_SETTING	= 3,
+	PLUGIN_INTEGRATION_SERVICE	= 4,
+	PLUGIN_INTEGRATION_INFORMATION	= 5,
+	PLUGIN_INTEGRATION_NI_MENU	= 10
+};
 
-#endif
+#endif // __plugin_h__