3 files changed, 10 insertions, 25 deletions

diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES
index c2ad75e0c7..4b267c162b 100644
--- a/apps/plugins/CATEGORIES
+++ b/apps/plugins/CATEGORIES
@@ -80,7 +80,6 @@ stopwatch,apps
 test_codec,viewers
 test_disk,apps
 test_fps,apps
-test_grey,apps
 test_sampr,apps
 test_scanrate,apps
 test_viewports,apps
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index fbfb38047d..b6603a44c0 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -19,7 +19,6 @@ stats.c
 stopwatch.c
 vbrfix.c
 viewer.c
-test_disk.c
 
 #ifdef OLYMPUS_MROBE_500
 /* remove these once the plugins before it are compileable */
@@ -48,9 +47,6 @@ flipit.c
 brickmania.c
 maze.c
 mazezam.c      
-greyscale.c
-test_fps.c
-test_scanrate.c
 text_editor.c
 wavview.c
 robotfindskitten.c
@@ -61,10 +57,6 @@ jpeg.c
 mandelbrot.c
 plasma.c
 
-#if LCD_DEPTH < 4
-test_grey.c
-#endif
-
 blackjack.c
 bounce.c
 bubbles.c
@@ -124,7 +116,6 @@ nim.c
 
 #if CONFIG_CODEC == SWCODEC        /* software codec platforms */
 mp3_encoder.c
-test_codec.c
 wav2wv.c
 #else                              /* hardware codec platforms */
 #ifndef HAVE_MMC                   /* not for Ondio, has no remote control pin */
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c
index aabc623d9f..63ab97d89d 100644
--- a/apps/plugins/test_scanrate.c
+++ b/apps/plugins/test_scanrate.c
@@ -56,29 +56,24 @@ PLUGIN_HEADER
 #endif
 
 /* Default refresh rates in 1/10 Hz */
-#if defined ARCHOS_RECORDER   || defined ARCHOS_FMRECORDER  \
- || defined ARCHOS_RECORDERV2 || defined ARCHOS_ONDIOFM     \
- || defined ARCHOS_ONDIOSP
+#if CONFIG_LCD == LCD_SSD1815
 #define DEFAULT_SCAN_RATE 670
-#elif defined IAUDIO_M3
-#define DEFAULT_SCAN_RATE 1500
+#elif CONFIG_LCD == LCD_S1D15E06
+#define DEFAULT_SCAN_RATE 700
+#elif CONFIG_LCD == LCD_IPOD2BPP
+#define DEFAULT_SCAN_RATE 800
+#elif CONFIG_LCD == LCD_IPODMINI
+#define DEFAULT_SCAN_RATE 880
+#elif CONFIG_LCD == LCD_TL0350A
+#define DEFAULT_SCAN_RATE 1480
 #define HORIZ_SCAN /* LCD controller updates the panel sideways */
 #define NEED_BOOST
-#elif defined IAUDIO_M5
-#define DEFAULT_SCAN_RATE 730
-#elif defined IPOD_1G2G
-#define DEFAULT_SCAN_RATE 960
-#elif defined IPOD_MINI2G  || defined IPOD_MINI  \
-   || defined IPOD_3G      || defined IPOD_4G
-#define DEFAULT_SCAN_RATE 870
-#elif defined IRIVER_H100_SERIES
-#define DEFAULT_SCAN_RATE 700
 #else
 #define DEFAULT_SCAN_RATE 700
 #warning Generic default scanrate
 #endif
 
-#ifdef HORIZ_SCAN
+#ifdef HORIZ_SCAN 
 #define TEXT_X 0
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
 #define BUF_WIDTH  ((LCD_WIDTH+7)/8)