diff --git a/source/draw.c b/source/draw.c
index bdec776..4c35866 100644
--- a/source/draw.c
+++ b/source/draw.c
@@ -107,7 +107,7 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
     if (themes_list == NULL)
     {
         pp2d_begin_draw(GFX_TOP);
-        pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "FAILURE");
+        pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "NO THEMES FOUND");
         pp2d_end_draw();
         return;
     }
@@ -119,9 +119,9 @@ void draw_theme_interface(Theme_s * themes_list, int theme_count, int selected_t
         if (current_theme.has_preview)
         {
             pp2d_begin_draw(GFX_TOP);
-            pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, preview_offset, 0, 400, 240);
+            pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, current_theme.preview_offset, 0, 400, 240);
             pp2d_draw_on(GFX_BOTTOM);
-            pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 40+preview_offset, 240, 320, 240);
+            pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 40+current_theme.preview_offset, 240, 320, 240);
         }
     }
     else
@@ -202,7 +202,7 @@ void draw_splash_interface(Splash_s *splashes_list, int splash_count, int select
     if (splashes_list == NULL)
     {
         pp2d_begin_draw(GFX_TOP);
-        pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "FAILURE");
+        pp2d_draw_text_center(GFX_TOP, 100, 1, 1, COLOR_WHITE, "NO SPLASHES FOUND");
         pp2d_end_draw();
         return;
     }
diff --git a/source/fs.c b/source/fs.c
index c16587f..1cca223 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -51,6 +51,10 @@ Result open_archives(void)
     CFGU_SecureInfoGetRegion(&regionCode);
     switch(regionCode)
     {
+        case 0:
+            archive1 = 0x000002cc;
+            archive2 = 0x00000082;
+            break;
         case 1:
             archive1 = 0x000002cd;
             archive2 = 0x0000008f;
@@ -59,10 +63,6 @@ Result open_archives(void)
             archive1 = 0x000002ce;
             archive2 = 0x00000098;
             break;
-        case 3:
-            archive1 = 0x000002cc;
-            archive2 = 0x00000082;
-            break;
         default:
             archive1 = 0x00;
             archive2 = 0x00;
diff --git a/source/main.c b/source/main.c
index 3ac6b1e..9e55cfa 100644
--- a/source/main.c
+++ b/source/main.c
@@ -91,7 +91,11 @@ int main(void)
             PTMSYSM_RebootAsync(0);
             ptmSysmExit();
         }
-        
+        else if (kDown & KEY_L)
+        {
+            splash_mode = !splash_mode;
+        }
+
         if (themes_list == NULL && !splash_mode)
             continue;
         
@@ -119,10 +123,6 @@ int main(void)
             continue;
         
         // Actions
-        else if (kDown & KEY_L)
-        {
-            splash_mode = !splash_mode;
-        }
         else if (kDown & KEY_X)
         {
             // install_bgm(current_theme);