1 files changed, 4 insertions, 8 deletions

diff --git a/apps/main.c b/apps/main.c
index 6d2609b486..187f0cdd96 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -325,11 +325,10 @@ static void init(void)
     sb_skin_init();
     viewportmanager_init();
 
-    gui_sync_wps_init();
     storage_init();
     settings_reset();
     settings_load(SETTINGS_ALL);
-    settings_apply(false);
+    settings_apply();
     init_dircache(true);
     init_dircache(false);
 #ifdef HAVE_TAGCACHE
@@ -368,7 +367,7 @@ static void init(void)
     audio_init();
     button_clear_queue(); /* Empty the keyboard buffer */
     
-    settings_apply(true);
+    settings_apply_skins();
 }
 
 #else
@@ -455,8 +454,6 @@ static void init(void)
     sb_skin_init();
     viewportmanager_init();
 
-    gui_sync_wps_init();
-
 #if CONFIG_CHARGING && (CONFIG_CPU == SH7034)
     /* charger_inserted() can't be used here because power_thread()
        hasn't checked power_input_status() yet */
@@ -562,7 +559,7 @@ static void init(void)
 #endif
     }
 
-    settings_apply(false);
+    settings_apply();
     init_dircache(false);
 #ifdef HAVE_TAGCACHE
     init_tagcache();
@@ -627,8 +624,7 @@ static void init(void)
 #ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
     check_bootfile(false); /* remember write time and filesize */
 #endif
-
-    settings_apply(true);
+    settings_apply_skins();
 }
 
 #ifdef CPU_PP