removed sub-headline on score info screen
[rocksndiamonds.git] / src / screens.c
index 4967ebde6f9c90a52b384e22f690289423eb07d7..977ac133f826daf2044cd402e2617dec5c25b1e7 100644 (file)
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //                         Holger Schemel
 //                 info@artsoft.org
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // screens.c
 // ============================================================================
 #include "network.h"
 #include "init.h"
 #include "config.h"
+#include "api.h"
 
 
 #define DEBUG_JOYSTICKS                0
 
 
-/* screens on the info screen */
+// screens on the info screen
 #define INFO_MODE_MAIN                 0
 #define INFO_MODE_TITLE                        1
 #define INFO_MODE_ELEMENTS             2
 
 #define MAX_INFO_MODES                 8
 
-/* screens on the setup screen */
-/* (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h) */
-/* (should also match corresponding entries in src/conf_gfx.c) */
+// screens on the setup screen
+// (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h)
+// (should also match corresponding entries in src/conf_gfx.c)
 #define SETUP_MODE_MAIN                        0
 #define SETUP_MODE_GAME                        1
-#define SETUP_MODE_EDITOR              2
-#define SETUP_MODE_GRAPHICS            3
-#define SETUP_MODE_SOUND               4
-#define SETUP_MODE_ARTWORK             5
-#define SETUP_MODE_INPUT               6
-#define SETUP_MODE_TOUCH               7
-#define SETUP_MODE_SHORTCUTS           8
-#define SETUP_MODE_SHORTCUTS_1         9
-#define SETUP_MODE_SHORTCUTS_2         10
-#define SETUP_MODE_SHORTCUTS_3         11
-#define SETUP_MODE_SHORTCUTS_4         12
-#define SETUP_MODE_SHORTCUTS_5         13
-
-/* sub-screens on the setup screen (generic) */
-#define SETUP_MODE_CHOOSE_ARTWORK      14
-#define SETUP_MODE_CHOOSE_OTHER                15
-
-/* sub-screens on the setup screen (specific) */
-#define SETUP_MODE_CHOOSE_GAME_SPEED   16
-#define SETUP_MODE_CHOOSE_SCROLL_DELAY 17
-#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE        18
-#define SETUP_MODE_CHOOSE_WINDOW_SIZE  19
-#define SETUP_MODE_CHOOSE_SCALING_TYPE 20
-#define SETUP_MODE_CHOOSE_RENDERING    21
-#define SETUP_MODE_CHOOSE_VSYNC                22
-#define SETUP_MODE_CHOOSE_GRAPHICS     23
-#define SETUP_MODE_CHOOSE_SOUNDS       24
-#define SETUP_MODE_CHOOSE_MUSIC                25
-#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE        26
-#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 27
-#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 28
-#define SETUP_MODE_CHOOSE_TOUCH_CONTROL        29
-#define SETUP_MODE_CHOOSE_MOVE_DISTANCE        30
-#define SETUP_MODE_CHOOSE_DROP_DISTANCE        31
-#define SETUP_MODE_CHOOSE_TRANSPARENCY 32
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 33
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 34
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 35
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 36
-#define SETUP_MODE_CONFIG_VIRT_BUTTONS 37
-
-#define MAX_SETUP_MODES                        38
+#define SETUP_MODE_ENGINES             2
+#define SETUP_MODE_EDITOR              3
+#define SETUP_MODE_GRAPHICS            4
+#define SETUP_MODE_SOUND               5
+#define SETUP_MODE_ARTWORK             6
+#define SETUP_MODE_INPUT               7
+#define SETUP_MODE_TOUCH               8
+#define SETUP_MODE_SHORTCUTS           9
+#define SETUP_MODE_SHORTCUTS_1         10
+#define SETUP_MODE_SHORTCUTS_2         11
+#define SETUP_MODE_SHORTCUTS_3         12
+#define SETUP_MODE_SHORTCUTS_4         13
+#define SETUP_MODE_SHORTCUTS_5         14
+
+// sub-screens on the setup screen (generic)
+#define SETUP_MODE_CHOOSE_ARTWORK      15
+#define SETUP_MODE_CHOOSE_OTHER                16
+
+// sub-screens on the setup screen (specific)
+#define SETUP_MODE_CHOOSE_SCORES_TYPE  17
+#define SETUP_MODE_CHOOSE_GAME_SPEED   18
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY 19
+#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE        20
+#define SETUP_MODE_CHOOSE_WINDOW_SIZE  21
+#define SETUP_MODE_CHOOSE_SCALING_TYPE 22
+#define SETUP_MODE_CHOOSE_RENDERING    23
+#define SETUP_MODE_CHOOSE_VSYNC                24
+#define SETUP_MODE_CHOOSE_GRAPHICS     25
+#define SETUP_MODE_CHOOSE_SOUNDS       26
+#define SETUP_MODE_CHOOSE_MUSIC                27
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE        28
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 29
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 30
+#define SETUP_MODE_CHOOSE_TOUCH_CONTROL        31
+#define SETUP_MODE_CHOOSE_MOVE_DISTANCE        32
+#define SETUP_MODE_CHOOSE_DROP_DISTANCE        33
+#define SETUP_MODE_CHOOSE_TRANSPARENCY 34
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 35
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 36
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 37
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 38
+#define SETUP_MODE_CONFIG_VIRT_BUTTONS 39
+
+#define MAX_SETUP_MODES                        40
 
 #define MAX_MENU_MODES                 MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
 
-/* setup screen titles */
+// info screen titles
+#define STR_INFO_MAIN                  "Info Screen"
+#define STR_INFO_TITLE                 "Title Screen"
+#define STR_INFO_ELEMENTS              "Game Elements"
+#define STR_INFO_MUSIC                 "Music Info"
+#define STR_INFO_CREDITS               "Credits"
+#define STR_INFO_PROGRAM               "Program Info"
+#define STR_INFO_VERSION               "Version Info"
+#define STR_INFO_LEVELSET              "Level Set Info"
+#define STR_INFO_EXIT                  "Exit"
+
+// setup screen titles
 #define STR_SETUP_MAIN                 "Setup"
 #define STR_SETUP_GAME                 "Game & Menu"
+#define STR_SETUP_ENGINES              "Game Engines"
 #define STR_SETUP_EDITOR               "Editor"
 #define STR_SETUP_GRAPHICS             "Graphics"
 #define STR_SETUP_SOUND                        "Sound & Music"
 #define STR_SETUP_EXIT                 "Exit"
 #define STR_SETUP_SAVE_AND_EXIT                "Save and Exit"
 
+#define STR_SETUP_CHOOSE_SCORES_TYPE   "Scores Type"
 #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_GRID_XSIZE_1  "Horiz. Buttons"
 #define STR_SETUP_CHOOSE_GRID_YSIZE_1  "Vert. Buttons"
 
-/* for input setup functions */
+// other screen text constants
+#define STR_CHOOSE_TREE_EDIT           "Edit"
+#define MENU_CHOOSE_TREE_FONT(x)       (FONT_TEXT_1 + (x))
+#define MENU_CHOOSE_TREE_COLOR(ti, a)  TREE_COLOR(ti, a)
+
+#define TEXT_MAIN_MENU                 "Press any key or button for main menu"
+#define TEXT_INFO_MENU                 "Press any key or button for info menu"
+#define TEXT_NEXT_PAGE                 "Press any key or button for next page"
+#define TEXT_NEXT_MENU                 (info_screens_from_main ?       \
+                                        TEXT_MAIN_MENU : TEXT_INFO_MENU)
+
+// for input setup functions
 #define SETUPINPUT_SCREEN_POS_START    0
 #define SETUPINPUT_SCREEN_POS_EMPTY1   3
 #define SETUPINPUT_SCREEN_POS_EMPTY2   12
 
 #define MAX_SETUP_TEXT_INPUT_LEN       28
 
-/* for various menu stuff  */
+// for various menu stuff
 #define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_START_YPOS         2
 #define MENU_SCREEN_VALUE_XPOS         (SCR_FIELDX - 3)
+#define MENU_SCREEN_TEXT2_XPOS         (SCR_FIELDX - 2)
 #define MENU_SCREEN_MAX_XPOS           (SCR_FIELDX - 1)
 #define MENU_TITLE1_YPOS               8
 #define MENU_TITLE2_YPOS               46
 #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_YSTART                MENU_SCREEN_INFO_SPACE_TOP
 #define MENU_SCREEN_INFO_YSTEP         (TILEY + 4)
 #define MENU_SCREEN_INFO_YBOTTOM       (SYSIZE - MENU_SCREEN_INFO_SPACE_BOTTOM)
 #define MENU_SCREEN_INFO_YSIZE         (MENU_SCREEN_INFO_YBOTTOM -     \
-                                        MENU_SCREEN_INFO_YSTART2 -     \
+                                        MENU_SCREEN_INFO_YSTART -      \
                                         TILEY / 2)
-#define MAX_INFO_ELEMENTS_ON_SCREEN    128
-#define STD_INFO_ELEMENTS_ON_SCREEN    (MENU_SCREEN_INFO_YSIZE /       \
+#define MAX_INFO_ELEMENTS_IN_ARRAY     128
+#define MAX_INFO_ELEMENTS_ON_SCREEN    (SYSIZE / TILEY)
+#define MAX_INFO_ELEMENTS              MIN(MAX_INFO_ELEMENTS_IN_ARRAY, \
+                                           MAX_INFO_ELEMENTS_ON_SCREEN)
+#define STD_INFO_ELEMENTS_ON_SCREEN    10
+#define DYN_INFO_ELEMENTS_ON_SCREEN    (MENU_SCREEN_INFO_YSIZE /       \
                                         MENU_SCREEN_INFO_YSTEP)
-#define NUM_INFO_ELEMENTS_FROM_CONF    \
+#define DEFAULT_INFO_ELEMENTS          MIN(STD_INFO_ELEMENTS_ON_SCREEN,\
+                                           DYN_INFO_ELEMENTS_ON_SCREEN)
+#define NUM_INFO_ELEMENTS_FROM_CONF                                    \
   (menu.list_size_info[GFX_SPECIAL_ARG_INFO_ELEMENTS] > 0 ?            \
    menu.list_size_info[GFX_SPECIAL_ARG_INFO_ELEMENTS] :                        \
-   MAX_MENU_ENTRIES_ON_SCREEN)
-#define NUM_INFO_ELEMENTS_ON_SCREEN    MIN(MIN(STD_INFO_ELEMENTS_ON_SCREEN, \
-                                                MAX_INFO_ELEMENTS_ON_SCREEN), \
-                                           NUM_INFO_ELEMENTS_FROM_CONF)
+   DEFAULT_INFO_ELEMENTS)
+#define NUM_INFO_ELEMENTS_ON_SCREEN    MIN(NUM_INFO_ELEMENTS_FROM_CONF,\
+                                           MAX_INFO_ELEMENTS)
 #define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - MENU_SCREEN_START_YPOS)
 #define MAX_MENU_TEXT_LENGTH_BIG       13
 #define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
 
-/* screen gadget identifiers */
+// screen gadget identifiers
 #define SCREEN_CTRL_ID_PREV_LEVEL      0
 #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_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 SCREEN_CTRL_ID_NETWORK_SERVER  9
-
-#define NUM_SCREEN_GADGETS             10
-
-#define NUM_SCREEN_MENUBUTTONS         6
+#define SCREEN_CTRL_ID_PREV_LEVEL2     2
+#define SCREEN_CTRL_ID_NEXT_LEVEL2     3
+#define SCREEN_CTRL_ID_PREV_SCORE      4
+#define SCREEN_CTRL_ID_NEXT_SCORE      5
+#define SCREEN_CTRL_ID_PLAY_TAPE       6
+#define SCREEN_CTRL_ID_FIRST_LEVEL     7
+#define SCREEN_CTRL_ID_LAST_LEVEL      8
+#define SCREEN_CTRL_ID_LEVEL_NUMBER    9
+#define SCREEN_CTRL_ID_PREV_PLAYER     10
+#define SCREEN_CTRL_ID_NEXT_PLAYER     11
+#define SCREEN_CTRL_ID_INSERT_SOLUTION 12
+#define SCREEN_CTRL_ID_PLAY_SOLUTION   13
+#define SCREEN_CTRL_ID_LEVELSET_INFO   14
+#define SCREEN_CTRL_ID_SWITCH_ECS_AGA  15
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 16
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 17
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2        18
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2        19
+
+#define NUM_SCREEN_MENUBUTTONS         20
+
+#define SCREEN_CTRL_ID_SCROLL_UP       20
+#define SCREEN_CTRL_ID_SCROLL_DOWN     21
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 22
+#define SCREEN_CTRL_ID_NETWORK_SERVER  23
+
+#define NUM_SCREEN_GADGETS             24
+
 #define NUM_SCREEN_SCROLLBUTTONS       2
 #define NUM_SCREEN_SCROLLBARS          1
 #define NUM_SCREEN_TEXTINPUT           1
 
 #define SCREEN_MASK_MAIN               (1 << 0)
 #define SCREEN_MASK_MAIN_HAS_SOLUTION  (1 << 1)
-#define SCREEN_MASK_INPUT              (1 << 2)
-
-/* graphic position and size values for buttons and scrollbars */
+#define SCREEN_MASK_MAIN_HAS_SET_INFO  (1 << 2)
+#define SCREEN_MASK_INPUT              (1 << 3)
+#define SCREEN_MASK_TOUCH              (1 << 4)
+#define SCREEN_MASK_TOUCH2             (1 << 5)
+#define SCREEN_MASK_SCORES             (1 << 6)
+#define SCREEN_MASK_SCORES_INFO                (1 << 7)
+
+// graphic position and size values for buttons and scrollbars
 #define SC_MENUBUTTON_XSIZE            TILEX
 #define SC_MENUBUTTON_YSIZE            TILEY
 
 #define SC_BORDER_SIZE                 14
 
 
-/* forward declarations of internal functions */
+// forward declarations of internal functions
 static void HandleScreenGadgets(struct GadgetInfo *);
 static void HandleSetupScreen_Generic(int, int, int, int, int);
 static void HandleSetupScreen_Input(int, int, int, int, int);
@@ -229,39 +280,65 @@ static void CustomizeKeyboard(int);
 static void ConfigureJoystick(int);
 static void ConfigureVirtualButtons(void);
 static void execSetupGame(void);
+static void execSetupEngines(void);
 static void execSetupGraphics(void);
 static void execSetupSound(void);
 static void execSetupTouch(void);
 static void execSetupArtwork(void);
 static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 
+static void DrawChoosePlayerName(void);
 static void DrawChooseLevelSet(void);
 static void DrawChooseLevelNr(void);
+static void DrawScoreInfo(int);
+static void DrawScoreInfo_Content(int);
 static void DrawInfoScreen(void);
 static void DrawSetupScreen(void);
+static void DrawTypeName(void);
 
 static void DrawInfoScreen_NotAvailable(char *, char *);
 static void DrawInfoScreen_HelpAnim(int, int, boolean);
 static void DrawInfoScreen_HelpText(int, int, int, int);
 static void HandleInfoScreen_Main(int, int, int, int, int);
-static void HandleInfoScreen_TitleScreen(int);
-static void HandleInfoScreen_Elements(int);
-static void HandleInfoScreen_Music(int);
-static void HandleInfoScreen_Credits(int);
-static void HandleInfoScreen_Program(int);
+static void HandleInfoScreen_TitleScreen(int, int, int);
+static void HandleInfoScreen_Elements(int, int, int);
+static void HandleInfoScreen_Music(int, int, int);
 static void HandleInfoScreen_Version(int);
+static void HandleInfoScreen_Generic(int, int, int);
 
+static void ModifyGameSpeedIfNeeded(void);
+static void DisableVsyncIfNeeded(void);
+
+static void RedrawScreenMenuGadgets(int);
 static void MapScreenMenuGadgets(int);
+static void UnmapScreenMenuGadgets(int);
 static void MapScreenGadgets(int);
+static void UnmapScreenGadgets(void);
 static void MapScreenTreeGadgets(TreeInfo *);
+static void UnmapScreenTreeGadgets(void);
 
 static void UpdateScreenMenuGadgets(int, boolean);
+static void AdjustScoreInfoButtons_SelectScore(int, int, int);
+static void AdjustScoreInfoButtons_PlayTape(int, int, boolean);
+
+static boolean OfferUploadTapes(void);
+static void execOfferUploadTapes(void);
+
+static void DrawHallOfFame_setScoreEntries(void);
+static void HandleHallOfFame_SelectLevel(int, int);
+static char *getHallOfFameRankText(int, int);
+static char *getHallOfFameScoreText(int, int);
+static char *getInfoScreenTitle_Generic(void);
+
+static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
 static int info_mode = INFO_MODE_MAIN;
 static int setup_mode = SETUP_MODE_MAIN;
 
+static boolean info_screens_from_main = FALSE;
+
 static TreeInfo *window_sizes = NULL;
 static TreeInfo *window_size_current = NULL;
 
@@ -280,6 +357,11 @@ static TreeInfo *scroll_delay_current = NULL;
 static TreeInfo *snapshot_modes = NULL;
 static TreeInfo *snapshot_mode_current = NULL;
 
+static TreeInfo *scores_types = NULL;
+static TreeInfo *scores_type_current = NULL;
+
+static TreeInfo *game_speeds_normal = NULL;
+static TreeInfo *game_speeds_extended = NULL;
 static TreeInfo *game_speeds = NULL;
 static TreeInfo *game_speed_current = NULL;
 
@@ -307,14 +389,16 @@ 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 *player_name = NULL;
+static TreeInfo *player_name_current = NULL;
+
 static TreeInfo *level_number = NULL;
 static TreeInfo *level_number_current = NULL;
 
-static struct
-{
-  int value;
-  char *text;
-} window_sizes_list[] =
+static TreeInfo *score_entries = NULL;
+static TreeInfo *score_entry_current = NULL;
+
+static struct ValueTextInfo window_sizes_list[] =
 {
   {    50,     "50 %"                          },
   {    80,     "80 %"                          },
@@ -332,11 +416,7 @@ static struct
   {    -1,     NULL                            },
 };
 
-static struct
-{
-  char *value;
-  char *text;
-} scaling_types_list[] =
+static struct StringValueTextInfo scaling_types_list[] =
 {
   {    SCALING_QUALITY_NEAREST, "Off"          },
   {    SCALING_QUALITY_LINEAR,  "Linear"       },
@@ -345,11 +425,7 @@ static struct
   {    NULL,                    NULL           },
 };
 
-static struct
-{
-  char *value;
-  char *text;
-} rendering_modes_list[] =
+static struct StringValueTextInfo rendering_modes_list[] =
 {
   {    STR_SPECIAL_RENDERING_OFF,      "Off (May show artifacts, fast)" },
   {    STR_SPECIAL_RENDERING_BITMAP,   "Bitmap/Texture mode (slower)"   },
@@ -362,11 +438,7 @@ static struct
   {    NULL,                            NULL                            },
 };
 
-static struct
-{
-  char *value;
-  char *text;
-} vsync_modes_list[] =
+static struct StringValueTextInfo vsync_modes_list[] =
 {
   {    STR_VSYNC_MODE_OFF,             "Off"           },
   {    STR_VSYNC_MODE_NORMAL,          "Normal"        },
@@ -375,42 +447,49 @@ static struct
   {    NULL,                            NULL           },
 };
 
-static struct
+static struct StringValueTextInfo scores_types_list[] =
 {
-  int value;
-  char *text;
-} game_speeds_list[] =
+  {    STR_SCORES_TYPE_LOCAL_ONLY,         "Local scores only"         },
+  {    STR_SCORES_TYPE_SERVER_ONLY,        "Server scores only"        },
+  {    STR_SCORES_TYPE_LOCAL_AND_SERVER,   "Local and server scores"   },
+
+  {    NULL,                           NULL            },
+};
+
+static struct ValueTextInfo game_speeds_list_normal[] =
 {
-#if 1
   {    30,     "Very Slow"                     },
   {    25,     "Slow"                          },
   {    20,     "Normal"                        },
   {    15,     "Fast"                          },
   {    10,     "Very Fast"                     },
-#else
-  {    1000,   "1/1s (Extremely Slow)"         },
-  {    500,    "1/2s"                          },
-  {    200,    "1/5s"                          },
-  {    100,    "1/10s"                         },
-  {    50,     "1/20s"                         },
-  {    29,     "1/35s (Original Supaplex)"     },
-  {    25,     "1/40s"                         },
-  {    20,     "1/50s (Normal Speed)"          },
-  {    14,     "1/70s (Maximum Supaplex)"      },
-  {    10,     "1/100s"                        },
-  {    5,      "1/200s"                        },
-  {    2,      "1/500s"                        },
-  {    1,      "1/1000s (Extremely Fast)"      },
-#endif
 
   {    -1,     NULL                            },
 };
 
-static struct
-{
-  int value;
-  char *text;
-} scroll_delays_list[] =
+static struct ValueTextInfo game_speeds_list_extended[] =
+{
+  {    1000,   "1 fps (Extremely Slow)"        },
+  {    500,    "2 fps"                         },
+  {    200,    "5 fps"                         },
+  {    100,    "10 fps"                        },
+  {    50,     "20 fps"                        },
+  {    29,     "35 fps (Original Supaplex)"    },
+  {    25,     "40 fps"                        },
+  {    20,     "50 fps (=== Normal Speed ===)" },
+  {    16,     "60 fps (60 Hz VSync Speed)"    },
+  {    14,     "70 fps (Maximum Supaplex)"     },
+  {    10,     "100 fps"                       },
+  {    5,      "200 fps"                       },
+  {    2,      "500 fps"                       },
+  {    1,      "1000 fps (Extremely Fast)"     },
+
+  {    -1,     NULL                            },
+};
+
+static struct ValueTextInfo *game_speeds_list;
+
+static struct ValueTextInfo scroll_delays_list[] =
 {
   {    0,      "0 Tiles (No Scroll Delay)"     },
   {    1,      "1 Tile"                        },
@@ -425,11 +504,7 @@ static struct
   {    -1,     NULL                            },
 };
 
-static struct
-{
-  char *value;
-  char *text;
-} snapshot_modes_list[] =
+static struct StringValueTextInfo snapshot_modes_list[] =
 {
   {    STR_SNAPSHOT_MODE_OFF,                  "Off"           },
   {    STR_SNAPSHOT_MODE_EVERY_STEP,           "Every Step"    },
@@ -439,11 +514,7 @@ static struct
   {    NULL,                                   NULL            },
 };
 
-static struct
-{
-  int value;
-  char *text;
-} volumes_list[] =
+static struct ValueTextInfo volumes_list[] =
 {
   {    0,      "0 %"                           },
   {    1,      "1 %"                           },
@@ -463,11 +534,7 @@ static struct
   {    -1,     NULL                            },
 };
 
-static struct
-{
-  char *value;
-  char *text;
-} touch_controls_list[] =
+static struct StringValueTextInfo touch_controls_list[] =
 {
   {    TOUCH_CONTROL_OFF,              "Off"                   },
   {    TOUCH_CONTROL_VIRTUAL_BUTTONS,  "Virtual Buttons"       },
@@ -477,11 +544,7 @@ static struct
   {    NULL,                           NULL                    },
 };
 
-static struct
-{
-  int value;
-  char *text;
-} distances_list[] =
+static struct ValueTextInfo distances_list[] =
 {
   {    1,      "1 %"                           },
   {    2,      "2 %"                           },
@@ -496,11 +559,7 @@ static struct
   {    -1,     NULL                            },
 };
 
-static struct
-{
-  int value;
-  char *text;
-} transparencies_list[] =
+static struct ValueTextInfo transparencies_list[] =
 {
   {    0,      "0 % (Opaque)"                  },
   {    10,     "10 %"                          },
@@ -517,11 +576,7 @@ static struct
   {    -1,     NULL                            },
 };
 
-static struct
-{
-  int value;
-  char *text;
-} grid_sizes_list[] =
+static struct ValueTextInfo grid_sizes_list[] =
 {
   {    3,      "3"                             },
   {    4,      "4"                             },
@@ -557,12 +612,17 @@ static struct
   {    -1,     NULL                            },
 };
 
+static int align_xoffset = 0;
+static int align_yoffset = 0;
+
 #define DRAW_MODE(s)           ((s) >= GAME_MODE_MAIN &&               \
                                 (s) <= GAME_MODE_SETUP ? (s) :         \
                                 (s) == GAME_MODE_PSEUDO_TYPENAME ?     \
-                                GAME_MODE_MAIN : GAME_MODE_DEFAULT)
+                                GAME_MODE_MAIN :                       \
+                                (s) == GAME_MODE_PSEUDO_TYPENAMES ?    \
+                                GAME_MODE_NAMES : GAME_MODE_DEFAULT)
 
-/* (there are no draw offset definitions needed for INFO_MODE_TITLE) */
+// (there are no draw offset definitions needed for INFO_MODE_TITLE)
 #define DRAW_MODE_INFO(i)      ((i) >= INFO_MODE_TITLE &&              \
                                 (i) <= INFO_MODE_LEVELSET ? (i) :      \
                                 INFO_MODE_MAIN)
@@ -594,6 +654,10 @@ static struct
                                 menu.extra_spacing[GAME_MODE_SETUP] :  \
                                 menu.extra_spacing_setup[DRAW_MODE_SETUP(i)])
 
+#define EXTRA_SPACING_SCORES(i)        (EXTRA_SPACING_INFO(i))
+
+#define EXTRA_SPACING_SCOREINFO(i) (menu.extra_spacing[GAME_MODE_SCOREINFO])
+
 #define DRAW_XOFFSET(s)                ((s) == GAME_MODE_INFO ?                \
                                 DRAW_XOFFSET_INFO(info_mode) :         \
                                 (s) == GAME_MODE_SETUP ?               \
@@ -608,11 +672,16 @@ static struct
                                 EXTRA_SPACING_INFO(info_mode) :        \
                                 (s) == GAME_MODE_SETUP ?               \
                                 EXTRA_SPACING_SETUP(setup_mode) :      \
+                                (s) == GAME_MODE_SCORES ?              \
+                                EXTRA_SPACING_SCORES(info_mode) :      \
                                 menu.extra_spacing[DRAW_MODE(s)])
 
 #define mSX                    (SX + DRAW_XOFFSET(game_status))
 #define mSY                    (SY + DRAW_YOFFSET(game_status))
 
+#define amSX                   (mSX + align_xoffset)
+#define amSY                   (mSY + align_yoffset)
+
 #define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ?  \
                                    menu.list_size[game_status] :       \
                                    MAX_MENU_ENTRIES_ON_SCREEN)
@@ -621,7 +690,7 @@ static struct
                                         NUM_MENU_ENTRIES_ON_SCREEN)
 
 
-/* title display and control definitions */
+// title display and control definitions
 
 #define MAX_NUM_TITLE_SCREENS  (2 * MAX_NUM_TITLE_IMAGES +             \
                                 2 * MAX_NUM_TITLE_MESSAGES)
@@ -642,7 +711,8 @@ struct TitleControlInfo
 
 struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS];
 
-/* main menu display and control definitions */
+
+// main menu display and control definitions
 
 #define MAIN_CONTROL_NAME                      0
 #define MAIN_CONTROL_LEVELS                    1
@@ -697,6 +767,8 @@ static char *main_text_title_1                      = NULL;
 static char *main_text_title_2                 = NULL;
 static char *main_text_title_3                 = NULL;
 
+extern char debug_xsn_mode[];
+
 struct MainControlInfo
 {
   int nr;
@@ -761,36 +833,33 @@ static struct MainControlInfo main_controls[] =
     &menu.main.text.quit,              &main_text_quit,
     NULL,                              NULL,
   },
-#if 0
-  /* (these two buttons are real gadgets) */
   {
     MAIN_CONTROL_PREV_LEVEL,
-    &menu.main.button.prev_level,      IMG_MENU_BUTTON_PREV_LEVEL,
+    NULL,                              -1,
     NULL,                              NULL,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_NEXT_LEVEL,
-    &menu.main.button.next_level,      IMG_MENU_BUTTON_NEXT_LEVEL,
+    NULL,                              -1,
     NULL,                              NULL,
     NULL,                              NULL,
   },
-#endif
   {
     MAIN_CONTROL_FIRST_LEVEL,
-    &menu.main.button.first_level,     IMG_MENU_BUTTON_FIRST_LEVEL,
+    NULL,                              -1,
     &menu.main.text.first_level,       &main_text_first_level,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_LAST_LEVEL,
-    &menu.main.button.last_level,      IMG_MENU_BUTTON_LAST_LEVEL,
+    NULL,                              -1,
     &menu.main.text.last_level,                &main_text_last_level,
     NULL,                              NULL,
   },
   {
     MAIN_CONTROL_LEVEL_NUMBER,
-    &menu.main.button.level_number,    IMG_MENU_BUTTON_LEVEL_NUMBER,
+    NULL,                              -1,
     &menu.main.text.level_number,      &main_text_level_number,
     NULL,                              NULL,
   },
@@ -870,6 +939,11 @@ static struct MainControlInfo main_controls[] =
 };
 
 
+static boolean hasLevelSetInfo(void)
+{
+  return (getLevelSetInfoFilename(0) != NULL);
+}
+
 static int getTitleScreenGraphic(int nr, boolean initial)
 {
   return (initial ? IMG_TITLESCREEN_INITIAL_1 : IMG_TITLESCREEN_1) + nr;
@@ -948,10 +1022,10 @@ static int getTitleSound(struct TitleControlInfo *tci)
   int sound_local = base + nr;
 
 #if 0
-  printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n",
-        nr, initial, is_image,
-        sound_global, getSoundListEntry(sound_global)->filename,
-        sound_local, getSoundListEntry(sound_local)->filename);
+  Debug("screens:getTitleSound", "%d, %d, %d: %d ['%s'], %d ['%s']",
+       nr, initial, is_image,
+       sound_global, getSoundListEntry(sound_global)->filename,
+       sound_local, getSoundListEntry(sound_local)->filename);
 #endif
 
   if (!strEqual(getSoundListEntry(sound_local)->filename, UNDEFINED_FILENAME))
@@ -978,10 +1052,10 @@ static int getTitleMusic(struct TitleControlInfo *tci)
   int music_local = base + nr;
 
 #if 0
-  printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n",
-        nr, initial, is_image,
-        music_global, getMusicListEntry(music_global)->filename,
-        music_local, getMusicListEntry(music_local)->filename);
+  Debug("screens:getTitleMusic", "%d, %d, %d: %d ['%s'], %d ['%s']",
+       nr, initial, is_image,
+       music_global, getMusicListEntry(music_global)->filename,
+       music_local, getMusicListEntry(music_local)->filename);
 #endif
 
   if (!strEqual(getMusicListEntry(music_local)->filename, UNDEFINED_FILENAME))
@@ -1019,6 +1093,7 @@ static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
   ti.fade_delay = tmi.fade_delay;
   ti.post_delay = tmi.post_delay;
   ti.auto_delay = tmi.auto_delay;
+  ti.auto_delay_unit = tmi.auto_delay_unit;
 
   return ti;
 }
@@ -1050,7 +1125,7 @@ static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image,
   title_controls[num_title_screens].local_nr = nr;
   title_controls[num_title_screens].sort_priority = sort_priority;
 
-  title_controls[num_title_screens].first = FALSE;     /* will be set later */
+  title_controls[num_title_screens].first = FALSE;     // will be set later
 
   num_title_screens++;
 }
@@ -1084,18 +1159,18 @@ static void InitializeTitleControls(boolean show_title_initial)
 {
   num_title_screens = 0;
 
-  /* 1st step: initialize title screens for game start (only when starting) */
+  // 1st step: initialize title screens for game start (only when starting)
   if (show_title_initial)
     InitializeTitleControls_CheckTitleInfo(TRUE);
 
-  /* 2nd step: initialize title screens for current level set */
+  // 2nd step: initialize title screens for current level set
   InitializeTitleControls_CheckTitleInfo(FALSE);
 
-  /* sort title screens according to sort_priority and title number */
+  // sort title screens according to sort_priority and title number
   qsort(title_controls, num_title_screens, sizeof(struct TitleControlInfo),
        compareTitleControlInfo);
 
-  /* mark first title screen */
+  // mark first title screen
   title_controls[0].first = TRUE;
 }
 
@@ -1114,7 +1189,7 @@ static void InitializeMainControls(void)
   boolean local_team_mode = (!network.enabled && setup.team_mode);
   int i;
 
-  /* set main control text values to dynamically determined values */
+  // set main control text values to dynamically determined values
   sprintf(main_text_name,         "%s",   local_team_mode ? "Team:" : "Name:");
 
   strcpy(main_text_first_level,  int2str(leveldir_current->first_level,
@@ -1133,7 +1208,7 @@ static void InitializeMainControls(void)
   main_text_title_2 = getConfigProgramCopyrightString();
   main_text_title_3 = getConfigProgramCompanyString();
 
-  /* set main control screen positions to dynamically determined values */
+  // set main control screen positions to dynamically determined values
   for (i = 0; main_controls[i].nr != -1; i++)
   {
     struct MainControlInfo *mci = &main_controls[i];
@@ -1169,15 +1244,15 @@ static void InitializeMainControls(void)
       menu.main.input.name.height = input_height;
     }
 
-    if (pos_button != NULL)            /* (x/y may be -1/-1 here) */
+    if (pos_button != NULL)            // (x/y may be -1/-1 here)
     {
       pos_button->width  = button_width;
       pos_button->height = button_height;
     }
 
-    if (pos_text != NULL)              /* (x/y may be -1/-1 here) */
+    if (pos_text != NULL)              // (x/y may be -1/-1 here)
     {
-      /* calculate text size -- needed for text alignment */
+      // calculate text size -- needed for text alignment
       boolean calculate_text_size = (text != NULL);
 
       if (pos_text->width == -1 || calculate_text_size)
@@ -1195,7 +1270,7 @@ static void InitializeMainControls(void)
       }
     }
 
-    if (pos_input != NULL)             /* (x/y may be -1/-1 here) */
+    if (pos_input != NULL)             // (x/y may be -1/-1 here)
     {
       if (visibleTextPos(pos_text))
       {
@@ -1277,7 +1352,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
        int y = mSY + ALIGNED_TEXT_YPOS(pos);
 
 #if 1
-       /* (check why/if this is needed) */
+       // (check why/if this is needed)
        DrawBackgroundForFont(x, y, pos->width, pos->height, font_text);
 #endif
        DrawText(x, y, text, font_text);
@@ -1290,7 +1365,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text,
        int y = mSY + ALIGNED_TEXT_YPOS(pos);
 
 #if 1
-       /* (check why/if this is needed) */
+       // (check why/if this is needed)
        DrawBackgroundForFont(x, y, pos->width, pos->height, font_input);
 #endif
        DrawText(x, y, input, font_input);
@@ -1345,10 +1420,11 @@ static boolean insideTextPosRect(struct TextPosInfo *rect, int x, int y)
   int rect_y = ALIGNED_TEXT_YPOS(rect);
 
 #if 0
-  printf("::: insideTextPosRect: (%d, %d), (%d, %d) [%d, %d] (%d, %d) => %d\n",
-        x, y, rect_x, rect_y, rect->x, rect->y, rect->width, rect->height,
-        (x >= rect_x && x < rect_x + rect->width &&
-         y >= rect_y && y < rect_y + rect->height));
+  Debug("screens:insideTextPosRect",
+       "(%d, %d), (%d, %d) [%d, %d] (%d, %d) => %d",
+       x, y, rect_x, rect_y, rect->x, rect->y, rect->width, rect->height,
+       (x >= rect_x && x < rect_x + rect->width &&
+        y >= rect_y && y < rect_y + rect->height));
 #endif
 
   return (x >= rect_x && x < rect_x + rect->width &&
@@ -1379,30 +1455,35 @@ static void AdjustScrollbar(int id, int items_max, int items_visible,
               GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
-static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
+static void AdjustChooseTreeScrollbar(TreeInfo *ti, int id)
 {
   AdjustScrollbar(id, numTreeInfoInGroup(ti), NUM_MENU_ENTRIES_ON_SCREEN,
-                 first_entry);
+                 ti->cl_first);
 }
 
 static void clearMenuListArea(void)
 {
   int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
 
-  /* correct scrollbar position if placed outside menu (playfield) area */
+  // correct scrollbar position if placed outside menu (playfield) area
   if (scrollbar_xpos > SX + SC_SCROLLBAR_XPOS)
     scrollbar_xpos = SX + SC_SCROLLBAR_XPOS;
 
-  /* clear menu list area, but not title or scrollbar */
+  // clear menu list area, but not title or scrollbar
   DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
                  scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32);
+
+  // special compatibility handling for "Snake Bite" graphics set
+  if (strPrefix(leveldir_current->identifier, "snake_bite"))
+    ClearRectangle(drawto, mSX, mSY + MENU_SCREEN_START_YPOS * 32,
+                  scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32);
 }
 
 static void drawCursorExt(int xpos, int ypos, boolean active, int graphic)
 {
   static int cursor_array[MAX_LEV_FIELDY];
-  int x = mSX + TILEX * xpos;
-  int y = mSY + TILEY * (MENU_SCREEN_START_YPOS + ypos);
+  int x = amSX + TILEX * xpos;
+  int y = amSY + TILEY * (MENU_SCREEN_START_YPOS + ypos);
 
   if (xpos == 0)
   {
@@ -1439,10 +1520,74 @@ static void drawChooseTreeCursor(int ypos, boolean active)
   drawCursorExt(0, ypos, active, -1);
 }
 
-static void DrawHeadline(void)
+static int getChooseTreeEditFont(boolean active)
+{
+  return (active ? FONT_MENU_2_ACTIVE : FONT_MENU_2);
+}
+
+static int getChooseTreeEditXPos(int pos)
+{
+  boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped;
+  int xoffset = (has_scrollbar ? -1 : 0);
+  int xpos = MENU_SCREEN_TEXT2_XPOS + xoffset;
+  int sx = amSX + xpos * TILEX;
+  int font_nr = getChooseTreeEditFont(FALSE);
+  int width = getTextWidth(STR_CHOOSE_TREE_EDIT, font_nr);
+
+  return (pos == POS_RIGHT ? sx + width - 1 : sx);
+}
+
+static int getChooseTreeEditYPos(int ypos_raw)
+{
+  int ypos = MENU_SCREEN_START_YPOS + ypos_raw;
+  int sy = amSY + ypos * TILEY;
+
+  return sy;
+}
+
+static int getChooseTreeEditXPosReal(int pos)
+{
+  int xpos = getChooseTreeEditXPos(pos);
+  int font_nr = getChooseTreeEditFont(FALSE);
+  int font_xoffset = getFontDrawOffsetX(font_nr);
+
+  return xpos + font_xoffset;
+}
+
+static void drawChooseTreeEdit(int ypos_raw, boolean active)
+{
+  int sx = getChooseTreeEditXPos(POS_LEFT);
+  int sy = getChooseTreeEditYPos(ypos_raw);
+  int font_nr = getChooseTreeEditFont(active);
+
+  DrawText(sx, sy, STR_CHOOSE_TREE_EDIT, font_nr);
+}
+
+static void DrawInfoScreen_Headline(int screen_nr, int num_screens,
+                                   int use_global_screens)
 {
-  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1);
-  DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, main_text_title_2);
+  char *info_text_title_1 = getInfoScreenTitle_Generic();
+  char info_text_title_2[MAX_LINE_LEN + 1];
+
+  if (num_screens > 1)
+  {
+    sprintf(info_text_title_2, "Page %d of %d", screen_nr + 1, num_screens);
+  }
+  else
+  {
+    char *text_format = (use_global_screens ? "for %s" : "for \"%s\"");
+    int max_text_len = SXSIZE / getFontWidth(FONT_TITLE_2);
+    int max_name_len = max_text_len - strlen(text_format) - strlen("%s");
+    char name_cut[max_name_len];
+    char *name_full = (use_global_screens ? getProgramTitleString() :
+                      leveldir_current->name);
+
+    snprintf(name_cut, max_name_len, "%s", name_full);
+    snprintf(info_text_title_2, max_text_len, text_format, name_cut);
+  }
+
+  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, info_text_title_1);
+  DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, info_text_title_2);
 }
 
 static void DrawTitleScreenImage(int nr, boolean initial)
@@ -1460,19 +1605,19 @@ static void DrawTitleScreenImage(int nr, boolean initial)
 
   if (width > WIN_XSIZE)
   {
-    /* image width too large for window => center image horizontally */
+    // image width too large for window => center image horizontally
     src_x = (width - WIN_XSIZE) / 2;
     width = WIN_XSIZE;
   }
 
   if (height > WIN_YSIZE)
   {
-    /* image height too large for window => center image vertically */
+    // image height too large for window => center image vertically
     src_y = (height - WIN_YSIZE) / 2;
     height = WIN_YSIZE;
   }
 
-  /* always display title screens centered */
+  // always display title screens centered
   dst_x = (WIN_XSIZE - width) / 2;
   dst_y = (WIN_YSIZE - height) / 2;
 
@@ -1497,34 +1642,34 @@ static void DrawTitleScreenMessage(int nr, boolean initial)
   if (filename == NULL)
     return;
 
-  /* force TITLE font on title message screen */
+  // force TITLE font on title message screen
   SetFontStatus(getTitleMessageGameMode(initial));
 
-  /* if chars *and* width set to "-1", automatically determine width */
+  // if chars *and* width set to "-1", automatically determine width
   if (tmi->chars == -1 && tmi->width == -1)
     tmi->width = viewport.window[game_status].width;
 
-  /* if lines *and* height set to "-1", automatically determine height */
+  // if lines *and* height set to "-1", automatically determine height
   if (tmi->lines == -1 && tmi->height == -1)
     tmi->height = viewport.window[game_status].height;
 
-  /* if chars set to "-1", automatically determine by text and font width */
+  // if chars set to "-1", automatically determine by text and font width
   if (tmi->chars == -1)
     tmi->chars = tmi->width / getFontWidth(tmi->font);
   else
     tmi->width = tmi->chars * getFontWidth(tmi->font);
 
-  /* if lines set to "-1", automatically determine by text and font height */
+  // if lines set to "-1", automatically determine by text and font height
   if (tmi->lines == -1)
     tmi->lines = tmi->height / getFontHeight(tmi->font);
   else
     tmi->height = tmi->lines * getFontHeight(tmi->font);
 
-  /* if x set to "-1", automatically determine by width and alignment */
+  // if x set to "-1", automatically determine by width and alignment
   if (tmi->x == -1)
     tmi->x = -1 * ALIGNED_XPOS(0, tmi->width, tmi->align);
 
-  /* if y set to "-1", automatically determine by height and alignment */
+  // if y set to "-1", automatically determine by height and alignment
   if (tmi->y == -1)
     tmi->y = -1 * ALIGNED_YPOS(0, tmi->height, tmi->valign);
 
@@ -1552,13 +1697,13 @@ static boolean CheckTitleScreen(boolean levelset_has_changed)
   static boolean show_title_initial = TRUE;
   boolean show_titlescreen = FALSE;
 
-  /* needed to be able to skip title screen, if no image or message defined */
+  // needed to be able to skip title screen, if no image or message defined
   InitializeTitleControls(show_title_initial);
 
   if (setup.show_titlescreen && (show_title_initial || levelset_has_changed))
     show_titlescreen = TRUE;
 
-  /* show initial title images and messages only once at program start */
+  // show initial title images and messages only once at program start
   show_title_initial = FALSE;
 
   return (show_titlescreen && num_title_screens > 0);
@@ -1574,7 +1719,7 @@ void DrawMainMenu(void)
 
   FadeSetLeaveScreen();
 
-  /* do not fade out here -- function may continue and fade on editor screen */
+  // do not fade out here -- function may continue and fade on editor screen
 
   UnmapAllGadgets();
   FadeMenuSoundsAndMusic();
@@ -1587,7 +1732,7 @@ void DrawMainMenu(void)
 
   GetPlayerConfig();
 
-  /* needed if last screen was the playing screen, invoked from level editor */
+  // needed if last screen was the playing screen, invoked from level editor
   if (level_editor_test_game)
   {
     CloseDoor(DOOR_CLOSE_ALL);
@@ -1599,23 +1744,40 @@ void DrawMainMenu(void)
     return;
   }
 
-  /* needed if last screen was the setup screen and fullscreen state changed */
-  // (moved to "execSetupGraphics()" to change fullscreen state directly)
-  // ToggleFullscreenOrChangeWindowScalingIfNeeded();
+  // needed if last screen was the playing screen, invoked from hall of fame
+  if (score_info_tape_play)
+  {
+    CloseDoor(DOOR_CLOSE_ALL);
+
+    SetGameStatus(GAME_MODE_SCOREINFO);
+
+    DrawScoreInfo(scores.last_entry_nr);
+
+    return;
+  }
+
+  // reset flag to continue playing next level from hall of fame
+  scores.continue_playing = FALSE;
 
-  /* leveldir_current may be invalid (level group, parent link) */
-  if (!validLevelSeries(leveldir_current))
-    leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
+  // leveldir_current may be invalid (level group, parent link, node copy)
+  leveldir_current = getValidLevelSeries(leveldir_current, leveldir_last_valid);
 
   if (leveldir_current != leveldir_last_valid)
+  {
+    // level setup config may have been loaded to "last played" tree node copy,
+    // but "leveldir_current" now points to the "original" level set tree node,
+    // in which case "handicap_level" may still default to the first level
+    LoadLevelSetup_SeriesInfo();
+
+    UpdateLastPlayedLevels_TreeInfo();
+
     levelset_has_changed = TRUE;
+  }
 
-  /* store valid level series information */
+  // store valid level series information
   leveldir_last_valid = leveldir_current;
 
-  init_last = init;                    /* switch to new busy animation */
-
-  /* needed if last screen (level choice) changed graphics, sounds or music */
+  // needed if last screen (level choice) changed graphics, sounds or music
   ReloadCustomArtwork(0);
 
   if (CheckTitleScreen(levelset_has_changed))
@@ -1630,17 +1792,17 @@ void DrawMainMenu(void)
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
 
-  /* needed if different viewport properties defined for menues */
+  // needed if different viewport properties defined for menues
   ChangeViewportPropertiesIfNeeded();
 
   SetDrawtoField(DRAW_TO_BACKBUFFER);
 
-  /* level_nr may have been set to value over handicap with level editor */
+  // level_nr may have been set to value over handicap with level editor
   if (setup.handicap && level_nr > leveldir_current->handicap_level)
     level_nr = leveldir_current->handicap_level;
 
@@ -1677,20 +1839,21 @@ void DrawMainMenu(void)
 
   PlayMenuSoundsAndMusic();
 
-  /* create gadgets for main menu screen */
+  // create gadgets for main menu screen
   FreeScreenGadgets();
   CreateScreenGadgets();
 
-  /* may be required if audio buttons shown on tape and changed in setup menu */
+  // may be required if audio buttons shown on tape and changed in setup menu
   FreeGameButtons();
   CreateGameButtons();
 
-  /* map gadgets for main menu screen */
+  // map gadgets for main menu screen
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
   UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape());
+  UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SET_INFO, hasLevelSetInfo());
 
-  /* copy actual game door content to door double buffer for OpenDoor() */
+  // copy actual game door content to door double buffer for OpenDoor()
   BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
   BlitBitmap(drawto, bitmap_db_door_2, VX, VY, VXSIZE, VYSIZE, 0, 0);
 
@@ -1701,34 +1864,34 @@ void DrawMainMenu(void)
   FadeIn(fade_mask);
   FadeSetEnterMenu();
 
-  /* update screen area with special editor door */
+  // update screen area with special editor door
   redraw_mask |= REDRAW_ALL;
   BackToFront();
 
   SetMouseCursor(CURSOR_DEFAULT);
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+
+  SyncEmscriptenFilesystem();
+
+  // needed once after program start or after user change
+  CheckApiServerTasks();
 }
 
 static void gotoTopLevelDir(void)
 {
-  /* move upwards until inside (but not above) top level directory */
+  // move upwards until inside (but not above) top level directory
   while (leveldir_current->node_parent &&
         !strEqual(leveldir_current->node_parent->subdir, STRING_TOP_DIRECTORY))
   {
-    /* write a "path" into level tree for easy navigation to last level */
+    // write a "path" into level tree for easy navigation to last level
     if (leveldir_current->node_parent->node_group->cl_first == -1)
     {
       int num_leveldirs = numTreeInfoInGroup(leveldir_current);
-      int leveldir_pos = posTreeInfo(leveldir_current);
-      int num_page_entries;
+      int leveldir_pos = getPosFromTreeInfo(leveldir_current);
+      int num_page_entries = MIN(num_leveldirs, NUM_MENU_ENTRIES_ON_SCREEN);
       int cl_first, cl_cursor;
 
-      if (num_leveldirs <= NUM_MENU_ENTRIES_ON_SCREEN)
-       num_page_entries = num_leveldirs;
-      else
-       num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
-
       cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
       cl_cursor = leveldir_pos - cl_first;
 
@@ -1740,6 +1903,25 @@ static void gotoTopLevelDir(void)
   }
 }
 
+static unsigned int getAutoDelayCounter(struct TitleFadingInfo *fi)
+{
+  boolean use_frame_counter = (fi->auto_delay_unit == AUTO_DELAY_UNIT_FRAMES);
+
+  return (use_frame_counter ? video.frame_counter : Counter());
+}
+
+static boolean TitleAutoDelayReached(unsigned int *counter_var,
+                                    struct TitleFadingInfo *fi)
+{
+  return DelayReachedExt2(counter_var, fi->auto_delay, getAutoDelayCounter(fi));
+}
+
+static void ResetTitleAutoDelay(unsigned int *counter_var,
+                               struct TitleFadingInfo *fi)
+{
+  *counter_var = getAutoDelayCounter(fi);
+}
+
 void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 {
   static unsigned int title_delay = 0;
@@ -1764,7 +1946,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     {
       FadeSetEnterScreen();
 
-      /* use individual title fading instead of global "enter screen" fading */
+      // use individual title fading instead of global "enter screen" fading
       fading = getTitleFading(tci);
     }
 
@@ -1772,26 +1954,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     {
       if (num_title_screens == 0)
       {
-       /* switch game mode from title screen mode back to info screen mode */
+       // switch game mode from title screen mode back to info screen mode
        SetGameStatus(GAME_MODE_INFO);
 
-       /* store that last screen was info screen, not main menu screen */
+       // store that last screen was info screen, not main menu screen
        game_status_last_screen = GAME_MODE_INFO;
 
        DrawInfoScreen_NotAvailable("Title screen information:",
                                    "No title screen for this level set.");
        return;
       }
-
-      FadeMenuSoundsAndMusic();
     }
 
+    FadeMenuSoundsAndMusic();
+
     FadeOut(REDRAW_ALL);
 
-    /* title screens may have different window size */
+    // title screens may have different window size
     ChangeViewportPropertiesIfNeeded();
 
-    /* only required to update logic for redrawing global border */
+    // only required to update logic for redrawing global border
     ClearField();
 
     if (tci->is_image)
@@ -1814,19 +1996,19 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     FadeIn(REDRAW_ALL);
 
-    DelayReached(&title_delay, 0);     /* reset delay counter */
+    ResetTitleAutoDelay(&title_delay, &fading);
 
     return;
   }
 
-  if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay))
+  if (fading.auto_delay > 0 && TitleAutoDelayReached(&title_delay, &fading))
     button = MB_MENU_CHOICE;
 
   if (button == MB_MENU_LEAVE)
   {
     return_to_main_menu = TRUE;
   }
-  else if (button == MB_MENU_CHOICE)
+  else if (button == MB_MENU_CHOICE || dx)
   {
     if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0)
     {
@@ -1839,9 +2021,10 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       return;
     }
 
-    title_screen_nr++;
+    title_screen_nr +=
+      (game_status_last_screen == GAME_MODE_INFO && dx < 0 ? -1 : +1);
 
-    if (title_screen_nr < num_title_screens)
+    if (title_screen_nr >= 0 && title_screen_nr < num_title_screens)
     {
       tci = &title_controls[title_screen_nr];
 
@@ -1877,7 +2060,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
       FadeIn(REDRAW_ALL);
 
-      DelayReached(&title_delay, 0);   /* reset delay counter */
+      ResetTitleAutoDelay(&title_delay, &fading);
     }
     else
     {
@@ -1891,7 +2074,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   {
     SetMouseCursor(CURSOR_DEFAULT);
 
-    /* force full menu screen redraw after displaying title screens */
+    // force full menu screen redraw after displaying title screens
     redraw_mask = REDRAW_ALL;
 
     if (game_status_last_screen == GAME_MODE_INFO)
@@ -1902,7 +2085,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
       DrawInfoScreen();
     }
-    else       /* default: return to main menu */
+    else       // default: return to main menu
     {
       SetGameStatus(GAME_MODE_MAIN);
 
@@ -1911,6 +2094,16 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   }
 }
 
+static void HandleMainMenu_ToggleTeamMode(void)
+{
+  setup.team_mode = !setup.team_mode;
+
+  InitializeMainControls();
+  DrawCursorAndText_Main(MAIN_CONTROL_NAME, TRUE, FALSE);
+
+  DrawPreviewPlayers();
+}
+
 static void HandleMainMenu_SelectLevel(int step, int direction,
                                       int selected_level_nr)
 {
@@ -1929,9 +2122,9 @@ static void HandleMainMenu_SelectLevel(int step, int direction,
 
   if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
   {
-    /* skipping levels is only allowed when trying to skip single level */
+    // skipping levels is only allowed when trying to skip single level
     if (setup.skip_levels && new_level_nr == old_level_nr + 1 &&
-       Request("Level still unsolved! Skip despite handicap?", REQ_ASK))
+       Request("Level still unsolved! Skip it anyway?", REQ_ASK))
     {
       leveldir_current->handicap_level++;
       SaveLevelSetup_SeriesInfo();
@@ -1942,7 +2135,7 @@ static void HandleMainMenu_SelectLevel(int step, int direction,
 
   if (new_level_nr != old_level_nr)
   {
-    struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER);
+    struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER);
 
     PlaySound(SND_MENU_ITEM_SELECTING);
 
@@ -1963,9 +2156,8 @@ static void HandleMainMenu_SelectLevel(int step, int direction,
 
     UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape());
 
-    /* needed because DrawPreviewLevelInitial() takes some time */
-    BackToFront();
-    /* SyncDisplay(); */
+    // force redraw of playfield area (may be reset at this point)
+    redraw_mask |= REDRAW_FIELD;
   }
 }
 
@@ -1975,7 +2167,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   static boolean button_pressed_last = FALSE;
   boolean button_pressed = FALSE;
   int pos = choice;
-  int i;
+  int i = 0;   // needed to prevent compiler warning due to bad code below
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -1984,7 +2176,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
     return;
   }
 
-  if (mx || my)                /* mouse input */
+  if (mx || my)                // mouse input
   {
     pos = -1;
 
@@ -2000,7 +2192,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
     }
 
-    /* check if level preview was clicked */
+    // check if level preview was clicked
     if (insidePreviewRect(&preview, mx - SX, my - SY))
       pos = MAIN_CONTROL_GAME;
 
@@ -2021,7 +2213,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        PlaySound(SND_MENU_BUTTON_RELEASING);
     }
   }
-  else if (dx || dy)   /* keyboard input */
+  else if (dx || dy)   // keyboard input
   {
     if (dx > 0 && (choice == MAIN_CONTROL_INFO ||
                   choice == MAIN_CONTROL_SETUP))
@@ -2061,9 +2253,16 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (dx != 0)
       {
-       if (choice != MAIN_CONTROL_INFO &&
-           choice != MAIN_CONTROL_SETUP)
+       if (choice == MAIN_CONTROL_NAME)
+       {
+         // special case: cursor left or right pressed -- toggle team mode
+         HandleMainMenu_ToggleTeamMode();
+       }
+       else if (choice != MAIN_CONTROL_INFO &&
+                choice != MAIN_CONTROL_SETUP)
+       {
          HandleMainMenu_SelectLevel(1, dx, NO_DIRECT_LEVEL_SELECT);
+       }
       }
     }
     else
@@ -2072,9 +2271,29 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
       if (pos == MAIN_CONTROL_NAME)
       {
-       SetGameStatus(GAME_MODE_PSEUDO_TYPENAME);
+       if ((mx || my) &&
+           insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY))
+       {
+         // special case: menu text "name/team" clicked -- toggle team mode
+         HandleMainMenu_ToggleTeamMode();
+       }
+       else
+       {
+         if (setup.multiple_users)
+         {
+           CloseDoor(DOOR_CLOSE_2);
 
-       HandleTypeName(strlen(setup.player_name), 0);
+           SetGameStatus(GAME_MODE_NAMES);
+
+           DrawChoosePlayerName();
+         }
+         else
+         {
+           SetGameStatus(GAME_MODE_PSEUDO_TYPENAME);
+
+           DrawTypeName();
+         }
+       }
       }
       else if (pos == MAIN_CONTROL_LEVELS)
       {
@@ -2087,6 +2306,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
          SaveLevelSetup_LastSeries();
          SaveLevelSetup_SeriesInfo();
 
+         // restore level set if chosen from "last played level set" menu
+         RestoreLastPlayedLevels(&leveldir_current);
+
          if (setup.internal.choose_from_top_leveldir)
            gotoTopLevelDir();
 
@@ -2099,15 +2321,15 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
        SetGameStatus(GAME_MODE_SCORES);
 
-       DrawHallOfFame(level_nr, -1);
+       DrawHallOfFame(level_nr);
       }
       else if (pos == MAIN_CONTROL_EDITOR)
       {
        if (leveldir_current->readonly &&
-           !strEqual(setup.player_name, "Artsoft"))
-         Request("This level is read only!", REQ_CONFIRM);
+           setup.editor.show_read_only_warning)
+         Request("This level is read-only!", REQ_CONFIRM | REQ_STAY_OPEN);
 
-       CloseDoor(DOOR_CLOSE_2);
+       CloseDoor(DOOR_CLOSE_ALL);
 
        SetGameStatus(GAME_MODE_EDITOR);
 
@@ -2144,8 +2366,13 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
        SaveLevelSetup_LastSeries();
        SaveLevelSetup_SeriesInfo();
 
-        if (Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
+#if defined(PLATFORM_EMSCRIPTEN)
+       Request("Close the browser window to quit!", REQ_CONFIRM);
+#else
+       if (!setup.ask_on_quit_program ||
+           Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
          SetGameStatus(GAME_MODE_QUIT);
+#endif
       }
     }
   }
@@ -2154,13 +2381,13 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 }
 
 
-/* ========================================================================= */
-/* info screen functions                                                     */
-/* ========================================================================= */
+// ============================================================================
+// info screen functions
+// ============================================================================
 
 static struct TokenInfo *info_info;
-static int num_info_info;      /* number of info entries shown on screen */
-static int max_info_info;      /* total number of info entries in list */
+static int num_info_info;      // number of info entries shown on screen
+static int max_info_info;      // total number of info entries in list
 
 static void execInfoTitleScreen(void)
 {
@@ -2220,15 +2447,15 @@ static void execExitInfo(void)
 
 static struct TokenInfo info_info_main[] =
 {
-  { TYPE_ENTER_SCREEN, execInfoTitleScreen,    "Title Screen"          },
-  { TYPE_ENTER_SCREEN, execInfoElements,       "Elements Info"         },
-  { TYPE_ENTER_SCREEN, execInfoMusic,          "Music Info"            },
-  { TYPE_ENTER_SCREEN, execInfoCredits,        "Credits"               },
-  { TYPE_ENTER_SCREEN, execInfoProgram,        "Program Info"          },
-  { TYPE_ENTER_SCREEN, execInfoVersion,        "Version Info"          },
-  { TYPE_ENTER_SCREEN, execInfoLevelSet,       "Level Set Info"        },
+  { TYPE_ENTER_SCREEN, execInfoTitleScreen,    STR_INFO_TITLE          },
+  { TYPE_ENTER_SCREEN, execInfoElements,       STR_INFO_ELEMENTS       },
+  { TYPE_ENTER_SCREEN, execInfoMusic,          STR_INFO_MUSIC          },
+  { TYPE_ENTER_SCREEN, execInfoCredits,        STR_INFO_CREDITS        },
+  { TYPE_ENTER_SCREEN, execInfoProgram,        STR_INFO_PROGRAM        },
+  { TYPE_ENTER_SCREEN, execInfoVersion,        STR_INFO_VERSION        },
+  { TYPE_ENTER_SCREEN, execInfoLevelSet,       STR_INFO_LEVELSET       },
   { TYPE_EMPTY,                NULL,                   ""                      },
-  { TYPE_LEAVE_MENU,   execExitInfo,           "Exit"                  },
+  { TYPE_LEAVE_MENU,   execExitInfo,           STR_INFO_EXIT           },
 
   { 0,                 NULL,                   NULL                    }
 };
@@ -2310,7 +2537,7 @@ static void drawMenuInfoList(int first_entry, int num_page_entries,
     struct TokenInfo *si = &menu_info[menu_info_pos];
     void *value_ptr = si->value;
 
-    /* set some entries to "unchangeable" according to other variables */
+    // set some entries to "unchangeable" according to other variables
     if ((value_ptr == &setup.sound_simple && !audio.sound_available) ||
        (value_ptr == &setup.sound_loops  && !audio.loops_available) ||
        (value_ptr == &setup.sound_music  && !audio.music_available) ||
@@ -2358,10 +2585,22 @@ static void DrawInfoScreen_Main(void)
   int fade_mask = REDRAW_FIELD;
   int i;
 
+  // (needed after displaying info sub-screens directly from main menu)
+  if (info_screens_from_main)
+  {
+    info_screens_from_main = FALSE;
+
+    SetGameStatus(GAME_MODE_MAIN);
+
+    DrawMainMenu();
+
+    return;
+  }
+
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -2370,14 +2609,14 @@ static void DrawInfoScreen_Main(void)
   FreeScreenGadgets();
   CreateScreenGadgets();
 
-  /* (needed after displaying title screens which disable auto repeat) */
+  // (needed after displaying title screens which disable auto repeat)
   KeyboardAutoRepeatOn();
 
   FadeSetLeaveScreen();
 
   FadeOut(fade_mask);
 
-  /* needed if different viewport properties defined for info screen */
+  // needed if different viewport properties defined for info screen
   ChangeViewportPropertiesIfNeeded();
 
   SetMainBackgroundImage(IMG_BACKGROUND_INFO);
@@ -2386,10 +2625,13 @@ static void DrawInfoScreen_Main(void)
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
-  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen");
+  DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, STR_INFO_MAIN);
 
   info_info = info_info_main;
 
+  // use modified info screen info without info screen entries marked as hidden
+  info_info = getSetupInfoFinal(info_info);
+
   // determine maximal number of info entries that can be displayed on screen
   num_info_info = 0;
   for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
@@ -2420,11 +2662,14 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
   static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
   static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
   static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
+  boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped;
+  int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x;
+  int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE);
   int *num_page_entries_last = num_page_entries_all_last[game_status];
   int *choice_store = choice_stores[game_status];
   int *first_entry_store = first_entry_stores[game_status];
-  int choice = choice_store[mode];             /* starts with 0 */
-  int first_entry = first_entry_store[mode];   /* starts with 0 */
+  int choice = choice_store[mode];             // starts with 0
+  int first_entry = first_entry_store[mode];   // starts with 0
   int x = 0;
   int y = choice - first_entry;
   int y_old = y;
@@ -2447,7 +2692,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
       num_page_entries_last[mode] = num_page_entries;
     }
 
-    /* advance to first valid menu entry */
+    // advance to first valid menu entry
     while (choice < num_page_entries &&
           menu_info[choice].type & TYPE_SKIP_ENTRY)
       choice++;
@@ -2495,28 +2740,28 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
 
        menu_callback_function();
 
-       break;  /* absolutely needed because function changes 'menu_info'! */
+       break;  // absolutely needed because function changes 'menu_info'!
       }
     }
 
     return;
   }
 
-  if (mx || my)                /* mouse input */
+  if (mx || my)                // mouse input
   {
     x = (mx - mSX) / 32;
     y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
   }
-  else if (dx || dy)   /* keyboard or scrollbar/scrollbutton input */
+  else if (dx || dy)   // keyboard or scrollbar/scrollbutton input
   {
-    /* move cursor instead of scrolling when already at start/end of list */
+    // move cursor instead of scrolling when already at start/end of list
     if (dy == -1 * SCROLL_LINE && first_entry == 0)
       dy = -1;
     else if (dy == +1 * SCROLL_LINE &&
             first_entry + num_page_entries == max_page_entries)
       dy = 1;
 
-    /* handle scrolling screen one line or page */
+    // handle scrolling screen one line or page
     if (y + dy < 0 ||
        y + dy > num_page_entries - 1)
     {
@@ -2527,7 +2772,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
 
       if (dy < 0 && first_entry > 0)
       {
-       /* scroll page/line up */
+       // scroll page/line up
 
        first_entry -= step;
        if (first_entry < 0)
@@ -2537,7 +2782,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
       }
       else if (dy > 0 && first_entry + num_page_entries < max_page_entries)
       {
-       /* scroll page/line down */
+       // scroll page/line down
 
        first_entry += step;
        if (first_entry + num_page_entries > max_page_entries)
@@ -2600,7 +2845,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
     else if (dy)
       y += dy;
 
-    /* jump to next non-empty menu entry (up or down) */
+    // jump to next non-empty menu entry (up or down)
     while (first_entry + y > 0 &&
           first_entry + y < max_page_entries - 1 &&
           menu_info[first_entry + y].type & TYPE_SKIP_ENTRY)
@@ -2641,7 +2886,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
 
   if (!anyScrollbarGadgetActive() &&
       IN_VIS_MENU(x, y) &&
-      mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
+      mx < mx_right_border &&
       y >= 0 && y < num_page_entries)
   {
     if (button)
@@ -2670,7 +2915,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
 
            menu_callback_function();
 
-           /* absolutely needed because function changes 'menu_info'! */
+           // absolutely needed because function changes 'menu_info'!
            break;
          }
        }
@@ -2682,17 +2927,17 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
 
-      /* when selecting key headline, execute function for key value change */
+      // when selecting key headline, execute function for key value change
       if (menu_info[first_entry + y].type & TYPE_KEYTEXT &&
          menu_info[first_entry + y + 1].type & TYPE_KEY)
        y++;
 
-      /* when selecting string value, execute function for list selection */
+      // when selecting string value, execute function for list selection
       if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 &&
          menu_info[first_entry + y - 1].type & TYPE_ENTER_LIST)
        y--;
 
-      /* when selecting string value, execute function for text input gadget */
+      // when selecting string value, execute function for text input gadget
       if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 &&
          menu_info[first_entry + y - 1].type & TYPE_TEXT_INPUT)
        y--;
@@ -2751,13 +2996,9 @@ static int getMenuTextStep(int spacing_height, int font_nr)
 
 void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 {
-  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 ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
@@ -2765,26 +3006,22 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
   FadeOut(REDRAW_FIELD);
 
   ClearField();
-  DrawHeadline();
 
-  DrawTextSCentered(ystart1, font_title, text_title);
-  DrawTextSCentered(ystart2, font_error, text_error);
+  DrawInfoScreen_Headline(0, 1, FALSE);
 
-  DrawTextSCentered(ybottom, font_foot,
-                   "Press any key or button for info menu");
+  DrawTextSCentered(ystart, font_error, text_error);
+  DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU);
 
   FadeIn(REDRAW_FIELD);
 }
 
 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 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;
+  static int infoscreen_step[MAX_INFO_ELEMENTS_IN_ARRAY];
+  static int infoscreen_frame[MAX_INFO_ELEMENTS_IN_ARRAY];
+  int font_foot = MENU_INFO_FONT_FOOT;
+  int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT;
+  int ystart = mSY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
   int ystep = MENU_SCREEN_INFO_YSTEP;
   int element, action, direction;
@@ -2798,13 +3035,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
     for (i = 0; i < NUM_INFO_ELEMENTS_ON_SCREEN; i++)
       infoscreen_step[i] = infoscreen_frame[i] = 0;
 
-    ClearField();
-    DrawHeadline();
-
-    DrawTextSCentered(ystart1, font_title, "The Game Elements:");
-
-    DrawTextSCentered(ybottom, font_foot,
-                     "Press any key or button for next page");
+    DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE);
 
     FrameCounter = 0;
   }
@@ -2875,9 +3106,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 
     j++;
 
-    ClearRectangleOnBackground(drawto, xstart, ystart2 + (i - start) * ystep,
+    ClearRectangleOnBackground(drawto, xstart, ystart + (i - start) * ystep,
                               TILEX, TILEY);
-    DrawFixedGraphicAnimationExt(drawto, xstart, ystart2 + (i - start) * ystep,
+    DrawFixedGraphicAnimationExt(drawto, xstart, ystart + (i - start) * ystep,
                                 graphic, sync_frame, USE_MASKING);
 
     if (init)
@@ -2913,7 +3144,7 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
   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 ystart = mSY + MENU_SCREEN_INFO_YSTART + yoffset;
   int ystep = TILEY + 4;
   int pad_left = xstart - SX;
   int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
@@ -2921,22 +3152,22 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
   int max_lines_per_text = 2;    
   char *text = NULL;
 
-  if (action != -1 && direction != -1)         /* element.action.direction */
+  if (action != -1 && direction != -1)         // element.action.direction
     text = getHelpText(element, action, direction);
 
-  if (text == NULL && action != -1)            /* element.action */
+  if (text == NULL && action != -1)            // element.action
     text = getHelpText(element, action, -1);
 
-  if (text == NULL && direction != -1)         /* element.direction */
+  if (text == NULL && direction != -1)         // element.direction
     text = getHelpText(element, -1, direction);
 
-  if (text == NULL)                            /* base element */
+  if (text == NULL)                            // base element
     text = getHelpText(element, -1, -1);
 
-  if (text == NULL)                            /* not found */
+  if (text == NULL)                            // not found
     text = "No description available";
 
-  if (strlen(text) <= max_chars_per_line)      /* only one line of text */
+  if (strlen(text) <= max_chars_per_line)      // only one line of text
     ystart += getFontHeight(font_nr) / 2;
 
   DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr,
@@ -2951,9 +3182,9 @@ static void DrawInfoScreen_TitleScreen(void)
   DrawTitleScreen();
 }
 
-void HandleInfoScreen_TitleScreen(int button)
+void HandleInfoScreen_TitleScreen(int dx, int dy, int button)
 {
-  HandleTitleScreen(0, 0, 0, 0, button);
+  HandleTitleScreen(0, 0, dx, dy, button);
 }
 
 static void DrawInfoScreen_Elements(void)
@@ -2965,20 +3196,22 @@ static void DrawInfoScreen_Elements(void)
   LoadHelpAnimInfo();
   LoadHelpTextInfo();
 
-  HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
+  HandleInfoScreen_Elements(0, 0, MB_MENU_INITIALIZE);
 
   FadeIn(REDRAW_FIELD);
 }
 
-void HandleInfoScreen_Elements(int button)
+void HandleInfoScreen_Elements(int dx, int dy, int button)
 {
-  static unsigned int info_delay = 0;
+  static DelayCounter info_delay = { 0 };
   static int num_anims;
   static int num_pages;
   static int page;
   int anims_per_page = NUM_INFO_ELEMENTS_ON_SCREEN;
   int i;
 
+  info_delay.value = GameFrameDelay;
+
   if (button == MB_MENU_INITIALIZE)
   {
     boolean new_element = TRUE;
@@ -3009,16 +3242,16 @@ void HandleInfoScreen_Elements(int button)
 
     return;
   }
-  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
+  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE || dx)
   {
     if (button != MB_MENU_INITIALIZE)
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
 
-      page++;
+      page += (dx < 0 ? -1 : +1);
     }
 
-    if (page >= num_pages)
+    if (page < 0 || page >= num_pages)
     {
       FadeMenuSoundsAndMusic();
 
@@ -3028,12 +3261,15 @@ void HandleInfoScreen_Elements(int button)
       return;
     }
 
-    if (page > 0)
+    if (button != MB_MENU_INITIALIZE)
       FadeSetNextScreen();
 
     if (button != MB_MENU_INITIALIZE)
       FadeOut(REDRAW_FIELD);
 
+    ClearField();
+
+    DrawInfoScreen_Headline(page, num_pages, TRUE);
     DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE);
 
     if (button != MB_MENU_INITIALIZE)
@@ -3041,7 +3277,7 @@ void HandleInfoScreen_Elements(int button)
   }
   else
   {
-    if (DelayReached(&info_delay, GameFrameDelay))
+    if (DelayReached(&info_delay))
       if (page < num_pages)
        DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE);
 
@@ -3056,31 +3292,43 @@ static void DrawInfoScreen_Music(void)
   FadeOut(REDRAW_FIELD);
 
   ClearField();
-  DrawHeadline();
+
+  DrawInfoScreen_Headline(0, 1, TRUE);
 
   LoadMusicInfo();
 
-  HandleInfoScreen_Music(MB_MENU_INITIALIZE);
+  HandleInfoScreen_Music(0, 0, MB_MENU_INITIALIZE);
 
   FadeIn(REDRAW_FIELD);
 }
 
-void HandleInfoScreen_Music(int button)
+void HandleInfoScreen_Music(int dx, int dy, int button)
 {
   static struct MusicFileInfo *list = NULL;
+  static int num_screens = 0;
+  static int screen_nr = 0;
   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 spacing_head = menu.headline2_spacing_info[info_mode];
+  int ystep_head = getMenuTextStep(spacing_head,  font_head);
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   if (button == MB_MENU_INITIALIZE)
   {
+    struct MusicFileInfo *list_ptr = music_file_info;
+
+    num_screens = 0;
+    screen_nr = 0;
+
+    while (list_ptr != NULL)
+    {
+      list_ptr = list_ptr->next;
+      num_screens++;
+    }
+
     list = music_file_info;
 
     if (list == NULL)
@@ -3088,13 +3336,11 @@ void HandleInfoScreen_Music(int button)
       FadeMenuSoundsAndMusic();
 
       ClearField();
-      DrawHeadline();
 
-      DrawTextSCentered(ystart, font_title,
-                       "No music info for this level set.");
+      DrawInfoScreen_Headline(0, 1, TRUE);
 
-      DrawTextSCentered(ybottom, font_foot,
-                       "Press any key or button for info menu");
+      DrawTextSCentered(ystart, font_title, "No music info for this level set.");
+      DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU);
 
       return;
     }
@@ -3111,14 +3357,17 @@ void HandleInfoScreen_Music(int button)
 
     return;
   }
-  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
+  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE || dx)
   {
     if (button != MB_MENU_INITIALIZE)
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
 
       if (list != NULL)
-       list = list->next;
+      {
+       list = (dx < 0 ? list->prev : list->next);
+       screen_nr += (dx < 0 ? -1 : +1);
+      }
     }
 
     if (list == NULL)
@@ -3140,40 +3389,36 @@ void HandleInfoScreen_Music(int button)
       FadeOut(REDRAW_FIELD);
 
     ClearField();
-    DrawHeadline();
+
+    DrawInfoScreen_Headline(screen_nr, num_screens, TRUE);
 
     if (list->is_sound)
     {
       int sound = list->music;
 
-      if (sound_info[sound].loop)
+      if (IS_LOOP_SOUND(sound))
        PlaySoundLoop(sound);
       else
        PlaySound(sound);
-
-      DrawTextSCentered(ystart, font_title, "The Game Background Sounds:");
     }
     else
     {
       int music = list->music;
 
-      if (music_info[music].loop)
+      if (IS_LOOP_MUSIC(music))
        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(ystart, font_head, list->title_header);
-       ystart += ystep_head;
-      }
+      else
+       DrawTextSCentered(ystart, font_head, "Track");
+
+      ystart += ystep_head;
 
       DrawTextFCentered(ystart, font_text, "\"%s\"", list->title);
       ystart += ystep_head;
@@ -3218,458 +3463,62 @@ void HandleInfoScreen_Music(int button)
       ystart += ystep_head;
     }
 
-    DrawTextSCentered(ybottom, FONT_TEXT_4,
-                     "Press any key or button for next page");
+    DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE);
 
     if (button != MB_MENU_INITIALIZE)
       FadeIn(REDRAW_FIELD);
   }
 
-  if (list != NULL && list->is_sound && sound_info[list->music].loop)
+  if (list != NULL && list->is_sound && IS_LOOP_SOUND(list->music))
     PlaySoundLoop(list->music);
 }
 
-static void DrawInfoScreen_CreditsScreen(int screen_nr)
+static void DrawInfoScreen_Version(void)
 {
-  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 font_head = MENU_INFO_FONT_HEAD;
+  int font_text = MENU_INFO_FONT_TEXT;
+  int font_foot = MENU_INFO_FONT_FOOT;
+  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_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_YSTART;
   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;
+  SDL_version sdl_version_compiled;
+  const SDL_version *sdl_version_linked;
+  int driver_name_len = 10;
+  SDL_version sdl_version_linked_ext;
+  const char *driver_name = NULL;
 
-  ClearField();
-  DrawHeadline();
-
-  DrawTextSCentered(ystart, font_title, "Credits:");
-  ystart += ystep_title;
-
-  if (screen_nr == 0)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Peter Liepa");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "\"Boulder Dash\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "1984");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "First Star Software");
-  }
-  else if (screen_nr == 1)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Klaus Heinz & Volker Wertich");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "\"Emerald Mine\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "1987");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Kingsoft");
-  }
-  else if (screen_nr == 2)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Michael Stopp & Philip Jespersen");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "\"Supaplex\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "1991");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Digital Integration");
-  }
-  else if (screen_nr == 3)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Hiroyuki Imabayashi");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "\"Sokoban\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "1982");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Thinking Rabbit");
-  }
-  else if (screen_nr == 4)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Alan Bond");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "and");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "J\xfcrgen Bonhagen");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for the continuous creation");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_head,
-                     "of outstanding level sets");
-  }
-  else if (screen_nr == 5)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Peter Elzner");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for ideas and inspiration by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Diamond Caves");
-    ystart += ystep_para;
-
-    DrawTextSCentered(ystart, font_head,
-                     "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Steffest");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for ideas and inspiration by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "DX-Boulderdash");
-  }
-  else if (screen_nr == 6)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "David Tritscher");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for the code base used for the");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_head,
-                     "native Emerald Mine engine");
-  }
-  else if (screen_nr == 7)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Guido Schulz");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for the initial DOS port");
-    ystart += ystep_para;
-
-    DrawTextSCentered(ystart, font_head,
-                     "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "Karl H\xf6rnell");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "for some additional toons");
-  }
-  else if (screen_nr == 8)
-  {
-    DrawTextSCentered(ystart, font_head,
-                     "And not to forget:");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-                     "Many thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-                     "All those who contributed");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_text,
-                     "levels to this game");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_text,
-                     "since 1995");
-  }
-
-  DrawTextSCentered(ybottom, font_foot,
-                   "Press any key or button for next page");
-}
-
-static void DrawInfoScreen_Credits(void)
-{
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS);
-
-  FadeMenuSoundsAndMusic();
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
 
   FadeOut(REDRAW_FIELD);
 
-  HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
+  ClearField();
 
-  FadeIn(REDRAW_FIELD);
-}
+  DrawInfoScreen_Headline(0, 1, TRUE);
 
-void HandleInfoScreen_Credits(int button)
-{
-  static int screen_nr = 0;
-  int num_screens = 9;
+  DrawTextF(xstart1, ystart, font_head, "Name");
+  DrawTextF(xstart2, ystart, font_text, getProgramTitleString());
+  ystart += ystep_line;
 
-  if (button == MB_MENU_INITIALIZE)
+  if (!strEqual(getProgramVersionString(), getProgramRealVersionString()))
   {
-    screen_nr = 0;
+    DrawTextF(xstart1, ystart, font_head, "Version (fake)");
+    DrawTextF(xstart2, ystart, font_text, getProgramVersionString());
+    ystart += ystep_line;
 
-    // DrawInfoScreen_CreditsScreen(screen_nr);
+    DrawTextF(xstart1, ystart, font_head, "Version (real)");
+    DrawTextF(xstart2, ystart, font_text, getProgramRealVersionString());
+    ystart += ystep_line;
   }
-
-  if (button == MB_MENU_LEAVE)
-  {
-    PlaySound(SND_MENU_ITEM_SELECTING);
-
-    info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
-
-    return;
-  }
-  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
-  {
-    if (button != MB_MENU_INITIALIZE)
-    {
-      PlaySound(SND_MENU_ITEM_SELECTING);
-
-      screen_nr++;
-    }
-
-    if (screen_nr >= num_screens)
-    {
-      FadeMenuSoundsAndMusic();
-
-      info_mode = INFO_MODE_MAIN;
-      DrawInfoScreen();
-
-      return;
-    }
-
-    if (screen_nr > 0)
-      FadeSetNextScreen();
-
-    if (button != MB_MENU_INITIALIZE)
-      FadeOut(REDRAW_FIELD);
-
-    DrawInfoScreen_CreditsScreen(screen_nr);
-
-    if (button != MB_MENU_INITIALIZE)
-      FadeIn(REDRAW_FIELD);
-  }
-  else
-  {
-    PlayMenuSoundIfLoop();
-  }
-}
-
-static void DrawInfoScreen_Program(void)
-{
-  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);
-
-  FadeOut(REDRAW_FIELD);
-
-  ClearField();
-  DrawHeadline();
-
-  DrawTextSCentered(ystart, font_title, "Program Information:");
-  ystart += ystep_title;
-
-  DrawTextSCentered(ystart, font_head,
-                   "This game is Freeware!");
-  ystart += ystep_head;
-  DrawTextSCentered(ystart, font_head,
-                   "If you like it, send e-mail to:");
-  ystart += ystep_head;
-  DrawTextSCentered(ystart, font_text,
-                   setup.internal.program_email);
-  ystart += ystep_para;
-
-  DrawTextSCentered(ystart, font_head,
-                   "More information and levels:");
-  ystart += ystep_head;
-  DrawTextSCentered(ystart, font_text,
-                   setup.internal.program_website);
-  ystart += ystep_para;
-
-  DrawTextSCentered(ystart, font_head,
-                   "If you have created new levels,");
-  ystart += ystep_line;
-  DrawTextSCentered(ystart, font_head,
-                   "send them to me to include them!");
-  ystart += ystep_head;
-  DrawTextSCentered(ystart, font_head,
-                   ":-)");
-
-  DrawTextSCentered(ybottom, font_foot,
-                   "Press any key or button for info menu");
-
-  FadeIn(REDRAW_FIELD);
-}
-
-void HandleInfoScreen_Program(int button)
-{
-  if (button == MB_MENU_LEAVE)
-  {
-    PlaySound(SND_MENU_ITEM_SELECTING);
-
-    info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
-
-    return;
-  }
-  else if (button == MB_MENU_CHOICE)
-  {
-    PlaySound(SND_MENU_ITEM_SELECTING);
-
-    FadeMenuSoundsAndMusic();
-
-    info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
-  }
-  else
-  {
-    PlayMenuSoundIfLoop();
-  }
-}
-
-static void DrawInfoScreen_Version(void)
-{
-  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_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;
-  SDL_version sdl_version_compiled;
-  const SDL_version *sdl_version_linked;
-  int driver_name_len = 10;
-#if defined(TARGET_SDL2)
-  SDL_version sdl_version_linked_ext;
-  const char *driver_name = NULL;
-#else
-  char driver_name[driver_name_len];
-#endif
-
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
-
-  FadeOut(REDRAW_FIELD);
-
-  ClearField();
-  DrawHeadline();
-
-  DrawTextSCentered(ystart, font_title, "Version Information:");
-  ystart += ystep_title;
-
-  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;
-
-    DrawTextF(xstart1, ystart, font_head, "Version (real)");
-    DrawTextF(xstart2, ystart, font_text, getProgramRealVersionString());
-    ystart += ystep_line;
-  }
-  else
+  else
   {
     DrawTextF(xstart1, ystart, font_head, "Version");
     DrawTextF(xstart2, ystart, font_text, getProgramVersionString());
@@ -3677,7 +3526,9 @@ static void DrawInfoScreen_Version(void)
   }
 
   DrawTextF(xstart1, ystart, font_head, "Platform");
-  DrawTextF(xstart2, ystart, font_text, PLATFORM_STRING);
+  DrawTextF(xstart2, ystart, font_text, "%s (%s)",
+           PLATFORM_STRING,
+           PLATFORM_XX_BIT_STRING);
   ystart += ystep_line;
 
   DrawTextF(xstart1, ystart, font_head, "Target");
@@ -3686,6 +3537,10 @@ static void DrawInfoScreen_Version(void)
 
   DrawTextF(xstart1, ystart, font_head, "Source date");
   DrawTextF(xstart2, ystart, font_text, getSourceDateString());
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Commit hash");
+  DrawTextF(xstart2, ystart, font_text, getSourceHashString());
   ystart += ystep_para;
 
   DrawTextF(xstart1, ystart, font_head, "Library");
@@ -3694,12 +3549,8 @@ static void DrawInfoScreen_Version(void)
   ystart += ystep_head;
 
   SDL_VERSION(&sdl_version_compiled);
-#if defined(TARGET_SDL2)
   SDL_GetVersion(&sdl_version_linked_ext);
   sdl_version_linked = &sdl_version_linked_ext;
-#else
-  sdl_version_linked = SDL_Linked_Version();
-#endif
 
   DrawTextF(xstart1, ystart, font_text, "SDL");
   DrawTextF(xstart2, ystart, font_text, "%d.%d.%d",
@@ -3759,29 +3610,30 @@ static void DrawInfoScreen_Version(void)
   DrawTextF(xstart3, ystart, font_head, "Used");
   ystart += ystep_head;
 
-#if defined(TARGET_SDL2)
-  driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len);
-#else
-  SDL_VideoDriverName(driver_name, driver_name_len);
-#endif
+  driver_name =
+    getStringCopyNStatic(SDLGetRendererName(), driver_name_len);
+
+  DrawTextF(xstart1, ystart, font_text, "Render Driver");
+  DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_renderdriver);
+  DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
+  ystart += ystep_line;
+
+  driver_name =
+    getStringCopyNStatic(SDL_GetCurrentVideoDriver(), driver_name_len);
 
-  DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver");
+  DrawTextF(xstart1, ystart, font_text, "Video Driver");
   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);
-#else
-  SDL_AudioDriverName(driver_name, driver_name_len);
-#endif
+  driver_name =
+    getStringCopyNStatic(SDL_GetCurrentAudioDriver(), driver_name_len);
 
-  DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver");
+  DrawTextF(xstart1, ystart, font_text, "Audio Driver");
   DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver);
   DrawTextF(xstart3, ystart, font_text, "%s", driver_name);
 
-  DrawTextSCentered(ybottom, font_foot,
-                   "Press any key or button for info menu");
+  DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU);
 
   FadeIn(REDRAW_FIELD);
 }
@@ -3812,87 +3664,221 @@ void HandleInfoScreen_Version(int button)
   }
 }
 
-static void DrawInfoScreen_LevelSet(void)
+static char *getInfoScreenTitle_Generic(void)
+{
+  return (info_mode == INFO_MODE_MAIN     ? STR_INFO_MAIN     :
+         info_mode == INFO_MODE_TITLE    ? STR_INFO_TITLE    :
+         info_mode == INFO_MODE_ELEMENTS ? STR_INFO_ELEMENTS :
+         info_mode == INFO_MODE_MUSIC    ? STR_INFO_MUSIC    :
+         info_mode == INFO_MODE_CREDITS  ? STR_INFO_CREDITS  :
+         info_mode == INFO_MODE_PROGRAM  ? STR_INFO_PROGRAM  :
+         info_mode == INFO_MODE_VERSION  ? STR_INFO_VERSION  :
+         info_mode == INFO_MODE_LEVELSET ? STR_INFO_LEVELSET :
+         "");
+}
+
+static int getInfoScreenBackground_Generic(void)
 {
-  struct TitleMessageInfo *tmi = &readme;
-  char *filename = getLevelSetInfoFilename();
-  char *title = "Level Set Information:";
-  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  return (info_mode == INFO_MODE_CREDITS  ? IMG_BACKGROUND_INFO_CREDITS  :
+         info_mode == INFO_MODE_PROGRAM  ? IMG_BACKGROUND_INFO_PROGRAM  :
+         info_mode == INFO_MODE_LEVELSET ? IMG_BACKGROUND_INFO_LEVELSET :
+         IMG_BACKGROUND_INFO);
+}
+
+static char *getInfoScreenFilename_Generic(int nr, boolean global)
+{
+  return (info_mode == INFO_MODE_CREDITS  ? getCreditsFilename(nr, global) :
+         info_mode == INFO_MODE_PROGRAM  ? getProgramInfoFilename(nr)     :
+         info_mode == INFO_MODE_LEVELSET ? getLevelSetInfoFilename(nr)    :
+         NULL);
+}
+
+static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens,
+                                        int use_global_screens)
+{
+  char *filename = getInfoScreenFilename_Generic(screen_nr, use_global_screens);
+  int font_text = MENU_INFO_FONT_TEXT;
+  int font_foot = MENU_INFO_FONT_FOOT;
+  int spacing_line = menu.line_spacing_info[info_mode];
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
-  if (filename == NULL)
+  ClearField();
+
+  DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens);
+
+  if (info_mode == INFO_MODE_CREDITS ||
+      info_mode == INFO_MODE_PROGRAM)
   {
-    DrawInfoScreen_NotAvailable(title, "No information for this level set.");
+    int width = SXSIZE;
+    int height = MENU_SCREEN_INFO_YBOTTOM - MENU_SCREEN_INFO_YSTART;
+    int chars = width / getFontWidth(font_text);
+    int lines = height / getFontHeight(font_text);
+    int padx = (width - chars * getFontWidth(font_text)) / 2;
+    int line_spacing = getMenuTextSpacing(spacing_line, font_text);
+    boolean autowrap = FALSE;
+    boolean centered = TRUE;
+    boolean parse_comments = TRUE;
 
-    return;
+    DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART,
+                filename, font_text, chars, -1, lines, line_spacing, -1,
+                autowrap, centered, parse_comments);
   }
+  else if (info_mode == INFO_MODE_LEVELSET)
+  {
+    struct TitleMessageInfo *tmi = &readme;
 
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
+    // if x position set to "-1", automatically determine by playfield width
+    if (tmi->x == -1)
+      tmi->x = SXSIZE / 2;
 
-  FadeOut(REDRAW_FIELD);
+    // if y position set to "-1", use static default value
+    if (tmi->y == -1)
+      tmi->y = MENU_SCREEN_INFO_YSTART;
 
-  ClearField();
-  DrawHeadline();
+    // if width set to "-1", automatically determine by playfield width
+    if (tmi->width == -1)
+      tmi->width = SXSIZE - 2 * TILEX;
 
-  DrawTextSCentered(ystart, FONT_TEXT_1, title);
+    // if height set to "-1", automatically determine by playfield height
+    if (tmi->height == -1)
+      tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10;
 
-  /* if x position set to "-1", automatically determine by playfield width */
-  if (tmi->x == -1)
-    tmi->x = SXSIZE / 2;
+    // if chars set to "-1", automatically determine by text and font width
+    if (tmi->chars == -1)
+      tmi->chars = tmi->width / getFontWidth(tmi->font);
+    else
+      tmi->width = tmi->chars * getFontWidth(tmi->font);
 
-  /* if y position set to "-1", use static default value */
-  if (tmi->y == -1)
-    tmi->y = 150;
+    // if lines set to "-1", automatically determine by text and font height
+    if (tmi->lines == -1)
+      tmi->lines = tmi->height / getFontHeight(tmi->font);
+    else
+      tmi->height = tmi->lines * getFontHeight(tmi->font);
 
-  /* if width set to "-1", automatically determine by playfield width */
-  if (tmi->width == -1)
-    tmi->width = SXSIZE - 2 * TILEX;
+    DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi),
+                filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1,
+                tmi->autowrap, tmi->centered, tmi->parse_comments);
+  }
 
-  /* if height set to "-1", automatically determine by playfield height */
-  if (tmi->height == -1)
-    tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10;
+  boolean last_screen = (screen_nr == num_screens - 1);
+  char *text_foot = (last_screen ? TEXT_NEXT_MENU : TEXT_NEXT_PAGE);
 
-  /* if chars set to "-1", automatically determine by text and font width */
-  if (tmi->chars == -1)
-    tmi->chars = tmi->width / getFontWidth(tmi->font);
-  else
-    tmi->width = tmi->chars * getFontWidth(tmi->font);
+  DrawTextSCentered(ybottom, font_foot, text_foot);
+}
 
-  /* if lines set to "-1", automatically determine by text and font height */
-  if (tmi->lines == -1)
-    tmi->lines = tmi->height / getFontHeight(tmi->font);
-  else
-    tmi->height = tmi->lines * getFontHeight(tmi->font);
+static void DrawInfoScreen_Generic(void)
+{
+  SetMainBackgroundImageIfDefined(getInfoScreenBackground_Generic());
 
-  DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi),
-              filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1,
-              tmi->autowrap, tmi->centered, tmi->parse_comments);
+  FadeMenuSoundsAndMusic();
+
+  FadeOut(REDRAW_FIELD);
 
-  DrawTextSCentered(ybottom, FONT_TEXT_4,
-                   "Press any key or button for info menu");
+  HandleInfoScreen_Generic(0, 0, MB_MENU_INITIALIZE);
 
   FadeIn(REDRAW_FIELD);
 }
 
-static void HandleInfoScreen_LevelSet(int button)
+void HandleInfoScreen_Generic(int dx, int dy, int button)
 {
-  if (button == MB_MENU_LEAVE)
+  static char *text_no_info = "";
+  static int num_screens = 0;
+  static int screen_nr = 0;
+  static boolean use_global_screens = FALSE;
+
+  if (button == MB_MENU_INITIALIZE)
+  {
+    num_screens = 0;
+    screen_nr = 0;
+
+    if (info_mode == INFO_MODE_CREDITS)
+    {
+      int i;
+
+      for (i = 0; i < 2; i++)
+      {
+       use_global_screens = i;         // check for "FALSE", then "TRUE"
+
+       // determine number of (global or level set specific) credits screens
+       while (getCreditsFilename(num_screens, use_global_screens) != NULL)
+         num_screens++;
+
+       if (num_screens > 0)
+         break;
+      }
+
+      text_no_info = "No credits available.";
+    }
+    else if (info_mode == INFO_MODE_PROGRAM)
+    {
+      use_global_screens = TRUE;
+
+      // determine number of program info screens
+      while (getProgramInfoFilename(num_screens) != NULL)
+       num_screens++;
+
+      text_no_info = "No program info available.";
+    }
+    else if (info_mode == INFO_MODE_LEVELSET)
+    {
+      use_global_screens = FALSE;
+
+      // determine number of levelset info screens
+      while (getLevelSetInfoFilename(num_screens) != NULL)
+       num_screens++;
+
+      text_no_info = "No level set info available.";
+    }
+
+    if (num_screens == 0)
+    {
+      int font_title = MENU_INFO_FONT_TITLE;
+      int font_foot  = MENU_INFO_FONT_FOOT;
+      int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
+      int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
+
+      ClearField();
+
+      DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens);
+
+      DrawTextSCentered(ystart, font_title, text_no_info);
+      DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU);
+
+      return;
+    }
+
+    DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens);
+  }
+  else if (button == MB_MENU_LEAVE)
   {
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     info_mode = INFO_MODE_MAIN;
     DrawInfoScreen();
-
-    return;
   }
-  else if (button == MB_MENU_CHOICE)
+  else if (button == MB_MENU_CHOICE || dx)
   {
     PlaySound(SND_MENU_ITEM_SELECTING);
 
-    FadeMenuSoundsAndMusic();
+    screen_nr += (dx < 0 ? -1 : +1);
 
-    info_mode = INFO_MODE_MAIN;
-    DrawInfoScreen();
+    if (screen_nr < 0 || screen_nr >= num_screens)
+    {
+      FadeMenuSoundsAndMusic();
+
+      info_mode = INFO_MODE_MAIN;
+      DrawInfoScreen();
+    }
+    else
+    {
+      FadeSetNextScreen();
+
+      FadeOut(REDRAW_FIELD);
+
+      DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens);
+
+      FadeIn(REDRAW_FIELD);
+    }
   }
   else
   {
@@ -3909,13 +3895,13 @@ static void DrawInfoScreen(void)
   else if (info_mode == INFO_MODE_MUSIC)
     DrawInfoScreen_Music();
   else if (info_mode == INFO_MODE_CREDITS)
-    DrawInfoScreen_Credits();
+    DrawInfoScreen_Generic();
   else if (info_mode == INFO_MODE_PROGRAM)
-    DrawInfoScreen_Program();
+    DrawInfoScreen_Generic();
   else if (info_mode == INFO_MODE_VERSION)
     DrawInfoScreen_Version();
   else if (info_mode == INFO_MODE_LEVELSET)
-    DrawInfoScreen_LevelSet();
+    DrawInfoScreen_Generic();
   else
     DrawInfoScreen_Main();
 
@@ -3925,122 +3911,443 @@ static void DrawInfoScreen(void)
     PlayMenuSoundsAndMusic();
 }
 
-void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
+void DrawInfoScreen_FromMainMenu(int nr)
 {
-  if (info_mode == INFO_MODE_TITLE)
-    HandleInfoScreen_TitleScreen(button);
-  else if (info_mode == INFO_MODE_ELEMENTS)
-    HandleInfoScreen_Elements(button);
-  else if (info_mode == INFO_MODE_MUSIC)
-    HandleInfoScreen_Music(button);
-  else if (info_mode == INFO_MODE_CREDITS)
-    HandleInfoScreen_Credits(button);
-  else if (info_mode == INFO_MODE_PROGRAM)
-    HandleInfoScreen_Program(button);
-  else if (info_mode == INFO_MODE_VERSION)
-    HandleInfoScreen_Version(button);
-  else if (info_mode == INFO_MODE_LEVELSET)
-    HandleInfoScreen_LevelSet(button);
-  else
-    HandleInfoScreen_Main(mx, my, dx, dy, button);
-}
+  int fade_mask = REDRAW_FIELD;
+
+  if (nr < INFO_MODE_MAIN || nr >= MAX_INFO_MODES)
+    return;
+
+  CloseDoor(DOOR_CLOSE_2);
+
+  SetGameStatus(GAME_MODE_INFO);
+
+  info_mode = nr;
+  info_screens_from_main = TRUE;
+
+  if (redraw_mask & REDRAW_ALL)
+    fade_mask = REDRAW_ALL;
+
+  if (CheckFadeAll())
+    fade_mask = REDRAW_ALL;
+
+  UnmapAllGadgets();
+  FadeMenuSoundsAndMusic();
+
+  FadeSetEnterScreen();
+
+  FadeOut(fade_mask);
+
+  FadeSkipNextFadeOut();
+
+  // needed if different viewport properties defined for info screen
+  ChangeViewportPropertiesIfNeeded();
+
+  SetMainBackgroundImage(IMG_BACKGROUND_INFO);
+
+  DrawInfoScreen();
+}
+
+void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
+{
+  if (info_mode == INFO_MODE_TITLE)
+    HandleInfoScreen_TitleScreen(dx, dy, button);
+  else if (info_mode == INFO_MODE_ELEMENTS)
+    HandleInfoScreen_Elements(dx, dy, button);
+  else if (info_mode == INFO_MODE_MUSIC)
+    HandleInfoScreen_Music(dx, dy, button);
+  else if (info_mode == INFO_MODE_CREDITS)
+    HandleInfoScreen_Generic(dx, dy, button);
+  else if (info_mode == INFO_MODE_PROGRAM)
+    HandleInfoScreen_Generic(dx, dy, button);
+  else if (info_mode == INFO_MODE_VERSION)
+    HandleInfoScreen_Version(button);
+  else if (info_mode == INFO_MODE_LEVELSET)
+    HandleInfoScreen_Generic(dx, dy, button);
+  else
+    HandleInfoScreen_Main(mx, my, dx, dy, button);
+}
+
+
+// ============================================================================
+// type name functions
+// ============================================================================
+
+static TreeInfo *type_name_node = NULL;
+static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 };
+static int type_name_nr = 0;
 
+static int getPlayerNameColor(char *name)
+{
+  return (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED);
+}
+
+static void drawTypeNameText(char *name, struct TextPosInfo *pos,
+                            boolean active)
+{
+  char text[MAX_PLAYER_NAME_LEN + 2] = { 0 };
+  boolean multiple_users = (game_status == GAME_MODE_PSEUDO_TYPENAMES);
+  int sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos));
+  int sy = (multiple_users ? amSY + pos->y : mSY + ALIGNED_TEXT_YPOS(pos));
+  int font_nr = (active ? FONT_ACTIVE(pos->font) : pos->font);
+  int font_width = getFontWidth(font_nr);
+  int font_xoffset = getFontDrawOffsetX(font_nr);
+  int font_yoffset = getFontDrawOffsetY(font_nr);
+  int font_sx = sx + font_xoffset;
+  int font_sy = sy + font_yoffset;
+
+  DrawBackgroundForFont(font_sx, font_sy, pos->width, pos->height, font_nr);
 
-/* ========================================================================= */
-/* type name functions                                                       */
-/* ========================================================================= */
+  sprintf(text, "%s%c", name, (active ? '_' : '\0'));
 
-void HandleTypeName(int newxpos, Key key)
+  pos->width = strlen(text) * font_width;
+  sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos));
+
+  DrawText(sx, sy, text, font_nr);
+}
+
+static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos)
 {
-  static char last_player_name[MAX_PLAYER_NAME_LEN + 1];
   struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME);
-  struct TextPosInfo *pos = mci->pos_input;
-  int startx = mSX + ALIGNED_TEXT_XPOS(pos);
-  int starty = mSY + ALIGNED_TEXT_YPOS(pos);
-  static int xpos = 0;
-  int font_nr = pos->font;
-  int font_active_nr = FONT_ACTIVE(font_nr);
-  int font_width = getFontWidth(font_active_nr);
-  char key_char = getValidConfigValueChar(getCharFromKey(key));
-  boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
-  boolean is_active = TRUE;
 
-  DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr);
+  *pos = *mci->pos_input;
 
-  if (newxpos)
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
   {
-    strcpy(last_player_name, setup.player_name);
+    TreeInfo *ti = player_name_current;
+    int first_entry = ti->cl_first;
+    int entry_pos = first_entry + ti->cl_cursor;
+    TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
+    int xpos = MENU_SCREEN_START_XPOS;
+    int ypos = MENU_SCREEN_START_YPOS + ti->cl_cursor;
+
+    type_name_node = getTreeInfoFromPos(node_first, entry_pos);
+    type_name_nr = entry_pos;
 
-    xpos = newxpos;
+    strcpy(name, type_name_node->name);
 
-    StartTextInput(startx, starty, pos->width, pos->height);
+    pos->x = xpos * 32;
+    pos->y = ypos * 32;
+    pos->width = MAX_PLAYER_NAME_LEN * 32;
   }
-  else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
+  else
   {
-    setup.player_name[xpos] = key_char;
-    setup.player_name[xpos + 1] = 0;
+    type_name_nr = user.nr;
 
-    xpos++;
+    strcpy(name, setup.player_name);
   }
-  else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
+
+  strcpy(type_name_last, name);
+
+  if (strEqual(name, EMPTY_PLAYER_NAME))
+    strcpy(name, "");
+
+  *xpos = strlen(name);
+}
+
+static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos)
+{
+  // change name of edited user in global list of user names
+  setString(&global.user_names[type_name_nr], name);
+
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
   {
-    xpos--;
+    TreeInfo *node = type_name_node;
 
-    setup.player_name[xpos] = 0;
+    // change name of edited user in local menu tree structure
+    setString(&node->name, name);
+    setString(&node->name_sorting, name);
+
+    node->color = getPlayerNameColor(name);
+    pos->font = MENU_CHOOSE_TREE_FONT(node->color);
   }
-  else if (key == KSYM_Return && xpos > 0)
+}
+
+static void setTypeNameValues(char *name, struct TextPosInfo *pos,
+                             boolean changed)
+{
+  boolean reset_setup = strEqual(name, "");
+  boolean remove_user = strEqual(name, EMPTY_PLAYER_NAME);
+  boolean create_user = strEqual(type_name_last, EMPTY_PLAYER_NAME);
+
+  if (!changed)
+    strcpy(name, type_name_last);
+
+  if (strEqual(name, ""))
+    strcpy(name, EMPTY_PLAYER_NAME);
+
+  setTypeNameValues_Name(name, pos);
+
+  // if player name not changed, no further action required
+  if (strEqual(name, type_name_last))
+    return;
+
+  // redraw player name before (possibly) opening request dialogs
+  drawTypeNameText(name, pos, FALSE);
+
+  int last_user_nr = user.nr;
+
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
   {
+    // save setup of currently active user (may differ from edited user)
     SaveSetup();
 
-    is_active = FALSE;
+    // temporarily change active user to edited user
+    user.nr = type_name_nr;
 
-    SetGameStatus(GAME_MODE_MAIN);
+    if (create_user &&
+        Request("Use current setup values for the new player?", REQ_ASK))
+    {
+      // use current setup values for new user, but create new player UUID
+      setup.player_uuid = getStringCopy(getUUID());
+    }
+    else
+    {
+      // load setup for existing user (or start with defaults for new user)
+      LoadSetup();
+    }
   }
-  else if (key == KSYM_Escape)
+
+  char *setup_filename = getSetupFilename();
+  boolean setup_exists = fileExists(setup_filename);
+
+  // change name of edited user in setup structure
+  strcpy(setup.player_name, name);
+
+  // save setup of edited user
+  SaveSetup();
+
+  // change name of edited user on score server
+  ApiRenamePlayerAsThread();
+
+  if (game_status == GAME_MODE_PSEUDO_TYPENAMES || reset_setup)
   {
-    strcpy(setup.player_name, last_player_name);
+    if (reset_setup)
+    {
+      if (Request("Reset setup values for this player?", REQ_ASK))
+      {
+       // remove setup config file
+       unlink(setup_filename);
 
-    is_active = FALSE;
+       // set player name to default player name
+       LoadSetup();
 
-    SetGameStatus(GAME_MODE_MAIN);
+       // update player name used by name typing functions
+       strcpy(name, setup.player_name);
+
+       setTypeNameValues_Name(name, pos);
+      }
+    }
+    else if (remove_user && type_name_nr != 0)
+    {
+      if (Request("Remove settings and tapes for deleted player?", REQ_ASK))
+      {
+       char *user_dir = getUserGameDataDir();
+       char *user_dir_removed =
+         getStringCat3WithSeparator(user_dir, "REMOVED",
+                                    getCurrentTimestamp(), ".");
+
+       if (rename(user_dir, user_dir_removed) != 0)
+         Request("Removing settings and tapes failed!", REQ_CONFIRM);
+
+       checked_free(user_dir_removed);
+      }
+    }
+    else if (create_user && type_name_nr != 0 && !setup_exists)
+    {
+      if (Request("Create empty level set for the new player?", REQ_ASK))
+      {
+       char *levelset_subdir = getNewUserLevelSubdir();
+
+       if (CreateUserLevelSet(levelset_subdir, name, name, 100, FALSE))
+       {
+         AddUserLevelSetToLevelInfo(levelset_subdir);
+
+         LevelDirTree *leveldir_current_last = leveldir_current;
+
+         leveldir_current = getTreeInfoFromIdentifier(leveldir_first,
+                                                      levelset_subdir);
+
+         // set level number of newly created level set to default value
+         LoadLevelSetup_SeriesInfo();
+
+         // set newly created level set as current level set for new user
+         SaveLevelSetup_LastSeries();
+         SaveLevelSetup_SeriesInfo();
+
+         leveldir_current = leveldir_current_last;
+       }
+       else
+       {
+         Request("Creating new level set failed!", REQ_CONFIRM);
+       }
+      }
+    }
+
+    // restore currently active user
+    user.nr = last_user_nr;
+
+    // restore setup of currently active user
+    LoadSetup();
+
+    // restore last level set of currently active user
+    LoadLevelSetup_LastSeries();
+    LoadLevelSetup_SeriesInfo();
   }
+}
+
+static void HandleTypeNameExt(boolean initialize, Key key)
+{
+  static struct TextPosInfo pos_name = { 0 };
+  static char name[MAX_PLAYER_NAME_LEN + 1] = { 0 };
+  static int xpos = 0;
+  struct TextPosInfo *pos = &pos_name;
+  char key_char = getValidConfigValueChar(getCharFromKey(key));
+  boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0));
+  boolean active = TRUE;
+
+  if (initialize)
+  {
+    getTypeNameValues(name, pos, &xpos);
+
+    int sx = mSX + ALIGNED_TEXT_XPOS(pos);
+    int sy = mSY + ALIGNED_TEXT_YPOS(pos);
 
-  if (is_active)
+    StartTextInput(sx, sy, pos->width, pos->height);
+  }
+  else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN)
   {
-    pos->width = (strlen(setup.player_name) + 1) * font_width;
-    startx = mSX + ALIGNED_TEXT_XPOS(pos);
+    name[xpos] = key_char;
+    name[xpos + 1] = 0;
 
-    DrawText(startx, starty, setup.player_name, font_active_nr);
-    DrawText(startx + xpos * font_width, starty, "_", font_active_nr);
+    xpos++;
   }
-  else
+  else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0)
   {
-    pos->width = strlen(setup.player_name) * font_width;
-    startx = mSX + ALIGNED_TEXT_XPOS(pos);
+    xpos--;
 
-    DrawText(startx, starty, setup.player_name, font_nr);
+    name[xpos] = 0;
+  }
+  else if (key == KSYM_Return || key == KSYM_Escape)
+  {
+    boolean changed = (key == KSYM_Return);
 
     StopTextInput();
+
+    setTypeNameValues(name, pos, changed);
+
+    active = FALSE;
   }
+
+  drawTypeNameText(name, pos, active);
+
+  if (!active)
+  {
+    SetGameStatus(game_status_last_screen);
+
+    if (game_status == GAME_MODE_MAIN)
+      InitializeMainControls();
+  }
+}
+
+static void DrawTypeName(void)
+{
+  HandleTypeNameExt(TRUE, 0);
+}
+
+void HandleTypeName(Key key)
+{
+  HandleTypeNameExt(FALSE, key);
 }
 
 
-/* ========================================================================= */
-/* tree menu functions                                                       */
-/* ========================================================================= */
+// ============================================================================
+// tree menu functions
+// ============================================================================
+
+static int getAlignXOffsetFromTreeInfo(TreeInfo *ti)
+{
+  if (game_status != GAME_MODE_SETUP ||
+      DRAW_MODE_SETUP(setup_mode) != SETUP_MODE_CHOOSE_OTHER)
+    return 0;
+
+  int max_text_size = 0;
+  TreeInfo *node;
+
+  for (node = getTreeInfoFirstGroupEntry(ti); node != NULL; node = node->next)
+    max_text_size = MAX(max_text_size, strlen(node->name));
+
+  int num_entries = numTreeInfoInGroup(ti);
+  boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
+  int font_nr = MENU_CHOOSE_TREE_FONT(FC_RED);
+  int text_width = max_text_size * getFontWidth(font_nr);
+  int button_width = SC_MENUBUTTON_XSIZE;
+  int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
+  int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
+  int align = menu.list_setup[SETUP_MODE_CHOOSE_OTHER].align;
+  int x = ALIGNED_XPOS(0, screen_width, align) * -1;
+  int align_xoffset_raw = ALIGNED_XPOS(x, button_width + text_width, align);
+  int align_xoffset = MAX(0, align_xoffset_raw);
+
+  return align_xoffset;
+}
+
+static int getAlignYOffsetFromTreeInfo(TreeInfo *ti)
+{
+  if (game_status != GAME_MODE_SETUP ||
+      DRAW_MODE_SETUP(setup_mode) != SETUP_MODE_CHOOSE_OTHER)
+    return 0;
+
+  int num_entries = numTreeInfoInGroup(ti);
+  int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
+  int font_nr = MENU_CHOOSE_TREE_FONT(FC_RED);
+  int font_height = getFontHeight(font_nr);
+  int text_height = font_height * num_page_entries;
+  int page_height = font_height * NUM_MENU_ENTRIES_ON_SCREEN;
+  int align = menu.list_setup[SETUP_MODE_CHOOSE_OTHER].valign;
+  int y = ALIGNED_YPOS(0, page_height, align) * -1;
+  int align_yoffset_raw = ALIGNED_YPOS(y, text_height, align);
+  int align_yoffset = MAX(0, align_yoffset_raw);
+
+  return align_yoffset;
+}
+
+static void StartPlayingFromHallOfFame(void)
+{
+  level_nr = scores.next_level_nr;
+  LoadLevel(level_nr);
+
+  StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+}
 
 static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   int fade_mask = REDRAW_FIELD;
+  boolean restart_music = (game_status != game_status_last_screen &&
+                          game_status_last_screen != GAME_MODE_SCOREINFO);
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  scores.continue_on_return = (game_status == GAME_MODE_SCORES &&
+                              game_status_last_screen == GAME_MODE_PLAYING);
+
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
-  if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
+  if (*ti_ptr != NULL && strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
   {
-    SetGameStatus(GAME_MODE_MAIN);
+    if (game_status == GAME_MODE_SETUP)
+    {
+      execSetupArtwork();
+    }
+    else if (game_status == GAME_MODE_SCORES && scores.continue_playing)
+    {
+      StartPlayingFromHallOfFame();
+    }
+    else
+    {
+      SetGameStatus(GAME_MODE_MAIN);
 
-    DrawMainMenu();
+      DrawMainMenu();
+    }
 
     return;
   }
@@ -4050,41 +4357,139 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
   FreeScreenGadgets();
   CreateScreenGadgets();
 
+  if (restart_music)
+    FadeMenuSoundsAndMusic();
+
   FadeOut(fade_mask);
 
-  /* needed if different viewport properties defined for choosing level (set) */
+  // needed if different viewport properties defined for this screen
   ChangeViewportPropertiesIfNeeded();
 
-  if (game_status == GAME_MODE_LEVELNR)
+  if (game_status == GAME_MODE_NAMES)
+    SetMainBackgroundImage(IMG_BACKGROUND_NAMES);
+  else if (game_status == GAME_MODE_LEVELNR)
     SetMainBackgroundImage(IMG_BACKGROUND_LEVELNR);
   else if (game_status == GAME_MODE_LEVELS)
     SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
+  else if (game_status == GAME_MODE_SCORES)
+    SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
 
   ClearField();
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
-  HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
+  // map gadgets for high score screen
+  if (game_status == GAME_MODE_SCORES)
+    MapScreenMenuGadgets(SCREEN_MASK_SCORES);
+
   MapScreenTreeGadgets(*ti_ptr);
 
+  HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
+
   DrawMaskedBorder(fade_mask);
 
+  if (restart_music)
+    PlayMenuSoundsAndMusic();
+
   FadeIn(fade_mask);
 }
 
-static void drawChooseTreeList(int first_entry, int num_page_entries,
-                              TreeInfo *ti)
+static int getChooseTreeFont(TreeInfo *node, boolean active)
+{
+  if (game_status == GAME_MODE_SCORES)
+    return (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
+  else
+    return MENU_CHOOSE_TREE_FONT(MENU_CHOOSE_TREE_COLOR(node, active));
+}
+
+static void drawChooseTreeText(TreeInfo *ti, int y, boolean active)
+{
+  int num_entries = numTreeInfoInGroup(ti);
+  boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
+  int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
+  int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
+  int first_entry = ti->cl_first;
+  int entry_pos = first_entry + y;
+  TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
+  TreeInfo *node = getTreeInfoFromPos(node_first, entry_pos);
+  int font_nr = getChooseTreeFont(node, active);
+  int font_xoffset = getFontDrawOffsetX(font_nr);
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + y;
+  int startdx = xpos * 32;
+  int startdy = ypos * 32;
+  int startx = amSX + startdx;
+  int starty = amSY + startdy;
+  int startx_text = startx + font_xoffset;
+  int endx_text = amSX + screen_width;
+  int max_text_size = endx_text - startx_text;
+  int max_buffer_len = max_text_size / getFontWidth(font_nr);
+  char buffer[max_buffer_len + 1];
+
+  if (game_status == GAME_MODE_SCORES && !node->parent_link)
+  {
+    int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
+    int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
+    int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
+    int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
+    int font_size_1 = getFontWidth(font_nr1);
+    int font_size_3 = getFontWidth(font_nr3);
+    int font_size_4 = getFontWidth(font_nr4);
+    int text_size_1 = 4 * font_size_1;
+    int text_size_4 = 5 * font_size_4;
+    int border = amSX - SX + getFontDrawOffsetX(font_nr1);
+    int dx1 = 0;
+    int dx3 = text_size_1;
+    int dx4 = SXSIZE - 2 * startdx - 2 * border - text_size_4;
+    int num_dots = (dx4 - dx3) / font_size_3;
+    int startx1 = startx + dx1;
+    int startx3 = startx + dx3;
+    int startx4 = startx + dx4;
+    int pos = node->pos;
+    char *pos_text = getHallOfFameRankText(pos, 3);
+    int i;
+
+    DrawText(startx1, starty, pos_text, font_nr1);
+
+    for (i = 0; i < num_dots; i++)
+      DrawText(startx3 + i * font_size_3, starty, ".", font_nr3);
+
+    if (!strEqual(scores.entry[pos].name, EMPTY_PLAYER_NAME))
+      DrawText(startx3, starty, scores.entry[pos].name, font_nr2);
+
+    DrawText(startx4, starty, getHallOfFameScoreText(pos, 5), font_nr4);
+  }
+  else
+  {
+    strncpy(buffer, node->name, max_buffer_len);
+    buffer[max_buffer_len] = '\0';
+
+    DrawText(startx, starty, buffer, font_nr);
+  }
+}
+
+static void drawChooseTreeHeadExt(int type, char *title_string)
 {
-  int i;
-  char *title_string = NULL;
   int yoffset_sets = MENU_TITLE1_YPOS;
   int yoffset_setup = 16;
-  int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ||
-                ti->type == TREE_TYPE_LEVEL_NR ? yoffset_sets : yoffset_setup);
-
-  title_string = ti->infotext;
+  int yoffset = (type == TREE_TYPE_SCORE_ENTRY ||
+                type == TREE_TYPE_LEVEL_DIR ||
+                type == TREE_TYPE_LEVEL_NR ? yoffset_sets : yoffset_setup);
 
   DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string);
+}
+
+static void drawChooseTreeHead(TreeInfo *ti)
+{
+  drawChooseTreeHeadExt(ti->type, ti->infotext);
+}
+
+static void drawChooseTreeList(TreeInfo *ti)
+{
+  int first_entry = ti->cl_first;
+  int num_entries = numTreeInfoInGroup(ti);
+  int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
+  int i;
 
   clearMenuListArea();
 
@@ -4092,25 +4497,11 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   {
     TreeInfo *node, *node_first;
     int entry_pos = first_entry + i;
-    int xpos = MENU_SCREEN_START_XPOS;
-    int ypos = MENU_SCREEN_START_YPOS + i;
-    int startx = mSX + xpos * 32;
-    int starty = mSY + ypos * 32;
-    int font_nr = FONT_TEXT_1;
-    int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
-    int startx_text = startx + font_xoffset;
-    int startx_scrollbar = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
-    int text_size = startx_scrollbar - startx_text;
-    int max_buffer_len = text_size / getFontWidth(font_nr);
-    char buffer[max_buffer_len + 1];
 
     node_first = getTreeInfoFirstGroupEntry(ti);
     node = getTreeInfoFromPos(node_first, entry_pos);
 
-    strncpy(buffer, node->name, max_buffer_len);
-    buffer[max_buffer_len] = '\0';
-
-    DrawText(startx, starty, buffer, font_nr + node->color);
+    drawChooseTreeText(ti, i, FALSE);
 
     if (node->parent_link)
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
@@ -4118,26 +4509,37 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
       initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
     else
       initCursor(i, IMG_MENU_BUTTON);
+
+    if (game_status == GAME_MODE_SCORES && node->pos == scores.last_added)
+      initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
+
+    if (game_status == GAME_MODE_NAMES)
+      drawChooseTreeEdit(i, FALSE);
   }
 
   redraw_mask |= REDRAW_FIELD;
 }
 
-static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
+static void drawChooseTreeInfo(TreeInfo *ti)
 {
-  TreeInfo *node, *node_first;
-  int x, last_redraw_mask = redraw_mask;
+  int entry_pos = ti->cl_first + ti->cl_cursor;
+  int last_redraw_mask = redraw_mask;
   int ypos = MENU_TITLE2_YPOS;
   int font_nr = FONT_TITLE_2;
+  int x;
 
   if (ti->type == TREE_TYPE_LEVEL_NR)
     DrawTextFCentered(ypos, font_nr, leveldir_current->name);
 
+  if (ti->type == TREE_TYPE_SCORE_ENTRY)
+    DrawTextFCentered(ypos, font_nr, "HighScores of Level %d",
+                     scores.last_level_nr);
+
   if (ti->type != TREE_TYPE_LEVEL_DIR)
     return;
 
-  node_first = getTreeInfoFirstGroupEntry(ti);
-  node = getTreeInfoFromPos(node_first, entry_pos);
+  TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
+  TreeInfo *node = getTreeInfoFromPos(node_first, entry_pos);
 
   DrawBackgroundForFont(SX, SY + ypos, SXSIZE, getFontHeight(font_nr), font_nr);
 
@@ -4152,63 +4554,184 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
                      node->levels, (node->levels > 1 ? "levels" : "level"),
                      node->class_desc);
 
-  /* let BackToFront() redraw only what is needed */
+  // let BackToFront() redraw only what is needed
   redraw_mask = last_redraw_mask;
   for (x = 0; x < SCR_FIELDX; x++)
     MarkTileDirty(x, 1);
 }
 
+static void drawChooseTreeCursorAndText(TreeInfo *ti, boolean active)
+{
+  drawChooseTreeCursor(ti->cl_cursor, active);
+  drawChooseTreeText(ti, ti->cl_cursor, active);
+}
+
+static void drawChooseTreeScreen(TreeInfo *ti)
+{
+  drawChooseTreeHead(ti);
+  drawChooseTreeList(ti);
+  drawChooseTreeInfo(ti);
+  drawChooseTreeCursorAndText(ti, TRUE);
+
+  AdjustChooseTreeScrollbar(ti, SCREEN_CTRL_ID_SCROLL_VERTICAL);
+
+  // scroll bar and buttons may just have been added after reloading scores
+  if (game_status == GAME_MODE_SCORES)
+    MapScreenTreeGadgets(ti);
+}
+
+static void drawChooseTreeScreen_Scores_NotAvailable(void)
+{
+  // dirty workaround to use spacing definitions from info screen
+  info_mode = INFO_MODE_TITLE;
+
+  char *text_info = "HighScores of Level %d";
+  char *text_title = "Score information:";
+  char *text_error = "No scores for this level.";
+  char *text_foot = TEXT_MAIN_MENU;
+  int font_info = FONT_TITLE_2;
+  int font_title = FONT_INITIAL_3;
+  int font_error = FONT_INITIAL_4;
+  int font_foot  = FONT_INITIAL_2;
+  int spacing_title = menu.headline1_spacing_info[INFO_MODE_TITLE];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART;
+  int ystart2 = ystart1 + ystep_title;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
+  int ystart0 = MENU_TITLE2_YPOS;
+
+  drawChooseTreeHeadExt(TREE_TYPE_SCORE_ENTRY, INFOTEXT_SCORE_ENTRY);
+  DrawTextFCentered(ystart0, font_info, text_info, scores.last_level_nr);
+
+  DrawTextSCentered(ystart1, font_title, text_title);
+  DrawTextSCentered(ystart2, font_error, text_error);
+
+  DrawTextSCentered(ybottom, font_foot, text_foot);
+}
+
+static TreeInfo *setHallOfFameActiveEntry(TreeInfo **ti_ptr)
+{
+  int score_pos = scores.last_added;
+
+  if (game_status_last_screen == GAME_MODE_SCOREINFO)
+    score_pos = scores.last_entry_nr;
+
+  // set current tree entry to last added score entry
+  *ti_ptr = getTreeInfoFromIdentifier(score_entries, i_to_a(score_pos));
+
+  // if that fails, set current tree entry to first entry (back link)
+  if (*ti_ptr == NULL)
+    *ti_ptr = score_entries->node_group;
+
+  int num_entries = numTreeInfoInGroup(*ti_ptr);
+  int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
+  int pos_score = getPosFromTreeInfo(*ti_ptr);
+  int pos_first_raw = pos_score - (num_page_entries + 1) / 2 + 1;
+  int pos_first = MIN(MAX(0, pos_first_raw), num_entries - num_page_entries);
+
+  (*ti_ptr)->cl_first = pos_first;
+  (*ti_ptr)->cl_cursor = pos_score - pos_first;
+
+  return *ti_ptr;
+}
+
 static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
                             TreeInfo **ti_ptr)
 {
   TreeInfo *ti = *ti_ptr;
+  boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped;
+  int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x;
+  int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE);
+  int sx1_edit_name = getChooseTreeEditXPosReal(POS_LEFT);
+  int sx2_edit_name = getChooseTreeEditXPosReal(POS_RIGHT);
   int x = 0;
-  int y = ti->cl_cursor;
+  int y = (ti != NULL ? ti->cl_cursor : 0);
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
   int num_entries = numTreeInfoInGroup(ti);
-  int num_page_entries;
+  int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
   boolean position_set_by_scrollbar = (dx == 999);
+  boolean button_action = (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE);
+  boolean button_is_valid = (mx >= 0 && my >= 0);
+  boolean button_screen_clicked = (button_action && button_is_valid);
 
-  if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
-    num_page_entries = num_entries;
-  else
-    num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
+  if (game_status == GAME_MODE_SCORES)
+  {
+    if (server_scores.updated)
+    {
+      // reload scores, using updated server score cache file
+      LoadLocalAndServerScore(scores.last_level_nr, FALSE);
+
+      server_scores.updated = FALSE;
+
+      DrawHallOfFame_setScoreEntries();
+
+      if (score_entries != NULL)
+      {
+       ti = setHallOfFameActiveEntry(ti_ptr);
+
+       if (button != MB_MENU_INITIALIZE)
+         drawChooseTreeScreen(ti);
+      }
+    }
+
+    if (score_entries == NULL)
+    {
+      if (button == MB_MENU_INITIALIZE)
+      {
+       drawChooseTreeScreen_Scores_NotAvailable();
+      }
+      else if (button_screen_clicked)
+      {
+       PlaySound(SND_MENU_ITEM_SELECTING);
+
+       SetGameStatus(GAME_MODE_MAIN);
+
+       DrawMainMenu();
+      }
+
+      return;
+    }
+  }
 
   if (button == MB_MENU_INITIALIZE)
   {
     int num_entries = numTreeInfoInGroup(ti);
-    int entry_pos = posTreeInfo(ti);
+    int entry_pos = getPosFromTreeInfo(ti);
+
+    align_xoffset = getAlignXOffsetFromTreeInfo(ti);
+    align_yoffset = getAlignYOffsetFromTreeInfo(ti);
 
-    if (ti->cl_first == -1)
+    if (game_status == GAME_MODE_SCORES)
     {
-      /* only on initialization */
+      ti = setHallOfFameActiveEntry(ti_ptr);
+    }
+    else if (ti->cl_first == -1)
+    {
+      // only on initialization
       ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
       ti->cl_cursor = entry_pos - ti->cl_first;
+
     }
     else if (ti->cl_cursor >= num_page_entries ||
             (num_entries > num_page_entries &&
              num_entries - ti->cl_first < num_page_entries))
     {
-      /* only after change of list size (by custom graphic configuration) */
+      // only after change of list size (by custom graphic configuration)
       ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
       ti->cl_cursor = entry_pos - ti->cl_first;
     }
 
     if (position_set_by_scrollbar)
       ti->cl_first = dy;
-    else
-      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                               ti->cl_first, ti);
 
-    drawChooseTreeList(ti->cl_first, num_page_entries, ti);
-    drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-    drawChooseTreeCursor(ti->cl_cursor, TRUE);
+    drawChooseTreeScreen(ti);
 
     return;
   }
   else if (button == MB_MENU_LEAVE)
   {
-    FadeSetLeaveMenu();
+    if (game_status != GAME_MODE_SCORES)
+      FadeSetLeaveMenu();
 
     PlaySound(SND_MENU_ITEM_SELECTING);
 
@@ -4219,7 +4742,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     }
     else if (game_status == GAME_MODE_SETUP)
     {
-      if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+      if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE ||
+         setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
          setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
          setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
        execSetupGame();
@@ -4261,21 +4785,41 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     return;
   }
 
-  if (mx || my)                /* mouse input */
+#if defined(PLATFORM_ANDROID)
+  // directly continue when touching the screen after playing
+  if ((mx || my) && scores.continue_on_return)
   {
-    x = (mx - mSX) / 32;
-    y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
+    // ignore touch events until released
+    mx = my = 0;
   }
-  else if (dx || dy)   /* keyboard or scrollbar/scrollbutton input */
+#endif
+
+  // any mouse click or cursor key stops leaving scores by "Return" key
+  if ((mx || my || dx || dy) && scores.continue_on_return)
   {
-    /* move cursor instead of scrolling when already at start/end of list */
+    scores.continue_on_return = FALSE;
+    level_nr = scores.last_level_nr;
+    LoadLevel(level_nr);
+  }
+
+  if (mx || my)                // mouse input
+  {
+    x = (mx - amSX) / 32;
+    y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS;
+
+    if (game_status == GAME_MODE_NAMES)
+      drawChooseTreeEdit(ti->cl_cursor, FALSE);
+  }
+  else if (dx || dy)   // keyboard or scrollbar/scrollbutton input
+  {
+    // move cursor instead of scrolling when already at start/end of list
     if (dy == -1 * SCROLL_LINE && ti->cl_first == 0)
       dy = -1;
     else if (dy == +1 * SCROLL_LINE &&
             ti->cl_first + num_page_entries == num_entries)
       dy = 1;
 
-    /* handle scrolling screen one line or page */
+    // handle scrolling screen one line or page
     if (ti->cl_cursor + dy < 0 ||
        ti->cl_cursor + dy > num_page_entries - 1)
     {
@@ -4286,7 +4830,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       if (dy < 0 && ti->cl_first > 0)
       {
-       /* scroll page/line up */
+       // scroll page/line up
 
        ti->cl_first -= step;
        if (ti->cl_first < 0)
@@ -4296,7 +4840,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
       else if (dy > 0 && ti->cl_first + num_page_entries < num_entries)
       {
-       /* scroll page/line down */
+       // scroll page/line down
 
        ti->cl_first += step;
        if (ti->cl_first + num_page_entries > num_entries)
@@ -4306,23 +4850,22 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
 
       if (redraw)
-      {
-       drawChooseTreeList(ti->cl_first, num_page_entries, ti);
-       drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-       drawChooseTreeCursor(ti->cl_cursor, TRUE);
-
-       AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-                                 ti->cl_first, ti);
-      }
+       drawChooseTreeScreen(ti);
 
       return;
     }
 
-    /* handle moving cursor one line */
+    // handle moving cursor one line
     y = ti->cl_cursor + dy;
   }
 
-  if (dx == 1)
+  if (game_status == GAME_MODE_SCORES && ABS(dx) == 1)
+  {
+    HandleHallOfFame_SelectLevel(1, dx);
+
+    return;
+  }
+  else if (dx == 1)
   {
     TreeInfo *node_first, *node_cursor;
     int entry_pos = ti->cl_first + y;
@@ -4338,15 +4881,17 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       node_cursor->cl_first = ti->cl_first;
       node_cursor->cl_cursor = ti->cl_cursor;
+
       *ti_ptr = node_cursor->node_group;
       DrawChooseTree(ti_ptr);
 
       return;
     }
   }
-  else if (dx == -1 && ti->node_parent)
+  else if ((dx == -1 || button == MB_MENU_CONTINUE) && ti->node_parent)
   {
-    FadeSetLeaveMenu();
+    if (game_status != GAME_MODE_SCORES)
+      FadeSetLeaveMenu();
 
     PlaySound(SND_MENU_ITEM_SELECTING);
 
@@ -4358,26 +4903,35 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
   if (!anyScrollbarGadgetActive() &&
       IN_VIS_MENU(x, y) &&
-      mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x &&
+      mx < mx_right_border &&
       y >= 0 && y < num_page_entries)
   {
     if (button)
     {
+      if (game_status == GAME_MODE_NAMES)
+      {
+       if (mx >= sx1_edit_name && mx <= sx2_edit_name)
+         drawChooseTreeEdit(y, TRUE);
+      }
+
       if (y != ti->cl_cursor)
       {
        PlaySound(SND_MENU_ITEM_ACTIVATING);
 
-       drawChooseTreeCursor(ti->cl_cursor, FALSE);
-       drawChooseTreeCursor(y, TRUE);
-       drawChooseTreeInfo(ti->cl_first + y, ti);
+       drawChooseTreeCursorAndText(ti, FALSE);
 
        ti->cl_cursor = y;
+
+       drawChooseTreeCursorAndText(ti, TRUE);
+
+       drawChooseTreeInfo(ti);
       }
       else if (dx < 0)
       {
        if (game_status == GAME_MODE_SETUP)
        {
-         if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+         if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE ||
+             setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
              setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
              setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
            execSetupGame();
@@ -4420,22 +4974,26 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
        node_cursor->cl_first = ti->cl_first;
        node_cursor->cl_cursor = ti->cl_cursor;
+
        *ti_ptr = node_cursor->node_group;
        DrawChooseTree(ti_ptr);
       }
       else if (node_cursor->parent_link)
       {
-       FadeSetLeaveMenu();
+       if (game_status != GAME_MODE_SCORES)
+         FadeSetLeaveMenu();
 
        *ti_ptr = node_cursor->node_parent;
        DrawChooseTree(ti_ptr);
       }
       else
       {
-       FadeSetEnterMenu();
+       if (game_status != GAME_MODE_SCORES)
+         FadeSetEnterMenu();
 
        node_cursor->cl_first = ti->cl_first;
        node_cursor->cl_cursor = ti->cl_cursor;
+
        *ti_ptr = node_cursor;
 
        if (ti->type == TREE_TYPE_LEVEL_DIR)
@@ -4449,7 +5007,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
        if (game_status == GAME_MODE_SETUP)
        {
-         if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+         if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE ||
+             setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
              setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
              setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
            execSetupGame();
@@ -4480,7 +5039,65 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
          {
            int new_level_nr = atoi(level_number_current->identifier);
 
-           HandleMainMenu_SelectLevel(0, 0, new_level_nr);
+           HandleMainMenu_SelectLevel(0, 0, new_level_nr);
+         }
+         else if (game_status == GAME_MODE_LEVELS)
+         {
+           // store level set if chosen from "last played level set" menu
+           StoreLastPlayedLevels(leveldir_current);
+         }
+         else if (game_status == GAME_MODE_NAMES)
+         {
+           if (mx >= sx1_edit_name && mx <= sx2_edit_name)
+           {
+             SetGameStatus(GAME_MODE_PSEUDO_TYPENAMES);
+
+             DrawTypeName();
+
+             return;
+           }
+
+           // change active user to selected user
+           user.nr = entry_pos;
+
+           // save number of new active user
+           SaveUserSetup();
+
+           // load setup of new active user
+           LoadSetup();
+
+           // load last level set of new active user
+           LoadLevelSetup_LastSeries();
+           LoadLevelSetup_SeriesInfo();
+
+           // update list of last played level sets
+           UpdateLastPlayedLevels_TreeInfo();
+
+           TapeErase();
+
+           ToggleFullscreenIfNeeded();
+           ChangeWindowScalingIfNeeded();
+
+           ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_GRAPHICS);
+           ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_SOUNDS);
+           ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_MUSIC);
+         }
+         else if (game_status == GAME_MODE_SCORES)
+         {
+           if (scores.continue_playing && scores.continue_on_return)
+           {
+             StartPlayingFromHallOfFame();
+
+             return;
+           }
+           else if (!scores.continue_on_return)
+           {
+             SetGameStatus(GAME_MODE_SCOREINFO);
+
+             DrawScoreInfo(node_cursor->pos);
+
+             return;
+           }
          }
 
          SetGameStatus(GAME_MODE_MAIN);
@@ -4490,15 +5107,67 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
     }
   }
+
+  if (game_status == GAME_MODE_SCORES)
+    PlayMenuSoundIfLoop();
 }
 
-void DrawChooseLevelSet(void)
+void DrawChoosePlayerName(void)
 {
-  FadeMenuSoundsAndMusic();
+  int i;
 
-  DrawChooseTree(&leveldir_current);
+  if (player_name != NULL)
+  {
+    freeTreeInfo(player_name);
 
-  PlayMenuSoundsAndMusic();
+    player_name = NULL;
+  }
+
+  for (i = 0; i < MAX_PLAYER_NAMES; i++)
+  {
+    TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_PLAYER_NAME);
+    char identifier[32], name[MAX_PLAYER_NAME_LEN + 1];
+    int value = i;
+
+    ti->node_top = &player_name;
+    ti->sort_priority = 10000 + value;
+    ti->color = getPlayerNameColor(global.user_names[i]);
+
+    snprintf(identifier, sizeof(identifier), "%d", value);
+    snprintf(name, sizeof(name), "%s", global.user_names[i]);
+
+    setString(&ti->identifier, identifier);
+    setString(&ti->name, name);
+    setString(&ti->name_sorting, name);
+
+    pushTreeInfo(&player_name, ti);
+  }
+
+  // sort player entries by player number
+  sortTreeInfo(&player_name);
+
+  // set current player entry to selected player entry
+  player_name_current =
+    getTreeInfoFromIdentifier(player_name, i_to_a(user.nr));
+
+  // if that fails, set current player name to first available name
+  if (player_name_current == NULL)
+    player_name_current = player_name;
+
+  // set text size for main name input (also used on name selection screen)
+  InitializeMainControls();
+
+  DrawChooseTree(&player_name_current);
+}
+
+void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button)
+{
+  HandleChooseTree(mx, my, dx, dy, button, &player_name_current);
+}
+
+void DrawChooseLevelSet(void)
+{
+  DrawChooseTree(&leveldir_current);
 }
 
 void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button)
@@ -4510,8 +5179,6 @@ void DrawChooseLevelNr(void)
 {
   int i;
 
-  FadeMenuSoundsAndMusic();
-
   if (level_number != NULL)
   {
     freeTreeInfo(level_number);
@@ -4522,10 +5189,10 @@ void DrawChooseLevelNr(void)
   for (i = leveldir_current->first_level; i <= leveldir_current->last_level;i++)
   {
     TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_LEVEL_NR);
-    char identifier[32], name[32];
+    char identifier[32], name[64];
     int value = i;
 
-    /* temporarily load level info to get level name */
+    // temporarily load level info to get level name
     LoadLevelInfoOnly(i);
 
     ti->node_top = &level_number;
@@ -4545,20 +5212,18 @@ void DrawChooseLevelNr(void)
     pushTreeInfo(&level_number, ti);
   }
 
-  /* sort level number values to start with lowest level number */
+  // sort level number values to start with lowest level number
   sortTreeInfo(&level_number);
 
-  /* set current level number to current level number */
+  // set current level number to current level number
   level_number_current =
     getTreeInfoFromIdentifier(level_number, i_to_a(level_nr));
 
-  /* if that also fails, set current level number to first available level */
+  // if that also fails, set current level number to first available level
   if (level_number_current == NULL)
     level_number_current = level_number;
 
   DrawChooseTree(&level_number_current);
-
-  PlayMenuSoundsAndMusic();
 }
 
 void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
@@ -4566,163 +5231,429 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
   HandleChooseTree(mx, my, dx, dy, button, &level_number_current);
 }
 
-void DrawHallOfFame(int level_nr, int highlight_position)
+static void DrawHallOfFame_setScoreEntries(void)
 {
-  int fade_mask = REDRAW_FIELD;
+  int max_empty_entries = 10;  // at least show "top ten" list, if empty
+  int max_visible_entries = NUM_MENU_ENTRIES_ON_SCREEN - 1;   // w/o back link
+  int min_score_entries = MIN(max_empty_entries, max_visible_entries);
+  int score_pos = (scores.last_added >= 0 ? scores.last_added : 0);
+  int i;
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
-    fade_mask = REDRAW_ALL;
+  if (score_entries != NULL)
+  {
+    freeTreeInfo(score_entries);
 
-  UnmapAllGadgets();
-  FadeMenuSoundsAndMusic();
+    score_entries = NULL;
+  }
+
+  for (i = 0; i < MAX_SCORE_ENTRIES; i++)
+  {
+    // do not add empty score entries if off-screen
+    if (scores.entry[i].score == 0 &&
+       scores.entry[i].time == 0 &&
+       i >= min_score_entries)
+      break;
+
+    TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_SCORE_ENTRY);
+    char identifier[32], name[64];
+    int value = i;
+
+    ti->node_top = &score_entries;
+    ti->sort_priority = 10000 + value;
+    ti->color = FC_YELLOW;
+    ti->pos = i;
+
+    snprintf(identifier, sizeof(identifier), "%d", value);
+    snprintf(name, sizeof(name), "%03d.", value + 1);
+
+    setString(&ti->identifier, identifier);
+    setString(&ti->name, name);
+    setString(&ti->name_sorting, name);
+
+    pushTreeInfo(&score_entries, ti);
+  }
+
+  // sort score entries to start with highest score entry
+  sortTreeInfo(&score_entries);
+
+  // add top tree node to create back link to main menu
+  score_entries = addTopTreeInfoNode(score_entries);
+
+  // set current score entry to last added or highest score entry
+  score_entry_current =
+    getTreeInfoFromIdentifier(score_entries, i_to_a(score_pos));
+
+  // if that fails, set current score entry to first valid score entry
+  if (score_entry_current == NULL)
+    score_entry_current = getFirstValidTreeInfoEntry(score_entries);
 
-  /* (this is needed when called from GameEnd() after winning a game) */
+  if (score_entries != NULL && scores.continue_playing)
+    setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT);
+
+  // ("score_entries" and "score_entry_current" may be NULL here)
+}
+
+void DrawHallOfFame(int nr)
+{
+  scores.last_level_nr = nr;
+
+  // (this is needed when called from GameEnd() after winning a game)
   KeyboardAutoRepeatOn();
 
-  /* (this is needed when called from GameEnd() after winning a game) */
+  // (this is needed when called from GameEnd() after winning a game)
   SetDrawDeactivationMask(REDRAW_NONE);
   SetDrawBackgroundMask(REDRAW_FIELD);
 
-  if (highlight_position < 0) 
-    LoadScore(level_nr);
-  else
+  LoadLocalAndServerScore(scores.last_level_nr, TRUE);
+
+  DrawHallOfFame_setScoreEntries();
+
+  if (scores.last_added >= 0)
     SetAnimStatus(GAME_MODE_PSEUDO_SCORESNEW);
 
   FadeSetEnterScreen();
 
-  FadeOut(fade_mask);
+  DrawChooseTree(&score_entry_current);
+}
 
-  /* needed if different viewport properties defined for scores */
-  ChangeViewportPropertiesIfNeeded();
+static char *getHallOfFameRankText(int nr, int size)
+{
+  static char rank_text[10];
+  boolean forced = (scores.force_last_added && nr == scores.last_added);
+  char *rank_text_raw = (forced ? "???" : int2str(nr + 1, size));
 
-  PlayMenuSoundsAndMusic();
+  sprintf(rank_text, "%s%s", rank_text_raw, (size > 0 || !forced ? "." : ""));
 
-  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  return rank_text;
+}
+
+static char *getHallOfFameTimeText(int nr)
+{
+  static char score_text[10];
+  int time_seconds = scores.entry[nr].time / FRAMES_PER_SECOND;
+  int mm = (time_seconds / 60) % 60;
+  int ss = (time_seconds % 60);
 
-  HandleHallOfFame(level_nr, highlight_position, 0, 0, MB_MENU_INITIALIZE);
+  sprintf(score_text, "%02d:%02d", mm, ss);    // show playing time
 
-  DrawMaskedBorder(fade_mask);
+  return score_text;
+}
 
-  FadeIn(fade_mask);
+static char *getHallOfFameScoreText(int nr, int size)
+{
+  if (!level.rate_time_over_score)
+    return int2str(scores.entry[nr].score, size);      // show normal score
+  else if (level.use_step_counter)
+    return int2str(scores.entry[nr].time, size);       // show number of steps
+  else
+    return getHallOfFameTimeText(nr);                  // show playing time
 }
 
-static void drawHallOfFameList(int level_nr, int first_entry,
-                              int highlight_position)
+static char *getHallOfFameTapeDateText(struct ScoreEntry *entry)
 {
+  static char tape_date[MAX_ISO_DATE_LEN + 1];
   int i, j;
 
-  SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
-  ClearField();
+  if (!strEqual(entry->tape_date, UNKNOWN_NAME) ||
+      strEqual(entry->tape_basename, UNDEFINED_FILENAME))
+    return entry->tape_date;
 
-  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, "Hall Of Fame");
-  DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2,
-                   "HighScores of Level %d", level_nr);
+  for (i = 0, j = 0; i < 8; i++, j++)
+  {
+    tape_date[j] = entry->tape_basename[i];
+
+    if (i == 3 || i == 5)
+      tape_date[++j] = '-';
+  }
+
+  tape_date[MAX_ISO_DATE_LEN] = '\0';
+
+  return tape_date;
+}
+
+static void HandleHallOfFame_SelectLevel(int step, int direction)
+{
+  int old_level_nr = scores.last_level_nr;
+  int new_level_nr = old_level_nr + step * direction;
+
+  if (new_level_nr < leveldir_current->first_level)
+    new_level_nr = leveldir_current->first_level;
+  if (new_level_nr > leveldir_current->last_level)
+    new_level_nr = leveldir_current->last_level;
+
+  if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+    new_level_nr = leveldir_current->handicap_level;
 
-  for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
+  if (new_level_nr != old_level_nr)
   {
-    int entry = first_entry + i;
-    boolean active = (entry == highlight_position);
-    int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
-    int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
-    int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
-    int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
-    int dxoff = getFontDrawOffsetX(font_nr1);
-    int dx1 = 3 * getFontWidth(font_nr1);
-    int dx2 = dx1 + getFontWidth(font_nr1);
-    int dx3 = SXSIZE - 2 * (mSX - SX + dxoff) - 5 * getFontWidth(font_nr4);
-    int num_dots = (dx3 - dx2) / getFontWidth(font_nr3);
-    int sy = mSY + 64 + i * 32;
+    PlaySound(SND_MENU_ITEM_SELECTING);
 
-    DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1);
-    DrawText(mSX + dx1, sy, ".", font_nr1);
+    scores.last_level_nr = level_nr = new_level_nr;
+    scores.last_entry_nr = 0;
 
-    for (j = 0; j < num_dots; j++)
-      DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3);
+    LoadLevel(level_nr);
+    LoadLocalAndServerScore(level_nr, TRUE);
 
-    if (!strEqual(highscore[entry].Name, EMPTY_PLAYER_NAME))
-      DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2);
+    DrawHallOfFame_setScoreEntries();
 
-    DrawText(mSX + dx3, sy, int2str(highscore[entry].Score, 5), font_nr4);
-  }
+    if (game_status == GAME_MODE_SCORES)
+    {
+      // force remapping optional gadgets (especially scroll bar)
+      UnmapScreenTreeGadgets();
 
-  redraw_mask |= REDRAW_FIELD;
+      // redraw complete high score screen, as sub-title has changed
+      ClearField();
+
+      // redraw level selection buttons (which have just been erased)
+      RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
+
+      HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, &score_entry_current);
+    }
+    else
+    {
+      DrawScoreInfo_Content(scores.last_entry_nr);
+    }
+
+    SaveLevelSetup_SeriesInfo();
+  }
 }
 
 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);
+  HandleChooseTree(mx, my, dx, dy, button, &score_entry_current);
+}
 
-  if (button == MB_MENU_INITIALIZE)
-  {
-    level_nr = mx;
-    first_entry = 0;
-    highlight_position = my;
+static void DrawScoreInfo_Content(int entry_nr)
+{
+  struct ScoreEntry *entry = &scores.entry[entry_nr];
+  char *pos_text = getHallOfFameRankText(entry_nr, 0);
+  char *tape_date = getHallOfFameTapeDateText(entry);
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_para  = menu.paragraph_spacing[GAME_MODE_SCOREINFO];
+  int spacing_line  = menu.line_spacing[GAME_MODE_SCOREINFO];
+  int xstep = getFontWidth(font_text);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int xstart  = mSX - SX + menu.left_spacing[GAME_MODE_SCOREINFO];
+  int ystart  = mSY - SY + menu.top_spacing[GAME_MODE_SCOREINFO];
+  int ybottom = mSY - SY + SYSIZE - menu.bottom_spacing[GAME_MODE_SCOREINFO];
+  int xstart1 = xstart + xstep;
+  int xstart2 = xstart + xstep * 12;
+  int select_x = SX + xstart1;
+  int select_y1, select_y2;
+  int play_x, play_y;
+  int play_height = screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]->height;
+  boolean play_visible = !strEqual(tape_date, UNKNOWN_NAME);
+  int font_width = getFontWidth(font_text);
+  int font_height = getFontHeight(font_text);
+  int tape_date_width  = getTextWidth(tape_date, font_text);
+  int pad_left = xstart2;
+  int pad_right = menu.right_spacing[GAME_MODE_SCOREINFO];
+  int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
+  int max_lines_per_text = 5;
+  int lines;
+
+  ClearField();
+
+  // redraw level selection buttons (which have just been erased)
+  RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
 
-    drawHallOfFameList(level_nr, first_entry, highlight_position);
+  if (score_entries == NULL)
+  {
+    drawChooseTreeScreen_Scores_NotAvailable();
 
     return;
   }
 
-  if (ABS(dy) == SCROLL_PAGE)          /* handle scrolling one page */
-    step = NUM_MENU_ENTRIES_ON_SCREEN - 1;
+  drawChooseTreeHead(score_entries);
+  drawChooseTreeInfo(score_entries);
+
+  DrawTextF(xstart1, ystart, font_head, "Level Set");
+  lines = DrawTextBufferS(xstart2, ystart, leveldir_current->name, font_text,
+                         max_chars_per_line, -1, max_lines_per_text, 0, -1,
+                         TRUE, FALSE, FALSE);
+  ystart += ystep_line + (lines > 0 ? lines - 1 : 0) * font_height;
+
+  DrawTextF(xstart1, ystart, font_head, "Level");
+  lines = DrawTextBufferS(xstart2, ystart, level.name, font_text,
+                         max_chars_per_line, -1, max_lines_per_text, 0, -1,
+                         TRUE, FALSE, FALSE);
+  ystart += ystep_para + (lines > 0 ? lines - 1 : 0) * font_height;
+
+  select_y1 = SY + ystart;
+  ystart += graphic_info[IMG_MENU_BUTTON_PREV_SCORE].height;
 
-  if (dy < 0)
+  DrawTextF(xstart1, ystart, font_head, "Rank");
+  DrawTextF(xstart2, ystart, font_text, pos_text);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Player");
+  DrawTextF(xstart2, ystart, font_text, entry->name);
+  ystart += ystep_line;
+
+  if (level.use_step_counter)
   {
-    if (first_entry > 0)
-    {
-      first_entry -= step;
-      if (first_entry < 0)
-       first_entry = 0;
+    DrawTextF(xstart1, ystart, font_head, "Steps");
+    DrawTextF(xstart2, ystart, font_text, int2str(entry->time, 5));
+    ystart += ystep_line;
+  }
+  else
+  {
+    DrawTextF(xstart1, ystart, font_head, "Time");
+    DrawTextF(xstart2, ystart, font_text, getHallOfFameTimeText(entry_nr));
+    ystart += ystep_line;
+  }
 
-      drawHallOfFameList(level_nr, first_entry, highlight_position);
-    }
+  if (!level.rate_time_over_score || entry->score > 0)
+  {
+    DrawTextF(xstart1, ystart, font_head, "Score");
+    DrawTextF(xstart2, ystart, font_text, int2str(entry->score, 5));
+    ystart += ystep_line;
+  }
+
+  ystart += ystep_line;
+
+  play_x = SX + xstart2 + tape_date_width + font_width;
+  play_y = SY + ystart + (font_height - play_height) / 2;
+
+  DrawTextF(xstart1, ystart, font_head, "Tape Date");
+  DrawTextF(xstart2, ystart, font_text, tape_date);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Platform");
+  DrawTextF(xstart2, ystart, font_text, entry->platform);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Version");
+  DrawTextF(xstart2, ystart, font_text, entry->version);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Country");
+  lines = DrawTextBufferS(xstart2, ystart, entry->country_name, font_text,
+                         max_chars_per_line, -1, max_lines_per_text, 0, -1,
+                         TRUE, FALSE, FALSE);
+  ystart += ystep_line;
+
+  select_y2 = SY + ystart;
+
+  DrawTextSCentered(ybottom, font_foot, "Press any key or button to go back");
+
+  AdjustScoreInfoButtons_SelectScore(select_x, select_y1, select_y2);
+  AdjustScoreInfoButtons_PlayTape(play_x, play_y, play_visible);
+}
+
+static void DrawScoreInfo(int entry_nr)
+{
+  scores.last_entry_nr = entry_nr;
+  score_info_tape_play = FALSE;
+
+  UnmapAllGadgets();
+
+  FreeScreenGadgets();
+  CreateScreenGadgets();
+
+  FadeOut(REDRAW_FIELD);
+
+  // needed if different viewport properties defined after playing score tape
+  ChangeViewportPropertiesIfNeeded();
+
+  // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
+  SetDrawDeactivationMask(REDRAW_NONE);
+  SetDrawBackgroundMask(REDRAW_FIELD);
+
+  // needed if different background image defined after playing score tape
+  SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO);
+
+  // special compatibility handling for "Snake Bite" graphics set
+  if (strPrefix(leveldir_current->identifier, "snake_bite"))
+    ClearRectangle(gfx.background_bitmap, gfx.real_sx, gfx.real_sy + 64,
+                  gfx.full_sxsize, gfx.full_sysize - 64);
+
+  DrawScoreInfo_Content(entry_nr);
+
+  // map gadgets for score info screen
+  MapScreenMenuGadgets(SCREEN_MASK_SCORES_INFO);
+
+  FadeIn(REDRAW_FIELD);
+}
+
+static void HandleScoreInfo_SelectScore(int step, int direction)
+{
+  int old_entry_nr = scores.last_entry_nr;
+  int new_entry_nr = old_entry_nr + step * direction;
+  int num_nodes = numTreeInfoInGroup(score_entry_current);
+  int num_entries = num_nodes - 1;     // score nodes only, without back link
+
+  if (new_entry_nr < 0)
+    new_entry_nr = 0;
+  if (new_entry_nr > num_entries - 1)
+    new_entry_nr = num_entries - 1;
+
+  if (new_entry_nr != old_entry_nr)
+  {
+    scores.last_entry_nr = new_entry_nr;
+
+    DrawScoreInfo_Content(new_entry_nr);
   }
-  else if (dy > 0)
+}
+
+static void HandleScoreInfo_PlayTape(void)
+{
+  if (!PlayScoreTape(scores.last_entry_nr))
   {
-    if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN < MAX_SCORE_ENTRIES)
-    {
-      first_entry += step;
-      if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
-       first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
+    DrawScoreInfo_Content(scores.last_entry_nr);
 
-      drawHallOfFameList(level_nr, first_entry, highlight_position);
-    }
+    FadeIn(REDRAW_FIELD);
   }
-  else if (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE)
+}
+
+void HandleScoreInfo(int mx, int my, int dx, int dy, int button)
+{
+  boolean button_action = (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE);
+  boolean button_is_valid = (mx >= 0 && my >= 0);
+  boolean button_screen_clicked = (button_action && button_is_valid);
+
+  if (server_scores.updated)
   {
-    PlaySound(SND_MENU_ITEM_SELECTING);
+    // reload scores, using updated server score cache file
+    LoadLocalAndServerScore(scores.last_level_nr, FALSE);
 
-    FadeSound(SND_BACKGROUND_SCORES);
+    server_scores.updated = FALSE;
 
-    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);
+    DrawHallOfFame_setScoreEntries();
 
-      DrawMainMenu();
-    }
+    DrawScoreInfo_Content(scores.last_entry_nr);
   }
 
-  if (game_status == GAME_MODE_SCORES)
-    PlayMenuSoundIfLoop();
+  if (button_screen_clicked)
+  {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    SetGameStatus(GAME_MODE_SCORES);
+
+    DrawHallOfFame(scores.last_level_nr);
+  }
+  else if (dx)
+  {
+    HandleHallOfFame_SelectLevel(1, SIGN(dx) * (ABS(dx) > 1 ? 10 : 1));
+  }
+  else if (dy)
+  {
+    HandleScoreInfo_SelectScore(1, SIGN(dy) * (ABS(dy) > 1 ? 10 : 1));
+  }
 }
 
 
-/* ========================================================================= */
-/* setup screen functions                                                    */
-/* ========================================================================= */
+// ============================================================================
+// setup screen functions
+// ============================================================================
 
 static struct TokenInfo *setup_info;
-static int num_setup_info;     /* number of setup entries shown on screen */
-static int max_setup_info;     /* total number of setup entries in list */
+static int num_setup_info;     // number of setup entries shown on screen
+static int max_setup_info;     // total number of setup entries in list
 
 static char *window_size_text;
 static char *scaling_type_text;
@@ -4731,6 +5662,7 @@ static char *vsync_mode_text;
 static char *scroll_delay_text;
 static char *snapshot_mode_text;
 static char *game_speed_text;
+static char *scores_type_text;
 static char *network_server_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
@@ -4744,15 +5676,76 @@ static char *drop_distance_text;
 static char *transparency_text;
 static char *grid_size_text[2][2];
 
-static void execSetupMain(void)
-{
-  setup_mode = SETUP_MODE_MAIN;
+static void execSetupMain(void)
+{
+  setup_mode = SETUP_MODE_MAIN;
+
+  DrawSetupScreen();
+}
+
+static void execSetupGame_setScoresType(void)
+{
+  if (scores_types == NULL)
+  {
+    int i;
+
+    for (i = 0; scores_types_list[i].value != NULL; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      char *value = scores_types_list[i].value;
+      char *text = scores_types_list[i].text;
+
+      ti->node_top = &scores_types;
+      ti->sort_priority = i;
 
-  DrawSetupScreen();
+      sprintf(identifier, "%s", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, STR_SETUP_CHOOSE_SCORES_TYPE);
+
+      pushTreeInfo(&scores_types, ti);
+    }
+
+    // sort scores type values to start with lowest scores type value
+    sortTreeInfo(&scores_types);
+
+    // set current scores type value to configured scores type value
+    scores_type_current =
+      getTreeInfoFromIdentifier(scores_types, setup.scores_in_highscore_list);
+
+    // if that fails, set current scores type to reliable default value
+    if (scores_type_current == NULL)
+      scores_type_current =
+       getTreeInfoFromIdentifier(scores_types, STR_SCORES_TYPE_DEFAULT);
+
+    // if that also fails, set current scores type to first available value
+    if (scores_type_current == NULL)
+      scores_type_current = scores_types;
+  }
+
+  setup.scores_in_highscore_list = scores_type_current->identifier;
+
+  // needed for displaying scores type text instead of identifier
+  scores_type_text = scores_type_current->name;
 }
 
-static void execSetupGame_setGameSpeeds(void)
+static void execSetupGame_setGameSpeeds(boolean update_value)
 {
+  if (setup.game_speed_extended)
+  {
+    game_speeds_list = game_speeds_list_extended;
+    game_speeds      = game_speeds_extended;
+  }
+  else
+  {
+    game_speeds_list = game_speeds_list_normal;
+    game_speeds      = game_speeds_normal;
+  }
+
   if (game_speeds == NULL)
   {
     int i;
@@ -4778,26 +5771,36 @@ static void execSetupGame_setGameSpeeds(void)
       pushTreeInfo(&game_speeds, ti);
     }
 
-    /* sort game speed values to start with slowest game speed */
+    // sort game speed values to start with slowest game speed
     sortTreeInfo(&game_speeds);
 
-    /* set current game speed to configured game speed value */
+    update_value = TRUE;
+  }
+
+  if (update_value)
+  {
+    // set current game speed to configured game speed value
     game_speed_current =
       getTreeInfoFromIdentifier(game_speeds, i_to_a(setup.game_frame_delay));
 
-    /* if that fails, set current game speed to reliable default value */
+    // if that fails, set current game speed to reliable default value
     if (game_speed_current == NULL)
       game_speed_current =
        getTreeInfoFromIdentifier(game_speeds, i_to_a(GAME_FRAME_DELAY));
 
-    /* if that also fails, set current game speed to first available speed */
+    // if that also fails, set current game speed to first available speed
     if (game_speed_current == NULL)
       game_speed_current = game_speeds;
+
+    if (setup.game_speed_extended)
+      game_speeds_extended = game_speeds;
+    else
+      game_speeds_normal = game_speeds;
   }
 
   setup.game_frame_delay = atoi(game_speed_current->identifier);
 
-  /* needed for displaying game speed text instead of identifier */
+  // needed for displaying game speed text instead of identifier
   game_speed_text = game_speed_current->name;
 }
 
@@ -4828,26 +5831,26 @@ static void execSetupGame_setScrollDelays(void)
       pushTreeInfo(&scroll_delays, ti);
     }
 
-    /* sort scroll delay values to start with lowest scroll delay value */
+    // sort scroll delay values to start with lowest scroll delay value
     sortTreeInfo(&scroll_delays);
 
-    /* set current scroll delay value to configured scroll delay value */
+    // set current scroll delay value to configured scroll delay value
     scroll_delay_current =
       getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
 
-    /* if that fails, set current scroll delay to reliable default value */
+    // if that fails, set current scroll delay to reliable default value
     if (scroll_delay_current == NULL)
       scroll_delay_current =
        getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY));
 
-    /* if that also fails, set current scroll delay to first available value */
+    // if that also fails, set current scroll delay to first available value
     if (scroll_delay_current == NULL)
       scroll_delay_current = scroll_delays;
   }
 
   setup.scroll_delay_value = atoi(scroll_delay_current->identifier);
 
-  /* needed for displaying scroll delay text instead of identifier */
+  // needed for displaying scroll delay text instead of identifier
   scroll_delay_text = scroll_delay_current->name;
 }
 
@@ -4878,26 +5881,26 @@ static void execSetupGame_setSnapshotModes(void)
       pushTreeInfo(&snapshot_modes, ti);
     }
 
-    /* sort snapshot mode values to start with lowest snapshot mode value */
+    // sort snapshot mode values to start with lowest snapshot mode value
     sortTreeInfo(&snapshot_modes);
 
-    /* set current snapshot mode value to configured snapshot mode value */
+    // set current snapshot mode value to configured snapshot mode value
     snapshot_mode_current =
       getTreeInfoFromIdentifier(snapshot_modes, setup.engine_snapshot_mode);
 
-    /* if that fails, set current snapshot mode to reliable default value */
+    // if that fails, set current snapshot mode to reliable default value
     if (snapshot_mode_current == NULL)
       snapshot_mode_current =
        getTreeInfoFromIdentifier(snapshot_modes, STR_SNAPSHOT_MODE_DEFAULT);
 
-    /* if that also fails, set current snapshot mode to first available value */
+    // if that also fails, set current snapshot mode to first available value
     if (snapshot_mode_current == NULL)
       snapshot_mode_current = snapshot_modes;
   }
 
   setup.engine_snapshot_mode = snapshot_mode_current->identifier;
 
-  /* needed for displaying snapshot mode text instead of identifier */
+  // needed for displaying snapshot mode text instead of identifier
   snapshot_mode_text = snapshot_mode_current->name;
 }
 
@@ -4914,21 +5917,38 @@ static void execSetupGame_setNetworkServerText(void)
     network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN] = '\0';
   }
 
-  /* needed for displaying network server text instead of identifier */
+  // needed for displaying network server text instead of identifier
   network_server_text = network_server_hostname;
 }
 
 static void execSetupGame(void)
 {
-  execSetupGame_setGameSpeeds();
+  boolean check_vsync_mode = (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED);
+
+  execSetupGame_setGameSpeeds(FALSE);
+  execSetupGame_setScoresType();
   execSetupGame_setScrollDelays();
   execSetupGame_setSnapshotModes();
 
   execSetupGame_setNetworkServerText();
 
+  if (!setup.provide_uploading_tapes)
+    setHideSetupEntry(execOfferUploadTapes);
+
   setup_mode = SETUP_MODE_GAME;
 
   DrawSetupScreen();
+
+  // check if vsync needs to be disabled for this game speed to work
+  if (check_vsync_mode)
+    DisableVsyncIfNeeded();
+}
+
+static void execSetupChooseScoresType(void)
+{
+  setup_mode = SETUP_MODE_CHOOSE_SCORES_TYPE;
+
+  DrawSetupScreen();
 }
 
 static void execSetupChooseGameSpeed(void)
@@ -4952,6 +5972,13 @@ static void execSetupChooseSnapshotMode(void)
   DrawSetupScreen();
 }
 
+static void execSetupEngines(void)
+{
+  setup_mode = SETUP_MODE_ENGINES;
+
+  DrawSetupScreen();
+}
+
 static void execSetupEditor(void)
 {
   setup_mode = SETUP_MODE_EDITOR;
@@ -5019,28 +6046,28 @@ static void execSetupGraphics_setWindowSizes(boolean update_list)
       pushTreeInfo(&window_sizes, ti);
     }
 
-    /* sort window size values to start with lowest window size value */
+    // sort window size values to start with lowest window size value
     sortTreeInfo(&window_sizes);
 
-    /* set current window size value to configured window size value */
+    // set current window size value to configured window size value
     window_size_current =
       getTreeInfoFromIdentifier(window_sizes,
                                i_to_a(setup.window_scaling_percent));
 
-    /* if that fails, set current window size to reliable default value */
+    // if that fails, set current window size to reliable default value
     if (window_size_current == NULL)
       window_size_current =
        getTreeInfoFromIdentifier(window_sizes,
                                  i_to_a(STD_WINDOW_SCALING_PERCENT));
 
-    /* if that also fails, set current window size to first available value */
+    // if that also fails, set current window size to first available value
     if (window_size_current == NULL)
       window_size_current = window_sizes;
   }
 
   setup.window_scaling_percent = atoi(window_size_current->identifier);
 
-  /* needed for displaying window size text instead of identifier */
+  // needed for displaying window size text instead of identifier
   window_size_text = window_size_current->name;
 }
 
@@ -5071,26 +6098,26 @@ static void execSetupGraphics_setScalingTypes(void)
       pushTreeInfo(&scaling_types, ti);
     }
 
-    /* sort scaling type values to start with lowest scaling type value */
+    // sort scaling type values to start with lowest scaling type value
     sortTreeInfo(&scaling_types);
 
-    /* set current scaling type value to configured scaling type value */
+    // set current scaling type value to configured scaling type value
     scaling_type_current =
       getTreeInfoFromIdentifier(scaling_types, setup.window_scaling_quality);
 
-    /* if that fails, set current scaling type to reliable default value */
+    // if that fails, set current scaling type to reliable default value
     if (scaling_type_current == NULL)
       scaling_type_current =
        getTreeInfoFromIdentifier(scaling_types, SCALING_QUALITY_DEFAULT);
 
-    /* if that also fails, set current scaling type to first available value */
+    // if that also fails, set current scaling type to first available value
     if (scaling_type_current == NULL)
       scaling_type_current = scaling_types;
   }
 
   setup.window_scaling_quality = scaling_type_current->identifier;
 
-  /* needed for displaying scaling type text instead of identifier */
+  // needed for displaying scaling type text instead of identifier
   scaling_type_text = scaling_type_current->name;
 }
 
@@ -5121,31 +6148,31 @@ static void execSetupGraphics_setRenderingModes(void)
       pushTreeInfo(&rendering_modes, ti);
     }
 
-    /* sort rendering mode values to start with lowest rendering mode value */
+    // sort rendering mode values to start with lowest rendering mode value
     sortTreeInfo(&rendering_modes);
 
-    /* set current rendering mode value to configured rendering mode value */
+    // set current rendering mode value to configured rendering mode value
     rendering_mode_current =
       getTreeInfoFromIdentifier(rendering_modes, setup.screen_rendering_mode);
 
-    /* if that fails, set current rendering mode to reliable default value */
+    // if that fails, set current rendering mode to reliable default value
     if (rendering_mode_current == NULL)
       rendering_mode_current =
        getTreeInfoFromIdentifier(rendering_modes,
                                  STR_SPECIAL_RENDERING_DEFAULT);
 
-    /* if that also fails, set current rendering mode to first available one */
+    // if that also fails, set current rendering mode to first available one
     if (rendering_mode_current == NULL)
       rendering_mode_current = rendering_modes;
   }
 
   setup.screen_rendering_mode = rendering_mode_current->identifier;
 
-  /* needed for displaying rendering mode text instead of identifier */
+  // needed for displaying rendering mode text instead of identifier
   rendering_mode_text = rendering_mode_current->name;
 }
 
-static void execSetupGraphics_setVsyncModes(void)
+static void execSetupGraphics_setVsyncModes(boolean update_value)
 {
   if (vsync_modes == NULL)
   {
@@ -5172,51 +6199,69 @@ static void execSetupGraphics_setVsyncModes(void)
       pushTreeInfo(&vsync_modes, ti);
     }
 
-    /* sort vsync mode values to start with lowest vsync mode value */
+    // sort vsync mode values to start with lowest vsync mode value
     sortTreeInfo(&vsync_modes);
 
-    /* set current vsync mode value to configured vsync mode value */
+    update_value = TRUE;
+  }
+
+  if (update_value)
+  {
+    // set current vsync mode value to configured vsync mode value
     vsync_mode_current =
       getTreeInfoFromIdentifier(vsync_modes, setup.vsync_mode);
 
-    /* if that fails, set current vsync mode to reliable default value */
+    // if that fails, set current vsync mode to reliable default value
     if (vsync_mode_current == NULL)
       vsync_mode_current =
        getTreeInfoFromIdentifier(vsync_modes, STR_VSYNC_MODE_DEFAULT);
 
-    /* if that also fails, set current vsync mode to first available one */
+    // if that also fails, set current vsync mode to first available one
     if (vsync_mode_current == NULL)
       vsync_mode_current = vsync_modes;
   }
 
   setup.vsync_mode = vsync_mode_current->identifier;
 
-  /* needed for displaying vsync mode text instead of identifier */
+  // needed for displaying vsync mode text instead of identifier
   vsync_mode_text = vsync_mode_current->name;
 }
 
 static void execSetupGraphics(void)
 {
+  boolean check_game_speed = (setup_mode == SETUP_MODE_CHOOSE_VSYNC);
+
   // update "setup.window_scaling_percent" from list selection
   // (in this case, window scaling was changed on setup screen)
   if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
     execSetupGraphics_setWindowSizes(FALSE);
 
+  // update "setup.vsync_mode" from list selection
+  // (in this case, vsync mode was changed on setup screen)
+  if (setup_mode == SETUP_MODE_CHOOSE_VSYNC)
+    execSetupGraphics_setVsyncModes(FALSE);
+
   // update list selection from "setup.window_scaling_percent"
   // (window scaling may have changed by resizing the window)
   execSetupGraphics_setWindowSizes(TRUE);
 
+  // update list selection from "setup.vsync_mode"
+  // (vsync_mode may have changed by re-creating the renderer)
+  execSetupGraphics_setVsyncModes(TRUE);
+
   execSetupGraphics_setScalingTypes();
   execSetupGraphics_setRenderingModes();
-  execSetupGraphics_setVsyncModes();
 
   setup_mode = SETUP_MODE_GRAPHICS;
 
   DrawSetupScreen();
 
-#if defined(TARGET_SDL2)
+  // check if game speed is high enough for 60 Hz vsync to work
+  if (check_game_speed)
+    ModifyGameSpeedIfNeeded();
+
   // window scaling may have changed at this point
-  ToggleFullscreenOrChangeWindowScalingIfNeeded();
+  ChangeWindowScalingIfNeeded();
 
   // window scaling quality may have changed at this point
   if (!strEqual(setup.window_scaling_quality, video.window_scaling_quality))
@@ -5225,9 +6270,23 @@ static void execSetupGraphics(void)
   // screen rendering mode may have changed at this point
   SDLSetScreenRenderingMode(setup.screen_rendering_mode);
 
+  int setup_vsync_mode = VSYNC_MODE_STR_TO_INT(setup.vsync_mode);
+  int video_vsync_mode = video.vsync_mode;
+
   // screen vsync mode may have changed at this point
-  SDLSetScreenVsyncMode(setup.vsync_mode);
-#endif
+  ChangeVsyncModeIfNeeded();
+
+  // check if setting vsync mode to selected value failed
+  if (setup_vsync_mode != video_vsync_mode &&
+      setup_vsync_mode != video.vsync_mode)
+  {
+    // changing vsync mode to selected value failed -- reset displayed value
+    execSetupGraphics_setVsyncModes(TRUE);
+
+    Request("Setting VSync failed!", REQ_CONFIRM);
+
+    DrawSetupScreen();
+  }
 }
 
 static void execSetupChooseWindowSize(void)
@@ -5332,19 +6391,19 @@ static void execSetupSound(void)
       pushTreeInfo(&volumes_simple, ti);
     }
 
-    /* sort volume values to start with lowest volume value */
+    // sort volume values to start with lowest volume value
     sortTreeInfo(&volumes_simple);
 
-    /* set current volume value to configured volume value */
+    // set current volume value to configured volume value
     volume_simple_current =
       getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple));
 
-    /* if that fails, set current volume to reliable default value */
+    // if that fails, set current volume to reliable default value
     if (volume_simple_current == NULL)
       volume_simple_current =
        getTreeInfoFromIdentifier(volumes_simple, i_to_a(100));
 
-    /* if that also fails, set current volume to first available value */
+    // if that also fails, set current volume to first available value
     if (volume_simple_current == NULL)
       volume_simple_current = volumes_simple;
   }
@@ -5400,19 +6459,19 @@ static void execSetupSound(void)
       pushTreeInfo(&volumes_loops, ti);
     }
 
-    /* sort volume values to start with lowest volume value */
+    // sort volume values to start with lowest volume value
     sortTreeInfo(&volumes_loops);
 
-    /* set current volume value to configured volume value */
+    // set current volume value to configured volume value
     volume_loops_current =
       getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops));
 
-    /* if that fails, set current volume to reliable default value */
+    // if that fails, set current volume to reliable default value
     if (volume_loops_current == NULL)
       volume_loops_current =
        getTreeInfoFromIdentifier(volumes_loops, i_to_a(100));
 
-    /* if that also fails, set current volume to first available value */
+    // if that also fails, set current volume to first available value
     if (volume_loops_current == NULL)
       volume_loops_current = volumes_loops;
   }
@@ -5468,19 +6527,19 @@ static void execSetupSound(void)
       pushTreeInfo(&volumes_music, ti);
     }
 
-    /* sort volume values to start with lowest volume value */
+    // sort volume values to start with lowest volume value
     sortTreeInfo(&volumes_music);
 
-    /* set current volume value to configured volume value */
+    // set current volume value to configured volume value
     volume_music_current =
       getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music));
 
-    /* if that fails, set current volume to reliable default value */
+    // if that fails, set current volume to reliable default value
     if (volume_music_current == NULL)
       volume_music_current =
        getTreeInfoFromIdentifier(volumes_music, i_to_a(100));
 
-    /* if that also fails, set current volume to first available value */
+    // if that also fails, set current volume to first available value
     if (volume_music_current == NULL)
       volume_music_current = volumes_music;
   }
@@ -5489,7 +6548,7 @@ static void execSetupSound(void)
   setup.volume_loops  = atoi(volume_loops_current->identifier);
   setup.volume_music  = atoi(volume_music_current->identifier);
 
-  /* needed for displaying volume text instead of identifier */
+  // needed for displaying volume text instead of identifier
   volume_simple_text = volume_simple_current->name;
   volume_loops_text = volume_loops_current->name;
   volume_music_text = volume_music_current->name;
@@ -5593,19 +6652,19 @@ static void execSetupTouch(void)
       pushTreeInfo(&touch_controls, ti);
     }
 
-    /* sort touch control values to start with lowest touch control value */
+    // sort touch control values to start with lowest touch control value
     sortTreeInfo(&touch_controls);
 
-    /* set current touch control value to configured touch control value */
+    // set current touch control value to configured touch control value
     touch_control_current =
       getTreeInfoFromIdentifier(touch_controls, setup.touch.control_type);
 
-    /* if that fails, set current touch control to reliable default value */
+    // if that fails, set current touch control to reliable default value
     if (touch_control_current == NULL)
       touch_control_current =
        getTreeInfoFromIdentifier(touch_controls, TOUCH_CONTROL_DEFAULT);
 
-    /* if that also fails, set current touch control to first available value */
+    // if that also fails, set current touch control to first available value
     if (touch_control_current == NULL)
       touch_control_current = touch_controls;
   }
@@ -5633,21 +6692,21 @@ static void execSetupTouch(void)
       pushTreeInfo(&move_distances, ti);
     }
 
-    /* sort distance values to start with lowest distance value */
+    // sort distance values to start with lowest distance value
     sortTreeInfo(&move_distances);
 
-    /* set current distance value to configured distance value */
+    // set current distance value to configured distance value
     move_distance_current =
       getTreeInfoFromIdentifier(move_distances,
                                i_to_a(setup.touch.move_distance));
 
-    /* if that fails, set current distance to reliable default value */
+    // if that fails, set current distance to reliable default value
     if (move_distance_current == NULL)
       move_distance_current =
        getTreeInfoFromIdentifier(move_distances,
                                  i_to_a(TOUCH_MOVE_DISTANCE_DEFAULT));
 
-    /* if that also fails, set current distance to first available value */
+    // if that also fails, set current distance to first available value
     if (move_distance_current == NULL)
       move_distance_current = move_distances;
   }
@@ -5675,21 +6734,21 @@ static void execSetupTouch(void)
       pushTreeInfo(&drop_distances, ti);
     }
 
-    /* sort distance values to start with lowest distance value */
+    // sort distance values to start with lowest distance value
     sortTreeInfo(&drop_distances);
 
-    /* set current distance value to configured distance value */
+    // set current distance value to configured distance value
     drop_distance_current =
       getTreeInfoFromIdentifier(drop_distances,
                                i_to_a(setup.touch.drop_distance));
 
-    /* if that fails, set current distance to reliable default value */
+    // if that fails, set current distance to reliable default value
     if (drop_distance_current == NULL)
       drop_distance_current =
        getTreeInfoFromIdentifier(drop_distances,
                                  i_to_a(TOUCH_DROP_DISTANCE_DEFAULT));
 
-    /* if that also fails, set current distance to first available value */
+    // if that also fails, set current distance to first available value
     if (drop_distance_current == NULL)
       drop_distance_current = drop_distances;
   }
@@ -5717,21 +6776,21 @@ static void execSetupTouch(void)
       pushTreeInfo(&transparencies, ti);
     }
 
-    /* sort transparency values to start with lowest transparency value */
+    // sort transparency values to start with lowest transparency value
     sortTreeInfo(&transparencies);
 
-    /* set current transparency value to configured transparency value */
+    // 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 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 that also fails, set current transparency to first available value
     if (transparency_current == NULL)
       transparency_current = transparencies;
   }
@@ -5770,17 +6829,17 @@ static void execSetupTouch(void)
          pushTreeInfo(&grid_sizes[i][j], ti);
        }
 
-       /* sort grid size values to start with lowest grid size value */
+       // 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 */
+       // 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 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],
@@ -5788,7 +6847,7 @@ static void execSetupTouch(void)
                                             DEFAULT_GRID_XSIZE(i) :
                                             DEFAULT_GRID_YSIZE(i)));
 
-       /* if that also fails, set current grid size to first available value */
+       // 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];
       }
@@ -5812,7 +6871,7 @@ static void execSetupTouch(void)
     }
   }
 
-  /* needed for displaying value text instead of identifier */
+  // 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;
@@ -5829,21 +6888,38 @@ static void execSetupTouch(void)
 
 static void execSetupArtwork(void)
 {
+  static ArtworkDirTree *gfx_last_valid = NULL;
+  static ArtworkDirTree *snd_last_valid = NULL;
+  static ArtworkDirTree *mus_last_valid = NULL;
+
+  // current artwork directory may be invalid (level group, parent link)
+  if (!validLevelSeries(artwork.gfx_current))
+    artwork.gfx_current = getFirstValidTreeInfoEntry(gfx_last_valid);
+  if (!validLevelSeries(artwork.snd_current))
+    artwork.snd_current = getFirstValidTreeInfoEntry(snd_last_valid);
+  if (!validLevelSeries(artwork.mus_current))
+    artwork.mus_current = getFirstValidTreeInfoEntry(mus_last_valid);
+
+  // store valid artwork directory information
+  gfx_last_valid = artwork.gfx_current;
+  snd_last_valid = artwork.snd_current;
+  mus_last_valid = artwork.mus_current;
+
 #if 0
-  printf("::: '%s', '%s', '%s'\n",
-        artwork.gfx_current->subdir,
-        artwork.gfx_current->fullpath,
-        artwork.gfx_current->basepath);
+  Debug("screens:execSetupArtwork", "'%s', '%s', '%s'",
+       artwork.gfx_current->subdir,
+       artwork.gfx_current->fullpath,
+       artwork.gfx_current->basepath);
 #endif
 
   setup.graphics_set = artwork.gfx_current->identifier;
   setup.sounds_set = artwork.snd_current->identifier;
   setup.music_set = artwork.mus_current->identifier;
 
-  /* needed if last screen (setup choice) changed graphics, sounds or music */
+  // needed if last screen (setup choice) changed graphics, sounds or music
   ReloadCustomArtwork(0);
 
-  /* needed for displaying artwork name instead of artwork identifier */
+  // needed for displaying artwork name instead of artwork identifier
   graphics_set_name = artwork.gfx_current->name;
   sounds_set_name = artwork.snd_current->name;
   music_set_name = artwork.mus_current->name;
@@ -5951,6 +7027,11 @@ static void execGadgetNetworkServer(void)
   ClickOnGadget(gi, MB_LEFTBUTTON);
 }
 
+static void execOfferUploadTapes(void)
+{
+  OfferUploadTapes();
+}
+
 static void ToggleNetworkModeIfNeeded(void)
 {
   int font_title = FONT_TITLE_1;
@@ -5980,15 +7061,104 @@ static void ToggleNetworkModeIfNeeded(void)
   DrawTextSCentered(ybottom, font_foot,
                    "Press any key or button for setup menu");
 
+  WaitForEventToContinue();
+
+  DrawSetupScreen();
+}
+
+static void ToggleGameSpeedsListIfNeeded(void)
+{
+  boolean using_game_speeds_extended = (game_speeds == game_speeds_extended);
+
+  if (setup.game_speed_extended == using_game_speeds_extended)
+    return;
+
+  // try to match similar values when changing game speeds list
+  if (setup.game_speed_extended)
+    setup.game_frame_delay = (setup.game_frame_delay == 15 ? 16 :
+                             setup.game_frame_delay == 30 ? 29 :
+                             setup.game_frame_delay);
+  else
+    setup.game_frame_delay = (setup.game_frame_delay == 14 ? 15 :
+                             setup.game_frame_delay == 16 ? 15 :
+                             setup.game_frame_delay >= 29 ? 30 :
+                             setup.game_frame_delay <= 10 ? 10 :
+                             setup.game_frame_delay);
+
+  execSetupGame_setGameSpeeds(TRUE);
+
   DrawSetupScreen();
 }
 
+static void ToggleUseApiServerIfNeeded(void)
+{
+  if (runtime.use_api_server == setup.use_api_server)
+    return;
+
+  runtime.use_api_server = setup.use_api_server;
+
+  if (runtime.use_api_server)
+  {
+    if (setup.has_remaining_tapes)
+      setup.ask_for_uploading_tapes = TRUE;
+
+    CheckApiServerTasks();
+  }
+}
+
+static void ModifyGameSpeedIfNeeded(void)
+{
+  if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) ||
+      setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY)
+    return;
+
+  char message[100];
+  char *game_speed_text = "Fast";
+  int game_speed_value = 15;
+
+  if (setup.game_speed_extended)
+  {
+    game_speed_text = "60 fps";
+    game_speed_value = 16;
+  }
+
+  sprintf(message, "Game speed set to %s for VSync to work!", game_speed_text);
+
+  // set game speed to existing list value that is fast enough for vsync
+  setup.game_frame_delay = game_speed_value;
+
+  execSetupGame_setGameSpeeds(TRUE);
+
+  Request(message, REQ_CONFIRM);
+}
+
+static void DisableVsyncIfNeeded(void)
+{
+  if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) ||
+      (setup.game_frame_delay >= MIN_VSYNC_FRAME_DELAY &&
+       setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY))
+    return;
+
+  // disable vsync for the selected game speed to work
+  setup.vsync_mode = STR_VSYNC_MODE_OFF;
+
+  execSetupGraphics_setVsyncModes(TRUE);
+
+  Request("VSync disabled for this game speed to work!", REQ_CONFIRM);
+}
+
 static struct
 {
   void *value;
   void *related_value;
 } hide_related_entry_list[] =
 {
+  { &setup.network_server_hostname,    execGadgetNetworkServer         },
+  { &setup.network_server_hostname,    &network_server_text            },
+
+  { &setup.scores_in_highscore_list,   execSetupChooseScoresType       },
+  { &setup.scores_in_highscore_list,   &scores_type_text               },
+
   { &setup.game_frame_delay,           execSetupChooseGameSpeed        },
   { &setup.game_frame_delay,           &game_speed_text                },
 
@@ -6052,6 +7222,33 @@ static struct
   { &setup.touch.grid_ysize[1],                execSetupChooseGridYSize_1      },
   { &setup.touch.grid_ysize[1],                &grid_size_text[1][1]           },
 
+  { &setup.internal.menu_game,         execSetupGame                   },
+  { &setup.internal.menu_engines,      execSetupEngines                },
+  { &setup.internal.menu_editor,       execSetupEditor                 },
+  { &setup.internal.menu_graphics,     execSetupGraphics               },
+  { &setup.internal.menu_sound,                execSetupSound                  },
+  { &setup.internal.menu_artwork,      execSetupArtwork                },
+  { &setup.internal.menu_input,                execSetupInput                  },
+  { &setup.internal.menu_touch,                execSetupTouch                  },
+  { &setup.internal.menu_shortcuts,    execSetupShortcuts              },
+  { &setup.internal.menu_exit,         execExitSetup                   },
+  { &setup.internal.menu_save_and_exit,        execSaveAndExitSetup            },
+
+  { &setup.internal.menu_shortcuts_various,    execSetupShortcuts1     },
+  { &setup.internal.menu_shortcuts_focus,      execSetupShortcuts2     },
+  { &setup.internal.menu_shortcuts_tape,       execSetupShortcuts3     },
+  { &setup.internal.menu_shortcuts_sound,      execSetupShortcuts4     },
+  { &setup.internal.menu_shortcuts_snap,       execSetupShortcuts5     },
+
+  { &setup.internal.info_title,                execInfoTitleScreen             },
+  { &setup.internal.info_elements,     execInfoElements                },
+  { &setup.internal.info_music,                execInfoMusic                   },
+  { &setup.internal.info_credits,      execInfoCredits                 },
+  { &setup.internal.info_program,      execInfoProgram                 },
+  { &setup.internal.info_version,      execInfoVersion                 },
+  { &setup.internal.info_levelset,     execInfoLevelSet                },
+  { &setup.internal.info_exit,         execExitInfo                    },
+
   { NULL,                              NULL                            }
 };
 
@@ -6067,6 +7264,7 @@ void setHideRelatedSetupEntries(void)
 static struct TokenInfo setup_info_main[] =
 {
   { TYPE_ENTER_MENU,   execSetupGame,          STR_SETUP_GAME          },
+  { TYPE_ENTER_MENU,   execSetupEngines,       STR_SETUP_ENGINES       },
   { TYPE_ENTER_MENU,   execSetupEditor,        STR_SETUP_EDITOR        },
   { TYPE_ENTER_MENU,   execSetupGraphics,      STR_SETUP_GRAPHICS      },
   { TYPE_ENTER_MENU,   execSetupSound,         STR_SETUP_SOUND         },
@@ -6088,23 +7286,52 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_PLAYER,       &setup.network_player_nr,"Preferred Network Player:" },
   { TYPE_TEXT_INPUT,   execGadgetNetworkServer, "Network Server Hostname:" },
   { TYPE_STRING,       &network_server_text,   ""                      },
+  { TYPE_SWITCH,       &setup.use_api_server,  "Use Highscore Server:" },
+  { TYPE_ENTER_LIST,   execSetupChooseScoresType,"Scores in Highscore List:" },
+  { TYPE_STRING,       &scores_type_text,      ""                      },
+  { TYPE_ENTER_LIST,   execOfferUploadTapes,   "Upload Tapes to Server" },
+  { TYPE_SWITCH,       &setup.multiple_users,  "Multiple Users/Teams:" },
   { 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.handicap,        "Force Solving Levels:" },
+  { TYPE_SWITCH,       &setup.skip_levels,     "Allow Skipping 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_SWITCH,       &setup.count_score_after_game,"Count Score After Game:" },
+  { TYPE_SWITCH,       &setup.show_scores_after_game,"Show Scores After Game:" },
+  { TYPE_YES_NO,       &setup.ask_on_game_over, "Ask on Game Over:"    },
+  { TYPE_YES_NO,       &setup.ask_on_quit_game, "Ask on Quit Game:"    },
+  { TYPE_YES_NO,       &setup.ask_on_quit_program, "Ask on Quit Program:" },
+  { TYPE_SWITCH,       &setup.autorecord,      "Auto-Record When Playing:" },
+  { TYPE_SWITCH,       &setup.autorecord_after_replay, "Auto-Record After Replay:" },
+  { TYPE_SWITCH,       &setup.auto_pause_on_start, "Start Game in Pause Mode:" },
   { TYPE_ENTER_LIST,   execSetupChooseGameSpeed, "Game Speed:"         },
   { TYPE_STRING,       &game_speed_text,       ""                      },
+  { TYPE_SWITCH,       &setup.game_speed_extended, "Game Speed Extended List:" },
 #if 1
   { TYPE_ENTER_LIST,   execSetupChooseScrollDelay, "Scroll Delay:"     },
   { TYPE_STRING,       &scroll_delay_text,     ""                      },
 #endif
   { TYPE_ENTER_LIST, execSetupChooseSnapshotMode,"Game Engine Snapshot Mode:" },
   { TYPE_STRING,       &snapshot_mode_text,    ""                      },
-  { TYPE_SWITCH,       &setup.show_snapshot_buttons,"Show Snapshot Buttons:" },
+  { TYPE_SWITCH,       &setup.show_load_save_buttons,"Show Load/Save Buttons:" },
+  { TYPE_SWITCH,       &setup.show_undo_redo_buttons,"Show Undo/Redo Buttons:" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
+
+  { 0,                 NULL,                   NULL                    }
+};
+
+static struct TokenInfo setup_info_engines[] =
+{
+  { TYPE_HEADLINE,     NULL,                   "Emerald Mine"          },
+  { TYPE_SWITCH,       &setup.forced_scroll_delay, "Scroll Delay:"     },
+  { TYPE_ECS_AGA,      &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
+  { TYPE_SWITCH,       &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" },
+  { TYPE_SWITCH,       &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_HEADLINE,     NULL,                   "Supaplex"              },
+  { TYPE_SWITCH,       &setup.sp_show_border_elements, "Border Elements:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
@@ -6140,6 +7367,8 @@ static struct TokenInfo setup_info_editor[] =
 #endif
   { TYPE_SWITCH, &setup.editor.show_element_token,     "Show element token:" },
   { TYPE_EMPTY,                NULL,                   ""                      },
+  { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" },
+  { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
   { 0,                 NULL,                   NULL                    }
@@ -6147,7 +7376,7 @@ static struct TokenInfo setup_info_editor[] =
 
 static struct TokenInfo setup_info_graphics[] =
 {
-#if defined(TARGET_SDL2) && !defined(PLATFORM_ANDROID)
+#if !defined(PLATFORM_ANDROID) && !defined(PLATFORM_EMSCRIPTEN)
   { TYPE_SWITCH,       &setup.fullscreen,      "Fullscreen:"           },
   { TYPE_ENTER_LIST,   execSetupChooseWindowSize, "Window Scaling:"    },
   { TYPE_STRING,       &window_size_text,      ""                      },
@@ -6160,16 +7389,17 @@ static struct TokenInfo setup_info_graphics[] =
   { TYPE_ENTER_LIST,   execSetupChooseScrollDelay, "Scroll Delay:"     },
   { TYPE_STRING,       &scroll_delay_text,     ""                      },
 #endif
+#if !defined(PLATFORM_EMSCRIPTEN)
   { TYPE_ENTER_LIST,   execSetupChooseVsyncMode, "Vertical Sync (VSync):" },
   { TYPE_STRING,       &vsync_mode_text,       ""                      },
+#endif
   { TYPE_SWITCH,       &setup.fade_screens,    "Fade Screens:"         },
   { TYPE_SWITCH,       &setup.quick_switch,    "Quick Player Focus Switch:" },
   { TYPE_SWITCH,       &setup.quick_doors,     "Quick Menu Doors:"     },
   { TYPE_SWITCH,       &setup.show_titlescreen,"Show Title Screens:"   },
   { TYPE_SWITCH,       &setup.toons,           "Show Menu Animations:" },
-  { TYPE_ECS_AGA,      &setup.prefer_aga_graphics,"EMC graphics preference:" },
-  { TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" },
   { TYPE_SWITCH,       &setup.small_game_graphics, "Small Game Graphics:" },
+  { TYPE_YES_NO_AUTO,  &setup.debug.xsn_mode,  debug_xsn_mode          },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_LEAVE_MENU,   execSetupMain,          "Back"                  },
 
@@ -6324,6 +7554,10 @@ static struct TokenInfo setup_info_shortcuts_1[] =
   { TYPE_KEY,          &setup.shortcut.save_game, ""                   },
   { TYPE_KEYTEXT,      NULL,           "Quick Load Game from Tape:",   },
   { TYPE_KEY,          &setup.shortcut.load_game, ""                   },
+  { TYPE_KEYTEXT,      NULL,           "Restart Game:",                },
+  { TYPE_KEY,          &setup.shortcut.restart_game, ""                },
+  { TYPE_KEYTEXT,      NULL,           "Replay & Pause Before End:",   },
+  { TYPE_KEY,          &setup.shortcut.pause_before_end, ""            },
   { TYPE_KEYTEXT,      NULL,           "Start Game & Toggle Pause:",   },
   { TYPE_KEY,          &setup.shortcut.toggle_pause, ""                },
   { TYPE_EMPTY,                NULL,                   ""                      },
@@ -6418,11 +7652,11 @@ static Key getSetupKey(void)
       {
         case EVENT_KEYPRESS:
          {
-           key = GetEventKey((KeyEvent *)&event, TRUE);
+           key = GetEventKey((KeyEvent *)&event);
 
-           /* press 'Escape' or 'Enter' to keep the existing key binding */
+           // press 'Escape' or 'Enter' to keep the existing key binding
            if (key == KSYM_Escape || key == KSYM_Return)
-             key = KSYM_UNDEFINED;     /* keep old value */
+             key = KSYM_UNDEFINED;     // keep old value
 
            got_key_event = TRUE;
          }
@@ -6487,10 +7721,12 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
   int ypos = MENU_SCREEN_START_YPOS + screen_pos;
   int startx = mSX + xpos * 32;
   int starty = mSY + ypos * 32;
-  int font_nr, font_nr_default, font_width_default;
   int type = si->type;
   void *value = si->value;
   char *value_string = getSetupValue(type, value);
+  int font_nr_default = getSetupValueFont(type, value);
+  int font_width_default = getFontWidth(font_nr_default);
+  int font_nr = font_nr_default;
   int i;
 
   if (value_string == NULL)
@@ -6505,7 +7741,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
   }
   else if (type & TYPE_STRING)
   {
-    int max_value_len = (SCR_FIELDX - 2) * 2;
+    int max_value_len = (SXSIZE - 2 * TILEX) / font_width_default;
 
     xpos = MENU_SCREEN_START_XPOS;
 
@@ -6525,23 +7761,23 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
 
   startx = mSX + xpos * 32;
   starty = mSY + ypos * 32;
-  font_nr_default = getSetupValueFont(type, value);
-  font_width_default = getFontWidth(font_nr_default);
-
-  font_nr = font_nr_default;
 
   // special check if right-side setup values moved left due to scrollbar
   if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
   {
     int max_menu_text_length = 26;     // maximum text length for classic menu
-    int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+    int font_xoffset = getFontDrawOffsetX(font_nr);
     int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
     int text_font_nr = getMenuTextFont(FONT_MENU_2);
-    int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+    int text_font_xoffset = getFontDrawOffsetX(text_font_nr);
     int text_width = max_menu_text_length * getFontWidth(text_font_nr);
 
     if (startx + font_xoffset < text_startx + text_width + text_font_xoffset)
     {
+      // when using narrow font, left-shifting text "auto" not needed
+      if (type & TYPE_YES_NO_AUTO)
+       xpos += 1;
+
       xpos += 1;
       startx = mSX + xpos * 32;
 
@@ -6549,18 +7785,18 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
     }
   }
 
-  /* downward compatibility correction for Juergen Bonhagen's menu settings */
+  // downward compatibility correction for Juergen Bonhagen's menu settings
   if (setup_mode != SETUP_MODE_INPUT)
   {
     int max_menu_text_length_big = (menu_screen_value_xpos -
                                    MENU_SCREEN_START_XPOS);
     int max_menu_text_length_medium = max_menu_text_length_big * 2;
-    int check_font_nr = FONT_OPTION_ON; /* known font that needs correction */
-    int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
-    int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset;
+    int check_font_nr = FONT_OPTION_ON; // known font that needs correction
+    int font1_xoffset = getFontDrawOffsetX(font_nr);
+    int font2_xoffset = getFontDrawOffsetX(check_font_nr);
     int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
     int text_font_nr = getMenuTextFont(FONT_MENU_2);
-    int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+    int text_font_xoffset = getFontDrawOffsetX(text_font_nr);
     int text_width = max_menu_text_length_medium * getFontWidth(text_font_nr);
     boolean correct_font_draw_xoffset = FALSE;
 
@@ -6572,11 +7808,11 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
        startx + font2_xoffset < text_startx + text_width + text_font_xoffset)
       correct_font_draw_xoffset = TRUE;
 
-    /* check if setup value would overlap with setup text when printed */
-    /* (this can happen for extreme/wrong values for font draw offset) */
+    // check if setup value would overlap with setup text when printed
+    // (this can happen for extreme/wrong values for font draw offset)
     if (correct_font_draw_xoffset)
     {
-      font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset;
+      font_draw_xoffset_old = getFontDrawOffsetX(font_nr);
       font_draw_xoffset_modified = TRUE;
 
       if (type & TYPE_KEY)
@@ -6594,10 +7830,17 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
 
   if (type & TYPE_PLAYER)
   {
+    struct FontBitmapInfo *font = getFontBitmapInfo(font_nr);
     int player_nr = *(int *)value;
-    int xoff = getFontWidth(font_nr);
+    int xoff = font->draw_xoffset + getFontWidth(font_nr);
+    int yoff = font->draw_yoffset + (getFontHeight(font_nr) - TILEY) / 2;
+    int startx2 = startx + xoff;
+    int starty2 = starty + yoff;
 
-    DrawFixedGraphicThruMaskExt(drawto, startx + xoff, starty,
+    if (DrawingOnBackground(startx2, starty2))
+      ClearRectangleOnBackground(drawto, startx2, starty2, TILEX, TILEY);
+
+    DrawFixedGraphicThruMaskExt(drawto, startx2, starty2,
                                PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
   }
 
@@ -6651,11 +7894,19 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
 
   // fullscreen state may have changed at this point
   if (si->value == &setup.fullscreen)
-    ToggleFullscreenOrChangeWindowScalingIfNeeded();
+    ToggleFullscreenIfNeeded();
 
   // network mode may have changed at this point
   if (si->value == &setup.network_mode)
     ToggleNetworkModeIfNeeded();
+
+  // API server mode may have changed at this point
+  if (si->value == &setup.use_api_server)
+    ToggleUseApiServerIfNeeded();
+
+  // game speed list may have changed at this point
+  if (si->value == &setup.game_speed_extended)
+    ToggleGameSpeedsListIfNeeded();
 }
 
 static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig)
@@ -6665,21 +7916,21 @@ static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig)
   int list_pos = 0;
   int i;
 
-  /* determine maximum list size of target list */
+  // determine maximum list size of target list
   while (setup_info_orig[list_size++].type != 0);
 
-  /* free, allocate and clear memory for target list */
+  // 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 */
+  // 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 */
+    // 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 */
+    // skip skippable setup entries if screen is lower than usual
     if (SCR_FIELDY < SCR_FIELDY_DEFAULT &&
        setup_info_orig[i].type == TYPE_SKIPPABLE)
       continue;
@@ -6697,7 +7948,7 @@ static void DrawSetupScreen_Generic(void)
   char *title_string = NULL;
   int i;
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
@@ -6711,7 +7962,7 @@ static void DrawSetupScreen_Generic(void)
 
   FadeOut(fade_mask);
 
-  /* needed if different viewport properties defined for setup screen */
+  // needed if different viewport properties defined for setup screen
   ChangeViewportPropertiesIfNeeded();
 
   SetMainBackgroundImage(IMG_BACKGROUND_SETUP);
@@ -6730,6 +7981,11 @@ static void DrawSetupScreen_Generic(void)
     setup_info = setup_info_game;
     title_string = STR_SETUP_GAME;
   }
+  else if (setup_mode == SETUP_MODE_ENGINES)
+  {
+    setup_info = setup_info_engines;
+    title_string = STR_SETUP_ENGINES;
+  }
   else if (setup_mode == SETUP_MODE_EDITOR)
   {
     setup_info = setup_info_editor;
@@ -6791,7 +8047,7 @@ static void DrawSetupScreen_Generic(void)
     title_string = STR_SETUP_SHORTCUTS;
   }
 
-  /* use modified setup info without setup entries marked as hidden */
+  // use modified setup info without setup entries marked as hidden
   setup_info = getSetupInfoFinal(setup_info);
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string);
@@ -6850,11 +8106,11 @@ static void DrawSetupScreen_Input(void)
     DrawCursorAndText_Setup(i, -1, FALSE);
   }
 
-  /* create gadgets for setup input menu screen */
+  // create gadgets for setup input menu screen
   FreeScreenGadgets();
   CreateScreenGadgets();
 
-  /* map gadgets for setup input menu screen */
+  // map gadgets for setup input menu screen
   MapScreenMenuGadgets(SCREEN_MASK_INPUT);
 
   HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
@@ -7015,7 +8271,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 
     for (i = 0; setup_info_input[i].type != 0; i++)
     {
-      /* adjust menu structure according to skipped setup entries */
+      // adjust menu structure according to skipped setup entries
       if (setup_info_input[i].type == TYPE_SKIPPABLE)
       {
        pos_empty2--;
@@ -7026,7 +8282,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
 
   if (button == MB_MENU_INITIALIZE)
   {
-    /* input setup menu may have changed size due to graphics configuration */
+    // input setup menu may have changed size due to graphics configuration
     if (choice >= pos_empty1)
       choice = pos_end;
 
@@ -7045,12 +8301,12 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
     return;
   }
 
-  if (mx || my)                /* mouse input */
+  if (mx || my)                // mouse input
   {
     x = (mx - mSX) / 32;
     y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
   }
-  else if (dx || dy)   /* keyboard input */
+  else if (dx || dy)   // keyboard input
   {
     if (dx && choice == 0)
       x = (dx < 0 ? 10 : 12);
@@ -7159,7 +8415,7 @@ static boolean CustomizeKeyboardMain(int player_nr)
     font_nr_new = FONT_VALUE_NARROW;
   }
 
-  /* read existing key bindings from player setup */
+  // read existing key bindings from player setup
   custom_key = setup.input[player_nr].key;
 
   FadeSetEnterMenu();
@@ -7182,16 +8438,20 @@ static boolean CustomizeKeyboardMain(int player_nr)
   while (!finished)
   {
     Event event;
+    DelayCounter event_frame_delay = { GAME_FRAME_DELAY };
 
-    if (NextValidEvent(&event))
+    // reset frame delay counter directly after updating screen
+    ResetDelayCounter(&event_frame_delay);
+
+    while (NextValidEvent(&event))
     {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
          {
-           Key key = GetEventKey((KeyEvent *)&event, FALSE);
+           Key key = GetEventKey((KeyEvent *)&event);
 
-           /* press 'Escape' to abort and keep the old key bindings */
+           // press 'Escape' to abort and keep the old key bindings
            if (key == KSYM_Escape)
            {
              FadeSkipNextFadeIn();
@@ -7201,18 +8461,18 @@ static boolean CustomizeKeyboardMain(int player_nr)
              break;
            }
 
-           /* press 'Enter' to keep the existing key binding */
+           // press 'Enter' to keep the existing key binding
            if (key == KSYM_Return)
              key = *customize_step[step_nr].key;
 
-           /* check if key already used */
+           // check if key already used
            for (i = 0; i < step_nr; i++)
              if (*customize_step[i].key == key)
                break;
            if (i < step_nr)
              break;
 
-           /* got new key binding */
+           // got new key binding
            *customize_step[step_nr].key = key;
            DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
                     "             ", font_nr_new);
@@ -7220,13 +8480,13 @@ static boolean CustomizeKeyboardMain(int player_nr)
                     getKeyNameFromKey(key), font_nr_new);
            step_nr++;
 
-           /* un-highlight last query */
+           // un-highlight last query
            DrawText(mSX, mSY + (2 + 2 * (step_nr - 1)) * 32,
                     customize_step[step_nr - 1].text, FONT_MENU_1);
            DrawText(mSX, mSY + (2 + 2 * (step_nr - 1) + 1) * 32,
                     "Key:", FONT_MENU_1);
 
-           /* all keys configured */
+           // all keys configured
            if (step_nr == 6)
            {
              finished = TRUE;
@@ -7235,7 +8495,7 @@ static boolean CustomizeKeyboardMain(int player_nr)
              break;
            }
 
-           /* query next key binding */
+           // query next key binding
            DrawText(mSX, mSY + (2 + 2 * step_nr) * 32,
                     customize_step[step_nr].text, FONT_INPUT_1_ACTIVE);
            DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32,
@@ -7254,12 +8514,16 @@ static boolean CustomizeKeyboardMain(int player_nr)
          HandleOtherEvents(&event);
          break;
       }
+
+      // do not handle events for longer than standard frame delay period
+      if (DelayReached(&event_frame_delay))
+       break;
     }
 
     BackToFront();
   }
 
-  /* write new key bindings back to player setup, if successfully finished */
+  // write new key bindings back to player setup, if successfully finished
   if (success)
     setup.input[player_nr].key = custom_key;
 
@@ -7276,8 +8540,7 @@ void CustomizeKeyboard(int player_nr)
     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;
+    DelayCounter wait_frame_delay = { 2000 };
 
     ResetDelayCounter(&wait_frame_delay);
 
@@ -7286,7 +8549,7 @@ void CustomizeKeyboard(int player_nr)
     DrawTextSCentered(ypos1, font_nr, "Keyboard");
     DrawTextSCentered(ypos2, font_nr, "configured!");
 
-    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+    while (!DelayReached(&wait_frame_delay))
       BackToFront();
 
     ClearEventQueue();
@@ -7295,7 +8558,7 @@ void CustomizeKeyboard(int player_nr)
   DrawSetupScreen_Input();
 }
 
-/* game controller mapping generator by Gabriel Jacobo <gabomdq@gmail.com> */
+// game controller mapping generator by Gabriel Jacobo <gabomdq@gmail.com>
 
 #define MARKER_BUTTON          1
 #define MARKER_AXIS_X          2
@@ -7303,7 +8566,6 @@ void CustomizeKeyboard(int player_nr)
 
 static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 {
-#if defined(TARGET_SDL2)
   static boolean bitmaps_initialized = FALSE;
   boolean screen_initialized = FALSE;
   static Bitmap *controller, *button, *axis_x, *axis_y;
@@ -7313,7 +8575,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   Event event;
   int alpha = 200, alpha_step = -1;
   int alpha_ticks = 0;
-  char mapping[4096], temp[4096];
+  char mapping[4096], temp[256];
   int font_name = MENU_SETUP_FONT_TITLE;
   int font_info = MENU_SETUP_FONT_TEXT;
   int spacing_name = menu.line_spacing_setup[SETUP_MODE_INPUT];
@@ -7357,11 +8619,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
     { 282, 210, MARKER_AXIS_Y, "righty",       },
   };
 
-  unsigned int event_frame_delay = 0;
-  unsigned int event_frame_delay_value = GAME_FRAME_DELAY;
-
-  ResetDelayCounter(&event_frame_delay);
-
   if (!bitmaps_initialized)
   {
     controller = LoadCustomImage("joystick/controller.png");
@@ -7375,24 +8632,24 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   name = getFormattedJoystickName(SDL_JoystickName(joystick));
 
 #if DEBUG_JOYSTICKS
-  /* print info about the joystick we are watching */
-  Error(ERR_DEBUG, "watching joystick %d: (%s)\n",
+  // print info about the joystick we are watching
+  Debug("joystick", "watching joystick %d: (%s)",
        SDL_JoystickInstanceID(joystick), name);
-  Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n",
+  Debug("joystick", "joystick has %d axes, %d hats, %d balls, and %d buttons",
        SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick),
        SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick));
 #endif
 
-  /* initialize mapping with GUID and name */
+  // initialize mapping with GUID and name
   SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp));
 
   snprintf(mapping, sizeof(mapping), "%s,%s,platform:%s,",
           temp, name, SDL_GetPlatform());
 
-  /* loop through all steps (buttons and axes), getting joystick events */
+  // 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 */
+    Bitmap *marker = button;   // initialize with reliable default value
 
     step = &steps[i];
     strcpy(step->mapping, mapping);
@@ -7493,6 +8750,11 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 
       screen_initialized = TRUE;
 
+      DelayCounter event_frame_delay = { GAME_FRAME_DELAY };
+
+      // reset frame delay counter directly after updating screen
+      ResetDelayCounter(&event_frame_delay);
+
       while (NextValidEvent(&event))
       {
        switch (event.type)
@@ -7523,8 +8785,8 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
            break;
 
          case SDL_JOYHATMOTION:
-           /* ignore centering; we're probably just coming back
-              to the center from the previous item we set */
+           // ignore centering; we're probably just coming back
+           // to the center from the previous item we set
            if (event.jhat.value == SDL_HAT_CENTERED)
              break;
 
@@ -7569,7 +8831,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 
          case SDL_FINGERDOWN:
          case SDL_MOUSEBUTTONDOWN:
-           /* skip this step */
+           // skip this step
            i++;
            next = TRUE;
 
@@ -7581,14 +8843,14 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
            {
              if (i == 0)
              {
-               /* leave screen */
+               // leave screen
                success = FALSE;
                done = TRUE;
 
                break;
              }
 
-             /* undo this step */
+             // undo this step
              prev_step = &steps[i - 1];
              strcpy(mapping, prev_step->mapping);
              i--;
@@ -7601,7 +8863,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
                event.key.keysym.sym == KSYM_Return ||
                event.key.keysym.sym == KSYM_Menu)
            {
-             /* skip this step */
+             // skip this step
              i++;
              next = TRUE;
 
@@ -7610,7 +8872,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
 
            if (event.key.keysym.sym == KSYM_Escape)
            {
-             /* leave screen */
+             // leave screen
              success = FALSE;
              done = TRUE;
            }
@@ -7626,7 +8888,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
        }
 
        // do not handle events for longer than standard frame delay period
-       if (DelayReached(&event_frame_delay, event_frame_delay_value))
+       if (DelayReached(&event_frame_delay))
          break;
       }
     }
@@ -7635,7 +8897,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
   if (success)
   {
 #if DEBUG_JOYSTICKS
-    Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping);
+    Debug("joystick", "New game controller mapping:\n\n%s\n\n", mapping);
 #endif
 
     // activate mapping for this game
@@ -7645,13 +8907,10 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
     SaveSetup_AddGameControllerMapping(mapping);
   }
 
-  /* wait until the last pending event was removed from event queue */
+  // wait until the last pending event was removed from event queue
   while (NextValidEvent(&event));
 
   return success;
-#else
-  return TRUE;
-#endif
 }
 
 static int ConfigureJoystickMain(int player_nr)
@@ -7713,8 +8972,7 @@ void ConfigureJoystick(int player_nr)
     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;
+    DelayCounter wait_frame_delay = { 2000 };
 
     ResetDelayCounter(&wait_frame_delay);
 
@@ -7725,7 +8983,7 @@ void ConfigureJoystick(int player_nr)
     DrawTextSCentered(ypos1, font_nr, message1);
     DrawTextSCentered(ypos2, font_nr, message2);
 
-    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+    while (!DelayReached(&wait_frame_delay))
       BackToFront();
 
     ClearEventQueue();
@@ -7734,6 +8992,22 @@ void ConfigureJoystick(int player_nr)
   DrawSetupScreen_Input();
 }
 
+static void MapScreenMenuGadgets_OverlayTouchButtons(int y)
+{
+  if (y < video.screen_height / 3)
+  {
+    // remap touch gadgets to access upper part of the screen
+    UnmapScreenMenuGadgets(SCREEN_MASK_TOUCH);
+    MapScreenMenuGadgets(SCREEN_MASK_TOUCH2);
+  }
+  else if (y > 2 * video.screen_height / 3)
+  {
+    // remap touch gadgets to access lower part of the screen
+    MapScreenMenuGadgets(SCREEN_MASK_TOUCH);
+    UnmapScreenMenuGadgets(SCREEN_MASK_TOUCH2);
+  }
+}
+
 static boolean ConfigureVirtualButtonsMain(void)
 {
   static char *customize_step_text[] =
@@ -7754,6 +9028,13 @@ static boolean ConfigureVirtualButtonsMain(void)
     CHAR_GRID_BUTTON_SNAP,
     CHAR_GRID_BUTTON_DROP
   };
+  enum
+  {
+    ACTION_NONE,
+    ACTION_ESCAPE,
+    ACTION_BACK,
+    ACTION_NEXT
+  };
   int font_nr = FONT_INPUT_1_ACTIVE;
   int font_height = getFontHeight(font_nr);
   int ypos1 = SYSIZE / 2 - font_height * 2;
@@ -7774,6 +9055,8 @@ static boolean ConfigureVirtualButtonsMain(void)
 
   overlay.grid_button_highlight = grid_button[step_nr];
 
+  UnmapAllGadgets();
+
   FadeSetEnterMenu();
   FadeOut(REDRAW_FIELD);
 
@@ -7787,86 +9070,45 @@ static boolean ConfigureVirtualButtonsMain(void)
 
   SetOverlayShowGrid(TRUE);
 
+  // map gadgets for setup touch buttons menu screen
+  MapScreenMenuGadgets(SCREEN_MASK_TOUCH);
+
   while (!finished)
   {
     Event event;
 
     while (NextValidEvent(&event))
     {
+      int action = ACTION_NONE;
+
+      // ---------- handle events and set the resulting action ----------
+
       switch (event.type)
       {
-        case EVENT_KEYPRESS:
+       case EVENT_USER:
          {
-           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();
+           UserEvent *user = (UserEvent *)&event;
+           int id = user->value1;
+
+           action = (id == SCREEN_CTRL_ID_TOUCH_PREV_PAGE ||
+                     id == SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 ? ACTION_BACK :
+                     id == SCREEN_CTRL_ID_TOUCH_NEXT_PAGE ||
+                     id == SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 ? ACTION_NEXT :
+                     ACTION_NONE);
+         }
+         break;
 
-           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]);
+        case EVENT_KEYPRESS:
+         {
+           Key key = GetEventKey((KeyEvent *)&event);
+
+           action = (key == KSYM_Escape ?      ACTION_ESCAPE :
+                     key == KSYM_BackSpace ||
+                     key == KSYM_Back ?        ACTION_BACK :
+                     key == KSYM_Return ||
+                     key == KSYM_Menu ||
+                     key == KSYM_space ?       ACTION_NEXT :
+                     ACTION_NONE);
          }
          break;
 
@@ -7879,6 +9121,19 @@ static boolean ConfigureVirtualButtonsMain(void)
          {
            ButtonEvent *button = (ButtonEvent *)&event;
 
+           motion_status = FALSE;
+
+           if (button->type == EVENT_BUTTONPRESS)
+             button_status = button->button;
+           else
+             button_status = MB_RELEASED;
+
+           if (HandleGadgets(button->x, button->y, button_status))
+           {
+             // do not handle this button event anymore
+             break;
+           }
+
            button->x += video.screen_xoffset;
            button->y += video.screen_yoffset;
 
@@ -7887,18 +9142,14 @@ static boolean ConfigureVirtualButtonsMain(void)
 
            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;
-           }
+
+           MapScreenMenuGadgets_OverlayTouchButtons(button->y);
          }
          break;
 
@@ -7906,6 +9157,14 @@ static boolean ConfigureVirtualButtonsMain(void)
          {
            MotionEvent *motion = (MotionEvent *)&event;
 
+           motion_status = TRUE;
+
+           if (HandleGadgets(motion->x, motion->y, button_status))
+           {
+             // do not handle this button event anymore
+             break;
+           }
+
            motion->x += video.screen_xoffset;
            motion->y += video.screen_yoffset;
 
@@ -7913,10 +9172,11 @@ static boolean ConfigureVirtualButtonsMain(void)
            y = motion->y * overlay.grid_ysize / video.screen_height;
 
            set_grid_button = TRUE;
+
+           MapScreenMenuGadgets_OverlayTouchButtons(motion->y);
          }
          break;
 
-#if defined(TARGET_SDL2)
        case SDL_WINDOWEVENT:
          HandleWindowEvent((WindowEvent *) &event);
 
@@ -7933,17 +9193,74 @@ static boolean ConfigureVirtualButtonsMain(void)
 
          break;
 
-       case SDL_APP_WILLENTERBACKGROUND:
-       case SDL_APP_DIDENTERBACKGROUND:
-       case SDL_APP_WILLENTERFOREGROUND:
-       case SDL_APP_DIDENTERFOREGROUND:
-         HandlePauseResumeEvent((PauseResumeEvent *) &event);
-         break;
-#endif
+       case SDL_APP_WILLENTERBACKGROUND:
+       case SDL_APP_DIDENTERBACKGROUND:
+       case SDL_APP_WILLENTERFOREGROUND:
+       case SDL_APP_DIDENTERFOREGROUND:
+         HandlePauseResumeEvent((PauseResumeEvent *) &event);
+         break;
+
+        default:
+         HandleOtherEvents(&event);
+         break;
+      }
+
+      // ---------- perform action set by handling events ----------
+
+      if (action == ACTION_ESCAPE)
+      {
+       // abort and restore the old key bindings
+
+       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;
+      }
+      else if (action == ACTION_BACK)
+      {
+       // keep the configured key bindings and go to previous page
+
+       step_nr--;
+
+       if (step_nr < 0)
+       {
+         FadeSkipNextFadeIn();
+
+         finished = TRUE;
+       }
+      }
+      else if (action == ACTION_NEXT)
+      {
+       // keep the configured key bindings and go to next page
+
+       step_nr++;
+
+       // all virtual buttons configured
+       if (step_nr == 6)
+       {
+         finished = TRUE;
+         success = TRUE;
+       }
+      }
+
+      if (action != ACTION_NONE && !finished)
+      {
+       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];
+
+       // configure next virtual button
+
+       ClearField();
 
-        default:
-         HandleOtherEvents(&event);
-         break;
+       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]);
       }
 
       if (set_grid_button)
@@ -7975,14 +9292,16 @@ void ConfigureVirtualButtons(void)
 {
   boolean success = ConfigureVirtualButtonsMain();
 
+  UnmapScreenMenuGadgets(SCREEN_MASK_TOUCH |
+                        SCREEN_MASK_TOUCH2);
+
   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;
+    DelayCounter wait_frame_delay = { 2000 };
 
     ResetDelayCounter(&wait_frame_delay);
 
@@ -7991,7 +9310,7 @@ void ConfigureVirtualButtons(void)
     DrawTextSCentered(ypos1, font_nr, "Virtual buttons");
     DrawTextSCentered(ypos2, font_nr, "configured!");
 
-    while (!DelayReached(&wait_frame_delay, wait_frame_delay_value))
+    while (!DelayReached(&wait_frame_delay))
       BackToFront();
 
     ClearEventQueue();
@@ -8000,8 +9319,13 @@ void ConfigureVirtualButtons(void)
 
 void DrawSetupScreen(void)
 {
+  align_xoffset = 0;
+  align_yoffset = 0;
+
   if (setup_mode == SETUP_MODE_INPUT)
     DrawSetupScreen_Input();
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE)
+    DrawChooseTree(&scores_type_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
     DrawChooseTree(&game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
@@ -8084,6 +9408,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 {
   if (setup_mode == SETUP_MODE_INPUT)
     HandleSetupScreen_Input(mx, my, dx, dy, button);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE)
+    HandleChooseTree(mx, my, dx, dy, button, &scores_type_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
     HandleChooseTree(mx, my, dx, dy, button, &game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
@@ -8132,110 +9458,199 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
 void HandleGameActions(void)
 {
+  if (setup.ask_on_game_over)
+    CheckGameOver();
+
   if (game.restart_game_message != NULL)
+  {
     RequestRestartGame(game.restart_game_message);
 
+    return;
+  }
+
   if (game_status != GAME_MODE_PLAYING)
     return;
 
-  GameActions();       /* main game loop */
+  GameActions();               // main game loop
 
   if (tape.auto_play && !tape.playing)
-    AutoPlayTape();    /* continue automatically playing next tape */
+    AutoPlayTapesContinue();   // continue automatically playing next tape
 }
 
 
-/* ---------- new screen button stuff -------------------------------------- */
-
-static void getScreenMenuButtonPos(int *x, int *y, int gadget_id)
-{
-  switch (gadget_id)
-  {
-    case SCREEN_CTRL_ID_PREV_LEVEL:
-      *x = mSX + GDI_ACTIVE_POS(menu.main.button.prev_level.x);
-      *y = mSY + GDI_ACTIVE_POS(menu.main.button.prev_level.y);
-      break;
-
-    case SCREEN_CTRL_ID_NEXT_LEVEL:
-      *x = mSX + GDI_ACTIVE_POS(menu.main.button.next_level.x);
-      *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y);
-      break;
-
-    case SCREEN_CTRL_ID_PREV_PLAYER:
-      *x = mSX + TILEX * 10;
-      *y = mSY + TILEY * MENU_SCREEN_START_YPOS;
-      break;
-
-    case SCREEN_CTRL_ID_NEXT_PLAYER:
-      *x = mSX + TILEX * 12;
-      *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);
-  }
-}
+// ---------- new screen button stuff --------------------------------------
 
 static struct
 {
   int gfx_unpressed, gfx_pressed;
-  void (*get_gadget_position)(int *, int *, int);
+  struct MenuPosInfo *pos;
+  boolean *check_value;
   int gadget_id;
   int screen_mask;
+  unsigned int event_mask;
+  boolean is_touch_button;
   char *infotext;
 } menubutton_info[NUM_SCREEN_MENUBUTTONS] =
 {
   {
     IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE,
-    getScreenMenuButtonPos,
+    &menu.main.button.prev_level, NULL,
     SCREEN_CTRL_ID_PREV_LEVEL,
     SCREEN_MASK_MAIN,
-    "last level"
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous level"
   },
   {
     IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE,
-    getScreenMenuButtonPos,
+    &menu.main.button.next_level, NULL,
     SCREEN_CTRL_ID_NEXT_LEVEL,
     SCREEN_MASK_MAIN,
-    "next level"
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next level"
+  },
+  {
+    IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE,
+    &menu.scores.button.prev_level, NULL,
+    SCREEN_CTRL_ID_PREV_LEVEL2,
+    SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous level"
+  },
+  {
+    IMG_MENU_BUTTON_NEXT_LEVEL2, IMG_MENU_BUTTON_NEXT_LEVEL2_ACTIVE,
+    &menu.scores.button.next_level, NULL,
+    SCREEN_CTRL_ID_NEXT_LEVEL2,
+    SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next level"
+  },
+  {
+    IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_ACTIVE,
+    &menu.scores.button.prev_score, NULL,
+    SCREEN_CTRL_ID_PREV_SCORE,
+    SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous score"
+  },
+  {
+    IMG_MENU_BUTTON_NEXT_SCORE, IMG_MENU_BUTTON_NEXT_SCORE_ACTIVE,
+    &menu.scores.button.next_score, NULL,
+    SCREEN_CTRL_ID_NEXT_SCORE,
+    SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next score"
+  },
+  {
+    IMG_MENU_BUTTON_PLAY_TAPE, IMG_MENU_BUTTON_PLAY_TAPE,
+    &menu.scores.button.play_tape, NULL,
+    SCREEN_CTRL_ID_PLAY_TAPE,
+    SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_RELEASED,
+    FALSE, "play tape"
+  },
+  {
+    IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE,
+    &menu.main.button.first_level, NULL,
+    SCREEN_CTRL_ID_FIRST_LEVEL,
+    SCREEN_MASK_MAIN,
+    GD_EVENT_RELEASED,
+    FALSE, "first level"
+  },
+  {
+    IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE,
+    &menu.main.button.last_level, NULL,
+    SCREEN_CTRL_ID_LAST_LEVEL,
+    SCREEN_MASK_MAIN,
+    GD_EVENT_RELEASED,
+    FALSE, "last level"
+  },
+  {
+    IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE,
+    &menu.main.button.level_number, NULL,
+    SCREEN_CTRL_ID_LEVEL_NUMBER,
+    SCREEN_MASK_MAIN,
+    GD_EVENT_RELEASED,
+    FALSE, "level number"
   },
   {
     IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE,
-    getScreenMenuButtonPos,
+    &menu.setup.button.prev_player, NULL,
     SCREEN_CTRL_ID_PREV_PLAYER,
     SCREEN_MASK_INPUT,
-    "last player"
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous player"
   },
   {
     IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE,
-    getScreenMenuButtonPos,
+    &menu.setup.button.next_player, NULL,
     SCREEN_CTRL_ID_NEXT_PLAYER,
     SCREEN_MASK_INPUT,
-    "next player"
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next player"
   },
   {
     IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE,
-    getScreenMenuButtonPos,
+    &menu.main.button.insert_solution, NULL,
     SCREEN_CTRL_ID_INSERT_SOLUTION,
     SCREEN_MASK_MAIN_HAS_SOLUTION,
-    "insert solution tape"
+    GD_EVENT_RELEASED,
+    FALSE, "insert solution tape"
   },
   {
     IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE,
-    getScreenMenuButtonPos,
+    &menu.main.button.play_solution, NULL,
     SCREEN_CTRL_ID_PLAY_SOLUTION,
     SCREEN_MASK_MAIN_HAS_SOLUTION,
-    "play solution tape"
+    GD_EVENT_RELEASED,
+    FALSE, "play solution tape"
+  },
+  {
+    IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_ACTIVE,
+    &menu.main.button.levelset_info, NULL,
+    SCREEN_CTRL_ID_LEVELSET_INFO,
+    SCREEN_MASK_MAIN_HAS_SET_INFO,
+    GD_EVENT_RELEASED,
+    FALSE, "show level set info"
+  },
+  {
+    IMG_MENU_BUTTON_SWITCH_ECS_AGA, IMG_MENU_BUTTON_SWITCH_ECS_AGA_ACTIVE,
+    &menu.main.button.switch_ecs_aga, &setup.prefer_aga_graphics,
+    SCREEN_CTRL_ID_SWITCH_ECS_AGA,
+    SCREEN_MASK_MAIN,
+    GD_EVENT_RELEASED | GD_EVENT_OFF_BORDERS,
+    FALSE, "switch ECS/AGA chipset"
+  },
+  {
+    IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK,
+    &menu.setup.button.touch_back, NULL,
+    SCREEN_CTRL_ID_TOUCH_PREV_PAGE,
+    SCREEN_MASK_TOUCH,
+    GD_EVENT_RELEASED,
+    TRUE, "previous page"
+  },
+  {
+    IMG_MENU_BUTTON_TOUCH_NEXT, IMG_MENU_BUTTON_TOUCH_NEXT,
+    &menu.setup.button.touch_next, NULL,
+    SCREEN_CTRL_ID_TOUCH_NEXT_PAGE,
+    SCREEN_MASK_TOUCH,
+    GD_EVENT_RELEASED,
+    TRUE, "next page"
+  },
+  {
+    IMG_MENU_BUTTON_TOUCH_BACK2, IMG_MENU_BUTTON_TOUCH_BACK2,
+    &menu.setup.button.touch_back2, NULL,
+    SCREEN_CTRL_ID_TOUCH_PREV_PAGE2,
+    SCREEN_MASK_TOUCH2,
+    GD_EVENT_RELEASED,
+    TRUE, "previous page"
+  },
+  {
+    IMG_MENU_BUTTON_TOUCH_NEXT2, IMG_MENU_BUTTON_TOUCH_NEXT2,
+    &menu.setup.button.touch_next2, NULL,
+    SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2,
+    SCREEN_MASK_TOUCH2,
+    GD_EVENT_RELEASED,
+    TRUE, "next page"
   },
 };
 
@@ -8249,13 +9664,13 @@ static struct
 {
   {
     IMG_MENU_BUTTON_UP, IMG_MENU_BUTTON_UP_ACTIVE,
-    -1, -1,    /* these values are not constant, but can change at runtime */
+    -1, -1,    // these values are not constant, but can change at runtime
     SCREEN_CTRL_ID_SCROLL_UP,
     "scroll up"
   },
   {
     IMG_MENU_BUTTON_DOWN, IMG_MENU_BUTTON_DOWN_ACTIVE,
-    -1, -1,    /* these values are not constant, but can change at runtime */
+    -1, -1,    // these values are not constant, but can change at runtime
     SCREEN_CTRL_ID_SCROLL_DOWN,
     "scroll down"
   }
@@ -8273,8 +9688,8 @@ static struct
 {
   {
     IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE,
-    -1, -1,    /* these values are not constant, but can change at runtime */
-    -1, -1,    /* these values are not constant, but can change at runtime */
+    -1, -1,    // these values are not constant, but can change at runtime
+    -1, -1,    // these values are not constant, but can change at runtime
     GD_TYPE_SCROLLBAR_VERTICAL,
     SCREEN_CTRL_ID_SCROLL_VERTICAL,
     "scroll level series vertically"
@@ -8294,7 +9709,7 @@ static struct
   {
     IMG_SETUP_INPUT_TEXT,
     SCREEN_CTRL_ID_NETWORK_SERVER,
-    -1, -1,    /* these values are not constant, but can change at runtime */
+    -1, -1,    // these values are not constant, but can change at runtime
     MAX_SETUP_TEXT_INPUT_LEN,
     network_server_hostname,
     "Network Server Hostname / IP"
@@ -8309,29 +9724,33 @@ static void CreateScreenMenubuttons(void)
 
   for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
   {
+    struct MenuPosInfo *pos = menubutton_info[i].pos;
+    int screen_mask = menubutton_info[i].screen_mask;
+    boolean is_touch_button = menubutton_info[i].is_touch_button;
+    boolean is_check_button = menubutton_info[i].check_value != NULL;
+    boolean is_score_button = (screen_mask & SCREEN_MASK_SCORES_INFO);
+    boolean has_gfx_pressed = (menubutton_info[i].gfx_pressed ==
+                               menubutton_info[i].gfx_unpressed);
     Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
     int gfx_unpressed, gfx_pressed;
     int x, y, width, height;
     int gd_x1, gd_x2, gd_y1, gd_y2;
+    int gd_x1a, gd_x2a, gd_y1a, gd_y2a;
     int id = menubutton_info[i].gadget_id;
+    int type = GD_TYPE_NORMAL_BUTTON;
+    boolean checked = FALSE;
 
-    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;
+    // do not use touch buttons if overlay touch buttons are disabled
+    if (is_touch_button && !setup.touch.overlay_buttons)
+      continue;
 
-    menubutton_info[i].get_gadget_position(&x, &y, id);
+    event_mask = menubutton_info[i].event_mask;
 
-    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;
-    }
+    x = (is_touch_button ? pos->x : mSX + GDI_ACTIVE_POS(pos->x));
+    y = (is_touch_button ? pos->y : mSY + GDI_ACTIVE_POS(pos->y));
+
+    width  = graphic_info[menubutton_info[i].gfx_pressed].width;
+    height = graphic_info[menubutton_info[i].gfx_pressed].height;
 
     gfx_unpressed = menubutton_info[i].gfx_unpressed;
     gfx_pressed   = menubutton_info[i].gfx_pressed;
@@ -8341,6 +9760,70 @@ static void CreateScreenMenubuttons(void)
     gd_y1 = graphic_info[gfx_unpressed].src_y;
     gd_x2 = graphic_info[gfx_pressed].src_x;
     gd_y2 = graphic_info[gfx_pressed].src_y;
+    gd_x1a = gd_x1;
+    gd_y1a = gd_y1;
+    gd_x2a = gd_x2;
+    gd_y2a = gd_y2;
+
+    if (has_gfx_pressed)
+    {
+      gd_x2 += graphic_info[gfx_pressed].pressed_xoffset;
+      gd_y2 += graphic_info[gfx_pressed].pressed_yoffset;
+    }
+
+    if (is_check_button)
+    {
+      gd_x1a += graphic_info[gfx_unpressed].active_xoffset;
+      gd_y1a += graphic_info[gfx_unpressed].active_yoffset;
+      gd_x2a += graphic_info[gfx_pressed].active_xoffset;
+      gd_y2a += graphic_info[gfx_pressed].active_yoffset;
+
+      type = GD_TYPE_CHECK_BUTTON;
+      checked = *menubutton_info[i].check_value;
+    }
+
+    if (is_score_button)
+    {
+      // if x/y set to -1, dynamically place buttons next to title text
+      int title_width = getTextWidth(INFOTEXT_SCORE_ENTRY, FONT_TITLE_1);
+
+      // special compatibility handling for "Snake Bite" graphics set
+      if (strPrefix(leveldir_current->identifier, "snake_bite"))
+       title_width = strlen(INFOTEXT_SCORE_ENTRY) * 32;
+
+      // use "SX" here to center buttons (ignore horizontal draw offset)
+      if (pos->x == -1)
+       x = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ?
+            SX + (SXSIZE - title_width) / 2 - width * 3 / 2 :
+            id == SCREEN_CTRL_ID_NEXT_LEVEL2 ?
+            SX + (SXSIZE + title_width) / 2 + width / 2 : 0);
+
+      // use "mSY" here to place buttons (respect vertical draw offset)
+      if (pos->y == -1)
+       y = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ||
+            id == SCREEN_CTRL_ID_NEXT_LEVEL2 ? mSY + MENU_TITLE1_YPOS : 0);
+    }
+
+    if (id == SCREEN_CTRL_ID_LEVELSET_INFO)
+    {
+      if (pos->x == -1 && pos->y == -1)
+      {
+       // use "SX" here to place button (ignore draw offsets)
+       x = SX + SXSIZE - 2 * TILESIZE;
+       y = SY + SYSIZE - 2 * TILESIZE;
+
+       // special compatibility handling for "BD2K3" graphics set
+       if (strPrefix(leveldir_current->identifier, "BD2K3"))
+         x = SX + TILESIZE + MINI_TILESIZE;
+
+       // special compatibility handling for "jue0" graphics set
+       if (strPrefix(artwork.gfx_current_identifier, "jue0"))
+       {
+         x = SX + SXSIZE - 4 * TILESIZE;
+         y = SY + SYSIZE - 3 * TILESIZE;
+       }
+      }
+    }
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
@@ -8350,17 +9833,21 @@ static void CreateScreenMenubuttons(void)
                      GDI_Y, y,
                      GDI_WIDTH, width,
                      GDI_HEIGHT, height,
-                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+                     GDI_TYPE, type,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
+                     GDI_CHECKED, checked,
                      GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
                      GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
+                      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1a, gd_y1a,
+                      GDI_ALT_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2a, gd_y2a,
                      GDI_DIRECT_DRAW, FALSE,
+                     GDI_OVERLAY_TOUCH_BUTTON, is_touch_button,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_ACTION, HandleScreenGadgets,
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     screen_gadget[id] = gi;
   }
@@ -8372,7 +9859,7 @@ static void CreateScreenScrollbuttons(void)
   unsigned int event_mask;
   int i;
 
-  /* these values are not constant, but can change at runtime */
+  // these values are not constant, but can change at runtime
   scrollbutton_info[0].x = SC_SCROLL_UP_XPOS;
   scrollbutton_info[0].y = SC_SCROLL_UP_YPOS;
   scrollbutton_info[1].x = SC_SCROLL_DOWN_XPOS;
@@ -8393,7 +9880,7 @@ static void CreateScreenScrollbuttons(void)
     width = SC_SCROLLBUTTON_XSIZE;
     height = SC_SCROLLBUTTON_YSIZE;
 
-    /* correct scrollbar position if placed outside menu (playfield) area */
+    // correct scrollbar position if placed outside menu (playfield) area
     if (x > SX + SC_SCROLL_UP_XPOS)
       x = SX + SC_SCROLL_UP_XPOS;
 
@@ -8428,7 +9915,7 @@ static void CreateScreenScrollbuttons(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     screen_gadget[id] = gi;
   }
@@ -8438,7 +9925,7 @@ static void CreateScreenScrollbars(void)
 {
   int i;
 
-  /* these values are not constant, but can change at runtime */
+  // these values are not constant, but can change at runtime
   scrollbar_info[0].x = SC_SCROLL_VERTICAL_XPOS;
   scrollbar_info[0].y = SC_SCROLL_VERTICAL_YPOS;
   scrollbar_info[0].width  = SC_SCROLL_VERTICAL_XSIZE;
@@ -8463,7 +9950,7 @@ static void CreateScreenScrollbars(void)
     width  = scrollbar_info[i].width;
     height = scrollbar_info[i].height;
 
-    /* correct scrollbar position if placed outside menu (playfield) area */
+    // correct scrollbar position if placed outside menu (playfield) area
     if (x > SX + SC_SCROLL_VERTICAL_XPOS)
       x = SX + SC_SCROLL_VERTICAL_XPOS;
 
@@ -8509,7 +9996,7 @@ static void CreateScreenScrollbars(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     screen_gadget[id] = gi;
   }
@@ -8555,7 +10042,7 @@ static void CreateScreenTextInputGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     screen_gadget[id] = gi;
   }
@@ -8579,7 +10066,16 @@ void FreeScreenGadgets(void)
     FreeGadget(screen_gadget[i]);
 }
 
-void MapScreenMenuGadgets(int screen_mask)
+static void RedrawScreenMenuGadgets(int screen_mask)
+{
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
+    if (screen_mask & menubutton_info[i].screen_mask)
+      RedrawGadget(screen_gadget[menubutton_info[i].gadget_id]);
+}
+
+static void MapScreenMenuGadgets(int screen_mask)
 {
   int i;
 
@@ -8607,7 +10103,7 @@ static void UnmapScreenMenuGadgets(int screen_mask)
   }
 }
 
-void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets)
+static void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets)
 {
   if (map_gadgets)
     MapScreenMenuGadgets(screen_mask);
@@ -8615,7 +10111,7 @@ void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets)
     UnmapScreenMenuGadgets(screen_mask);
 }
 
-void MapScreenGadgets(int num_entries)
+static void MapScreenGadgets(int num_entries)
 {
   int i;
 
@@ -8629,11 +10125,54 @@ void MapScreenGadgets(int num_entries)
     MapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
 }
 
-void MapScreenTreeGadgets(TreeInfo *ti)
+static void UnmapScreenGadgets()
+{
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBUTTONS; i++)
+    UnmapGadget(screen_gadget[scrollbutton_info[i].gadget_id]);
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++)
+    UnmapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
+}
+
+static void MapScreenTreeGadgets(TreeInfo *ti)
 {
   MapScreenGadgets(numTreeInfoInGroup(ti));
 }
 
+static void UnmapScreenTreeGadgets(void)
+{
+  UnmapScreenGadgets();
+}
+
+static void AdjustScoreInfoButtons_SelectScore(int x, int y1, int y2)
+{
+  struct GadgetInfo *gi_1 = screen_gadget[SCREEN_CTRL_ID_PREV_SCORE];
+  struct GadgetInfo *gi_2 = screen_gadget[SCREEN_CTRL_ID_NEXT_SCORE];
+  struct MenuPosInfo *pos_1 = menubutton_info[SCREEN_CTRL_ID_PREV_SCORE].pos;
+  struct MenuPosInfo *pos_2 = menubutton_info[SCREEN_CTRL_ID_NEXT_SCORE].pos;
+
+  if (pos_1->x == -1 && pos_1->y == -1)
+    ModifyGadget(gi_1, GDI_X, x, GDI_Y, y1, GDI_END);
+
+  if (pos_2->x == -1 && pos_2->y == -1)
+    ModifyGadget(gi_2, GDI_X, x, GDI_Y, y2, GDI_END);
+}
+
+static void AdjustScoreInfoButtons_PlayTape(int x, int y, boolean visible)
+{
+  struct GadgetInfo *gi = screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE];
+  struct MenuPosInfo *pos = menubutton_info[SCREEN_CTRL_ID_PLAY_TAPE].pos;
+
+  // set gadget position dynamically, pre-defined or off-screen
+  int xx = (visible ? (pos->x == -1 ? x : pos->x) : POS_OFFSCREEN);
+  int yy = (visible ? (pos->y == -1 ? y : pos->y) : POS_OFFSCREEN);
+
+  ModifyGadget(gi, GDI_X, xx, GDI_Y, yy, GDI_END);
+  MapGadget(gi);       // (needed if deactivated on last score page)
+}
+
 static void HandleScreenGadgets(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
@@ -8652,6 +10191,40 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       HandleMainMenu_SelectLevel(step, +1, NO_DIRECT_LEVEL_SELECT);
       break;
 
+    case SCREEN_CTRL_ID_PREV_LEVEL2:
+      HandleHallOfFame_SelectLevel(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_LEVEL2:
+      HandleHallOfFame_SelectLevel(step, +1);
+      break;
+
+    case SCREEN_CTRL_ID_PREV_SCORE:
+      HandleScoreInfo_SelectScore(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_SCORE:
+      HandleScoreInfo_SelectScore(step, +1);
+      break;
+
+    case SCREEN_CTRL_ID_PLAY_TAPE:
+      HandleScoreInfo_PlayTape();
+      break;
+
+    case SCREEN_CTRL_ID_FIRST_LEVEL:
+      HandleMainMenu_SelectLevel(MAX_LEVELS, -1, NO_DIRECT_LEVEL_SELECT);
+      break;
+
+    case SCREEN_CTRL_ID_LAST_LEVEL:
+      HandleMainMenu_SelectLevel(MAX_LEVELS, +1, NO_DIRECT_LEVEL_SELECT);
+      break;
+
+    case SCREEN_CTRL_ID_LEVEL_NUMBER:
+      CloseDoor(DOOR_CLOSE_2);
+      SetGameStatus(GAME_MODE_LEVELNR);
+      DrawChooseLevelNr();
+      break;
+
     case SCREEN_CTRL_ID_PREV_PLAYER:
       HandleSetupScreen_Input_Player(step, -1);
       break;
@@ -8668,8 +10241,26 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       PlaySolutionTape();
       break;
 
+    case SCREEN_CTRL_ID_LEVELSET_INFO:
+      DrawInfoScreen_FromMainMenu(INFO_MODE_LEVELSET);
+      break;
+
+    case SCREEN_CTRL_ID_SWITCH_ECS_AGA:
+      setup.prefer_aga_graphics = !setup.prefer_aga_graphics;
+      DrawMainMenu();
+      break;
+
+    case SCREEN_CTRL_ID_TOUCH_PREV_PAGE:
+    case SCREEN_CTRL_ID_TOUCH_NEXT_PAGE:
+    case SCREEN_CTRL_ID_TOUCH_PREV_PAGE2:
+    case SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2:
+      PushUserEvent(USEREVENT_GADGET_PRESSED, id, 0);
+      break;
+
     case SCREEN_CTRL_ID_SCROLL_UP:
-      if (game_status == GAME_MODE_LEVELS)
+      if (game_status == GAME_MODE_NAMES)
+       HandleChoosePlayerName(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_LEVELS)
        HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
       else if (game_status == GAME_MODE_LEVELNR)
        HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
@@ -8677,10 +10268,14 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
        HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
       else if (game_status == GAME_MODE_INFO)
        HandleInfoScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SCORES)
+       HandleHallOfFame(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_DOWN:
-      if (game_status == GAME_MODE_LEVELS)
+      if (game_status == GAME_MODE_NAMES)
+       HandleChoosePlayerName(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_LEVELS)
        HandleChooseLevelSet(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
       else if (game_status == GAME_MODE_LEVELNR)
        HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
@@ -8688,10 +10283,14 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
        HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
       else if (game_status == GAME_MODE_INFO)
        HandleInfoScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SCORES)
+       HandleHallOfFame(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_VERTICAL:
-      if (game_status == GAME_MODE_LEVELS)
+      if (game_status == GAME_MODE_NAMES)
+       HandleChoosePlayerName(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);
+      else if (game_status == GAME_MODE_LEVELS)
        HandleChooseLevelSet(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);
       else if (game_status == GAME_MODE_LEVELNR)
        HandleChooseLevelNr(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);
@@ -8699,6 +10298,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
        HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       else if (game_status == GAME_MODE_INFO)
        HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+      else if (game_status == GAME_MODE_SCORES)
+       HandleHallOfFame(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       break;
 
     case SCREEN_CTRL_ID_NETWORK_SERVER:
@@ -8731,6 +10332,12 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
   }
 }
 
+void HandleScreenGadgetKeys(Key key)
+{
+  if (key == setup.shortcut.tape_play)
+    HandleScreenGadgets(screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]);
+}
+
 void DumpScreenIdentifiers(void)
 {
   int i;
@@ -8777,3 +10384,210 @@ boolean DoScreenAction(int image_id)
 
   return FALSE;
 }
+
+void DrawScreenAfterAddingSet(char *tree_subdir_new, int tree_type)
+{
+  // get tree info node of newly added level or artwork set
+  TreeInfo *tree_node_first = TREE_FIRST_NODE(tree_type);
+  TreeInfo *tree_node_new = getTreeInfoFromIdentifier(tree_node_first,
+                                                     tree_subdir_new);
+  if (tree_node_new == NULL)   // should not happen
+    return;
+
+  // if request dialog is active, do nothing
+  if (game.request_active)
+    return;
+
+  if (game_status == GAME_MODE_MAIN &&
+      tree_type == TREE_TYPE_LEVEL_DIR)
+  {
+    // when adding new level set in main menu, select it as current level set
+
+    // change current level set to newly added level set from zip file
+    leveldir_current = tree_node_new;
+
+    // change current level number to first level of newly added level set
+    level_nr = leveldir_current->first_level;
+
+    // redraw screen to reflect changed level set
+    DrawMainMenu();
+
+    // save this level set and level number as last selected level set
+    SaveLevelSetup_LastSeries();
+    SaveLevelSetup_SeriesInfo();
+  }
+  else if (game_status == GAME_MODE_LEVELS &&
+          tree_type == TREE_TYPE_LEVEL_DIR)
+  {
+    // when adding new level set in level set menu, set cursor and update screen
+
+    leveldir_current = tree_node_new;
+
+    DrawChooseTree(&leveldir_current);
+  }
+  else if (game_status == GAME_MODE_SETUP)
+  {
+    // when adding new artwork set in setup menu, set cursor and update screen
+
+    if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS &&
+       tree_type == TREE_TYPE_GRAPHICS_DIR)
+    {
+      artwork.gfx_current = tree_node_new;
+
+      DrawChooseTree(&artwork.gfx_current);
+    }
+    else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS &&
+            tree_type == TREE_TYPE_SOUNDS_DIR)
+    {
+      artwork.snd_current = tree_node_new;
+
+      DrawChooseTree(&artwork.snd_current);
+    }
+    else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC &&
+            tree_type == TREE_TYPE_MUSIC_DIR)
+    {
+      artwork.mus_current = tree_node_new;
+
+      DrawChooseTree(&artwork.mus_current);
+    }
+  }
+}
+
+static int UploadTapes(void)
+{
+  SetGameStatus(GAME_MODE_LOADING);
+
+  FadeSetEnterScreen();
+  FadeOut(REDRAW_ALL);
+
+  ClearRectangle(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
+
+  FadeIn(REDRAW_ALL);
+
+  DrawInitTextHead("Uploading tapes");
+
+  global.autoplay_mode = AUTOPLAY_MODE_UPLOAD;
+  global.autoplay_leveldir = "ALL";
+  global.autoplay_all = TRUE;
+
+  int num_tapes_uploaded = AutoPlayTapes();
+
+  global.autoplay_mode = AUTOPLAY_MODE_NONE;
+  global.autoplay_leveldir = NULL;
+  global.autoplay_all = FALSE;
+
+  SetGameStatus(GAME_MODE_MAIN);
+
+  DrawMainMenu();
+
+  return num_tapes_uploaded;
+}
+
+static boolean OfferUploadTapes(void)
+{
+  if (!Request(setup.has_remaining_tapes ?
+              "Upload missing tapes to the high score server now?" :
+              "Upload all your tapes to the high score server now?", REQ_ASK))
+    return FALSE;
+
+  // when uploading tapes, make sure that high score server is enabled
+  runtime.use_api_server = setup.use_api_server = TRUE;
+
+  int num_tapes_uploaded = UploadTapes();
+  char message[100];
+
+  if (num_tapes_uploaded < 0)
+  {
+    num_tapes_uploaded = -num_tapes_uploaded - 1;
+
+    if (num_tapes_uploaded == 0)
+      sprintf(message, "Upload failed! No tapes uploaded!");
+    else if (num_tapes_uploaded == 1)
+      sprintf(message, "Upload failed! Only 1 tape uploaded!");
+    else
+      sprintf(message, "Upload failed! Only %d tapes uploaded!",
+             num_tapes_uploaded);
+
+    Request(message, REQ_CONFIRM);
+
+    // if uploading tapes failed, add tape upload entry to setup menu
+    setup.provide_uploading_tapes = TRUE;
+    setup.has_remaining_tapes = TRUE;
+
+    SaveSetup_ServerSetup();
+
+    return FALSE;
+  }
+
+  if (num_tapes_uploaded == 0)
+    sprintf(message, "No tapes uploaded!");
+  else if (num_tapes_uploaded == 1)
+    sprintf(message, "1 tape uploaded!");
+  else
+    sprintf(message, "%d tapes uploaded!", num_tapes_uploaded);
+
+  Request(message, REQ_CONFIRM);
+
+  if (num_tapes_uploaded > 0)
+    Request("New scores will be visible after a few minutes!", REQ_CONFIRM);
+
+  // after all tapes have been uploaded, remove entry from setup menu
+  setup.provide_uploading_tapes = FALSE;
+  setup.has_remaining_tapes = FALSE;
+
+  SaveSetup_ServerSetup();
+
+  return TRUE;
+}
+
+static void CheckUploadTapes(void)
+{
+  if (!setup.ask_for_uploading_tapes)
+    return;
+
+  // after asking for uploading tapes, do not ask again
+  setup.ask_for_uploading_tapes = FALSE;
+  setup.ask_for_remaining_tapes = FALSE;
+
+  if (directoryExists(getTapeDir(NULL)))
+  {
+    boolean tapes_uploaded = OfferUploadTapes();
+
+    if (!tapes_uploaded)
+    {
+      Request(setup.has_remaining_tapes ?
+             "You can upload missing tapes from the setup menu later!" :
+             "You can upload your tapes from the setup menu later!",
+             REQ_CONFIRM);
+    }
+  }
+  else
+  {
+    // if tapes directory does not exist yet, never offer uploading all tapes
+    setup.provide_uploading_tapes = FALSE;
+  }
+
+  SaveSetup_ServerSetup();
+}
+
+static void UpgradePlayerUUID(void)
+{
+  ApiResetUUIDAsThread(getUUID());
+}
+
+static void CheckUpgradePlayerUUID(void)
+{
+  if (setup.player_version > 1)
+    return;
+
+  UpgradePlayerUUID();
+}
+
+void CheckApiServerTasks(void)
+{
+  // check if the player's UUID has to be upgraded
+  CheckUpgradePlayerUUID();
+
+  // check if there are any tapes to be uploaded
+  CheckUploadTapes();
+}