diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp
index ab0b698cb..3cc6d8e57 100644
--- a/src/gui/glcdsetup.cpp
+++ b/src/gui/glcdsetup.cpp
@@ -225,73 +225,84 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data)
 	if (!Data)
 		return false;
 	cGLCD *cglcd = cGLCD::getInstance();
-	switch(OptionName) {
-	case LOCALE_GLCD_SELECT_FG:
-	case LOCALE_GLCD_SELECT_BG:
-	case LOCALE_GLCD_SELECT_BAR:
-		cglcd->Update();
-		break;
-	case LOCALE_GLCD_ENABLE:
-		if (g_settings.glcd_enable)
-			cglcd->Resume();
-		else
-			cglcd->Suspend();
-		return true;
-	case LOCALE_GLCD_MIRROR_OSD:
-		cglcd->MirrorOSD(*((int *) Data));
-		break;
-	case LOCALE_GLCD_MIRROR_VIDEO:
-		cglcd->Update();
-		break;
-	case LOCALE_GLCD_BRIGHTNESS:
-	case LOCALE_GLCD_BRIGHTNESS_STANDBY:
-	case LOCALE_GLCD_BRIGHTNESS_DIM:
-	case LOCALE_GLCD_BRIGHTNESS_DIM_TIME:
-		cglcd->Update();
-		break;
-	case LOCALE_GLCD_SHOW_PROGRESSBAR:
-	case LOCALE_GLCD_SHOW_DURATION:
-	case LOCALE_GLCD_SHOW_START:
-	case LOCALE_GLCD_SHOW_END:
-	case LOCALE_GLCD_SHOW_TIME:
-	case LOCALE_GLCD_SHOW_WEATHER:
-	case LOCALE_GLCD_SHOW_LOGO:
-	case LOCALE_GLCD_SIZE_BAR:
-	case LOCALE_GLCD_BAR_X_POSITION:
-	case LOCALE_GLCD_BAR_Y_POSITION:
-	case LOCALE_GLCD_BAR_WIDTH:
-	case LOCALE_GLCD_SIZE_CHANNEL:
-	case LOCALE_GLCD_CHANNEL_X_POSITION:
-	case LOCALE_GLCD_CHANNEL_Y_POSITION:
-	case LOCALE_GLCD_SIZE_EPG:
-	case LOCALE_GLCD_EPG_X_POSITION:
-	case LOCALE_GLCD_EPG_Y_POSITION:
-	case LOCALE_GLCD_SIZE_DURATION:
-	case LOCALE_GLCD_DURATION_X_POSITION:
-	case LOCALE_GLCD_DURATION_Y_POSITION:
-	case LOCALE_GLCD_SIZE_START:
-	case LOCALE_GLCD_START_X_POSITION:
-	case LOCALE_GLCD_START_Y_POSITION:
-	case LOCALE_GLCD_SIZE_END:
-	case LOCALE_GLCD_END_X_POSITION:
-	case LOCALE_GLCD_END_Y_POSITION:
-	case LOCALE_GLCD_SIZE_LOGO:
-	case LOCALE_GLCD_LOGO_X_POSITION:
-	case LOCALE_GLCD_LOGO_Y_POSITION:
-	case LOCALE_GLCD_SIZE_TIME:
-	case LOCALE_GLCD_TIME_X_POSITION:
-	case LOCALE_GLCD_TIME_Y_POSITION:
-	case LOCALE_GLCD_TIME_IN_STANDBY:
-	case LOCALE_GLCD_SCROLL_SPEED:
-	case LOCALE_GLCD_THEME_POSITION_SETTINGS:
-		break;
-	default:
-		return false;
+
+	switch(OptionName)
+	{
+		case LOCALE_GLCD_SELECT_FG:
+		case LOCALE_GLCD_SELECT_BG:
+		case LOCALE_GLCD_SELECT_BAR:
+			cglcd->Update();
+			break;
+		case LOCALE_GLCD_ENABLE:
+			if (g_settings.glcd_enable)
+				cglcd->Resume();
+			else
+				cglcd->Suspend();
+			return true;
+		case LOCALE_GLCD_MIRROR_OSD:
+			cglcd->MirrorOSD(*((int *) Data));
+			break;
+		case LOCALE_GLCD_MIRROR_VIDEO:
+			cglcd->Update();
+			break;
+		case LOCALE_GLCD_BRIGHTNESS:
+		case LOCALE_GLCD_BRIGHTNESS_STANDBY:
+		case LOCALE_GLCD_BRIGHTNESS_DIM:
+		case LOCALE_GLCD_BRIGHTNESS_DIM_TIME:
+			cglcd->Update();
+			break;
+		case LOCALE_GLCD_SHOW_PROGRESSBAR:
+		case LOCALE_GLCD_SHOW_DURATION:
+		case LOCALE_GLCD_SHOW_START:
+		case LOCALE_GLCD_SHOW_END:
+		case LOCALE_GLCD_SHOW_TIME:
+		case LOCALE_GLCD_SHOW_WEATHER:
+		case LOCALE_GLCD_SHOW_LOGO:
+		case LOCALE_GLCD_SIZE_BAR:
+		case LOCALE_GLCD_BAR_X_POSITION:
+		case LOCALE_GLCD_BAR_Y_POSITION:
+		case LOCALE_GLCD_BAR_WIDTH:
+		case LOCALE_GLCD_SIZE_CHANNEL:
+		case LOCALE_GLCD_CHANNEL_X_POSITION:
+		case LOCALE_GLCD_CHANNEL_Y_POSITION:
+		case LOCALE_GLCD_SIZE_EPG:
+		case LOCALE_GLCD_EPG_X_POSITION:
+		case LOCALE_GLCD_EPG_Y_POSITION:
+		case LOCALE_GLCD_SIZE_DURATION:
+		case LOCALE_GLCD_DURATION_X_POSITION:
+		case LOCALE_GLCD_DURATION_Y_POSITION:
+		case LOCALE_GLCD_SIZE_START:
+		case LOCALE_GLCD_START_X_POSITION:
+		case LOCALE_GLCD_START_Y_POSITION:
+		case LOCALE_GLCD_SIZE_END:
+		case LOCALE_GLCD_END_X_POSITION:
+		case LOCALE_GLCD_END_Y_POSITION:
+		case LOCALE_GLCD_SIZE_LOGO:
+		case LOCALE_GLCD_LOGO_X_POSITION:
+		case LOCALE_GLCD_LOGO_Y_POSITION:
+		case LOCALE_GLCD_SIZE_TIME:
+		case LOCALE_GLCD_TIME_X_POSITION:
+		case LOCALE_GLCD_TIME_Y_POSITION:
+		case LOCALE_GLCD_TIME_IN_STANDBY:
+		case LOCALE_GLCD_SCROLL_SPEED:
+		case LOCALE_GLCD_THEME_POSITION_SETTINGS:
+			break;
+		default:
+			return false;
 	}
 
-	if (OptionName == LOCALE_GLCD_TIME_IN_STANDBY || OptionName == LOCALE_GLCD_BRIGHTNESS_STANDBY || OptionName == LOCALE_GLCD_STANDBY_LED_CLOCK || OptionName == LOCALE_GLCD_STANDBY_LCD_CLOCK
-	 || OptionName == LOCALE_GLCD_STANDBY_DIGITAL_CLOCK || OptionName == LOCALE_GLCD_STANDBY_DIGITAL_CLOCK || OptionName == LOCALE_GLCD_STANDBY_ANALOG_CLOCK || OptionName == LOCALE_GLCD_STANDBY_WEATHER
-	 || OptionName == LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION || OptionName == LOCALE_GLCD_SIZE_SIMPLE_CLOCK || OptionName == LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION)
+	if (
+		   OptionName == LOCALE_GLCD_TIME_IN_STANDBY
+		|| OptionName == LOCALE_GLCD_BRIGHTNESS_STANDBY
+		|| OptionName == LOCALE_GLCD_STANDBY_LED_CLOCK
+		|| OptionName == LOCALE_GLCD_STANDBY_LCD_CLOCK
+		|| OptionName == LOCALE_GLCD_STANDBY_DIGITAL_CLOCK
+		|| OptionName == LOCALE_GLCD_STANDBY_ANALOG_CLOCK
+		|| OptionName == LOCALE_GLCD_STANDBY_WEATHER
+		|| OptionName == LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION
+		|| OptionName == LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION
+		|| OptionName == LOCALE_GLCD_SIZE_SIMPLE_CLOCK
+	)
 		cglcd->StandbyMode(true);
 	else
 		cglcd->StandbyMode(false);