diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 77ec29141..8e5c83472 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -213,26 +213,37 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 		switch (item)
 		{
 		case SNeutrinoSettings::ITEM_NONE:
+		{
 			continue;
+		}
 		case SNeutrinoSettings::ITEM_BAR:
+		{
 			menu->addItem(GenericMenuSeparatorLine);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_EPG_LIST:
+		{
 			keyhelper.get(&key,&icon,CRCInput::RC_red);
 			menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTLIST, !_mode_ts, NULL, new CEventListHandler,  "-1", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_EPG_SUPER:
+		{
 			keyhelper.get(&key,&icon,CRCInput::RC_green);
 			menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, !_mode_ts, NULL, new CEPGplusHandler,  "-1", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_EPG_INFO:
+		{
 			keyhelper.get(&key,&icon,CRCInput::RC_yellow);
 			menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTINFO, !_mode_ts, NULL, new CEPGDataHandler,  "-1", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_EPG_MISC:
+		{
 			dummy = g_Sectionsd->getIsScanningActive();
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this , key, icon );
@@ -243,12 +254,16 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			menu_item = new CMenuForwarder(LOCALE_MAINMENU_CLEARSECTIONSD, true, NULL, neutrino, "clearSectionsd", key,icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_AUDIO_SELECT:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_AUDIOSELECTMENUE_HEAD, !_mode_ts, NULL, new CAudioSelectMenuHandler, "-1", key,icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_SUBCHANNEL:
+		{
 			if (g_RemoteControl->subChannels.empty())
 				break;
 			if (_mode_webtv)
@@ -264,46 +279,62 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			menu_item = new CMenuDForwarder(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, true, NULL, tmpNVODSelector, "-1", key,icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_RECORD:
+		{
 			if (g_settings.recording_type == RECORDING_OFF)
 				break;
 			keyhelper.get(&key,&icon,CRCInput::RC_red);
 			menu_item = new CMenuForwarder(LOCALE_MAINMENU_RECORDING, true, NULL, CRecordManager::getInstance(), "-1", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB:
+		{
 			if (g_settings.recording_type == RECORDING_OFF)
 				break;
 			keyhelper.get(&key,&icon,CRCInput::RC_green);
 			menu_item = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, !_mode_ts, NULL, neutrino, "tsmoviebrowser", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_TIMERLIST:
+		{
 			keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_TIMERLIST]].key); //CRCInput::RC_yellow
 			menu_item = new CMenuDForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList, "-1", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_VTXT:
+		{
 			keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue
 			menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT); //NI
 			break;
+		}
 		case SNeutrinoSettings::ITEM_FAVORITS:
+		{
 			keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); //CRCInput::RC_green
 			menu_item = new CMenuDForwarder(LOCALE_FAVORITES_MENUEADD, true, NULL, new CFavorites, "-1", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_TECHINFO:
+		{
 			keyhelper.get(&key,&icon,CRCInput::RC_blue);
 			menu_item = new CMenuDForwarder(LOCALE_EPGMENU_STREAMINFO, !neutrino->channelList->isEmpty(), NULL, new CStreamInfo2, "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_REMOTE:
+		{
 			keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey);
 			menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1" , key, icon );
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_PLUGIN_TYPES:
+		{
 			unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins();
 			if (!number_of_plugins)
 				continue;
@@ -337,125 +368,170 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			}
 			menu_item = NULL;
 			break;
+		}
 		case SNeutrinoSettings::ITEM_IMAGEINFO:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_IMAGEINFO,  true, NULL, new CImageInfoNI, NULL, key, icon); //NI
 			menu_item->setHint(NEUTRINO_ICON_HINT_IMAGEINFO, LOCALE_MENU_HINT_IMAGEINFO);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_BOXINFO:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO);
 			break;
+		}
 #if !HAVE_SPARK_HARDWARE
 		case SNeutrinoSettings::ITEM_CAM:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 #endif
 		case SNeutrinoSettings::ITEM_CLOCK:
+		{
 			keyhelper.get(&key,&icon); 
 			menu_item = new CMenuForwarder(!g_settings.mode_clock ? LOCALE_CLOCK_SWITCH_ON:LOCALE_CLOCK_SWITCH_OFF, true, NULL, neutrino, "clock_switch", key, icon);
 			menu_item->setHint("", LOCALE_MENU_HINT_CLOCK_MODE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_GAMES:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_SCRIPTS:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
 			menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
 			break;
+		}
 		//NI
 		case SNeutrinoSettings::ITEM_ECMINFO:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, ni_menu, "ecmInfo", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		//NI
 		case SNeutrinoSettings::ITEM_CAMD_RESET:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, ni_menu, "camd_reset", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		//NI
 		case SNeutrinoSettings::ITEM_INFOICONS:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(!g_settings.mode_icons ? LOCALE_INFOICONS_SWITCH_ON : LOCALE_INFOICONS_SWITCH_OFF, g_settings.mode_icons_skin != INFOICONS_INFOVIEWER, NULL, new CInfoIconsSetup, "infoicons_switch", key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_YOUTUBE:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, !_mode_ts, NULL, neutrino, "ytplayback", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_FILEPLAY:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK, !_mode_ts, NULL, neutrino, "fileplayback", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY);
 			break;
-                case SNeutrinoSettings::ITEM_TOOLS:
+		}
+		case SNeutrinoSettings::ITEM_TOOLS:
+		{
 			keyhelper.get(&key,&icon);
-                        menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
+			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_PluginList->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
-                        break;
+			break;
+		}
 		case SNeutrinoSettings::ITEM_LUA:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		//NI
 		case SNeutrinoSettings::ITEM_TUNER_RESTART:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_HDDMENU:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, CHDDMenuHandler::getInstance(), NULL, key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_HDD, LOCALE_MENU_HINT_HDD);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_AUDIOPLAY:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, neutrino, "audioplayer", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_INETPLAY:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_NETSETTINGS:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK, true, NULL, CNetworkSetup::getInstance(), NULL, key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_NETWORK, LOCALE_MENU_HINT_NETWORK);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_SWUPDATE:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION:
+		{
 			if (!_mode_webtv)
 				break;
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_LIVESTREAM_RESOLUTION, true, NULL, new CWebTVResolution(), NULL, key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case SNeutrinoSettings::ITEM_ADZAP:
+		{
 			keyhelper.get(&key,&icon,CRCInput::RC_blue);
 			menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP);
 			break;
+		}
 		//NI
 		case SNeutrinoSettings::ITEM_TESTMENU:
+		{
 			keyhelper.get(&key,&icon);
 			menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon);
 			// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
 			break;
+		}
 		case -1: // plugin
 		{
 			int number_of_plugins = g_PluginList->getNumberOfPlugins();