5 files changed, 16 insertions, 2 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 469e4cb033..9ec8416ad9 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3449,3 +3449,8 @@ eng: "Browse .rwps files"
 voice: "Browse remote while-playing-screen files"
 new:
 
+id: LANG_CUSTOM_THEME
+desc: Custom themes menu
+eng: "Browse themes"
+voice: "Browse themes"
+new:
diff --git a/apps/settings.h b/apps/settings.h
index 20b0408dfd..caaead6a10 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -32,6 +32,7 @@
 #define FONT_DIR "/fonts"
 #define LANG_DIR "/langs"
 #define WPS_DIR ROCKBOX_DIR "/wps"
+#define THEME_DIR ROCKBOX_DIR "/theme"
 #define PLUGIN_DIR ROCKBOX_DIR"/rocks"
 #define REC_BASE_DIR "/recordings"
 
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 82c25af433..41beb4d016 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1004,6 +1004,11 @@ static bool custom_remote_wps_browse(void)
 }
 #endif
 
+static bool custom_theme_browse(void)
+{
+    return rockbox_browse(THEME_DIR, SHOW_CFG);
+}
+        
 static bool custom_cfg_browse(void)
 {
     return rockbox_browse(ROCKBOX_DIR, SHOW_CFG);
@@ -1584,6 +1589,7 @@ static bool display_settings_menu(void)
 #ifdef HAVE_LCD_BITMAP
         { ID2P(LANG_CUSTOM_FONT),     font_browse },
 #endif
+        { ID2P(LANG_CUSTOM_THEME),    custom_theme_browse },
         { ID2P(LANG_WHILE_PLAYING),   custom_wps_browse },
 #ifdef HAVE_REMOTE_LCD
         { ID2P(LANG_REMOTE_WHILE_PLAYING),   custom_remote_wps_browse },
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 0694d1ace3..a15344561b 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -63,6 +63,7 @@ sub buildzip {
     mkdir ".rockbox/rocks", 0777;
     mkdir ".rockbox/codecs", 0777;
     mkdir ".rockbox/wps", 0777;
+    mkdir ".rockbox/theme", 0777;
 
     my $c = 'find apps -name "*.codec" ! -empty -exec cp {} .rockbox/codecs/ \;';
     print `$c`;
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 7fe46adcf3..c0555d824b 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -90,6 +90,7 @@ sub mkdirs {
     my $wpsdir = $wps;
     $wpsdir =~ s/\.(r|)wps//;
     mkdir ".rockbox/wps", 0777;
+    mkdir ".rockbox/theme", 0777;
 
     if( -d ".rockbox/wps/$wpsdir") {
         #print STDERR "wpsbuild warning: directory wps/$wpsdir already exists!\n";
@@ -139,7 +140,7 @@ MOO
     if($statusbar) {
         push @out, "statusbar: $statusbar\n";
     }
-    if($rwps) {
+    if($rwps && $isrwps) {
         push @out, "rwps: /.rockbox/wps/$rwps\n";
     }
 
@@ -147,7 +148,7 @@ MOO
         print STDERR "wpsbuild warning: wps/$cfg already exists!\n";
     }
     else {
-        open(CFG, ">.rockbox/wps/$cfg");
+        open(CFG, ">.rockbox/theme/$cfg");
         print CFG @out;
         close(CFG);
     }