diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index c01d88b5c..51683cd09 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -34,29 +34,16 @@ 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_t;
+		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;
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 8568902cc..0c7ffdb22 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -388,7 +388,7 @@ int CVideoSettings::showVideoSetup()
 
 		for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
 			if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key != -1)
-			videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
+				videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
 
 		vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red);
 		vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 7957a60fe..f75fcd83c 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -393,7 +393,7 @@ void CNeutrinoApp::InitMenuService()
 	mf->setHint(NEUTRINO_ICON_HINT_SERVICE_SCAN, LOCALE_MENU_HINT_SERVICE_SCAN);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SCANTS], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS);
 
-		//reload channels
+	//reload channels
 	mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD    , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_yellow);
 	mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]);
@@ -402,10 +402,10 @@ void CNeutrinoApp::InitMenuService()
 	// TODO: this needs a neutrino restart after changing parentallock_prompt to activate :-(
 	CLockedMenuForwarder *lf;
 	lf = new CLockedMenuForwarder(LOCALE_BOUQUETEDITOR_NAME, g_settings.parentallock_pincode, g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED, true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue);
-
 	/* does not work with CLockedMenuForwarder yet?
 	lf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
 	*/
+
 	personalize.addItem(MENU_SERVICE, lf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]);
 
 	//channel reset