6 files changed, 26 insertions, 10 deletions

diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index c12c7c7d67..df1397d2e2 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -5,7 +5,7 @@
 bubbles_bubble.112x64x1.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
 bubbles_bubble.128x64x1.bmp
-#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
+#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)
 bubbles_bubble.132x80x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
 bubbles_bubble.128x96x1.bmp
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 8eaf623fda..7ea9e2918f 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -76,7 +76,7 @@ brickmania_long_pads.132x80x16.bmp
 brickmania_powerups.132x80x16.bmp
 brickmania_break.132x80x16.bmp
 
-#elif LCD_WIDTH >= 128
+#elif LCD_WIDTH >= 96
 brickmania_ball.4x4x16.bmp
 brickmania_bricks.128x128x16.bmp
 brickmania_pads.132x80x16.bmp
@@ -84,6 +84,7 @@ brickmania_short_pads.132x80x16.bmp
 brickmania_long_pads.132x80x16.bmp
 brickmania_powerups.132x80x16.bmp
 brickmania_break.132x80x16.bmp
+
 #endif /* different colour displays */
 
 #elif LCD_DEPTH > 1
@@ -148,7 +149,7 @@ bubbles_background.128x128x16.bmp
 #elif (LCD_WIDTH >= 132) && (LCD_HEIGHT >= 80)
 bubbles_emblem.132x80x16.bmp
 bubbles_background.132x80x16.bmp
-#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96)
+#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96)
 bubbles_emblem.132x80x16.bmp
 bubbles_background.128x96x16.bmp
 #endif
@@ -262,7 +263,7 @@ clock_segments.128x128x2.bmp
 clock_smallsegments.128x128x2.bmp
 clock_logo.128x128x2.bmp
 clock_messages.128x128x2.bmp
-#elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) && (LCD_DEPTH >= 1)
+#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 64) && (LCD_DEPTH >= 1)
 clock_binary.112x64x1.bmp
 clock_digits.112x64x1.bmp
 clock_smalldigits.112x64x1.bmp
@@ -505,7 +506,7 @@ rockblox_background.128x160x16.bmp
 rockblox_background.128x128x16.bmp
 #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
 rockblox_background.132x80x16.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
+#elif ((LCD_WIDTH == 128 && LCD_HEIGHT == 96) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96))
 rockblox_background.128x96x2.bmp
 #endif
 #elif LCD_DEPTH == 2 /* greyscale versions */
@@ -647,7 +648,7 @@ solitaire_suitsi.26x132x16.bmp
 card_back.18x23x16.bmp
 card_deck.234x92x16.bmp
 solitaire_suitsi.18x92x16.bmp
-#elif LCD_WIDTH >= 128
+#elif LCD_WIDTH >= 96
 card_back.15x20x16.bmp
 card_deck.195x80x16.bmp
 solitaire_suitsi.15x80x16.bmp
@@ -729,7 +730,7 @@ sudoku_inverse.128x128x2.bmp
 sudoku_start.138x110x2.bmp
 sudoku_normal.138x110x2.bmp
 sudoku_inverse.138x110x2.bmp
-#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) && (LCD_DEPTH >= 16)
+#elif ((LCD_WIDTH == 132 && LCD_HEIGHT == 80) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)) && (LCD_DEPTH >= 16)
 sudoku_start.132x80x16.bmp
 sudoku_normal.132x80x16.bmp
 sudoku_inverse.132x80x16.bmp
@@ -898,6 +899,8 @@ pitch_notes.128x128x2.bmp
 pitch_notes.128x96x2.bmp
 #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64)
 pitch_notes.128x64x1.bmp
+#elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96)
+pitch_notes.132x80x16.bmp
 #else
 #error Pitch Detector: unsupported LCD
 #endif
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 1c4bbca788..9f860d43ee 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -198,7 +198,7 @@ enum {
 #define MAX_FPS       30
 
 /* 7x7 bubbles (Sansa Clip/m200) */
-#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128)
+#elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96)
 #define XOFS          33
 #define ROW_HEIGHT     5
 #define MAX_FPS       30
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 7097704742..674b14ed83 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -630,6 +630,19 @@
 #define LEVEL_X 78
 #define LINES_Y 51
 
+#elif LCD_WIDTH == 96 && LCD_HEIGHT == 96
+
+#define BLOCK_WIDTH 3
+#define BLOCK_HEIGHT 3
+#define BOARD_X 9
+#define BOARD_Y 3
+#define PREVIEW_X 59
+#define PREVIEW_Y 5
+#define LABEL_X 59
+#define SCORE_Y 32
+#define LEVEL_Y 13
+#define LEVEL_X 78
+#define LINES_Y 51
 #endif
 
 #ifndef LEVEL_X
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index f0bff4d2a4..73c18708d2 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -99,7 +99,7 @@ static const char default_game[9][9] =
 
 #if LCD_HEIGHT <= LCD_WIDTH /* Horizontal layout, scratchpad at the left */
 
-#if (LCD_HEIGHT==64) && (LCD_WIDTH==112 || LCD_WIDTH==128)
+#if ((LCD_HEIGHT==64 && (LCD_WIDTH==112 || LCD_WIDTH==128)) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96))
 /* Archos Recorders and Ondios - 112x64, 9 cells @ 8x6 with 10 border lines */
 #define SMALL_BOARD
 #define MARK_OFFS   1   /* Pixels between border and mark */
diff --git a/tools/configure b/tools/configure
index 8a622af7e7..80c638013f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2541,7 +2541,7 @@ fi
     output="rockbox.sansa"
     bootoutput="bootloader-clipzip.sansa"
     appextra="recorder:gui:radio"
-    plugins=""
+    plugins="yes"
     swcodec="yes"
     toolset=$scramblebitmaptools
     t_cpu="arm"