3 files changed, 12 insertions, 7 deletions

diff --git a/apps/plugins/sudoku/SOURCES b/apps/plugins/sudoku/SOURCES
index 8b344bdfeb..7cce555c93 100644
--- a/apps/plugins/sudoku/SOURCES
+++ b/apps/plugins/sudoku/SOURCES
@@ -1,5 +1,3 @@
-#if !defined(SANSA_E200)
 sudoku.c
 generator.c
 templates.c
-#endif
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index 9a3a147889..218a544f8c 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -129,8 +129,7 @@ static const char default_game[9][9] =
 #define CELL_WIDTH  12
 #define CELL_HEIGHT 12
 
-#elif ((LCD_HEIGHT==176) && (LCD_WIDTH==220)) || \
-      ((LCD_HEIGHT==220) && (LCD_WIDTH==176))
+#elif ((LCD_HEIGHT==176) && (LCD_WIDTH==220))
 /* Iriver h300, iPod Color/Photo - 220x176, 9 cells @ 16x16 with 14 border lines */
 
 /* Internal dimensions of a cell */
@@ -151,7 +150,14 @@ static const char default_game[9][9] =
 #else /* Vertical layout, scratchpad at the bottom */
 #define VERTICAL_LAYOUT
 
-#if (LCD_HEIGHT>=320) && (LCD_WIDTH>=240)
+#if ((LCD_HEIGHT==220) && (LCD_WIDTH==176))
+/* e200, 9 cells @ 16x16 with 14 border lines */
+
+/* Internal dimensions of a cell */
+#define CELL_WIDTH  16
+#define CELL_HEIGHT 16
+
+#elif (LCD_HEIGHT>=320) && (LCD_WIDTH>=240)
 /* Gigabeat - 240x320, 9 cells @ 24x24 with 14 border lines */
 
 /* Internal dimensions of a cell */
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 2628e3254f..04923be18e 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -116,8 +116,9 @@
 #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
 #define SUDOKU_BUTTON_LEFT BUTTON_LEFT
 #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
-#define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
-#define SUDOKU_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT)
+#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_UP
+#define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_DOWN
+#define SUDOKU_BUTTON_MENU BUTTON_SELECT
 #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC
 
 #elif