6 files changed, 26 insertions, 1 deletions

diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 65b1a3828e..8eaf623fda 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -386,7 +386,8 @@ jewels.112x64x1.bmp
 jewels.128x128x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160)
 jewels.128x128x16.bmp
-#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
+#elif ((LCD_WIDTH == 132) && (LCD_HEIGHT == 80)) || \
+      ((LCD_WIDTH == 96) && (LCD_HEIGHT == 96))
 jewels.132x80x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
 jewels.128x96x2.bmp
@@ -453,6 +454,9 @@ pegbox_header.22x80x16.bmp
 #elif LCD_WIDTH >= 128
 pegbox_pieces.10x10x16.bmp
 pegbox_header.128x42x16.bmp
+#elif LCD_WIDTH >= 96
+pegbox_pieces.8x8x16.bmp
+pegbox_header.96x32x16.bmp
 #endif /* different colour displays */
 #elif LCD_DEPTH > 1
 #if LCD_WIDTH >= 160
@@ -692,6 +696,8 @@ star_tiles.11x11.bmp
 star_tiles.10x10.bmp
 #elif   (STAR_TILESIZE >= 8)
 star_tiles.8x8.bmp
+#elif   (STAR_TILESIZE >= 6)
+star_tiles.6x6.bmp
 #endif
 #elif LCD_DEPTH > 1 /* grey */
 #if LCD_WIDTH >= 160 && LCD_HEIGHT >= 98
diff --git a/apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp b/apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp
new file mode 100644
index 0000000000..d83494b679
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp
new file mode 100644
index 0000000000..ca80fb8a43
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp
diff --git a/apps/plugins/bitmaps/native/star_tiles.6x6.bmp b/apps/plugins/bitmaps/native/star_tiles.6x6.bmp
new file mode 100644
index 0000000000..da047d87fb
--- /dev/null
+++ b/apps/plugins/bitmaps/native/star_tiles.6x6.bmp
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 635335a91c..babe653e93 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -638,6 +638,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define LEVEL_TEXT_X   25
 #define PEGS_TEXT_X    90
 #define TEXT_Y         0
+#elif LCD_WIDTH >= 96
+#define LEVEL_TEXT_X   25
+#define PEGS_TEXT_X    86
+#define TEXT_Y         22
 #endif /* LCD_WIDTH */
 
 #endif /* WIDE_LAYOUT */
@@ -843,7 +847,11 @@ static void pegbox_draw_board(struct game_context* pb)
 
 #ifdef HAVE_LCD_COLOR
     rb->lcd_set_foreground(LCD_WHITE);
+#if ((BOARD_HEIGHT + HEADER_HEIGHT + 2) <= LCD_HEIGHT)
     rb->lcd_fillrect(BOARD_X-1,BOARD_Y-1,BOARD_WIDTH+2,BOARD_HEIGHT+2);
+#else
+    rb->lcd_fillrect(BOARD_X,BOARD_Y,BOARD_WIDTH,BOARD_HEIGHT);
+#endif
     rb->lcd_set_foreground(LCD_BLACK);
     rb->lcd_set_background(TEXT_BG);
 #endif
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index ac9f5dab5e..9ec289fce4 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -221,6 +221,17 @@
 #define ROCKPAINT_LEFT      BUTTON_LEFT
 #define ROCKPAINT_RIGHT     BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
+#define ROCKPAINT_QUIT      BUTTON_POWER
+#define ROCKPAINT_DRAW      BUTTON_SELECT
+#define ROCKPAINT_MENU      BUTTON_HOME
+#define ROCKPAINT_TOOLBAR   BUTTON_VOL_UP
+#define ROCKPAINT_TOOLBAR2  BUTTON_VOL_DOWN
+#define ROCKPAINT_UP        BUTTON_UP
+#define ROCKPAINT_DOWN      BUTTON_DOWN
+#define ROCKPAINT_LEFT      BUTTON_LEFT
+#define ROCKPAINT_RIGHT     BUTTON_RIGHT
+
 #else
 #error "Please define keys for this keypad"
 #endif