fixed bug with not recognizing ".mode_loop: false" for music
[rocksndiamonds.git] / src / screens.c
index 265c9e2f45d1a7e0456031e680df77035eb7af5b..5e0740b6366566b53340f5d1971412ee717941bf 100644 (file)
 #include "init.h"
 #include "config.h"
 
+
+#define DEBUG_JOYSTICKS                0
+
+
 /* screens on the info screen */
 #define INFO_MODE_MAIN                 0
 #define INFO_MODE_TITLE                        1
 #define SETUP_MODE_CHOOSE_TOUCH_CONTROL        28
 #define SETUP_MODE_CHOOSE_MOVE_DISTANCE        29
 #define SETUP_MODE_CHOOSE_DROP_DISTANCE        30
+#define SETUP_MODE_CHOOSE_TRANSPARENCY 31
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 32
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 33
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 34
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 35
+#define SETUP_MODE_CONFIG_VIRT_BUTTONS 36
 
-#define MAX_SETUP_MODES                        31
+#define MAX_SETUP_MODES                        37
 
 #define MAX_MENU_MODES                 MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
 
+/* setup screen titles */
+#define STR_SETUP_MAIN                 "Setup"
+#define STR_SETUP_GAME                 "Game & Menu"
+#define STR_SETUP_EDITOR               "Editor"
+#define STR_SETUP_GRAPHICS             "Graphics"
+#define STR_SETUP_SOUND                        "Sound & Music"
+#define STR_SETUP_ARTWORK              "Custom Artwork"
+#define STR_SETUP_INPUT                        "Input Devices"
+#define STR_SETUP_TOUCH                        "Touch Controls"
+#define STR_SETUP_SHORTCUTS            "Key Shortcuts"
+#define STR_SETUP_EXIT                 "Exit"
+#define STR_SETUP_SAVE_AND_EXIT                "Save and Exit"
+
+#define STR_SETUP_CHOOSE_GAME_SPEED    "Game Speed"
+#define STR_SETUP_CHOOSE_SCROLL_DELAY  "Scroll Delay"
+#define STR_SETUP_CHOOSE_SNAPSHOT_MODE "Snapshot Mode"
+#define STR_SETUP_CHOOSE_WINDOW_SIZE   "Window Scaling"
+#define STR_SETUP_CHOOSE_SCALING_TYPE  "Anti-Aliasing"
+#define STR_SETUP_CHOOSE_RENDERING     "Rendering Mode"
+#define STR_SETUP_CHOOSE_VOLUME_SIMPLE "Sound Volume"
+#define STR_SETUP_CHOOSE_VOLUME_LOOPS  "Loops Volume"
+#define STR_SETUP_CHOOSE_VOLUME_MUSIC  "Music Volume"
+#define STR_SETUP_CHOOSE_TOUCH_CONTROL "Control Type"
+#define STR_SETUP_CHOOSE_MOVE_DISTANCE "Move Distance"
+#define STR_SETUP_CHOOSE_DROP_DISTANCE "Drop Distance"
+#define STR_SETUP_CHOOSE_TRANSPARENCY  "Transparency"
+#define STR_SETUP_CHOOSE_GRID_XSIZE_0  "Horiz. Buttons"
+#define STR_SETUP_CHOOSE_GRID_YSIZE_0  "Vert. Buttons"
+#define STR_SETUP_CHOOSE_GRID_XSIZE_1  "Horiz. Buttons"
+#define STR_SETUP_CHOOSE_GRID_YSIZE_1  "Vert. Buttons"
+
 /* for input setup functions */
 #define SETUPINPUT_SCREEN_POS_START    0
-#define SETUPINPUT_SCREEN_POS_END      (SCR_FIELDY - 4)
-#define SETUPINPUT_SCREEN_POS_EMPTY1   (SETUPINPUT_SCREEN_POS_START + 3)
-#define SETUPINPUT_SCREEN_POS_EMPTY2   (SETUPINPUT_SCREEN_POS_END - 1)
+#define SETUPINPUT_SCREEN_POS_EMPTY1   3
+#define SETUPINPUT_SCREEN_POS_EMPTY2   12
+#define SETUPINPUT_SCREEN_POS_END      13
+
+#define MENU_SETUP_FONT_TITLE          FONT_TEXT_1
+#define MENU_SETUP_FONT_TEXT           FONT_TITLE_2
 
 /* for various menu stuff  */
 #define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_MAX_XPOS           (SCR_FIELDX - 1)
 #define MENU_TITLE1_YPOS               8
 #define MENU_TITLE2_YPOS               46
-#define MENU_SCREEN_INFO_XSTART                16
-#define MENU_SCREEN_INFO_YSTART1       100
-#define MENU_SCREEN_INFO_YSTART2       128
+#define MENU_INFO_FONT_TITLE           FONT_TEXT_1
+#define MENU_INFO_FONT_HEAD            FONT_TEXT_2
+#define MENU_INFO_FONT_TEXT            FONT_TEXT_3
+#define MENU_INFO_FONT_FOOT            FONT_TEXT_4
+#define MENU_INFO_SPACE_HEAD           (menu.headline2_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_LEFT    (menu.left_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_RIGHT   (menu.right_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_TOP     (menu.top_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_BOTTOM  (menu.bottom_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_YSTART1       MENU_SCREEN_INFO_SPACE_TOP
+#define MENU_SCREEN_INFO_YSTART2       (MENU_SCREEN_INFO_YSTART1 +            \
+                                        getMenuTextStep(MENU_INFO_SPACE_HEAD, \
+                                                        MENU_INFO_FONT_TITLE))
 #define MENU_SCREEN_INFO_YSTEP         (TILEY + 4)
-#define MENU_SCREEN_INFO_YBOTTOM       (SYSIZE - 20)
+#define MENU_SCREEN_INFO_YBOTTOM       (SYSIZE - MENU_SCREEN_INFO_SPACE_BOTTOM)
 #define MENU_SCREEN_INFO_YSIZE         (MENU_SCREEN_INFO_YBOTTOM -     \
                                         MENU_SCREEN_INFO_YSTART2 -     \
                                         TILEY / 2)
 #define SCREEN_CTRL_ID_NEXT_LEVEL      1
 #define SCREEN_CTRL_ID_PREV_PLAYER     2
 #define SCREEN_CTRL_ID_NEXT_PLAYER     3
-#define SCREEN_CTRL_ID_SCROLL_UP       4
-#define SCREEN_CTRL_ID_SCROLL_DOWN     5
-#define SCREEN_CTRL_ID_SCROLL_VERTICAL 6
+#define SCREEN_CTRL_ID_INSERT_SOLUTION 4
+#define SCREEN_CTRL_ID_PLAY_SOLUTION   5
+#define SCREEN_CTRL_ID_SCROLL_UP       6
+#define SCREEN_CTRL_ID_SCROLL_DOWN     7
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 8
 
-#define NUM_SCREEN_GADGETS             7
+#define NUM_SCREEN_GADGETS             9
 
-#define NUM_SCREEN_MENUBUTTONS         4
+#define NUM_SCREEN_MENUBUTTONS         6
 #define NUM_SCREEN_SCROLLBUTTONS       2
 #define NUM_SCREEN_SCROLLBARS          1
 
 #define SCREEN_MASK_MAIN               (1 << 0)
-#define SCREEN_MASK_INPUT              (1 << 1)
+#define SCREEN_MASK_MAIN_HAS_SOLUTION  (1 << 1)
+#define SCREEN_MASK_INPUT              (1 << 2)
 
 /* graphic position and size values for buttons and scrollbars */
 #define SC_MENUBUTTON_XSIZE            TILEX
@@ -164,6 +221,7 @@ static void HandleSetupScreen_Generic(int, int, int, int, int);
 static void HandleSetupScreen_Input(int, int, int, int, int);
 static void CustomizeKeyboard(int);
 static void ConfigureJoystick(int);
+static void ConfigureVirtualButtons();
 static void execSetupGame(void);
 static void execSetupGraphics(void);
 static void execSetupSound(void);
@@ -191,6 +249,8 @@ static void MapScreenMenuGadgets(int);
 static void MapScreenGadgets(int);
 static void MapScreenTreeGadgets(TreeInfo *);
 
+static void UpdateScreenMenuGadgets(int, boolean);
+
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
 static int info_mode = INFO_MODE_MAIN;
@@ -232,6 +292,12 @@ static TreeInfo *move_distance_current = NULL;
 static TreeInfo *drop_distances = NULL;
 static TreeInfo *drop_distance_current = NULL;
 
+static TreeInfo *transparencies = NULL;
+static TreeInfo *transparency_current = NULL;
+
+static TreeInfo *grid_sizes[2][2] = { { NULL, NULL }, { NULL, NULL } };
+static TreeInfo *grid_size_current[2][2] = { { NULL, NULL }, { NULL, NULL } };
+
 static TreeInfo *level_number = NULL;
 static TreeInfo *level_number_current = NULL;
 
@@ -263,7 +329,7 @@ static struct
   char *text;
 } scaling_types_list[] =
 {
-  {    SCALING_QUALITY_NEAREST, "None"         },
+  {    SCALING_QUALITY_NEAREST, "Off"          },
   {    SCALING_QUALITY_LINEAR,  "Linear"       },
   {    SCALING_QUALITY_BEST,    "Anisotropic"  },
 
@@ -381,6 +447,7 @@ static struct
   char *text;
 } touch_controls_list[] =
 {
+  {    TOUCH_CONTROL_OFF,              "Off"                   },
   {    TOUCH_CONTROL_VIRTUAL_BUTTONS,  "Virtual Buttons"       },
   {    TOUCH_CONTROL_WIPE_GESTURES,    "Wipe Gestures"         },
   {    TOUCH_CONTROL_FOLLOW_FINGER,    "Follow Finger"         },
@@ -407,13 +474,74 @@ static struct
   {    -1,     NULL                            },
 };
 
+static struct
+{
+  int value;
+  char *text;
+} transparencies_list[] =
+{
+  {    0,      "0 % (Opaque)"                  },
+  {    10,     "10 %"                          },
+  {    20,     "20 %"                          },
+  {    30,     "30 %"                          },
+  {    40,     "40 %"                          },
+  {    50,     "50 %"                          },
+  {    60,     "60 %"                          },
+  {    70,     "70 %"                          },
+  {    80,     "80 %"                          },
+  {    90,     "90 %"                          },
+  {    100,    "100 % (Invisible)"             },
+
+  {    -1,     NULL                            },
+};
+
+static struct
+{
+  int value;
+  char *text;
+} grid_sizes_list[] =
+{
+  {    3,      "3"                             },
+  {    4,      "4"                             },
+  {    5,      "5"                             },
+  {    6,      "6"                             },
+  {    7,      "7"                             },
+  {    8,      "8"                             },
+  {    9,      "9"                             },
+  {    10,     "10"                            },
+  {    11,     "11"                            },
+  {    12,     "12"                            },
+  {    13,     "13"                            },
+  {    14,     "14"                            },
+  {    15,     "15"                            },
+  {    16,     "16"                            },
+  {    17,     "17"                            },
+  {    18,     "18"                            },
+  {    19,     "19"                            },
+  {    20,     "20"                            },
+  {    21,     "21"                            },
+  {    22,     "22"                            },
+  {    23,     "23"                            },
+  {    24,     "24"                            },
+  {    25,     "25"                            },
+  {    26,     "26"                            },
+  {    27,     "27"                            },
+  {    28,     "28"                            },
+  {    29,     "29"                            },
+  {    30,     "30"                            },
+  {    31,     "31"                            },
+  {    32,     "32"                            },
+
+  {    -1,     NULL                            },
+};
+
 #define DRAW_MODE(s)           ((s) >= GAME_MODE_MAIN &&               \
                                 (s) <= GAME_MODE_SETUP ? (s) :         \
                                 (s) == GAME_MODE_PSEUDO_TYPENAME ?     \
                                 GAME_MODE_MAIN : GAME_MODE_DEFAULT)
 
 /* (there are no draw offset definitions needed for INFO_MODE_TITLE) */
-#define DRAW_MODE_INFO(i)      ((i) >= INFO_MODE_ELEMENTS &&           \
+#define DRAW_MODE_INFO(i)      ((i) >= INFO_MODE_TITLE &&              \
                                 (i) <= INFO_MODE_LEVELSET ? (i) :      \
                                 INFO_MODE_MAIN)
 
@@ -430,6 +558,9 @@ static struct
 #define DRAW_YOFFSET_INFO(i)   (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ?  \
                                 menu.draw_yoffset[GAME_MODE_INFO] :    \
                                 menu.draw_yoffset_info[DRAW_MODE_INFO(i)])
+#define EXTRA_SPACING_INFO(i)  (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \
+                                menu.extra_spacing[GAME_MODE_INFO] :   \
+                                menu.extra_spacing_info[DRAW_MODE_INFO(i)])
 
 #define DRAW_XOFFSET_SETUP(i)  (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
                                 menu.draw_xoffset[GAME_MODE_SETUP] :   \
@@ -437,6 +568,9 @@ static struct
 #define DRAW_YOFFSET_SETUP(i)  (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
                                 menu.draw_yoffset[GAME_MODE_SETUP] :   \
                                 menu.draw_yoffset_setup[DRAW_MODE_SETUP(i)])
+#define EXTRA_SPACING_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
+                                menu.extra_spacing[GAME_MODE_SETUP] :  \
+                                menu.extra_spacing_setup[DRAW_MODE_SETUP(i)])
 
 #define DRAW_XOFFSET(s)                ((s) == GAME_MODE_INFO ?                \
                                 DRAW_XOFFSET_INFO(info_mode) :         \
@@ -448,6 +582,11 @@ static struct
                                 (s) == GAME_MODE_SETUP ?               \
                                 DRAW_YOFFSET_SETUP(setup_mode) :       \
                                 menu.draw_yoffset[DRAW_MODE(s)])
+#define EXTRA_SPACING(s)       ((s) == GAME_MODE_INFO ?                \
+                                EXTRA_SPACING_INFO(info_mode) :        \
+                                (s) == GAME_MODE_SETUP ?               \
+                                EXTRA_SPACING_SETUP(setup_mode) :      \
+                                menu.extra_spacing[DRAW_MODE(s)])
 
 #define mSX                    (SX + DRAW_XOFFSET(game_status))
 #define mSY                    (SY + DRAW_YOFFSET(game_status))
@@ -530,6 +669,9 @@ static char *main_text_level_year           = NULL;
 static char *main_text_level_imported_from     = NULL;
 static char *main_text_level_imported_by       = NULL;
 static char *main_text_level_tested_by         = NULL;
+static char *main_text_title_1                 = NULL;
+static char *main_text_title_2                 = NULL;
+static char *main_text_title_3                 = NULL;
 
 struct MainControlInfo
 {
@@ -612,19 +754,19 @@ static struct MainControlInfo main_controls[] =
 #endif
   {
     MAIN_CONTROL_FIRST_LEVEL,
-    NULL,                              -1,
+    &menu.main.button.first_level,     IMG_MENU_BUTTON_FIRST_LEVEL,
     &menu.main.text.first_level,       &main_text_first_level,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_LAST_LEVEL,
-    NULL,                              -1,
+    &menu.main.button.last_level,      IMG_MENU_BUTTON_LAST_LEVEL,
     &menu.main.text.last_level,                &main_text_last_level,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_LEVEL_NUMBER,
-    NULL,                              -1,
+    &menu.main.button.level_number,    IMG_MENU_BUTTON_LEVEL_NUMBER,
     &menu.main.text.level_number,      &main_text_level_number,
     NULL,                              NULL,
   },
@@ -679,19 +821,19 @@ static struct MainControlInfo main_controls[] =
   {
     MAIN_CONTROL_TITLE_1,
     NULL,                              -1,
-    &menu.main.text.title_1,           &setup.internal.program_title,
+    &menu.main.text.title_1,           &main_text_title_1,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_TITLE_2,
     NULL,                              -1,
-    &menu.main.text.title_2,           &setup.internal.program_copyright,
+    &menu.main.text.title_2,           &main_text_title_2,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_TITLE_3,
     NULL,                              -1,
-    &menu.main.text.title_3,           &setup.internal.program_company,
+    &menu.main.text.title_3,           &main_text_title_3,
     NULL,                              NULL,
   },
 
@@ -945,7 +1087,7 @@ static boolean visibleTextPos(struct TextPosInfo *pos)
 
 static void InitializeMainControls()
 {
-  boolean local_team_mode = (!options.network && setup.team_mode);
+  boolean local_team_mode = (!network.enabled && setup.team_mode);
   int i;
 
   /* set main control text values to dynamically determined values */
@@ -963,6 +1105,10 @@ static void InitializeMainControls()
   main_text_level_imported_by  = leveldir_current->imported_by;
   main_text_level_tested_by    = leveldir_current->tested_by;
 
+  main_text_title_1 = getConfigProgramTitleString();
+  main_text_title_2 = getConfigProgramCopyrightString();
+  main_text_title_3 = getConfigProgramCompanyString();
+
   /* set main control screen positions to dynamically determined values */
   for (i = 0; main_controls[i].nr != -1; i++)
   {
@@ -1007,8 +1153,8 @@ static void InitializeMainControls()
 
     if (pos_text != NULL)              /* (x/y may be -1/-1 here) */
     {
-      /* calculate size for non-clickable text -- needed for text alignment */
-      boolean calculate_text_size = (pos_button == NULL && text != NULL);
+      /* calculate text size -- needed for text alignment */
+      boolean calculate_text_size = (text != NULL);
 
       if (pos_text->width == -1 || calculate_text_size)
        pos_text->width = text_width;
@@ -1271,9 +1417,8 @@ static void drawChooseTreeCursor(int ypos, boolean active)
 
 void DrawHeadline()
 {
-  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, getProgramTitleString());
-  DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2,
-                   setup.internal.program_copyright);
+  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1);
+  DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, main_text_title_2);
 }
 
 void DrawTitleScreenImage(int nr, boolean initial)
@@ -1461,7 +1606,7 @@ void DrawMainMenu()
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
@@ -1478,6 +1623,8 @@ void DrawMainMenu()
   LoadLevel(level_nr);
   LoadScore(level_nr);
 
+  SaveLevelSetup_SeriesInfo();
+
   // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
   SetDrawDeactivationMask(REDRAW_NONE);
   SetDrawBackgroundMask(REDRAW_FIELD);
@@ -1495,6 +1642,7 @@ void DrawMainMenu()
 
   DrawCursorAndText_Main(-1, FALSE, FALSE);
   DrawPreviewLevelInitial();
+  DrawNetworkPlayers();
 
   HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
 
@@ -1509,9 +1657,14 @@ void DrawMainMenu()
   FreeScreenGadgets();
   CreateScreenGadgets();
 
+  /* may be required if audio buttons shown on tape and changed in setup menu */
+  FreeGameButtons();
+  CreateGameButtons();
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
+  UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape());
 
   /* copy actual game door content to door double buffer for OpenDoor() */
   BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
@@ -1781,6 +1934,10 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr)
     LoadTape(level_nr);
     DrawCompleteVideoDisplay();
 
+    SaveLevelSetup_SeriesInfo();
+
+    UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape());
+
     /* needed because DrawPreviewLevelInitial() takes some time */
     BackToFront();
     /* SyncDisplay(); */
@@ -1917,7 +2074,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
        SetGameStatus(GAME_MODE_SCORES);
 
-       DrawHallOfFame(-1);
+       DrawHallOfFame(level_nr, -1);
       }
       else if (pos == MAIN_CONTROL_EDITOR)
       {
@@ -1945,7 +2102,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (pos == MAIN_CONTROL_GAME)
       {
-       StartGameActions(options.network, setup.autorecord, level.random_seed);
+       StartGameActions(network.enabled, setup.autorecord, level.random_seed);
       }
       else if (pos == MAIN_CONTROL_SETUP)
       {
@@ -2057,6 +2214,7 @@ static int getMenuTextFont(int type)
              TYPE_YES_NO       |
              TYPE_YES_NO_AUTO  |
              TYPE_STRING       |
+             TYPE_PLAYER       |
              TYPE_ECS_AGA      |
              TYPE_KEYTEXT      |
              TYPE_ENTER_LIST))
@@ -2080,7 +2238,7 @@ static void DrawCursorAndText_Menu_Ext(struct TokenInfo *token_info,
   int ypos = MENU_SCREEN_START_YPOS + screen_pos;
   int font_nr = getMenuTextFont(ti->type);
 
-  if (token_info == setup_info_input)
+  if (setup_mode == SETUP_MODE_INPUT)
     font_nr = FONT_MENU_1;
 
   if (active)
@@ -2157,7 +2315,7 @@ static void DrawInfoScreen_Main()
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -2388,7 +2546,8 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
 
       if (menu_info[choice].type & menu_navigation_type ||
          menu_info[choice].type & TYPE_BOOLEAN_STYLE ||
-         menu_info[choice].type & TYPE_YES_NO_AUTO)
+         menu_info[choice].type & TYPE_YES_NO_AUTO ||
+         menu_info[choice].type & TYPE_PLAYER)
        button = MB_MENU_CHOICE;
     }
     else if (dy)
@@ -2512,11 +2671,35 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
                   info_mode, num_info_info, max_info_info);
 }
 
+static int getMenuFontSpacing(int spacing_height, int font_nr)
+{
+  int font_spacing = getFontHeight(font_nr) + EXTRA_SPACING(game_status);
+
+  return (spacing_height < 0 ? ABS(spacing_height) * font_spacing :
+         spacing_height);
+}
+
+static int getMenuTextSpacing(int spacing_height, int font_nr)
+{
+  return (getMenuFontSpacing(spacing_height, font_nr) +
+         EXTRA_SPACING(game_status));
+}
+
+static int getMenuTextStep(int spacing_height, int font_nr)
+{
+  return getFontHeight(font_nr) + getMenuTextSpacing(spacing_height, font_nr);
+}
+
 void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 {
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
-  int ybottom = mSY - SY + SYSIZE - 20;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_error = FONT_TEXT_2;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ystart2 = ystart1 + ystep_title;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
 
@@ -2525,10 +2708,10 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, text_title);
-  DrawTextSCentered(ystart2, FONT_TEXT_2, text_error);
+  DrawTextSCentered(ystart1, font_title, text_title);
+  DrawTextSCentered(ystart2, font_error, text_error);
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for info menu");
 
   FadeIn(REDRAW_FIELD);
@@ -2538,7 +2721,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 {
   static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN];
   static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN];
-  int xstart = mSX + MENU_SCREEN_INFO_XSTART;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int xstart  = mSX + MENU_SCREEN_INFO_SPACE_LEFT;
   int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
   int ystart2 = mSY + MENU_SCREEN_INFO_YSTART2;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
@@ -2557,9 +2742,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
     ClearField();
     DrawHeadline();
 
-    DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Elements:");
+    DrawTextSCentered(ystart1, font_title, "The Game Elements:");
 
-    DrawTextSCentered(ybottom, FONT_TEXT_4,
+    DrawTextSCentered(ybottom, font_foot,
                      "Press any key or button for next page");
 
     FrameCounter = 0;
@@ -2666,11 +2851,14 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
 {
   int font_nr = FONT_INFO_ELEMENTS;
   int font_width = getFontWidth(font_nr);
-  int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX;
-  int sy = mSY + 65 + 2 * 32 + 1;
+  int font_height = getFontHeight(font_nr);
+  int yoffset = (TILEX - 2 * font_height) / 2;
+  int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT + TILEX + MINI_TILEX;
+  int ystart = mSY + MENU_SCREEN_INFO_YSTART2 + yoffset;
   int ystep = TILEY + 4;
-  int pad_x = sx - SX;
-  int max_chars_per_line = (SXSIZE - pad_x - MINI_TILEX) / font_width;
+  int pad_left = xstart - SX;
+  int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
+  int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
   int max_lines_per_text = 2;    
   char *text = NULL;
 
@@ -2690,9 +2878,9 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
     text = "No description available";
 
   if (strlen(text) <= max_chars_per_line)      /* only one line of text */
-    sy += getFontHeight(font_nr) / 2;
+    ystart += getFontHeight(font_nr) / 2;
 
-  DrawTextBuffer(sx, sy + ypos * ystep, text, font_nr,
+  DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr,
                 max_chars_per_line, -1, max_lines_per_text, 0, -1,
                 TRUE, FALSE, FALSE);
 }
@@ -2821,10 +3009,16 @@ void DrawInfoScreen_Music()
 void HandleInfoScreen_Music(int button)
 {
   static struct MusicFileInfo *list = NULL;
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
-  int ybottom = mSY - SY + SYSIZE - 20;
-  int dy = 30;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -2837,10 +3031,10 @@ void HandleInfoScreen_Music(int button)
       ClearField();
       DrawHeadline();
 
-      DrawTextSCentered(ystart1, FONT_TEXT_1,
+      DrawTextSCentered(ystart, font_title,
                        "No music info for this level set.");
 
-      DrawTextSCentered(ybottom, FONT_TEXT_4,
+      DrawTextSCentered(ybottom, font_foot,
                        "Press any key or button for info menu");
 
       return;
@@ -2860,8 +3054,6 @@ void HandleInfoScreen_Music(int button)
   }
   else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
   {
-    int y = 0;
-
     if (button != MB_MENU_INITIALIZE)
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
@@ -2900,51 +3092,71 @@ void HandleInfoScreen_Music(int button)
       else
        PlaySound(sound);
 
-      DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Background Sounds:");
+      DrawTextSCentered(ystart, font_title, "The Game Background Sounds:");
     }
     else
     {
-      PlayMusic(list->music);
+      int music = list->music;
 
-      DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Background Music:");
+      if (music_info[music].loop)
+       PlayMusicLoop(music);
+      else
+       PlayMusic(music);
+
+      DrawTextSCentered(ystart, font_title, "The Game Background Music:");
     }
 
+    ystart += ystep_title;
+
     if (!strEqual(list->title, UNKNOWN_NAME))
     {
       if (!strEqual(list->title_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->title_header);
+      {
+       DrawTextSCentered(ystart, font_head, list->title_header);
+       ystart += ystep_head;
+      }
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "\"%s\"", list->title);
+      DrawTextFCentered(ystart, font_text, "\"%s\"", list->title);
+      ystart += ystep_head;
     }
 
     if (!strEqual(list->artist, UNKNOWN_NAME))
     {
       if (!strEqual(list->artist_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->artist_header);
+       DrawTextSCentered(ystart, font_head, list->artist_header);
       else
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "by");
+       DrawTextSCentered(ystart, font_head, "by");
+
+      ystart += ystep_head;
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->artist);
+      DrawTextFCentered(ystart, font_text, "%s", list->artist);
+      ystart += ystep_head;
     }
 
     if (!strEqual(list->album, UNKNOWN_NAME))
     {
       if (!strEqual(list->album_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->album_header);
+       DrawTextSCentered(ystart, font_head, list->album_header);
       else
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the album");
+       DrawTextSCentered(ystart, font_head, "from the album");
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "\"%s\"", list->album);
+      ystart += ystep_head;
+
+      DrawTextFCentered(ystart, font_text, "\"%s\"", list->album);
+      ystart += ystep_head;
     }
 
     if (!strEqual(list->year, UNKNOWN_NAME))
     {
       if (!strEqual(list->year_header, UNKNOWN_NAME))
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->year_header);
+       DrawTextSCentered(ystart, font_head, list->year_header);
       else
-       DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the year");
+       DrawTextSCentered(ystart, font_head, "from the year");
+
+      ystart += ystep_head;
 
-      DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year);
+      DrawTextFCentered(ystart, font_text, "%s", list->year);
+      ystart += ystep_head;
     }
 
     DrawTextSCentered(ybottom, FONT_TEXT_4,
@@ -2960,174 +3172,232 @@ void HandleInfoScreen_Music(int button)
 
 static void DrawInfoScreen_CreditsScreen(int screen_nr)
 {
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
-  int ybottom = mSY - SY + SYSIZE - 20;
-  int ystep = 30;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int spacing_para  = menu.paragraph_spacing_info[info_mode];
+  int spacing_line  = menu.line_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, "Credits:");
+  DrawTextSCentered(ystart, font_title, "Credits:");
+  ystart += ystep_title;
 
   if (screen_nr == 0)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Peter Liepa");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Boulder Dash\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1984");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "First Star Software");
   }
   else if (screen_nr == 1)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Klaus Heinz & Volker Wertich");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Emerald Mine\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1987");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Kingsoft");
   }
   else if (screen_nr == 2)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Michael Stopp & Philip Jespersen");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Supaplex\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1991");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Digital Integration");
   }
   else if (screen_nr == 3)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Hiroyuki Imabayashi");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for creating");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "\"Sokoban\"");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "in the year");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "1982");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "published by");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Thinking Rabbit");
   }
   else if (screen_nr == 4)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Special thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Alan Bond");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "and");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "J\xfcrgen Bonhagen");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for the continuous creation");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_head,
                      "of outstanding level sets");
   }
   else if (screen_nr == 5)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Peter Elzner");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for ideas and inspiration by");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Diamond Caves");
+    ystart += ystep_para;
 
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Steffest");
-    DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for ideas and inspiration by");
-    DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "DX-Boulderdash");
   }
   else if (screen_nr == 6)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "David Tritscher");
-#if 1
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for the code base used for the");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_head,
                      "native Emerald Mine engine");
-#else
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
-                     "for the new Emerald Mine engine");
-#endif
   }
   else if (screen_nr == 7)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Guido Schulz");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for the initial DOS port");
+    ystart += ystep_para;
 
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "Thanks to");
-    DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "Karl H\xf6rnell");
-    DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "for some additional toons");
   }
   else if (screen_nr == 8)
   {
-    DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+    DrawTextSCentered(ystart, font_head,
                      "And not to forget:");
-    DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_head,
                      "Many thanks to");
-    DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3,
+    ystart += ystep_head;
+    DrawTextSCentered(ystart, font_text,
                      "All those who contributed");
-    DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_text,
                      "levels to this game");
-    DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_3,
+    ystart += ystep_line;
+    DrawTextSCentered(ystart, font_text,
                      "since 1995");
   }
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for next page");
 }
 
@@ -3203,10 +3473,20 @@ void HandleInfoScreen_Credits(int button)
 
 void DrawInfoScreen_Program()
 {
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
-  int ybottom = mSY - SY + SYSIZE - 20;
-  int ystep = 30;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int spacing_para  = menu.paragraph_spacing_info[info_mode];
+  int spacing_line  = menu.line_spacing_info[info_mode];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
 
@@ -3215,26 +3495,36 @@ void DrawInfoScreen_Program()
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, "Program Information:");
+  DrawTextSCentered(ystart, font_title, "Program Information:");
+  ystart += ystep_title;
 
-  DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2,
+  DrawTextSCentered(ystart, font_head,
                    "This game is Freeware!");
-  DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_head,
                    "If you like it, send e-mail to:");
-  DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_text,
                    setup.internal.program_email);
-  DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2,
+  ystart += ystep_para;
+
+  DrawTextSCentered(ystart, font_head,
                    "More information and levels:");
-  DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_text,
                    setup.internal.program_website);
-  DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2,
+  ystart += ystep_para;
+
+  DrawTextSCentered(ystart, font_head,
                    "If you have created new levels,");
-  DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_2,
+  ystart += ystep_line;
+  DrawTextSCentered(ystart, font_head,
                    "send them to me to include them!");
-  DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2,
+  ystart += ystep_head;
+  DrawTextSCentered(ystart, font_head,
                    ":-)");
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for info menu");
 
   FadeIn(REDRAW_FIELD);
@@ -3268,13 +3558,21 @@ void HandleInfoScreen_Program(int button)
 
 void DrawInfoScreen_Version()
 {
-  int font_header = FONT_TEXT_3;
-  int font_text = FONT_TEXT_2;
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing_info[info_mode];
+  int spacing_head  = menu.headline2_spacing_info[info_mode];
+  int spacing_para  = menu.paragraph_spacing_info[info_mode];
+  int spacing_line  = menu.line_spacing_info[info_mode];
   int xstep = getFontWidth(font_text);
-  int ystep = getFontHeight(font_text);
-  int ystart1 = mSY - SY + 100;
-  int ystart2 = mSY - SY + 150;
-  int ybottom = mSY - SY + SYSIZE - 20;
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
   int xstart1 = mSX - SX + 2 * xstep;
   int xstart2 = mSX - SX + 18 * xstep;
   int xstart3 = mSX - SX + 28 * xstep;
@@ -3295,31 +3593,46 @@ void DrawInfoScreen_Version()
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, "Version Information:");
+  DrawTextSCentered(ystart, font_title, "Version Information:");
+  ystart += ystep_title;
 
-  DrawTextF(xstart1, ystart2, font_header, "Name");
-  DrawTextF(xstart2, ystart2, font_text, getProgramTitleString());
+  DrawTextF(xstart1, ystart, font_head, "Name");
+  DrawTextF(xstart2, ystart, font_text, getProgramTitleString());
+  ystart += ystep_line;
+
+  if (!strEqual(getProgramVersionString(), getProgramRealVersionString()))
+  {
+    DrawTextF(xstart1, ystart, font_head, "Version (fake)");
+    DrawTextF(xstart2, ystart, font_text, getProgramVersionString());
+    ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Version");
-  DrawTextF(xstart2, ystart2, font_text, getProgramVersionString());
+    DrawTextF(xstart1, ystart, font_head, "Version (real)");
+    DrawTextF(xstart2, ystart, font_text, getProgramRealVersionString());
+    ystart += ystep_line;
+  }
+  else
+  {
+    DrawTextF(xstart1, ystart, font_head, "Version");
+    DrawTextF(xstart2, ystart, font_text, getProgramVersionString());
+    ystart += ystep_line;
+  }
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Platform");
-  DrawTextF(xstart2, ystart2, font_text, PLATFORM_STRING);
+  DrawTextF(xstart1, ystart, font_head, "Platform");
+  DrawTextF(xstart2, ystart, font_text, PLATFORM_STRING);
+  ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Target");
-  DrawTextF(xstart2, ystart2, font_text, TARGET_STRING);
+  DrawTextF(xstart1, ystart, font_head, "Target");
+  DrawTextF(xstart2, ystart, font_text, TARGET_STRING);
+  ystart += ystep_line;
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Source date");
-  DrawTextF(xstart2, ystart2, font_text, getSourceDateString());
+  DrawTextF(xstart1, ystart, font_head, "Source date");
+  DrawTextF(xstart2, ystart, font_text, getSourceDateString());
+  ystart += ystep_para;
 
-  ystart2 += 3 * ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Library");
-  DrawTextF(xstart2, ystart2, font_header, "compiled");
-  DrawTextF(xstart3, ystart2, font_header, "linked");
+  DrawTextF(xstart1, ystart, font_head, "Library");
+  DrawTextF(xstart2, ystart, font_head, "compiled");
+  DrawTextF(xstart3, ystart, font_head, "linked");
+  ystart += ystep_head;
 
   SDL_VERSION(&sdl_version_compiled);
 #if defined(TARGET_SDL2)
@@ -3329,63 +3642,63 @@ void DrawInfoScreen_Version()
   sdl_version_linked = SDL_Linked_Version();
 #endif
 
-  ystart2 += 2 * ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_line;
 
   SDL_IMAGE_VERSION(&sdl_version_compiled);
   sdl_version_linked = IMG_Linked_Version();
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_image");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL_image");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_line;
 
   SDL_MIXER_VERSION(&sdl_version_compiled);
   sdl_version_linked = Mix_Linked_Version();
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_mixer");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL_mixer");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_line;
 
   SDL_NET_VERSION(&sdl_version_compiled);
   sdl_version_linked = SDLNet_Linked_Version();
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_net");
-  DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart1, ystart, font_text, "SDL_net");
+  DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
            sdl_version_compiled.major,
            sdl_version_compiled.minor,
            sdl_version_compiled.patch);
-  DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d",
+  DrawTextF(xstart3, ystart, font_text, "%d.%d.%d",
            sdl_version_linked->major,
            sdl_version_linked->minor,
            sdl_version_linked->patch);
+  ystart += ystep_para;
 
-  ystart2 += 3 * ystep;
-  DrawTextF(xstart1, ystart2, font_header, "Driver");
-  DrawTextF(xstart2, ystart2, font_header, "Requested");
-  DrawTextF(xstart3, ystart2, font_header, "Used");
+  DrawTextF(xstart1, ystart, font_head, "Driver");
+  DrawTextF(xstart2, ystart, font_head, "Requested");
+  DrawTextF(xstart3, ystart, font_head, "Used");
+  ystart += ystep_head;
 
 #if defined(TARGET_SDL2)
   driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len);
@@ -3393,10 +3706,10 @@ void DrawInfoScreen_Version()
   SDL_VideoDriverName(driver_name, driver_name_len);
 #endif
 
-  ystart2 += 2 * ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_VideoDriver");
-  DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_videodriver);
-  DrawTextF(xstart3, ystart2, font_text, "%s", driver_name);
+  DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver");
+  DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_videodriver);
+  DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
+  ystart += ystep_line;
 
 #if defined(TARGET_SDL2)
   driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len);
@@ -3404,12 +3717,11 @@ void DrawInfoScreen_Version()
   SDL_AudioDriverName(driver_name, driver_name_len);
 #endif
 
-  ystart2 += ystep;
-  DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver");
-  DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_audiodriver);
-  DrawTextF(xstart3, ystart2, font_text, "%s", driver_name);
+  DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver");
+  DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver);
+  DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
+  DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for info menu");
 
   FadeIn(REDRAW_FIELD);
@@ -3446,8 +3758,8 @@ void DrawInfoScreen_LevelSet()
   struct TitleMessageInfo *tmi = &readme;
   char *filename = getLevelSetInfoFilename();
   char *title = "Level Set Information:";
-  int ystart1 = mSY - SY + 100;
-  int ybottom = mSY - SY + SYSIZE - 20;
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   if (filename == NULL)
   {
@@ -3463,7 +3775,7 @@ void DrawInfoScreen_LevelSet()
   ClearField();
   DrawHeadline();
 
-  DrawTextSCentered(ystart1, FONT_TEXT_1, title);
+  DrawTextSCentered(ystart, FONT_TEXT_1, title);
 
   /* if x position set to "-1", automatically determine by playfield width */
   if (tmi->x == -1)
@@ -3479,7 +3791,7 @@ void DrawInfoScreen_LevelSet()
 
   /* if height set to "-1", automatically determine by playfield height */
   if (tmi->height == -1)
-    tmi->height = SYSIZE - 20 - tmi->y - 10;
+    tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10;
 
   /* if chars set to "-1", automatically determine by text and font width */
   if (tmi->chars == -1)
@@ -3662,7 +3974,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   int fade_mask = REDRAW_FIELD;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
@@ -3862,7 +4174,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
        execSetupSound();
       else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
               setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
-              setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+              setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE ||
+              setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY ||
+              setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 ||
+              setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 ||
+              setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 ||
+              setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
        execSetupTouch();
       else
        execSetupArtwork();
@@ -4014,7 +4331,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
            execSetupSound();
          else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
                   setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
-                  setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+                  setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE ||
+                  setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
            execSetupTouch();
          else
            execSetupArtwork();
@@ -4080,7 +4402,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
            execSetupSound();
          else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL ||
                   setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE ||
-                  setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
+                  setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE ||
+                  setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 ||
+                  setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
            execSetupTouch();
          else
            execSetupArtwork();
@@ -4177,11 +4504,11 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
   HandleChooseTree(mx, my, dx, dy, button, &level_number_current);
 }
 
-void DrawHallOfFame(int highlight_position)
+void DrawHallOfFame(int level_nr, int highlight_position)
 {
   int fade_mask = REDRAW_FIELD;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -4210,14 +4537,15 @@ void DrawHallOfFame(int highlight_position)
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
-  HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
+  HandleHallOfFame(level_nr, highlight_position, 0, 0, MB_MENU_INITIALIZE);
 
   DrawMaskedBorder(fade_mask);
 
   FadeIn(fade_mask);
 }
 
-static void drawHallOfFameList(int first_entry, int highlight_position)
+static void drawHallOfFameList(int level_nr, int first_entry,
+                              int highlight_position)
 {
   int i, j;
 
@@ -4260,15 +4588,18 @@ static void drawHallOfFameList(int first_entry, int highlight_position)
 
 void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 {
+  static int level_nr = 0;
   static int first_entry = 0;
   static int highlight_position = 0;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
 
   if (button == MB_MENU_INITIALIZE)
   {
+    level_nr = mx;
     first_entry = 0;
-    highlight_position = mx;
-    drawHallOfFameList(first_entry, highlight_position);
+    highlight_position = my;
+
+    drawHallOfFameList(level_nr, first_entry, highlight_position);
 
     return;
   }
@@ -4284,7 +4615,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
       if (first_entry < 0)
        first_entry = 0;
 
-      drawHallOfFameList(first_entry, highlight_position);
+      drawHallOfFameList(level_nr, first_entry, highlight_position);
     }
   }
   else if (dy > 0)
@@ -4295,28 +4626,27 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
       if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
        first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
 
-      drawHallOfFameList(first_entry, highlight_position);
+      drawHallOfFameList(level_nr, first_entry, highlight_position);
     }
   }
-  else if (button == MB_MENU_LEAVE)
-  {
-    PlaySound(SND_MENU_ITEM_SELECTING);
-
-    FadeSound(SND_BACKGROUND_SCORES);
-
-    SetGameStatus(GAME_MODE_MAIN);
-
-    DrawMainMenu();
-  }
-  else if (button == MB_MENU_CHOICE)
+  else if (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE)
   {
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSound(SND_BACKGROUND_SCORES);
 
-    SetGameStatus(GAME_MODE_MAIN);
+    if (game_status_last_screen == GAME_MODE_PLAYING &&
+       setup.auto_play_next_level && setup.increment_levels &&
+       !network_playing)
+    {
+      StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+    }
+    else
+    {
+      SetGameStatus(GAME_MODE_MAIN);
 
-    DrawMainMenu();
+      DrawMainMenu();
+    }
   }
 
   if (game_status == GAME_MODE_SCORES)
@@ -4347,6 +4677,8 @@ static char *volume_music_text;
 static char *touch_controls_text;
 static char *move_distance_text;
 static char *drop_distance_text;
+static char *transparency_text;
+static char *grid_size_text[2][2];
 
 static void execSetupMain()
 {
@@ -4377,7 +4709,7 @@ static void execSetupGame_setGameSpeeds()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Game Speed");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_GAME_SPEED);
 
       pushTreeInfo(&game_speeds, ti);
     }
@@ -4427,7 +4759,7 @@ static void execSetupGame_setScrollDelays()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Scroll Delay");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_SCROLL_DELAY);
 
       pushTreeInfo(&scroll_delays, ti);
     }
@@ -4477,7 +4809,7 @@ static void execSetupGame_setSnapshotModes()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Snapshot Mode");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_SNAPSHOT_MODE);
 
       pushTreeInfo(&snapshot_modes, ti);
     }
@@ -4574,7 +4906,7 @@ static void execSetupGraphics_setWindowSizes(boolean update_list)
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Window Scaling");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_WINDOW_SIZE);
 
       pushTreeInfo(&window_sizes, ti);
 
@@ -4599,7 +4931,7 @@ static void execSetupGraphics_setWindowSizes(boolean update_list)
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Window Scaling");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_WINDOW_SIZE);
 
       pushTreeInfo(&window_sizes, ti);
     }
@@ -4651,7 +4983,7 @@ static void execSetupGraphics_setScalingTypes()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Anti-Aliasing");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_SCALING_TYPE);
 
       pushTreeInfo(&scaling_types, ti);
     }
@@ -4701,7 +5033,7 @@ static void execSetupGraphics_setRenderingModes()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Special Rendering");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_RENDERING);
 
       pushTreeInfo(&rendering_modes, ti);
     }
@@ -4761,7 +5093,6 @@ static void execSetupGraphics()
 #endif
 }
 
-#if defined(TARGET_SDL2) && !defined(PLATFORM_ANDROID)
 static void execSetupChooseWindowSize()
 {
   setup_mode = SETUP_MODE_CHOOSE_WINDOW_SIZE;
@@ -4782,7 +5113,6 @@ static void execSetupChooseRenderingMode()
 
   DrawSetupScreen();
 }
-#endif
 
 static void execSetupChooseVolumeSimple()
 {
@@ -4828,7 +5158,7 @@ static void execSetupSound()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Sound Volume");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_VOLUME_SIMPLE);
 
       pushTreeInfo(&volumes_simple, ti);
 
@@ -4853,7 +5183,7 @@ static void execSetupSound()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Sound Volume");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_VOLUME_SIMPLE);
 
       pushTreeInfo(&volumes_simple, ti);
     }
@@ -4896,7 +5226,7 @@ static void execSetupSound()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Loops Volume");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_VOLUME_LOOPS);
 
       pushTreeInfo(&volumes_loops, ti);
 
@@ -4921,7 +5251,7 @@ static void execSetupSound()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Loops Volume");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_VOLUME_LOOPS);
 
       pushTreeInfo(&volumes_loops, ti);
     }
@@ -4964,7 +5294,7 @@ static void execSetupSound()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Music Volume");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_VOLUME_MUSIC);
 
       pushTreeInfo(&volumes_music, ti);
 
@@ -4989,7 +5319,7 @@ static void execSetupSound()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Music Volume");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_VOLUME_MUSIC);
 
       pushTreeInfo(&volumes_music, ti);
     }
@@ -5046,12 +5376,58 @@ static void execSetupChooseDropDistance()
   DrawSetupScreen();
 }
 
+static void execSetupChooseTransparency()
+{
+  setup_mode = SETUP_MODE_CHOOSE_TRANSPARENCY;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseGridXSize_0()
+{
+  setup_mode = SETUP_MODE_CHOOSE_GRID_XSIZE_0;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseGridYSize_0()
+{
+  setup_mode = SETUP_MODE_CHOOSE_GRID_YSIZE_0;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseGridXSize_1()
+{
+  setup_mode = SETUP_MODE_CHOOSE_GRID_XSIZE_1;
+
+  DrawSetupScreen();
+}
+
+static void execSetupChooseGridYSize_1()
+{
+  setup_mode = SETUP_MODE_CHOOSE_GRID_YSIZE_1;
+
+  DrawSetupScreen();
+}
+
+static void execSetupConfigureVirtualButtons()
+{
+  setup_mode = SETUP_MODE_CONFIG_VIRT_BUTTONS;
+
+  ConfigureVirtualButtons();
+
+  setup_mode = SETUP_MODE_TOUCH;
+
+  DrawSetupScreen();
+}
+
 static void execSetupTouch()
 {
+  int i, j, k;
+
   if (touch_controls == NULL)
   {
-    int i;
-
     for (i = 0; touch_controls_list[i].value != NULL; i++)
     {
       TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
@@ -5068,7 +5444,7 @@ static void execSetupTouch()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Control Type");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_TOUCH_CONTROL);
 
       pushTreeInfo(&touch_controls, ti);
     }
@@ -5092,8 +5468,6 @@ static void execSetupTouch()
 
   if (move_distances == NULL)
   {
-    int i;
-
     for (i = 0; distances_list[i].value != -1; i++)
     {
       TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
@@ -5110,7 +5484,7 @@ static void execSetupTouch()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Move Distance");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_MOVE_DISTANCE);
 
       pushTreeInfo(&move_distances, ti);
     }
@@ -5126,7 +5500,8 @@ static void execSetupTouch()
     /* if that fails, set current distance to reliable default value */
     if (move_distance_current == NULL)
       move_distance_current =
-       getTreeInfoFromIdentifier(move_distances, i_to_a(1));
+       getTreeInfoFromIdentifier(move_distances,
+                                 i_to_a(TOUCH_MOVE_DISTANCE_DEFAULT));
 
     /* if that also fails, set current distance to first available value */
     if (move_distance_current == NULL)
@@ -5135,8 +5510,6 @@ static void execSetupTouch()
 
   if (drop_distances == NULL)
   {
-    int i;
-
     for (i = 0; distances_list[i].value != -1; i++)
     {
       TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
@@ -5153,7 +5526,7 @@ static void execSetupTouch()
       setString(&ti->identifier, identifier);
       setString(&ti->name, name);
       setString(&ti->name_sorting, name);
-      setString(&ti->infotext, "Drop Distance");
+      setString(&ti->infotext, STR_SETUP_CHOOSE_DROP_DISTANCE);
 
       pushTreeInfo(&drop_distances, ti);
     }
@@ -5169,21 +5542,141 @@ static void execSetupTouch()
     /* if that fails, set current distance to reliable default value */
     if (drop_distance_current == NULL)
       drop_distance_current =
-       getTreeInfoFromIdentifier(drop_distances, i_to_a(1));
+       getTreeInfoFromIdentifier(drop_distances,
+                                 i_to_a(TOUCH_DROP_DISTANCE_DEFAULT));
 
     /* if that also fails, set current distance to first available value */
     if (drop_distance_current == NULL)
       drop_distance_current = drop_distances;
   }
 
+  if (transparencies == NULL)
+  {
+    for (i = 0; transparencies_list[i].value != -1; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      int value = transparencies_list[i].value;
+      char *text = transparencies_list[i].text;
+
+      ti->node_top = &transparencies;
+      ti->sort_priority = value;
+
+      sprintf(identifier, "%d", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, STR_SETUP_CHOOSE_TRANSPARENCY);
+
+      pushTreeInfo(&transparencies, ti);
+    }
+
+    /* sort transparency values to start with lowest transparency value */
+    sortTreeInfo(&transparencies);
+
+    /* set current transparency value to configured transparency value */
+    transparency_current =
+      getTreeInfoFromIdentifier(transparencies,
+                               i_to_a(setup.touch.transparency));
+
+    /* if that fails, set current transparency to reliable default value */
+    if (transparency_current == NULL)
+      transparency_current =
+       getTreeInfoFromIdentifier(transparencies,
+                                 i_to_a(TOUCH_TRANSPARENCY_DEFAULT));
+
+    /* if that also fails, set current transparency to first available value */
+    if (transparency_current == NULL)
+      transparency_current = transparencies;
+  }
+
+  for (i = 0; i < 2; i++)
+  {
+    for (j = 0; j < 2; j++)
+    {
+      if (grid_sizes[i][j] == NULL)
+      {
+       for (k = 0; grid_sizes_list[k].value != -1; k++)
+       {
+         TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+         char identifier[32], name[32];
+         int value = grid_sizes_list[k].value;
+         char *text = grid_sizes_list[k].text;
+
+         ti->node_top = &grid_sizes[i][j];
+         ti->sort_priority = value;
+
+         sprintf(identifier, "%d", value);
+         sprintf(name, "%s", text);
+
+         setString(&ti->identifier, identifier);
+         setString(&ti->name, name);
+         setString(&ti->name_sorting, name);
+         setString(&ti->infotext,
+                   (i == 0 ?
+                    (j == 0 ?
+                     STR_SETUP_CHOOSE_GRID_XSIZE_0 :
+                     STR_SETUP_CHOOSE_GRID_YSIZE_0) :
+                    (j == 0 ?
+                     STR_SETUP_CHOOSE_GRID_XSIZE_1 :
+                     STR_SETUP_CHOOSE_GRID_YSIZE_1)));
+
+         pushTreeInfo(&grid_sizes[i][j], ti);
+       }
+
+       /* sort grid size values to start with lowest grid size value */
+       sortTreeInfo(&grid_sizes[i][j]);
+
+       /* set current grid size value to configured grid size value */
+       grid_size_current[i][j] =
+         getTreeInfoFromIdentifier(grid_sizes[i][j],
+                                   i_to_a(j == 0 ?
+                                          setup.touch.grid_xsize[i] :
+                                          setup.touch.grid_ysize[i]));
+
+       /* if that fails, set current grid size to reliable default value */
+       if (grid_size_current[i][j] == NULL)
+         grid_size_current[i][j] =
+           getTreeInfoFromIdentifier(grid_sizes[i][j],
+                                     i_to_a(j == 0 ?
+                                            DEFAULT_GRID_XSIZE(i) :
+                                            DEFAULT_GRID_YSIZE(i)));
+
+       /* if that also fails, set current grid size to first available value */
+       if (grid_size_current[i][j] == NULL)
+         grid_size_current[i][j] = grid_sizes[i][j];
+      }
+    }
+  }
+
   setup.touch.control_type = touch_control_current->identifier;
   setup.touch.move_distance = atoi(move_distance_current->identifier);
   setup.touch.drop_distance = atoi(drop_distance_current->identifier);
+  setup.touch.transparency = atoi(transparency_current->identifier);
 
-  /* needed for displaying volume text instead of identifier */
+  for (i = 0; i < 2; i++)
+  {
+    setup.touch.grid_xsize[i] = atoi(grid_size_current[i][0]->identifier);
+    setup.touch.grid_ysize[i] = atoi(grid_size_current[i][1]->identifier);
+
+    if (i == GRID_ACTIVE_NR())
+    {
+      overlay.grid_xsize = setup.touch.grid_xsize[i];
+      overlay.grid_ysize = setup.touch.grid_ysize[i];
+    }
+  }
+
+  /* needed for displaying value text instead of identifier */
   touch_controls_text = touch_control_current->name;
   move_distance_text = move_distance_current->name;
   drop_distance_text = drop_distance_current->name;
+  transparency_text = transparency_current->name;
+
+  for (i = 0; i < 2; i++)
+    for (j = 0; j < 2; j++)
+      grid_size_text[i][j] = grid_size_current[i][j]->name;
 
   setup_mode = SETUP_MODE_TOUCH;
 
@@ -5299,19 +5792,97 @@ static void execSaveAndExitSetup()
   execExitSetup();
 }
 
+static struct
+{
+  void *value;
+  void *related_value;
+} hide_related_entry_list[] =
+{
+  { &setup.game_frame_delay,           execSetupChooseGameSpeed        },
+  { &setup.game_frame_delay,           &game_speed_text                },
+
+  { &setup.scroll_delay_value,         execSetupChooseScrollDelay      },
+  { &setup.scroll_delay_value,         &scroll_delay_text              },
+
+  { &setup.engine_snapshot_mode,       execSetupChooseSnapshotMode     },
+  { &setup.engine_snapshot_mode,       &snapshot_mode_text             },
+
+  { &setup.window_scaling_percent,     execSetupChooseWindowSize       },
+  { &setup.window_scaling_percent,     &window_size_text               },
+
+  { &setup.window_scaling_quality,     execSetupChooseScalingType      },
+  { &setup.window_scaling_quality,     &scaling_type_text              },
+
+  { &setup.screen_rendering_mode,      execSetupChooseRenderingMode    },
+  { &setup.screen_rendering_mode,      &rendering_mode_text            },
+
+  { &setup.graphics_set,               execSetupChooseGraphics         },
+  { &setup.graphics_set,               &graphics_set_name              },
+
+  { &setup.sounds_set,                 execSetupChooseSounds           },
+  { &setup.sounds_set,                 &sounds_set_name                },
+
+  { &setup.music_set,                  execSetupChooseMusic            },
+  { &setup.music_set,                  &music_set_name                 },
+
+  { &setup.volume_simple,              execSetupChooseVolumeSimple     },
+  { &setup.volume_simple,              &volume_simple_text             },
+
+  { &setup.volume_loops,               execSetupChooseVolumeLoops      },
+  { &setup.volume_loops,               &volume_loops_text              },
+
+  { &setup.volume_music,               execSetupChooseVolumeMusic      },
+  { &setup.volume_music,               &volume_music_text              },
+
+  { &setup.touch.control_type,         execSetupChooseTouchControls    },
+  { &setup.touch.control_type,         &touch_controls_text            },
+
+  { &setup.touch.move_distance,                execSetupChooseMoveDistance     },
+  { &setup.touch.move_distance,                &move_distance_text             },
+
+  { &setup.touch.drop_distance,                execSetupChooseDropDistance     },
+  { &setup.touch.drop_distance,                &drop_distance_text             },
+
+  { &setup.touch.transparency,         execSetupChooseTransparency     },
+  { &setup.touch.transparency,         &transparency_text              },
+
+  { &setup.touch.grid_xsize[0],                execSetupChooseGridXSize_0      },
+  { &setup.touch.grid_xsize[0],                &grid_size_text[0][0]           },
+
+  { &setup.touch.grid_ysize[0],                execSetupChooseGridYSize_0      },
+  { &setup.touch.grid_ysize[0],                &grid_size_text[0][1]           },
+
+  { &setup.touch.grid_xsize[1],                execSetupChooseGridXSize_1      },
+  { &setup.touch.grid_xsize[1],                &grid_size_text[1][0]           },
+
+  { &setup.touch.grid_ysize[1],                execSetupChooseGridYSize_1      },
+  { &setup.touch.grid_ysize[1],                &grid_size_text[1][1]           },
+
+  { NULL,                              NULL                            }
+};
+
+void setHideRelatedSetupEntries()
+{
+  int i;
+
+  for (i = 0; hide_related_entry_list[i].value != NULL; i++)
+    if (hideSetupEntry(hide_related_entry_list[i].value))
+      setHideSetupEntry(hide_related_entry_list[i].related_value);
+}
+
 static struct TokenInfo setup_info_main[] =
 {
-  { TYPE_ENTER_MENU,   execSetupGame,          "Game & Menu"           },
-  { TYPE_ENTER_MENU,   execSetupEditor,        "Editor"                },
-  { TYPE_ENTER_MENU,   execSetupGraphics,      "Graphics"              },
-  { TYPE_ENTER_MENU,   execSetupSound,         "Sound & Music"         },
-  { TYPE_ENTER_MENU,   execSetupArtwork,       "Custom Artwork"        },
-  { TYPE_ENTER_MENU,   execSetupInput,         "Input Devices"         },
-  { TYPE_ENTER_MENU,   execSetupTouch,         "Touch Controls"        },
-  { TYPE_ENTER_MENU,   execSetupShortcuts,     "Key Shortcuts"         },
+  { TYPE_ENTER_MENU,   execSetupGame,          STR_SETUP_GAME          },
+  { TYPE_ENTER_MENU,   execSetupEditor,        STR_SETUP_EDITOR        },
+  { TYPE_ENTER_MENU,   execSetupGraphics,      STR_SETUP_GRAPHICS      },
+  { TYPE_ENTER_MENU,   execSetupSound,         STR_SETUP_SOUND         },
+  { TYPE_ENTER_MENU,   execSetupArtwork,       STR_SETUP_ARTWORK       },
+  { TYPE_ENTER_MENU,   execSetupInput,         STR_SETUP_INPUT         },
+  { TYPE_ENTER_MENU,   execSetupTouch,         STR_SETUP_TOUCH         },
+  { TYPE_ENTER_MENU,   execSetupShortcuts,     STR_SETUP_SHORTCUTS     },
   { TYPE_EMPTY,                NULL,                   ""                      },
-  { TYPE_LEAVE_MENU,   execExitSetup,          "Exit"                  },
-  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   "Save and Exit"         },
+  { TYPE_LEAVE_MENU,   execExitSetup,          STR_SETUP_EXIT          },
+  { TYPE_LEAVE_MENU,   execSaveAndExitSetup,   STR_SETUP_SAVE_AND_EXIT },
 
   { 0,                 NULL,                   NULL                    }
 };
@@ -5319,11 +5890,15 @@ static struct TokenInfo setup_info_main[] =
 static struct TokenInfo setup_info_game[] =
 {
   { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode (Multi-Player):" },
+  { TYPE_SWITCH,       &setup.network_mode,    "Network Multi-Player Mode:" },
+  { TYPE_PLAYER,       &setup.network_player_nr,"Preferred Network Player:" },
   { TYPE_YES_NO,       &setup.input_on_focus,  "Only Move Focussed Player:" },
   { TYPE_SWITCH,       &setup.time_limit,      "Time Limit:"           },
   { TYPE_SWITCH,       &setup.handicap,        "Handicap:"             },
   { TYPE_SWITCH,       &setup.skip_levels,     "Skip Unsolved Levels:" },
   { TYPE_SWITCH,       &setup.increment_levels,"Increment Solved Levels:" },
+  { TYPE_SWITCH,       &setup.auto_play_next_level,"Auto-play Next Level:" },
+  { TYPE_SWITCH,       &setup.skip_scores_after_game,"Skip Scores After Game:" },
   { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record Tapes:"    },
   { TYPE_ENTER_LIST,   execSetupChooseGameSpeed, "Game Speed:"         },
   { TYPE_STRING,       &game_speed_text,       ""                      },
@@ -5444,31 +6019,79 @@ static struct TokenInfo setup_info_input[] =
   { TYPE_SWITCH,       NULL,                   "Player:"               },
   { TYPE_SWITCH,       NULL,                   "Device:"               },
   { TYPE_SWITCH,       NULL,                   ""                      },
+  { TYPE_SKIPPABLE,    NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_SKIPPABLE,    NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_touch[] =
+{
+  { TYPE_ENTER_LIST,   execSetupChooseTouchControls, "Touch Control Type:" },
+  { TYPE_STRING,       &touch_controls_text,   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_touch_virtual_buttons_0[] =
+{
+  { TYPE_ENTER_LIST,   execSetupChooseTouchControls, "Touch Control Type:" },
+  { TYPE_STRING,       &touch_controls_text,   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseGridXSize_0, "Horizontal Buttons (Landscape):"   },
+  { TYPE_STRING,       &grid_size_text[0][0],  ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseGridYSize_0, "Vertical Buttons (Landscape):"     },
+  { TYPE_STRING,       &grid_size_text[0][1],  ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseTransparency, "Button Transparency:" },
+  { TYPE_STRING,       &transparency_text,     ""                      },
+  { TYPE_SWITCH,       &setup.touch.draw_outlined, "Draw Buttons Outlined:" },
+  { TYPE_SWITCH,       &setup.touch.draw_pressed, "Highlight Pressed Buttons:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_ENTER_LIST,   execSetupConfigureVirtualButtons, "Configure Virtual Buttons" },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
   { 0,                 NULL,                   NULL                    }
 };
 
-static struct TokenInfo setup_info_touch[] =
+static struct TokenInfo setup_info_touch_virtual_buttons_1[] =
 {
   { TYPE_ENTER_LIST,   execSetupChooseTouchControls, "Touch Control Type:" },
   { TYPE_STRING,       &touch_controls_text,   ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseGridXSize_1, "Horizontal Buttons (Portrait):"    },
+  { TYPE_STRING,       &grid_size_text[1][0],  ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseGridYSize_1, "Vertical Buttons (Portrait):"      },
+  { TYPE_STRING,       &grid_size_text[1][1],  ""                      },
+  { TYPE_ENTER_LIST,   execSetupChooseTransparency, "Button Transparency:" },
+  { TYPE_STRING,       &transparency_text,     ""                      },
+  { TYPE_SWITCH,       &setup.touch.draw_outlined, "Draw Buttons Outlined:" },
+  { TYPE_SWITCH,       &setup.touch.draw_pressed, "Highlight Pressed Buttons:" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_ENTER_LIST,   execSetupConfigureVirtualButtons, "Configure Virtual Buttons" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
   { 0,                 NULL,                   NULL                    }
 };
 
+static struct TokenInfo *setup_info_touch_virtual_buttons[] =
+{
+  setup_info_touch_virtual_buttons_0,
+  setup_info_touch_virtual_buttons_1
+};
+
 static struct TokenInfo setup_info_touch_wipe_gestures[] =
 {
   { TYPE_ENTER_LIST,   execSetupChooseTouchControls, "Touch Control Type:" },
@@ -5589,12 +6212,10 @@ static Key getSetupKey()
 
   while (!got_key_event)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
@@ -5627,7 +6248,9 @@ static Key getSetupKey()
 
 static int getSetupValueFont(int type, void *value)
 {
-  if (type & TYPE_KEY)
+  if (type & TYPE_GHOSTED)
+    return FONT_OPTION_OFF;
+  else if (type & TYPE_KEY)
     return (type & TYPE_QUERY ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1);
   else if (type & TYPE_STRING)
     return FONT_VALUE_2;
@@ -5638,6 +6261,8 @@ static int getSetupValueFont(int type, void *value)
   else if (type & TYPE_YES_NO_AUTO)
     return (*(int *)value == AUTO  ? FONT_OPTION_ON :
            *(int *)value == FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
+  else if (type & TYPE_PLAYER)
+    return FONT_VALUE_1;
   else
     return FONT_VALUE_1;
 }
@@ -5693,6 +6318,12 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
   {
     xpos = menu_screen_value_xpos - 1;
   }
+  else if (type & TYPE_PLAYER)
+  {
+    int displayed_player_nr = *(int *)value + 1;
+
+    value_string = getSetupValue(TYPE_INTEGER, (void *)&displayed_player_nr);
+  }
 
   startx = mSX + xpos * 32;
   starty = mSY + ypos * 32;
@@ -5763,6 +6394,15 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
 
   DrawText(startx, starty, value_string, font_nr);
 
+  if (type & TYPE_PLAYER)
+  {
+    int player_nr = *(int *)value;
+    int xoff = getFontWidth(font_nr);
+
+    DrawFixedGraphicThruMaskExt(drawto, startx + xoff, starty,
+                               PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
+  }
+
   if (font_draw_xoffset_modified)
     getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old;
 }
@@ -5797,12 +6437,74 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
     if (key != KSYM_UNDEFINED)
       *(Key *)si->value = key;
   }
+  else if (si->type & TYPE_PLAYER)
+  {
+    int player_nr = *(int *)si->value;
+
+    if (dx)
+      player_nr += dx;
+    else
+      player_nr = Request("Choose player", REQ_PLAYER) - 1;
+
+    *(int *)si->value = MIN(MAX(0, player_nr), MAX_PLAYERS - 1);
+  }
 
   drawSetupValue(screen_pos, setup_info_pos_raw);
 
   // fullscreen state may have changed at this point
   if (si->value == &setup.fullscreen)
     ToggleFullscreenOrChangeWindowScalingIfNeeded();
+
+  if (si->value == &setup.network_mode &&
+      setup.network_mode != network.enabled)
+  {
+    network.enabled = setup.network_mode;
+
+    FadeOut(REDRAW_ALL);
+
+    ClearField();
+
+    FadeIn(REDRAW_ALL);
+
+    if (network.enabled)
+      InitNetworkServer();
+    else
+      DisconnectFromNetworkServer();
+
+    DrawSetupScreen();
+  }
+}
+
+static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig)
+{
+  static struct TokenInfo *setup_info_final = NULL;
+  int list_size = 0;
+  int list_pos = 0;
+  int i;
+
+  /* determine maximum list size of target list */
+  while (setup_info_orig[list_size++].type != 0);
+
+  /* free, allocate and clear memory for target list */
+  checked_free(setup_info_final);
+  setup_info_final = checked_calloc(list_size * sizeof(struct TokenInfo));
+
+  /* copy setup info list without setup entries marked as hidden */
+  for (i = 0; setup_info_orig[i].type != 0; i++)
+  {
+    /* skip setup entries configured to be hidden */
+    if (hideSetupEntry(setup_info_orig[i].value))
+      continue;
+
+    /* skip skippable setup entries if screen is lower than usual */
+    if (SCR_FIELDY < SCR_FIELDY_DEFAULT &&
+       setup_info_orig[i].type == TYPE_SKIPPABLE)
+      continue;
+
+    setup_info_final[list_pos++] = setup_info_orig[i];
+  }
+
+  return setup_info_final;
 }
 
 static void DrawSetupScreen_Generic()
@@ -5812,7 +6514,7 @@ static void DrawSetupScreen_Generic()
   char *title_string = NULL;
   int i;
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -5838,72 +6540,77 @@ static void DrawSetupScreen_Generic()
   if (setup_mode == SETUP_MODE_MAIN)
   {
     setup_info = setup_info_main;
-    title_string = "Setup";
+    title_string = STR_SETUP_MAIN;
   }
   else if (setup_mode == SETUP_MODE_GAME)
   {
     setup_info = setup_info_game;
-    title_string = "Setup Game";
+    title_string = STR_SETUP_GAME;
   }
   else if (setup_mode == SETUP_MODE_EDITOR)
   {
     setup_info = setup_info_editor;
-    title_string = "Setup Editor";
+    title_string = STR_SETUP_EDITOR;
   }
   else if (setup_mode == SETUP_MODE_GRAPHICS)
   {
     setup_info = setup_info_graphics;
-    title_string = "Setup Graphics";
+    title_string = STR_SETUP_GRAPHICS;
   }
   else if (setup_mode == SETUP_MODE_SOUND)
   {
     setup_info = setup_info_sound;
-    title_string = "Setup Sound";
+    title_string = STR_SETUP_SOUND;
   }
   else if (setup_mode == SETUP_MODE_ARTWORK)
   {
     setup_info = setup_info_artwork;
-    title_string = "Custom Artwork";
+    title_string = STR_SETUP_ARTWORK;
   }
   else if (setup_mode == SETUP_MODE_TOUCH)
   {
     setup_info = setup_info_touch;
-    title_string = "Setup Touch Ctrls";
+    title_string = STR_SETUP_TOUCH;
 
-    if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
+    if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+      setup_info = setup_info_touch_virtual_buttons[GRID_ACTIVE_NR()];
+    else if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
       setup_info = setup_info_touch_wipe_gestures;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS)
   {
     setup_info = setup_info_shortcuts;
-    title_string = "Setup Shortcuts";
+    title_string = STR_SETUP_SHORTCUTS;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS_1)
   {
     setup_info = setup_info_shortcuts_1;
-    title_string = "Setup Shortcuts";
+    title_string = STR_SETUP_SHORTCUTS;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS_2)
   {
     setup_info = setup_info_shortcuts_2;
-    title_string = "Setup Shortcuts";
+    title_string = STR_SETUP_SHORTCUTS;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS_3)
   {
     setup_info = setup_info_shortcuts_3;
-    title_string = "Setup Shortcuts";
+    title_string = STR_SETUP_SHORTCUTS;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS_4)
   {
     setup_info = setup_info_shortcuts_4;
-    title_string = "Setup Shortcuts";
+    title_string = STR_SETUP_SHORTCUTS;
   }
   else if (setup_mode == SETUP_MODE_SHORTCUTS_5)
   {
     setup_info = setup_info_shortcuts_5;
-    title_string = "Setup Shortcuts";
+    title_string = STR_SETUP_SHORTCUTS;
   }
 
+  /* use modified setup info without setup entries marked as hidden */
+  setup_info = getSetupInfoFinal(setup_info);
+
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string);
 
   // determine maximal number of setup entries that can be displayed on screen
@@ -5944,11 +6651,11 @@ void DrawSetupScreen_Input()
 
   ClearField();
 
-  setup_info = setup_info_input;
+  setup_info = getSetupInfoFinal(setup_info_input);
 
-  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input");
+  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, STR_SETUP_INPUT);
 
-  for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++)
+  for (i = 0; setup_info[i].type != 0; i++)
   {
     if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST))
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
@@ -6003,10 +6710,10 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     char *text;
   } custom[] =
   {
-    { &custom_key.left,  "Joystick Left"  },
-    { &custom_key.right, "Joystick Right" },
-    { &custom_key.up,    "Joystick Up"    },
-    { &custom_key.down,  "Joystick Down"  },
+    { &custom_key.left,  "Axis/Pad Left"  },
+    { &custom_key.right, "Axis/Pad Right" },
+    { &custom_key.up,    "Axis/Pad Up"    },
+    { &custom_key.down,  "Axis/Pad Down"  },
     { &custom_key.snap,  "Button 1/A/X"   },
     { &custom_key.drop,  "Button 2/B/Y"   }
   };
@@ -6017,7 +6724,19 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     "Joystick3",
     "Joystick4"
   };
-  int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+  int font_nr_menu = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1);
+  int font_nr_info = FONT_MENU_1;
+  int font_nr_name = FONT_VALUE_OLD;
+  int font_nr_on   = FONT_VALUE_1;
+  int font_nr_off  = FONT_VALUE_OLD;
+  int pos = 4;
+
+  if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
+  {
+    font_nr_info = FONT_MENU_2;
+    font_nr_on   = FONT_VALUE_NARROW;
+    font_nr_off  = FONT_VALUE_OLD_NARROW;
+  }
 
   custom_key = setup.input[player_nr].key;
 
@@ -6035,41 +6754,44 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active)
     int joystick_nr = getJoystickNrFromDeviceName(device_name);
     boolean joystick_active = CheckJoystickOpened(joystick_nr);
     char *text = joystick_name[joystick_nr];
-    int font_nr = (joystick_active ? FONT_VALUE_1 : FONT_VALUE_OLD);
+    int font_nr = (joystick_active ? font_nr_on : font_nr_off);
 
     DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr);
-    DrawText(mSX + 32, mSY + 4 * 32, "Configure", text_font_nr);
+    DrawText(mSX + 32, mSY + 4 * 32, "Configure", font_nr_menu);
   }
   else
   {
-    DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1);
-    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr);
+    DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", font_nr_on);
+    DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", font_nr_menu);
   }
 
-  DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1);
+  if (SCR_FIELDY >= SCR_FIELDY_DEFAULT)
+    DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", font_nr_info);
+  else
+    pos = 3;
 
-  drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT);
-  drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT);
-  drawCursorXY(1, 6, IMG_MENU_BUTTON_UP);
-  drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN);
+  drawCursorXY(1, pos + 0, IMG_MENU_BUTTON_LEFT);
+  drawCursorXY(1, pos + 1, IMG_MENU_BUTTON_RIGHT);
+  drawCursorXY(1, pos + 2, IMG_MENU_BUTTON_UP);
+  drawCursorXY(1, pos + 3, IMG_MENU_BUTTON_DOWN);
 
-  DrawText(mSX + 2 * 32, mSY +  6 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  7 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  8 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 2 * 32, mSY +  9 * 32, ":", FONT_VALUE_OLD);
-  DrawText(mSX + 1 * 32, mSY + 10 * 32, "Snap Field:", FONT_VALUE_OLD);
-  DrawText(mSX + 1 * 32, mSY + 12 * 32, "Drop Element:", FONT_VALUE_OLD);
+  DrawText(mSX + 2 * 32, mSY + (pos + 2) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 3) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 4) * 32, ":", font_nr_name);
+  DrawText(mSX + 2 * 32, mSY + (pos + 5) * 32, ":", font_nr_name);
+  DrawText(mSX + 1 * 32, mSY + (pos + 6) * 32, "Snap Field:", font_nr_name);
+  DrawText(mSX + 1 * 32, mSY + (pos + 8) * 32, "Drop Element:", font_nr_name);
 
   for (i = 0; i < 6; i++)
   {
-    int ypos = 6 + i + (i > 3 ? i-3 : 0);
+    int ypos = (pos + 2) + i + (i > 3 ? i - 3 : 0);
 
     DrawText(mSX + 3 * 32, mSY + ypos * 32,
-            "              ", FONT_VALUE_1);
+            "              ", font_nr_on);
     DrawText(mSX + 3 * 32, mSY + ypos * 32,
             (setup.input[player_nr].use_joystick ?
              custom[i].text :
-             getKeyNameFromKey(*custom[i].key)), FONT_VALUE_1);
+             getKeyNameFromKey(*custom[i].key)), font_nr_on);
   }
 }
 
@@ -6104,8 +6826,27 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
   int pos_empty2 = SETUPINPUT_SCREEN_POS_EMPTY2;
   int pos_end    = SETUPINPUT_SCREEN_POS_END;
 
+  if (SCR_FIELDY < SCR_FIELDY_DEFAULT)
+  {
+    int i;
+
+    for (i = 0; setup_info_input[i].type != 0; i++)
+    {
+      /* adjust menu structure according to skipped setup entries */
+      if (setup_info_input[i].type == TYPE_SKIPPABLE)
+      {
+       pos_empty2--;
+       pos_end--;
+      }
+    }
+  }
+
   if (button == MB_MENU_INITIALIZE)
   {
+    /* input setup menu may have changed size due to graphics configuration */
+    if (choice >= pos_empty1)
+      choice = pos_end;
+
     drawPlayerSetupInputInfo(input_player_nr, (choice == 2));
 
     DrawCursorAndText_Setup(choice, -1, TRUE);
@@ -6206,7 +6947,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
   }
 }
 
-void CustomizeKeyboard(int player_nr)
+static boolean CustomizeKeyboardMain(int player_nr)
 {
   int i;
   int step_nr;
@@ -6225,6 +6966,15 @@ void CustomizeKeyboard(int player_nr)
     { &custom_key.snap,  "Snap Field"  },
     { &custom_key.drop,  "Drop Element"        }
   };
+  int font_nr_old = FONT_VALUE_OLD;
+  int font_nr_new = FONT_VALUE_1;
+  boolean success = FALSE;
+
+  if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
+  {
+    font_nr_old = FONT_VALUE_OLD_NARROW;
+    font_nr_new = FONT_VALUE_NARROW;
+  }
 
   /* read existing key bindings from player setup */
   custom_key = setup.input[player_nr].key;
@@ -6242,36 +6992,31 @@ void CustomizeKeyboard(int player_nr)
   DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32,
           "Key:", FONT_INPUT_1_ACTIVE);
   DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-          getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
+          getKeyNameFromKey(*customize_step[step_nr].key), font_nr_old);
 
   FadeIn(REDRAW_FIELD);
 
   while (!finished)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
          {
            Key key = GetEventKey((KeyEvent *)&event, FALSE);
 
-           if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
+           /* press 'Escape' to abort and keep the old key bindings */
+           if (key == KSYM_Escape)
            {
-             if (key == KSYM_Escape)
-               FadeSkipNextFadeIn();
+             FadeSkipNextFadeIn();
 
              finished = TRUE;
-             break;
-           }
 
-           /* all keys configured -- wait for "Escape" or "Return" key */
-           if (step_nr == 6)
              break;
+           }
 
            /* press 'Enter' to keep the existing key binding */
            if (key == KSYM_Return)
@@ -6287,9 +7032,9 @@ void CustomizeKeyboard(int player_nr)
            /* got new key binding */
            *customize_step[step_nr].key = key;
            DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-                    "             ", FONT_VALUE_1);
+                    "             ", font_nr_new);
            DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
-                    getKeyNameFromKey(key), FONT_VALUE_1);
+                    getKeyNameFromKey(key), font_nr_new);
            step_nr++;
 
            /* un-highlight last query */
@@ -6298,11 +7043,12 @@ void CustomizeKeyboard(int player_nr)
            DrawText(mSX, mSY + (2 + 2 * (step_nr - 1) + 1) * 32,
                     "Key:", FONT_MENU_1);
 
-           /* press 'Enter' to leave */
+           /* all keys configured */
            if (step_nr == 6)
            {
-             DrawText(mSX + 16, mSY + 15 * 32 + 16,
-                      "Press Enter", FONT_TITLE_1);
+             finished = TRUE;
+             success = TRUE;
+
              break;
            }
 
@@ -6313,7 +7059,7 @@ void CustomizeKeyboard(int player_nr)
                     "Key:", FONT_INPUT_1_ACTIVE);
            DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
                     getKeyNameFromKey(*customize_step[step_nr].key),
-                    FONT_VALUE_OLD);
+                    font_nr_old);
          }
          break;
 
@@ -6330,185 +7076,41 @@ void CustomizeKeyboard(int player_nr)
     BackToFront();
   }
 
-  /* write new key bindings back to player setup */
-  setup.input[player_nr].key = custom_key;
+  /* write new key bindings back to player setup, if successfully finished */
+  if (success)
+    setup.input[player_nr].key = custom_key;
 
-  DrawSetupScreen_Input();
+  return success;
 }
 
-#if 0
-static boolean OLD_CalibrateJoystickMain(int player_nr)
+void CustomizeKeyboard(int player_nr)
 {
-  int new_joystick_xleft = JOYSTICK_XMIDDLE;
-  int new_joystick_xright = JOYSTICK_XMIDDLE;
-  int new_joystick_yupper = JOYSTICK_YMIDDLE;
-  int new_joystick_ylower = JOYSTICK_YMIDDLE;
-  int new_joystick_xmiddle, new_joystick_ymiddle;
-
-  char *device_name = setup.input[player_nr].joy.device_name;
-  int joystick_nr = getJoystickNrFromDeviceName(device_name);
-  boolean joystick_active = CheckJoystickOpened(joystick_nr);
-
-  int x, y, last_x, last_y, xpos = 8, ypos = 3;
-  boolean check[3][3];
-  int check_remaining = 3 * 3;
-  int joy_x, joy_y;
-  int joy_value;
-  int result = -1;
-
-  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
-    return FALSE;
+  boolean success = CustomizeKeyboardMain(player_nr);
 
-  if (!joystick_active || !setup.input[player_nr].use_joystick)
-    return FALSE;
-
-  FadeSetEnterMenu();
-  FadeOut(REDRAW_FIELD);
-
-  ClearField();
-
-  for (y = 0; y < 3; y++)
-  {
-    for (x = 0; x < 3; x++)
-    {
-      DrawFixedGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0);
-      check[x][y] = FALSE;
-    }
-  }
-
-  DrawTextSCentered(mSY - SY +  6 * 32, FONT_TITLE_1, "Rotate joystick");
-  DrawTextSCentered(mSY - SY +  7 * 32, FONT_TITLE_1, "in all directions");
-  DrawTextSCentered(mSY - SY +  9 * 32, FONT_TITLE_1, "if all balls");
-  DrawTextSCentered(mSY - SY + 10 * 32, FONT_TITLE_1, "are marked,");
-  DrawTextSCentered(mSY - SY + 11 * 32, FONT_TITLE_1, "center joystick");
-  DrawTextSCentered(mSY - SY + 12 * 32, FONT_TITLE_1, "and");
-  DrawTextSCentered(mSY - SY + 13 * 32, FONT_TITLE_1, "press any button!");
-
-  joy_value = JoystickExt(joystick_nr, TRUE);
-  last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
-  last_y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
-
-  /* eventually uncalibrated center position (joystick could be uncentered) */
-  if (!ReadJoystick(joystick_nr, &joy_x, &joy_y, NULL, NULL))
-    return FALSE;
-
-  new_joystick_xmiddle = joy_x;
-  new_joystick_ymiddle = joy_y;
-
-  DrawFixedGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
-
-  FadeIn(REDRAW_FIELD);
-
-  /* wait for potentially still pressed button to be released */
-  while (JoystickExt(joystick_nr, TRUE) & JOY_BUTTON);
-
-  while (result < 0)
+  if (success)
   {
-    while (PendingEvent())             /* got event */
-    {
-      Event event;
-
-      NextEvent(&event);
-
-      switch (event.type)
-      {
-       case EVENT_KEYPRESS:
-         switch (GetEventKey((KeyEvent *)&event, TRUE))
-         {
-           case KSYM_Return:
-             if (check_remaining == 0)
-               result = 1;
-             break;
-
-           case KSYM_Escape:
-             FadeSkipNextFadeIn();
-             result = 0;
-             break;
-
-           default:
-             break;
-         }
-         break;
-
-       case EVENT_KEYRELEASE:
-         key_joystick_mapping = 0;
-         break;
-
-       default:
-         HandleOtherEvents(&event);
-         break;
-      }
-    }
-
-    if (!ReadJoystick(joystick_nr, &joy_x, &joy_y, NULL, NULL))
-      return FALSE;
-
-    new_joystick_xleft  = MIN(new_joystick_xleft,  joy_x);
-    new_joystick_xright = MAX(new_joystick_xright, joy_x);
-    new_joystick_yupper = MIN(new_joystick_yupper, joy_y);
-    new_joystick_ylower = MAX(new_joystick_ylower, joy_y);
-
-    setup.input[player_nr].joy.xleft = new_joystick_xleft;
-    setup.input[player_nr].joy.yupper = new_joystick_yupper;
-    setup.input[player_nr].joy.xright = new_joystick_xright;
-    setup.input[player_nr].joy.ylower = new_joystick_ylower;
-    setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
-    setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
-
-    CheckJoystickData();
-
-    joy_value = JoystickExt(joystick_nr, TRUE);
-
-    if (joy_value & JOY_BUTTON && check_remaining == 0)
-      result = 1;
-
-    x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0);
-    y = (joy_value & JOY_UP   ? -1 : joy_value & JOY_DOWN  ? +1 : 0);
-
-    if (x != last_x || y != last_y)
-    {
-      DrawFixedGraphic(xpos + last_x, ypos + last_y,
-                      IMG_MENU_CALIBRATE_YELLOW, 0);
-      DrawFixedGraphic(xpos + x,      ypos + y,
-                      IMG_MENU_CALIBRATE_RED,    0);
-
-      last_x = x;
-      last_y = y;
-
-      if (check_remaining > 0 && !check[x+1][y+1])
-      {
-       check[x+1][y+1] = TRUE;
-       check_remaining--;
-      }
-    }
-
-    BackToFront();
-  }
-
-  /* calibrated center position (joystick should now be centered) */
-  if (!ReadJoystick(joystick_nr, &joy_x, &joy_y, NULL, NULL))
-    return FALSE;
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
+    unsigned int wait_frame_delay = 0;
+    unsigned int wait_frame_delay_value = 2000;
 
-  new_joystick_xmiddle = joy_x;
-  new_joystick_ymiddle = joy_y;
+    ResetDelayCounter(&wait_frame_delay);
 
-  /* wait until the last pressed button was released */
-  while (JoystickExt(joystick_nr, TRUE) & JOY_BUTTON)
-  {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
+    ClearField();
 
-      NextEvent(&event);
-      HandleOtherEvents(&event);
+    DrawTextSCentered(ypos1, font_nr, "Keyboard");
+    DrawTextSCentered(ypos2, font_nr, "configured!");
 
+    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
       BackToFront();
-    }
+
+    ClearEventQueue();
   }
 
-  return TRUE;
+  DrawSetupScreen_Input();
 }
-#endif
 
 /* game controller mapping generator by Gabriel Jacobo <gabomdq@gmail.com> */
 
@@ -6519,17 +7121,24 @@ static boolean OLD_CalibrateJoystickMain(int player_nr)
 static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 {
 #if defined(TARGET_SDL2)
-  static Bitmap *controller, *button, *axis_x, *axis_y;
-  Bitmap *marker;
-  boolean bitmaps_initialized = FALSE;
+  static boolean bitmaps_initialized = FALSE;
   boolean screen_initialized = FALSE;
-  const char *name = NULL;
+  static Bitmap *controller, *button, *axis_x, *axis_y;
+  char *name;
   boolean success = TRUE;
   boolean done = FALSE, next = FALSE;
   Event event;
   int alpha = 200, alpha_step = -1;
   int alpha_ticks = 0;
   char mapping[4096], temp[4096];
+  int font_name = MENU_SETUP_FONT_TITLE;
+  int font_info = MENU_SETUP_FONT_TEXT;
+  int spacing_name = menu.line_spacing_setup[SETUP_MODE_INPUT];
+  int spacing_line = menu.line_spacing_setup[SETUP_MODE_INPUT];
+  int spacing_para = menu.paragraph_spacing_setup[SETUP_MODE_INPUT];
+  int ystep_name = getMenuTextStep(spacing_name, font_name);
+  int ystep_line = getMenuTextStep(spacing_line, font_info);
+  int ystep_para = getMenuTextStep(spacing_para, font_info);
   int i, j;
 
   struct
@@ -6542,27 +7151,27 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   }
   *step, *prev_step, steps[] =
   {
-    { 370, 175, MARKER_BUTTON, "a",            },
-    { 410, 142, MARKER_BUTTON, "b",            },
-    { 334, 145, MARKER_BUTTON, "x",            },
-    { 372, 115, MARKER_BUTTON, "y",            },
-    { 176, 145, MARKER_BUTTON, "back",         },
-    { 230, 145, MARKER_BUTTON, "guide",                },
-    { 285, 145, MARKER_BUTTON, "start",                },
-    { 124, 220, MARKER_BUTTON, "dpleft",       },
-    { 160, 248, MARKER_BUTTON, "dpdown",       },
-    { 192, 220, MARKER_BUTTON, "dpright",      },
-    { 160, 192, MARKER_BUTTON, "dpup",         },
-    {  64,  60, MARKER_BUTTON, "leftshoulder", },
-    { 102,  10, MARKER_AXIS_Y, "lefttrigger",  },
-    { 396,  60, MARKER_BUTTON, "rightshoulder",        },
-    { 360,  10, MARKER_AXIS_Y, "righttrigger", },
-    {  87, 161, MARKER_BUTTON, "leftstick",    },
-    { 296, 230, MARKER_BUTTON, "rightstick",   },
-    {  87, 161, MARKER_AXIS_X, "leftx",                },
-    {  87, 161, MARKER_AXIS_Y, "lefty",                },
-    { 296, 230, MARKER_AXIS_X, "rightx",       },
-    { 296, 230, MARKER_AXIS_Y, "righty",       },
+    { 356, 155, MARKER_BUTTON, "a",            },
+    { 396, 122, MARKER_BUTTON, "b",            },
+    { 320, 125, MARKER_BUTTON, "x",            },
+    { 358,  95, MARKER_BUTTON, "y",            },
+    { 162, 125, MARKER_BUTTON, "back",         },
+    { 216, 125, MARKER_BUTTON, "guide",                },
+    { 271, 125, MARKER_BUTTON, "start",                },
+    { 110, 200, MARKER_BUTTON, "dpleft",       },
+    { 146, 228, MARKER_BUTTON, "dpdown",       },
+    { 178, 200, MARKER_BUTTON, "dpright",      },
+    { 146, 172, MARKER_BUTTON, "dpup",         },
+    {  50,  40, MARKER_BUTTON, "leftshoulder", },
+    {  88, -10, MARKER_AXIS_Y, "lefttrigger",  },
+    { 382,  40, MARKER_BUTTON, "rightshoulder",        },
+    { 346, -10, MARKER_AXIS_Y, "righttrigger", },
+    {  73, 141, MARKER_BUTTON, "leftstick",    },
+    { 282, 210, MARKER_BUTTON, "rightstick",   },
+    {  73, 141, MARKER_AXIS_X, "leftx",                },
+    {  73, 141, MARKER_AXIS_Y, "lefty",                },
+    { 282, 210, MARKER_AXIS_X, "rightx",       },
+    { 282, 210, MARKER_AXIS_Y, "righty",       },
   };
 
   unsigned int event_frame_delay = 0;
@@ -6580,24 +7189,28 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
     bitmaps_initialized = TRUE;
   }
 
+  name = getFormattedJoystickName(SDL_JoystickName(joystick));
+
+#if DEBUG_JOYSTICKS
   /* print info about the joystick we are watching */
-  name = SDL_JoystickName(joystick);
-  Error(ERR_DEBUG, "Watching joystick %d: (%s)\n",
-       SDL_JoystickInstanceID(joystick),
-       (name ? name : "(unknown joystick)"));
-  Error(ERR_DEBUG, "Joystick has %d axes, %d hats, %d balls, and %d buttons\n",
+  Error(ERR_DEBUG, "watching joystick %d: (%s)\n",
+       SDL_JoystickInstanceID(joystick), name);
+  Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n",
        SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick),
        SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick));
+#endif
 
   /* initialize mapping with GUID and name */
   SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp));
 
   snprintf(mapping, sizeof(mapping), "%s,%s,platform:%s,",
-          temp, name ? name : "Unknown Joystick", SDL_GetPlatform());
+          temp, name, SDL_GetPlatform());
 
   /* loop through all steps (buttons and axes), getting joystick events */
   for (i = 0; i < SDL_arraysize(steps) && !done;)
   {
+    Bitmap *marker = button;   /* initialize with reliable default value */
+
     step = &steps[i];
     strcpy(step->mapping, mapping);
     step->axis = -1;
@@ -6627,47 +7240,63 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
        alpha_step = 1;
       }
 
+      int controller_x = SX + (SXSIZE - controller->width) / 2;
+      int controller_y = SY + ystep_line;
+
+      int marker_x = controller_x + step->x;
+      int marker_y = controller_y + step->y;
+
+      int ystart1 = mSY - 2 * SY + controller_y + controller->height;
+      int ystart2 = ystart1 + ystep_name + ystep_line;
+
       ClearField();
 
-      DrawTextSCentered(mSY - SY + 22 * 16, FONT_REQUEST,
+      DrawTextSCentered(ystart1, font_name, name);
+
+      DrawTextSCentered(ystart2, font_info,
                        "Press buttons and move axes on");
-      DrawTextSCentered(mSY - SY + 23 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "your controller when indicated.");
-      DrawTextSCentered(mSY - SY + 24 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "(Your controller may look different.)");
+      ystart2 += ystep_para;
 
 #if defined(PLATFORM_ANDROID)
-      DrawTextSCentered(mSY - SY + 26 * 16, FONT_REQUEST,
+      DrawTextSCentered(ystart2, font_info,
                        "To correct a mistake,");
-      DrawTextSCentered(mSY - SY + 27 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "press the 'back' button.");
-      DrawTextSCentered(mSY - SY + 28 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "To skip a button or axis,");
-      DrawTextSCentered(mSY - SY + 29 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "press the 'menu' button.");
 #else
-      DrawTextSCentered(mSY - SY + 26 * 16, FONT_REQUEST,
+      DrawTextSCentered(ystart2, font_info,
                        "To correct a mistake,");
-      DrawTextSCentered(mSY - SY + 27 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "press the 'backspace' key.");
-      DrawTextSCentered(mSY - SY + 28 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "To skip a button or axis,");
-      DrawTextSCentered(mSY - SY + 29 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "press the 'return' key.");
-      DrawTextSCentered(mSY - SY + 30 * 16, FONT_REQUEST,
+      ystart2 += ystep_line;
+      DrawTextSCentered(ystart2, font_info,
                        "To exit, press the 'escape' key.");
 #endif
 
-      int controller_x = gfx.sx + (gfx.sxsize - controller->width) / 2;
-      int controller_y = gfx.sy;
-
-      int marker_x = controller_x + step->x;
-      int marker_y = controller_y + step->y;
-
       BlitBitmapMasked(controller, drawto, 0, 0,
                       controller->width, controller->height,
                       controller_x, controller_y);
 
+      SDL_SetSurfaceBlendMode(marker->surface_masked, SDL_BLENDMODE_BLEND);
       SDL_SetSurfaceAlphaMod(marker->surface_masked, alpha);
 
       BlitBitmapMasked(marker, drawto, 0, 0,
@@ -6767,14 +7396,21 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
            if (event.key.keysym.sym == KSYM_BackSpace ||
                event.key.keysym.sym == KSYM_Back)
            {
-             /* undo this step */
-             if (i > 0)
+             if (i == 0)
              {
-               prev_step = &steps[--i];
-               strcpy(mapping, prev_step->mapping);
-               next = TRUE;
+               /* leave screen */
+               success = FALSE;
+               done = TRUE;
+
+               break;
              }
 
+             /* undo this step */
+             prev_step = &steps[i - 1];
+             strcpy(mapping, prev_step->mapping);
+             i--;
+             next = TRUE;
+
              break;
            }
 
@@ -6791,6 +7427,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 
            if (event.key.keysym.sym == KSYM_Escape)
            {
+             /* leave screen */
              success = FALSE;
              done = TRUE;
            }
@@ -6814,7 +7451,9 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 
   if (success)
   {
+#if DEBUG_JOYSTICKS
     Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping);
+#endif
 
     // activate mapping for this game
     SDL_GameControllerAddMapping(mapping);
@@ -6883,11 +7522,14 @@ void ConfigureJoystick(int player_nr)
   if (state != JOYSTICK_NOT_CONFIGURED)
   {
     boolean success = (state == JOYSTICK_CONFIGURED);
-    char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! ");
+    char message1[MAX_OUTPUT_LINESIZE + 1];
+    char *message2 = (success ? "configured!" : "not available!");
     char *device_name = setup.input[player_nr].joy.device_name;
     int nr = getJoystickNrFromDeviceName(device_name) + 1;
-    int xpos = mSX - SX;
-    int ypos = mSY - SY;
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
     unsigned int wait_frame_delay = 0;
     unsigned int wait_frame_delay_value = 2000;
 
@@ -6895,8 +7537,10 @@ void ConfigureJoystick(int player_nr)
 
     ClearField();
 
-    DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, "   JOYSTICK %d   ", nr);
-    DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message);
+    sprintf(message1, "Joystick %d", nr);
+
+    DrawTextSCentered(ypos1, font_nr, message1);
+    DrawTextSCentered(ypos2, font_nr, message2);
 
     while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
       BackToFront();
@@ -6907,6 +7551,270 @@ void ConfigureJoystick(int player_nr)
   DrawSetupScreen_Input();
 }
 
+boolean ConfigureVirtualButtonsMain()
+{
+  static char *customize_step_text[] =
+  {
+    "Move Left",
+    "Move Right",
+    "Move Up",
+    "Move Down",
+    "Snap Field",
+    "Drop Element"
+  };
+  char grid_button[] =
+  {
+    CHAR_GRID_BUTTON_LEFT,
+    CHAR_GRID_BUTTON_RIGHT,
+    CHAR_GRID_BUTTON_UP,
+    CHAR_GRID_BUTTON_DOWN,
+    CHAR_GRID_BUTTON_SNAP,
+    CHAR_GRID_BUTTON_DROP
+  };
+  int font_nr = FONT_INPUT_1_ACTIVE;
+  int font_height = getFontHeight(font_nr);
+  int ypos1 = SYSIZE / 2 - font_height * 2;
+  int ypos2 = SYSIZE / 2 - font_height * 1;
+  boolean success = FALSE;
+  boolean finished = FALSE;
+  int step_nr = 0;
+  char grid_button_draw = CHAR_GRID_BUTTON_NONE;
+  char grid_button_old[MAX_GRID_XSIZE][MAX_GRID_YSIZE];
+  char grid_button_tmp[MAX_GRID_XSIZE][MAX_GRID_YSIZE];
+  boolean set_grid_button = FALSE;
+  int nr = GRID_ACTIVE_NR();
+  int x, y;
+
+  for (x = 0; x < MAX_GRID_XSIZE; x++)
+    for (y = 0; y < MAX_GRID_YSIZE; y++)
+      grid_button_old[x][y] = grid_button_tmp[x][y] = overlay.grid_button[x][y];
+
+  overlay.grid_button_highlight = grid_button[step_nr];
+
+  FadeSetEnterMenu();
+  FadeOut(REDRAW_FIELD);
+
+  ClearField();
+
+  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Virtual Buttons");
+  DrawTextSCentered(ypos1, font_nr, "Select tiles to");
+  DrawTextSCentered(ypos2, font_nr, customize_step_text[step_nr]);
+
+  FadeIn(REDRAW_FIELD);
+
+  SetOverlayShowGrid(TRUE);
+
+  while (!finished)
+  {
+    Event event;
+
+    while (NextValidEvent(&event))
+    {
+      switch (event.type)
+      {
+        case EVENT_KEYPRESS:
+         {
+           Key key = GetEventKey((KeyEvent *)&event, FALSE);
+
+           /* press 'Escape' to abort and keep the old key bindings */
+           if (key == KSYM_Escape)
+           {
+             for (x = 0; x < MAX_GRID_XSIZE; x++)
+               for (y = 0; y < MAX_GRID_YSIZE; y++)
+                 overlay.grid_button[x][y] = grid_button_old[x][y];
+
+             FadeSkipNextFadeIn();
+
+             finished = TRUE;
+
+             break;
+           }
+
+           /* press 'Enter' to keep the existing key binding */
+           if (key == KSYM_Return ||
+#if defined(TARGET_SDL2)
+               key == KSYM_Menu ||
+#endif
+               key == KSYM_space)
+           {
+             step_nr++;
+           }
+           else if (key == KSYM_BackSpace
+#if defined(TARGET_SDL2)
+                    ||
+                    key == KSYM_Back
+#endif
+                    )
+           {
+             if (step_nr == 0)
+             {
+               FadeSkipNextFadeIn();
+
+               finished = TRUE;
+
+               break;
+             }
+
+             step_nr--;
+           }
+           else
+           {
+             break;
+           }
+
+           /* all virtual buttons configured */
+           if (step_nr == 6)
+           {
+             finished = TRUE;
+             success = TRUE;
+
+             break;
+           }
+
+           for (x = 0; x < MAX_GRID_XSIZE; x++)
+             for (y = 0; y < MAX_GRID_YSIZE; y++)
+               grid_button_tmp[x][y] = overlay.grid_button[x][y];
+
+           overlay.grid_button_highlight = grid_button[step_nr];
+
+           /* query next virtual button */
+
+           ClearField();
+
+           DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Virtual Buttons");
+           DrawTextSCentered(ypos1, font_nr, "Select tiles to");
+           DrawTextSCentered(ypos2, font_nr, customize_step_text[step_nr]);
+         }
+         break;
+
+        case EVENT_KEYRELEASE:
+         key_joystick_mapping = 0;
+         break;
+
+       case EVENT_BUTTONPRESS:
+       case EVENT_BUTTONRELEASE:
+         {
+           ButtonEvent *button = (ButtonEvent *)&event;
+
+           button->x += video.screen_xoffset;
+           button->y += video.screen_yoffset;
+
+           x = button->x * overlay.grid_xsize / video.screen_width;
+           y = button->y * overlay.grid_ysize / video.screen_height;
+
+           if (button->type == EVENT_BUTTONPRESS)
+           {
+             button_status = button->button;
+
+             grid_button_draw =
+               (overlay.grid_button[x][y] != grid_button[step_nr] ?
+                grid_button[step_nr] : CHAR_GRID_BUTTON_NONE);
+
+             set_grid_button = TRUE;
+           }
+           else
+           {
+             button_status = MB_RELEASED;
+           }
+         }
+         break;
+
+       case EVENT_MOTIONNOTIFY:
+         {
+           MotionEvent *motion = (MotionEvent *)&event;
+
+           motion->x += video.screen_xoffset;
+           motion->y += video.screen_yoffset;
+
+           x = motion->x * overlay.grid_xsize / video.screen_width;
+           y = motion->y * overlay.grid_ysize / video.screen_height;
+
+           set_grid_button = TRUE;
+         }
+         break;
+
+#if defined(TARGET_SDL2)
+       case SDL_WINDOWEVENT:
+         HandleWindowEvent((WindowEvent *) &event);
+
+         // check if device has been rotated
+         if (nr != GRID_ACTIVE_NR())
+         {
+           nr = GRID_ACTIVE_NR();
+
+           for (x = 0; x < MAX_GRID_XSIZE; x++)
+             for (y = 0; y < MAX_GRID_YSIZE; y++)
+               grid_button_old[x][y] = grid_button_tmp[x][y] =
+                 overlay.grid_button[x][y];
+         }
+
+         break;
+
+       case SDL_APP_WILLENTERBACKGROUND:
+       case SDL_APP_DIDENTERBACKGROUND:
+       case SDL_APP_WILLENTERFOREGROUND:
+       case SDL_APP_DIDENTERFOREGROUND:
+         HandlePauseResumeEvent((PauseResumeEvent *) &event);
+         break;
+#endif
+
+        default:
+         HandleOtherEvents(&event);
+         break;
+      }
+
+      if (set_grid_button)
+      {
+       overlay.grid_button[x][y] =
+         (grid_button_draw != CHAR_GRID_BUTTON_NONE ? grid_button_draw :
+          grid_button_tmp[x][y] == grid_button[step_nr] ? CHAR_GRID_BUTTON_NONE :
+          grid_button_tmp[x][y]);
+
+       set_grid_button = FALSE;
+      }
+    }
+
+    BackToFront();
+  }
+
+  for (x = 0; x < MAX_GRID_XSIZE; x++)
+    for (y = 0; y < MAX_GRID_YSIZE; y++)
+      setup.touch.grid_button[nr][x][y] = overlay.grid_button[x][y];
+
+  overlay.grid_button_highlight = CHAR_GRID_BUTTON_NONE;
+
+  SetOverlayShowGrid(FALSE);
+
+  return success;
+}
+
+void ConfigureVirtualButtons()
+{
+  boolean success = ConfigureVirtualButtonsMain();
+
+  if (success)
+  {
+    int font_nr = FONT_TITLE_1;
+    int font_height = getFontHeight(font_nr);
+    int ypos1 = SYSIZE / 2 - font_height * 2;
+    int ypos2 = SYSIZE / 2 - font_height * 1;
+    unsigned int wait_frame_delay = 0;
+    unsigned int wait_frame_delay_value = 2000;
+
+    ResetDelayCounter(&wait_frame_delay);
+
+    ClearField();
+
+    DrawTextSCentered(ypos1, font_nr, "Virtual buttons");
+    DrawTextSCentered(ypos2, font_nr, "configured!");
+
+    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+      BackToFront();
+
+    ClearEventQueue();
+  }
+}
+
 void DrawSetupScreen()
 {
   if (setup_mode == SETUP_MODE_INPUT)
@@ -6941,6 +7849,16 @@ void DrawSetupScreen()
     DrawChooseTree(&move_distance_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
     DrawChooseTree(&drop_distance_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY)
+    DrawChooseTree(&transparency_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0)
+    DrawChooseTree(&grid_size_current[0][0]);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0)
+    DrawChooseTree(&grid_size_current[0][1]);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1)
+    DrawChooseTree(&grid_size_current[1][0]);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
+    DrawChooseTree(&grid_size_current[1][1]);
   else
     DrawSetupScreen_Generic();
 
@@ -6959,6 +7877,24 @@ void RedrawSetupScreenAfterFullscreenToggle()
   }
 }
 
+void RedrawSetupScreenAfterScreenRotation(int nr)
+{
+  int x, y;
+
+  if (setup_mode == SETUP_MODE_TOUCH)
+  {
+    // update virtual button settings (depending on screen orientation)
+    DrawSetupScreen();
+  }
+  else if (setup_mode == SETUP_MODE_CONFIG_VIRT_BUTTONS)
+  {
+    // save already configured virtual buttons
+    for (x = 0; x < MAX_GRID_XSIZE; x++)
+      for (y = 0; y < MAX_GRID_YSIZE; y++)
+       setup.touch.grid_button[nr][x][y] = overlay.grid_button[x][y];
+  }
+}
+
 void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 {
   if (setup_mode == SETUP_MODE_INPUT)
@@ -6993,12 +7929,25 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
     HandleChooseTree(mx, my, dx, dy, button, &move_distance_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE)
     HandleChooseTree(mx, my, dx, dy, button, &drop_distance_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY)
+    HandleChooseTree(mx, my, dx, dy, button, &transparency_current);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0)
+    HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[0][0]);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0)
+    HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[0][1]);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1)
+    HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[1][0]);
+  else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1)
+    HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[1][1]);
   else
     HandleSetupScreen_Generic(mx, my, dx, dy, button);
 }
 
 void HandleGameActions()
 {
+  if (game.restart_game_message != NULL)
+    RequestRestartGame(game.restart_game_message);
+
   if (game_status != GAME_MODE_PLAYING)
     return;
 
@@ -7035,6 +7984,16 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
       *y = mSY + TILEY * MENU_SCREEN_START_YPOS;
       break;
 
+    case SCREEN_CTRL_ID_INSERT_SOLUTION:
+      *x = mSX + GDI_ACTIVE_POS(menu.main.button.insert_solution.x);
+      *y = mSY + GDI_ACTIVE_POS(menu.main.button.insert_solution.y);
+      break;
+
+    case SCREEN_CTRL_ID_PLAY_SOLUTION:
+      *x = mSX + GDI_ACTIVE_POS(menu.main.button.play_solution.x);
+      *y = mSY + GDI_ACTIVE_POS(menu.main.button.play_solution.y);
+      break;
+
     default:
       Error(ERR_EXIT, "unknown gadget ID %d", gadget_id);
   }
@@ -7077,6 +8036,20 @@ static struct
     SCREEN_MASK_INPUT,
     "next player"
   },
+  {
+    IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE,
+    getScreenMenuButtonPos,
+    SCREEN_CTRL_ID_INSERT_SOLUTION,
+    SCREEN_MASK_MAIN_HAS_SOLUTION,
+    "insert solution tape"
+  },
+  {
+    IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE,
+    getScreenMenuButtonPos,
+    SCREEN_CTRL_ID_PLAY_SOLUTION,
+    SCREEN_MASK_MAIN_HAS_SOLUTION,
+    "play solution tape"
+  },
 };
 
 static struct
@@ -7135,12 +8108,23 @@ static void CreateScreenMenubuttons()
     int gd_x1, gd_x2, gd_y1, gd_y2;
     int id = menubutton_info[i].gadget_id;
 
-    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+    if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION)
+      event_mask = GD_EVENT_RELEASED;
+    else
+      event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
     menubutton_info[i].get_gadget_position(&x, &y, id);
 
-    width = SC_MENUBUTTON_XSIZE;
-    height = SC_MENUBUTTON_YSIZE;
+    if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION)
+    {
+      width  = graphic_info[menubutton_info[i].gfx_pressed].width;
+      height = graphic_info[menubutton_info[i].gfx_pressed].height;
+    }
+    else
+    {
+      width = SC_MENUBUTTON_XSIZE;
+      height = SC_MENUBUTTON_YSIZE;
+    }
 
     gfx_unpressed = menubutton_info[i].gfx_unpressed;
     gfx_pressed   = menubutton_info[i].gfx_pressed;
@@ -7153,6 +8137,7 @@ static void CreateScreenMenubuttons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, gfx_unpressed,
                      GDI_INFO_TEXT, menubutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -7220,6 +8205,7 @@ static void CreateScreenScrollbuttons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, gfx_unpressed,
                      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -7292,6 +8278,7 @@ static void CreateScreenScrollbars()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, gfx_unpressed,
                      GDI_INFO_TEXT, scrollbar_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -7346,6 +8333,33 @@ void MapScreenMenuGadgets(int screen_mask)
       MapGadget(screen_gadget[menubutton_info[i].gadget_id]);
 }
 
+void UnmapScreenMenuGadgets(int screen_mask)
+{
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
+  {
+    if (screen_mask & menubutton_info[i].screen_mask)
+    {
+      UnmapGadget(screen_gadget[menubutton_info[i].gadget_id]);
+
+      if (screen_mask & SCREEN_MASK_MAIN_HAS_SOLUTION)
+       DrawBackground(screen_gadget[menubutton_info[i].gadget_id]->x,
+                      screen_gadget[menubutton_info[i].gadget_id]->y,
+                      screen_gadget[menubutton_info[i].gadget_id]->width,
+                      screen_gadget[menubutton_info[i].gadget_id]->height);
+    }
+  }
+}
+
+void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets)
+{
+  if (map_gadgets)
+    MapScreenMenuGadgets(screen_mask);
+  else
+    UnmapScreenMenuGadgets(screen_mask);
+}
+
 void MapScreenGadgets(int num_entries)
 {
   int i;
@@ -7369,7 +8383,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
   int button = gi->event.button;
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int step = (button == MB_LEFTBUTTON   ? 1 :
+             button == MB_MIDDLEBUTTON ? 5 :
+             button == MB_RIGHTBUTTON  ? 10 : 1);
 
   switch (id)
   {
@@ -7389,6 +8405,14 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       HandleSetupScreen_Input_Player(step, +1);
       break;
 
+    case SCREEN_CTRL_ID_INSERT_SOLUTION:
+      InsertSolutionTape();
+      break;
+
+    case SCREEN_CTRL_ID_PLAY_SOLUTION:
+      PlaySolutionTape();
+      break;
+
     case SCREEN_CTRL_ID_SCROLL_UP:
       if (game_status == GAME_MODE_LEVELS)
        HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
@@ -7426,3 +8450,50 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       break;
   }
 }
+
+void DumpScreenIdentifiers()
+{
+  int i;
+
+  Print("Active screen elements on current screen:\n");
+
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    struct MainControlInfo *mci = &main_controls[i];
+
+    if (mci->button_graphic != -1)
+    {
+      char *token = getTokenFromImageID(mci->button_graphic);
+
+      Print("- '%s'\n", token);
+    }
+  }
+
+  Print("Done.\n");
+}
+
+boolean DoScreenAction(int image_id)
+{
+  int i;
+
+  if (game_status != GAME_MODE_MAIN)
+    return FALSE;
+
+  for (i = 0; main_controls[i].nr != -1; i++)
+  {
+    struct MainControlInfo *mci = &main_controls[i];
+    struct MenuPosInfo *pos = mci->pos_button;
+
+    if (mci->button_graphic == image_id)
+    {
+      int x = mSX + pos->x;
+      int y = mSY + pos->y;
+
+      HandleMainMenu(x, y, 0, 0, MB_MENU_CHOICE);
+
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}