diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index f0c809326..dd1b55ef6 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -317,11 +317,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	g_settings.video_Format = configfile.getInt32("video_Format", DISPLAY_AR_16_9);
 	g_settings.video_43mode = configfile.getInt32("video_43mode", DISPLAY_AR_MODE_LETTERBOX);
-#ifdef BOXMODEL_APOLLO
-	g_settings.brightness = configfile.getInt32("brightness", 0);
-	g_settings.contrast = configfile.getInt32("contrast", 0);
-	g_settings.saturation = configfile.getInt32("saturation", 0);
-#endif
 	g_settings.current_volume = configfile.getInt32("current_volume", 50);
 	g_settings.current_volume_step = configfile.getInt32("current_volume_step", 2);
 	g_settings.channel_mode = configfile.getInt32("channel_mode", LIST_MODE_PROV);
@@ -770,6 +765,15 @@ int CNeutrinoApp::loadSetup(const char * fname)
 		g_settings.screen_width = frameBuffer->getScreenWidth(true);
 		g_settings.screen_height = frameBuffer->getScreenHeight(true);
 	}
+#ifdef BOXMODEL_APOLLO
+	g_settings.brightness = configfile.getInt32("brightness", 0);
+	g_settings.contrast = configfile.getInt32("contrast", 0);
+	g_settings.saturation = configfile.getInt32("saturation", 0);
+	g_settings.pip_x = configfile.getInt32("pip_x", 50);
+	g_settings.pip_y = configfile.getInt32("pip_y", 50);
+	g_settings.pip_width = configfile.getInt32("pip_width", 365);
+	g_settings.pip_height = configfile.getInt32("pip_height", 200);
+#endif
 	if(erg)
 		configfile.setModifiedFlag(true);
 	return erg;
@@ -792,11 +796,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "analog_mode2", g_settings.analog_mode2 );
 	configfile.setInt32( "video_Format", g_settings.video_Format );
 	configfile.setInt32( "video_43mode", g_settings.video_43mode );
-#ifdef BOXMODEL_APOLLO
-	configfile.setInt32( "brightness", g_settings.brightness );
-	configfile.setInt32( "contrast", g_settings.contrast );
-	configfile.setInt32( "saturation", g_settings.saturation );
-#endif
 	configfile.setInt32( "hdmi_cec_mode", g_settings.hdmi_cec_mode );
 	configfile.setInt32( "hdmi_cec_view_on", g_settings.hdmi_cec_view_on );
 	configfile.setInt32( "hdmi_cec_standby", g_settings.hdmi_cec_standby );
@@ -1147,7 +1146,10 @@ void CNeutrinoApp::saveSetup(const char * fname)
 
 	configfile.setInt32("bigFonts", g_settings.bigFonts);
 	configfile.setInt32("big_windows", g_settings.big_windows);
-#if 0
+#ifdef BOXMODEL_APOLLO
+	configfile.setInt32("brightness", g_settings.brightness );
+	configfile.setInt32("contrast", g_settings.contrast );
+	configfile.setInt32("saturation", g_settings.saturation );
 	configfile.setInt32("pip_x", g_settings.pip_x);
 	configfile.setInt32("pip_y", g_settings.pip_y);
 	configfile.setInt32("pip_width", g_settings.pip_width);
@@ -2686,7 +2688,7 @@ _repeat:
 				printf("NeutrinoMessages::INACTIVITY SLEEPTIMER: skiping\n");
 				skipShutdownTimer = false;
 				return messages_return::handled;
-                       }
+			}
 		}else{ //MAIN-MENU SLEEPTIMER
 			if(skipSleepTimer) {
 				printf("NeutrinoMessages::SLEEPTIMER: skiping\n");