Index: apps/plugins/text_editor.c
===================================================================
--- apps/plugins/text_editor.c	(revision 20954)
+++ apps/plugins/text_editor.c	(working copy)
@@ -154,6 +154,7 @@
         if (!rb->read(fd,&t,1))
         {
             rb->strcpy(eol,"\n");
+            rb->close(fd);
             return 0;
         }
         if (t == '\r')
@@ -323,14 +324,11 @@
     bool changed = false;
     int cur_sel=0;
     static char copy_buffer[MAX_LINE_LEN];
-    bool prev_show_statusbar;
 #ifdef HAVE_LCD_COLOR
     bool edit_colors_file = false;
 #endif
 
     copy_buffer[0]='\0';
-    prev_show_statusbar = rb->global_settings->statusbar;
-    rb->global_settings->statusbar = false;
 
 #if LCD_DEPTH > 1
     rb->lcd_set_backdrop(NULL);
@@ -512,6 +510,5 @@
         }
         rb->gui_synclist_set_nb_items(&lists,line_count);
     }
-    rb->global_settings->statusbar = prev_show_statusbar;
     return PLUGIN_OK;
 }
Index: apps/plugins/spacerocks.c
===================================================================
--- apps/plugins/spacerocks.c	(revision 20954)
+++ apps/plugins/spacerocks.c	(working copy)
@@ -1985,8 +1985,8 @@
             button = rb->button_get(false);
 
 #ifdef HAS_BUTTON_HOLD
-        if (rb->button_hold())
-        game_state = PAUSE_MODE;
+            if (rb->button_hold() && game_state == PLAY_MODE)
+                game_state = PAUSE_MODE;
 #endif
 
             switch(button)
Index: apps/plugins/star.c
===================================================================
--- apps/plugins/star.c	(revision 20954)
+++ apps/plugins/star.c	(working copy)
@@ -1054,7 +1054,7 @@
     }
     while(!menu_quit)
     {
-        switch(rb->do_menu(&menu, &selection, vp, false))
+        switch(rb->do_menu(&menu, &selection, vp, true))
         {
             case 0:
                 menu_quit = true;
Index: apps/plugins/lib/helper.c
===================================================================
--- apps/plugins/lib/helper.c	(revision 20954)
+++ apps/plugins/lib/helper.c	(working copy)
@@ -25,8 +25,6 @@
 /*  Force the backlight on */
 void backlight_force_on(void)
 {
-    if(!rb)
-        return;
     if (rb->global_settings->backlight_timeout > 0)
         rb->backlight_set_timeout(0);
 #if CONFIG_CHARGING
@@ -38,8 +36,6 @@
 /*  Reset backlight operation to its settings */
 void backlight_use_settings(void)
 {
-    if (!rb)
-        return;
     rb->backlight_set_timeout(rb->global_settings->backlight_timeout);
 #if CONFIG_CHARGING
     rb->backlight_set_timeout_plugged(rb->global_settings->
@@ -51,8 +47,6 @@
 /*  Force the backlight on */
 void remote_backlight_force_on(void)
 {
-    if (!rb)
-        return;
     if (rb->global_settings->remote_backlight_timeout > 0)
         rb->remote_backlight_set_timeout(0);
 #if CONFIG_CHARGING
@@ -64,8 +58,6 @@
 /*  Reset backlight operation to its settings */
 void remote_backlight_use_settings(void)
 {
-    if (!rb)
-        return;
     rb->remote_backlight_set_timeout(rb->global_settings->
                                      remote_backlight_timeout);
 #if CONFIG_CHARGING
@@ -79,8 +71,6 @@
 /*  Force the buttonlight on */
 void buttonlight_force_on(void)
 {
-    if (!rb)
-        return;
     if (rb->global_settings->buttonlight_timeout > 0)
         rb->buttonlight_set_timeout(0);
 }
@@ -88,8 +78,6 @@
 /*  Reset buttonlight operation to its settings */
 void buttonlight_use_settings(void)
 {
-    if (!rb)
-        return;
     rb->buttonlight_set_timeout(rb->global_settings->buttonlight_timeout);
 }
 #endif /* HAVE_BUTTON_LIGHT */
@@ -97,15 +85,11 @@
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
 void backlight_brightness_set(int brightness)
 {
-    if (!rb)
-        return;
     rb->backlight_set_brightness(brightness);
 }
 
 void backlight_brightness_use_setting(void)
 {
-    if (!rb)
-        return;
     rb->backlight_set_brightness(rb->global_settings->brightness);
 }
 #endif /* HAVE_BACKLIGHT_BRIGHTNESS */
Index: apps/plugins/dict.c
===================================================================
--- apps/plugins/dict.c	(revision 20954)
+++ apps/plugins/dict.c	(working copy)
@@ -147,8 +147,8 @@
 #endif
 
 /* data files */
-#define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index"
-#define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc"
+#define DICT_INDEX PLUGIN_APPS_DIR "/dict.index"
+#define DICT_DESC PLUGIN_APPS_DIR "/dict.desc"
 
 /* the main plugin function */
 enum plugin_status plugin_start(const void* parameter)
Index: apps/plugins/stopwatch.c
===================================================================
--- apps/plugins/stopwatch.c	(revision 20954)
+++ apps/plugins/stopwatch.c	(working copy)
@@ -32,7 +32,7 @@
 #define LAP_Y TIMER_Y+1
 #define MAX_LAPS 64
 
-#define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat"
+#define STOPWATCH_FILE PLUGIN_APPS_DIR "/stopwatch.dat"
 
 /* variable button definitions */
 #if CONFIG_KEYPAD == RECORDER_PAD
Index: apps/plugins/keybox.c
===================================================================
--- apps/plugins/keybox.c	(revision 20954)
+++ apps/plugins/keybox.c	(working copy)
@@ -22,7 +22,7 @@
 #include "lib/md5.h"
 PLUGIN_HEADER
 
-#define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat"
+#define KEYBOX_FILE PLUGIN_APPS_DIR "/keybox.dat"
 #define BLOCK_SIZE 8
 #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */
 #define FIELD_LEN 32 /* should be enough for anyone ;) */
Index: apps/plugins/pegbox.c
===================================================================
--- apps/plugins/pegbox.c	(revision 20954)
+++ apps/plugins/pegbox.c	(working copy)
@@ -39,8 +39,8 @@
 #define PB_USB  2
 #define PB_QUIT 1
 
-#define DATA_FILE   PLUGIN_DIR "/games/pegbox.data"
-#define SAVE_FILE   PLUGIN_DIR "/games/pegbox.save"
+#define DATA_FILE   PLUGIN_GAMES_DIR "/pegbox.data"
+#define SAVE_FILE   PLUGIN_GAMES_DIR "/pegbox.save"
 
 #define ROWS       8   /* Number of rows on each board */
 #define COLS       12  /* Number of columns on each board */