added optional button to restart game (door, panel and touch variants)
[rocksndiamonds.git] / src / editor.c
index e2c9e90c8ea599798020914b77f99d0a43604560..671ac61de7551324c23e7c14ecf4d6dd8b83eb3d 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/
 // ----------------------------------------------------------------------------
 // editor.c
 // ============================================================================
 #define INFOTEXT_UNKNOWN_ELEMENT       "unknown"
 
 
-/*
-  -----------------------------------------------------------------------------
-  screen and artwork graphic pixel position definitions
-  -----------------------------------------------------------------------------
-*/
+// ----------------------------------------------------------------------------
+// screen and artwork graphic pixel position definitions
+// ----------------------------------------------------------------------------
 
-/* values for the control window */
-#define ED_CTRL1_BUTTONS_HORIZ         4       /* toolbox */
+// values for the control window
+#define ED_CTRL1_BUTTONS_HORIZ         4       // toolbox
 #define ED_CTRL1_BUTTONS_VERT          4
-#define ED_CTRL2_BUTTONS_HORIZ         3       /* level */
+#define ED_CTRL2_BUTTONS_HORIZ         3       // level
 #define ED_CTRL2_BUTTONS_VERT          2
-#define ED_CTRL3_BUTTONS_HORIZ         3       /* CE and GE */
+#define ED_CTRL3_BUTTONS_HORIZ         3       // CE and GE
 #define ED_CTRL3_BUTTONS_VERT          1
-#define ED_CTRL4_BUTTONS_HORIZ         2       /* CE and GE */
+#define ED_CTRL4_BUTTONS_HORIZ         2       // CE and GE
 #define ED_CTRL4_BUTTONS_VERT          1
-#define ED_CTRL5_BUTTONS_HORIZ         1       /* properties */
+#define ED_CTRL5_BUTTONS_HORIZ         1       // properties
 #define ED_CTRL5_BUTTONS_VERT          1
-#define ED_CTRL6_BUTTONS_HORIZ         3       /* properties */
+#define ED_CTRL6_BUTTONS_HORIZ         3       // properties
 #define ED_CTRL6_BUTTONS_VERT          1
-#define ED_CTRL7_BUTTONS_HORIZ         1       /* palette */
+#define ED_CTRL7_BUTTONS_HORIZ         1       // palette
 #define ED_CTRL7_BUTTONS_VERT          1
 
 #define ED_NUM_CTRL1_BUTTONS   (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT)
 #define ED_NUM_CTRL1_7_BUTTONS (ED_NUM_CTRL1_6_BUTTONS + ED_NUM_CTRL7_BUTTONS)
 #define ED_NUM_CTRL_BUTTONS    ED_NUM_CTRL1_7_BUTTONS
 
-/* values for the element list */
+// values for the element list
 #define ED_ELEMENTLIST_XPOS            (editor.palette.x)
 #define ED_ELEMENTLIST_YPOS            (editor.palette.y)
 #define ED_ELEMENTLIST_XSIZE           (graphic_info[IMG_EDITOR_PALETTE_BUTTON].width)
 #define ED_ELEMENTLIST_YSIZE           (graphic_info[IMG_EDITOR_PALETTE_BUTTON].height)
-#define ED_ELEMENTLIST_BUTTONS_HORIZ   (editor.palette.cols)
-#define ED_ELEMENTLIST_BUTTONS_VERT    (editor.palette.rows)
+#define ED_ELEMENTLIST_COLS            MAX(1, editor.palette.cols)
+#define ED_ELEMENTLIST_ROWS            MAX(1, editor.palette.rows)
+#define ED_ELEMENTLIST_BUTTONS_HORIZ   (ED_ELEMENTLIST_COLS)
+#define ED_ELEMENTLIST_BUTTONS_VERT    (ED_ELEMENTLIST_ROWS)
 #define ED_NUM_ELEMENTLIST_BUTTONS     (ED_ELEMENTLIST_BUTTONS_HORIZ * \
                                         ED_ELEMENTLIST_BUTTONS_VERT)
 
-/* standard distances */
+// standard distances
 #define ED_GADGET_NORMAL_DISTANCE      (editor.gadget.normal_spacing)
 #define ED_GADGET_SMALL_DISTANCE       (editor.gadget.small_spacing)
 #define ED_GADGET_TINY_DISTANCE                (editor.gadget.tiny_spacing)
                                         ED_DRAWINGAREA_BORDER_SIZE)
 #define ED_GADGET_SPACE_DISTANCE       (getFontWidth(FONT_TEXT_1))
 
-/* values for drawingarea gadgets */
+// values for drawingarea gadgets
 #define IMG_BORDER_1                   IMG_EDITOR_ELEMENT_BORDER
 #define IMG_BORDER_2                   IMG_EDITOR_ELEMENT_BORDER_INPUT
 #define ED_ELEMENT_BORDER              (graphic_info[IMG_BORDER_1].border_size)
 #define ED_DRAWINGAREA_BORDER_SIZE     (graphic_info[IMG_BORDER_2].border_size)
 #define ED_DRAWINGAREA_TILE_SIZE       (editor.drawingarea.tile_size)
 
-/* values for checkbutton gadgets */
+// values for checkbutton gadgets
 #define ED_CHECKBUTTON_XSIZE        (graphic_info[IMG_EDITOR_CHECKBOX].width)
 #define ED_CHECKBUTTON_YSIZE        (graphic_info[IMG_EDITOR_CHECKBOX].height)
 
                                    ED_AREA_YOFFSET_1((i).y) -          \
                                    ED_AREA_YOFFSET_2((i).area_ysize))
 
-/* values for element content drawing areas */
+// values for element content drawing areas
 #define ED_AREA_1X1_LSETTINGS_XPOS(n)  ED_LEVEL_SETTINGS_XPOS(n)
 #define ED_AREA_1X1_LSETTINGS_YPOS(n)  ED_LEVEL_SETTINGS_YPOS(n)
 #define ED_AREA_1X1_LSETTINGS_XOFF     (0)
 #define ED_AREA_3X3_SETTINGS_XOFF      (0)
 #define ED_AREA_3X3_SETTINGS_YOFF      (0)
 
-/* element content */
+// element content
 #define ED_AREA_ELEMENT_CONTENT_XOFF(n)        (n)
 #define ED_AREA_ELEMENT_CONTENT_YOFF(n)        (n)
 
-/* yamyam content */
+// yamyam content
 #define ED_XPOS_YAM                    0
 #define ED_YPOS_YAM                    5
 #define ED_AREA_YAMYAM_CONTENT_XPOS    ED_ELEMENT_SETTINGS_XPOS(ED_XPOS_YAM)
                                         ED_AREA_YOFFSET_1(ED_YPOS_YAM) - \
                                         ED_AREA_YOFFSET_2(3))
 
-/* magic ball content */
+// magic ball content
 #define ED_XPOS_BALL                   0
 #define ED_YPOS_BALL                   6
 #define ED_AREA_MAGIC_BALL_CONTENT_XPOS        ED_ELEMENT_SETTINGS_XPOS(ED_XPOS_BALL)
                                         ED_AREA_YOFFSET_1(ED_YPOS_BALL) - \
                                         ED_AREA_YOFFSET_2(3))
 
-/* values for scrolling gadgets for drawing area */
+// values for scrolling gadgets for drawing area
 #define ED_SCROLLBUTTON_XSIZE          (graphic_info[IMG_EDITOR_PLAYFIELD_SCROLLBAR].width)
 #define ED_SCROLLBUTTON_YSIZE          (graphic_info[IMG_EDITOR_PLAYFIELD_SCROLLBAR].height)
 
 #define ED_SCROLL_VERTICAL_XSIZE       ED_SCROLLBUTTON_XSIZE
 #define ED_SCROLL_VERTICAL_YSIZE       (SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE)
 
-/* values for scrolling gadgets for element list */
+// values for scrolling gadgets for element list
 #define ED_SCROLLBUTTON2_XSIZE         (graphic_info[IMG_EDITOR_PALETTE_SCROLL_UP].width)
 #define ED_SCROLLBUTTON2_YSIZE         (graphic_info[IMG_EDITOR_PALETTE_SCROLL_UP].height)
 
                                         ED_ELEMENTLIST_YSIZE -         \
                                         2 * ED_SCROLLBUTTON2_YSIZE)
 
-/* values for ClearEditorGadgetInfoText() and HandleEditorGadgetInfoText() */
+// values for ClearEditorGadgetInfoText() and HandleEditorGadgetInfoText()
 #define INFOTEXT_FONT          FONT_TEXT_2
 #define INFOTEXT_XSIZE         SXSIZE
 #define INFOTEXT_YSIZE         getFontHeight(INFOTEXT_FONT)
                                      SYSIZE - INFOTEXT_YSIZE)
 
 
-/*
-  -----------------------------------------------------------------------------
-  editor gadget definitions
-  -----------------------------------------------------------------------------
-*/
-
-/* drawing toolbox buttons */
-#define GADGET_ID_NONE                 -1
-#define GADGET_ID_TOOLBOX_FIRST                0
-
-#define GADGET_ID_SINGLE_ITEMS         (GADGET_ID_TOOLBOX_FIRST + 0)
-#define GADGET_ID_CONNECTED_ITEMS      (GADGET_ID_TOOLBOX_FIRST + 1)
-#define GADGET_ID_LINE                 (GADGET_ID_TOOLBOX_FIRST + 2)
-#define GADGET_ID_ARC                  (GADGET_ID_TOOLBOX_FIRST + 3)
-#define GADGET_ID_RECTANGLE            (GADGET_ID_TOOLBOX_FIRST + 4)
-#define GADGET_ID_FILLED_BOX           (GADGET_ID_TOOLBOX_FIRST + 5)
-#define GADGET_ID_WRAP_UP              (GADGET_ID_TOOLBOX_FIRST + 6)
-#define GADGET_ID_TEXT                 (GADGET_ID_TOOLBOX_FIRST + 7)
-#define GADGET_ID_FLOOD_FILL           (GADGET_ID_TOOLBOX_FIRST + 8)
-#define GADGET_ID_WRAP_LEFT            (GADGET_ID_TOOLBOX_FIRST + 9)
-#define GADGET_ID_ZOOM                 (GADGET_ID_TOOLBOX_FIRST + 10)
-#define GADGET_ID_WRAP_RIGHT           (GADGET_ID_TOOLBOX_FIRST + 11)
-#define GADGET_ID_RANDOM_PLACEMENT     (GADGET_ID_TOOLBOX_FIRST + 12)
-#define GADGET_ID_GRAB_BRUSH           (GADGET_ID_TOOLBOX_FIRST + 13)
-#define GADGET_ID_WRAP_DOWN            (GADGET_ID_TOOLBOX_FIRST + 14)
-#define GADGET_ID_PICK_ELEMENT         (GADGET_ID_TOOLBOX_FIRST + 15)
-
-#define GADGET_ID_UNDO                 (GADGET_ID_TOOLBOX_FIRST + 16)
-#define GADGET_ID_INFO                 (GADGET_ID_TOOLBOX_FIRST + 17)
-#define GADGET_ID_SAVE                 (GADGET_ID_TOOLBOX_FIRST + 18)
-#define GADGET_ID_CLEAR                        (GADGET_ID_TOOLBOX_FIRST + 19)
-#define GADGET_ID_TEST                 (GADGET_ID_TOOLBOX_FIRST + 20)
-#define GADGET_ID_EXIT                 (GADGET_ID_TOOLBOX_FIRST + 21)
-
-#define GADGET_ID_CUSTOM_COPY_FROM     (GADGET_ID_TOOLBOX_FIRST + 22)
-#define GADGET_ID_CUSTOM_COPY_TO       (GADGET_ID_TOOLBOX_FIRST + 23)
-#define GADGET_ID_CUSTOM_EXCHANGE      (GADGET_ID_TOOLBOX_FIRST + 24)
-#define GADGET_ID_CUSTOM_COPY          (GADGET_ID_TOOLBOX_FIRST + 25)
-#define GADGET_ID_CUSTOM_PASTE         (GADGET_ID_TOOLBOX_FIRST + 26)
-
-#define GADGET_ID_PROPERTIES           (GADGET_ID_TOOLBOX_FIRST + 27)
-#define GADGET_ID_ELEMENT_LEFT         (GADGET_ID_TOOLBOX_FIRST + 28)
-#define GADGET_ID_ELEMENT_MIDDLE       (GADGET_ID_TOOLBOX_FIRST + 29)
-#define GADGET_ID_ELEMENT_RIGHT                (GADGET_ID_TOOLBOX_FIRST + 30)
-#define GADGET_ID_PALETTE              (GADGET_ID_TOOLBOX_FIRST + 31)
-
-/* counter gadget identifiers */
-#define GADGET_ID_COUNTER_FIRST                (GADGET_ID_TOOLBOX_FIRST + 32)
-
-#define GADGET_ID_SELECT_LEVEL_DOWN    (GADGET_ID_COUNTER_FIRST + 0)
-#define GADGET_ID_SELECT_LEVEL_TEXT    (GADGET_ID_COUNTER_FIRST + 1)
-#define GADGET_ID_SELECT_LEVEL_UP      (GADGET_ID_COUNTER_FIRST + 2)
-#define GADGET_ID_LEVEL_XSIZE_DOWN     (GADGET_ID_COUNTER_FIRST + 3)
-#define GADGET_ID_LEVEL_XSIZE_TEXT     (GADGET_ID_COUNTER_FIRST + 4)
-#define GADGET_ID_LEVEL_XSIZE_UP       (GADGET_ID_COUNTER_FIRST + 5)
-#define GADGET_ID_LEVEL_YSIZE_DOWN     (GADGET_ID_COUNTER_FIRST + 6)
-#define GADGET_ID_LEVEL_YSIZE_TEXT     (GADGET_ID_COUNTER_FIRST + 7)
-#define GADGET_ID_LEVEL_YSIZE_UP       (GADGET_ID_COUNTER_FIRST + 8)
-#define GADGET_ID_LEVEL_RANDOM_DOWN    (GADGET_ID_COUNTER_FIRST + 9)
-#define GADGET_ID_LEVEL_RANDOM_TEXT    (GADGET_ID_COUNTER_FIRST + 10)
-#define GADGET_ID_LEVEL_RANDOM_UP      (GADGET_ID_COUNTER_FIRST + 11)
-#define GADGET_ID_LEVEL_GEMSLIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 12)
-#define GADGET_ID_LEVEL_GEMSLIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 13)
-#define GADGET_ID_LEVEL_GEMSLIMIT_UP   (GADGET_ID_COUNTER_FIRST + 14)
-#define GADGET_ID_LEVEL_TIMELIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 15)
-#define GADGET_ID_LEVEL_TIMELIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 16)
-#define GADGET_ID_LEVEL_TIMELIMIT_UP   (GADGET_ID_COUNTER_FIRST + 17)
-#define GADGET_ID_LEVEL_TIMESCORE_DOWN (GADGET_ID_COUNTER_FIRST + 18)
-#define GADGET_ID_LEVEL_TIMESCORE_TEXT (GADGET_ID_COUNTER_FIRST + 19)
-#define GADGET_ID_LEVEL_TIMESCORE_UP   (GADGET_ID_COUNTER_FIRST + 20)
-#define GADGET_ID_LEVEL_RANDOM_SEED_DOWN (GADGET_ID_COUNTER_FIRST + 21)
-#define GADGET_ID_LEVEL_RANDOM_SEED_TEXT (GADGET_ID_COUNTER_FIRST + 22)
-#define GADGET_ID_LEVEL_RANDOM_SEED_UP (GADGET_ID_COUNTER_FIRST + 23)
-#define GADGET_ID_LEVELSET_NUM_LEVELS_DOWN (GADGET_ID_COUNTER_FIRST + 24)
-#define GADGET_ID_LEVELSET_NUM_LEVELS_TEXT (GADGET_ID_COUNTER_FIRST + 25)
-#define GADGET_ID_LEVELSET_NUM_LEVELS_UP   (GADGET_ID_COUNTER_FIRST + 26)
-#define GADGET_ID_ELEMENT_VALUE1_DOWN  (GADGET_ID_COUNTER_FIRST + 27)
-#define GADGET_ID_ELEMENT_VALUE1_TEXT  (GADGET_ID_COUNTER_FIRST + 28)
-#define GADGET_ID_ELEMENT_VALUE1_UP    (GADGET_ID_COUNTER_FIRST + 29)
-#define GADGET_ID_ELEMENT_VALUE2_DOWN  (GADGET_ID_COUNTER_FIRST + 30)
-#define GADGET_ID_ELEMENT_VALUE2_TEXT  (GADGET_ID_COUNTER_FIRST + 31)
-#define GADGET_ID_ELEMENT_VALUE2_UP    (GADGET_ID_COUNTER_FIRST + 32)
-#define GADGET_ID_ELEMENT_VALUE3_DOWN  (GADGET_ID_COUNTER_FIRST + 33)
-#define GADGET_ID_ELEMENT_VALUE3_TEXT  (GADGET_ID_COUNTER_FIRST + 34)
-#define GADGET_ID_ELEMENT_VALUE3_UP    (GADGET_ID_COUNTER_FIRST + 35)
-#define GADGET_ID_ELEMENT_VALUE4_DOWN  (GADGET_ID_COUNTER_FIRST + 36)
-#define GADGET_ID_ELEMENT_VALUE4_TEXT  (GADGET_ID_COUNTER_FIRST + 37)
-#define GADGET_ID_ELEMENT_VALUE4_UP    (GADGET_ID_COUNTER_FIRST + 38)
-#define GADGET_ID_YAMYAM_CONTENT_DOWN  (GADGET_ID_COUNTER_FIRST + 39)
-#define GADGET_ID_YAMYAM_CONTENT_TEXT  (GADGET_ID_COUNTER_FIRST + 40)
-#define GADGET_ID_YAMYAM_CONTENT_UP    (GADGET_ID_COUNTER_FIRST + 41)
-#define GADGET_ID_BALL_CONTENT_DOWN    (GADGET_ID_COUNTER_FIRST + 42)
-#define GADGET_ID_BALL_CONTENT_TEXT    (GADGET_ID_COUNTER_FIRST + 43)
-#define GADGET_ID_BALL_CONTENT_UP      (GADGET_ID_COUNTER_FIRST + 44)
-#define GADGET_ID_ANDROID_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 45)
-#define GADGET_ID_ANDROID_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 46)
-#define GADGET_ID_ANDROID_CONTENT_UP   (GADGET_ID_COUNTER_FIRST + 47)
-#define GADGET_ID_ENVELOPE_XSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 48)
-#define GADGET_ID_ENVELOPE_XSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 49)
-#define GADGET_ID_ENVELOPE_XSIZE_UP    (GADGET_ID_COUNTER_FIRST + 50)
-#define GADGET_ID_ENVELOPE_YSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 51)
-#define GADGET_ID_ENVELOPE_YSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 52)
-#define GADGET_ID_ENVELOPE_YSIZE_UP    (GADGET_ID_COUNTER_FIRST + 53)
-#define GADGET_ID_INVENTORY_SIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 54)
-#define GADGET_ID_INVENTORY_SIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 55)
-#define GADGET_ID_INVENTORY_SIZE_UP    (GADGET_ID_COUNTER_FIRST + 56)
-#define GADGET_ID_CUSTOM_SCORE_DOWN    (GADGET_ID_COUNTER_FIRST + 57)
-#define GADGET_ID_CUSTOM_SCORE_TEXT    (GADGET_ID_COUNTER_FIRST + 58)
-#define GADGET_ID_CUSTOM_SCORE_UP      (GADGET_ID_COUNTER_FIRST + 59)
-#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 60)
-#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 61)
-#define GADGET_ID_CUSTOM_GEMCOUNT_UP   (GADGET_ID_COUNTER_FIRST + 62)
-#define GADGET_ID_CUSTOM_VALUE_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 63)
-#define GADGET_ID_CUSTOM_VALUE_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 64)
-#define GADGET_ID_CUSTOM_VALUE_FIX_UP  (GADGET_ID_COUNTER_FIRST + 65)
-#define GADGET_ID_CUSTOM_VALUE_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 66)
-#define GADGET_ID_CUSTOM_VALUE_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 67)
-#define GADGET_ID_CUSTOM_VALUE_RND_UP  (GADGET_ID_COUNTER_FIRST + 68)
-#define GADGET_ID_PUSH_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 69)
-#define GADGET_ID_PUSH_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 70)
-#define GADGET_ID_PUSH_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 71)
-#define GADGET_ID_PUSH_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 72)
-#define GADGET_ID_PUSH_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 73)
-#define GADGET_ID_PUSH_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 74)
-#define GADGET_ID_DROP_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 75)
-#define GADGET_ID_DROP_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 76)
-#define GADGET_ID_DROP_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 77)
-#define GADGET_ID_DROP_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 78)
-#define GADGET_ID_DROP_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 79)
-#define GADGET_ID_DROP_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 80)
-#define GADGET_ID_MOVE_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 81)
-#define GADGET_ID_MOVE_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 82)
-#define GADGET_ID_MOVE_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 83)
-#define GADGET_ID_MOVE_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 84)
-#define GADGET_ID_MOVE_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 85)
-#define GADGET_ID_MOVE_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 86)
-#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 87)
-#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 88)
-#define GADGET_ID_EXPLOSION_DELAY_UP   (GADGET_ID_COUNTER_FIRST + 89)
-#define GADGET_ID_IGNITION_DELAY_DOWN  (GADGET_ID_COUNTER_FIRST + 90)
-#define GADGET_ID_IGNITION_DELAY_TEXT  (GADGET_ID_COUNTER_FIRST + 91)
-#define GADGET_ID_IGNITION_DELAY_UP    (GADGET_ID_COUNTER_FIRST + 92)
-#define GADGET_ID_CHANGE_DELAY_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 93)
-#define GADGET_ID_CHANGE_DELAY_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 94)
-#define GADGET_ID_CHANGE_DELAY_FIX_UP  (GADGET_ID_COUNTER_FIRST + 95)
-#define GADGET_ID_CHANGE_DELAY_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 96)
-#define GADGET_ID_CHANGE_DELAY_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 97)
-#define GADGET_ID_CHANGE_DELAY_RND_UP  (GADGET_ID_COUNTER_FIRST + 98)
-#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 99)
-#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 100)
-#define GADGET_ID_CHANGE_CONT_RND_UP   (GADGET_ID_COUNTER_FIRST + 101)
-#define GADGET_ID_GROUP_CONTENT_DOWN   (GADGET_ID_COUNTER_FIRST + 102)
-#define GADGET_ID_GROUP_CONTENT_TEXT   (GADGET_ID_COUNTER_FIRST + 103)
-#define GADGET_ID_GROUP_CONTENT_UP     (GADGET_ID_COUNTER_FIRST + 104)
-
-/* drawing area identifiers */
-#define GADGET_ID_DRAWING_AREA_FIRST   (GADGET_ID_COUNTER_FIRST + 105)
-
-#define GADGET_ID_DRAWING_LEVEL                (GADGET_ID_DRAWING_AREA_FIRST + 0)
-#define GADGET_ID_YAMYAM_CONTENT_0     (GADGET_ID_DRAWING_AREA_FIRST + 1)
-#define GADGET_ID_YAMYAM_CONTENT_1     (GADGET_ID_DRAWING_AREA_FIRST + 2)
-#define GADGET_ID_YAMYAM_CONTENT_2     (GADGET_ID_DRAWING_AREA_FIRST + 3)
-#define GADGET_ID_YAMYAM_CONTENT_3     (GADGET_ID_DRAWING_AREA_FIRST + 4)
-#define GADGET_ID_YAMYAM_CONTENT_4     (GADGET_ID_DRAWING_AREA_FIRST + 5)
-#define GADGET_ID_YAMYAM_CONTENT_5     (GADGET_ID_DRAWING_AREA_FIRST + 6)
-#define GADGET_ID_YAMYAM_CONTENT_6     (GADGET_ID_DRAWING_AREA_FIRST + 7)
-#define GADGET_ID_YAMYAM_CONTENT_7     (GADGET_ID_DRAWING_AREA_FIRST + 8)
-#define GADGET_ID_MAGIC_BALL_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 9)
-#define GADGET_ID_MAGIC_BALL_CONTENT_1 (GADGET_ID_DRAWING_AREA_FIRST + 10)
-#define GADGET_ID_MAGIC_BALL_CONTENT_2 (GADGET_ID_DRAWING_AREA_FIRST + 11)
-#define GADGET_ID_MAGIC_BALL_CONTENT_3 (GADGET_ID_DRAWING_AREA_FIRST + 12)
-#define GADGET_ID_MAGIC_BALL_CONTENT_4 (GADGET_ID_DRAWING_AREA_FIRST + 13)
-#define GADGET_ID_MAGIC_BALL_CONTENT_5 (GADGET_ID_DRAWING_AREA_FIRST + 14)
-#define GADGET_ID_MAGIC_BALL_CONTENT_6 (GADGET_ID_DRAWING_AREA_FIRST + 15)
-#define GADGET_ID_MAGIC_BALL_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 16)
-#define GADGET_ID_ANDROID_CONTENT      (GADGET_ID_DRAWING_AREA_FIRST + 17)
-#define GADGET_ID_AMOEBA_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 18)
-#define GADGET_ID_START_ELEMENT                (GADGET_ID_DRAWING_AREA_FIRST + 19)
-#define GADGET_ID_ARTWORK_ELEMENT      (GADGET_ID_DRAWING_AREA_FIRST + 20)
-#define GADGET_ID_EXPLOSION_ELEMENT    (GADGET_ID_DRAWING_AREA_FIRST + 21)
-#define GADGET_ID_INVENTORY_CONTENT    (GADGET_ID_DRAWING_AREA_FIRST + 22)
-#define GADGET_ID_CUSTOM_GRAPHIC       (GADGET_ID_DRAWING_AREA_FIRST + 23)
-#define GADGET_ID_CUSTOM_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 24)
-#define GADGET_ID_CUSTOM_MOVE_ENTER    (GADGET_ID_DRAWING_AREA_FIRST + 25)
-#define GADGET_ID_CUSTOM_MOVE_LEAVE    (GADGET_ID_DRAWING_AREA_FIRST + 26)
-#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 27)
-#define GADGET_ID_CUSTOM_CHANGE_CONTENT        (GADGET_ID_DRAWING_AREA_FIRST + 28)
-#define GADGET_ID_CUSTOM_CHANGE_TRIGGER        (GADGET_ID_DRAWING_AREA_FIRST + 29)
-#define GADGET_ID_CUSTOM_CHANGE_ACTION (GADGET_ID_DRAWING_AREA_FIRST + 30)
-#define GADGET_ID_GROUP_CONTENT                (GADGET_ID_DRAWING_AREA_FIRST + 31)
-#define GADGET_ID_RANDOM_BACKGROUND    (GADGET_ID_DRAWING_AREA_FIRST + 32)
-
-/* text input identifiers */
-#define GADGET_ID_TEXT_INPUT_FIRST     (GADGET_ID_DRAWING_AREA_FIRST + 33)
-
-#define GADGET_ID_LEVEL_NAME           (GADGET_ID_TEXT_INPUT_FIRST + 0)
-#define GADGET_ID_LEVEL_AUTHOR         (GADGET_ID_TEXT_INPUT_FIRST + 1)
-#define GADGET_ID_LEVELSET_NAME                (GADGET_ID_TEXT_INPUT_FIRST + 2)
-#define GADGET_ID_LEVELSET_AUTHOR      (GADGET_ID_TEXT_INPUT_FIRST + 3)
-#define GADGET_ID_ELEMENT_NAME         (GADGET_ID_TEXT_INPUT_FIRST + 4)
-
-/* text area identifiers */
-#define GADGET_ID_TEXT_AREA_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 5)
-
-#define GADGET_ID_ENVELOPE_INFO                (GADGET_ID_TEXT_AREA_FIRST + 0)
-
-/* selectbox identifiers */
-#define GADGET_ID_SELECTBOX_FIRST      (GADGET_ID_TEXT_AREA_FIRST + 1)
-
-#define GADGET_ID_TIME_OR_STEPS                (GADGET_ID_SELECTBOX_FIRST + 0)
-#define GADGET_ID_GAME_ENGINE_TYPE     (GADGET_ID_SELECTBOX_FIRST + 1)
-#define GADGET_ID_LEVELSET_SAVE_MODE   (GADGET_ID_SELECTBOX_FIRST + 2)
-#define GADGET_ID_WIND_DIRECTION       (GADGET_ID_SELECTBOX_FIRST + 3)
-#define GADGET_ID_PLAYER_SPEED         (GADGET_ID_SELECTBOX_FIRST + 4)
-#define GADGET_ID_CUSTOM_WALK_TO_ACTION        (GADGET_ID_SELECTBOX_FIRST + 5)
-#define GADGET_ID_CUSTOM_EXPLOSION_TYPE        (GADGET_ID_SELECTBOX_FIRST + 6)
-#define GADGET_ID_CUSTOM_DEADLINESS    (GADGET_ID_SELECTBOX_FIRST + 7)
-#define GADGET_ID_CUSTOM_MOVE_PATTERN  (GADGET_ID_SELECTBOX_FIRST + 8)
-#define GADGET_ID_CUSTOM_MOVE_DIRECTION        (GADGET_ID_SELECTBOX_FIRST + 9)
-#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 10)
-#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 11)
-#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 12)
-#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 13)
-#define GADGET_ID_CUSTOM_ACCESS_TYPE   (GADGET_ID_SELECTBOX_FIRST + 14)
-#define GADGET_ID_CUSTOM_ACCESS_LAYER  (GADGET_ID_SELECTBOX_FIRST + 15)
-#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 16)
-#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 17)
-#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 18)
-#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 19)
-#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 20)
-#define GADGET_ID_CHANGE_SIDE          (GADGET_ID_SELECTBOX_FIRST + 21)
-#define GADGET_ID_CHANGE_PLAYER                (GADGET_ID_SELECTBOX_FIRST + 22)
-#define GADGET_ID_CHANGE_PAGE          (GADGET_ID_SELECTBOX_FIRST + 23)
-#define GADGET_ID_CHANGE_REPLACE_WHEN  (GADGET_ID_SELECTBOX_FIRST + 24)
-#define GADGET_ID_ACTION_TYPE          (GADGET_ID_SELECTBOX_FIRST + 25)
-#define GADGET_ID_ACTION_MODE          (GADGET_ID_SELECTBOX_FIRST + 26)
-#define GADGET_ID_ACTION_ARG           (GADGET_ID_SELECTBOX_FIRST + 27)
-#define GADGET_ID_SELECT_CHANGE_PAGE   (GADGET_ID_SELECTBOX_FIRST + 28)
-#define GADGET_ID_GROUP_CHOICE_MODE    (GADGET_ID_SELECTBOX_FIRST + 29)
-
-/* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 30)
-
-#define GADGET_ID_LEVELINFO_LEVEL      (GADGET_ID_TEXTBUTTON_FIRST + 0)
-#define GADGET_ID_LEVELINFO_LEVELSET   (GADGET_ID_TEXTBUTTON_FIRST + 1)
-#define GADGET_ID_LEVELINFO_EDITOR     (GADGET_ID_TEXTBUTTON_FIRST + 2)
-#define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 3)
-#define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 4)
-#define GADGET_ID_PROPERTIES_CONFIG_1  (GADGET_ID_TEXTBUTTON_FIRST + 5)
-#define GADGET_ID_PROPERTIES_CONFIG_2  (GADGET_ID_TEXTBUTTON_FIRST + 6)
-#define GADGET_ID_PROPERTIES_CHANGE    (GADGET_ID_TEXTBUTTON_FIRST + 7)
-#define GADGET_ID_SAVE_AS_TEMPLATE_1   (GADGET_ID_TEXTBUTTON_FIRST + 8)
-#define GADGET_ID_SAVE_AS_TEMPLATE_2   (GADGET_ID_TEXTBUTTON_FIRST + 9)
-#define GADGET_ID_SAVE_LEVELSET                (GADGET_ID_TEXTBUTTON_FIRST + 10)
-#define GADGET_ID_ADD_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 11)
-#define GADGET_ID_DEL_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 12)
-
-/* graphicbutton identifiers */
-#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 13)
-
-#define GADGET_ID_PREV_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 0)
-#define GADGET_ID_NEXT_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 1)
-#define GADGET_ID_COPY_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 2)
-#define GADGET_ID_PASTE_CHANGE_PAGE    (GADGET_ID_GRAPHICBUTTON_FIRST + 3)
-
-/* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLLING_FIRST      (GADGET_ID_GRAPHICBUTTON_FIRST + 4)
-
-#define GADGET_ID_SCROLL_UP            (GADGET_ID_SCROLLING_FIRST + 0)
-#define GADGET_ID_SCROLL_DOWN          (GADGET_ID_SCROLLING_FIRST + 1)
-#define GADGET_ID_SCROLL_LEFT          (GADGET_ID_SCROLLING_FIRST + 2)
-#define GADGET_ID_SCROLL_RIGHT         (GADGET_ID_SCROLLING_FIRST + 3)
-#define GADGET_ID_SCROLL_HORIZONTAL    (GADGET_ID_SCROLLING_FIRST + 4)
-#define GADGET_ID_SCROLL_VERTICAL      (GADGET_ID_SCROLLING_FIRST + 5)
-
-/* gadgets for scrolling element list */
-#define GADGET_ID_SCROLLING_LIST_FIRST (GADGET_ID_SCROLLING_FIRST + 6)
-
-#define GADGET_ID_SCROLL_LIST_UP       (GADGET_ID_SCROLLING_LIST_FIRST + 0)
-#define GADGET_ID_SCROLL_LIST_DOWN     (GADGET_ID_SCROLLING_LIST_FIRST + 1)
-#define GADGET_ID_SCROLL_LIST_VERTICAL (GADGET_ID_SCROLLING_LIST_FIRST + 2)
-
-/* checkbuttons/radiobuttons for level/element properties */
-#define GADGET_ID_CHECKBUTTON_FIRST    (GADGET_ID_SCROLLING_LIST_FIRST + 3)
-
-#define GADGET_ID_AUTO_COUNT_GEMS      (GADGET_ID_CHECKBUTTON_FIRST + 0)
-#define GADGET_ID_USE_LEVELSET_ARTWORK (GADGET_ID_CHECKBUTTON_FIRST + 1)
-#define GADGET_ID_COPY_LEVEL_TEMPLATE  (GADGET_ID_CHECKBUTTON_FIRST + 2)
-#define GADGET_ID_RANDOM_PERCENTAGE    (GADGET_ID_CHECKBUTTON_FIRST + 3)
-#define GADGET_ID_RANDOM_QUANTITY      (GADGET_ID_CHECKBUTTON_FIRST + 4)
-#define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 5)
-#define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 6)
-#define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 7)
-#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 8)
-#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 9)
-#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 10)
-#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 11)
-#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 12)
-#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 13)
-#define GADGET_ID_AUTO_EXIT_SOKOBAN    (GADGET_ID_CHECKBUTTON_FIRST + 14)
-#define GADGET_ID_SOLVED_BY_ONE_PLAYER (GADGET_ID_CHECKBUTTON_FIRST + 15)
-#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 16)
-#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 17)
-#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_LAZY_RELOCATION      (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 24)
-#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 25)
-#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 26)
-#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 27)
-#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 28)
-#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 29)
-#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 30)
-#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 31)
-#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 32)
-#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 33)
-#define GADGET_ID_MM_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 34)
-#define GADGET_ID_MM_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 35)
-#define GADGET_ID_MM_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 36)
-#define GADGET_ID_DF_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 37)
-#define GADGET_ID_DF_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 38)
-#define GADGET_ID_DF_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 39)
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 40)
-#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 41)
-#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 42)
-#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 43)
-#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 44)
-#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 45)
-#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 46)
-#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 47)
-#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 48)
-#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 49)
-#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 50)
-#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 51)
-#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 52)
-#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 53)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 54)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_1        (GADGET_ID_CHECKBUTTON_FIRST + 55)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_2        (GADGET_ID_CHECKBUTTON_FIRST + 56)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_3        (GADGET_ID_CHECKBUTTON_FIRST + 57)
-#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 58)
-#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 59)
-#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 60)
-#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 61)
-#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 62)
-#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 63)
-#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 64)
-#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 65)
-#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 66)
-
-/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 67)
+// ----------------------------------------------------------------------------
+// editor gadget definitions
+// ----------------------------------------------------------------------------
+
+enum
+{
+  GADGET_ID_NONE = -1,
+
+  // drawing toolbox buttons
+
+  GADGET_ID_SINGLE_ITEMS,
+  GADGET_ID_CONNECTED_ITEMS,
+  GADGET_ID_LINE,
+  GADGET_ID_ARC,
+  GADGET_ID_RECTANGLE,
+  GADGET_ID_FILLED_BOX,
+  GADGET_ID_WRAP_UP,
+  GADGET_ID_TEXT,
+  GADGET_ID_FLOOD_FILL,
+  GADGET_ID_WRAP_LEFT,
+  GADGET_ID_ZOOM,
+  GADGET_ID_WRAP_RIGHT,
+  GADGET_ID_RANDOM_PLACEMENT,
+  GADGET_ID_GRAB_BRUSH,
+  GADGET_ID_WRAP_DOWN,
+  GADGET_ID_PICK_ELEMENT,
+
+  GADGET_ID_UNDO,
+  GADGET_ID_CONF,
+  GADGET_ID_SAVE,
+  GADGET_ID_CLEAR,
+  GADGET_ID_TEST,
+  GADGET_ID_EXIT,
+
+  GADGET_ID_CUSTOM_COPY_FROM,
+  GADGET_ID_CUSTOM_COPY_TO,
+  GADGET_ID_CUSTOM_EXCHANGE,
+  GADGET_ID_CUSTOM_COPY,
+  GADGET_ID_CUSTOM_PASTE,
+
+  GADGET_ID_PROPERTIES,
+  GADGET_ID_ELEMENT_LEFT,
+  GADGET_ID_ELEMENT_MIDDLE,
+  GADGET_ID_ELEMENT_RIGHT,
+  GADGET_ID_PALETTE,
+
+  // counter gadget identifiers
+
+  GADGET_ID_SELECT_LEVEL_DOWN,
+  GADGET_ID_SELECT_LEVEL_TEXT,
+  GADGET_ID_SELECT_LEVEL_UP,
+  GADGET_ID_LEVEL_XSIZE_DOWN,
+  GADGET_ID_LEVEL_XSIZE_TEXT,
+  GADGET_ID_LEVEL_XSIZE_UP,
+  GADGET_ID_LEVEL_YSIZE_DOWN,
+  GADGET_ID_LEVEL_YSIZE_TEXT,
+  GADGET_ID_LEVEL_YSIZE_UP,
+  GADGET_ID_LEVEL_RANDOM_DOWN,
+  GADGET_ID_LEVEL_RANDOM_TEXT,
+  GADGET_ID_LEVEL_RANDOM_UP,
+  GADGET_ID_LEVEL_GEMSLIMIT_DOWN,
+  GADGET_ID_LEVEL_GEMSLIMIT_TEXT,
+  GADGET_ID_LEVEL_GEMSLIMIT_UP,
+  GADGET_ID_LEVEL_TIMELIMIT_DOWN,
+  GADGET_ID_LEVEL_TIMELIMIT_TEXT,
+  GADGET_ID_LEVEL_TIMELIMIT_UP,
+  GADGET_ID_LEVEL_TIMESCORE_DOWN,
+  GADGET_ID_LEVEL_TIMESCORE_TEXT,
+  GADGET_ID_LEVEL_TIMESCORE_UP,
+  GADGET_ID_LEVEL_RANDOM_SEED_DOWN,
+  GADGET_ID_LEVEL_RANDOM_SEED_TEXT,
+  GADGET_ID_LEVEL_RANDOM_SEED_UP,
+  GADGET_ID_LEVELSET_NUM_LEVELS_DOWN,
+  GADGET_ID_LEVELSET_NUM_LEVELS_TEXT,
+  GADGET_ID_LEVELSET_NUM_LEVELS_UP,
+  GADGET_ID_ELEMENT_VALUE1_DOWN,
+  GADGET_ID_ELEMENT_VALUE1_TEXT,
+  GADGET_ID_ELEMENT_VALUE1_UP,
+  GADGET_ID_ELEMENT_VALUE2_DOWN,
+  GADGET_ID_ELEMENT_VALUE2_TEXT,
+  GADGET_ID_ELEMENT_VALUE2_UP,
+  GADGET_ID_ELEMENT_VALUE3_DOWN,
+  GADGET_ID_ELEMENT_VALUE3_TEXT,
+  GADGET_ID_ELEMENT_VALUE3_UP,
+  GADGET_ID_ELEMENT_VALUE4_DOWN,
+  GADGET_ID_ELEMENT_VALUE4_TEXT,
+  GADGET_ID_ELEMENT_VALUE4_UP,
+  GADGET_ID_YAMYAM_CONTENT_DOWN,
+  GADGET_ID_YAMYAM_CONTENT_TEXT,
+  GADGET_ID_YAMYAM_CONTENT_UP,
+  GADGET_ID_BALL_CONTENT_DOWN,
+  GADGET_ID_BALL_CONTENT_TEXT,
+  GADGET_ID_BALL_CONTENT_UP,
+  GADGET_ID_ANDROID_CONTENT_DOWN,
+  GADGET_ID_ANDROID_CONTENT_TEXT,
+  GADGET_ID_ANDROID_CONTENT_UP,
+  GADGET_ID_ENVELOPE_XSIZE_DOWN,
+  GADGET_ID_ENVELOPE_XSIZE_TEXT,
+  GADGET_ID_ENVELOPE_XSIZE_UP,
+  GADGET_ID_ENVELOPE_YSIZE_DOWN,
+  GADGET_ID_ENVELOPE_YSIZE_TEXT,
+  GADGET_ID_ENVELOPE_YSIZE_UP,
+  GADGET_ID_INVENTORY_SIZE_DOWN,
+  GADGET_ID_INVENTORY_SIZE_TEXT,
+  GADGET_ID_INVENTORY_SIZE_UP,
+  GADGET_ID_MM_BALL_CONTENT_DOWN,
+  GADGET_ID_MM_BALL_CONTENT_TEXT,
+  GADGET_ID_MM_BALL_CONTENT_UP,
+  GADGET_ID_CUSTOM_SCORE_DOWN,
+  GADGET_ID_CUSTOM_SCORE_TEXT,
+  GADGET_ID_CUSTOM_SCORE_UP,
+  GADGET_ID_CUSTOM_GEMCOUNT_DOWN,
+  GADGET_ID_CUSTOM_GEMCOUNT_TEXT,
+  GADGET_ID_CUSTOM_GEMCOUNT_UP,
+  GADGET_ID_CUSTOM_VALUE_FIX_DOWN,
+  GADGET_ID_CUSTOM_VALUE_FIX_TEXT,
+  GADGET_ID_CUSTOM_VALUE_FIX_UP,
+  GADGET_ID_CUSTOM_VALUE_RND_DOWN,
+  GADGET_ID_CUSTOM_VALUE_RND_TEXT,
+  GADGET_ID_CUSTOM_VALUE_RND_UP,
+  GADGET_ID_PUSH_DELAY_FIX_DOWN,
+  GADGET_ID_PUSH_DELAY_FIX_TEXT,
+  GADGET_ID_PUSH_DELAY_FIX_UP,
+  GADGET_ID_PUSH_DELAY_RND_DOWN,
+  GADGET_ID_PUSH_DELAY_RND_TEXT,
+  GADGET_ID_PUSH_DELAY_RND_UP,
+  GADGET_ID_DROP_DELAY_FIX_DOWN,
+  GADGET_ID_DROP_DELAY_FIX_TEXT,
+  GADGET_ID_DROP_DELAY_FIX_UP,
+  GADGET_ID_DROP_DELAY_RND_DOWN,
+  GADGET_ID_DROP_DELAY_RND_TEXT,
+  GADGET_ID_DROP_DELAY_RND_UP,
+  GADGET_ID_MOVE_DELAY_FIX_DOWN,
+  GADGET_ID_MOVE_DELAY_FIX_TEXT,
+  GADGET_ID_MOVE_DELAY_FIX_UP,
+  GADGET_ID_MOVE_DELAY_RND_DOWN,
+  GADGET_ID_MOVE_DELAY_RND_TEXT,
+  GADGET_ID_MOVE_DELAY_RND_UP,
+  GADGET_ID_STEP_DELAY_FIX_DOWN,
+  GADGET_ID_STEP_DELAY_FIX_TEXT,
+  GADGET_ID_STEP_DELAY_FIX_UP,
+  GADGET_ID_STEP_DELAY_RND_DOWN,
+  GADGET_ID_STEP_DELAY_RND_TEXT,
+  GADGET_ID_STEP_DELAY_RND_UP,
+  GADGET_ID_EXPLOSION_DELAY_DOWN,
+  GADGET_ID_EXPLOSION_DELAY_TEXT,
+  GADGET_ID_EXPLOSION_DELAY_UP,
+  GADGET_ID_IGNITION_DELAY_DOWN,
+  GADGET_ID_IGNITION_DELAY_TEXT,
+  GADGET_ID_IGNITION_DELAY_UP,
+  GADGET_ID_CHANGE_DELAY_FIX_DOWN,
+  GADGET_ID_CHANGE_DELAY_FIX_TEXT,
+  GADGET_ID_CHANGE_DELAY_FIX_UP,
+  GADGET_ID_CHANGE_DELAY_RND_DOWN,
+  GADGET_ID_CHANGE_DELAY_RND_TEXT,
+  GADGET_ID_CHANGE_DELAY_RND_UP,
+  GADGET_ID_CHANGE_CONT_RND_DOWN,
+  GADGET_ID_CHANGE_CONT_RND_TEXT,
+  GADGET_ID_CHANGE_CONT_RND_UP,
+  GADGET_ID_GROUP_CONTENT_DOWN,
+  GADGET_ID_GROUP_CONTENT_TEXT,
+  GADGET_ID_GROUP_CONTENT_UP,
+
+  // drawing area identifiers
+
+  GADGET_ID_DRAWING_LEVEL,
+  GADGET_ID_YAMYAM_CONTENT_0,
+  GADGET_ID_YAMYAM_CONTENT_1,
+  GADGET_ID_YAMYAM_CONTENT_2,
+  GADGET_ID_YAMYAM_CONTENT_3,
+  GADGET_ID_YAMYAM_CONTENT_4,
+  GADGET_ID_YAMYAM_CONTENT_5,
+  GADGET_ID_YAMYAM_CONTENT_6,
+  GADGET_ID_YAMYAM_CONTENT_7,
+  GADGET_ID_MAGIC_BALL_CONTENT_0,
+  GADGET_ID_MAGIC_BALL_CONTENT_1,
+  GADGET_ID_MAGIC_BALL_CONTENT_2,
+  GADGET_ID_MAGIC_BALL_CONTENT_3,
+  GADGET_ID_MAGIC_BALL_CONTENT_4,
+  GADGET_ID_MAGIC_BALL_CONTENT_5,
+  GADGET_ID_MAGIC_BALL_CONTENT_6,
+  GADGET_ID_MAGIC_BALL_CONTENT_7,
+  GADGET_ID_ANDROID_CONTENT,
+  GADGET_ID_AMOEBA_CONTENT,
+  GADGET_ID_START_ELEMENT,
+  GADGET_ID_ARTWORK_ELEMENT,
+  GADGET_ID_EXPLOSION_ELEMENT,
+  GADGET_ID_INVENTORY_CONTENT,
+  GADGET_ID_MM_BALL_CONTENT,
+  GADGET_ID_CUSTOM_GRAPHIC,
+  GADGET_ID_CUSTOM_CONTENT,
+  GADGET_ID_CUSTOM_MOVE_ENTER,
+  GADGET_ID_CUSTOM_MOVE_LEAVE,
+  GADGET_ID_CUSTOM_CHANGE_TARGET,
+  GADGET_ID_CUSTOM_CHANGE_CONTENT,
+  GADGET_ID_CUSTOM_CHANGE_TRIGGER,
+  GADGET_ID_CUSTOM_CHANGE_ACTION,
+  GADGET_ID_GROUP_CONTENT,
+  GADGET_ID_RANDOM_BACKGROUND,
+
+  // text input identifiers
+
+  GADGET_ID_LEVEL_NAME,
+  GADGET_ID_LEVEL_AUTHOR,
+  GADGET_ID_LEVELSET_NAME,
+  GADGET_ID_LEVELSET_AUTHOR,
+  GADGET_ID_ELEMENT_NAME,
+
+  // text area identifiers
+
+  GADGET_ID_ENVELOPE_INFO,
+
+  // selectbox identifiers
+
+  GADGET_ID_TIME_OR_STEPS,
+  GADGET_ID_TIME_SCORE_BASE,
+  GADGET_ID_GAME_ENGINE_TYPE,
+  GADGET_ID_LEVELSET_SAVE_MODE,
+  GADGET_ID_WIND_DIRECTION,
+  GADGET_ID_PLAYER_SPEED,
+  GADGET_ID_MM_BALL_CHOICE_MODE,
+  GADGET_ID_CUSTOM_WALK_TO_ACTION,
+  GADGET_ID_CUSTOM_EXPLOSION_TYPE,
+  GADGET_ID_CUSTOM_DEADLINESS,
+  GADGET_ID_CUSTOM_MOVE_PATTERN,
+  GADGET_ID_CUSTOM_MOVE_DIRECTION,
+  GADGET_ID_CUSTOM_MOVE_STEPSIZE,
+  GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE,
+  GADGET_ID_CUSTOM_SMASH_TARGETS,
+  GADGET_ID_CUSTOM_SLIPPERY_TYPE,
+  GADGET_ID_CUSTOM_ACCESS_TYPE,
+  GADGET_ID_CUSTOM_ACCESS_LAYER,
+  GADGET_ID_CUSTOM_ACCESS_PROTECTED,
+  GADGET_ID_CUSTOM_ACCESS_DIRECTION,
+  GADGET_ID_CHANGE_TIME_UNITS,
+  GADGET_ID_CHANGE_DIRECT_ACTION,
+  GADGET_ID_CHANGE_OTHER_ACTION,
+  GADGET_ID_CHANGE_SIDE,
+  GADGET_ID_CHANGE_PLAYER,
+  GADGET_ID_CHANGE_PAGE,
+  GADGET_ID_CHANGE_REPLACE_WHEN,
+  GADGET_ID_ACTION_TYPE,
+  GADGET_ID_ACTION_MODE,
+  GADGET_ID_ACTION_ARG,
+  GADGET_ID_SELECT_CHANGE_PAGE,
+  GADGET_ID_GROUP_CHOICE_MODE,
+
+  // textbutton identifiers
+
+  GADGET_ID_LEVELCONFIG_LEVEL,
+  GADGET_ID_LEVELCONFIG_LEVELSET,
+  GADGET_ID_LEVELCONFIG_EDITOR,
+  GADGET_ID_PROPERTIES_INFO,
+  GADGET_ID_PROPERTIES_CONFIG,
+  GADGET_ID_PROPERTIES_CONFIG_1,
+  GADGET_ID_PROPERTIES_CONFIG_2,
+  GADGET_ID_PROPERTIES_CHANGE,
+  GADGET_ID_SAVE_AS_TEMPLATE_1,
+  GADGET_ID_SAVE_AS_TEMPLATE_2,
+  GADGET_ID_SAVE_LEVELSET,
+  GADGET_ID_ADD_CHANGE_PAGE,
+  GADGET_ID_DEL_CHANGE_PAGE,
+
+  // graphicbutton identifiers
+
+  GADGET_ID_PREV_CHANGE_PAGE,
+  GADGET_ID_NEXT_CHANGE_PAGE,
+  GADGET_ID_COPY_CHANGE_PAGE,
+  GADGET_ID_PASTE_CHANGE_PAGE,
+
+  // gadgets for scrolling of drawing area
+
+  GADGET_ID_SCROLL_UP,
+  GADGET_ID_SCROLL_DOWN,
+  GADGET_ID_SCROLL_LEFT,
+  GADGET_ID_SCROLL_RIGHT,
+  GADGET_ID_SCROLL_HORIZONTAL,
+  GADGET_ID_SCROLL_VERTICAL,
+
+  // gadgets for scrolling element list
+
+  GADGET_ID_SCROLL_LIST_UP,
+  GADGET_ID_SCROLL_LIST_DOWN,
+  GADGET_ID_SCROLL_LIST_VERTICAL,
+
+  // checkbuttons/radiobuttons for level/element properties
+
+  GADGET_ID_AUTO_COUNT_GEMS,
+  GADGET_ID_RATE_TIME_OVER_SCORE,
+  GADGET_ID_USE_LEVELSET_ARTWORK,
+  GADGET_ID_COPY_LEVEL_TEMPLATE,
+  GADGET_ID_RANDOM_PERCENTAGE,
+  GADGET_ID_RANDOM_QUANTITY,
+  GADGET_ID_RANDOM_RESTRICTED,
+  GADGET_ID_STICK_ELEMENT,
+  GADGET_ID_EM_SLIPPERY_GEMS,
+  GADGET_ID_EM_EXPLODES_BY_FIRE,
+  GADGET_ID_USE_SPRING_BUG,
+  GADGET_ID_USE_TIME_ORB_BUG,
+  GADGET_ID_USE_LIFE_BUGS,
+  GADGET_ID_RANDOM_BALL_CONTENT,
+  GADGET_ID_INITIAL_BALL_ACTIVE,
+  GADGET_ID_GROW_INTO_DIGGABLE,
+  GADGET_ID_SB_FIELDS_NEEDED,
+  GADGET_ID_SB_OBJECTS_NEEDED,
+  GADGET_ID_AUTO_EXIT_SOKOBAN,
+  GADGET_ID_SOLVED_BY_ONE_PLAYER,
+  GADGET_ID_FINISH_DIG_COLLECT,
+  GADGET_ID_KEEP_WALKABLE_CE,
+  GADGET_ID_CONTINUOUS_SNAPPING,
+  GADGET_ID_BLOCK_SNAP_FIELD,
+  GADGET_ID_BLOCK_LAST_FIELD,
+  GADGET_ID_SP_BLOCK_LAST_FIELD,
+  GADGET_ID_INSTANT_RELOCATION,
+  GADGET_ID_SHIFTED_RELOCATION,
+  GADGET_ID_LAZY_RELOCATION,
+  GADGET_ID_USE_START_ELEMENT,
+  GADGET_ID_USE_ARTWORK_ELEMENT,
+  GADGET_ID_USE_EXPLOSION_ELEMENT,
+  GADGET_ID_INITIAL_GRAVITY,
+  GADGET_ID_USE_INITIAL_INVENTORY,
+  GADGET_ID_CAN_PASS_TO_WALKABLE,
+  GADGET_ID_CAN_FALL_INTO_ACID,
+  GADGET_ID_CAN_MOVE_INTO_ACID,
+  GADGET_ID_DONT_COLLIDE_WITH,
+  GADGET_ID_ENVELOPE_AUTOWRAP,
+  GADGET_ID_ENVELOPE_CENTERED,
+  GADGET_ID_MM_LASER_RED,
+  GADGET_ID_MM_LASER_GREEN,
+  GADGET_ID_MM_LASER_BLUE,
+  GADGET_ID_DF_LASER_RED,
+  GADGET_ID_DF_LASER_GREEN,
+  GADGET_ID_DF_LASER_BLUE,
+  GADGET_ID_ROTATE_MM_BALL_CONTENT,
+  GADGET_ID_EXPLODE_MM_BALL,
+  GADGET_ID_CUSTOM_INDESTRUCTIBLE,
+  GADGET_ID_CUSTOM_CAN_EXPLODE,
+  GADGET_ID_CUSTOM_EXPLODE_FIRE,
+  GADGET_ID_CUSTOM_EXPLODE_SMASH,
+  GADGET_ID_CUSTOM_EXPLODE_IMPACT,
+  GADGET_ID_CUSTOM_WALK_TO_OBJECT,
+  GADGET_ID_CUSTOM_DEADLY,
+  GADGET_ID_CUSTOM_CAN_MOVE,
+  GADGET_ID_CUSTOM_CAN_FALL,
+  GADGET_ID_CUSTOM_CAN_SMASH,
+  GADGET_ID_CUSTOM_SLIPPERY,
+  GADGET_ID_CUSTOM_ACCESSIBLE,
+  GADGET_ID_CUSTOM_GRAV_REACHABLE,
+  GADGET_ID_CUSTOM_USE_LAST_VALUE,
+  GADGET_ID_CUSTOM_USE_GRAPHIC,
+  GADGET_ID_CUSTOM_USE_TEMPLATE_1,
+  GADGET_ID_CUSTOM_USE_TEMPLATE_2,
+  GADGET_ID_CUSTOM_USE_TEMPLATE_3,
+  GADGET_ID_CUSTOM_CAN_CHANGE,
+  GADGET_ID_CHANGE_USE_CONTENT,
+  GADGET_ID_CHANGE_USE_EXPLOSION,
+  GADGET_ID_CHANGE_ONLY_COMPLETE,
+  GADGET_ID_CHANGE_USE_RANDOM,
+  GADGET_ID_CHANGE_HAS_ACTION,
+  GADGET_ID_CHANGE_DELAY,
+  GADGET_ID_CHANGE_BY_DIRECT_ACT,
+  GADGET_ID_CHANGE_BY_OTHER_ACT,
+
+  NUM_STATIC_GADGET_IDS
+};
+
+// gadgets for buttons in element list (dynamic)
+#define GADGET_ID_ELEMENTLIST_FIRST    (NUM_STATIC_GADGET_IDS)
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define NUM_EDITOR_GADGETS             (GADGET_ID_ELEMENTLIST_LAST + 1)
 
-/* radio button numbers */
-#define RADIO_NR_NONE                  0
-#define RADIO_NR_DRAWING_TOOLBOX       1
-#define RADIO_NR_RANDOM_ELEMENTS       2
-
-/* values for counter gadgets */
-#define ED_COUNTER_ID_SELECT_LEVEL     0
-#define ED_COUNTER_ID_LEVEL_XSIZE      1
-#define ED_COUNTER_ID_LEVEL_YSIZE      2
-#define ED_COUNTER_ID_LEVEL_GEMSLIMIT  3
-#define ED_COUNTER_ID_LEVEL_TIMELIMIT  4
-#define ED_COUNTER_ID_LEVEL_TIMESCORE  5
-#define ED_COUNTER_ID_LEVEL_RANDOM_SEED        6
-#define ED_COUNTER_ID_LEVELSET_NUM_LEVELS 7
-#define ED_COUNTER_ID_LEVEL_RANDOM     8
-#define ED_COUNTER_ID_ELEMENT_VALUE1   9
-#define ED_COUNTER_ID_ELEMENT_VALUE2   10
-#define ED_COUNTER_ID_ELEMENT_VALUE3   11
-#define ED_COUNTER_ID_ELEMENT_VALUE4   12
-#define ED_COUNTER_ID_YAMYAM_CONTENT   13
-#define ED_COUNTER_ID_BALL_CONTENT     14
-#define ED_COUNTER_ID_ANDROID_CONTENT  15
-#define ED_COUNTER_ID_ENVELOPE_XSIZE   16
-#define ED_COUNTER_ID_ENVELOPE_YSIZE   17
-#define ED_COUNTER_ID_INVENTORY_SIZE   18
-#define ED_COUNTER_ID_CUSTOM_SCORE     19
-#define ED_COUNTER_ID_CUSTOM_GEMCOUNT  20
-#define ED_COUNTER_ID_CUSTOM_VALUE_FIX 21
-#define ED_COUNTER_ID_CUSTOM_VALUE_RND 22
-#define ED_COUNTER_ID_PUSH_DELAY_FIX   23
-#define ED_COUNTER_ID_PUSH_DELAY_RND   24
-#define ED_COUNTER_ID_DROP_DELAY_FIX   25
-#define ED_COUNTER_ID_DROP_DELAY_RND   26
-#define ED_COUNTER_ID_MOVE_DELAY_FIX   27
-#define ED_COUNTER_ID_MOVE_DELAY_RND   28
-#define ED_COUNTER_ID_EXPLOSION_DELAY  29
-#define ED_COUNTER_ID_IGNITION_DELAY   30
-#define ED_COUNTER_ID_GROUP_CONTENT    31
-#define ED_COUNTER_ID_CHANGE_DELAY_FIX 32
-#define ED_COUNTER_ID_CHANGE_DELAY_RND 33
-#define ED_COUNTER_ID_CHANGE_CONT_RND  34
-
-#define ED_NUM_COUNTERBUTTONS          35
+// radio button numbers
+enum
+{
+  RADIO_NR_NONE,
+  RADIO_NR_DRAWING_TOOLBOX,
+  RADIO_NR_RANDOM_ELEMENTS
+};
+
+// values for counter gadgets
+enum
+{
+  ED_COUNTER_ID_SELECT_LEVEL,
+  ED_COUNTER_ID_LEVEL_XSIZE,
+  ED_COUNTER_ID_LEVEL_YSIZE,
+  ED_COUNTER_ID_LEVEL_GEMSLIMIT,
+  ED_COUNTER_ID_LEVEL_TIMELIMIT,
+  ED_COUNTER_ID_LEVEL_TIMESCORE,
+  ED_COUNTER_ID_LEVEL_RANDOM_SEED,
+  ED_COUNTER_ID_LEVELSET_NUM_LEVELS,
+  ED_COUNTER_ID_LEVEL_RANDOM,
+  ED_COUNTER_ID_ELEMENT_VALUE1,
+  ED_COUNTER_ID_ELEMENT_VALUE2,
+  ED_COUNTER_ID_ELEMENT_VALUE3,
+  ED_COUNTER_ID_ELEMENT_VALUE4,
+  ED_COUNTER_ID_YAMYAM_CONTENT,
+  ED_COUNTER_ID_BALL_CONTENT,
+  ED_COUNTER_ID_ANDROID_CONTENT,
+  ED_COUNTER_ID_ENVELOPE_XSIZE,
+  ED_COUNTER_ID_ENVELOPE_YSIZE,
+  ED_COUNTER_ID_INVENTORY_SIZE,
+  ED_COUNTER_ID_MM_BALL_CONTENT,
+  ED_COUNTER_ID_CUSTOM_SCORE,
+  ED_COUNTER_ID_CUSTOM_GEMCOUNT,
+  ED_COUNTER_ID_CUSTOM_VALUE_FIX,
+  ED_COUNTER_ID_CUSTOM_VALUE_RND,
+  ED_COUNTER_ID_PUSH_DELAY_FIX,
+  ED_COUNTER_ID_PUSH_DELAY_RND,
+  ED_COUNTER_ID_DROP_DELAY_FIX,
+  ED_COUNTER_ID_DROP_DELAY_RND,
+  ED_COUNTER_ID_MOVE_DELAY_FIX,
+  ED_COUNTER_ID_MOVE_DELAY_RND,
+  ED_COUNTER_ID_STEP_DELAY_FIX,
+  ED_COUNTER_ID_STEP_DELAY_RND,
+  ED_COUNTER_ID_EXPLOSION_DELAY,
+  ED_COUNTER_ID_IGNITION_DELAY,
+  ED_COUNTER_ID_GROUP_CONTENT,
+  ED_COUNTER_ID_CHANGE_DELAY_FIX,
+  ED_COUNTER_ID_CHANGE_DELAY_RND,
+  ED_COUNTER_ID_CHANGE_CONT_RND,
+
+  ED_NUM_COUNTERBUTTONS
+};
 
 #define ED_COUNTER_ID_LEVEL_FIRST      ED_COUNTER_ID_LEVEL_XSIZE
 #define ED_COUNTER_ID_LEVEL_LAST       ED_COUNTER_ID_LEVEL_RANDOM_SEED
 #define ED_COUNTER_ID_CHANGE_FIRST     ED_COUNTER_ID_CHANGE_DELAY_FIX
 #define ED_COUNTER_ID_CHANGE_LAST      ED_COUNTER_ID_CHANGE_CONT_RND
 
-/* values for scrollbutton gadgets */
-#define ED_SCROLLBUTTON_ID_AREA_UP     0
-#define ED_SCROLLBUTTON_ID_AREA_DOWN   1
-#define ED_SCROLLBUTTON_ID_AREA_LEFT   2
-#define ED_SCROLLBUTTON_ID_AREA_RIGHT  3
-#define ED_SCROLLBUTTON_ID_LIST_UP     4
-#define ED_SCROLLBUTTON_ID_LIST_DOWN   5
+// values for scrollbutton gadgets
+enum
+{
+  ED_SCROLLBUTTON_ID_AREA_UP,
+  ED_SCROLLBUTTON_ID_AREA_DOWN,
+  ED_SCROLLBUTTON_ID_AREA_LEFT,
+  ED_SCROLLBUTTON_ID_AREA_RIGHT,
+  ED_SCROLLBUTTON_ID_LIST_UP,
+  ED_SCROLLBUTTON_ID_LIST_DOWN,
 
-#define ED_NUM_SCROLLBUTTONS           6
+  ED_NUM_SCROLLBUTTONS
+};
 
 #define ED_SCROLLBUTTON_ID_AREA_FIRST  ED_SCROLLBUTTON_ID_AREA_UP
 #define ED_SCROLLBUTTON_ID_AREA_LAST   ED_SCROLLBUTTON_ID_AREA_RIGHT
 
-/* values for scrollbar gadgets */
-#define ED_SCROLLBAR_ID_AREA_HORIZONTAL        0
-#define ED_SCROLLBAR_ID_AREA_VERTICAL  1
-#define ED_SCROLLBAR_ID_LIST_VERTICAL  2
+// values for scrollbar gadgets
+enum
+{
+  ED_SCROLLBAR_ID_AREA_HORIZONTAL,
+  ED_SCROLLBAR_ID_AREA_VERTICAL,
+  ED_SCROLLBAR_ID_LIST_VERTICAL,
 
-#define ED_NUM_SCROLLBARS              3
+  ED_NUM_SCROLLBARS
+};
 
 #define ED_SCROLLBAR_ID_AREA_FIRST     ED_SCROLLBAR_ID_AREA_HORIZONTAL
 #define ED_SCROLLBAR_ID_AREA_LAST      ED_SCROLLBAR_ID_AREA_VERTICAL
 
-/* values for text input gadgets */
-#define ED_TEXTINPUT_ID_LEVEL_NAME     0
-#define ED_TEXTINPUT_ID_LEVEL_AUTHOR   1
-#define ED_TEXTINPUT_ID_LEVELSET_NAME  2
-#define ED_TEXTINPUT_ID_LEVELSET_AUTHOR        3
-#define ED_TEXTINPUT_ID_ELEMENT_NAME   4
+// values for text input gadgets
+enum
+{
+  ED_TEXTINPUT_ID_LEVEL_NAME,
+  ED_TEXTINPUT_ID_LEVEL_AUTHOR,
+  ED_TEXTINPUT_ID_LEVELSET_NAME,
+  ED_TEXTINPUT_ID_LEVELSET_AUTHOR,
+  ED_TEXTINPUT_ID_ELEMENT_NAME,
 
-#define ED_NUM_TEXTINPUT               5
+  ED_NUM_TEXTINPUT
+};
 
 #define ED_TEXTINPUT_ID_LEVEL_FIRST    ED_TEXTINPUT_ID_LEVEL_NAME
 #define ED_TEXTINPUT_ID_LEVEL_LAST     ED_TEXTINPUT_ID_LEVEL_AUTHOR
 #define ED_TEXTINPUT_ID_LEVELSET_FIRST ED_TEXTINPUT_ID_LEVELSET_NAME
 #define ED_TEXTINPUT_ID_LEVELSET_LAST  ED_TEXTINPUT_ID_LEVELSET_AUTHOR
 
-/* values for text area gadgets */
-#define ED_TEXTAREA_ID_ENVELOPE_INFO   0
+// values for text area gadgets
+enum
+{
+  ED_TEXTAREA_ID_ENVELOPE_INFO,
 
-#define ED_NUM_TEXTAREAS                       1
+  ED_NUM_TEXTAREAS
+};
 
 #define ED_TEXTAREA_ID_LEVEL_FIRST     ED_TEXTAREA_ID_ENVELOPE
 #define ED_TEXTAREA_ID_LEVEL_LAST      ED_TEXTAREA_ID_ENVELOPE
 
-/* values for selectbox gadgets */
-#define ED_SELECTBOX_ID_TIME_OR_STEPS          0
-#define ED_SELECTBOX_ID_GAME_ENGINE_TYPE       1
-#define ED_SELECTBOX_ID_LEVELSET_SAVE_MODE     2
-#define ED_SELECTBOX_ID_WIND_DIRECTION         3
-#define ED_SELECTBOX_ID_PLAYER_SPEED           4
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE     5
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER    6
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED        7
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION        8
-#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION  9
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN    10
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION  11
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE   12
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 13
-#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS   14
-#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE   15
-#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS      16
-#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE  17
-#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      18
-#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION   19
-#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    20
-#define ED_SELECTBOX_ID_CHANGE_SIDE            21
-#define ED_SELECTBOX_ID_CHANGE_PLAYER          22
-#define ED_SELECTBOX_ID_CHANGE_PAGE            23
-#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN    24
-#define ED_SELECTBOX_ID_ACTION_TYPE            25
-#define ED_SELECTBOX_ID_ACTION_MODE            26
-#define ED_SELECTBOX_ID_ACTION_ARG             27
-#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE     28
-#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE      29
-
-#define ED_NUM_SELECTBOX                       30
+// values for selectbox gadgets
+enum
+{
+  ED_SELECTBOX_ID_TIME_OR_STEPS,
+  ED_SELECTBOX_ID_TIME_SCORE_BASE,
+  ED_SELECTBOX_ID_GAME_ENGINE_TYPE,
+  ED_SELECTBOX_ID_LEVELSET_SAVE_MODE,
+  ED_SELECTBOX_ID_WIND_DIRECTION,
+  ED_SELECTBOX_ID_PLAYER_SPEED,
+  ED_SELECTBOX_ID_MM_BALL_CHOICE_MODE,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION,
+  ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE,
+  ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS,
+  ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE,
+  ED_SELECTBOX_ID_CUSTOM_DEADLINESS,
+  ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE,
+  ED_SELECTBOX_ID_CHANGE_TIME_UNITS,
+  ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION,
+  ED_SELECTBOX_ID_CHANGE_OTHER_ACTION,
+  ED_SELECTBOX_ID_CHANGE_SIDE,
+  ED_SELECTBOX_ID_CHANGE_PLAYER,
+  ED_SELECTBOX_ID_CHANGE_PAGE,
+  ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN,
+  ED_SELECTBOX_ID_ACTION_TYPE,
+  ED_SELECTBOX_ID_ACTION_MODE,
+  ED_SELECTBOX_ID_ACTION_ARG,
+  ED_SELECTBOX_ID_SELECT_CHANGE_PAGE,
+  ED_SELECTBOX_ID_GROUP_CHOICE_MODE,
+
+  ED_NUM_SELECTBOX
+};
 
 #define ED_SELECTBOX_ID_LEVEL_FIRST    ED_SELECTBOX_ID_TIME_OR_STEPS
 #define ED_SELECTBOX_ID_LEVEL_LAST     ED_SELECTBOX_ID_GAME_ENGINE_TYPE
 #define ED_SELECTBOX_ID_CHANGE_FIRST   ED_SELECTBOX_ID_CHANGE_TIME_UNITS
 #define ED_SELECTBOX_ID_CHANGE_LAST    ED_SELECTBOX_ID_SELECT_CHANGE_PAGE
 
-/* values for textbutton gadgets */
-#define ED_TEXTBUTTON_ID_LEVELINFO_LEVEL       0
-#define ED_TEXTBUTTON_ID_LEVELINFO_LEVELSET    1
-#define ED_TEXTBUTTON_ID_LEVELINFO_EDITOR      2
-#define ED_TEXTBUTTON_ID_PROPERTIES_INFO       3
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG     4
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1   5
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2   6
-#define ED_TEXTBUTTON_ID_PROPERTIES_CHANGE     7
-#define ED_TEXTBUTTON_ID_SAVE_LEVELSET         8
-#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2    9
-#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1    10
-#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE       11
-#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE       12
-
-#define ED_NUM_TEXTBUTTONS                     13
-
-#define ED_TAB_BUTTON_ID_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
-#define ED_TAB_BUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
+// values for textbutton gadgets
+enum
+{
+  ED_TEXTBUTTON_ID_LEVELCONFIG_LEVEL,
+  ED_TEXTBUTTON_ID_LEVELCONFIG_LEVELSET,
+  ED_TEXTBUTTON_ID_LEVELCONFIG_EDITOR,
+  ED_TEXTBUTTON_ID_PROPERTIES_INFO,
+  ED_TEXTBUTTON_ID_PROPERTIES_CONFIG,
+  ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1,
+  ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2,
+  ED_TEXTBUTTON_ID_PROPERTIES_CHANGE,
+  ED_TEXTBUTTON_ID_SAVE_LEVELSET,
+  ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2,
+  ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1,
+  ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE,
+  ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE,
+
+  ED_NUM_TEXTBUTTONS
+};
+
+#define ED_TAB_BUTTON_ID_LEVELCONFIG_FIRST ED_TEXTBUTTON_ID_LEVELCONFIG_LEVEL
+#define ED_TAB_BUTTON_ID_LEVELCONFIG_LAST  ED_TEXTBUTTON_ID_LEVELCONFIG_EDITOR
 
 #define ED_TAB_BUTTON_ID_PROPERTIES_FIRST ED_TEXTBUTTON_ID_PROPERTIES_INFO
 #define ED_TAB_BUTTON_ID_PROPERTIES_LAST  ED_TEXTBUTTON_ID_PROPERTIES_CHANGE
 #define ED_TEXTBUTTON_ID_CHANGE_FIRST  ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE
 #define ED_TEXTBUTTON_ID_CHANGE_LAST   ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE
 
-/* values for graphicbutton gadgets */
-#define ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE   0
-#define ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE   1
-#define ED_GRAPHICBUTTON_ID_COPY_CHANGE_PAGE   2
-#define ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE  3
+// values for graphicbutton gadgets
+enum
+{
+  ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE,
+  ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE,
+  ED_GRAPHICBUTTON_ID_COPY_CHANGE_PAGE,
+  ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE,
 
-#define ED_NUM_GRAPHICBUTTONS                  4
+  ED_NUM_GRAPHICBUTTONS
+};
 
 #define ED_GRAPHICBUTTON_ID_CHANGE_FIRST  ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE
 #define ED_GRAPHICBUTTON_ID_CHANGE_LAST   ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE
 
-/* values for checkbutton gadgets */
-#define ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS      0
-#define ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK 1
-#define ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE  2
-#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    3
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3        4
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2        5
-#define ED_CHECKBUTTON_ID_STICK_ELEMENT                6
-#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     7
-#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  8
-#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       9
-#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     10
-#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  11
-#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   12
-#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   13
-#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN    14
-#define ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER 15
-#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  16
-#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     17
-#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     18
-#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  19
-#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   20
-#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   21
-#define ED_CHECKBUTTON_ID_LAZY_RELOCATION      22
-#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    23
-#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  24
-#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        25
-#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      26
-#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        27
-#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 28
-#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   29
-#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   30
-#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    31
-#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    32
-#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    33
-#define ED_CHECKBUTTON_ID_MM_LASER_RED         34
-#define ED_CHECKBUTTON_ID_MM_LASER_GREEN       35
-#define ED_CHECKBUTTON_ID_MM_LASER_BLUE                36
-#define ED_CHECKBUTTON_ID_DF_LASER_RED         37
-#define ED_CHECKBUTTON_ID_DF_LASER_GREEN       38
-#define ED_CHECKBUTTON_ID_DF_LASER_BLUE                39
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   40
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1        41
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    42
-#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        43
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        44
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        45
-#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        46
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      47
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      48
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     49
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      50
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                51
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   52
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  53
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 54
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        55
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    56
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         57
-#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 58
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  59
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 60
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   61
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 62
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    63
-#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    64
-
-#define ED_NUM_CHECKBUTTONS                    65
+// values for checkbutton gadgets
+enum
+{
+  ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS,
+  ED_CHECKBUTTON_ID_RATE_TIME_OVER_SCORE,
+  ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK,
+  ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE,
+  ED_CHECKBUTTON_ID_RANDOM_RESTRICTED,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2,
+  ED_CHECKBUTTON_ID_STICK_ELEMENT,
+  ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS,
+  ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE,
+  ED_CHECKBUTTON_ID_USE_SPRING_BUG,
+  ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG,
+  ED_CHECKBUTTON_ID_USE_LIFE_BUGS,
+  ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT,
+  ED_CHECKBUTTON_ID_INITIAL_BALL_ACTIVE,
+  ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE,
+  ED_CHECKBUTTON_ID_SB_FIELDS_NEEDED,
+  ED_CHECKBUTTON_ID_SB_OBJECTS_NEEDED,
+  ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN,
+  ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER,
+  ED_CHECKBUTTON_ID_FINISH_DIG_COLLECT,
+  ED_CHECKBUTTON_ID_KEEP_WALKABLE_CE,
+  ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING,
+  ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD,
+  ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD,
+  ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD,
+  ED_CHECKBUTTON_ID_INSTANT_RELOCATION,
+  ED_CHECKBUTTON_ID_SHIFTED_RELOCATION,
+  ED_CHECKBUTTON_ID_LAZY_RELOCATION,
+  ED_CHECKBUTTON_ID_USE_START_ELEMENT,
+  ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT,
+  ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT,
+  ED_CHECKBUTTON_ID_INITIAL_GRAVITY,
+  ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY,
+  ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE,
+  ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID,
+  ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID,
+  ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH,
+  ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP,
+  ED_CHECKBUTTON_ID_ENVELOPE_CENTERED,
+  ED_CHECKBUTTON_ID_MM_LASER_RED,
+  ED_CHECKBUTTON_ID_MM_LASER_GREEN,
+  ED_CHECKBUTTON_ID_MM_LASER_BLUE,
+  ED_CHECKBUTTON_ID_DF_LASER_RED,
+  ED_CHECKBUTTON_ID_DF_LASER_GREEN,
+  ED_CHECKBUTTON_ID_DF_LASER_BLUE,
+  ED_CHECKBUTTON_ID_ROTATE_MM_BALL_CONTENT,
+  ED_CHECKBUTTON_ID_EXPLODE_MM_BALL,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1,
+  ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE,
+  ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE,
+  ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT,
+  ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH,
+  ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY,
+  ED_CHECKBUTTON_ID_CUSTOM_DEADLY,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE,
+  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE,
+  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH,
+  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE,
+  ED_CHECKBUTTON_ID_CHANGE_DELAY,
+  ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT,
+  ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT,
+  ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION,
+  ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT,
+  ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE,
+  ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM,
+  ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION,
+
+  ED_NUM_CHECKBUTTONS
+};
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST  ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS
-#define ED_CHECKBUTTON_ID_LEVEL_LAST   ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS
+#define ED_CHECKBUTTON_ID_LEVEL_LAST   ED_CHECKBUTTON_ID_RATE_TIME_OVER_SCORE
 
 #define ED_CHECKBUTTON_ID_LEVELSET_FIRST ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK
 #define ED_CHECKBUTTON_ID_LEVELSET_LAST         ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE
 #define ED_CHECKBUTTON_ID_CHANGE_FIRST ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE
 #define ED_CHECKBUTTON_ID_CHANGE_LAST  ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION
 
-/* values for radiobutton gadgets */
-#define ED_RADIOBUTTON_ID_PERCENTAGE   0
-#define ED_RADIOBUTTON_ID_QUANTITY     1
+// values for radiobutton gadgets
+enum
+{
+  ED_RADIOBUTTON_ID_PERCENTAGE,
+  ED_RADIOBUTTON_ID_QUANTITY,
 
-#define ED_NUM_RADIOBUTTONS            2
+  ED_NUM_RADIOBUTTONS
+};
 
 #define ED_RADIOBUTTON_ID_EDITOR_FIRST ED_RADIOBUTTON_ID_PERCENTAGE
 #define ED_RADIOBUTTON_ID_EDITOR_LAST  ED_RADIOBUTTON_ID_QUANTITY
 
-/* values for drawing area gadgets */
-#define ED_DRAWING_ID_DRAWING_LEVEL            0
-#define ED_DRAWING_ID_YAMYAM_CONTENT_0         1
-#define ED_DRAWING_ID_YAMYAM_CONTENT_1         2
-#define ED_DRAWING_ID_YAMYAM_CONTENT_2         3
-#define ED_DRAWING_ID_YAMYAM_CONTENT_3         4
-#define ED_DRAWING_ID_YAMYAM_CONTENT_4         5
-#define ED_DRAWING_ID_YAMYAM_CONTENT_5         6
-#define ED_DRAWING_ID_YAMYAM_CONTENT_6         7
-#define ED_DRAWING_ID_YAMYAM_CONTENT_7         8
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_0     9
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_1     10
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_2     11
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_3     12
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_4     13
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_5     14
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_6     15
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_7     16
-#define ED_DRAWING_ID_ANDROID_CONTENT          17
-#define ED_DRAWING_ID_AMOEBA_CONTENT           18
-#define ED_DRAWING_ID_START_ELEMENT            19
-#define ED_DRAWING_ID_ARTWORK_ELEMENT          20
-#define ED_DRAWING_ID_EXPLOSION_ELEMENT                21
-#define ED_DRAWING_ID_INVENTORY_CONTENT                22
-#define ED_DRAWING_ID_CUSTOM_GRAPHIC           23
-#define ED_DRAWING_ID_CUSTOM_CONTENT           24
-#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER                25
-#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE                26
-#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET     27
-#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT    28
-#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER    29
-#define ED_DRAWING_ID_CUSTOM_CHANGE_ACTION     30
-#define ED_DRAWING_ID_GROUP_CONTENT            31
-#define ED_DRAWING_ID_RANDOM_BACKGROUND                32
-
-#define ED_NUM_DRAWING_AREAS                   33
+// values for drawing area gadgets
+enum
+{
+  ED_DRAWING_ID_DRAWING_LEVEL,
+  ED_DRAWING_ID_YAMYAM_CONTENT_0,
+  ED_DRAWING_ID_YAMYAM_CONTENT_1,
+  ED_DRAWING_ID_YAMYAM_CONTENT_2,
+  ED_DRAWING_ID_YAMYAM_CONTENT_3,
+  ED_DRAWING_ID_YAMYAM_CONTENT_4,
+  ED_DRAWING_ID_YAMYAM_CONTENT_5,
+  ED_DRAWING_ID_YAMYAM_CONTENT_6,
+  ED_DRAWING_ID_YAMYAM_CONTENT_7,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_0,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_1,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_2,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_3,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_4,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_5,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_6,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_7,
+  ED_DRAWING_ID_ANDROID_CONTENT,
+  ED_DRAWING_ID_AMOEBA_CONTENT,
+  ED_DRAWING_ID_START_ELEMENT,
+  ED_DRAWING_ID_ARTWORK_ELEMENT,
+  ED_DRAWING_ID_EXPLOSION_ELEMENT,
+  ED_DRAWING_ID_INVENTORY_CONTENT,
+  ED_DRAWING_ID_MM_BALL_CONTENT,
+  ED_DRAWING_ID_CUSTOM_GRAPHIC,
+  ED_DRAWING_ID_CUSTOM_CONTENT,
+  ED_DRAWING_ID_CUSTOM_MOVE_ENTER,
+  ED_DRAWING_ID_CUSTOM_MOVE_LEAVE,
+  ED_DRAWING_ID_CUSTOM_CHANGE_TARGET,
+  ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT,
+  ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER,
+  ED_DRAWING_ID_CUSTOM_CHANGE_ACTION,
+  ED_DRAWING_ID_GROUP_CONTENT,
+  ED_DRAWING_ID_RANDOM_BACKGROUND,
+
+  ED_NUM_DRAWING_AREAS
+};
 
 #define ED_DRAWING_ID_EDITOR_FIRST     ED_DRAWING_ID_RANDOM_BACKGROUND
 #define ED_DRAWING_ID_EDITOR_LAST      ED_DRAWING_ID_RANDOM_BACKGROUND
 
 
-/*
-  -----------------------------------------------------------------------------
-  some internally used definitions
-  -----------------------------------------------------------------------------
-*/
+// ----------------------------------------------------------------------------
+// some internally used definitions
+// ----------------------------------------------------------------------------
 
-/* values for CopyLevelToUndoBuffer() */
+// values for CopyLevelToUndoBuffer()
 #define UNDO_IMMEDIATE                 0
 #define UNDO_ACCUMULATE                        1
 
-/* values for scrollbars */
+// values for scrollbars
 #define ED_SCROLL_NO                   0
 #define ED_SCROLL_LEFT                 1
 #define ED_SCROLL_RIGHT                        2
 #define ED_SCROLL_UP                   4
 #define ED_SCROLL_DOWN                 8
 
-/* screens in the level editor */
+// screens in the level editor
 #define ED_MODE_DRAWING                        0
-#define ED_MODE_INFO                   1
+#define ED_MODE_LEVELCONFIG            1
 #define ED_MODE_PROPERTIES             2
 #define ED_MODE_PALETTE                        3
 
-/* sub-screens in the global settings section */
-#define ED_MODE_LEVELINFO_LEVEL                ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
-#define ED_MODE_LEVELINFO_LEVELSET     ED_TEXTBUTTON_ID_LEVELINFO_LEVELSET
-#define ED_MODE_LEVELINFO_EDITOR       ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
+// sub-screens in the global settings section
+#define ED_MODE_LEVELCONFIG_LEVEL      ED_TEXTBUTTON_ID_LEVELCONFIG_LEVEL
+#define ED_MODE_LEVELCONFIG_LEVELSET   ED_TEXTBUTTON_ID_LEVELCONFIG_LEVELSET
+#define ED_MODE_LEVELCONFIG_EDITOR     ED_TEXTBUTTON_ID_LEVELCONFIG_EDITOR
 
-/* sub-screens in the element properties section */
+// sub-screens in the element properties section
 #define ED_MODE_PROPERTIES_INFO                ED_TEXTBUTTON_ID_PROPERTIES_INFO
 #define ED_MODE_PROPERTIES_CONFIG      ED_TEXTBUTTON_ID_PROPERTIES_CONFIG
 #define ED_MODE_PROPERTIES_CONFIG_1    ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1
 #define ED_MODE_PROPERTIES_CONFIG_2    ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2
 #define ED_MODE_PROPERTIES_CHANGE      ED_TEXTBUTTON_ID_PROPERTIES_CHANGE
 
-/* how many steps can be cancelled */
+// how many steps can be cancelled
 #define NUM_UNDO_STEPS                 (64 + 1)
 
-/* values for elements with score for certain actions */
+// values for elements with score for certain actions
 #define MIN_SCORE                      0
 #define MAX_SCORE                      999
 
-/* values for elements with count for collecting */
+// values for elements with count for collecting
 #define MIN_COLLECT_COUNT              0
 #define MAX_COLLECT_COUNT              999
 
-/* values for random placement */
+// values for random placement
 #define RANDOM_USE_PERCENTAGE          0
 #define RANDOM_USE_QUANTITY            1
 
-/* values for level set save mode */
+// values for level set save mode
 #define LEVELSET_SAVE_MODE_UPDATE      0
 #define LEVELSET_SAVE_MODE_CREATE      1
 
-/* default value for element tile size in drawing area */
+// default value for element tile size in drawing area
 #define DEFAULT_EDITOR_TILESIZE                MINI_TILESIZE
 #define DEFAULT_EDITOR_TILESIZE_MM     TILESIZE
 
 
-/*
-  -----------------------------------------------------------------------------
-  some internally used data structure definitions
-  -----------------------------------------------------------------------------
-*/
+// ----------------------------------------------------------------------------
+// some internally used data structure definitions
+// ----------------------------------------------------------------------------
 
 static struct
 {
@@ -1121,10 +1180,10 @@ static struct
   char shortcut;
 } controlbutton_info[ED_NUM_CTRL_BUTTONS] =
 {
-  /* note: some additional characters are already reserved for "cheat mode"
-     shortcuts (":XYZ" style) -- for details, see "events.c" */
+  // note: some additional characters are already reserved for "cheat mode"
+  // shortcuts (":XYZ" style) -- for details, see "events.c"
 
-  /* ---------- toolbox control buttons ------------------------------------ */
+  // ---------- toolbox control buttons ---------------------------------------
 
   {
     IMG_GFX_EDITOR_BUTTON_DRAW_SINGLE,         GADGET_ID_SINGLE_ITEMS,
@@ -1207,7 +1266,7 @@ static struct
     "pick drawing element",                    ','
   },
 
-  /* ---------- level control buttons -------------------------------------- */
+  // ---------- level control buttons -----------------------------------------
 
   {
     IMG_GFX_EDITOR_BUTTON_UNDO,                        GADGET_ID_UNDO,
@@ -1215,9 +1274,9 @@ static struct
     "undo/redo last operation",                        'u'
   },
   {
-    IMG_GFX_EDITOR_BUTTON_CONF,                        GADGET_ID_INFO,
+    IMG_GFX_EDITOR_BUTTON_CONF,                        GADGET_ID_CONF,
     &editor.button.conf,                       GD_TYPE_NORMAL_BUTTON,
-    "properties of level",                     'I'
+    "level and editor settings",               'I'
   },
   {
     IMG_GFX_EDITOR_BUTTON_SAVE,                        GADGET_ID_SAVE,
@@ -1240,7 +1299,7 @@ static struct
     "exit level editor",                       'E'
   },
 
-  /* ---------- CE and GE control buttons ---------------------------------- */
+  // ---------- CE and GE control buttons -------------------------------------
 
   {
     IMG_GFX_EDITOR_BUTTON_CE_COPY_FROM,                GADGET_ID_CUSTOM_COPY_FROM,
@@ -1268,7 +1327,7 @@ static struct
     "paste settings to this element",          0
   },
 
-  /* ---------- palette control buttons ------------------------------------ */
+  // ---------- palette control buttons ---------------------------------------
 
   {
     IMG_GFX_EDITOR_BUTTON_PROPERTIES,          GADGET_ID_PROPERTIES,
@@ -1326,10 +1385,10 @@ static struct
   char *text_above, *text_left, *text_right;
 } counterbutton_info[ED_NUM_COUNTERBUTTONS] =
 {
-  /* ---------- current level number --------------------------------------- */
+  // ---------- current level number ------------------------------------------
 
   {
-    -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,                                 100,
     GADGET_ID_SELECT_LEVEL_DOWN,       GADGET_ID_SELECT_LEVEL_UP,
     GADGET_ID_SELECT_LEVEL_TEXT,       GADGET_ID_NONE,
@@ -1337,7 +1396,7 @@ static struct
     NULL,                              NULL, NULL
   },
 
-  /* ---------- level and editor settings ---------------------------------- */
+  // ---------- level and editor settings -------------------------------------
 
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(4),
@@ -1377,10 +1436,10 @@ static struct
     GADGET_ID_LEVEL_TIMESCORE_DOWN,    GADGET_ID_LEVEL_TIMESCORE_UP,
     GADGET_ID_LEVEL_TIMESCORE_TEXT,    GADGET_ID_NONE,
     &level.score[SC_TIME_BONUS],
-    "score for each second/step left:",        NULL, NULL
+    "score for time or steps left:",   NULL, NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(12),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(13),
     0,                                 9999,
     GADGET_ID_LEVEL_RANDOM_SEED_DOWN,  GADGET_ID_LEVEL_RANDOM_SEED_UP,
     GADGET_ID_LEVEL_RANDOM_SEED_TEXT,  GADGET_ID_NONE,
@@ -1404,14 +1463,14 @@ static struct
     "random element placement:",       NULL, "in"
   },
 
-  /* ---------- element settings: configure (various elements) ------------- */
+  // ---------- element settings: configure (various elements) ----------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_ELEMENT_VALUE1_DOWN,     GADGET_ID_ELEMENT_VALUE1_UP,
     GADGET_ID_ELEMENT_VALUE1_TEXT,     GADGET_ID_NONE,
-    NULL,                              /* will be set when used */
+    NULL,                              // will be set when used
     NULL,                              NULL, NULL
   },
   {
@@ -1419,7 +1478,7 @@ static struct
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_ELEMENT_VALUE2_DOWN,     GADGET_ID_ELEMENT_VALUE2_UP,
     GADGET_ID_ELEMENT_VALUE2_TEXT,     GADGET_ID_NONE,
-    NULL,                              /* will be set when used */
+    NULL,                              // will be set when used
     NULL,                              NULL, NULL
   },
   {
@@ -1427,7 +1486,7 @@ static struct
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_ELEMENT_VALUE3_DOWN,     GADGET_ID_ELEMENT_VALUE3_UP,
     GADGET_ID_ELEMENT_VALUE3_TEXT,     GADGET_ID_NONE,
-    NULL,                              /* will be set when used */
+    NULL,                              // will be set when used
     NULL,                              NULL, NULL
   },
   {
@@ -1435,7 +1494,7 @@ static struct
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_ELEMENT_VALUE4_DOWN,     GADGET_ID_ELEMENT_VALUE4_UP,
     GADGET_ID_ELEMENT_VALUE4_TEXT,     GADGET_ID_NONE,
-    NULL,                              /* will be set when used */
+    NULL,                              // will be set when used
     NULL,                              NULL, NULL
   },
   {
@@ -1467,7 +1526,7 @@ static struct
     MIN_ENVELOPE_XSIZE,                        MAX_ENVELOPE_XSIZE,
     GADGET_ID_ENVELOPE_XSIZE_DOWN,     GADGET_ID_ENVELOPE_XSIZE_UP,
     GADGET_ID_ENVELOPE_XSIZE_TEXT,     GADGET_ID_NONE,
-    NULL,                              /* will be set when used */
+    NULL,                              // will be set when used
     NULL,                              NULL, "width",
   },
   {
@@ -1475,7 +1534,7 @@ static struct
     MIN_ENVELOPE_YSIZE,                        MAX_ENVELOPE_YSIZE,
     GADGET_ID_ENVELOPE_YSIZE_DOWN,     GADGET_ID_ENVELOPE_YSIZE_UP,
     GADGET_ID_ENVELOPE_YSIZE_TEXT,     GADGET_ID_ENVELOPE_XSIZE_UP,
-    NULL,                              /* will be set when used */
+    NULL,                              // will be set when used
     NULL,                              " ", "height",
   },
   {
@@ -1486,8 +1545,16 @@ static struct
     &level.initial_inventory_size[0],
     NULL,                              NULL, "number of inventory elements"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(3),
+    MIN_ELEMENTS_IN_GROUP,             MAX_MM_BALL_CONTENTS,
+    GADGET_ID_MM_BALL_CONTENT_DOWN,    GADGET_ID_MM_BALL_CONTENT_UP,
+    GADGET_ID_MM_BALL_CONTENT_TEXT,    GADGET_ID_NONE,
+    &level.num_mm_ball_contents,
+    NULL,                              NULL, "number of content elements"
+  },
 
-  /* ---------- element settings: configure 1 (custom elements) ------------ */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(5),
@@ -1554,7 +1621,7 @@ static struct
     NULL,                              "+random", NULL
   },
 
-  /* ---------- element settings: configure 2 (custom elements) ------------ */
+  // ---------- element settings: configure 2 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(5),
@@ -1573,7 +1640,23 @@ static struct
     NULL,                              "+random", NULL
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(12),
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(6),
+    0,                                 999,
+    GADGET_ID_STEP_DELAY_FIX_DOWN,     GADGET_ID_STEP_DELAY_FIX_UP,
+    GADGET_ID_STEP_DELAY_FIX_TEXT,     GADGET_ID_NONE,
+    &custom_element.step_delay_fixed,
+    NULL,                              "step delay", NULL
+  },
+  {
+    -1,                                        ED_ELEMENT_SETTINGS_YPOS(6),
+    0,                                 999,
+    GADGET_ID_STEP_DELAY_RND_DOWN,     GADGET_ID_STEP_DELAY_RND_UP,
+    GADGET_ID_STEP_DELAY_RND_TEXT,     GADGET_ID_STEP_DELAY_FIX_UP,
+    &custom_element.step_delay_random,
+    NULL,                              "+random", NULL
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(13),
     0,                                 999,
     GADGET_ID_EXPLOSION_DELAY_DOWN,    GADGET_ID_EXPLOSION_DELAY_UP,
     GADGET_ID_EXPLOSION_DELAY_TEXT,    GADGET_ID_NONE,
@@ -1581,7 +1664,7 @@ static struct
     NULL,                              "explosion delay", NULL
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(13),
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(14),
     0,                                 999,
     GADGET_ID_IGNITION_DELAY_DOWN,     GADGET_ID_IGNITION_DELAY_UP,
     GADGET_ID_IGNITION_DELAY_TEXT,     GADGET_ID_NONE,
@@ -1589,7 +1672,7 @@ static struct
     NULL,                              "ignition delay", "(by fire)"
   },
 
-  /* ---------- element settings: configure (group elements) --------------- */
+  // ---------- element settings: configure (group elements) ------------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(3),
@@ -1600,7 +1683,7 @@ static struct
     NULL,                              NULL, "number of elements in group"
   },
 
-  /* ---------- element settings: advanced (custom elements) --------------- */
+  // ---------- element settings: advanced (custom elements) ------------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(2),
@@ -1666,9 +1749,9 @@ static struct
     "Author:", "Author for this or new level set"
   },
   {
-    -1, -1,    /* these values are not constant, but can change at runtime */
+    -1, -1,    // these values are not constant, but can change at runtime
     GADGET_ID_ELEMENT_NAME,
-    MAX_ELEMENT_NAME_LEN - 2,          /* currently 2 chars less editable */
+    MAX_ELEMENT_NAME_LEN - 2,          // currently 2 chars less editable
     custom_element.description,
     NULL, "Element name"
   }
@@ -1680,7 +1763,7 @@ static struct
   int gadget_id;
   int xsize, ysize;
   char *value;
-  char *text_above, *infotext;
+  char *text_above, *text_above_cropped, *infotext;
 } textarea_info[ED_NUM_TEXTAREAS] =
 {
   {
@@ -1688,7 +1771,7 @@ static struct
     GADGET_ID_ENVELOPE_INFO,
     MAX_ENVELOPE_XSIZE, MAX_ENVELOPE_YSIZE,
     NULL,
-    "Envelope Content:", "Envelope Content"
+    "Envelope Content:", "Envelope Content (cropped):", "Envelope Content"
   }
 };
 
@@ -1700,6 +1783,14 @@ static struct ValueTextInfo options_time_or_steps[] =
   { -1,                                NULL                            }
 };
 
+static struct ValueTextInfo options_time_score_base[] =
+{
+  { 1,                         "per second/step"               },
+  { 10,                                "per 10 seconds/steps"          },
+
+  { -1,                                NULL                            }
+};
+
 static struct ValueTextInfo options_game_engine_type[] =
 {
   { GAME_ENGINE_TYPE_RND,      "Rocks'n'Diamonds"              },
@@ -1934,6 +2025,13 @@ static struct ValueTextInfo options_change_direct_action[] =
 #endif
   { CE_VALUE_GETS_ZERO,                "CE value gets 0"               },
   { CE_SCORE_GETS_ZERO,                "CE score gets 0"               },
+  { CE_UNDEFINED,              " "                             },
+  { CE_HEADLINE_SPECIAL_EVENTS,        "[mouse events]"                },
+  { CE_CLICKED_BY_MOUSE,       "clicked by mouse"              },
+  { CE_PRESSED_BY_MOUSE,       "pressed by mouse"              },
+  { CE_UNDEFINED,              " "                             },
+  { CE_HEADLINE_SPECIAL_EVENTS,        "[static states]"               },
+  { CE_NEXT_TO_PLAYER,         "next to player"                },
 
   { -1,                                NULL                            }
 };
@@ -1963,6 +2061,14 @@ static struct ValueTextInfo options_change_other_action[] =
   { CE_SCORE_CHANGES_OF_X,     "CE score changes of"           },
   { CE_VALUE_GETS_ZERO_OF_X,   "CE value gets 0 of"            },
   { CE_SCORE_GETS_ZERO_OF_X,   "CE score gets 0 of"            },
+  { CE_UNDEFINED,              " "                             },
+  { CE_HEADLINE_SPECIAL_EVENTS,        "[mouse events]"                },
+  { CE_MOUSE_CLICKED_ON_X,     "mouse clicked on"              },
+  { CE_MOUSE_PRESSED_ON_X,     "mouse pressed on"              },
+  { CE_UNDEFINED,              " "                             },
+  { CE_HEADLINE_SPECIAL_EVENTS,        "[static states]"               },
+  { CE_PLAYER_NEXT_TO_X,       "player next to"                },
+  { CE_NEXT_TO_X,              "next to"                       },
 
   { -1,                                NULL                            }
 };
@@ -1993,38 +2099,38 @@ static struct ValueTextInfo options_change_trigger_player[] =
 
 static struct ValueTextInfo options_change_trigger_page[] =
 {
-  { (1 << 0),                  "1"                             },
-  { (1 << 1),                  "2"                             },
-  { (1 << 2),                  "3"                             },
-  { (1 << 3),                  "4"                             },
-  { (1 << 4),                  "5"                             },
-  { (1 << 5),                  "6"                             },
-  { (1 << 6),                  "7"                             },
-  { (1 << 7),                  "8"                             },
-  { (1 << 8),                  "9"                             },
-  { (1 << 9),                  "10"                            },
-  { (1 << 10),                 "11"                            },
-  { (1 << 11),                 "12"                            },
-  { (1 << 12),                 "13"                            },
-  { (1 << 13),                 "14"                            },
-  { (1 << 14),                 "15"                            },
-  { (1 << 15),                 "16"                            },
-  { (1 << 16),                 "17"                            },
-  { (1 << 17),                 "18"                            },
-  { (1 << 18),                 "19"                            },
-  { (1 << 19),                 "20"                            },
-  { (1 << 20),                 "21"                            },
-  { (1 << 21),                 "22"                            },
-  { (1 << 22),                 "23"                            },
-  { (1 << 23),                 "24"                            },
-  { (1 << 24),                 "25"                            },
-  { (1 << 25),                 "26"                            },
-  { (1 << 26),                 "27"                            },
-  { (1 << 27),                 "28"                            },
-  { (1 << 28),                 "29"                            },
-  { (1 << 29),                 "30"                            },
-  { (1 << 30),                 "31"                            },
-  { (1 << 31),                 "32"                            },
+  { (1u << 0),                 "1"                             },
+  { (1u << 1),                 "2"                             },
+  { (1u << 2),                 "3"                             },
+  { (1u << 3),                 "4"                             },
+  { (1u << 4),                 "5"                             },
+  { (1u << 5),                 "6"                             },
+  { (1u << 6),                 "7"                             },
+  { (1u << 7),                 "8"                             },
+  { (1u << 8),                 "9"                             },
+  { (1u << 9),                 "10"                            },
+  { (1u << 10),                        "11"                            },
+  { (1u << 11),                        "12"                            },
+  { (1u << 12),                        "13"                            },
+  { (1u << 13),                        "14"                            },
+  { (1u << 14),                        "15"                            },
+  { (1u << 15),                        "16"                            },
+  { (1u << 16),                        "17"                            },
+  { (1u << 17),                        "18"                            },
+  { (1u << 18),                        "19"                            },
+  { (1u << 19),                        "20"                            },
+  { (1u << 20),                        "21"                            },
+  { (1u << 21),                        "22"                            },
+  { (1u << 22),                        "23"                            },
+  { (1u << 23),                        "24"                            },
+  { (1u << 24),                        "25"                            },
+  { (1u << 25),                        "26"                            },
+  { (1u << 26),                        "27"                            },
+  { (1u << 27),                        "28"                            },
+  { (1u << 28),                        "29"                            },
+  { (1u << 29),                        "30"                            },
+  { (1u << 30),                        "31"                            },
+  { (1u << 31),                        "32"                            },
   { CH_PAGE_ANY,               "any"                           },
 
   { -1,                                NULL                            }
@@ -2053,10 +2159,11 @@ static struct ValueTextInfo options_action_type[] =
   { CA_SET_LEVEL_SCORE,                "set score"                     },
   { CA_SET_LEVEL_GEMS,         "set gems"                      },
   { CA_SET_LEVEL_WIND,         "set wind dir."                 },
-  { CA_SET_LEVEL_RANDOM_SEED,  "set rand. seed"                },
+  { CA_SET_LEVEL_RANDOM_SEED,  "set random seed"               },
   { CA_UNDEFINED,              " "                             },
   { CA_HEADLINE_PLAYER_ACTIONS,        "[player]"                      },
   { CA_MOVE_PLAYER,            "move player"                   },
+  { CA_MOVE_PLAYER_NEW,                "move player new"               },
   { CA_EXIT_PLAYER,            "exit player"                   },
   { CA_KILL_PLAYER,            "kill player"                   },
   { CA_SET_PLAYER_KEYS,                "set keys"                      },
@@ -2358,6 +2465,7 @@ static struct ValueTextInfo options_group_choice_mode[] =
   { ANIM_LINEAR,               "linear"                        },
   { ANIM_PINGPONG,             "pingpong"                      },
   { ANIM_PINGPONG2,            "pingpong 2"                    },
+  { ANIM_LEVEL_NR,             "level number"                  },
 
   { -1,                                NULL                            }
 };
@@ -2382,6 +2490,7 @@ action_arg_options[] =
   { CA_EXIT_PLAYER,            0,      options_action_arg_player,      },
   { CA_KILL_PLAYER,            0,      options_action_arg_player,      },
   { CA_MOVE_PLAYER,            0,      options_action_arg_direction,   },
+  { CA_MOVE_PLAYER_NEW,                0,      options_action_arg_direction,   },
   { CA_RESTART_LEVEL,          0,      options_action_arg_none,        },
   { CA_SHOW_ENVELOPE,          0,      options_action_arg_envelope,    },
   { CA_SET_LEVEL_TIME,         3,      options_action_arg_number,      },
@@ -2408,13 +2517,13 @@ static struct
   int x, y;
   int gadget_id;
   int gadget_id_align;
-  int size;    /* char size of selectbox or '-1' (dynamically determined) */
+  int size;    // char size of selectbox or '-1' (dynamically determined)
   struct ValueTextInfo *options;
   int *value;
   char *text_above, *text_left, *text_right, *infotext;
 } selectbox_info[ED_NUM_SELECTBOX] =
 {
-  /* ---------- level and editor settings ---------------------------------- */
+  // ---------- level and editor settings -------------------------------------
 
   {
     -1,                                        ED_LEVEL_SETTINGS_YPOS(8),
@@ -2425,7 +2534,15 @@ static struct
     NULL, NULL, "(0 => no limit)",     "time or step limit"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(11),
+    -1,                                        ED_LEVEL_SETTINGS_YPOS(10),
+    GADGET_ID_TIME_SCORE_BASE,         GADGET_ID_LEVEL_TIMESCORE_UP,
+    -1,
+    options_time_score_base,
+    &level.time_score_base,
+    NULL, NULL, NULL,                  "time score for 1 or 10 seconds/steps"
+  },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(12),
     GADGET_ID_GAME_ENGINE_TYPE,                GADGET_ID_NONE,
     -1,
     options_game_engine_type,
@@ -2441,7 +2558,7 @@ static struct
     "Action:", NULL, NULL,             "action when saving level set"
   },
 
-  /* ---------- element settings: configure (several elements) ------------- */
+  // ---------- element settings: configure (several elements) ----------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
@@ -2459,8 +2576,16 @@ static struct
     &level.initial_player_stepsize[0],
     NULL, "initial player speed:", NULL,       "initial player speed"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(4),
+    GADGET_ID_MM_BALL_CHOICE_MODE,     GADGET_ID_NONE,
+    -1,
+    options_group_choice_mode,
+    &level.mm_ball_choice_mode,
+    NULL, "choice type:", NULL,                "type of content choice"
+  },
 
-  /* ---------- element settings: configure 1 (custom elements) ------------ */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(2),
@@ -2503,7 +2628,7 @@ static struct
     NULL, NULL, NULL,                  "diggable/collectible/pushable"
   },
 
-  /* ---------- element settings: configure 2 (custom elements) ------------ */
+  // ---------- element settings: configure 2 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(1),
@@ -2541,7 +2666,7 @@ static struct
     NULL, "            can", ":",      "leave behind or change element"
   },
   {
-    -1,                                        ED_ELEMENT_SETTINGS_YPOS(7),
+    -1,                                        ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_CUSTOM_SMASH_TARGETS,    GADGET_ID_CUSTOM_CAN_SMASH,
     -1,
     options_smash_targets,
@@ -2549,7 +2674,7 @@ static struct
     NULL, "can smash", NULL,           "elements that can be smashed"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(8),
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CUSTOM_SLIPPERY_TYPE,    GADGET_ID_NONE,
     -1,
     options_slippery_type,
@@ -2557,7 +2682,7 @@ static struct
     NULL, "slippery", NULL,            "where other elements fall down"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(9),
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(10),
     GADGET_ID_CUSTOM_DEADLINESS,       GADGET_ID_NONE,
     -1,
     options_deadliness,
@@ -2565,7 +2690,7 @@ static struct
     NULL, "deadly when", NULL,         "deadliness of element"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(10),
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_EXPLOSION_TYPE,   GADGET_ID_NONE,
     -1,
     options_explosion_type,
@@ -2573,7 +2698,7 @@ static struct
     NULL, "can explode", NULL,         "explosion type"
   },
 
-  /* ---------- element settings: advanced (custom elements) --------------- */
+  // ---------- element settings: advanced (custom elements) ------------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(3),
@@ -2634,7 +2759,7 @@ static struct
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(13),
     GADGET_ID_ACTION_TYPE,             GADGET_ID_NONE,
-    -1,
+    15,
     options_action_type,
     &custom_element_change.action_type,
     NULL, NULL, NULL,                  "action on specified condition"
@@ -2664,7 +2789,7 @@ static struct
     NULL, NULL, NULL,                  "element change page"
   },
 
-  /* ---------- element settings: configure (group elements) --------------- */
+  // ---------- element settings: configure (group elements) ------------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(4),
@@ -2686,28 +2811,28 @@ static struct
   char *text_above, *text_left, *text_right, *infotext;
 } textbutton_info[ED_NUM_TEXTBUTTONS] =
 {
-  /* ---------- level and editor settings (tabs) --------------------------- */
+  // ---------- level and editor settings (tabs) ------------------------------
 
   {
     ED_LEVEL_TABS_XPOS(0),             ED_LEVEL_TABS_YPOS(0),
-    GADGET_ID_LEVELINFO_LEVEL,         GADGET_ID_NONE,
+    GADGET_ID_LEVELCONFIG_LEVEL,       GADGET_ID_NONE,
     8,                                 "Level",
-    NULL, NULL, NULL,                  "Configure level properties"
+    NULL, NULL, NULL,                  "Configure level settings"
   },
   {
     -1,                                        -1,
-    GADGET_ID_LEVELINFO_LEVELSET,      GADGET_ID_LEVELINFO_LEVEL,
+    GADGET_ID_LEVELCONFIG_LEVELSET,    GADGET_ID_LEVELCONFIG_LEVEL,
     8,                                 "Levelset",
     NULL, NULL, NULL,                  "Update this or create new level set"
   },
   {
     -1,                                        -1,
-    GADGET_ID_LEVELINFO_EDITOR,                GADGET_ID_LEVELINFO_LEVELSET,
+    GADGET_ID_LEVELCONFIG_EDITOR,      GADGET_ID_LEVELCONFIG_LEVELSET,
     8,                                 "Editor",
-    NULL, NULL, NULL,                  "Configure editor properties"
+    NULL, NULL, NULL,                  "Configure editor settings"
   },
 
-  /* ---------- element settings (tabs) ------------------------------------ */
+  // ---------- element settings (tabs) ---------------------------------------
 
   {
     ED_ELEMENT_TABS_XPOS(0),           ED_ELEMENT_TABS_YPOS(0),
@@ -2740,7 +2865,7 @@ static struct
     NULL, NULL, NULL,                  "Configure custom element change pages"
   },
 
-  /* ---------- level and editor settings (buttons) ------------------------ */
+  // ---------- level and editor settings (buttons) ---------------------------
 
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(10),
@@ -2756,7 +2881,7 @@ static struct
     "Save current settings as new template"
   },
 
-  /* ---------- element settings (buttons) --------------------------------- */
+  // ---------- element settings (buttons) ------------------------------------
 
   {
     -1,                                        -1,
@@ -2931,7 +3056,7 @@ static struct
   char *text_above, *text_left, *text_right, *infotext;
 } checkbutton_info[ED_NUM_CHECKBUTTONS] =
 {
-  /* ---------- level and editor settings ---------------------------------- */
+  // ---------- level and editor settings -------------------------------------
 
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(6),
@@ -2940,6 +3065,13 @@ static struct
     NULL, NULL,
     "automatically count gems needed", "set counter to number of gems"
   },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(11),
+    GADGET_ID_RATE_TIME_OVER_SCORE,    GADGET_ID_NONE,
+    &level.rate_time_over_score,
+    NULL, NULL,
+    "rate time/steps used over score", "sort high scores by playing time/steps"
+  },
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(7),
     GADGET_ID_USE_LEVELSET_ARTWORK,    GADGET_ID_NONE,
@@ -2976,7 +3108,7 @@ static struct
     "use template for custom elements",        "use template for custom properties"
   },
 
-  /* ---------- element settings: configure (various elements) ------------- */
+  // ---------- element settings: configure (various elements) ----------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
@@ -3013,6 +3145,13 @@ static struct
     NULL, NULL,
     "use time orb bug",                        "use odd time orb behaviour"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(5),
+    GADGET_ID_USE_LIFE_BUGS,           GADGET_ID_NONE,
+    &level.use_life_bugs,
+    NULL, NULL,
+    "use buggy element behaviour",     "use odd (historic) element behaviour"
+  },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_RANDOM_BALL_CONTENT,     GADGET_ID_NONE,
@@ -3022,8 +3161,8 @@ static struct
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
-    GADGET_ID_INITIAL_BALL_STATE,      GADGET_ID_NONE,
-    &level.ball_state_initial,
+    GADGET_ID_INITIAL_BALL_ACTIVE,     GADGET_ID_NONE,
+    &level.ball_active_initial,
     NULL, NULL,
     "magic ball initially activated",  "activate magic ball after level start"
   },
@@ -3036,10 +3175,24 @@ static struct
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
+    GADGET_ID_SB_FIELDS_NEEDED,                GADGET_ID_NONE,
+    &level.sb_fields_needed,
+    NULL, NULL,
+    "all fields need to be filled",    "require all SB fields to be solved"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
+    GADGET_ID_SB_OBJECTS_NEEDED,       GADGET_ID_NONE,
+    &level.sb_objects_needed,
+    NULL, NULL,
+    "all objects need to be placed",   "require all SB objects to be solved"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_AUTO_EXIT_SOKOBAN,       GADGET_ID_NONE,
     &level.auto_exit_sokoban,
     NULL, NULL,
-    "exit level if all fields solved", "automatically finish Sokoban levels"
+    "exit level if all tasks solved",  "automatically finish Sokoban levels"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(14),
@@ -3048,6 +3201,20 @@ static struct
     NULL, NULL,
     "only one player must enter exit", "level solved by first player in exit"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(3),
+    GADGET_ID_FINISH_DIG_COLLECT,      GADGET_ID_NONE,
+    &level.finish_dig_collect,
+    NULL, NULL,
+    "CE action on finished dig/collect", "only finished dig/collect triggers CE"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(4),
+    GADGET_ID_KEEP_WALKABLE_CE,                GADGET_ID_NONE,
+    &level.keep_walkable_ce,
+    NULL, NULL,
+    "keep walkable CE changed to player", "keep CE changing to player if walkable"
+  },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CONTINUOUS_SNAPPING,     GADGET_ID_NONE,
@@ -3216,8 +3383,22 @@ static struct
     NULL, NULL,
     "blue",                            "use blue color components in laser"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(5),
+    GADGET_ID_ROTATE_MM_BALL_CONTENT,  GADGET_ID_NONE,
+    &level.rotate_mm_ball_content,
+    NULL, NULL,
+    "randomly rotate created content", "randomly rotate newly created content"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(6),
+    GADGET_ID_EXPLODE_MM_BALL,         GADGET_ID_NONE,
+    &level.explode_mm_ball,
+    NULL, NULL,
+    "explode ball instead of melting", "use explosion to release ball content"
+  },
 
-  /* ---------- element settings: configure 1 (custom elements) ----------- */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
@@ -3269,7 +3450,7 @@ static struct
     "indestructible",                  "element is indestructible"
   },
 
-  /* ---------- element settings: configure 2 (custom elements) ----------- */
+  // ---------- element settings: configure 2 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
@@ -3279,63 +3460,63 @@ static struct
     NULL,                              "element can move with some pattern"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(7),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_CUSTOM_CAN_FALL,         GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_FALL],
     NULL, NULL,
     "can fall",                                "element can fall down"
   },
   {
-    -1,                                        ED_ELEMENT_SETTINGS_YPOS(7),
+    -1,                                        ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_CUSTOM_CAN_SMASH,                GADGET_ID_CUSTOM_CAN_FALL,
     &custom_element_properties[EP_CAN_SMASH],
     NULL, " ",
     NULL,                              "element can smash other elements"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(8),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CUSTOM_SLIPPERY,         GADGET_ID_NONE,
     &custom_element_properties[EP_SLIPPERY],
     NULL, NULL,
     NULL,                              "other elements can fall down from it"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(10),
     GADGET_ID_CUSTOM_DEADLY,           GADGET_ID_NONE,
     &custom_element_properties[EP_DEADLY],
     NULL, NULL,
     NULL,                              "element can kill the player"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(10),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_CAN_EXPLODE,      GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_EXPLODE],
     NULL, NULL,
     NULL,                              "element can explode"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(11),
+    ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(12),
     GADGET_ID_CUSTOM_EXPLODE_FIRE,     GADGET_ID_NONE,
     &custom_element_properties[EP_EXPLODES_BY_FIRE],
     NULL, NULL,
     "by fire",                         "element can explode by fire/explosion"
   },
   {
-    -1,                                        ED_ELEMENT_SETTINGS_YPOS(11),
+    -1,                                        ED_ELEMENT_SETTINGS_YPOS(12),
     GADGET_ID_CUSTOM_EXPLODE_SMASH,    GADGET_ID_CUSTOM_EXPLODE_FIRE,
     &custom_element_properties[EP_EXPLODES_SMASHED],
     NULL, " ",
     "smashed",                         "element can explode when smashed"
   },
   {
-    -1,                                        ED_ELEMENT_SETTINGS_YPOS(11),
+    -1,                                        ED_ELEMENT_SETTINGS_YPOS(12),
     GADGET_ID_CUSTOM_EXPLODE_IMPACT,   GADGET_ID_CUSTOM_EXPLODE_SMASH,
     &custom_element_properties[EP_EXPLODES_IMPACT],
     NULL, " ",
     "impact",                          "element can explode on impact"
   },
 
-  /* ---------- element settings: advanced (custom elements) --------------- */
+  // ---------- element settings: advanced (custom elements) ------------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
@@ -3410,325 +3591,333 @@ static struct
   int gadget_id_align;
   int *value;
   int area_xsize, area_ysize;
-  char *text_left, *text_right, *text_below, *infotext;
+  char *text_left, *text_right, *text_above, *text_below, *infotext;
 } drawingarea_info[ED_NUM_DRAWING_AREAS] =
 {
-  /* ---------- level playfield content ------------------------------------ */
+  // ---------- level playfield content ---------------------------------------
 
   {
     0,                                 0,
     0,                                 0,
     GADGET_ID_DRAWING_LEVEL,           GADGET_ID_NONE,
     NULL,
-    -1, -1,    /* these values are not constant, but can change at runtime */
-    NULL, NULL, NULL,                  NULL
+    -1, -1,    // these values are not constant, but can change at runtime
+    NULL, NULL, NULL, NULL,            NULL
   },
 
-  /* ---------- yam yam content -------------------------------------------- */
+  // ---------- yam yam content -----------------------------------------------
 
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(0),    ED_AREA_YAMYAM_CONTENT_YOFF(0),
     GADGET_ID_YAMYAM_CONTENT_0,                GADGET_ID_NONE,
     &level.yamyam_content[0].e[0][0],  3, 3,
-    NULL, NULL, "1",                   NULL
+    NULL, NULL, NULL, "1",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(1),    ED_AREA_YAMYAM_CONTENT_YOFF(1),
     GADGET_ID_YAMYAM_CONTENT_1,                GADGET_ID_NONE,
     &level.yamyam_content[1].e[0][0],  3, 3,
-    NULL, NULL, "2",                   NULL
+    NULL, NULL, NULL, "2",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(2),    ED_AREA_YAMYAM_CONTENT_YOFF(2),
     GADGET_ID_YAMYAM_CONTENT_2,                GADGET_ID_NONE,
     &level.yamyam_content[2].e[0][0],  3, 3,
-    NULL, NULL, "3",                   NULL
+    NULL, NULL, NULL, "3",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(3),    ED_AREA_YAMYAM_CONTENT_YOFF(3),
     GADGET_ID_YAMYAM_CONTENT_3,                GADGET_ID_NONE,
     &level.yamyam_content[3].e[0][0],  3, 3,
-    NULL, NULL, "4",                   NULL
+    NULL, NULL, NULL, "4",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(4),    ED_AREA_YAMYAM_CONTENT_YOFF(4),
     GADGET_ID_YAMYAM_CONTENT_4,                GADGET_ID_NONE,
     &level.yamyam_content[4].e[0][0],  3, 3,
-    NULL, NULL, "5",                   NULL
+    NULL, NULL, NULL, "5",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(5),    ED_AREA_YAMYAM_CONTENT_YOFF(5),
     GADGET_ID_YAMYAM_CONTENT_5,                GADGET_ID_NONE,
     &level.yamyam_content[5].e[0][0],  3, 3,
-    NULL, NULL, "6",                   NULL
+    NULL, NULL, NULL, "6",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(6),    ED_AREA_YAMYAM_CONTENT_YOFF(6),
     GADGET_ID_YAMYAM_CONTENT_6,                GADGET_ID_NONE,
     &level.yamyam_content[6].e[0][0],  3, 3,
-    NULL, NULL, "7",                   NULL
+    NULL, NULL, NULL, "7",             NULL
   },
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
     ED_AREA_YAMYAM_CONTENT_XOFF(7),    ED_AREA_YAMYAM_CONTENT_YOFF(7),
     GADGET_ID_YAMYAM_CONTENT_7,                GADGET_ID_NONE,
     &level.yamyam_content[7].e[0][0],  3, 3,
-    NULL, NULL, "8",                   NULL
+    NULL, NULL, NULL, "8",             NULL
   },
 
-  /* ---------- magic ball content ----------------------------------------- */
+  // ---------- magic ball content --------------------------------------------
 
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(0),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(0),
     GADGET_ID_MAGIC_BALL_CONTENT_0,    GADGET_ID_NONE,
     &level.ball_content[0].e[0][0],    3, 3,
-    NULL, NULL, "1",                   NULL
+    NULL, NULL, NULL, "1",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(1),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(1),
     GADGET_ID_MAGIC_BALL_CONTENT_1,    GADGET_ID_NONE,
     &level.ball_content[1].e[0][0],    3, 3,
-    NULL, NULL, "2",                   NULL
+    NULL, NULL, NULL, "2",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(2),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(2),
     GADGET_ID_MAGIC_BALL_CONTENT_2,    GADGET_ID_NONE,
     &level.ball_content[2].e[0][0],    3, 3,
-    NULL, NULL, "3",                   NULL
+    NULL, NULL, NULL, "3",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(3),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(3),
     GADGET_ID_MAGIC_BALL_CONTENT_3,    GADGET_ID_NONE,
     &level.ball_content[3].e[0][0],    3, 3,
-    NULL, NULL, "4",                   NULL
+    NULL, NULL, NULL, "4",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(4),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(4),
     GADGET_ID_MAGIC_BALL_CONTENT_4,    GADGET_ID_NONE,
     &level.ball_content[4].e[0][0],    3, 3,
-    NULL, NULL, "5",                   NULL
+    NULL, NULL, NULL, "5",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(5),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(5),
     GADGET_ID_MAGIC_BALL_CONTENT_5,    GADGET_ID_NONE,
     &level.ball_content[5].e[0][0],    3, 3,
-    NULL, NULL, "6",                   NULL
+    NULL, NULL, NULL, "6",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(6),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(6),
     GADGET_ID_MAGIC_BALL_CONTENT_6,    GADGET_ID_NONE,
     &level.ball_content[6].e[0][0],    3, 3,
-    NULL, NULL, "7",                   NULL
+    NULL, NULL, NULL, "7",             NULL
   },
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
     ED_AREA_MAGIC_BALL_CONTENT_XOFF(7),        ED_AREA_MAGIC_BALL_CONTENT_YOFF(7),
     GADGET_ID_MAGIC_BALL_CONTENT_7,    GADGET_ID_NONE,
     &level.ball_content[7].e[0][0],    3, 3,
-    NULL, NULL, "8",                   NULL
+    NULL, NULL, NULL, "8",             NULL
   },
 
-  /* ---------- android content -------------------------------------------- */
+  // ---------- android content -----------------------------------------------
 
   {
-    ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(5),
+    ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(6),
     ED_AREA_1X1_SETTINGS_XOFF,         ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_ANDROID_CONTENT,         GADGET_ID_NONE,
     &level.android_clone_element[0],   MAX_ANDROID_ELEMENTS, 1,
-    "elements:", NULL, NULL,           "elements android can clone"
+    NULL, NULL, "elements:", NULL,     "elements android can clone"
   },
 
-  /* ---------- amoeba content --------------------------------------------- */
+  // ---------- amoeba content ------------------------------------------------
 
   {
     ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(3),
     ED_AREA_1X1_SETTINGS_XOFF,         ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_AMOEBA_CONTENT,          GADGET_ID_NONE,
     &level.amoeba_content,             1, 1,
-    "content:", NULL, NULL,            "amoeba content"
+    "content:", NULL, NULL, NULL,      "amoeba content"
   },
 
-  /* ---------- level start element ---------------------------------------- */
+  // ---------- level start element -------------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(10),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_START_ELEMENT,           GADGET_ID_USE_START_ELEMENT,
     &level.start_element[0],           1, 1,
-    NULL, NULL, NULL,                  "level start element"
+    NULL, NULL, NULL, NULL,            "level start element"
   },
 
-  /* ---------- player artwork element ------------------------------------- */
+  // ---------- player artwork element ----------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(11),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_ARTWORK_ELEMENT,         GADGET_ID_USE_ARTWORK_ELEMENT,
     &level.artwork_element[0],         1, 1,
-    NULL, NULL, NULL,                  "element for player artwork"
+    NULL, NULL, NULL, NULL,            "element for player artwork"
   },
 
-  /* ---------- player explosion element ----------------------------------- */
+  // ---------- player explosion element --------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(12),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_EXPLOSION_ELEMENT,       GADGET_ID_USE_EXPLOSION_ELEMENT,
     &level.explosion_element[0],       1, 1,
-    NULL, NULL, NULL,                  "element for player explosion"
+    NULL, NULL, NULL, NULL,            "element for player explosion"
   },
 
-  /* ---------- player initial inventory ----------------------------------- */
+  // ---------- player initial inventory --------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(1),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_INVENTORY_CONTENT,       GADGET_ID_USE_INITIAL_INVENTORY,
     &level.initial_inventory_content[0][0], MAX_INITIAL_INVENTORY_SIZE, 1,
-    NULL, NULL, NULL,                  "content for initial inventory"
+    NULL, NULL, NULL, NULL,            "content for initial inventory"
+  },
+
+  // ---------- gray ball content -----------------------------------------
+
+  {
+    ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(2),
+    ED_AREA_1X1_SETTINGS_XOFF,         ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_MM_BALL_CONTENT,         GADGET_ID_NONE,
+    &level.mm_ball_content[0],         MAX_MM_BALL_CONTENTS, 1,
+    "content:", NULL, NULL, NULL,      "content for gray ball"
   },
 
-  /* ---------- element settings: configure 1 (custom elements) ----------- */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
-  /* ---------- custom graphic --------------------------------------------- */
+  // ---------- custom graphic ------------------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(1),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_CUSTOM_GRAPHIC,          GADGET_ID_CUSTOM_USE_GRAPHIC,
-    &custom_element.gfx_element_initial,1, 1,
-    NULL, NULL, NULL,                  "custom graphic element"
+    &custom_element.gfx_element_initial, 1, 1,
+    NULL, NULL, NULL, NULL,            "custom graphic element"
   },
 
-  /* ---------- element settings: configure 2 (custom elements) ----------- */
+  // ---------- element settings: configure 2 (custom elements) ---------------
 
-  /* ---------- custom content (when exploding) ---------------------------- */
+  // ---------- custom content (when exploding) -------------------------------
 
   {
-    -1,                                        ED_AREA_3X3_SETTINGS_YPOS(10),
+    -1,                                        ED_AREA_3X3_SETTINGS_YPOS(11),
     0,                                 ED_AREA_3X3_SETTINGS_YOFF,
-    GADGET_ID_CUSTOM_CONTENT,          GADGET_ID_NONE, /* align three rows */
+    GADGET_ID_CUSTOM_CONTENT,          GADGET_ID_NONE, // align three rows
     &custom_element.content.e[0][0],   3, 3,
-    "content:", NULL, NULL,            NULL
+    "content:", NULL, NULL, NULL,      NULL
   },
 
-  /* ---------- custom enter and leave element (when moving) --------------- */
+  // ---------- custom enter and leave element (when moving) ------------------
 
   {
     ED_AREA_1X1_SETTINGS_XPOS(1),      ED_AREA_1X1_SETTINGS_YPOS(3),
     ED_AREA_1X1_SETTINGS_XOFF,         ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_CUSTOM_MOVE_ENTER,       GADGET_ID_NONE,
     &custom_element.move_enter_element,        1, 1,
-    "can dig:", " ", NULL,             "element that can be digged/collected"
+    "can dig:", " ", NULL, NULL,       "element that can be digged/collected"
   },
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(3),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_CUSTOM_MOVE_LEAVE,       GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE,
     &custom_element.move_leave_element,        1, 1,
-    NULL, NULL, NULL,                  "element that will be left behind"
+    NULL, NULL, NULL, NULL,            "element that will be left behind"
   },
 
-  /* ---------- element settings: advanced (custom elements) --------------- */
+  // ---------- element settings: advanced (custom elements) ------------------
 
-  /* ---------- custom change target --------------------------------------- */
+  // ---------- custom change target ------------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(1),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_CUSTOM_CHANGE_TARGET,    GADGET_ID_CUSTOM_CAN_CHANGE,
     &custom_element_change.target_element, 1, 1,
-    NULL, "after/when:", NULL,         "new target element after change"
+    NULL, "after/when:", NULL, NULL,   "new target element after change"
   },
 
-  /* ---------- custom change content (extended change target) ------------- */
+  // ---------- custom change content (extended change target) ----------------
 
   {
     -1,                                        ED_AREA_3X3_SETTINGS_YPOS(9),
     0,                                 ED_AREA_3X3_SETTINGS_YOFF,
-    GADGET_ID_CUSTOM_CHANGE_CONTENT,   GADGET_ID_NONE, /* align three rows */
+    GADGET_ID_CUSTOM_CHANGE_CONTENT,   GADGET_ID_NONE, // align three rows
     &custom_element_change.target_content.e[0][0], 3, 3,
-    NULL, NULL, NULL,                  "new extended elements after change"
+    NULL, NULL, NULL, NULL,            "new extended elements after change"
   },
 
-  /* ---------- custom change trigger (element causing change) ------------- */
+  // ---------- custom change trigger (element causing change) ----------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(5),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_CUSTOM_CHANGE_TRIGGER,   GADGET_ID_CHANGE_OTHER_ACTION,
     &custom_element_change.initial_trigger_element, 1, 1,
-    NULL, NULL, NULL,                  "other element triggering change"
+    NULL, NULL, NULL, NULL,            "other element triggering change"
   },
 
-  /* ---------- custom change action (element used for action) ------------- */
+  // ---------- custom change action (element used for action) ----------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(13),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_CUSTOM_CHANGE_ACTION,    GADGET_ID_ACTION_ARG,
     &custom_element_change.action_element, 1, 1,
-    NULL, NULL, NULL,                  "element used as action parameter"
+    NULL, NULL, NULL, NULL,            "element used as action parameter"
   },
 
-  /* ---------- group element content -------------------------------------- */
+  // ---------- group element content -----------------------------------------
 
   {
     ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(2),
     ED_AREA_1X1_SETTINGS_XOFF,         ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_GROUP_CONTENT,           GADGET_ID_NONE,
     &group_element_info.element[0],    MAX_ELEMENTS_IN_GROUP, 1,
-    "content:", NULL, NULL,            NULL
+    "content:", NULL, NULL, NULL,      NULL
   },
 
-  /* ---------- random background (for random painting) -------------------- */
+  // ---------- random background (for random painting) -----------------------
 
   {
     -1,                                        ED_AREA_1X1_LSETTINGS_YPOS(1),
     0,                                 ED_AREA_1X1_LSETTINGS_YOFF,
     GADGET_ID_RANDOM_BACKGROUND,       GADGET_ID_RANDOM_RESTRICTED,
     &random_placement_background_element, 1, 1,
-    NULL, NULL, NULL,                  "random placement background"
+    NULL, NULL, NULL, NULL,            "random placement background"
   },
 };
 
 
-/*
-  -----------------------------------------------------------------------------
-  some internally used variables
-  -----------------------------------------------------------------------------
-*/
+// ----------------------------------------------------------------------------
+// some internally used variables
+// ----------------------------------------------------------------------------
 
-/* maximal size of level editor drawing area */
+// maximal size of level editor drawing area
 static int MAX_ED_FIELDX, MAX_ED_FIELDY;
 
-/* actual size of level editor drawing area */
+// actual size of level editor drawing area
 static int ed_fieldx, ed_fieldy;
 
-/* actual position of level editor drawing area in level playfield */
+// actual position of level editor drawing area in level playfield
 static int level_xpos = -1, level_ypos = -1;
 
-/* actual tile size used to display playfield drawing area */
+// actual tile size used to display playfield drawing area
 static int ed_tilesize = DEFAULT_EDITOR_TILESIZE;
 static int ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
 
-#define IN_ED_FIELD(x,y)       IN_FIELD(x, y, ed_fieldx, ed_fieldy)
+#define IN_ED_FIELD(x, y)      IN_FIELD(x, y, ed_fieldx, ed_fieldy)
 
-/* drawing elements on the three mouse buttons */
+// drawing elements on the three mouse buttons
 static int new_element1 = EL_WALL;
 static int new_element2 = EL_EMPTY;
 static int new_element3 = EL_SAND;
@@ -3747,7 +3936,9 @@ static int use_permanent_palette = TRUE;
 #define PXSIZE         (use_permanent_palette ? DXSIZE : SXSIZE)
 #define PYSIZE         (use_permanent_palette ? DYSIZE : SYSIZE)
 
-/* forward declaration for internal use */
+// forward declaration for internal use
+static void CopyBrushToCursor(int, int);
+static void DeleteBrushFromCursor(void);
 static void ModifyEditorCounterValue(int, int);
 static void ModifyEditorCounterLimits(int, int, int);
 static void ModifyEditorSelectboxValue(int, int);
@@ -3758,7 +3949,7 @@ static void AdjustElementListScrollbar(void);
 static void RedrawDrawingElements(void);
 static void DrawDrawingWindowExt(boolean);
 static void DrawDrawingWindow(void);
-static void DrawLevelInfoWindow(void);
+static void DrawLevelConfigWindow(void);
 static void DrawPropertiesWindow(void);
 static void DrawPaletteWindow(void);
 static void UpdateCustomElementGraphicGadgets(void);
@@ -3783,8 +3974,9 @@ static boolean getDrawModeHiRes(void);
 static int getTabulatorBarWidth(void);
 static int getTabulatorBarHeight(void);
 static Pixel getTabulatorBarColor(void);
+static int numHiresTiles(int);
 
-static int num_editor_gadgets = 0;     /* dynamically determined */
+static int num_editor_gadgets = 0;     // dynamically determined
 
 static struct GadgetInfo **level_editor_gadget = NULL;
 static int *right_gadget_border = NULL;
@@ -3794,7 +3986,7 @@ static int last_drawing_function = GADGET_ID_SINGLE_ITEMS;
 static boolean draw_with_brush = FALSE;
 static int properties_element = 0;
 
-static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+static short TileBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static short IntelliDrawBuffer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static int undo_buffer_position = 0;
@@ -3802,7 +3994,7 @@ static int undo_buffer_steps = 0;
 static int redo_buffer_steps = 0;
 
 static int edit_mode;
-static int edit_mode_levelinfo;
+static int edit_mode_levelconfig;
 static int edit_mode_properties;
 
 static int element_shift = 0;
@@ -3994,13 +4186,13 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_MAGIC_BALL,
   EL_EMC_MAGIC_BALL_SWITCH,
-  EL_SPRING,
-  EL_EMC_SPRING_BUMPER,
-
   EL_EMC_LENSES,
   EL_EMC_MAGNIFIER,
-  EL_EMPTY,
-  EL_EMPTY,
+
+  EL_SPRING_LEFT,
+  EL_SPRING,
+  EL_SPRING_RIGHT,
+  EL_EMC_SPRING_BUMPER,
 
   EL_BALLOON,
   EL_YAMYAM_UP,
@@ -4032,8 +4224,8 @@ static int editor_hl_rnd[] =
 
 static int editor_el_rnd[] =
 {
-  EL_DYNAMITE,                 /* RND */
-  EL_DYNAMITE_ACTIVE,          /* RND */
+  EL_DYNAMITE,                 // RND
+  EL_DYNAMITE_ACTIVE,          // RND
   EL_EMPTY,
   EL_EMPTY,
 
@@ -4080,7 +4272,7 @@ static int editor_el_rnd[] =
   EL_PACMAN_LEFT,
   EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_YAMYAM,                   /* RND */
+  EL_YAMYAM,                   // RND
 
   EL_BLACK_ORB,
   EL_PACMAN_DOWN,
@@ -4227,10 +4419,10 @@ static int editor_hl_diamond_caves[] =
 
 static int editor_el_diamond_caves[] =
 {
-  EL_EM_STEEL_EXIT_CLOSED,     /* DC2 */
-  EL_EM_STEEL_EXIT_OPEN,       /* DC2 */
-  EL_WALL_EMERALD,             /* DC2 */
-  EL_WALL_DIAMOND,             /* DC2 */
+  EL_EM_STEEL_EXIT_CLOSED,     // DC2
+  EL_EM_STEEL_EXIT_OPEN,       // DC2
+  EL_WALL_EMERALD,             // DC2
+  EL_WALL_DIAMOND,             // DC2
 
   EL_PEARL,
   EL_CRYSTAL,
@@ -4472,7 +4664,12 @@ static int editor_el_mirror_magic[] =
   EL_MM_WOODEN_GRID_FIXED_1,
   EL_MM_WOODEN_GRID_FIXED_2,
   EL_MM_WOODEN_GRID_FIXED_3,
-  EL_MM_WOODEN_GRID_FIXED_4
+  EL_MM_WOODEN_GRID_FIXED_4,
+
+  EL_MM_ENVELOPE_1,
+  EL_MM_ENVELOPE_2,
+  EL_MM_ENVELOPE_3,
+  EL_MM_ENVELOPE_4
 };
 static int *editor_hl_mirror_magic_ptr = editor_hl_mirror_magic;
 static int *editor_el_mirror_magic_ptr = editor_el_mirror_magic;
@@ -4501,8 +4698,8 @@ static int editor_el_deflektor[] =
 
   EL_DF_MIRROR_START,
   EL_DF_MIRROR_ROTATING_START,
+  EL_DF_MIRROR_FIXED_START,
   EL_DF_CELL,
-  EL_DF_MINE,
 
   EL_DF_FIBRE_OPTIC_RED_1,
   EL_DF_FIBRE_OPTIC_YELLOW_1,
@@ -4517,7 +4714,12 @@ static int editor_el_deflektor[] =
   EL_DF_STEEL_WALL,
   EL_DF_WOODEN_WALL,
   EL_DF_REFRACTOR,
-  EL_EMPTY
+  EL_DF_MINE,
+
+  EL_DF_SLOPE_1,
+  EL_DF_SLOPE_2,
+  EL_DF_SLOPE_3,
+  EL_DF_SLOPE_4
 };
 static int *editor_hl_deflektor_ptr = editor_hl_deflektor;
 static int *editor_el_deflektor_ptr = editor_el_deflektor;
@@ -5134,6 +5336,41 @@ static int *editor_el_group_ptr = editor_el_group;
 static int num_editor_hl_group = ARRAY_SIZE(editor_hl_group);
 static int num_editor_el_group = ARRAY_SIZE(editor_el_group);
 
+static int editor_hl_empty_space[] =
+{
+  EL_INTERNAL_CASCADE_ES_ACTIVE,
+  EL_CHAR('E'),
+  EL_CHAR('S'),
+  EL_EMPTY,
+};
+
+static int editor_el_empty_space[] =
+{
+  EL_EMPTY_SPACE_1,
+  EL_EMPTY_SPACE_2,
+  EL_EMPTY_SPACE_3,
+  EL_EMPTY_SPACE_4,
+
+  EL_EMPTY_SPACE_5,
+  EL_EMPTY_SPACE_6,
+  EL_EMPTY_SPACE_7,
+  EL_EMPTY_SPACE_8,
+
+  EL_EMPTY_SPACE_9,
+  EL_EMPTY_SPACE_10,
+  EL_EMPTY_SPACE_11,
+  EL_EMPTY_SPACE_12,
+
+  EL_EMPTY_SPACE_13,
+  EL_EMPTY_SPACE_14,
+  EL_EMPTY_SPACE_15,
+  EL_EMPTY_SPACE_16
+};
+static int *editor_hl_empty_space_ptr = editor_hl_empty_space;
+static int *editor_el_empty_space_ptr = editor_el_empty_space;
+static int num_editor_hl_empty_space = ARRAY_SIZE(editor_hl_empty_space);
+static int num_editor_el_empty_space = ARRAY_SIZE(editor_el_empty_space);
+
 static int editor_hl_reference[] =
 {
   EL_INTERNAL_CASCADE_REF_ACTIVE,
@@ -5206,17 +5443,17 @@ static int num_editor_hl_dynamic = ARRAY_SIZE(editor_hl_dynamic);
 static int num_editor_el_dynamic = 0;
 
 static int editor_hl_empty[] = { EL_EMPTY };
-static int *editor_el_empty = NULL;    /* dynamically allocated */
+static int *editor_el_empty = NULL;    // dynamically allocated
 
 static int *editor_hl_empty_ptr = editor_hl_empty;
 static int *editor_el_empty_ptr = NULL;
 static int num_editor_hl_empty = 0;
-static int num_editor_el_empty = 0;    /* dynamically determined, if needed */
+static int num_editor_el_empty = 0;    // dynamically determined, if needed
 
 static boolean use_el_empty = FALSE;
 
-static int *editor_elements = NULL;    /* dynamically allocated */
-static int num_editor_elements = 0;    /* dynamically determined */
+static int *editor_elements = NULL;    // dynamically allocated
+static int num_editor_elements = 0;    // dynamically determined
 
 static boolean setup_editor_cascade_never = FALSE;
 
@@ -5346,6 +5583,12 @@ editor_elements_info[] =
     &editor_hl_group_ptr,              &num_editor_hl_group,
     &editor_el_group_ptr,              &num_editor_el_group
   },
+  {
+    &setup_editor_el_custom,
+    &setup.editor_cascade.el_es,
+    &editor_hl_empty_space_ptr,                &num_editor_hl_empty_space,
+    &editor_el_empty_space_ptr,                &num_editor_el_empty_space
+  },
   {
     &setup_editor_el_custom,
     &setup.editor_cascade.el_ref,
@@ -5378,12 +5621,18 @@ editor_elements_info[] =
   }
 };
 
+static struct XY xy_directions[] =
+{
+  { -1,  0 },
+  { +1,  0 },
+  {  0, -1 },
+  {  0, +1 }
+};
 
-/*
-  -----------------------------------------------------------------------------
-  functions
-  -----------------------------------------------------------------------------
-*/
+
+// ----------------------------------------------------------------------------
+// functions
+// ----------------------------------------------------------------------------
 
 static int getMaxInfoTextLength(void)
 {
@@ -5433,7 +5682,7 @@ static char *getElementInfoText(int element)
 
 static char *getElementDescriptionFilenameExt(char *basename)
 {
-  char *elements_subdir = "elements";
+  char *elements_subdir = ELEMENTS_DIRECTORY;
   static char *elements_subdir2 = NULL;
   static char *filename = NULL;
 
@@ -5442,14 +5691,14 @@ static char *getElementDescriptionFilenameExt(char *basename)
 
   checked_free(filename);
 
-  /* 1st try: look for element description in current level set directory */
+  // 1st try: look for element description in current level set directory
   filename = getPath3(getCurrentLevelDir(), elements_subdir2, basename);
   if (fileExists(filename))
     return filename;
 
   free(filename);
 
-  /* 2nd try: look for element description in the game's base directory */
+  // 2nd try: look for element description in the game's base directory
   filename = getPath3(options.docs_directory, elements_subdir, basename);
   if (fileExists(filename))
     return filename;
@@ -5462,18 +5711,23 @@ static char *getElementDescriptionFilename(int element)
   char basename[MAX_FILENAME_LEN];
   char *filename;
 
-  /* 1st try: look for element description file for exactly this element */
+  // 1st try: look for element description file for exactly this element
   sprintf(basename, "%s.txt", element_info[element].token_name);
   filename = getElementDescriptionFilenameExt(basename);
   if (filename != NULL)
     return filename;
 
-  /* 2nd try: look for element description file for this element's class */
+  // 2nd try: look for element description file for this element's class
   sprintf(basename, "%s.txt", element_info[element].class_name);
   filename = getElementDescriptionFilenameExt(basename);
   if (filename != NULL)
     return filename;
 
+  // 3rd try: look for generic fallback text file for any element
+  filename = getElementDescriptionFilenameExt(FALLBACK_TEXT_FILENAME);
+  if (filename != NULL)
+    return filename;
+
   return NULL;
 }
 
@@ -5489,51 +5743,64 @@ static void InitDynamicEditorElementList(int **elements, int *num_elements)
   boolean element_found[NUM_FILE_ELEMENTS];
   int i, x, y;
 
-  /* initialize list of used elements to "not used" */
+  // initialize list of used elements to "not used"
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     element_found[i] = FALSE;
 
-  /* find all elements used in current level */
+  // find all elements used in current level
   for (y = 0; y < lev_fieldy; y++)
+  {
     for (x = 0; x < lev_fieldx; x++)
-      if (Feld[x][y] < NUM_FILE_ELEMENTS)      /* should always be true */
-       element_found[Feld[x][y]] = TRUE;
+    {
+      if (Tile[x][y] >= NUM_FILE_ELEMENTS)     // should never happen
+       continue;
+
+      if (IS_MM_WALL(Tile[x][y]))
+       element_found[map_mm_wall_element(Tile[x][y])] = TRUE;
+      else
+       element_found[Tile[x][y]] = TRUE;
+    }
+  }
 
   *num_elements = 0;
 
-  /* count number of elements used in current level */
+  // count number of elements used in current level
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     if (element_found[i])
       (*num_elements)++;
 
-  /* add space for up to 3 more elements for padding that may be needed */
+  // add space for up to 3 more elements for padding that may be needed
   *num_elements += 3;
 
-  /* free memory for old list of elements, if needed */
+  // free memory for old list of elements, if needed
   checked_free(*elements);
 
-  /* allocate memory for new list of elements */
+  // allocate memory for new list of elements
   *elements = checked_malloc(*num_elements * sizeof(int));
 
   *num_elements = 0;
 
-  /* add all elements used in current level (non-custom/group elements) */
+  // add all elements used in current level (non-custom/group/empty elements)
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
-    if (element_found[i] && !(IS_CUSTOM_ELEMENT(i) || IS_GROUP_ELEMENT(i)))
+    if (element_found[i] && !(IS_CUSTOM_ELEMENT(i) ||
+                             IS_GROUP_ELEMENT(i) ||
+                             IS_EMPTY_ELEMENT(i)))
       (*elements)[(*num_elements)++] = i;
 
-  /* add all elements used in current level (custom/group elements) */
+  // add all elements used in current level (custom/group/empty elements)
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
-    if (element_found[i] && (IS_CUSTOM_ELEMENT(i) || IS_GROUP_ELEMENT(i)))
+    if (element_found[i] && (IS_CUSTOM_ELEMENT(i) ||
+                            IS_GROUP_ELEMENT(i) ||
+                            IS_EMPTY_ELEMENT(i)))
       (*elements)[(*num_elements)++] = i;
 
-  while (*num_elements % 4)    /* pad with empty elements, if needed */
+  while (*num_elements % 4)    // pad with empty elements, if needed
     (*elements)[(*num_elements)++] = EL_EMPTY;
 }
 
 static void ReinitializeElementList_EnableSections(void)
 {
-  /* default: enable all element sections */
+  // default: enable all element sections
 
   setup_editor_el_players              = TRUE;
   setup_editor_el_boulderdash          = TRUE;
@@ -5553,7 +5820,7 @@ static void ReinitializeElementList_EnableSections(void)
   setup_editor_el_user_defined         = TRUE;
   setup_editor_el_dynamic              = TRUE;
 
-  /* now disable all element sections not to be displayed */
+  // now disable all element sections not to be displayed
 
   if (!setup.editor.el_classic)
   {
@@ -5650,9 +5917,9 @@ static void ReinitializeElementList(void)
 
   if (initialization_needed)
   {
-    LoadSetup_EditorCascade();         /* load last editor cascade state */
+    LoadSetup_EditorCascade();         // load last editor cascade state
 
-    /* initialize editor cascade element from saved cascade state */
+    // initialize editor cascade element from saved cascade state
     for (i = 0; editor_elements_info[i].setup_value != NULL; i++)
     {
       int *cascade_element = &(*editor_elements_info[i].headline_list)[0];
@@ -5669,19 +5936,19 @@ static void ReinitializeElementList(void)
 
   checked_free(editor_elements);
 
-  /* reload optional user defined element list for each invocation of editor */
+  // reload optional user defined element list for each invocation of editor
   LoadUserDefinedEditorElementList(&editor_el_user_defined_ptr,
                                   &num_editor_el_user_defined);
 
-  /* initialize dynamic level element list for each invocation of editor */
+  // initialize dynamic level element list for each invocation of editor
   InitDynamicEditorElementList(&editor_el_dynamic_ptr,
                               &num_editor_el_dynamic);
 
-  /* initialize list of empty elements (used for padding, if needed) */
+  // initialize list of empty elements (used for padding, if needed)
   for (i = 0; i < ED_NUM_ELEMENTLIST_BUTTONS; i++)
     editor_el_empty[i] = EL_EMPTY;
 
-  /* do some sanity checks for each element from element list */
+  // do some sanity checks for each element from element list
   for (i = 0; editor_elements_info[i].setup_value != NULL; i++)
   {
     for (j = 0; j < *editor_elements_info[i].element_list_size; j++)
@@ -5689,28 +5956,28 @@ static void ReinitializeElementList(void)
       int element = (*editor_elements_info[i].element_list)[j];
 
       if (element >= NUM_FILE_ELEMENTS)
-       Error(ERR_WARN, "editor element %d is runtime element", element);
+       Warn("editor element %d is runtime element", element);
 
       if (strEqual(getElementInfoText(element), INFOTEXT_UNKNOWN_ELEMENT))
-       Error(ERR_WARN, "no element description text for element %d", element);
+       Warn("no element description text for element %d", element);
     }
   }
 
   num_editor_elements = 0;
   use_el_empty = FALSE;
 
-  /* determine size of element list */
+  // determine size of element list
   for (i = 0; editor_elements_info[i].setup_value != NULL; i++)
   {
-    boolean found_inactive_cascade = FALSE;
-
     if (*editor_elements_info[i].setup_value)
     {
+      boolean found_inactive_cascade = FALSE;
+
       if (setup.editor.el_headlines)
       {
        // required for correct padding of palette headline buttons
        if (*editor_elements_info[i].headline_list_size > 0)
-         num_editor_elements += editor.palette.cols;
+         num_editor_elements += ED_ELEMENTLIST_COLS;
 
        for (j = 0; j < *editor_elements_info[i].headline_list_size; j++)
        {
@@ -5727,8 +5994,8 @@ static void ReinitializeElementList(void)
       // required for correct padding of palette element buttons
       int element_list_size = *editor_elements_info[i].element_list_size;
       int element_rows =
-       (element_list_size + editor.palette.cols - 1) / editor.palette.cols;
-      int element_buttons = editor.palette.cols * element_rows;
+       (element_list_size + ED_ELEMENTLIST_COLS - 1) / ED_ELEMENTLIST_COLS;
+      int element_buttons = ED_ELEMENTLIST_COLS * element_rows;
 
       num_editor_elements += element_buttons;
     }
@@ -5736,7 +6003,7 @@ static void ReinitializeElementList(void)
 
   if (num_editor_elements < ED_NUM_ELEMENTLIST_BUTTONS)
   {
-    /* offer at least as many elements as element buttons exist */
+    // offer at least as many elements as element buttons exist
     use_el_empty = TRUE;
     num_editor_el_empty = ED_NUM_ELEMENTLIST_BUTTONS - num_editor_elements;
 
@@ -5749,7 +6016,7 @@ static void ReinitializeElementList(void)
 
   editor_elements = checked_malloc(num_editor_elements * sizeof(int));
 
-  /* fill element list */
+  // fill element list
   for (i = 0; editor_elements_info[i].setup_value != NULL; i++)
   {
     boolean found_inactive_cascade = FALSE;
@@ -5760,7 +6027,7 @@ static void ReinitializeElementList(void)
       {
        // required for correct padding of palette headline buttons
        int headline_size = (*editor_elements_info[i].headline_list_size > 0 ?
-                            editor.palette.cols : 0);
+                            ED_ELEMENTLIST_COLS : 0);
 
        for (j = 0; j < headline_size; j++)
        {
@@ -5782,8 +6049,8 @@ static void ReinitializeElementList(void)
       // required for correct padding of palette element buttons
       int element_list_size = *editor_elements_info[i].element_list_size;
       int element_rows =
-       (element_list_size + editor.palette.cols - 1) / editor.palette.cols;
-      int element_buttons = editor.palette.cols * element_rows;
+       (element_list_size + ED_ELEMENTLIST_COLS - 1) / ED_ELEMENTLIST_COLS;
+      int element_buttons = ED_ELEMENTLIST_COLS * element_rows;
 
       // copy all elements from element list
       for (j = 0; j < element_list_size; j++)
@@ -5795,7 +6062,7 @@ static void ReinitializeElementList(void)
     }
   }
 
-  /* (this function is also called before editor gadgets are initialized!) */
+  // (this function is also called before editor gadgets are initialized!)
   AdjustElementListScrollbar();
 }
 
@@ -5849,7 +6116,7 @@ static void ReinitializeElementListButtons(void)
   static boolean initialization_needed = TRUE;
   int i;
 
-  if (!initialization_needed)  /* check if editor element setup has changed */
+  if (!initialization_needed)  // check if editor element setup has changed
   {
     if (last_setup_value_headlines != setup.editor.el_headlines)
       initialization_needed = TRUE;
@@ -5866,7 +6133,7 @@ static void ReinitializeElementListButtons(void)
   FreeLevelEditorGadgets();
   CreateLevelEditorGadgets();
 
-  /* store current setup values for next invocation of this function */
+  // store current setup values for next invocation of this function
   last_setup_value_headlines = setup.editor.el_headlines;
   for (i = 0; editor_elements_info[i].setup_value != NULL; i++)
     editor_elements_info[i].last_setup_value =
@@ -5936,7 +6203,7 @@ static void DrawEditorLevelBorderLine(int x, int y, int xsize, int ysize)
   int ysize_thin = (ysize < ed_tilesize ? 1 : ysize);
   Pixel line_color = getTabulatorBarColor();
 
-  if (line_color == BLACK_PIXEL)               /* black => transparent */
+  if (line_color == BLACK_PIXEL)               // black => transparent
     return;
 
   FillRectangle(drawto, SX + x, SY + y, xsize_tile, ysize_tile, BLACK_PIXEL);
@@ -5953,7 +6220,7 @@ static void DrawEditorLevelBorderLinesIfNeeded(void)
   if (!suppressBorderElement())
     return;
 
-  /* draw little border line around editable level playfield */
+  // draw little border line around editable level playfield
 
   if (xsize < SXSIZE)
     DrawEditorLevelBorderLine(xsize, 0, line_size, ysize);
@@ -6046,7 +6313,7 @@ static void CreateControlButtons(void)
   struct GadgetInfo *gi;
   int i;
 
-  /* create toolbox buttons */
+  // create toolbox buttons
   for (i = 0; i < ED_NUM_CTRL_BUTTONS; i++)
   {
     int id = controlbutton_info[i].gadget_id;
@@ -6158,12 +6425,12 @@ static void CreateControlButtons(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
 
-  /* these values are not constant, but can change at runtime */
+  // these values are not constant, but can change at runtime
   scrollbutton_pos[ED_SCROLLBUTTON_ID_AREA_UP].x    = ED_SCROLL_UP_XPOS;
   scrollbutton_pos[ED_SCROLLBUTTON_ID_AREA_UP].y    = ED_SCROLL_UP_YPOS;
   scrollbutton_pos[ED_SCROLLBUTTON_ID_AREA_DOWN].x  = ED_SCROLL_DOWN_XPOS;
@@ -6177,7 +6444,7 @@ static void CreateControlButtons(void)
   scrollbutton_pos[ED_SCROLLBUTTON_ID_LIST_DOWN].x  = ED_SCROLL2_DOWN_XPOS;
   scrollbutton_pos[ED_SCROLLBUTTON_ID_LIST_DOWN].y  = ED_SCROLL2_DOWN_YPOS;
 
-  /* create buttons for scrolling of drawing area and element list */
+  // create buttons for scrolling of drawing area and element list
   for (i = 0; i < ED_NUM_SCROLLBUTTONS; i++)
   {
     int id = scrollbutton_info[i].gadget_id;
@@ -6224,12 +6491,12 @@ static void CreateControlButtons(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
 
-  /* create buttons for element list */
+  // create buttons for element list
   for (i = 0; i < ED_NUM_ELEMENTLIST_BUTTONS; i++)
   {
     int id = GADGET_ID_ELEMENTLIST_FIRST + i;
@@ -6277,7 +6544,7 @@ static void CreateControlButtons(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6291,15 +6558,15 @@ static void CreateCounterButtons(void)
   for (i = 0; i < ED_NUM_COUNTERBUTTONS; i++)
   {
     int j;
-    int x = SX + ED_SETTINGS_X(counterbutton_info[i].x); /* down count button */
+    int x = SX + ED_SETTINGS_X(counterbutton_info[i].x); // down count button
     int y = SY + ED_SETTINGS_Y(counterbutton_info[i].y);
 
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (counterbutton_info[i].gadget_id_align != GADGET_ID_NONE)
       x = (right_gadget_border[counterbutton_info[i].gadget_id_align] +
           ED_GADGET_TEXT_DISTANCE);
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (counterbutton_info[i].text_left != NULL)
       x += getTextWidthForGadget(counterbutton_info[i].text_left);
 
@@ -6312,11 +6579,9 @@ static void CreateCounterButtons(void)
       int graphic;
       struct GraphicInfo *gd;
       int gd_x1, gd_x2, gd_y1, gd_y2;
-      unsigned int event_mask;
+      unsigned int event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
       char infotext[max_infotext_len + 1];
 
-      event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
-
       if (i == ED_COUNTER_ID_SELECT_LEVEL)
       {
        graphic = (j == 0 ?
@@ -6371,13 +6636,13 @@ static void CreateCounterButtons(void)
                        GDI_END);
 
       if (gi == NULL)
-       Error(ERR_EXIT, "cannot create gadget");
+       Fail("cannot create gadget");
 
       level_editor_gadget[id] = gi;
       right_gadget_border[id] =
        getRightGadgetBorder(gi, counterbutton_info[i].text_right);
 
-      x += gi->width + ED_GADGET_SMALL_DISTANCE;       /* text count button */
+      x += gi->width + ED_GADGET_SMALL_DISTANCE;       // text count button
 
       if (j == 0)
       {
@@ -6420,7 +6685,7 @@ static void CreateCounterButtons(void)
                          GDI_NUMBER_VALUE, 0,
                          GDI_NUMBER_MIN, counterbutton_info[i].min_value,
                          GDI_NUMBER_MAX, counterbutton_info[i].max_value,
-                         GDI_TEXT_SIZE, 3,     /* minimal counter text size */
+                         GDI_TEXT_SIZE, 3,     // minimal counter text size
                          GDI_TEXT_FONT, font_type,
                          GDI_TEXT_FONT_ACTIVE, font_type_active,
                          GDI_DESIGN_UNPRESSED, gd->bitmap, gd_x1, gd_y1,
@@ -6433,13 +6698,13 @@ static void CreateCounterButtons(void)
                          GDI_END);
 
        if (gi == NULL)
-         Error(ERR_EXIT, "cannot create gadget");
+         Fail("cannot create gadget");
 
        level_editor_gadget[id] = gi;
        right_gadget_border[id] =
          getRightGadgetBorder(gi, counterbutton_info[i].text_right);
 
-       x += gi->width + ED_GADGET_SMALL_DISTANCE;      /* up count button */
+       x += gi->width + ED_GADGET_SMALL_DISTANCE;      // up count button
       }
     }
   }
@@ -6449,14 +6714,13 @@ static void CreateDrawingAreas(void)
 {
   int i;
 
-  /* these values are not constant, but can change at runtime */
+  // these values are not constant, but can change at runtime
   drawingarea_info[ED_DRAWING_ID_DRAWING_LEVEL].area_xsize = MAX_ED_FIELDX;
   drawingarea_info[ED_DRAWING_ID_DRAWING_LEVEL].area_ysize = MAX_ED_FIELDY;
 
   for (i = 0; i < ED_NUM_DRAWING_AREAS; i++)
   {
     struct GadgetInfo *gi;
-    unsigned int event_mask;
     int id = drawingarea_info[i].gadget_id;
     int x = SX + ED_AREA_SETTINGS_X(drawingarea_info[i]);
     int y = SY + ED_AREA_SETTINGS_Y(drawingarea_info[i]);
@@ -6464,17 +6728,16 @@ static void CreateDrawingAreas(void)
     int area_ysize = drawingarea_info[i].area_ysize;
     int item_size = (id == GADGET_ID_DRAWING_LEVEL ?
                     ed_tilesize : ED_DRAWINGAREA_TILE_SIZE);
-
-    event_mask =
+    unsigned int event_mask =
       GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
       GD_EVENT_OFF_BORDERS | GD_EVENT_PIXEL_PRECISE;
 
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (drawingarea_info[i].gadget_id_align != GADGET_ID_NONE)
       x = (right_gadget_border[drawingarea_info[i].gadget_id_align] +
           ED_DRAWINGAREA_TEXT_DISTANCE);
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (drawingarea_info[i].text_left != NULL)
       x += getTextWidthForDrawingArea(drawingarea_info[i].text_left);
 
@@ -6491,7 +6754,7 @@ static void CreateDrawingAreas(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6512,7 +6775,7 @@ static void CreateTextInputGadgets(void)
     int gd_x2 = gd->src_x + gd->active_xoffset;
     int gd_y2 = gd->src_y + gd->active_yoffset;
     struct GadgetInfo *gi;
-    unsigned int event_mask;
+    unsigned int event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = textinput_info[i].gadget_id;
     int x, y;
@@ -6539,8 +6802,6 @@ static void CreateTextInputGadgets(void)
       y = ED_SETTINGS_Y(textinput_info[i].y);
     }
 
-    event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
-
     sprintf(infotext, "Enter %s", textinput_info[i].infotext);
     infotext[max_infotext_len] = '\0';
 
@@ -6564,7 +6825,7 @@ static void CreateTextInputGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6583,14 +6844,12 @@ static void CreateTextAreaGadgets(void)
     int gd_x2 = gd->src_x + gd->active_xoffset;
     int gd_y2 = gd->src_y + gd->active_yoffset;
     struct GadgetInfo *gi;
-    unsigned int event_mask;
+    unsigned int event_mask = GD_EVENT_TEXT_LEAVING;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = textarea_info[i].gadget_id;
     int area_xsize = textarea_info[i].xsize;
     int area_ysize = textarea_info[i].ysize;
 
-    event_mask = GD_EVENT_TEXT_LEAVING;
-
     sprintf(infotext, "Enter %s", textarea_info[i].infotext);
     infotext[max_infotext_len] = '\0';
 
@@ -6613,7 +6872,7 @@ static void CreateTextAreaGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6634,35 +6893,33 @@ static void CreateSelectboxGadgets(void)
     int gd_y2 = gd->src_y + gd->active_yoffset;
     int selectbox_button_xsize = gd2->width;
     struct GadgetInfo *gi;
-    unsigned int event_mask;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = selectbox_info[i].gadget_id;
     int x = SX + ED_SETTINGS_X(selectbox_info[i].x);
     int y = SY + ED_SETTINGS_Y(selectbox_info[i].y);
+    unsigned int event_mask =
+      GD_EVENT_RELEASED | GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
 
-    if (selectbox_info[i].size == -1)  /* dynamically determine size */
+    if (selectbox_info[i].size == -1)  // dynamically determine size
     {
-      /* (we cannot use -1 for uninitialized values if we directly compare
-        with results from strlen(), because the '<' and '>' operation will
-        implicitely cast -1 to an unsigned integer value!) */
+      // (we cannot use -1 for uninitialized values if we directly compare
+      // with results from strlen(), because the '<' and '>' operation will
+      // implicitely cast -1 to an unsigned integer value!)
       selectbox_info[i].size = 0;
 
       for (j = 0; selectbox_info[i].options[j].text != NULL; j++)
        if (strlen(selectbox_info[i].options[j].text) > selectbox_info[i].size)
          selectbox_info[i].size = strlen(selectbox_info[i].options[j].text);
 
-      selectbox_info[i].size++;                /* add one character empty space */
+      selectbox_info[i].size++;                // add one character empty space
     }
 
-    event_mask = GD_EVENT_RELEASED |
-      GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
-
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (selectbox_info[i].gadget_id_align != GADGET_ID_NONE)
       x = (right_gadget_border[selectbox_info[i].gadget_id_align] +
           ED_GADGET_TEXT_DISTANCE);
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (selectbox_info[i].text_left != NULL)
       x += getTextWidthForGadget(selectbox_info[i].text_left);
 
@@ -6692,7 +6949,7 @@ static void CreateSelectboxGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6709,7 +6966,7 @@ static void CreateTextbuttonGadgets(void)
   {
     int id = textbutton_info[i].gadget_id;
     int is_tab_button =
-      ((id >= GADGET_ID_LEVELINFO_LEVEL && id <= GADGET_ID_LEVELINFO_EDITOR) ||
+      ((id >= GADGET_ID_LEVELCONFIG_LEVEL && id <= GADGET_ID_LEVELCONFIG_EDITOR) ||
        (id >= GADGET_ID_PROPERTIES_INFO && id <= GADGET_ID_PROPERTIES_CHANGE));
     int graphic =
       (is_tab_button ? IMG_EDITOR_TABBUTTON : IMG_EDITOR_TEXTBUTTON);
@@ -6725,20 +6982,18 @@ static void CreateTextbuttonGadgets(void)
     int border_xsize = gd->border_size + gd->draw_xoffset;
     int border_ysize = gd->border_size;
     struct GadgetInfo *gi;
-    unsigned int event_mask;
+    unsigned int event_mask = GD_EVENT_RELEASED;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int x = SX + ED_SETTINGS_X(textbutton_info[i].x);
     int y = SY + ED_SETTINGS_Y(textbutton_info[i].y);
 
-    if (textbutton_info[i].size == -1) /* dynamically determine size */
+    if (textbutton_info[i].size == -1) // dynamically determine size
       textbutton_info[i].size = strlen(textbutton_info[i].text);
 
-    event_mask = GD_EVENT_RELEASED;
-
     sprintf(infotext, "%s", textbutton_info[i].infotext);
     infotext[max_infotext_len] = '\0';
 
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (textbutton_info[i].gadget_id_align != GADGET_ID_NONE)
     {
       int gadget_id_align = textbutton_info[i].gadget_id_align;
@@ -6749,7 +7004,7 @@ static void CreateTextbuttonGadgets(void)
        y = level_editor_gadget[gadget_id_align]->y;
     }
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (textbutton_info[i].text_left != NULL)
       x += getTextWidthForGadget(textbutton_info[i].text_left);
 
@@ -6776,7 +7031,7 @@ static void CreateTextbuttonGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6787,10 +7042,9 @@ static void CreateTextbuttonGadgets(void)
 static void CreateGraphicbuttonGadgets(void)
 {
   struct GadgetInfo *gi;
-  unsigned int event_mask;
   int i;
 
-  /* create buttons for scrolling of drawing area and element list */
+  // create buttons for scrolling of drawing area and element list
   for (i = 0; i < ED_NUM_GRAPHICBUTTONS; i++)
   {
     int id = graphicbutton_info[i].gadget_id;
@@ -6802,15 +7056,14 @@ static void CreateGraphicbuttonGadgets(void)
     int gd_y1 = gd->src_y;
     int gd_x2 = gd->src_x + gd->pressed_xoffset;
     int gd_y2 = gd->src_y + gd->pressed_yoffset;
+    unsigned int event_mask = GD_EVENT_RELEASED;
 
-    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
-
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (graphicbutton_info[i].gadget_id_align != GADGET_ID_NONE)
       x = (right_gadget_border[graphicbutton_info[i].gadget_id_align] +
           ED_GADGET_TEXT_DISTANCE);
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (graphicbutton_info[i].text_left != NULL)
       x += getTextWidthForGadget(graphicbutton_info[i].text_left);
 
@@ -6832,7 +7085,7 @@ static void CreateGraphicbuttonGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6844,7 +7097,7 @@ static void CreateScrollbarGadgets(void)
 {
   int i;
 
-  /* these values are not constant, but can change at runtime */
+  // these values are not constant, but can change at runtime
   scrollbar_pos[ED_SCROLLBAR_ID_AREA_HORIZONTAL].x =
     SX + ED_SCROLL_HORIZONTAL_XPOS;
   scrollbar_pos[ED_SCROLLBAR_ID_AREA_HORIZONTAL].y =
@@ -6895,7 +7148,7 @@ static void CreateScrollbarGadgets(void)
     int gd_y2 = gd->src_y + gd->pressed_yoffset;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
-    unsigned int event_mask;
+    unsigned int event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
 
     if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
     {
@@ -6903,7 +7156,7 @@ static void CreateScrollbarGadgets(void)
       items_visible = ED_ELEMENTLIST_BUTTONS_VERT;
       item_position = element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ;
     }
-    else       /* drawing area scrollbars */
+    else       // drawing area scrollbars
     {
       if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
       {
@@ -6919,8 +7172,6 @@ static void CreateScrollbarGadgets(void)
       }
     }
 
-    event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
-
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_IMAGE_ID, graphic,
@@ -6947,7 +7198,7 @@ static void CreateScrollbarGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6956,11 +7207,8 @@ static void CreateScrollbarGadgets(void)
 static void CreateCheckbuttonGadgets(void)
 {
   struct GadgetInfo *gi;
-  unsigned int event_mask;
   int i;
 
-  event_mask = GD_EVENT_PRESSED;
-
   for (i = 0; i < ED_NUM_CHECKBUTTONS; i++)
   {
     int id = checkbutton_info[i].gadget_id;
@@ -6977,13 +7225,14 @@ static void CreateCheckbuttonGadgets(void)
     int gd_y2a = gd->src_y + gd->active_yoffset + gd->pressed_yoffset;
     int x = SX + ED_SETTINGS_X(checkbutton_info[i].x);
     int y = SY + ED_SETTINGS_Y(checkbutton_info[i].y);
+    unsigned int event_mask = GD_EVENT_PRESSED;
 
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (checkbutton_info[i].gadget_id_align != GADGET_ID_NONE)
       x = (right_gadget_border[checkbutton_info[i].gadget_id_align] +
           ED_GADGET_TEXT_DISTANCE);
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (checkbutton_info[i].text_left != NULL)
       x += getTextWidthForGadget(checkbutton_info[i].text_left);
 
@@ -7007,7 +7256,7 @@ static void CreateCheckbuttonGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -7028,26 +7277,24 @@ static void CreateRadiobuttonGadgets(void)
   int gd_x2a = gd->src_x + gd->active_xoffset + gd->pressed_xoffset;
   int gd_y2a = gd->src_y + gd->active_yoffset + gd->pressed_yoffset;
   struct GadgetInfo *gi;
-  unsigned int event_mask;
   int i;
 
-  event_mask = GD_EVENT_PRESSED;
-
   for (i = 0; i < ED_NUM_RADIOBUTTONS; i++)
   {
     int id = radiobutton_info[i].gadget_id;
     int x = SX + ED_SETTINGS_X(radiobutton_info[i].x);
     int y = SY + ED_SETTINGS_Y(radiobutton_info[i].y);
+    unsigned int event_mask = GD_EVENT_PRESSED;
 
     int checked =
       (*radiobutton_info[i].value == radiobutton_info[i].checked_value);
 
-    /* determine horizontal position to the right of specified gadget */
+    // determine horizontal position to the right of specified gadget
     if (radiobutton_info[i].gadget_id_align != GADGET_ID_NONE)
       x = (right_gadget_border[radiobutton_info[i].gadget_id_align] +
           ED_GADGET_TEXT_DISTANCE);
 
-    /* determine horizontal offset for leading text */
+    // determine horizontal offset for leading text
     if (radiobutton_info[i].text_left != NULL)
       x += getTextWidthForGadget(radiobutton_info[i].text_left);
 
@@ -7072,7 +7319,7 @@ static void CreateRadiobuttonGadgets(void)
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -7082,33 +7329,38 @@ static void CreateRadiobuttonGadgets(void)
 
 void CreateLevelEditorGadgets(void)
 {
-  /* force EDITOR font inside level editor */
+  // force EDITOR font inside level editor
   SetFontStatus(GAME_MODE_EDITOR);
 
-  /* these values are not constant, but can change at runtime */
+  // these values are not constant, but can change at runtime
   ed_fieldx = MAX_ED_FIELDX - 1;
   ed_fieldy = MAX_ED_FIELDY - 1;
 
   num_editor_gadgets = NUM_EDITOR_GADGETS;
 
-  // printf("::: allocating %d gadgets ...\n", num_editor_gadgets);
+  // Debug("editor", "allocating %d gadgets ...\n", num_editor_gadgets);
 
   level_editor_gadget =
     checked_calloc(num_editor_gadgets * sizeof(struct GadgetInfo *));
   right_gadget_border =
     checked_calloc(num_editor_gadgets * sizeof(int));
 
-  editor_el_empty = checked_calloc(ED_NUM_ELEMENTLIST_BUTTONS * sizeof(int));
+  // set number of empty (padding) element buttons to maximum number of buttons
+  num_editor_el_empty = ED_NUM_ELEMENTLIST_BUTTONS;
+
+  editor_el_empty = checked_calloc(num_editor_el_empty * sizeof(int));
   editor_el_empty_ptr = editor_el_empty;
 
   use_permanent_palette = !editor.palette.show_as_separate_screen;
 
+  InitGadgetScreenBorders(-1, INFOTEXT_YPOS);
+
   ReinitializeElementList();
 
   CreateControlButtons();
   CreateScrollbarGadgets();
 
-  /* order of function calls is important because of cross-references */
+  // order of function calls is important because of cross-references
   CreateCheckbuttonGadgets();
   CreateCounterButtons();
   CreateRadiobuttonGadgets();
@@ -7126,7 +7378,7 @@ void FreeLevelEditorGadgets(void)
 {
   int i;
 
-  // printf("::: freeing %d gadgets ...\n", num_editor_gadgets);
+  // Debug("editor", "freeing %d gadgets ...\n", num_editor_gadgets);
 
   for (i = 0; i < num_editor_gadgets; i++)
   {
@@ -7156,21 +7408,21 @@ static void MapCounterButtons(int id)
   int yoffset_above = font_height + ED_GADGET_LINE_DISTANCE;
   int yoffset = (gi_down->height - font_height) / 2;
   int x_left = gi_down->x - xoffset_left;
-  int x_right; /* set after gadget position was modified */
+  int x_right; // set after gadget position was modified
   int y_above = gi_down->y - yoffset_above;
   int x = gi_down->x;
-  int y;       /* set after gadget position was modified */
+  int y;       // set after gadget position was modified
 
-  /* counter limits must be changed first to prevent value truncation */
+  // counter limits must be changed first to prevent value truncation
   ModifyEditorCounterLimits(id, counterbutton_info[id].min_value,
                            counterbutton_info[id].max_value);
 
-  /* right text position might have changed after setting position above */
+  // right text position might have changed after setting position above
   x_right = gi_up->x + gi_up->width + xoffset_right;
 
   ModifyEditorCounterValue(id, *counterbutton_info[id].value);
 
-  /* set position for "value[1,2,3,4]" counter gadgets (score in most cases) */
+  // set position for "value[1,2,3,4]" counter gadgets (score in most cases)
   if (id >= ED_COUNTER_ID_ELEMENT_VALUE1 &&
       id <= ED_COUNTER_ID_ELEMENT_VALUE4)
   {
@@ -7182,7 +7434,7 @@ static void MapCounterButtons(int id)
                 SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
   }
 
-  /* vertical position might have changed after setting position above */
+  // vertical position might have changed after setting position above
   y = gi_up->y + yoffset;
 
   if (counterbutton_info[id].text_above)
@@ -7204,17 +7456,17 @@ static void MapControlButtons(void)
   int counter_id;
   int i;
 
-  /* map toolbox buttons (excluding special CE toolbox buttons) */
+  // map toolbox buttons (excluding special CE toolbox buttons)
   for (i = 0; i < ED_NUM_CTRL1_2_BUTTONS; i++)
     MapGadget(level_editor_gadget[i]);
 
-  /* map toolbox buttons (element properties buttons) */
+  // map toolbox buttons (element properties buttons)
   for (i = ED_NUM_CTRL1_4_BUTTONS; i < ED_NUM_CTRL1_7_BUTTONS; i++)
     MapGadget(level_editor_gadget[i]);
 
   if (use_permanent_palette)
   {
-    /* map buttons to select elements */
+    // map buttons to select elements
     for (i = 0; i < ED_NUM_ELEMENTLIST_BUTTONS; i++)
       MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
     MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL]);
@@ -7222,7 +7474,7 @@ static void MapControlButtons(void)
     MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
   }
 
-  /* map buttons to select level */
+  // map buttons to select level
   counter_id = ED_COUNTER_ID_SELECT_LEVEL;
   counterbutton_info[counter_id].min_value = leveldir_current->first_level;
   counterbutton_info[counter_id].max_value = leveldir_current->last_level;
@@ -7240,8 +7492,10 @@ static void MapDrawingArea(int id)
   int xoffset_below = getTextWidth(drawingarea_info[id].text_below, font_nr);
   int x_left  = gi->x - xoffset_left;
   int x_right = gi->x + gi->width + ED_DRAWINGAREA_TEXT_DISTANCE;
+  int x_above = gi->x - ED_DRAWINGAREA_BORDER_SIZE;
   int x_below = gi->x + (gi->width - xoffset_below) / 2;
   int y_side  = gi->y + (gi->height - font_height) / 2;
+  int y_above = gi->y - font_height - ED_DRAWINGAREA_TEXT_DISTANCE;
   int y_below = gi->y + gi->height + ED_DRAWINGAREA_TEXT_DISTANCE;
 
   if (drawingarea_info[id].text_left)
@@ -7250,6 +7504,9 @@ static void MapDrawingArea(int id)
   if (drawingarea_info[id].text_right)
     DrawText(x_right, y_side, drawingarea_info[id].text_right, font_nr);
 
+  if (drawingarea_info[id].text_above)
+    DrawText(x_above, y_above, drawingarea_info[id].text_above, font_nr);
+
   if (drawingarea_info[id].text_below)
     DrawText(x_below, y_below, drawingarea_info[id].text_below, font_nr);
 
@@ -7290,9 +7547,13 @@ static void MapTextAreaGadget(int id)
   int yoffset_above = font_height + ED_GADGET_LINE_DISTANCE;
   int x_above = ED_SETTINGS_X(textarea_info[id].x);
   int y_above = ED_SETTINGS_Y(textarea_info[id].y) - yoffset_above;
+  char *text_above = textarea_info[id].text_above;
+
+  if (gi->textarea.cropped && textarea_info[id].text_above_cropped)
+    text_above = textarea_info[id].text_above_cropped;
 
-  if (textarea_info[id].text_above)
-    DrawTextS(x_above, y_above, font_nr, textarea_info[id].text_above);
+  if (text_above)
+    DrawTextS(x_above, y_above, font_nr, text_above);
 
   ModifyGadget(gi, GDI_TEXT_VALUE, textarea_info[id].value, GDI_END);
 
@@ -7343,7 +7604,7 @@ static void MapTextbuttonGadget(int id)
   int x = gi->x;
   int y = gi->y + yoffset;
 
-  /* only show button to delete change pages when more than minimum pages */
+  // only show button to delete change pages when more than minimum pages
   if (id == ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE &&
       custom_element.num_change_pages == MIN_CHANGE_PAGES)
     return;
@@ -7417,11 +7678,11 @@ static void MapCheckbuttonGadget(int id)
   int yoffset = (gi->height - font_height) / 2;
   int y_above = gi->y - yoffset_above;
   int x = gi->x;
-  int x_left, x_right, y;      /* set after gadget position was modified */
+  int x_left, x_right, y;      // set after gadget position was modified
 
-  /* set position for gadgets with dynamically determined position */
-  if (checkbutton_info[id].x != -1)    /* do not change dynamic positions */
-    ModifyGadget(gi, GDI_X, SX + ED_SETTINGS_X(checkbutton_info[id].x),GDI_END);
+  // set position for gadgets with dynamically determined position
+  if (checkbutton_info[id].x != -1)    // do not change dynamic positions
+    ModifyGadget(gi, GDI_X, SX + ED_SETTINGS_X(checkbutton_info[id].x), GDI_END);
   ModifyGadget(gi, GDI_Y, SY + ED_SETTINGS_Y(checkbutton_info[id].y), GDI_END);
 
   x_left = gi->x - xoffset_left;
@@ -7504,6 +7765,14 @@ static void MapLevelEditorToolboxCustomGadgets(void)
   MapOrUnmapLevelEditorToolboxCustomGadgets(TRUE);
 }
 
+static void MapLevelEditorToolboxCustomGadgetsIfNeeded(void)
+{
+  if (IS_CUSTOM_ELEMENT(properties_element) ||
+      IS_GROUP_ELEMENT(properties_element) ||
+      IS_EMPTY_ELEMENT(properties_element))
+    MapLevelEditorToolboxCustomGadgets();
+}
+
 static void UnmapLevelEditorToolboxCustomGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxCustomGadgets(FALSE);
@@ -7592,13 +7861,13 @@ static void DrawEditModeWindowExt(boolean remap_toolbox_gadgets)
     RedrawDrawingElements();
   }
 
-  if (edit_mode == ED_MODE_INFO)
-    DrawLevelInfoWindow();
+  if (edit_mode == ED_MODE_LEVELCONFIG)
+    DrawLevelConfigWindow();
   else if (edit_mode == ED_MODE_PROPERTIES)
     DrawPropertiesWindow();
   else if (edit_mode == ED_MODE_PALETTE)
     DrawPaletteWindow();
-  else /* edit_mode == ED_MODE_DRAWING */
+  else // edit_mode == ED_MODE_DRAWING
     DrawDrawingWindowExt(remap_toolbox_gadgets);
 }
 
@@ -7626,7 +7895,7 @@ static boolean LevelChanged(void)
 
   for (y = 0; y < lev_fieldy; y++) 
     for (x = 0; x < lev_fieldx; x++)
-      if (Feld[x][y] != level.field[x][y])
+      if (Tile[x][y] != level.field[x][y])
        field_changed = TRUE;
 
   return (level.changed || field_changed);
@@ -7654,7 +7923,7 @@ static boolean PrepareSavingIntoPersonalLevelSet(void)
     return TRUE;
   }
 
-  if (!Request("This level is read only! "
+  if (!Request("This level is read-only! "
               "Save into personal level set?", REQ_ASK))
     return FALSE;
 
@@ -7662,6 +7931,17 @@ static boolean PrepareSavingIntoPersonalLevelSet(void)
   leveldir_current =
     getTreeInfoFromIdentifier(leveldir_first, getLoginName());
 
+  // this may happen if "setup.internal.create_user_levelset" is FALSE
+  // or if file "levelinfo.conf" is missing in personal user level set
+  if (leveldir_current == NULL)
+  {
+    Request("Cannot find personal level set?!", REQ_CONFIRM);
+
+    leveldir_current = leveldir_former;
+
+    return FALSE;
+  }
+
   // find unused level number
   for (new_level_nr = leveldir_current->first_level; ; new_level_nr++)
   {
@@ -7682,7 +7962,7 @@ static boolean PrepareSavingIntoPersonalLevelSet(void)
   return TRUE;
 }
 
-static void ModifyLevelInfoForSavingIntoPersonalLevelSet(char *former_name)
+static void ModifyLevelConfigForSavingIntoPersonalLevelSet(char *former_name)
 {
   static char *filename_levelinfo = NULL, *mod_name = NULL;
   FILE *file;
@@ -7778,19 +8058,19 @@ static void setSelectboxSpecialActionVariablesIfNeeded(void)
 {
   int i;
 
-  /* change action mode and arg variables according to action type variable */
+  // change action mode and arg variables according to action type variable
   for (i = 0; action_arg_options[i].value != -1; i++)
   {
     if (action_arg_options[i].value == custom_element_change.action_type)
     {
       int mode = action_arg_options[i].mode;
 
-      /* only change if corresponding selectbox has changed */
+      // only change if corresponding selectbox has changed
       if (selectbox_info[ED_SELECTBOX_ID_ACTION_MODE].options !=
          action_arg_modes[mode])
        custom_element_change.action_mode = -1;
 
-      /* only change if corresponding selectbox has changed */
+      // only change if corresponding selectbox has changed
       if (selectbox_info[ED_SELECTBOX_ID_ACTION_ARG].options !=
          action_arg_options[i].options)
        custom_element_change.action_arg = -1;
@@ -7804,7 +8084,7 @@ static void setSelectboxSpecialActionOptions(void)
 {
   int i;
 
-  /* change action mode and arg selectbox according to action type selectbox */
+  // change action mode and arg selectbox according to action type selectbox
   for (i = 0; action_arg_options[i].value != -1; i++)
   {
     if (action_arg_options[i].value == custom_element_change.action_type)
@@ -7866,7 +8146,7 @@ static void replace_custom_element_in_settings(int element_from,
            change->target_content.e[x][y] = element_to;
     }
 
-    if (ei->group != NULL)                             /* group or internal */
+    if (ei->group != NULL)                             // group or internal
       for (j = 0; j < MAX_ELEMENTS_IN_GROUP; j++)
        if (ei->group->element[j] == element_from)
          ei->group->element[j] = element_to;
@@ -7880,8 +8160,8 @@ static void replace_custom_element_in_playfield(int element_from,
 
   for (x = 0; x < lev_fieldx; x++)
     for (y = 0; y < lev_fieldy; y++)
-      if (Feld[x][y] == element_from)
-       Feld[x][y] = element_to;
+      if (Tile[x][y] == element_from)
+       Tile[x][y] = element_to;
 }
 
 static boolean CopyCustomElement(int element_old, int element_new,
@@ -7915,12 +8195,18 @@ static boolean CopyCustomElement(int element_old, int element_new,
 
     return FALSE;
   }
+  else if (IS_EMPTY_ELEMENT(element_old) && !IS_EMPTY_ELEMENT(element_new))
+  {
+    Request("Please choose empty element!", REQ_CONFIRM);
+
+    return FALSE;
+  }
   else
   {
     level.changed = TRUE;
   }
 
-  /* when modifying custom/group element, ask for copying level template */
+  // when modifying custom/group element, ask for copying level template
   if (copy_mode_orig != GADGET_ID_CUSTOM_COPY && level.use_custom_template)
   {
     if (!AskToCopyAndModifyLevelTemplate())
@@ -7961,7 +8247,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
   int i;
   int current_change_page = element_info[element].current_change_page;
 
-  /* dynamically (re)build selectbox for selecting change page */
+  // dynamically (re)build selectbox for selecting change page
   for (i = 0; i < element_info[element].num_change_pages; i++)
   {
     sprintf(options_change_page_strings[i], "%d", i + 1);
@@ -7973,7 +8259,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
   options_change_page[i].value = -1;
   options_change_page[i].text = NULL;
 
-  /* needed here to initialize combined element properties */
+  // needed here to initialize combined element properties
   InitElementPropertiesEngine(level.game_version);
 
   element_info[element].change =
@@ -7982,10 +8268,10 @@ static void CopyCustomElementPropertiesToEditor(int element)
   custom_element = element_info[element];
   custom_element_change = *element_info[element].change;
 
-  /* needed to initially set selectbox options for special action options */
+  // needed to initially set selectbox options for special action options
   setSelectboxSpecialActionOptions();
 
-  /* needed to initially set selectbox value variables to reliable defaults */
+  // needed to initially set selectbox value variables to reliable defaults
   for (i = 0; i < ED_NUM_SELECTBOX; i++)
     setSelectboxValue(i, *selectbox_info[i].value);
 
@@ -7995,9 +8281,9 @@ static void CopyCustomElementPropertiesToEditor(int element)
   for (i = 0; i < NUM_CHANGE_EVENTS; i++)
     custom_element_change_events[i] = HAS_CHANGE_EVENT(element, i);
 
-  /* ---------- element settings: configure (custom elements) ------------- */
+  // ---------- element settings: configure (custom elements) -----------------
 
-  /* set accessible layer selectbox help value */
+  // set accessible layer selectbox help value
   custom_element.access_type =
     (IS_WALKABLE(element) ? EP_WALKABLE :
      IS_PASSABLE(element) ? EP_PASSABLE :
@@ -8014,7 +8300,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
      IS_ACCESSIBLE_INSIDE(element) ||
      IS_ACCESSIBLE_UNDER(element));
 
-  /* set walk-to-object action selectbox help value */
+  // set walk-to-object action selectbox help value
   custom_element.walk_to_action =
     (IS_DIGGABLE(element) ? EP_DIGGABLE :
      IS_COLLECTIBLE_ONLY(element) ? EP_COLLECTIBLE_ONLY :
@@ -8029,7 +8315,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
      IS_THROWABLE(element) ||
      IS_PUSHABLE(element));
 
-  /* set smash targets selectbox help value */
+  // set smash targets selectbox help value
   custom_element.smash_targets =
     (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
      CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
@@ -8040,7 +8326,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
      CAN_SMASH_ENEMIES(element) ||
      CAN_SMASH_PLAYER(element));
 
-  /* set deadliness selectbox help value */
+  // set deadliness selectbox help value
   custom_element.deadliness =
     (DONT_TOUCH(element) ? EP_DONT_TOUCH :
      DONT_GET_HIT_BY(element) ? EP_DONT_GET_HIT_BY :
@@ -8053,11 +8339,12 @@ static void CopyCustomElementPropertiesToEditor(int element)
      DONT_COLLIDE_WITH(element) ||
      DONT_RUN_INTO(element));
 
-  /* ---------- element settings: advanced (custom elements) --------------- */
+  // ---------- element settings: advanced (custom elements) ------------------
 
-  /* set "change by direct action" selectbox help value */
+  // set "change by direct action" selectbox help value
   custom_element_change.direct_action =
-    (HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
+    (HAS_CHANGE_EVENT(element, CE_NEXT_TO_PLAYER) ? CE_NEXT_TO_PLAYER :
+     HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
      HAS_CHANGE_EVENT(element, CE_PRESSED_BY_PLAYER) ? CE_PRESSED_BY_PLAYER :
      HAS_CHANGE_EVENT(element, CE_SWITCHED_BY_PLAYER) ? CE_SWITCHED_BY_PLAYER :
      HAS_CHANGE_EVENT(element, CE_SNAPPED_BY_PLAYER) ? CE_SNAPPED_BY_PLAYER :
@@ -8075,11 +8362,14 @@ static void CopyCustomElementPropertiesToEditor(int element)
      HAS_CHANGE_EVENT(element, CE_SCORE_CHANGES) ? CE_SCORE_CHANGES :
      HAS_CHANGE_EVENT(element, CE_VALUE_GETS_ZERO) ? CE_VALUE_GETS_ZERO :
      HAS_CHANGE_EVENT(element, CE_SCORE_GETS_ZERO) ? CE_SCORE_GETS_ZERO :
+     HAS_CHANGE_EVENT(element, CE_CLICKED_BY_MOUSE) ? CE_CLICKED_BY_MOUSE :
+     HAS_CHANGE_EVENT(element, CE_PRESSED_BY_MOUSE) ? CE_PRESSED_BY_MOUSE :
      custom_element_change.direct_action);
 
-  /* set "change by other element action" selectbox help value */
+  // set "change by other element action" selectbox help value
   custom_element_change.other_action =
-    (HAS_CHANGE_EVENT(element, CE_PLAYER_TOUCHES_X) ? CE_PLAYER_TOUCHES_X :
+    (HAS_CHANGE_EVENT(element, CE_PLAYER_NEXT_TO_X) ? CE_PLAYER_NEXT_TO_X :
+     HAS_CHANGE_EVENT(element, CE_PLAYER_TOUCHES_X) ? CE_PLAYER_TOUCHES_X :
      HAS_CHANGE_EVENT(element, CE_PLAYER_PRESSES_X) ? CE_PLAYER_PRESSES_X :
      HAS_CHANGE_EVENT(element, CE_PLAYER_SWITCHES_X) ? CE_PLAYER_SWITCHES_X :
      HAS_CHANGE_EVENT(element, CE_PLAYER_SNAPS_X) ? CE_PLAYER_SNAPS_X :
@@ -8089,6 +8379,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
      HAS_CHANGE_EVENT(element, CE_PLAYER_DIGS_X) ? CE_PLAYER_DIGS_X :
      HAS_CHANGE_EVENT(element, CE_PLAYER_COLLECTS_X) ? CE_PLAYER_COLLECTS_X :
      HAS_CHANGE_EVENT(element, CE_PLAYER_DROPS_X) ? CE_PLAYER_DROPS_X :
+     HAS_CHANGE_EVENT(element, CE_NEXT_TO_X) ? CE_NEXT_TO_X :
      HAS_CHANGE_EVENT(element, CE_TOUCHING_X) ? CE_TOUCHING_X :
      HAS_CHANGE_EVENT(element, CE_HITTING_X) ? CE_HITTING_X :
      HAS_CHANGE_EVENT(element, CE_DIGGING_X) ? CE_DIGGING_X :
@@ -8102,18 +8393,25 @@ static void CopyCustomElementPropertiesToEditor(int element)
      HAS_CHANGE_EVENT(element, CE_SCORE_CHANGES_OF_X) ? CE_SCORE_CHANGES_OF_X :
      HAS_CHANGE_EVENT(element, CE_VALUE_GETS_ZERO_OF_X) ? CE_VALUE_GETS_ZERO_OF_X :
      HAS_CHANGE_EVENT(element, CE_SCORE_GETS_ZERO_OF_X) ? CE_SCORE_GETS_ZERO_OF_X :
+     HAS_CHANGE_EVENT(element, CE_MOUSE_CLICKED_ON_X) ? CE_MOUSE_CLICKED_ON_X :
+     HAS_CHANGE_EVENT(element, CE_MOUSE_PRESSED_ON_X) ? CE_MOUSE_PRESSED_ON_X :
      custom_element_change.other_action);
 }
 
 static void CopyGroupElementPropertiesToEditor(int element)
 {
   group_element_info = *element_info[element].group;
-  custom_element = element_info[element];      /* needed for description */
+  custom_element = element_info[element];      // needed for description
+}
+
+static void CopyEmptyElementPropertiesToEditor(int element)
+{
+  custom_element = element_info[element];
 }
 
 static void CopyClassicElementPropertiesToEditor(int element)
 {
-  if (ELEM_IS_PLAYER(element) || COULD_MOVE_INTO_ACID(element))
+  if (IS_PLAYER_ELEMENT(element) || COULD_MOVE_INTO_ACID(element))
     custom_element_properties[EP_CAN_MOVE_INTO_ACID] =
       getMoveIntoAcidProperty(&level, element);
 
@@ -8128,6 +8426,8 @@ static void CopyElementPropertiesToEditor(int element)
     CopyCustomElementPropertiesToEditor(element);
   else if (IS_GROUP_ELEMENT(element))
     CopyGroupElementPropertiesToEditor(element);
+  else if (IS_EMPTY_ELEMENT(element))
+    CopyEmptyElementPropertiesToEditor(element);
   else
     CopyClassicElementPropertiesToEditor(element);
 }
@@ -8147,9 +8447,9 @@ static boolean AskToCopyAndModifyLevelTemplate(void)
   }
   else
   {
-    LoadLevelTemplate(-1);     /* this resets all element modifications ... */
+    LoadLevelTemplate(-1);     // this resets all element modifications ...
 
-    DrawEditModeWindow();      /* ... and copies them to 'custom_element' */
+    DrawEditModeWindow();      // ... and copies them to 'custom_element'
 
     return FALSE;
   }
@@ -8160,7 +8460,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   int i;
   int access_type_and_layer;
 
-  /* mark that this custom element has been modified */
+  // mark that this custom element has been modified
   custom_element.modified_settings = TRUE;
   level.changed = TRUE;
 
@@ -8170,9 +8470,9 @@ static void CopyCustomElementPropertiesToGame(int element)
   element_info[element] = custom_element;
   *element_info[element].change = custom_element_change;
 
-  /* ---------- element settings: configure (custom elements) ------------- */
+  // ---------- element settings: configure (custom elements) -----------------
 
-  /* set accessible property from checkbox and selectbox */
+  // set accessible property from checkbox and selectbox
   custom_element_properties[EP_WALKABLE_OVER] = FALSE;
   custom_element_properties[EP_WALKABLE_INSIDE] = FALSE;
   custom_element_properties[EP_WALKABLE_UNDER] = FALSE;
@@ -8188,7 +8488,7 @@ static void CopyCustomElementPropertiesToGame(int element)
     (custom_element.access_protected != 0 &&
      custom_element_properties[EP_ACCESSIBLE]);
 
-  /* set walk-to-object property from checkbox and selectbox */
+  // set walk-to-object property from checkbox and selectbox
   custom_element_properties[EP_DIGGABLE] = FALSE;
   custom_element_properties[EP_COLLECTIBLE_ONLY] = FALSE;
   custom_element_properties[EP_DROPPABLE] = FALSE;
@@ -8197,14 +8497,14 @@ static void CopyCustomElementPropertiesToGame(int element)
   custom_element_properties[custom_element.walk_to_action] =
     custom_element_properties[EP_WALK_TO_OBJECT];
 
-  /* set smash property from checkbox and selectbox */
+  // set smash property from checkbox and selectbox
   custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
   custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
   custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
   custom_element_properties[custom_element.smash_targets] =
     custom_element_properties[EP_CAN_SMASH];
 
-  /* set deadliness property from checkbox and selectbox */
+  // set deadliness property from checkbox and selectbox
   custom_element_properties[EP_DONT_RUN_INTO] = FALSE;
   custom_element_properties[EP_DONT_COLLIDE_WITH] = FALSE;
   custom_element_properties[EP_DONT_GET_HIT_BY] = FALSE;
@@ -8212,9 +8512,10 @@ static void CopyCustomElementPropertiesToGame(int element)
   custom_element_properties[custom_element.deadliness] =
     custom_element_properties[EP_DEADLY];
 
-  /* ---------- element settings: advanced (custom elements) --------------- */
+  // ---------- element settings: advanced (custom elements) ------------------
 
-  /* set player change event from checkbox and selectbox */
+  // set player change event from checkbox and selectbox
+  custom_element_change_events[CE_NEXT_TO_PLAYER] = FALSE;
   custom_element_change_events[CE_TOUCHED_BY_PLAYER] = FALSE;
   custom_element_change_events[CE_PRESSED_BY_PLAYER] = FALSE;
   custom_element_change_events[CE_SWITCHED_BY_PLAYER] = FALSE;
@@ -8233,10 +8534,13 @@ static void CopyCustomElementPropertiesToGame(int element)
   custom_element_change_events[CE_SCORE_CHANGES] = FALSE;
   custom_element_change_events[CE_VALUE_GETS_ZERO] = FALSE;
   custom_element_change_events[CE_SCORE_GETS_ZERO] = FALSE;
+  custom_element_change_events[CE_CLICKED_BY_MOUSE] = FALSE;
+  custom_element_change_events[CE_PRESSED_BY_MOUSE] = FALSE;
   custom_element_change_events[custom_element_change.direct_action] =
     custom_element_change_events[CE_BY_DIRECT_ACTION];
 
-  /* set other element action change event from checkbox and selectbox */
+  // set other element action change event from checkbox and selectbox
+  custom_element_change_events[CE_PLAYER_NEXT_TO_X] = FALSE;
   custom_element_change_events[CE_PLAYER_TOUCHES_X] = FALSE;
   custom_element_change_events[CE_PLAYER_PRESSES_X] = FALSE;
   custom_element_change_events[CE_PLAYER_SWITCHES_X] = FALSE;
@@ -8247,6 +8551,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   custom_element_change_events[CE_PLAYER_DIGS_X] = FALSE;
   custom_element_change_events[CE_PLAYER_COLLECTS_X] = FALSE;
   custom_element_change_events[CE_PLAYER_DROPS_X] = FALSE;
+  custom_element_change_events[CE_NEXT_TO_X] = FALSE;
   custom_element_change_events[CE_TOUCHING_X] = FALSE;
   custom_element_change_events[CE_HITTING_X] = FALSE;
   custom_element_change_events[CE_DIGGING_X] = FALSE;
@@ -8260,6 +8565,8 @@ static void CopyCustomElementPropertiesToGame(int element)
   custom_element_change_events[CE_SCORE_CHANGES_OF_X] = FALSE;
   custom_element_change_events[CE_VALUE_GETS_ZERO_OF_X] = FALSE;
   custom_element_change_events[CE_SCORE_GETS_ZERO_OF_X] = FALSE;
+  custom_element_change_events[CE_MOUSE_CLICKED_ON_X] = FALSE;
+  custom_element_change_events[CE_MOUSE_PRESSED_ON_X] = FALSE;
   custom_element_change_events[custom_element_change.other_action] =
     custom_element_change_events[CE_BY_OTHER_ACTION];
 
@@ -8269,14 +8576,17 @@ static void CopyCustomElementPropertiesToGame(int element)
   for (i = 0; i < NUM_CHANGE_EVENTS; i++)
     SET_CHANGE_EVENT(element, i, custom_element_change_events[i]);
 
-  /* copy change events also to special level editor variable */
+  // copy change events also to special level editor variable
   custom_element = element_info[element];
   custom_element_change = *element_info[element].change;
+
+  // needed here to restore runtime value "element_info[element].gfx_element"
+  InitElementPropertiesGfxElement();
 }
 
 static void CopyGroupElementPropertiesToGame(int element)
 {
-  /* mark that this group element has been modified */
+  // mark that this group element has been modified
   custom_element.modified_settings = TRUE;
   level.changed = TRUE;
 
@@ -8285,11 +8595,29 @@ static void CopyGroupElementPropertiesToGame(int element)
 
   element_info[element] = custom_element;
   *element_info[element].group = group_element_info;
+
+  // needed here to restore runtime value "element_info[element].gfx_element"
+  InitElementPropertiesGfxElement();
+}
+
+static void CopyEmptyElementPropertiesToGame(int element)
+{
+  // mark that this empty element has been modified
+  custom_element.modified_settings = TRUE;
+  level.changed = TRUE;
+
+  if (level.use_custom_template)
+    AskToCopyAndModifyLevelTemplate();
+
+  element_info[element] = custom_element;
+
+  // needed here to restore runtime value "element_info[element].gfx_element"
+  InitElementPropertiesGfxElement();
 }
 
 static void CopyClassicElementPropertiesToGame(int element)
 {
-  if (ELEM_IS_PLAYER(element) || COULD_MOVE_INTO_ACID(element))
+  if (IS_PLAYER_ELEMENT(element) || COULD_MOVE_INTO_ACID(element))
     setMoveIntoAcidProperty(&level, element,
                            custom_element_properties[EP_CAN_MOVE_INTO_ACID]);
 
@@ -8304,6 +8632,8 @@ static void CopyElementPropertiesToGame(int element)
     CopyCustomElementPropertiesToGame(element);
   else if (IS_GROUP_ELEMENT(element))
     CopyGroupElementPropertiesToGame(element);
+  else if (IS_EMPTY_ELEMENT(element))
+    CopyEmptyElementPropertiesToGame(element);
   else
     CopyClassicElementPropertiesToGame(element);
 }
@@ -8315,8 +8645,7 @@ static void CheckElementDescriptions(void)
 
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     if (getElementDescriptionFilename(i) == NULL && !IS_OBSOLETE(i))
-      Error(ERR_WARN, "no element description file for element '%s'",
-           EL_NAME(i));
+      Warn("no element description file for element '%s'", EL_NAME(i));
 }
 #endif
 
@@ -8349,6 +8678,9 @@ static void InitZoomLevelSettings(int zoom_tilesize)
     ed_tilesize = setup.auto_setup.editor_zoom_tilesize;
     ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
 
+    // make sure that tile size is always a power of 2
+    ed_tilesize = (1 << log_2(ed_tilesize));
+
     if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     {
       ed_tilesize = DEFAULT_EDITOR_TILESIZE_MM;
@@ -8450,38 +8782,49 @@ static boolean useEditorDoorAnimation(void)
   return (door_1_viewport_unchanged && door_1_contains_toolbox);
 }
 
+static void DrawEditorDoorBackground(int graphic, int x, int y,
+                                    int width, int height)
+{
+  struct GraphicInfo *g = &graphic_info[graphic];
+
+  if (g->bitmap != NULL)
+    BlitBitmap(g->bitmap, drawto, g->src_x, g->src_y,
+              MIN(width, g->width), MIN(height, g->height), x, y);
+  else
+    ClearRectangle(drawto, x, y, width, height);
+}
+
 static void DrawEditorDoorContent(void)
 {
-  /* needed for gadgets drawn on background (like palette scrollbar) */
+  // needed for gadgets drawn on background (like palette scrollbar)
   SetDoorBackgroundImage(IMG_UNDEFINED);
 
-  /* copy default editor door content to main double buffer */
-  BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto,
-            graphic_info[IMG_BACKGROUND_PALETTE].src_x,
-            graphic_info[IMG_BACKGROUND_PALETTE].src_y,
-            MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width),
-            MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height),
-            DX, DY);
+  // copy default editor door content to main double buffer
+  DrawEditorDoorBackground(IMG_BACKGROUND_PALETTE, DX, DY, DXSIZE, DYSIZE);
 
-  /* draw bigger door */
+  // draw bigger door
   DrawSpecialEditorDoor();
 
-  /* draw new control window */
-  BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
-            graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
-            graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
-            MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width),
-            MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height),
-            EX, EY);
+  // draw new control window
+  DrawEditorDoorBackground(IMG_BACKGROUND_TOOLBOX, EX, EY, EXSIZE, EYSIZE);
 
-  /* draw all toolbox gadgets to editor doors */
+  // draw all toolbox gadgets to editor doors
   MapControlButtons();
 
-  /* draw all palette gadgets to editor doors */
+  // when returning from test game to properties page, redraw toolbox gadgets
+  if (edit_mode == ED_MODE_PROPERTIES)
+  {
+    UnmapLevelEditorToolboxDrawingGadgets();
+    UnmapLevelEditorToolboxCustomGadgets();
+
+    MapLevelEditorToolboxCustomGadgetsIfNeeded();
+  }
+
+  // draw all palette gadgets to editor doors
   ModifyEditorElementList();
   RedrawDrawingElements();
 
-  /* copy actual editor door content to door double buffer for OpenDoor() */
+  // copy actual editor door content to door double buffer for OpenDoor()
   BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
 }
 
@@ -8491,12 +8834,12 @@ void DrawLevelEd(void)
 
   FadeSoundsAndMusic();
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
 
-  /* needed if different viewport properties defined for editor */
+  // needed if different viewport properties defined for editor
   ChangeViewportPropertiesIfNeeded();
 
   ClearField();
@@ -8511,15 +8854,15 @@ void DrawLevelEd(void)
 
   if (level_editor_test_game)
   {
-    CopyPlayfield(level.field, Feld);
-    CopyPlayfield(FieldBackup, level.field);
+    CopyPlayfield(level.field, Tile);
+    CopyPlayfield(TileBackup, level.field);
 
     level_editor_test_game = FALSE;
   }
   else
   {
     edit_mode = ED_MODE_DRAWING;
-    edit_mode_levelinfo = ED_MODE_LEVELINFO_LEVEL;
+    edit_mode_levelconfig = ED_MODE_LEVELCONFIG_LEVEL;
     edit_mode_properties = ED_MODE_PROPERTIES_INFO;
 
     ResetUndoBuffer();
@@ -8533,8 +8876,8 @@ void DrawLevelEd(void)
   FreeLevelEditorGadgets();
   CreateLevelEditorGadgets();
 
-  ReinitializeElementList();           /* update dynamic level element list */
-  ReinitializeElementListButtons();    /* custom element may look different */
+  ReinitializeElementList();           // update dynamic level element list
+  ReinitializeElementListButtons();    // custom element may look different
 
   InitElementPropertiesGfxElement();
 
@@ -8575,23 +8918,23 @@ static void AdjustDrawingAreaGadgets(void)
 
   if (suppressBorderElement())
   {
-    ed_xsize = max_ed_fieldx;
-    ed_ysize = max_ed_fieldy;
+    ed_xsize = lev_fieldx;
+    ed_ysize = lev_fieldy;
   }
 
-  /* check if we need any scrollbars */
+  // check if we need any scrollbars
   horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
   vertical_scrollbar_needed   = (ed_ysize > max_ed_fieldy);
 
-  /* check if we have a smaller editor field because of scrollbars */
+  // check if we have a smaller editor field because of scrollbars
   max_ed_fieldx = getMaxEdFieldX(vertical_scrollbar_needed);
   max_ed_fieldy = getMaxEdFieldY(horizontal_scrollbar_needed);
 
-  /* check again if we now need more scrollbars because of less space */
+  // check again if we now need more scrollbars because of less space
   horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
   vertical_scrollbar_needed   = (ed_ysize > max_ed_fieldy);
 
-  /* check if editor field gets even smaller after adding new scrollbars */
+  // check if editor field gets even smaller after adding new scrollbars
   max_ed_fieldx = getMaxEdFieldX(vertical_scrollbar_needed);
   max_ed_fieldy = getMaxEdFieldY(horizontal_scrollbar_needed);
 
@@ -8604,13 +8947,13 @@ static void AdjustDrawingAreaGadgets(void)
   width  = ed_fieldx * ed_tilesize - 2 * ED_SCROLLBUTTON_XSIZE;
   height = ed_fieldy * ed_tilesize - 2 * ED_SCROLLBUTTON_YSIZE;
 
-  /* adjust drawing area gadget */
+  // adjust drawing area gadget
   ModifyGadget(level_editor_gadget[GADGET_ID_DRAWING_LEVEL],
               GDI_AREA_SIZE, ed_fieldx, ed_fieldy,
               GDI_ITEM_SIZE, ed_tilesize, ed_tilesize,
               GDI_END);
 
-  /* adjust horizontal scrollbar gadgets */
+  // adjust horizontal scrollbar gadgets
   ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LEFT],
               GDI_Y, y,
               GDI_END);
@@ -8624,7 +8967,7 @@ static void AdjustDrawingAreaGadgets(void)
               GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldx,
               GDI_END);
 
-  /* adjust vertical scrollbar gadgets */
+  // adjust vertical scrollbar gadgets
   ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_UP],
               GDI_X, x,
               GDI_END);
@@ -8692,7 +9035,7 @@ static void AdjustElementListScrollbar(void)
   struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL];
   int items_max, items_visible, item_position;
 
-  /* correct position of element list scrollbar */
+  // correct position of element list scrollbar
   if (element_shift < 0)
     element_shift = 0;
   if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
@@ -8755,7 +9098,7 @@ static void ModifyEditorSelectboxOptions(int selectbox_id,
 
   selectbox_info[selectbox_id].options = options;
 
-  /* set index to zero -- list may be shorter now (correct later, if needed) */
+  // set index to zero -- list may be shorter now (correct later, if needed)
   ModifyGadget(gi, GDI_SELECTBOX_INDEX, 0,
               GDI_SELECTBOX_OPTIONS, options, GDI_END);
 }
@@ -8902,7 +9245,7 @@ static int getTabulatorBarHeight(void)
 
 static Pixel getTabulatorBarColor(void)
 {
-  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL];
+  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELCONFIG_LEVEL];
   struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED];
   int gd_x = gd->x + gd_gi1->border.width / 2;
   int gd_y = gd->y + gd_gi1->height - 1;
@@ -8910,25 +9253,25 @@ static Pixel getTabulatorBarColor(void)
   return GetPixel(gd->bitmap, gd_x, gd_y);
 }
 
-static void DrawLevelInfoTabulatorGadgets(void)
+static void DrawLevelConfigTabulatorGadgets(void)
 {
-  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL];
+  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELCONFIG_LEVEL];
   Pixel tab_color = getTabulatorBarColor();
-  int id_first = ED_TAB_BUTTON_ID_LEVELINFO_FIRST;
-  int id_last  = ED_TAB_BUTTON_ID_LEVELINFO_LAST;
+  int id_first = ED_TAB_BUTTON_ID_LEVELCONFIG_FIRST;
+  int id_last  = ED_TAB_BUTTON_ID_LEVELCONFIG_LAST;
   int i;
 
   for (i = id_first; i <= id_last; i++)
   {
     int gadget_id = textbutton_info[i].gadget_id;
     struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-    boolean active = (i != edit_mode_levelinfo);
+    boolean active = (i != edit_mode_levelconfig);
 
-    /* draw background line below tabulator button */
+    // draw background line below tabulator button
     ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width, 1);
 
-    /* draw solid line below inactive tabulator buttons */
-    if (!active && tab_color != BLACK_PIXEL)   /* black => transparent */
+    // draw solid line below inactive tabulator buttons
+    if (!active && tab_color != BLACK_PIXEL)   // black => transparent
       FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,
                    ED_GADGET_TINY_DISTANCE, tab_color);
 
@@ -8936,8 +9279,8 @@ static void DrawLevelInfoTabulatorGadgets(void)
     MapTextbuttonGadget(i);
   }
 
-  /* draw little border line below tabulator buttons */
-  if (tab_color != BLACK_PIXEL)                        /* black => transparent */
+  // draw little border line below tabulator buttons
+  if (tab_color != BLACK_PIXEL)                        // black => transparent
     FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height +
                  ED_GADGET_TINY_DISTANCE,
                  getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color);
@@ -8954,11 +9297,11 @@ static void DrawPropertiesTabulatorGadgets(void)
   int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
   int i;
 
-  /* draw two config tabulators for player elements */
-  if (ELEM_IS_PLAYER(properties_element))
+  // draw two config tabulators for player elements
+  if (IS_PLAYER_ELEMENT(properties_element))
     id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2;
 
-  /* draw two config and one "change" tabulator for custom elements */
+  // draw two config and one "change" tabulator for custom elements
   if (IS_CUSTOM_ELEMENT(properties_element))
     id_last = ED_TEXTBUTTON_ID_PROPERTIES_CHANGE;
 
@@ -8968,17 +9311,17 @@ static void DrawPropertiesTabulatorGadgets(void)
     struct GadgetInfo *gi = level_editor_gadget[gadget_id];
     boolean active = (i != edit_mode_properties);
 
-    /* use "config 1" and "config 2" instead of "config" for players and CEs */
+    // use "config 1" and "config 2" instead of "config" for players and CEs
     if (i == ED_TEXTBUTTON_ID_PROPERTIES_CONFIG &&
-       (ELEM_IS_PLAYER(properties_element) ||
+       (IS_PLAYER_ELEMENT(properties_element) ||
         IS_CUSTOM_ELEMENT(properties_element)))
       continue;
 
-    /* draw background line below tabulator button */
+    // draw background line below tabulator button
     ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width, 1);
 
-    /* draw solid line below inactive tabulator buttons */
-    if (!active && tab_color != BLACK_PIXEL)   /* black => transparent */
+    // draw solid line below inactive tabulator buttons
+    if (!active && tab_color != BLACK_PIXEL)   // black => transparent
       FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,
                    ED_GADGET_TINY_DISTANCE, tab_color);
 
@@ -8986,8 +9329,8 @@ static void DrawPropertiesTabulatorGadgets(void)
     MapTextbuttonGadget(i);
   }
 
-  /* draw little border line below tabulator buttons */
-  if (tab_color != BLACK_PIXEL)                        /* black => transparent */
+  // draw little border line below tabulator buttons
+  if (tab_color != BLACK_PIXEL)                        // black => transparent
     FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height +
                  ED_GADGET_TINY_DISTANCE,
                  getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color);
@@ -9011,23 +9354,23 @@ static int PrintElementDescriptionFromFile(char *filename, int font_nr,
                      TRUE, FALSE, FALSE);
 }
 
-static void DrawLevelInfoLevel(void)
+static void DrawLevelConfigLevel(void)
 {
   int i;
 
-  /* draw counter gadgets */
+  // draw counter gadgets
   for (i = ED_COUNTER_ID_LEVEL_FIRST; i <= ED_COUNTER_ID_LEVEL_LAST; i++)
     MapCounterButtons(i);
 
-  /* draw checkbutton gadgets */
+  // draw checkbutton gadgets
   for (i = ED_CHECKBUTTON_ID_LEVEL_FIRST; i<= ED_CHECKBUTTON_ID_LEVEL_LAST; i++)
     MapCheckbuttonGadget(i);
 
-  /* draw selectbox gadgets */
+  // draw selectbox gadgets
   for (i = ED_SELECTBOX_ID_LEVEL_FIRST; i <= ED_SELECTBOX_ID_LEVEL_LAST; i++)
     MapSelectboxGadget(i);
 
-  /* draw text input gadgets */
+  // draw text input gadgets
   for (i = ED_TEXTINPUT_ID_LEVEL_FIRST; i <= ED_TEXTINPUT_ID_LEVEL_LAST; i++)
     MapTextInputGadget(i);
 }
@@ -9040,7 +9383,7 @@ static char *getLevelSubdirFromSaveMode(int save_mode)
   return leveldir_current->subdir;
 }
 
-static void DrawLevelInfoLevelSet_DirectoryInfo(void)
+static void DrawLevelConfigLevelSet_DirectoryInfo(void)
 {
   char *directory_text = "Level set directory:";
   char *directory_name = getLevelSubdirFromSaveMode(levelset_save_mode);
@@ -9055,17 +9398,17 @@ static void DrawLevelInfoLevelSet_DirectoryInfo(void)
   PrintInfoText(directory_name, font2_nr, x, y);
 }
 
-static void DrawLevelInfoLevelSet(void)
+static void DrawLevelConfigLevelSet(void)
 {
   boolean artwork_exists = checkIfCustomArtworkExistsForCurrentLevelSet();
   boolean template_exists = fileExists(getLocalLevelTemplateFilename());
   int i;
 
-  /* draw counter gadgets */
+  // draw counter gadgets
   for (i = ED_COUNTER_ID_LEVELSET_FIRST; i <= ED_COUNTER_ID_LEVELSET_LAST; i++)
     MapCounterButtons(i);
 
-  /* draw checkbutton gadgets */
+  // draw checkbutton gadgets
   for (i = ED_CHECKBUTTON_ID_LEVELSET_FIRST; i <= ED_CHECKBUTTON_ID_LEVELSET_LAST; i++)
   {
     if (levelset_save_mode == LEVELSET_SAVE_MODE_UPDATE ||
@@ -9076,45 +9419,45 @@ static void DrawLevelInfoLevelSet(void)
     MapCheckbuttonGadget(i);
   }
 
-  /* draw selectbox gadgets */
+  // draw selectbox gadgets
   for (i = ED_SELECTBOX_ID_LEVELSET_FIRST; i <= ED_SELECTBOX_ID_LEVELSET_LAST; i++)
     MapSelectboxGadget(i);
 
-  /* draw text input gadgets */
+  // draw text input gadgets
   for (i = ED_TEXTINPUT_ID_LEVELSET_FIRST; i <= ED_TEXTINPUT_ID_LEVELSET_LAST; i++)
     MapTextInputGadget(i);
 
-  /* draw textbutton gadgets */
+  // draw textbutton gadgets
   MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_LEVELSET);
 
-  /* draw info text */
-  DrawLevelInfoLevelSet_DirectoryInfo();
+  // draw info text
+  DrawLevelConfigLevelSet_DirectoryInfo();
 }
 
-static void DrawLevelInfoEditor(void)
+static void DrawLevelConfigEditor(void)
 {
   int i;
 
-  /* draw counter gadgets */
+  // draw counter gadgets
   for (i = ED_COUNTER_ID_EDITOR_FIRST; i <= ED_COUNTER_ID_EDITOR_LAST; i++)
     MapCounterButtons(i);
 
-  /* draw checkbutton gadgets */
+  // draw checkbutton gadgets
   for (i=ED_CHECKBUTTON_ID_EDITOR_FIRST; i<= ED_CHECKBUTTON_ID_EDITOR_LAST; i++)
     MapCheckbuttonGadget(i);
 
-  /* draw radiobutton gadgets */
+  // draw radiobutton gadgets
   for (i=ED_RADIOBUTTON_ID_EDITOR_FIRST; i<= ED_RADIOBUTTON_ID_EDITOR_LAST; i++)
     MapRadiobuttonGadget(i);
 
-  /* draw drawing area */
+  // draw drawing area
   MapDrawingArea(ED_DRAWING_ID_RANDOM_BACKGROUND);
 
-  /* draw textbutton gadgets */
+  // draw textbutton gadgets
   MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2);
 }
 
-static void DrawLevelInfoWindow(void)
+static void DrawLevelConfigWindow(void)
 {
   char *text = "Global Settings";
   int font_nr = FONT_TITLE_1;
@@ -9133,14 +9476,14 @@ static void DrawLevelInfoWindow(void)
 
   DrawText(sx, sy, text, font_nr);
 
-  DrawLevelInfoTabulatorGadgets();
+  DrawLevelConfigTabulatorGadgets();
 
-  if (edit_mode_levelinfo == ED_MODE_LEVELINFO_LEVEL)
-    DrawLevelInfoLevel();
-  else if (edit_mode_levelinfo == ED_MODE_LEVELINFO_LEVELSET)
-    DrawLevelInfoLevelSet();
-  else if (edit_mode_levelinfo == ED_MODE_LEVELINFO_EDITOR)
-    DrawLevelInfoEditor();
+  if (edit_mode_levelconfig == ED_MODE_LEVELCONFIG_LEVEL)
+    DrawLevelConfigLevel();
+  else if (edit_mode_levelconfig == ED_MODE_LEVELCONFIG_LEVELSET)
+    DrawLevelConfigLevelSet();
+  else if (edit_mode_levelconfig == ED_MODE_LEVELCONFIG_EDITOR)
+    DrawLevelConfigEditor();
 }
 
 static void DrawCustomContentArea(void)
@@ -9152,7 +9495,7 @@ static void DrawCustomContentArea(void)
   int x3 = right_gadget_border[GADGET_ID_CUSTOM_EXPLODE_IMPACT];
   int xoffset = ED_GADGET_SPACE_DISTANCE;
 
-  /* add distance for potential left text (without drawing area border) */
+  // add distance for potential left text (without drawing area border)
   x2 += getTextWidthForGadget(drawingarea_info[id].text_left);
 
   ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END);
@@ -9195,7 +9538,7 @@ static void DrawYamYamContentAreas(void)
   int y = SY + ED_AREA_YAMYAM_CONTENT_Y(3) + yoffset;
   int i;
 
-  /* display counter to choose number of element content areas */
+  // display counter to choose number of element content areas
   MapCounterButtons(ED_COUNTER_ID_YAMYAM_CONTENT);
 
   for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
@@ -9210,7 +9553,7 @@ static void DrawYamYamContentAreas(void)
     {
       UnmapDrawingArea(id);
 
-      /* delete content areas in case of reducing number of them */
+      // delete content areas in case of reducing number of them
       RemoveElementContentArea(id, font_height);
     }
   }
@@ -9230,7 +9573,7 @@ static void DrawMagicBallContentAreas(void)
   int y = SY + ED_AREA_MAGIC_BALL_CONTENT_Y(3) + yoffset;
   int i;
 
-  /* display counter to choose number of element content areas */
+  // display counter to choose number of element content areas
   MapCounterButtons(ED_COUNTER_ID_BALL_CONTENT);
 
   for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
@@ -9245,7 +9588,7 @@ static void DrawMagicBallContentAreas(void)
     {
       UnmapDrawingArea(id);
 
-      /* delete content areas in case of reducing number of them */
+      // delete content areas in case of reducing number of them
       RemoveElementContentArea(id, font_height);
     }
   }
@@ -9255,7 +9598,7 @@ static void DrawMagicBallContentAreas(void)
   DrawText(x, y + 2 * tilesize, "active",    font_nr);
 }
 
-static void DrawAndroidElementArea(int element)
+static void DrawAndroidElementArea(void)
 {
   int id = ED_DRAWING_ID_ANDROID_CONTENT;
   int num_elements = level.num_android_clone_elements;
@@ -9265,7 +9608,7 @@ static void DrawAndroidElementArea(int element)
   int xsize = MAX_ANDROID_ELEMENTS;
   int ysize = 1;
 
-  /* display counter to choose number of element areas */
+  // display counter to choose number of element areas
   MapCounterButtons(ED_COUNTER_ID_ANDROID_CONTENT);
 
   if (drawingarea_info[id].text_left != NULL)
@@ -9275,7 +9618,7 @@ static void DrawAndroidElementArea(int element)
 
   ModifyEditorDrawingArea(id, num_elements, 1);
 
-  /* delete content areas in case of reducing number of them */
+  // delete content areas in case of reducing number of them
   DrawBackground(sx, sy,
                 xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
                 ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
@@ -9283,7 +9626,7 @@ static void DrawAndroidElementArea(int element)
   MapDrawingArea(id);
 }
 
-static void DrawGroupElementArea(int element)
+static void DrawGroupElementArea(void)
 {
   int id = ED_DRAWING_ID_GROUP_CONTENT;
   int num_elements = group_element_info.num_elements;
@@ -9300,7 +9643,7 @@ static void DrawGroupElementArea(int element)
 
   ModifyEditorDrawingArea(id, num_elements, 1);
 
-  /* delete content areas in case of reducing number of them */
+  // delete content areas in case of reducing number of them
   DrawBackground(sx, sy,
                 xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
                 ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
@@ -9319,12 +9662,12 @@ static void DrawPlayerInitialInventoryArea(int element)
   int xsize = MAX_INITIAL_INVENTORY_SIZE;
   int ysize = 1;
 
-  /* determine horizontal position to the right of specified gadget */
+  // determine horizontal position to the right of specified gadget
   if (drawingarea_info[id].gadget_id_align != GADGET_ID_NONE)
     sx = (right_gadget_border[drawingarea_info[id].gadget_id_align] +
          ED_DRAWINGAREA_TEXT_DISTANCE);
 
-  /* determine horizontal offset for leading text */
+  // determine horizontal offset for leading text
   if (drawingarea_info[id].text_left != NULL)
     sx += getTextWidthForDrawingArea(drawingarea_info[id].text_left);
 
@@ -9332,7 +9675,7 @@ static void DrawPlayerInitialInventoryArea(int element)
 
   ModifyEditorDrawingArea(id, num_elements, 1);
 
-  /* delete content areas in case of reducing number of them */
+  // delete content areas in case of reducing number of them
   DrawBackground(sx, sy,
                 xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
                 ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
@@ -9340,21 +9683,48 @@ static void DrawPlayerInitialInventoryArea(int element)
   MapDrawingArea(id);
 }
 
-static void DrawEnvelopeTextArea(int envelope_nr)
+static void DrawMMBallContentArea(void)
 {
-  int id = ED_TEXTAREA_ID_ENVELOPE_INFO;
-  struct GadgetInfo *gi = level_editor_gadget[textarea_info[id].gadget_id];
+  int id = ED_DRAWING_ID_MM_BALL_CONTENT;
+  int num_elements = level.num_mm_ball_contents;
+  int border_size = ED_DRAWINGAREA_BORDER_SIZE;
+  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size;
+  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size;
+  int xsize = MAX_MM_BALL_CONTENTS;
+  int ysize = 1;
 
-  UnmapGadget(gi);
-  DrawBackground(gi->x, gi->y, gi->width, gi->height);
+  if (drawingarea_info[id].text_left != NULL)
+    sx += getTextWidthForDrawingArea(drawingarea_info[id].text_left);
 
-  if (envelope_nr != -1)
-    textarea_info[id].value = level.envelope[envelope_nr].text;
+  UnmapDrawingArea(id);
 
-  ModifyGadget(gi, GDI_AREA_SIZE,
-              *counterbutton_info[ED_COUNTER_ID_ENVELOPE_XSIZE].value,
-              *counterbutton_info[ED_COUNTER_ID_ENVELOPE_YSIZE].value,
-              GDI_END);
+  ModifyEditorDrawingArea(id, num_elements, 1);
+
+  // delete content areas in case of reducing number of them
+  DrawBackground(sx, sy,
+                xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
+                ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
+
+  MapDrawingArea(id);
+}
+
+static void DrawEnvelopeTextArea(int envelope_nr)
+{
+  int id = ED_TEXTAREA_ID_ENVELOPE_INFO;
+  struct GadgetInfo *gi = level_editor_gadget[textarea_info[id].gadget_id];
+
+  UnmapGadget(gi);
+
+  DrawBackground(gi->x, gi->y,
+                gi->textarea.crop_width, gi->textarea.crop_height);
+
+  if (envelope_nr != -1)
+    textarea_info[id].value = level.envelope[envelope_nr].text;
+
+  ModifyGadget(gi, GDI_AREA_SIZE,
+              *counterbutton_info[ED_COUNTER_ID_ENVELOPE_XSIZE].value,
+              *counterbutton_info[ED_COUNTER_ID_ENVELOPE_YSIZE].value,
+              GDI_END);
 
   MapTextAreaGadget(ED_TEXTAREA_ID_ENVELOPE_INFO);
 }
@@ -9368,7 +9738,7 @@ static void DrawPropertiesInfo(void)
   }
   properties[] =
   {
-    /* configurable properties */
+    // configurable properties
 
     { EP_WALKABLE_OVER,                "- player can walk over it"             },
     { EP_WALKABLE_INSIDE,      "- player can walk inside it"           },
@@ -9409,7 +9779,7 @@ static void DrawPropertiesInfo(void)
 
     { EP_CAN_CHANGE,           "- can change to other element"         },
 
-    /* pre-defined properties */
+    // pre-defined properties
     { EP_CAN_PASS_MAGIC_WALL,  "- can pass magic walls"                },
     { EP_CAN_PASS_DC_MAGIC_WALL,"- can pass magic walls (DC style)"    },
     { EP_SWITCHABLE,           "- can be switched"                     },
@@ -9420,13 +9790,16 @@ static void DrawPropertiesInfo(void)
     { -1,                      NULL                                    }
   };
   char *filename = getElementDescriptionFilename(properties_element);
-  char *percentage_text = "In this level: ";
+  char *num_elements_text = "In this level: ";
+  char *num_similar_text = "Similar tiles: ";
   char *properties_text = "Standard properties: ";
   char *description_text = "Description:";
   char *no_description_text = "No description available.";
   char *none_text = "None";
   float percentage;
-  int num_elements_in_level;
+  int num_elements_in_level = 0;
+  int num_similar_in_level = 0;
+  int num_hires_tiles_in_level = 0;
   int num_standard_properties = 0;
   int font1_nr = FONT_TEXT_1;
   int font2_nr = FONT_TEXT_2;
@@ -9435,7 +9808,8 @@ static void DrawPropertiesInfo(void)
   int font2_height = getFontHeight(font2_nr);
   int line1_height = font1_height + ED_GADGET_LINE_DISTANCE;
   int font2_yoffset = (font1_height - font2_height) / 2;
-  int percentage_text_len = strlen(percentage_text) * font1_width;
+  int num_elements_text_len = strlen(num_elements_text) * font1_width;
+  int num_similar_text_len = strlen(num_similar_text) * font1_width;
   int properties_text_len = strlen(properties_text) * font1_width;
   int xpos = ED_ELEMENT_SETTINGS_X(0);
   int ypos = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE;
@@ -9452,27 +9826,71 @@ static void DrawPropertiesInfo(void)
     ypos += 2 * font3_height;
   }
 
-  /* ----- print number of elements / percentage of this element in level */
+  // ----- print number of elements / percentage of this element in level
 
-  num_elements_in_level = 0;
-  for (y = 0; y < lev_fieldy; y++) 
+  for (y = 0; y < lev_fieldy; y++)
+  {
     for (x = 0; x < lev_fieldx; x++)
-      if (Feld[x][y] == properties_element)
+    {
+      if (Tile[x][y] == properties_element)
+      {
        num_elements_in_level++;
+      }
+      else if (IS_MM_WALL(Tile[x][y]) &&
+              map_mm_wall_element(Tile[x][y]) == properties_element)
+      {
+       num_hires_tiles_in_level += numHiresTiles(Tile[x][y]);
+      }
+    }
+  }
+
   percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
 
-  DrawTextS(xpos, ypos, font1_nr, percentage_text);
+  DrawTextS(xpos, ypos, font1_nr, num_elements_text);
 
-  if (num_elements_in_level > 0)
-    DrawTextF(xpos + percentage_text_len, ypos + font2_yoffset, font2_nr,
+  if (num_hires_tiles_in_level > 0)
+    DrawTextF(xpos + num_elements_text_len, ypos + font2_yoffset, font2_nr,
+             "%d wall tiles", num_hires_tiles_in_level);
+  else if (num_elements_in_level > 0)
+    DrawTextF(xpos + num_elements_text_len, ypos + font2_yoffset, font2_nr,
              "%d (%.2f %%)", num_elements_in_level, percentage);
   else
-    DrawTextF(xpos + percentage_text_len, ypos + font2_yoffset, font2_nr,
+    DrawTextF(xpos + num_elements_text_len, ypos + font2_yoffset, font2_nr,
              none_text);
 
+  // ----- print number of similar elements / percentage of them in level
+
+  for (y = 0; y < lev_fieldy; y++)
+  {
+    for (x = 0; x < lev_fieldx; x++)
+    {
+      if (strEqual(element_info[Tile[x][y]].class_name,
+                  element_info[properties_element].class_name))
+      {
+       num_similar_in_level++;
+      }
+    }
+  }
+
+  if (num_similar_in_level != num_elements_in_level)
+  {
+    ypos += 1 * MAX(font1_height, font2_height);
+
+    percentage = num_similar_in_level * 100.0 / (lev_fieldx * lev_fieldy);
+
+    DrawTextS(xpos, ypos, font1_nr, num_similar_text);
+
+    if (num_similar_in_level > 0)
+      DrawTextF(xpos + num_similar_text_len, ypos + font2_yoffset, font2_nr,
+               "%d (%.2f %%)", num_similar_in_level, percentage);
+    else
+      DrawTextF(xpos + num_similar_text_len, ypos + font2_yoffset, font2_nr,
+               none_text);
+  }
+
   ypos += 2 * MAX(font1_height, font2_height);
 
-  /* ----- print standard properties of this element */
+  // ----- print standard properties of this element
 
   DrawTextS(xpos, ypos, font1_nr, properties_text);
 
@@ -9500,7 +9918,7 @@ static void DrawPropertiesInfo(void)
 
   ypos += MAX(font1_height, font2_height);
 
-  /* ----- print special description of this element */
+  // ----- print special description of this element
 
   PrintInfoText(description_text, font1_nr, xpos, ypos);
 
@@ -9518,6 +9936,7 @@ static void DrawPropertiesInfo(void)
 #define TEXT_DURATION          "Duration when activated"
 #define TEXT_DELAY_ON          "Delay before activating"
 #define TEXT_DELAY_OFF         "Delay before deactivating"
+#define TEXT_DELAY_CHANGING    "Delay before changing"
 #define TEXT_DELAY_EXPLODING   "Delay before exploding"
 #define TEXT_DELAY_MOVING      "Delay before moving"
 #define TEXT_BALL_DELAY                "Element generation delay"
@@ -9582,9 +10001,9 @@ static struct
   { EL_NUT,            &level.score[SC_NUT],           TEXT_CRACKING   },
   { EL_DYNAMITE,       &level.score[SC_DYNAMITE],      TEXT_COLLECTING },
   { EL_EM_DYNAMITE,    &level.score[SC_DYNAMITE],      TEXT_COLLECTING },
-  { EL_DYNABOMB_INCREASE_NUMBER,&level.score[SC_DYNAMITE],TEXT_COLLECTING },
-  { EL_DYNABOMB_INCREASE_SIZE, &level.score[SC_DYNAMITE],TEXT_COLLECTING },
-  { EL_DYNABOMB_INCREASE_POWER,        &level.score[SC_DYNAMITE],TEXT_COLLECTING },
+  { EL_DYNABOMB_INCREASE_NUMBER,&level.score[SC_DYNAMITE], TEXT_COLLECTING },
+  { EL_DYNABOMB_INCREASE_SIZE, &level.score[SC_DYNAMITE], TEXT_COLLECTING },
+  { EL_DYNABOMB_INCREASE_POWER,        &level.score[SC_DYNAMITE], TEXT_COLLECTING },
   { EL_SHIELD_NORMAL,  &level.score[SC_SHIELD],        TEXT_COLLECTING },
   { EL_SHIELD_DEADLY,  &level.score[SC_SHIELD],        TEXT_COLLECTING },
   { EL_EXTRA_TIME,     &level.extra_time_score,        TEXT_COLLECTING },
@@ -9643,11 +10062,13 @@ static struct
   { EL_EMC_LENSES,     &level.lenses_score,            TEXT_COLLECTING },
   { EL_EMC_MAGNIFIER,  &level.magnify_score,           TEXT_COLLECTING },
   { EL_SPRING,         &level.slurp_score,             TEXT_SLURPING   },
+  { EL_SPRING_LEFT,    &level.slurp_score,             TEXT_SLURPING   },
+  { EL_SPRING_RIGHT,   &level.slurp_score,             TEXT_SLURPING   },
   { EL_EMC_LENSES,     &level.lenses_time,             TEXT_DURATION   },
   { EL_EMC_MAGNIFIER,  &level.magnify_time,            TEXT_DURATION   },
   { EL_MM_FUSE_ACTIVE, &level.mm_time_fuse,            TEXT_DELAY_OFF  },
   { EL_MM_BOMB,                &level.mm_time_bomb,            TEXT_DELAY_EXPLODING },
-  { EL_MM_GRAY_BALL,   &level.mm_time_ball,            TEXT_DELAY_ON   },
+  { EL_MM_GRAY_BALL,   &level.mm_time_ball,            TEXT_DELAY_CHANGING },
   { EL_MM_STEEL_BLOCK, &level.mm_time_block,           TEXT_DELAY_MOVING },
   { EL_MM_WOODEN_BLOCK,        &level.mm_time_block,           TEXT_DELAY_MOVING },
 
@@ -9661,11 +10082,13 @@ static boolean checkPropertiesConfig(int element)
   if (IS_GEM(element) ||
       IS_CUSTOM_ELEMENT(element) ||
       IS_GROUP_ELEMENT(element) ||
+      IS_EMPTY_ELEMENT(element) ||
       IS_BALLOON_ELEMENT(element) ||
       IS_ENVELOPE(element) ||
+      IS_MM_ENVELOPE(element) ||
       IS_MM_MCDUFFIN(element) ||
       IS_DF_LASER(element) ||
-      ELEM_IS_PLAYER(element) ||
+      IS_PLAYER_ELEMENT(element) ||
       HAS_EDITOR_CONTENT(element) ||
       CAN_GROW(element) ||
       COULD_MOVE_INTO_ACID(element) ||
@@ -9695,12 +10118,45 @@ static void SetAutomaticNumberOfGemsNeeded(void)
   {
     for (y = 0; y < lev_fieldy; y++)
     {
-      int element = Feld[x][y];
+      int element = Tile[x][y];
+
+      switch (element)
+      {
+       case EL_EMERALD:
+       case EL_EMERALD_YELLOW:
+       case EL_EMERALD_RED:
+       case EL_EMERALD_PURPLE:
+       case EL_BD_DIAMOND:
+       case EL_WALL_EMERALD:
+       case EL_WALL_EMERALD_YELLOW:
+       case EL_WALL_EMERALD_RED:
+       case EL_WALL_EMERALD_PURPLE:
+       case EL_WALL_BD_DIAMOND:
+       case EL_NUT:
+       case EL_SP_INFOTRON:
+       case EL_MM_KETTLE:
+       case EL_DF_CELL:
+         level.gems_needed++;
+         break;
 
-      if (IS_GEM(element) ||
-         element == EL_MM_KETTLE ||
-         element == EL_DF_CELL)
-       level.gems_needed++;
+       case EL_DIAMOND:
+       case EL_WALL_DIAMOND:
+         level.gems_needed += 3;
+         break;
+
+       case EL_PEARL:
+       case EL_WALL_PEARL:
+         level.gems_needed += 5;
+         break;
+
+       case EL_CRYSTAL:
+       case EL_WALL_CRYSTAL:
+         level.gems_needed += 8;
+         break;
+
+       default:
+         break;
+      }
     }
   }
 
@@ -9725,7 +10181,7 @@ static void DrawPropertiesConfig(void)
     return;
   }
 
-  /* check if there are elements where a value can be chosen for */
+  // check if there are elements where a value can be chosen for
   for (i = 0; elements_with_counter[i].element != -1; i++)
   {
     if (elements_with_counter[i].element == properties_element)
@@ -9747,12 +10203,12 @@ static void DrawPropertiesConfig(void)
       if (properties_element == EL_GAME_OF_LIFE ||
          properties_element == EL_BIOMAZE)
       {
-       counterbutton_info[counter_id].min_value = 0;   /* min neighbours */
-       counterbutton_info[counter_id].max_value = 8;   /* max neighbours */
+       counterbutton_info[counter_id].min_value = 0;   // min neighbours
+       counterbutton_info[counter_id].max_value = 8;   // max neighbours
       }
       else
       {
-       /* !!! CHANGE THIS FOR CERTAIN ELEMENTS !!! */
+       // !!! CHANGE THIS FOR CERTAIN ELEMENTS !!!
        counterbutton_info[counter_id].min_value = MIN_SCORE;
        counterbutton_info[counter_id].max_value = MAX_SCORE;
       }
@@ -9767,7 +10223,7 @@ static void DrawPropertiesConfig(void)
 
   if (HAS_EDITOR_CONTENT(properties_element))
   {
-    /* draw stickybutton gadget */
+    // draw stickybutton gadget
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT);
 
     if (IS_AMOEBOID(properties_element))
@@ -9783,17 +10239,26 @@ static void DrawPropertiesConfig(void)
       DrawMagicBallContentAreas();
 
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT);
-      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_BALL_STATE);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_BALL_ACTIVE);
     }
     else if (properties_element == EL_EMC_ANDROID)
-      DrawAndroidElementArea(properties_element);
+      DrawAndroidElementArea();
+    else if (properties_element == EL_MM_GRAY_BALL)
+    {
+      MapCounterButtons(ED_COUNTER_ID_MM_BALL_CONTENT);
+      MapSelectboxGadget(ED_SELECTBOX_ID_MM_BALL_CHOICE_MODE);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_ROTATE_MM_BALL_CONTENT);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EXPLODE_MM_BALL);
+
+      DrawMMBallContentArea();
+    }
   }
 
-  if (ELEM_IS_PLAYER(properties_element))
+  if (IS_PLAYER_ELEMENT(properties_element))
   {
     int player_nr = GET_PLAYER_NR(properties_element);
 
-    /* these properties can be set for every player individually */
+    // these properties can be set for every player individually
 
     if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_1)
     {
@@ -9849,13 +10314,15 @@ static void DrawPropertiesConfig(void)
       checkbutton_info[ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY].value =
        &level.use_initial_inventory[player_nr];
 
-      /* draw checkbutton gadgets */
+      // draw checkbutton gadgets
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_FINISH_DIG_COLLECT);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_KEEP_WALKABLE_CE);
 
-      /* draw counter gadgets */
+      // draw counter gadgets
       MapCounterButtons(ED_COUNTER_ID_INVENTORY_SIZE);
 
-      /* draw drawing area gadgets */
+      // draw drawing area gadgets
       DrawPlayerInitialInventoryArea(properties_element);
     }
   }
@@ -9867,15 +10334,15 @@ static void DrawPropertiesConfig(void)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE);
 
   if (COULD_MOVE_INTO_ACID(properties_element) &&
-      !ELEM_IS_PLAYER(properties_element) &&
+      !IS_PLAYER_ELEMENT(properties_element) &&
       (!IS_CUSTOM_ELEMENT(properties_element) ||
        edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_2))
   {
-    /* set position for checkbutton for "can move into acid" */
+    // set position for checkbutton for "can move into acid"
     checkbutton_info[ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID].x =
       ED_ELEMENT_SETTINGS_XPOS(IS_CUSTOM_ELEMENT(properties_element) ? 1 : 0);
     checkbutton_info[ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID].y =
-      ED_ELEMENT_SETTINGS_YPOS(IS_CUSTOM_ELEMENT(properties_element) ? 6 :
+      ED_ELEMENT_SETTINGS_YPOS(IS_CUSTOM_ELEMENT(properties_element) ? 7 :
                               IS_BALLOON_ELEMENT(properties_element) ||
                               HAS_EDITOR_CONTENT(properties_element) ? 1 : 0);
 
@@ -9885,12 +10352,18 @@ static void DrawPropertiesConfig(void)
   if (MAYBE_DONT_COLLIDE_WITH(properties_element))
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH);
 
-  if (properties_element == EL_SPRING)
+  if (properties_element == EL_SPRING ||
+      properties_element == EL_SPRING_LEFT ||
+      properties_element == EL_SPRING_RIGHT)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_SPRING_BUG);
 
   if (properties_element == EL_TIME_ORB_FULL)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG);
 
+  if (properties_element == EL_GAME_OF_LIFE ||
+      properties_element == EL_BIOMAZE)
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_LIFE_BUGS);
+
   if (CAN_GROW(properties_element))
   {
     checkbutton_info[ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE].y =
@@ -9899,21 +10372,34 @@ static void DrawPropertiesConfig(void)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE);
   }
 
+  if (properties_element == EL_SOKOBAN_FIELD_EMPTY)
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SB_FIELDS_NEEDED);
+
+  if (properties_element == EL_SOKOBAN_OBJECT)
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SB_OBJECTS_NEEDED);
+
   if (properties_element == EL_SOKOBAN_OBJECT ||
       properties_element == EL_SOKOBAN_FIELD_EMPTY ||
       properties_element == EL_SOKOBAN_FIELD_FULL)
+  {
+    checkbutton_info[ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN].y =
+      ED_ELEMENT_SETTINGS_XPOS(properties_element == EL_SOKOBAN_FIELD_FULL ?
+                              0 : 1);
+
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN);
+  }
 
   if (IS_BALLOON_ELEMENT(properties_element))
     MapSelectboxGadget(ED_SELECTBOX_ID_WIND_DIRECTION);
 
-  if (IS_ENVELOPE(properties_element))
+  if (IS_ENVELOPE(properties_element) ||
+      IS_MM_ENVELOPE(properties_element))
   {
     int counter1_id = ED_COUNTER_ID_ENVELOPE_XSIZE;
     int counter2_id = ED_COUNTER_ID_ENVELOPE_YSIZE;
     int button1_id = ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP;
     int button2_id = ED_CHECKBUTTON_ID_ENVELOPE_CENTERED;
-    int envelope_nr = properties_element - EL_ENVELOPE_1;
+    int envelope_nr = ENVELOPE_NR(properties_element);
 
     counterbutton_info[counter1_id].value = &level.envelope[envelope_nr].xsize;
     counterbutton_info[counter2_id].value = &level.envelope[envelope_nr].ysize;
@@ -9921,11 +10407,11 @@ static void DrawPropertiesConfig(void)
     checkbutton_info[button1_id].value = &level.envelope[envelope_nr].autowrap;
     checkbutton_info[button2_id].value = &level.envelope[envelope_nr].centered;
 
-    /* display counter to choose size of envelope text area */
+    // display counter to choose size of envelope text area
     MapCounterButtons(counter1_id);
     MapCounterButtons(counter2_id);
 
-    /* display checkbuttons to choose auto-wrap and alignment properties */
+    // display checkbuttons to choose auto-wrap and alignment properties
     MapCheckbuttonGadget(button1_id);
     MapCheckbuttonGadget(button2_id);
 
@@ -9948,55 +10434,55 @@ static void DrawPropertiesConfig(void)
 
   if (IS_CUSTOM_ELEMENT(properties_element))
   {
-    /* draw stickybutton gadget */
+    // draw stickybutton gadget
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT);
 
     if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_1)
     {
-      /* draw checkbutton gadgets */
+      // draw checkbutton gadgets
       for (i =  ED_CHECKBUTTON_ID_CUSTOM1_FIRST;
           i <= ED_CHECKBUTTON_ID_CUSTOM1_LAST; i++)
        MapCheckbuttonGadget(i);
 
-      /* draw counter gadgets */
+      // draw counter gadgets
       for (i =  ED_COUNTER_ID_CUSTOM1_FIRST;
           i <= ED_COUNTER_ID_CUSTOM1_LAST; i++)
        MapCounterButtons(i);
 
-      /* draw selectbox gadgets */
+      // draw selectbox gadgets
       for (i =  ED_SELECTBOX_ID_CUSTOM1_FIRST;
           i <= ED_SELECTBOX_ID_CUSTOM1_LAST; i++)
        MapSelectboxGadget(i);
 
-      /* draw textbutton gadgets */
+      // draw textbutton gadgets
       MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
 
-      /* draw text input gadgets */
+      // draw text input gadgets
       MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
 
-      /* draw drawing area gadgets */
+      // draw drawing area gadgets
       MapDrawingArea(ED_DRAWING_ID_CUSTOM_GRAPHIC);
 
       draw_footer_line = TRUE;
     }
     else if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG_2)
     {
-      /* draw checkbutton gadgets */
+      // draw checkbutton gadgets
       for (i =  ED_CHECKBUTTON_ID_CUSTOM2_FIRST;
           i <= ED_CHECKBUTTON_ID_CUSTOM2_LAST; i++)
        MapCheckbuttonGadget(i);
 
-      /* draw counter gadgets */
+      // draw counter gadgets
       for (i =  ED_COUNTER_ID_CUSTOM2_FIRST;
           i <= ED_COUNTER_ID_CUSTOM2_LAST; i++)
        MapCounterButtons(i);
 
-      /* draw selectbox gadgets */
+      // draw selectbox gadgets
       for (i =  ED_SELECTBOX_ID_CUSTOM2_FIRST;
           i <= ED_SELECTBOX_ID_CUSTOM2_LAST; i++)
        MapSelectboxGadget(i);
 
-      /* draw drawing area gadgets */
+      // draw drawing area gadgets
       MapDrawingArea(ED_DRAWING_ID_CUSTOM_MOVE_ENTER);
       MapDrawingArea(ED_DRAWING_ID_CUSTOM_MOVE_LEAVE);
       DrawCustomContentArea();
@@ -10004,35 +10490,52 @@ static void DrawPropertiesConfig(void)
   }
   else if (IS_GROUP_ELEMENT(properties_element))
   {
-    /* draw stickybutton gadget */
+    // draw stickybutton gadget
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT);
 
-    /* draw checkbutton gadgets */
+    // draw checkbutton gadgets
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC);
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1);
 
-    /* draw counter gadgets */
+    // draw counter gadgets
     MapCounterButtons(ED_COUNTER_ID_GROUP_CONTENT);
 
-    /* draw selectbox gadgets */
+    // draw selectbox gadgets
     MapSelectboxGadget(ED_SELECTBOX_ID_GROUP_CHOICE_MODE);
 
-    /* draw textbutton gadgets */
+    // draw textbutton gadgets
     MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
 
-    /* draw drawing area gadgets */
-    DrawGroupElementArea(properties_element);
+    // draw drawing area gadgets
+    DrawGroupElementArea();
 
-    /* draw text input gadgets */
+    // draw text input gadgets
     MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
 
-    /* draw drawing area gadgets */
+    // draw drawing area gadgets
+    MapDrawingArea(ED_DRAWING_ID_CUSTOM_GRAPHIC);
+
+    draw_footer_line = TRUE;
+  }
+  else if (IS_EMPTY_ELEMENT(properties_element))
+  {
+    // draw stickybutton gadget
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT);
+
+    // draw checkbutton gadgets
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC);
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1);
+
+    // draw textbutton gadgets
+    MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
+
+    // draw drawing area gadgets
     MapDrawingArea(ED_DRAWING_ID_CUSTOM_GRAPHIC);
 
     draw_footer_line = TRUE;
   }
 
-  /* draw little footer border line above CE/GE use/save template gadgets */
+  // draw little footer border line above CE/GE use/save template gadgets
   if (draw_footer_line)
   {
     struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
@@ -10041,7 +10544,7 @@ static void DrawPropertiesConfig(void)
     int gd_y = gd->y + gd_gi1->height - 1;
     Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
 
-    if (tab_color != BLACK_PIXEL)              /* black => transparent */
+    if (tab_color != BLACK_PIXEL)              // black => transparent
       FillRectangle(drawto,
                    SX + ED_ELEMENT_SETTINGS_X(0),
                    SY + ED_ELEMENT_SETTINGS_Y(14) - ED_SETTINGS_TABS_YOFFSET -
@@ -10068,38 +10571,38 @@ static void DrawPropertiesChange(void)
 {
   int i;
 
-  /* needed to initially set selectbox options for special action options */
+  // needed to initially set selectbox options for special action options
   setSelectboxSpecialActionOptions();
 
-  /* draw stickybutton gadget */
+  // draw stickybutton gadget
   MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT);
 
-  /* draw checkbutton gadgets */
+  // draw checkbutton gadgets
   for (i =  ED_CHECKBUTTON_ID_CHANGE_FIRST;
        i <= ED_CHECKBUTTON_ID_CHANGE_LAST; i++)
     MapCheckbuttonGadget(i);
 
-  /* draw counter gadgets */
+  // draw counter gadgets
   for (i =  ED_COUNTER_ID_CHANGE_FIRST;
        i <= ED_COUNTER_ID_CHANGE_LAST; i++)
     MapCounterButtons(i);
 
-  /* draw selectbox gadgets */
+  // draw selectbox gadgets
   for (i =  ED_SELECTBOX_ID_CHANGE_FIRST;
        i <= ED_SELECTBOX_ID_CHANGE_LAST; i++)
     MapSelectboxGadget(i);
 
-  /* draw textbutton gadgets */
+  // draw textbutton gadgets
   for (i =  ED_TEXTBUTTON_ID_CHANGE_FIRST;
        i <= ED_TEXTBUTTON_ID_CHANGE_LAST; i++)
     MapTextbuttonGadget(i);
 
-  /* draw graphicbutton gadgets */
+  // draw graphicbutton gadgets
   for (i =  ED_GRAPHICBUTTON_ID_CHANGE_FIRST;
        i <= ED_GRAPHICBUTTON_ID_CHANGE_LAST; i++)
     MapGraphicbuttonGadget(i);
 
-  /* draw drawing area gadgets */
+  // draw drawing area gadgets
   DrawPropertiesChangeDrawingAreas();
 }
 
@@ -10121,12 +10624,12 @@ static void DrawEditorElementName(int x, int y, int font_nr)
   int font_height = getFontHeight(font_nr);
   int max_text_width = SXSIZE - x - ED_ELEMENT_SETTINGS_X(0);
   int max_chars_per_line = max_text_width / font_width;
-  char buffer[max_chars_per_line + 1];
 
   if (strlen(element_name) <= max_chars_per_line)
     DrawTextS(x, y, font_nr, element_name);
   else
   {
+    char buffer[max_chars_per_line + 1];
     int next_pos = max_chars_per_line;
 
     strncpy(buffer, element_name, max_chars_per_line);
@@ -10181,18 +10684,18 @@ static void DrawPropertiesWindow(void)
 
   stick_element_properties_window = FALSE;
 
-  /* make sure that previous properties edit mode exists for this element */
+  // make sure that previous properties edit mode exists for this element
   if (edit_mode_properties > ED_MODE_PROPERTIES_CONFIG_2 &&
       !IS_CUSTOM_ELEMENT(properties_element))
     edit_mode_properties = ED_MODE_PROPERTIES_CONFIG_2;
 
   if (edit_mode_properties > ED_MODE_PROPERTIES_CONFIG &&
-      !ELEM_IS_PLAYER(properties_element) &&
+      !IS_PLAYER_ELEMENT(properties_element) &&
       !IS_CUSTOM_ELEMENT(properties_element))
     edit_mode_properties = ED_MODE_PROPERTIES_CONFIG;
 
   if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG &&
-      (ELEM_IS_PLAYER(properties_element) ||
+      (IS_PLAYER_ELEMENT(properties_element) ||
        IS_CUSTOM_ELEMENT(properties_element)))
     edit_mode_properties = ED_MODE_PROPERTIES_CONFIG_1;
 
@@ -10202,16 +10705,14 @@ static void DrawPropertiesWindow(void)
   UnmapLevelEditorToolboxDrawingGadgets();
   UnmapLevelEditorToolboxCustomGadgets();
 
-  if (IS_CUSTOM_ELEMENT(properties_element) ||
-      IS_GROUP_ELEMENT(properties_element))
-    MapLevelEditorToolboxCustomGadgets();
+  MapLevelEditorToolboxCustomGadgetsIfNeeded();
 
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearField();
 
   DrawText(sx, sy, text, font2_nr);
 
-  FrameCounter = 0;    /* restart animation frame counter */
+  FrameCounter = 0;    // restart animation frame counter
 
   DrawElementBorder(SX + x1, SY + y1, TILEX, TILEY, FALSE);
   DrawEditorElementAnimation(SX + x1, SY + y1);
@@ -10223,7 +10724,7 @@ static void DrawPropertiesWindow(void)
     DrawPropertiesInfo();
   else if (edit_mode_properties == ED_MODE_PROPERTIES_CHANGE)
     DrawPropertiesChange();
-  else /* (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG[_1|_2]) */
+  else // (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG[_1|_2])
     DrawPropertiesConfig();
 }
 
@@ -10236,7 +10737,7 @@ static void DrawPaletteWindow(void)
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearField();
 
-  /* map buttons to select elements */
+  // map buttons to select elements
   for (i = 0; i < ED_NUM_ELEMENTLIST_BUTTONS; i++)
     MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
   MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL]);
@@ -10253,7 +10754,7 @@ static void UpdateCustomElementGraphicGadgets(void)
   ModifyEditorElementList();
   RedrawDrawingElements();
 
-  /* force redraw of all mapped drawing area gadgets */
+  // force redraw of all mapped drawing area gadgets
   for (i = 0; i < ED_NUM_DRAWING_AREAS; i++)
   {
     struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[i].gadget_id];
@@ -10299,7 +10800,7 @@ static int getTubeFromOpenDirection(int direction)
     case (MV_VERTICAL | MV_RIGHT):     return EL_TUBE_VERTICAL_RIGHT;
     case (MV_ANY_DIRECTION):           return EL_TUBE_ANY;
 
-    /* if only one direction, fall back to simple tube with that direction */
+    // if only one direction, fall back to simple tube with that direction
     case (MV_LEFT):                    return EL_TUBE_HORIZONTAL;
     case (MV_RIGHT):                   return EL_TUBE_HORIZONTAL;
     case (MV_UP):                      return EL_TUBE_VERTICAL;
@@ -10513,13 +11014,7 @@ static int getChipFromOpenDirectionNotEmpty(int direction, int element_old)
 
 static int getClosedTube(int x, int y)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   int element_old = IntelliDrawBuffer[x][y];
   int direction_old = getOpenDirectionFromTube(element_old);
   int direction_new = MV_NONE;
@@ -10527,8 +11022,8 @@ static int getClosedTube(int x, int y)
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
   {
-    int xx = x + xy[i][0];
-    int yy = y + xy[i][1];
+    int xx = x + xy[i].x;
+    int yy = y + xy[i].y;
     int dir = MV_DIR_FROM_BIT(i);
     int dir_opposite = MV_DIR_OPPOSITE(dir);
 
@@ -10543,13 +11038,7 @@ static int getClosedTube(int x, int y)
 
 static int getClosedBelt(int x, int y)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   int element_old = IntelliDrawBuffer[x][y];
   int nr = getBeltNrFromBeltElement(element_old);
   int direction_old = getOpenDirectionFromBelt(element_old);
@@ -10558,8 +11047,8 @@ static int getClosedBelt(int x, int y)
 
   for (i = MV_BIT_LEFT; i <= MV_BIT_RIGHT; i++)
   {
-    int xx = x + xy[i][0];
-    int yy = y + xy[i][1];
+    int xx = x + xy[i].x;
+    int yy = y + xy[i].y;
     int dir = MV_DIR_FROM_BIT(i);
     int dir_opposite = MV_DIR_OPPOSITE(dir);
 
@@ -10574,13 +11063,7 @@ static int getClosedBelt(int x, int y)
 
 static int getClosedPool(int x, int y)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   int element_old = IntelliDrawBuffer[x][y];
   int direction_old = getOpenDirectionFromPool(element_old);
   int direction_new = MV_NONE;
@@ -10588,8 +11071,8 @@ static int getClosedPool(int x, int y)
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
   {
-    int xx = x + xy[i][0];
-    int yy = y + xy[i][1];
+    int xx = x + xy[i].x;
+    int yy = y + xy[i].y;
     int dir = MV_DIR_FROM_BIT(i);
     int dir_opposite = MV_DIR_OPPOSITE(dir);
 
@@ -10605,13 +11088,7 @@ static int getClosedPool(int x, int y)
 
 static int getClosedPillar(int x, int y)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   int element_old = IntelliDrawBuffer[x][y];
   int direction_old = getOpenDirectionFromPillar(element_old);
   int direction_new = MV_NONE;
@@ -10619,8 +11096,8 @@ static int getClosedPillar(int x, int y)
 
   for (i = MV_BIT_UP; i <= MV_BIT_DOWN; i++)
   {
-    int xx = x + xy[i][0];
-    int yy = y + xy[i][1];
+    int xx = x + xy[i].x;
+    int yy = y + xy[i].y;
     int dir = MV_DIR_FROM_BIT(i);
     int dir_opposite = MV_DIR_OPPOSITE(dir);
 
@@ -10635,13 +11112,7 @@ static int getClosedPillar(int x, int y)
 
 static int getClosedSteel2(int x, int y)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   int element_old = IntelliDrawBuffer[x][y];
   int direction_old = getOpenDirectionFromSteel2(element_old);
   int direction_new = MV_NONE;
@@ -10649,8 +11120,8 @@ static int getClosedSteel2(int x, int y)
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
   {
-    int xx = x + xy[i][0];
-    int yy = y + xy[i][1];
+    int xx = x + xy[i].x;
+    int yy = y + xy[i].y;
     int dir = MV_DIR_FROM_BIT(i);
     int dir_opposite = MV_DIR_OPPOSITE(dir);
 
@@ -10665,13 +11136,7 @@ static int getClosedSteel2(int x, int y)
 
 static int getClosedChip(int x, int y)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   int element_old = IntelliDrawBuffer[x][y];
   int direction_old = getOpenDirectionFromChip(element_old);
   int direction_new = MV_NONE;
@@ -10679,8 +11144,8 @@ static int getClosedChip(int x, int y)
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
   {
-    int xx = x + xy[i][0];
-    int yy = y + xy[i][1];
+    int xx = x + xy[i].x;
+    int yy = y + xy[i].y;
     int dir = MV_DIR_FROM_BIT(i);
     int dir_opposite = MV_DIR_OPPOSITE(dir);
 
@@ -10698,7 +11163,7 @@ static void SetElementSimpleExt(int x, int y, int dx, int dy, int element,
 {
   int sx = x - level_xpos;
   int sy = y - level_ypos;
-  int old_element = Feld[x][y];
+  int old_element = Tile[x][y];
   int new_element = element;
   unsigned int new_bitmask = (getDrawModeHiRes() ? (dx + 1) << (dy * 2) : 0x0f);
   boolean draw_masked = FALSE;
@@ -10724,7 +11189,7 @@ static void SetElementSimpleExt(int x, int y, int dx, int dy, int element,
   IntelliDrawBuffer[x][y] = element;
 
   if (change_level)
-    Feld[x][y] = element;
+    Tile[x][y] = element;
 
   if (IN_ED_FIELD(sx, sy))
   {
@@ -10747,32 +11212,25 @@ static void MergeAndCloseNeighbourElements(int x1, int y1, int *element1,
                                           int (*close_function)(int, int),
                                           boolean change_level)
 {
-  /* set neighbour elements to newly determined connections */
+  // set neighbour elements to newly determined connections
   SetElementSimple(x1, y1, *element1, change_level);
   SetElementSimple(x2, y2, *element2, change_level);
 
-  /* remove all open connections of neighbour elements */
+  // remove all open connections of neighbour elements
   *element1 = close_function(x1, y1);
   *element2 = close_function(x2, y2);
 
-  /* set neighbour elements to new, minimized connections */
+  // set neighbour elements to new, minimized connections
   SetElementSimple(x1, y1, *element1, change_level);
   SetElementSimple(x2, y2, *element2, change_level);
 }
 
-static void SetElementIntelliDraw(int x, int y, int new_element,
+static void SetElementIntelliDraw(int x, int y, int dx, int dy, int new_element,
                                  boolean change_level, int button)
 {
-  static int xy[4][2] =
-  {
-    { -1, 0 },
-    { +1, 0 },
-    { 0, -1 },
-    { 0, +1 }
-  };
+  struct XY *xy = xy_directions;
   static int last_x = -1;
   static int last_y = -1;
-  int old_element = IntelliDrawBuffer[x][y];
 
   if (new_element == EL_UNDEFINED)
   {
@@ -10782,20 +11240,22 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     return;
   }
 
+  int old_element = IntelliDrawBuffer[x][y];
+
   if (IS_TUBE(new_element))
   {
     int last_element_new = EL_UNDEFINED;
     int direction = MV_NONE;
     int i;
 
-    /* if old element is of same kind, keep all existing directions */
+    // if old element is of same kind, keep all existing directions
     if (IS_TUBE(old_element))
       direction |= getOpenDirectionFromTube(old_element);
 
     for (i = 0; i < NUM_DIRECTIONS; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_TUBE(IntelliDrawBuffer[last_x][last_y]))
@@ -10826,14 +11286,14 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     int direction = MV_NONE;
     int i;
 
-    /* if old element is of same kind, keep all existing directions */
+    // if old element is of same kind, keep all existing directions
     if (IS_BELT(old_element))
       direction |= getOpenDirectionFromBelt(old_element);
 
     for (i = MV_BIT_LEFT; i <= MV_BIT_RIGHT; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_BELT(IntelliDrawBuffer[last_x][last_y]))
@@ -10864,14 +11324,14 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     int direction = MV_NONE;
     int i;
 
-    /* if old element is of same kind, keep all existing directions */
+    // if old element is of same kind, keep all existing directions
     if (IS_ACID_POOL_OR_ACID(old_element))
       direction |= getOpenDirectionFromPool(old_element);
 
     for (i = 0; i < NUM_DIRECTIONS; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_ACID_POOL_OR_ACID(IntelliDrawBuffer[last_x][last_y]))
@@ -10888,7 +11348,7 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
       }
     }
 
-    /* special corrections needed for intuitively correct acid pool drawing */
+    // special corrections needed for intuitively correct acid pool drawing
     if (last_element_new == EL_EMPTY)
       last_element_new = new_element;
     else if (last_element_new != EL_UNDEFINED)
@@ -10907,14 +11367,14 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     int direction = MV_NONE;
     int i;
 
-    /* if old element is of same kind, keep all existing directions */
+    // if old element is of same kind, keep all existing directions
     if (IS_EMC_PILLAR(old_element))
       direction |= getOpenDirectionFromPillar(old_element);
 
     for (i = MV_BIT_UP; i <= MV_BIT_DOWN; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_EMC_PILLAR(IntelliDrawBuffer[last_x][last_y]))
@@ -10944,14 +11404,14 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     int direction = MV_NONE;
     int i;
 
-    /* if old element is of same kind, keep all existing directions */
+    // if old element is of same kind, keep all existing directions
     if (IS_DC_STEELWALL_2(old_element))
       direction |= getOpenDirectionFromSteel2(old_element);
 
     for (i = 0; i < NUM_DIRECTIONS; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_DC_STEELWALL_2(IntelliDrawBuffer[last_x][last_y]))
@@ -10981,12 +11441,12 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     int direction = MV_NONE;
     int i;
 
-    /* (do not keep existing directions, regardless of kind of old element) */
+    // (do not keep existing directions, regardless of kind of old element)
 
     for (i = 0; i < NUM_DIRECTIONS; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_SP_CHIP(IntelliDrawBuffer[last_x][last_y]))
@@ -11046,8 +11506,8 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
 
     for (i = 0; i < NUM_DIRECTIONS; i++)
     {
-      int xx = x + xy[i][0];
-      int yy = y + xy[i][1];
+      int xx = x + xy[i].x;
+      int yy = y + xy[i].y;
 
       if (last_x == xx && last_y == yy && IN_LEV_FIELD(last_x, last_y) &&
          IS_IN_GROUP_EL(IntelliDrawBuffer[last_x][last_y], new_element))
@@ -11248,6 +11708,12 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        EL_DF_RECEIVER_DOWN,
        EL_DF_RECEIVER_LEFT
       },
+      {
+       EL_DF_SLOPE_1,
+       EL_DF_SLOPE_4,
+       EL_DF_SLOPE_3,
+       EL_DF_SLOPE_2
+      },
 
       {
        -1,
@@ -11464,6 +11930,24 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        EL_DF_MIRROR_ROTATING_3,
        EL_DF_MIRROR_ROTATING_2
       },
+      {
+       EL_DF_MIRROR_FIXED_1,
+       EL_DF_MIRROR_FIXED_16,
+       EL_DF_MIRROR_FIXED_15,
+       EL_DF_MIRROR_FIXED_14,
+       EL_DF_MIRROR_FIXED_13,
+       EL_DF_MIRROR_FIXED_12,
+       EL_DF_MIRROR_FIXED_11,
+       EL_DF_MIRROR_FIXED_10,
+       EL_DF_MIRROR_FIXED_9,
+       EL_DF_MIRROR_FIXED_8,
+       EL_DF_MIRROR_FIXED_7,
+       EL_DF_MIRROR_FIXED_6,
+       EL_DF_MIRROR_FIXED_5,
+       EL_DF_MIRROR_FIXED_4,
+       EL_DF_MIRROR_FIXED_3,
+       EL_DF_MIRROR_FIXED_2
+      },
 
       {
        -1,
@@ -11537,7 +12021,10 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     }
   }
 
-  SetElementSimple(x, y, new_element, change_level);
+  if (IS_MM_WALL_EDITOR(new_element))
+    SetElementSimpleExt(x, y, dx, dy, new_element, change_level);
+  else
+    SetElementSimple(x, y, new_element, change_level);
 
   last_x = x;
   last_y = y;
@@ -11549,18 +12036,36 @@ static void ResetIntelliDraw(void)
 
   for (x = 0; x < lev_fieldx; x++)
     for (y = 0; y < lev_fieldy; y++)
-      IntelliDrawBuffer[x][y] = Feld[x][y];
+      IntelliDrawBuffer[x][y] = Tile[x][y];
 
-  SetElementIntelliDraw(-1, -1, EL_UNDEFINED, FALSE, -1);
+  SetElementIntelliDraw(-1, -1, -1, -1, EL_UNDEFINED, FALSE, -1);
 }
 
 static boolean draw_mode_hires = FALSE;
 
+static boolean isHiresTileElement(int element)
+{
+  return (IS_MM_WALL(element)        || element == EL_EMPTY);
+}
+
+static boolean isHiresDrawElement(int element)
+{
+  return (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY);
+}
+
+static int numHiresTiles(int element)
+{
+  if (IS_MM_WALL(element))
+    return get_number_of_bits(MM_WALL_BITS(element));
+
+  return 1;
+}
+
 static void SetDrawModeHiRes(int element)
 {
   draw_mode_hires =
     (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
-     (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY));
+     isHiresDrawElement(element));
 }
 
 static boolean getDrawModeHiRes(void)
@@ -11582,9 +12087,9 @@ static void SetElementExt(int x, int y, int dx, int dy, int element,
                          boolean change_level, int button)
 {
   if (element < 0)
-    SetElementSimple(x, y, Feld[x][y], change_level);
-  else if (GetKeyModState() & KMOD_Shift && !IS_MM_WALL_EDITOR(element))
-    SetElementIntelliDraw(x, y, element, change_level, button);
+    SetElementSimple(x, y, Tile[x][y], change_level);
+  else if (GetKeyModState() & KMOD_Shift)
+    SetElementIntelliDraw(x, y, dx, dy, element, change_level, button);
   else
     SetElementSimpleExt(x, y, dx, dy, element, change_level);
 }
@@ -11626,7 +12131,7 @@ static int getLevelElementHiRes(int lx2, int ly2)
   int ly = ly2 / 2;
   int dx = lx2 % 2;
   int dy = ly2 % 2;
-  int element = Feld[lx][ly];
+  int element = Tile[lx][ly];
   unsigned int bitmask = (dx + 1) << (dy * 2);
 
   if (IS_MM_WALL(element))
@@ -11654,19 +12159,19 @@ static void DrawLine(int from_x, int from_y, int to_x, int to_y,
   int dy = (to_y < from_y ? -1 : +1);
   int i;
 
-  if (from_y == to_y)                  /* horizontal line */
+  if (from_y == to_y)                  // horizontal line
   {
     for (i = 0; i <= xsize; i++)
       DrawLineElement(from_x + i * dx, from_y, element, change_level);
   }
-  else if (from_x == to_x)             /* vertical line */
+  else if (from_x == to_x)             // vertical line
   {
     for (i = 0; i <= ysize; i++)
       DrawLineElement(from_x, from_y + i * dy, element, change_level);
   }
-  else                                 /* diagonal line */
+  else                                 // diagonal line
   {
-    if (ysize < xsize)                 /* a < 1 */
+    if (ysize < xsize)                 // a < 1
     {
       float a = (float)ysize / (float)xsize;
 
@@ -11678,7 +12183,7 @@ static void DrawLine(int from_x, int from_y, int to_x, int to_y,
        DrawLineElement(from_x + x, from_y + y, element, change_level);
       }
     }
-    else                               /* a >= 1 */
+    else                               // a >= 1
     {
       float a = (float)xsize / (float)ysize;
 
@@ -11725,8 +12230,8 @@ static void DrawArcExt(int from_x, int from_y, int to_x2, int to_y2,
 
   radius = (int)(sqrt((float)(len_x * len_x + len_y * len_y)) + 0.5);
 
-  /* not optimal (some points get drawn twice) but simple,
-     and fast enough for the few points we are drawing */
+  // not optimal (some points get drawn twice) but simple,
+  // and fast enough for the few points we are drawing
 
   for (x = 0; x <= radius; x++)
   {
@@ -11786,7 +12291,7 @@ static void DrawCircle(int from_x, int from_y, int to_x, int to_y,
   DrawArcExt(from_x, from_y, to_x2, to_y2, element, change_level);
   DrawArcExt(from_x, from_y, mirror_to_x2, to_y2, element, change_level);
   DrawArcExt(from_x, from_y, to_x2, mirror_to_y2, element, change_level);
-  DrawArcExt(from_x, from_y, mirror_to_x2, mirror_to_y2, element,change_level);
+  DrawArcExt(from_x, from_y, mirror_to_x2, mirror_to_y2, element, change_level);
 }
 #endif
 
@@ -11832,13 +12337,206 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y,
     DrawAreaBorder(from_x, from_y, to_x, to_y);
 }
 
-/* values for CopyBrushExt() */
-#define CB_AREA_TO_BRUSH       0
-#define CB_BRUSH_TO_CURSOR     1
-#define CB_BRUSH_TO_LEVEL      2
-#define CB_DELETE_OLD_CURSOR   3
-#define CB_DUMP_BRUSH          4
-#define CB_DUMP_BRUSH_SMALL    5
+// values for CopyBrushExt()
+#define CB_AREA_TO_BRUSH               0
+#define CB_BRUSH_TO_CURSOR             1
+#define CB_BRUSH_TO_LEVEL              2
+#define CB_DELETE_OLD_CURSOR           3
+#define CB_DUMP_BRUSH                  4
+#define CB_DUMP_BRUSH_SMALL            5
+#define CB_CLIPBOARD_TO_BRUSH          6
+#define CB_BRUSH_TO_CLIPBOARD          7
+#define CB_BRUSH_TO_CLIPBOARD_SMALL    8
+#define CB_UPDATE_BRUSH_POSITION       9
+#define CB_FLIP_BRUSH_X                        10
+#define CB_FLIP_BRUSH_Y                        11
+#define CB_FLIP_BRUSH_XY               12
+
+#define MAX_CB_PART_SIZE       10
+#define MAX_CB_LINE_SIZE       (MAX_LEV_FIELDX + 1)    // text plus newline
+#define MAX_CB_NUM_LINES       (MAX_LEV_FIELDY)
+#define MAX_CB_TEXT_SIZE       (MAX_CB_LINE_SIZE *     \
+                                MAX_CB_NUM_LINES *     \
+                                MAX_CB_PART_SIZE)
+
+static int getFlippedTileExt(int map[], int element)
+{
+  int i;
+
+  for (i = 0; map[i] != -1; i++)
+    if (map[i] == element)
+      return map[i ^ 1];       // get flipped element by flipping LSB of index
+
+  return element;
+}
+
+static int getFlippedTileX(int element)
+{
+  int map[] =
+  {
+    EL_BD_BUTTERFLY_LEFT,              EL_BD_BUTTERFLY_RIGHT,
+    EL_BD_FIREFLY_LEFT,                        EL_BD_FIREFLY_RIGHT,
+    EL_BUG_LEFT,                       EL_BUG_RIGHT,
+    EL_SPACESHIP_LEFT,                 EL_SPACESHIP_RIGHT,
+    EL_PACMAN_LEFT,                    EL_PACMAN_RIGHT,
+    EL_ARROW_LEFT,                     EL_ARROW_RIGHT,
+    EL_MOLE_LEFT,                      EL_MOLE_RIGHT,
+    EL_BALLOON_SWITCH_LEFT,            EL_BALLOON_SWITCH_RIGHT,
+    EL_YAMYAM_LEFT,                    EL_YAMYAM_RIGHT,
+    EL_SP_PORT_LEFT,                   EL_SP_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_LEFT,           EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_ON_PORT_LEFT,                EL_SP_GRAVITY_ON_PORT_RIGHT,
+    EL_SP_GRAVITY_OFF_PORT_LEFT,       EL_SP_GRAVITY_OFF_PORT_RIGHT,
+    EL_CONVEYOR_BELT_1_LEFT,           EL_CONVEYOR_BELT_1_RIGHT,
+    EL_CONVEYOR_BELT_2_LEFT,           EL_CONVEYOR_BELT_2_RIGHT,
+    EL_CONVEYOR_BELT_3_LEFT,           EL_CONVEYOR_BELT_3_RIGHT,
+    EL_CONVEYOR_BELT_4_LEFT,           EL_CONVEYOR_BELT_4_RIGHT,
+    EL_SPRING_LEFT,                    EL_SPRING_RIGHT,
+    EL_SP_CHIP_LEFT,                   EL_SP_CHIP_RIGHT,
+    EL_TUBE_VERTICAL_LEFT,             EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_LEFT_UP,                   EL_TUBE_RIGHT_UP,
+    EL_TUBE_LEFT_DOWN,                 EL_TUBE_RIGHT_DOWN,
+    EL_DC_STEELWALL_1_LEFT,            EL_DC_STEELWALL_1_RIGHT,
+    EL_DC_STEELWALL_1_TOPLEFT,         EL_DC_STEELWALL_1_TOPRIGHT,
+    EL_DC_STEELWALL_1_BOTTOMLEFT,      EL_DC_STEELWALL_1_BOTTOMRIGHT,
+    EL_DC_STEELWALL_1_TOPLEFT_2,       EL_DC_STEELWALL_1_TOPRIGHT_2,
+    EL_DC_STEELWALL_1_BOTTOMLEFT_2,    EL_DC_STEELWALL_1_BOTTOMRIGHT_2,
+    EL_DC_STEELWALL_2_LEFT,            EL_DC_STEELWALL_2_RIGHT,
+    EL_ACID_POOL_TOPLEFT,              EL_ACID_POOL_TOPRIGHT,
+    EL_ACID_POOL_BOTTOMLEFT,           EL_ACID_POOL_BOTTOMRIGHT,
+
+    -1
+  };
+
+  return getFlippedTileExt(map, element);
+}
+
+static int getFlippedTileY(int element)
+{
+  int map[] =
+  {
+    EL_BD_BUTTERFLY_UP,                        EL_BD_BUTTERFLY_DOWN,
+    EL_BD_FIREFLY_UP,                  EL_BD_FIREFLY_DOWN,
+    EL_BUG_UP,                         EL_BUG_DOWN,
+    EL_SPACESHIP_UP,                   EL_SPACESHIP_DOWN,
+    EL_PACMAN_UP,                      EL_PACMAN_DOWN,
+    EL_ARROW_UP,                       EL_ARROW_DOWN,
+    EL_MOLE_UP,                                EL_MOLE_DOWN,
+    EL_BALLOON_SWITCH_UP,              EL_BALLOON_SWITCH_DOWN,
+    EL_YAMYAM_UP,                      EL_YAMYAM_DOWN,
+    EL_SP_PORT_UP,                     EL_SP_PORT_DOWN,
+    EL_SP_GRAVITY_PORT_UP,             EL_SP_GRAVITY_PORT_DOWN,
+    EL_SP_GRAVITY_ON_PORT_UP,          EL_SP_GRAVITY_ON_PORT_DOWN,
+    EL_SP_GRAVITY_OFF_PORT_UP,         EL_SP_GRAVITY_OFF_PORT_DOWN,
+    EL_SP_CHIP_TOP,                    EL_SP_CHIP_BOTTOM,
+    EL_TUBE_HORIZONTAL_UP,             EL_TUBE_HORIZONTAL_DOWN,
+    EL_TUBE_LEFT_UP,                   EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,                  EL_TUBE_RIGHT_DOWN,
+    EL_DC_STEELWALL_1_TOP,             EL_DC_STEELWALL_1_BOTTOM,
+    EL_DC_STEELWALL_1_TOPLEFT,         EL_DC_STEELWALL_1_BOTTOMLEFT,
+    EL_DC_STEELWALL_1_TOPRIGHT,                EL_DC_STEELWALL_1_BOTTOMRIGHT,
+    EL_DC_STEELWALL_1_TOPLEFT_2,       EL_DC_STEELWALL_1_BOTTOMLEFT_2,
+    EL_DC_STEELWALL_1_TOPRIGHT_2,      EL_DC_STEELWALL_1_BOTTOMRIGHT_2,
+    EL_DC_STEELWALL_2_TOP,             EL_DC_STEELWALL_2_BOTTOM,
+    EL_EMC_WALL_1,                     EL_EMC_WALL_3,
+
+    -1
+  };
+
+  return getFlippedTileExt(map, element);
+}
+
+static int getFlippedTileXY(int element)
+{
+  int map[] =
+  {
+    EL_BD_BUTTERFLY_LEFT,              EL_BD_BUTTERFLY_UP,
+    EL_BD_BUTTERFLY_RIGHT,             EL_BD_BUTTERFLY_DOWN,
+    EL_BD_FIREFLY_LEFT,                        EL_BD_FIREFLY_UP,
+    EL_BD_FIREFLY_RIGHT,               EL_BD_FIREFLY_DOWN,
+    EL_BUG_LEFT,                       EL_BUG_UP,
+    EL_BUG_RIGHT,                      EL_BUG_DOWN,
+    EL_SPACESHIP_LEFT,                 EL_SPACESHIP_UP,
+    EL_SPACESHIP_RIGHT,                        EL_SPACESHIP_DOWN,
+    EL_PACMAN_LEFT,                    EL_PACMAN_UP,
+    EL_PACMAN_RIGHT,                   EL_PACMAN_DOWN,
+    EL_ARROW_LEFT,                     EL_ARROW_UP,
+    EL_ARROW_RIGHT,                    EL_ARROW_DOWN,
+    EL_MOLE_LEFT,                      EL_MOLE_UP,
+    EL_MOLE_RIGHT,                     EL_MOLE_DOWN,
+    EL_BALLOON_SWITCH_LEFT,            EL_BALLOON_SWITCH_UP,
+    EL_BALLOON_SWITCH_RIGHT,           EL_BALLOON_SWITCH_DOWN,
+    EL_YAMYAM_LEFT,                    EL_YAMYAM_UP,
+    EL_YAMYAM_RIGHT,                   EL_YAMYAM_DOWN,
+    EL_SP_PORT_LEFT,                   EL_SP_PORT_UP,
+    EL_SP_PORT_RIGHT,                  EL_SP_PORT_DOWN,
+    EL_SP_GRAVITY_PORT_LEFT,           EL_SP_GRAVITY_PORT_UP,
+    EL_SP_GRAVITY_PORT_RIGHT,          EL_SP_GRAVITY_PORT_DOWN,
+    EL_SP_GRAVITY_ON_PORT_LEFT,                EL_SP_GRAVITY_ON_PORT_UP,
+    EL_SP_GRAVITY_ON_PORT_RIGHT,       EL_SP_GRAVITY_ON_PORT_DOWN,
+    EL_SP_GRAVITY_OFF_PORT_LEFT,       EL_SP_GRAVITY_OFF_PORT_UP,
+    EL_SP_GRAVITY_OFF_PORT_RIGHT,      EL_SP_GRAVITY_OFF_PORT_DOWN,
+    EL_SP_CHIP_LEFT,                   EL_SP_CHIP_TOP,
+    EL_SP_CHIP_RIGHT,                  EL_SP_CHIP_BOTTOM,
+    EL_TUBE_VERTICAL,                  EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERTICAL_LEFT,             EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_VERTICAL_RIGHT,            EL_TUBE_HORIZONTAL_DOWN,
+    EL_TUBE_LEFT_DOWN,                 EL_TUBE_RIGHT_UP,
+    EL_DC_STEELWALL_1_LEFT,            EL_DC_STEELWALL_1_TOP,
+    EL_DC_STEELWALL_1_RIGHT,           EL_DC_STEELWALL_1_BOTTOM,
+    EL_DC_STEELWALL_1_HORIZONTAL,      EL_DC_STEELWALL_1_VERTICAL,
+    EL_DC_STEELWALL_1_TOPRIGHT,                EL_DC_STEELWALL_1_BOTTOMLEFT,
+    EL_DC_STEELWALL_1_TOPRIGHT_2,      EL_DC_STEELWALL_1_BOTTOMLEFT_2,
+    EL_DC_STEELWALL_2_LEFT,            EL_DC_STEELWALL_2_TOP,
+    EL_DC_STEELWALL_2_RIGHT,           EL_DC_STEELWALL_2_BOTTOM,
+    EL_DC_STEELWALL_2_HORIZONTAL,      EL_DC_STEELWALL_2_VERTICAL,
+    EL_EXPANDABLE_WALL_HORIZONTAL,     EL_EXPANDABLE_WALL_VERTICAL,
+    EL_EXPANDABLE_STEELWALL_HORIZONTAL,        EL_EXPANDABLE_STEELWALL_VERTICAL,
+
+    -1
+  };
+
+  return getFlippedTileExt(map, element);
+}
+
+static int getFlippedTile(int element, int mode)
+{
+  if (IS_MM_ELEMENT(element))
+  {
+    // get MM game element
+    element = map_element_RND_to_MM(element);
+
+    // get flipped game element
+    element = (mode == CB_FLIP_BRUSH_X  ? getFlippedTileX_MM(element) :
+              mode == CB_FLIP_BRUSH_Y  ? getFlippedTileY_MM(element) :
+              mode == CB_FLIP_BRUSH_XY ? getFlippedTileXY_MM(element) :
+              element);
+
+    // get RND game element again
+    element = map_element_MM_to_RND(element);
+  }
+  else
+  {
+    // get flipped game element
+    element = (mode == CB_FLIP_BRUSH_X  ? getFlippedTileX(element) :
+              mode == CB_FLIP_BRUSH_Y  ? getFlippedTileY(element) :
+              mode == CB_FLIP_BRUSH_XY ? getFlippedTileXY(element) :
+              element);
+  }
+
+  return element;
+}
+
+static void SwapFlippedTiles(short *tile1, short *tile2, int mode)
+{
+  // flip tiles
+  short tile1_flipped = getFlippedTile(*tile1, mode);
+  short tile2_flipped = getFlippedTile(*tile2, mode);
+
+  // swap tiles
+  *tile1 = tile2_flipped;
+  *tile2 = tile1_flipped;
+}
 
 static void DrawBrushElement(int sx, int sy, int element, boolean change_level)
 {
@@ -11851,41 +12549,257 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
   static short brush_buffer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
   static int brush_width, brush_height;
   static int last_cursor_x = -1, last_cursor_y = -1;
-  static boolean delete_old_brush;
+  static boolean delete_old_brush = FALSE;
   int new_element = BUTTON_ELEMENT(button);
   int x, y;
 
   if (mode == CB_DUMP_BRUSH ||
-      mode == CB_DUMP_BRUSH_SMALL)
+      mode == CB_DUMP_BRUSH_SMALL ||
+      mode == CB_BRUSH_TO_CLIPBOARD ||
+      mode == CB_BRUSH_TO_CLIPBOARD_SMALL)
   {
-    if (!draw_with_brush)
+    if (edit_mode != ED_MODE_DRAWING)
+      return;
+
+    char part[MAX_CB_PART_SIZE + 1] = "";
+    char text[MAX_CB_TEXT_SIZE + 1] = "";
+    int width  = (draw_with_brush ? brush_width  : lev_fieldx);
+    int height = (draw_with_brush ? brush_height : lev_fieldy);
+    char *format = "%s%03d";
+
+    for (y = 0; y < height; y++)
+      for (x = 0; x < width; x++)
+       if ((draw_with_brush ? brush_buffer[x][y] : Tile[x][y]) > 999)
+         format = "%s%04d";
+
+    for (y = 0; y < height; y++)
     {
-      Error(ERR_WARN, "no brush selected");
+      for (x = 0; x < width; x++)
+      {
+       int element = (draw_with_brush ? brush_buffer[x][y] : Tile[x][y]);
+       char *prefix = (mode == CB_DUMP_BRUSH ||
+                       mode == CB_BRUSH_TO_CLIPBOARD ? "`" : "¸");
+
+       if (element >= NUM_FILE_ELEMENTS)
+         element = EL_UNKNOWN;
+
+       // copy brush to level sketch text buffer for the R'n'D forum:
+       // - large tiles: `xxx or `xxxx (0x60 ASCII)
+       // - small tiles: Â¸xxx or Â¸xxxx (0xb8 ISO-8859-1, 0xc2b8 UTF-8)
+       snprintf(part, MAX_CB_PART_SIZE + 1, format, prefix, element);
+       strcat(text, part);
+      }
+
+      strcat(text, "\n");
+    }
+
+    if (mode == CB_BRUSH_TO_CLIPBOARD ||
+       mode == CB_BRUSH_TO_CLIPBOARD_SMALL)
+      SDL_SetClipboardText(text);
+    else
+      Print("%s", text);       // print brush data to console and log file
+
+    return;
+  }
+
+  if (mode == CB_CLIPBOARD_TO_BRUSH)
+  {
+    if (edit_mode != ED_MODE_DRAWING)
+      return;
+
+    if (!SDL_HasClipboardText())
+    {
+      Request("Clipboard is empty!", REQ_CONFIRM);
 
       return;
     }
 
-    for (y = 0; y < brush_height; y++)
+    boolean copy_to_brush = (draw_with_brush ||
+                            drawing_function == GADGET_ID_GRAB_BRUSH);
+
+    // this will delete the old brush, if already drawing with a brush
+    if (copy_to_brush)
+      ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], MB_LEFTBUTTON);
+
+    // initialization is required for "odd" (incomplete) clipboard content
+    for (x = 0; x < MAX_LEV_FIELDX; x++)
+      for (y = 0; y < MAX_LEV_FIELDY; y++)
+       brush_buffer[x][y] = EL_EMPTY;
+
+    brush_width  = 0;
+    brush_height = 0;
+    x = 0;
+    y = 0;
+
+    char *clipboard_text = SDL_GetClipboardText();
+    char *ptr = clipboard_text;
+    boolean allow_new_row = FALSE;
+    boolean stop = FALSE;
+
+    while (*ptr && !stop)
     {
-      for (x = 0; x < brush_width; x++)
+      boolean prefix_found = FALSE;
+      boolean start_new_row = FALSE;
+
+      // level sketch element number prefixes (may be multi-byte characters)
+      char *prefix_list[] = { "`", "¸" };
+      int i;
+
+      for (i = 0; i < ARRAY_SIZE(prefix_list); i++)
+      {
+       char *prefix = prefix_list[i];
+
+       // check if string is large enough for prefix
+       if (strlen(ptr) < strlen(prefix))
+       {
+         stop = TRUE;
+
+         break;
+       }
+
+       // check if string starts with prefix
+       if (strPrefix(ptr, prefix))
+       {
+         ptr += strlen(prefix);
+
+         prefix_found = TRUE;
+
+         break;
+       }
+      }
+
+      // check if prefix found and followed by (at least) three digits
+      if (prefix_found &&
+         strlen(ptr) >= 3 &&
+         ptr[0] >= '0' && ptr[0] <= '9' &&
+         ptr[1] >= '0' && ptr[1] <= '9' &&
+         ptr[2] >= '0' && ptr[2] <= '9')
       {
-       int element = brush_buffer[x][y];
-       int element_mapped = element;
-
-       if (IS_CUSTOM_ELEMENT(element))
-         element_mapped = EL_CUSTOM_START;
-       else if (IS_GROUP_ELEMENT(element))
-         element_mapped = EL_GROUP_START;
-       else if (element >= NUM_FILE_ELEMENTS)
-         element_mapped = EL_UNKNOWN;
-
-       // dump brush as level sketch text for the R'n'D forum:
-       // - large tiles: `xxx (0x60 ASCII)
-       // - small tiles: Â¸xxx (0xb8 ISO-8859-1, 0xc2b8 UTF-8)
-       printf("%s%03d", (mode == CB_DUMP_BRUSH ? "`" : "¸"), element_mapped);
+       int element = ((ptr[0] - '0') * 100 +
+                      (ptr[1] - '0') * 10 +
+                      (ptr[2] - '0'));
+
+       ptr += 3;
+
+       // level sketch element number might consist of four digits
+       if (ptr[0] >= '0' && ptr[0] <= '9')
+       {
+         element = element * 10 + (ptr[0] - '0');
+         ptr++;
+       }
+
+       // remap some (historic, now obsolete) elements
+       element = getMappedElement(element);
+
+       if (element >= NUM_FILE_ELEMENTS)
+         element = EL_UNKNOWN;
+
+       brush_buffer[x][y] = element;
+
+       brush_width  = MAX(x + 1, brush_width);
+       brush_height = MAX(y + 1, brush_height);
+
+       x++;
+
+       if (x >= MAX_LEV_FIELDX)
+         start_new_row = TRUE;
+
+       allow_new_row = TRUE;
       }
+      else
+      {
+       if ((*ptr == '\n' || *ptr == '\r') && allow_new_row)
+         start_new_row = TRUE;
 
-      printf("\n");
+       ptr++;          // !!! FIX THIS for real UTF-8 handling !!!
+      }
+
+      if (start_new_row)
+      {
+       x = 0;
+       y++;
+
+       if (y >= MAX_LEV_FIELDY)
+         stop = TRUE;
+
+       allow_new_row = FALSE;
+      }
+    }
+
+    SDL_free(clipboard_text);
+
+    if (brush_width == 0 || brush_height == 0)
+    {
+      Request("No level sketch found in clipboard!", REQ_CONFIRM);
+
+      return;
+    }
+
+    if (copy_to_brush)
+    {
+      struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_DRAWING_LEVEL];
+      int mx, my;
+
+      SDL_GetMouseState(&mx, &my);
+
+      // if inside drawing area, activate and draw brush at last mouse position
+      if (mx >= gi->x && mx < gi->x + gi->width &&
+         my >= gi->y && my < gi->y + gi->height)
+       CopyBrushToCursor(last_cursor_x, last_cursor_y);
+
+      draw_with_brush = TRUE;
+    }
+    else
+    {
+      char request[100];
+
+      sprintf(request, "Replace level with %dx%d level sketch from clipboard?",
+             brush_width, brush_height);
+
+      if (!Request(request, REQ_ASK))
+       return;
+
+      for (x = 0; x < MAX_LEV_FIELDX; x++)
+       for (y = 0; y < MAX_LEV_FIELDY; y++)
+         Tile[x][y] = brush_buffer[x][y];
+
+      lev_fieldx = level.fieldx = brush_width;
+      lev_fieldy = level.fieldy = brush_height;
+
+      boolean use_em_engine = TRUE;
+      boolean use_sp_engine = TRUE;
+      boolean use_mm_engine = TRUE;
+
+      for (x = 0; x < MAX_LEV_FIELDX; x++)
+      {
+       for (y = 0; y < MAX_LEV_FIELDY; y++)
+       {
+         int element = Tile[x][y];
+
+         if (!IS_EM_ELEMENT(element) && !IS_PLAYER_ELEMENT(element))
+           use_em_engine = FALSE;
+
+         if (!IS_SP_ELEMENT(element))
+           use_sp_engine = FALSE;
+
+         if (!IS_MM_ELEMENT(element) && element != EL_EMPTY)
+           use_mm_engine = FALSE;
+       }
+      }
+
+      level.game_engine_type = (use_em_engine ? GAME_ENGINE_TYPE_EM :
+                               use_sp_engine ? GAME_ENGINE_TYPE_SP :
+                               use_mm_engine ? GAME_ENGINE_TYPE_MM :
+                               GAME_ENGINE_TYPE_RND);
+
+      // update element selection list
+      ReinitializeElementList();
+      ModifyEditorElementList();
+
+      SetBorderElement();
+
+      DrawEditModeWindow();
+      CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
     }
 
     return;
@@ -11914,7 +12828,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
     {
       for (x = 0; x < brush_width; x++)
       {
-       brush_buffer[x][y] = Feld[from_lx + x][from_ly + y];
+       brush_buffer[x][y] = Tile[from_lx + x][from_ly + y];
 
        if (button != 1)
          DrawBrushElement(from_x + x, from_y + y, new_element, TRUE);
@@ -11943,6 +12857,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
        !IN_LEV_FIELD(cursor_x + level_xpos, cursor_y + level_ypos))
     {
       delete_old_brush = FALSE;
+
       return;
     }
 
@@ -11980,8 +12895,46 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 
     last_cursor_x = cursor_x;
     last_cursor_y = cursor_y;
+
     delete_old_brush = TRUE;
   }
+  else if (mode == CB_FLIP_BRUSH_X)
+  {
+    for (y = 0; y < brush_height; y++)
+      for (x = 0; x < (brush_width + 1) / 2; x++)
+       SwapFlippedTiles(&brush_buffer[x][y],
+                        &brush_buffer[brush_width - x - 1][y], mode);
+
+    CopyBrushExt(last_cursor_x, last_cursor_y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
+  }
+  else if (mode == CB_FLIP_BRUSH_Y)
+  {
+    for (y = 0; y < (brush_height + 1) / 2; y++)
+      for (x = 0; x < brush_width; x++)
+       SwapFlippedTiles(&brush_buffer[x][y],
+                        &brush_buffer[x][brush_height - y - 1], mode);
+
+    CopyBrushExt(last_cursor_x, last_cursor_y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
+  }
+  else if (mode == CB_FLIP_BRUSH_XY)
+  {
+    CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
+
+    for (y = 0; y < MAX(brush_width, brush_height); y++)
+      for (x = 0; x <= y; x++)
+       SwapFlippedTiles(&brush_buffer[x][y],
+                        &brush_buffer[y][x], mode);
+
+    swap_numbers(&brush_width, &brush_height);
+
+    CopyBrushExt(last_cursor_x, last_cursor_y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
+  }
+
+  if (mode == CB_UPDATE_BRUSH_POSITION)
+  {
+    last_cursor_x = from_x;
+    last_cursor_y = from_y;
+  }
 }
 
 static void CopyAreaToBrush(int from_x, int from_y, int to_x, int to_y,
@@ -12000,11 +12953,32 @@ static void CopyBrushToCursor(int x, int y)
   CopyBrushExt(x, y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
 }
 
+static void UpdateBrushPosition(int x, int y)
+{
+  CopyBrushExt(x, y, 0, 0, 0, CB_UPDATE_BRUSH_POSITION);
+}
+
 static void DeleteBrushFromCursor(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
 }
 
+static void FlipBrushX(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_X);
+}
+
+static void FlipBrushY(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_Y);
+}
+
+static void RotateBrush(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_XY);
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_X);
+}
+
 void DumpBrush(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH);
@@ -12015,9 +12989,34 @@ void DumpBrush_Small(void)
   CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH_SMALL);
 }
 
+void CopyClipboardToBrush(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_CLIPBOARD_TO_BRUSH);
+}
+
+void CopyBrushToClipboard(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_BRUSH_TO_CLIPBOARD);
+}
+
+void CopyBrushToClipboard_Small(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_BRUSH_TO_CLIPBOARD_SMALL);
+}
+
+void UndoLevelEditorOperation(void)
+{
+  ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], -1);
+}
+
+void RedoLevelEditorOperation(void)
+{
+  ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
+}
+
 static void FloodFill(int from_x, int from_y, int fill_element)
 {
-  FloodFillLevel(from_x, from_y, fill_element, Feld, lev_fieldx, lev_fieldy);
+  FloodFillLevel(from_x, from_y, fill_element, Tile, lev_fieldx, lev_fieldy);
 }
 
 static void FloodFillWall_MM(int from_sx2, int from_sy2, int fill_element)
@@ -12026,23 +13025,23 @@ static void FloodFillWall_MM(int from_sx2, int from_sy2, int fill_element)
   int from_y = from_sy2 + 2 * level_ypos;
   int max_fillx = lev_fieldx * 2;
   int max_filly = lev_fieldy * 2;
-  short FillFeld[max_fillx][max_filly];
+  short Fill[max_fillx][max_filly];
   int x, y;
 
   for (x = 0; x < max_fillx; x++)
     for (y = 0; y < max_filly; y++)
-      FillFeld[x][y] = getLevelElementHiRes(x, y);
+      Fill[x][y] = getLevelElementHiRes(x, y);
 
   FloodFillLevelExt(from_x, from_y, fill_element, max_fillx, max_filly,
-                   FillFeld, max_fillx, max_filly);
+                   Fill, max_fillx, max_filly);
 
   for (x = 0; x < max_fillx; x++)
     for (y = 0; y < max_filly; y++)
-      if (FillFeld[x][y] == fill_element)
-       SetLevelElementHiRes(x, y, FillFeld[x][y]);
+      if (Fill[x][y] == fill_element)
+       SetLevelElementHiRes(x, y, Fill[x][y]);
 }
 
-/* values for DrawLevelText() modes */
+// values for DrawLevelText() modes
 #define TEXT_INIT              0
 #define TEXT_SETCURSOR         1
 #define TEXT_WRITECHAR         2
@@ -12057,10 +13056,10 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
   static int start_sx;
   static int last_sx, last_sy;
   static boolean typing = FALSE;
-  int letter_element = EL_CHAR_ASCII0 + letter;
+  int letter_element;
   int lx = 0, ly = 0;
 
-  /* map lower case letters to upper case and convert special characters */
+  // map lower case letters to upper case and convert special characters
   if (letter >= 'a' && letter <= 'z')
     letter_element = EL_CHAR_ASCII0 + letter + (int)('A' - 'a');
   else if (letter == CHAR_BYTE_UMLAUT_a || letter == CHAR_BYTE_UMLAUT_A)
@@ -12103,8 +13102,10 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
       break;
 
     case TEXT_SETCURSOR:
-      DrawEditorElement(last_sx, last_sy, Feld[lx][ly]);
+      DrawEditorElement(last_sx, last_sy, Tile[lx][ly]);
       DrawAreaBorder(sx, sy, sx, sy);
+      StartTextInput(SX + sx * ed_tilesize, SY + sy * ed_tilesize,
+                    ed_tilesize, ed_tilesize);
       last_sx = sx;
       last_sy = sy;
       break;
@@ -12116,8 +13117,8 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
            new_element1 <= EL_STEEL_CHAR_END)
          letter_element = letter_element - EL_CHAR_START + EL_STEEL_CHAR_START;
 
-       delete_buffer[sx - start_sx] = Feld[lx][ly];
-       Feld[lx][ly] = letter_element;
+       delete_buffer[sx - start_sx] = Tile[lx][ly];
+       Tile[lx][ly] = letter_element;
 
        if (sx + 1 < ed_fieldx && lx + 1 < lev_fieldx)
          DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR);
@@ -12133,14 +13134,14 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
     case TEXT_BACKSPACE:
       if (sx > start_sx)
       {
-       Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1];
-       DrawEditorElement(sx - 1, sy, Feld[lx - 1][ly]);
+       Tile[lx - 1][ly] = delete_buffer[sx - start_sx - 1];
+       DrawEditorElement(sx - 1, sy, Tile[lx - 1][ly]);
        DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR);
       }
       break;
 
     case TEXT_NEWLINE:
-      if (sy + 1 < ed_fieldy - 1 && ly + 1 < lev_fieldy - 1)
+      if (sy + 1 < ed_fieldy && ly + 1 < lev_fieldy)
        DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
       else
        DrawLevelText(0, 0, 0, TEXT_END);
@@ -12148,7 +13149,8 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
 
     case TEXT_END:
       CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
-      DrawEditorElement(sx, sy, Feld[lx][ly]);
+      DrawEditorElement(sx, sy, Tile[lx][ly]);
+      StopTextInput();
       typing = FALSE;
       break;
 
@@ -12169,7 +13171,7 @@ static void SetTextCursor(int unused_sx, int unused_sy, int sx, int sy,
   int ly = sy + level_ypos;
 
   if (element == -1)
-    DrawEditorElement(sx, sy, Feld[lx][ly]);
+    DrawEditorElement(sx, sy, Tile[lx][ly]);
   else
     DrawAreaBorder(sx, sy, sx, sy);
 }
@@ -12211,21 +13213,21 @@ static void CopyLevelToUndoBuffer(int mode)
 
   if (new_undo_buffer_position)
   {
-    /* advance position in undo buffer ring */
+    // advance position in undo buffer ring
     undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
 
     if (undo_buffer_steps < NUM_UNDO_STEPS - 1)
       undo_buffer_steps++;
   }
 
-  /* always reset redo buffer when storing level change into undo buffer */
+  // always reset redo buffer when storing level change into undo buffer
   redo_buffer_steps = 0;
 
   for (x = 0; x < lev_fieldx; x++)
     for (y = 0; y < lev_fieldy; y++)
-      UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
+      UndoBuffer[undo_buffer_position][x][y] = Tile[x][y];
 
-  /* check if drawing operation forces change of border style */
+  // check if drawing operation forces change of border style
   CheckLevelBorderElement(TRUE);
 
   level.changed = TRUE;
@@ -12240,24 +13242,24 @@ static void RandomPlacement(int new_element)
 
   ResetIntelliDraw();
 
-  /* determine number of free positions for randomly placing the new element */
+  // determine number of free positions for randomly placing the new element
   for (x = 0; x < lev_fieldx; x++) for (y = 0; y < lev_fieldy; y++)
   {
     free_position[x][y] =
       (random_placement_background_restricted ?
-       Feld[x][y] == random_placement_background_element :
-       Feld[x][y] != new_element);
+       Tile[x][y] == random_placement_background_element :
+       Tile[x][y] != new_element);
 
     if (free_position[x][y])
       num_free_positions++;
   }
 
-  /* determine number of new elements to place there */
+  // determine number of new elements to place there
   num_percentage = num_free_positions * random_placement_value / 100;
   num_elements = (random_placement_method == RANDOM_USE_PERCENTAGE ?
                  num_percentage : random_placement_value);
 
-  /* if less free positions than elements to place, fill all these positions */
+  // if less free positions than elements to place, fill all these positions
   if (num_free_positions < num_elements)
   {
     for (x = 0; x < lev_fieldx; x++)
@@ -12272,7 +13274,7 @@ static void RandomPlacement(int new_element)
       x = GetSimpleRandom(lev_fieldx);
       y = GetSimpleRandom(lev_fieldy);
 
-      /* don't place element at the same position twice */
+      // don't place element at the same position twice
       if (free_position[x][y])
       {
        free_position[x][y] = FALSE;
@@ -12294,17 +13296,98 @@ static void WrapLevel(int dx, int dy)
 
   for (x = 0; x < lev_fieldx; x++)
     for (y = 0; y < lev_fieldy; y++)
-      FieldBackup[x][y] = Feld[x][y];
+      TileBackup[x][y] = Tile[x][y];
 
   for (x = 0; x < lev_fieldx; x++)
     for (y = 0; y < lev_fieldy; y++)
-      Feld[x][y] =
-       FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
+      Tile[x][y] =
+       TileBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
 
   DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
 }
 
+static void DrawAreaElementHighlight(boolean highlighted,
+                                    boolean highlighted_similar)
+{
+  DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+
+  if (!highlighted)
+    return;
+
+  int x, y;
+
+  for (x = 0; x < ed_fieldx; x++)
+  {
+    for (y = 0; y < ed_fieldy; y++)
+    {
+      boolean highlight = FALSE;
+      int lx = x + level_xpos;
+      int ly = y + level_ypos;
+
+      if (!IN_LEV_FIELD(lx, ly))
+       continue;
+
+      // check if element is the same
+      if (Tile[lx][ly] == new_element1)
+       highlight = TRUE;
+
+      // check if element is similar
+      if (highlighted_similar &&
+         strEqual(element_info[Tile[lx][ly]].class_name,
+                  element_info[new_element1].class_name))
+       highlight = TRUE;
+
+      // check if element is matching MM style wall
+      if (IS_MM_WALL(Tile[lx][ly]) &&
+         map_mm_wall_element(Tile[lx][ly]) == new_element1)
+       highlight = TRUE;
+
+      if (!highlight)
+       continue;
+
+      if (IS_MM_WALL(Tile[lx][ly]) && !highlighted_similar)
+      {
+       int i;
+
+       for (i = 0; i < 4; i++)
+       {
+         if (!(MM_WALL_BITS(Tile[lx][ly]) & (1 << i)))
+           continue;
+
+         int xx = x * 2 + (i % 2);
+         int yy = y * 2 + (i / 2);
+         int sx = SX + xx * ed_tilesize / 2;
+         int sy = SY + yy * ed_tilesize / 2;
+         int from_sx = sx;
+         int from_sy = sy;
+         int to_sx = sx + ed_tilesize / 2 - 1;
+         int to_sy = sy + ed_tilesize / 2 - 1;
+
+         DrawSimpleWhiteLine(drawto, from_sx, from_sy, to_sx,   from_sy);
+         DrawSimpleWhiteLine(drawto, to_sx,   from_sy, to_sx,   to_sy);
+         DrawSimpleWhiteLine(drawto, to_sx,   to_sy,   from_sx, to_sy);
+         DrawSimpleWhiteLine(drawto, from_sx, to_sy,   from_sx, from_sy);
+       }
+      }
+      else
+      {
+       int sx = SX + x * ed_tilesize;
+       int sy = SY + y * ed_tilesize;
+       int from_sx = sx;
+       int from_sy = sy;
+       int to_sx = sx + ed_tilesize - 1;
+       int to_sy = sy + ed_tilesize - 1;
+
+       DrawSimpleWhiteLine(drawto, from_sx, from_sy, to_sx,   from_sy);
+       DrawSimpleWhiteLine(drawto, to_sx,   from_sy, to_sx,   to_sy);
+       DrawSimpleWhiteLine(drawto, to_sx,   to_sy,   from_sx, to_sy);
+       DrawSimpleWhiteLine(drawto, from_sx, to_sy,   from_sx, from_sy);
+      }
+    }
+  }
+}
+
 static void CopyLevelTemplateToUserLevelSet(char *levelset_subdir)
 {
   char *template_filename_old = getLocalLevelTemplateFilename();
@@ -12320,8 +13403,10 @@ static void CopyLevelTemplateToUserLevelSet(char *levelset_subdir)
 static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
   static boolean started_inside_drawing_area = FALSE;
-  static int last_sx = -1, last_sy = -1;
-  static int last_sx2 = -1, last_sy2 = -1;
+  static int last_sx = -1;
+  static int last_sy = -1;
+  static int last_sx2 = -1;
+  static int last_sy2 = -1;
   int id = gi->custom_id;
   int type_id = gi->custom_type_id;
   boolean button_press_event;
@@ -12341,36 +13426,37 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   int dx = sx2 % 2;
   int dy = sy2 % 2;
   int lx = 0, ly = 0;
-  int min_lx = 0, min_ly = 0;
-  int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
   int x, y;
 
   button_press_event = (gi->event.type == GD_EVENT_PRESSED);
   button_release_event = (gi->event.type == GD_EVENT_RELEASED);
 
-  /* make sure to stay inside drawing area boundaries */
+  // make sure to stay inside drawing area boundaries
   sx = (sx < min_sx ? min_sx : sx > max_sx ? max_sx : sx);
   sy = (sy < min_sy ? min_sy : sy > max_sy ? max_sy : sy);
 
   if (draw_level)
   {
-    /* get positions inside level field */
+    int min_lx = 0, min_ly = 0;
+    int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
+
+    // get positions inside level field
     lx = sx + level_xpos;
     ly = sy + level_ypos;
 
     if (!IN_LEV_FIELD(lx, ly))
       inside_drawing_area = FALSE;
 
-    /* make sure to stay inside level field boundaries */
+    // make sure to stay inside level field boundaries
     lx = (lx < min_lx ? min_lx : lx > max_lx ? max_lx : lx);
     ly = (ly < min_ly ? min_ly : ly > max_ly ? max_ly : ly);
 
-    /* correct drawing area positions accordingly */
+    // correct drawing area positions accordingly
     sx = lx - level_xpos;
     sy = ly - level_ypos;
   }
 
-  /* also correct MM wall-sized (double) drawing area positions accordingly */
+  // also correct MM wall-sized (double) drawing area positions accordingly
   if (sx2 / 2 < sx || sx2 / 2 > sx)
   {
     dx = (sx2 / 2 < sx ? 0 : 1);
@@ -12382,18 +13468,15 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
     sy2 = sy * 2 + dy;
   }
 
-  if (button_release_event)
+  if (!button_press_event && !button_release_event)
   {
-    last_sx = -1;
-    last_sy = -1;
-    last_sx2 = -1;
-    last_sy2 = -1;
-  }
-  else if (!button_press_event)
-  {
-    /* prevent handling events for every pixel position when moving mouse */
-    if ((sx == last_sx && sy == last_sy &&
-        !IS_MM_WALL_EDITOR(new_element) && new_element != EL_EMPTY) ||
+    int old_element = (IN_LEV_FIELD(lx, ly) ? Tile[lx][ly] : EL_UNDEFINED);
+    boolean hires_drawing = (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+                            isHiresTileElement(old_element) &&
+                            isHiresDrawElement(new_element));
+
+    // prevent handling events for every pixel position when moving mouse
+    if ((sx == last_sx && sy == last_sy && !hires_drawing) ||
        (sx2 == last_sx2 && sy2 == last_sy2))
       return;
   }
@@ -12412,18 +13495,15 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   if (!IS_VALID_BUTTON(button))
     return;
 
-  if (!button && !button_release_event)
-    return;
-
-  /* handle info callback for each invocation of action callback */
+  // handle info callback for each invocation of action callback
   gi->callback_info(gi);
 
-  /* automatically switch to 'single item' drawing mode, if needed */
+  // automatically switch to 'single item' drawing mode, if needed
   actual_drawing_function =
     (draw_level || drawing_function == GADGET_ID_PICK_ELEMENT ?
      drawing_function : GADGET_ID_SINGLE_ITEMS);
 
-  /* clicking into drawing area with pressed Control key picks element */
+  // clicking into drawing area with pressed Control key picks element
   if (GetKeyModState() & KMOD_Control)
   {
     last_drawing_function = drawing_function;
@@ -12436,7 +13516,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       ResetIntelliDraw();
   }
 
-  SetDrawModeHiRes(-1);                /* reset to normal draw mode */
+  SetDrawModeHiRes(-1);                // reset to normal draw mode
 
   switch (actual_drawing_function)
   {
@@ -12450,10 +13530,9 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
          if (edit_mode == ED_MODE_DRAWING && draw_with_brush &&
              !inside_drawing_area)
            DeleteBrushFromCursor();
-       }
 
-       if (!button || button_release_event)
          break;
+       }
 
        if (draw_with_brush)
        {
@@ -12463,13 +13542,44 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        {
          SetDrawModeHiRes(new_element);
 
-         if (new_element == EL_PLAYER_1)
+         if (IS_PLAYER_ELEMENT(new_element) || IS_MM_MCDUFFIN(new_element))
          {
-           /* remove player at old position */
+           // remove player at old position
            for (y = 0; y < lev_fieldy; y++)
+           {
              for (x = 0; x < lev_fieldx; x++)
-               if (Feld[x][y] == EL_PLAYER_1)
+             {
+               int old_element = Tile[x][y];
+
+               if (IS_PLAYER_ELEMENT(old_element) &&
+                   IS_PLAYER_ELEMENT(new_element))
+               {
+                 int replaced_with_element =
+                   (old_element == EL_SOKOBAN_FIELD_PLAYER &&
+                    new_element == EL_PLAYER_1 ? EL_SOKOBAN_FIELD_EMPTY :
+
+                    old_element == EL_SOKOBAN_FIELD_PLAYER &&
+                    new_element == old_element ? EL_SOKOBAN_FIELD_EMPTY :
+
+                    new_element == EL_SOKOBAN_FIELD_PLAYER &&
+                    old_element == EL_PLAYER_1 ? EL_EMPTY :
+
+                    new_element >= EL_PLAYER_1 &&
+                    new_element <= EL_PLAYER_4 &&
+                    new_element == old_element ? EL_EMPTY :
+
+                    old_element);
+
+                 SetElement(x, y, replaced_with_element);
+               }
+               else if (IS_MM_MCDUFFIN(old_element) &&
+                        IS_MM_MCDUFFIN(new_element))
+               {
+                 // remove McDuffin at old position
                  SetElement(x, y, EL_EMPTY);
+               }
+             }
+           }
          }
 
          SetElementButton(lx, ly, dx, dy, new_element, button);
@@ -12501,7 +13611,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        {
          UpdateCustomElementGraphicGadgets();
 
-         FrameCounter = 0;     /* restart animation frame counter */
+         FrameCounter = 0;     // restart animation frame counter
        }
       }
       break;
@@ -12514,22 +13624,19 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        if (button_release_event)
          CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 
-       if (button)
-       {
-         SetDrawModeHiRes(new_element);
+       SetDrawModeHiRes(new_element);
 
-         if (getDrawModeHiRes())
-         {
-           sx = sx2;
-           sy = sy2;
-         }
+       if (getDrawModeHiRes())
+       {
+         sx = sx2;
+         sy = sy2;
+       }
 
-         if (!button_press_event)
-           DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE);
+       if (!button_press_event)
+         DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE);
 
-         last_sx = sx;
-         last_sy = sy;
-       }
+       last_sx = sx;
+       last_sy = sy;
       }
       break;
 
@@ -12544,7 +13651,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        sx = sx2;
        sy = sy2;
       }
-      /* FALLTHROUGH */
+      // FALLTHROUGH
     case GADGET_ID_GRAB_BRUSH:
     case GADGET_ID_TEXT:
       {
@@ -12564,7 +13671,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
          draw_func = DrawFilledBox;
        else if (drawing_function == GADGET_ID_GRAB_BRUSH)
          draw_func = SelectArea;
-       else /* (drawing_function == GADGET_ID_TEXT) */
+       else // (drawing_function == GADGET_ID_TEXT)
          draw_func = SetTextCursor;
 
        if (button_press_event)
@@ -12595,7 +13702,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        else if (last_sx != sx || last_sy != sy)
        {
          draw_func(start_sx, start_sy, last_sx, last_sy, -1, FALSE);
-          if (IS_MM_WALL_EDITOR(new_element))  /* clear wall background */
+          if (IS_MM_WALL_EDITOR(new_element))  // clear wall background
             draw_func(start_sx, start_sy, sx, sy, EL_EMPTY, FALSE);
          draw_func(start_sx, start_sy, sx, sy, new_element, FALSE);
          last_sx = sx;
@@ -12605,7 +13712,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_FLOOD_FILL:
-      if (button_press_event && Feld[lx][ly] != new_element)
+      if (button_press_event && Tile[lx][ly] != new_element)
       {
        if (IS_MM_WALL_EDITOR(new_element))
          FloodFillWall_MM(sx2, sy2, new_element);
@@ -12622,7 +13729,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        ClickOnGadget(level_editor_gadget[last_drawing_function],
                      MB_LEFTBUTTON);
       else if (draw_level)
-       PickDrawingElement(button, Feld[lx][ly]);
+       PickDrawingElement(button, Tile[lx][ly]);
       else
       {
        int pos = sx * drawingarea_info[type_id].area_ysize + sy;
@@ -12634,7 +13741,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       break;
   }
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
+  // do not mark level as modified for certain non-level-changing gadgets
   if ((type_id >= ED_DRAWING_ID_EDITOR_FIRST &&
        type_id <= ED_DRAWING_ID_EDITOR_LAST) ||
       actual_drawing_function == GADGET_ID_GRAB_BRUSH ||
@@ -12693,7 +13800,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
     if (level.game_engine_type != last_game_engine_type)
     {
-      /* update element selection list */
+      // update element selection list
       ReinitializeElementList();
       ModifyEditorElementList();
     }
@@ -12712,11 +13819,11 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
       break;
 
     case ED_COUNTER_ID_ANDROID_CONTENT:
-      DrawAndroidElementArea(properties_element);
+      DrawAndroidElementArea();
       break;
 
     case ED_COUNTER_ID_GROUP_CONTENT:
-      DrawGroupElementArea(properties_element);
+      DrawGroupElementArea();
       CopyGroupElementPropertiesToGame(properties_element);
       break;
 
@@ -12724,6 +13831,10 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
       DrawPlayerInitialInventoryArea(properties_element);
       break;
 
+    case ED_COUNTER_ID_MM_BALL_CONTENT:
+      DrawMMBallContentArea();
+      break;
+
     case ED_COUNTER_ID_ENVELOPE_XSIZE:
     case ED_COUNTER_ID_ENVELOPE_YSIZE:
       DrawEnvelopeTextArea(-1);
@@ -12734,7 +13845,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
       lev_fieldx = level.fieldx;
       lev_fieldy = level.fieldy;
 
-      /* check if resizing of level results in change of border border */
+      // check if resizing of level results in change of border border
       SetBorderElement();
 
       break;
@@ -12749,7 +13860,7 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
        counter_id <= ED_COUNTER_ID_CHANGE_LAST))
     CopyElementPropertiesToGame(properties_element);
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
+  // do not mark level as modified for certain non-level-changing gadgets
   if ((counter_id >= ED_COUNTER_ID_LEVELSET_FIRST &&
        counter_id <= ED_COUNTER_ID_LEVELSET_LAST) ||
       (counter_id >= ED_COUNTER_ID_EDITOR_FIRST &&
@@ -12769,10 +13880,10 @@ static void HandleTextInputGadgets(struct GadgetInfo *gi)
   {
     CopyElementPropertiesToGame(properties_element);
 
-    ModifyEditorElementList(); /* update changed button info text */
+    ModifyEditorElementList(); // update changed button info text
   }
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
+  // do not mark level as modified for certain non-level-changing gadgets
   if (type_id >= ED_TEXTINPUT_ID_LEVELSET_FIRST &&
       type_id <= ED_TEXTINPUT_ID_LEVELSET_LAST)
     return;
@@ -12801,7 +13912,7 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
 
   if (type_id == ED_SELECTBOX_ID_LEVELSET_SAVE_MODE)
   {
-    DrawLevelInfoWindow();
+    DrawLevelConfigWindow();
   }
   else if (type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE)
   {
@@ -12817,7 +13928,7 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
   {
     if (type_id == ED_SELECTBOX_ID_ACTION_TYPE)
     {
-      /* when changing action type, also check action mode and action arg */
+      // when changing action type, also check action mode and action arg
       if (value_old != value_new)
        setSelectboxSpecialActionVariablesIfNeeded();
 
@@ -12828,12 +13939,12 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
   }
   else if (type_id == ED_SELECTBOX_ID_GAME_ENGINE_TYPE)
   {
-    /* update element selection list */
+    // update element selection list
     ReinitializeElementList();
     ModifyEditorElementList();
   }
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
+  // do not mark level as modified for certain non-level-changing gadgets
   if (type_id == ED_SELECTBOX_ID_LEVELSET_SAVE_MODE ||
       type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE)
     return;
@@ -12846,12 +13957,12 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   int type_id = gi->custom_type_id;
   int i;
 
-  if (type_id >= ED_TAB_BUTTON_ID_LEVELINFO_FIRST &&
-      type_id <= ED_TAB_BUTTON_ID_LEVELINFO_LAST)
+  if (type_id >= ED_TAB_BUTTON_ID_LEVELCONFIG_FIRST &&
+      type_id <= ED_TAB_BUTTON_ID_LEVELCONFIG_LAST)
   {
-    edit_mode_levelinfo = gi->custom_type_id;
+    edit_mode_levelconfig = gi->custom_type_id;
 
-    DrawLevelInfoWindow();
+    DrawLevelConfigWindow();
   }
   else if (type_id >= ED_TAB_BUTTON_ID_PROPERTIES_FIRST &&
           type_id <= ED_TAB_BUTTON_ID_PROPERTIES_LAST)
@@ -12865,11 +13976,11 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   {
     boolean new_template = !fileExists(getLocalLevelTemplateFilename());
 
-    /* backup original "level.field" (needed to track playfield changes) */
-    CopyPlayfield(level.field, FieldBackup);
+    // backup original "level.field" (needed to track playfield changes)
+    CopyPlayfield(level.field, TileBackup);
 
-    /* "SaveLevelTemplate()" uses "level.field", so copy editor playfield */
-    CopyPlayfield(Feld, level.field);
+    // "SaveLevelTemplate()" uses "level.field", so copy editor playfield
+    CopyPlayfield(Tile, level.field);
 
     if (new_template ||
        Request("Save this template and kill the old?", REQ_ASK))
@@ -12878,8 +13989,8 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
     if (new_template)
       Request("Template saved!", REQ_CONFIRM);
 
-    /* restore original "level.field" (needed to track playfield changes) */
-    CopyPlayfield(FieldBackup, level.field);
+    // restore original "level.field" (needed to track playfield changes)
+    CopyPlayfield(TileBackup, level.field);
   }
   else if (type_id == ED_TEXTBUTTON_ID_SAVE_LEVELSET)
   {
@@ -12888,7 +13999,7 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
     if (levelset_save_mode == LEVELSET_SAVE_MODE_UPDATE &&
        leveldir_current->readonly)
     {
-      Request("This level set is read only!", REQ_CONFIRM);
+      Request("This level set is read-only!", REQ_CONFIRM);
 
       return;
     }
@@ -12952,13 +14063,13 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   {
     struct ElementInfo *ei = &element_info[properties_element];
 
-    /* when modifying custom element, ask for copying level template */
+    // when modifying custom element, ask for copying level template
     if (level.use_custom_template && !AskToCopyAndModifyLevelTemplate())
       return;
 
     setElementChangePages(ei, ei->num_change_pages + 1);
 
-    /* set new change page to be new current change page */
+    // set new change page to be new current change page
     ei->current_change_page = ei->num_change_pages - 1;
     ei->change = &ei->change_page[ei->current_change_page];
 
@@ -12973,11 +14084,11 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   {
     struct ElementInfo *ei = &element_info[properties_element];
 
-    /* when modifying custom element, ask for copying level template */
+    // when modifying custom element, ask for copying level template
     if (level.use_custom_template && !AskToCopyAndModifyLevelTemplate())
       return;
 
-    /* copy all change pages after change page to be deleted */
+    // copy all change pages after change page to be deleted
     for (i = ei->current_change_page; i < ei->num_change_pages - 1; i++)
       ei->change_page[i] = ei->change_page[i + 1];
 
@@ -13022,7 +14133,7 @@ static void HandleGraphicbuttonGadgets(struct GadgetInfo *gi)
     }
     else if (type_id == ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE)
     {
-      /* when modifying custom element, ask for copying level template */
+      // when modifying custom element, ask for copying level template
       if (level.use_custom_template && !AskToCopyAndModifyLevelTemplate())
        return;
 
@@ -13043,7 +14154,7 @@ static void HandleRadiobuttons(struct GadgetInfo *gi)
   *radiobutton_info[type_id].value =
     radiobutton_info[type_id].checked_value;
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
+  // do not mark level as modified for certain non-level-changing gadgets
   if (type_id >= ED_RADIOBUTTON_ID_EDITOR_FIRST &&
       type_id <= ED_RADIOBUTTON_ID_EDITOR_LAST)
     return;
@@ -13079,9 +14190,11 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
     boolean template_related_changes_found = FALSE;
     int i;
 
-    /* check if any custom or group elements have been changed */
+    // check if any custom, group or empty elements have been changed
     for (i = 0; i < NUM_FILE_ELEMENTS; i++)
-      if ((IS_CUSTOM_ELEMENT(i) || IS_GROUP_ELEMENT(i)) &&
+      if ((IS_CUSTOM_ELEMENT(i) ||
+          IS_GROUP_ELEMENT(i) ||
+          IS_EMPTY_ELEMENT(i)) &&
          element_info[i].modified_settings)
        template_related_changes_found = TRUE;
 
@@ -13155,7 +14268,7 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
     SetAutomaticNumberOfGemsNeeded();
   }
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
+  // do not mark level as modified for certain non-level-changing gadgets
   if ((type_id >= ED_CHECKBUTTON_ID_LEVELSET_FIRST &&
        type_id <= ED_CHECKBUTTON_ID_LEVELSET_LAST) ||
       (type_id >= ED_CHECKBUTTON_ID_EDITOR_FIRST &&
@@ -13191,11 +14304,11 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       !(GetKeyModState() & KMOD_Control))
     ChangeEditModeWindow(ED_MODE_DRAWING);
 
-  /* element copy mode active, but no element button pressed => deactivate */
+  // element copy mode active, but no element button pressed => deactivate
   if (last_custom_copy_mode != -1 && id < ED_NUM_CTRL_BUTTONS)
     last_custom_copy_mode = -1;
 
-  /* when showing palette on element buttons, change element of button used */
+  // when showing palette on element buttons, change element of button used
   if (editor.palette.show_on_element_buttons &&
       id >= GADGET_ID_ELEMENT_LEFT && id <= GADGET_ID_ELEMENT_RIGHT)
   {
@@ -13349,7 +14462,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       else
       {
-       ChangeEditModeWindow(last_edit_mode);
+       ChangeEditModeWindow(ED_MODE_DRAWING);
 
        ClickOnGadget(level_editor_gadget[last_level_drawing_function],
                      MB_LEFTBUTTON);
@@ -13411,6 +14524,10 @@ static void HandleControlButtons(struct GadgetInfo *gi)
                     button == 2 ? ed_tilesize_default :
                     button == 3 ? ed_tilesize / 2 : ed_tilesize);
 
+      // when using touch device, cycle through all zoom tilesizes
+      if (runtime.uses_touch_device && ed_tilesize > TILESIZE)
+       ed_tilesize = MICRO_TILESIZE;
+
       // limit zoom level by upper and lower bound
       ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);
 
@@ -13420,11 +14537,11 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       {
        DrawDrawingWindow();
 
-       /* redraw zoom gadget info text */
+       // redraw zoom gadget info text
        PrintEditorGadgetInfoText(level_editor_gadget[id]);
       }
 
-      /* save current editor zoom tilesize */
+      // save current editor zoom tilesize
       SaveSetup_AutoSetup();
 
       break;
@@ -13445,7 +14562,9 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_UNDO:
-      if (button == 1 && GetKeyModState() & (KMOD_Shift|KMOD_Control))
+      if (button < 0)  // keep button value (even if modifier keys are pressed)
+       button = -button;
+      else if (button == 1 && GetKeyModState() & (KMOD_Shift | KMOD_Control))
        button = 3;
 
       if (button == 1 && undo_buffer_steps == 0)
@@ -13470,7 +14589,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
       if (button == 1)
       {
-       /* undo */
+       // undo
 
        undo_buffer_position =
          (undo_buffer_position - 1 + NUM_UNDO_STEPS) % NUM_UNDO_STEPS;
@@ -13480,7 +14599,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       else
       {
-       /* redo */
+       // redo
 
        undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
 
@@ -13490,25 +14609,25 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
       for (x = 0; x < lev_fieldx; x++)
        for (y = 0; y < lev_fieldy; y++)
-         Feld[x][y] = UndoBuffer[undo_buffer_position][x][y];
+         Tile[x][y] = UndoBuffer[undo_buffer_position][x][y];
 
-      /* check if undo operation forces change of border style */
+      // check if undo operation forces change of border style
       CheckLevelBorderElement(FALSE);
 
       DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
       break;
 
-    case GADGET_ID_INFO:
-      if (edit_mode != ED_MODE_INFO)
+    case GADGET_ID_CONF:
+      if (edit_mode != ED_MODE_LEVELCONFIG)
       {
        last_edit_mode = edit_mode;
 
-       ChangeEditModeWindow(ED_MODE_INFO);
+       ChangeEditModeWindow(ED_MODE_LEVELCONFIG);
       }
       else
       {
-       ChangeEditModeWindow(last_edit_mode);
+       ChangeEditModeWindow(ED_MODE_DRAWING);
       }
       break;
 
@@ -13518,7 +14637,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
       for (x = 0; x < MAX_LEV_FIELDX; x++)
        for (y = 0; y < MAX_LEV_FIELDY; y++)
-         Feld[x][y] = (button == 1 ? EL_EMPTY : new_element);
+         Tile[x][y] = (button == 1 ? EL_EMPTY : new_element);
 
       CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
 
@@ -13527,8 +14646,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
     case GADGET_ID_SAVE:
     {
-      /* saving read-only levels into personal level set modifies global vars
-        "leveldir_current" and "level_nr"; restore them after saving level */
+      // saving read-only levels into personal level set modifies global vars
+      // "leveldir_current" and "level_nr"; restore them after saving level
       LevelDirTree *leveldir_former = leveldir_current;
       int level_nr_former = level_nr;
       char *level_filename;
@@ -13545,11 +14664,11 @@ static void HandleControlButtons(struct GadgetInfo *gi)
          Request("Save this level and kill the old?", REQ_ASK))
       {
        if (leveldir_former->readonly)
-         ModifyLevelInfoForSavingIntoPersonalLevelSet(leveldir_former->name);
+         ModifyLevelConfigForSavingIntoPersonalLevelSet(leveldir_former->name);
 
        SetAutomaticNumberOfGemsNeeded();
 
-       CopyPlayfield(Feld, level.field);
+       CopyPlayfield(Tile, level.field);
        SaveLevel(level_nr);
 
        level.changed = FALSE;
@@ -13569,7 +14688,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        }
       }
 
-      /* "cd" back to copied-from levelset (in case of saved read-only level) */
+      // "cd" back to copied-from levelset (in case of saved read-only level)
       leveldir_current = leveldir_former;
       level_nr = level_nr_former;
 
@@ -13580,8 +14699,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       if (LevelChanged())
        level.game_version = GAME_VERSION_ACTUAL;
 
-      CopyPlayfield(level.field, FieldBackup);
-      CopyPlayfield(Feld, level.field);
+      CopyPlayfield(level.field, TileBackup);
+      CopyPlayfield(Tile, level.field);
 
       CopyNativeLevel_RND_to_Native(&level);
 
@@ -13590,7 +14709,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
       CloseDoor(DOOR_CLOSE_ALL);
 
-      /* needed before playing if editor playfield area has different size */
+      // needed before playing if editor playfield area has different size
       ClearRectangle(drawto, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
 
       // redraw_mask = REDRAW_ALL;
@@ -13602,7 +14721,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_EXIT:
-      RequestExitLevelEditor(TRUE, FALSE);  /* if level has changed, ask user */
+      RequestExitLevelEditor(TRUE, FALSE);  // if level has changed, ask user
       break;
 
     default:
@@ -13610,7 +14729,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
          id <= GADGET_ID_ELEMENTLIST_LAST)
       {
        int element_position = id - GADGET_ID_ELEMENTLIST_FIRST;
-       int new_element = editor_elements[element_position + element_shift];
+
+       new_element = editor_elements[element_position + element_shift];
 
        if (IS_EDITOR_CASCADE(new_element))
        {
@@ -13626,14 +14746,14 @@ static void HandleControlButtons(struct GadgetInfo *gi)
              *cascade_element = EL_CASCADE_TOGGLE(*cascade_element);
              *cascade_value = IS_EDITOR_CASCADE_ACTIVE(*cascade_element);
 
-             /* update element selection list */
+             // update element selection list
              ReinitializeElementList();
              ModifyEditorElementList();
 
-             /* update cascading gadget info text */
+             // update cascading gadget info text
              PrintEditorGadgetInfoText(level_editor_gadget[id]);
 
-             /* save current editor cascading state */
+             // save current editor cascading state
              SaveSetup_EditorCascade();
 
              break;
@@ -13657,7 +14777,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
          break;
        }
 
-       /* change element of button used to show palette */
+       // change element of button used to show palette
        if (editor.palette.show_on_element_buttons)
          button = last_button;
 
@@ -13681,13 +14801,13 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
 #ifdef DEBUG
       else if (gi->event.type == GD_EVENT_PRESSED)
-       printf("default: HandleControlButtons: GD_EVENT_PRESSED(%d)\n", id);
+       Debug("editor", "default: HandleControlButtons: GD_EVENT_PRESSED(%d)", id);
       else if (gi->event.type == GD_EVENT_RELEASED)
-       printf("default: HandleControlButtons: GD_EVENT_RELEASED(%d)\n", id);
+       Debug("editor", "default: HandleControlButtons: GD_EVENT_RELEASED(%d)", id);
       else if (gi->event.type == GD_EVENT_MOVING)
-       printf("default: HandleControlButtons: GD_EVENT_MOVING(%d)\n", id);
+       Debug("editor", "default: HandleControlButtons: GD_EVENT_MOVING(%d)", id);
       else
-       printf("default: HandleControlButtons: ? (id == %d)\n", id);
+       Debug("editor", "default: HandleControlButtons: ? (id == %d)", id);
 #endif
       break;
   }
@@ -13696,7 +14816,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 void HandleLevelEditorKeyInput(Key key)
 {
   char letter = getCharFromKey(key);
-  int button = MB_LEFTBUTTON;
 
   if (drawing_function == GADGET_ID_TEXT &&
       DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE)
@@ -13709,165 +14828,164 @@ void HandleLevelEditorKeyInput(Key key)
       DrawLevelText(0, 0, 0, TEXT_NEWLINE);
     else if (key == KSYM_Escape)
       DrawLevelText(0, 0, 0, TEXT_END);
+
+    return;
   }
-  else if (button_status == MB_RELEASED)
+
+  int id = GADGET_ID_NONE;
+  int new_element_shift = element_shift;
+  int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
+  int button = MB_LEFTBUTTON;
+  int i;
+
+  switch (key)
   {
-    int id = GADGET_ID_NONE;
-    int new_element_shift = element_shift;
-    int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
-    int i;
+    case KSYM_Left:
+      id = GADGET_ID_SCROLL_LEFT;
+      break;
+    case KSYM_Right:
+      id = GADGET_ID_SCROLL_RIGHT;
+      break;
+    case KSYM_Up:
+      id = GADGET_ID_SCROLL_UP;
+      break;
+    case KSYM_Down:
+      id = GADGET_ID_SCROLL_DOWN;
+      break;
 
-    switch (key)
-    {
-      case KSYM_Left:
-       id = GADGET_ID_SCROLL_LEFT;
-       break;
-      case KSYM_Right:
-       id = GADGET_ID_SCROLL_RIGHT;
-       break;
-      case KSYM_Up:
-       id = GADGET_ID_SCROLL_UP;
-       break;
-      case KSYM_Down:
-       id = GADGET_ID_SCROLL_DOWN;
-       break;
+    case KSYM_Page_Up:
+    case KSYM_Page_Down:
+      step *= (key == KSYM_Page_Up ? -1 : +1);
+      element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
 
-      case KSYM_Page_Up:
-      case KSYM_Page_Down:
-       step *= (key == KSYM_Page_Up ? -1 : +1);
-        element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+      if (element_shift < 0)
+       element_shift = 0;
+      if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+       element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
 
-        if (element_shift < 0)
-          element_shift = 0;
-        if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
-          element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+      ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+                  GDI_SCROLLBAR_ITEM_POSITION,
+                  element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
 
-        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-                     GDI_SCROLLBAR_ITEM_POSITION,
-                     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+      ModifyEditorElementList();
 
-       ModifyEditorElementList();
+      break;
 
-       break;
+    case KSYM_Home:
+    case KSYM_End:
+      element_shift = (key == KSYM_Home ? 0 :
+                      num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS);
 
-      case KSYM_Home:
-      case KSYM_End:
-       element_shift = (key == KSYM_Home ? 0 :
-                        num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS);
+      ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+                  GDI_SCROLLBAR_ITEM_POSITION,
+                  element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
 
-       ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-                    GDI_SCROLLBAR_ITEM_POSITION,
-                    element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+      ModifyEditorElementList();
+
+      break;
 
-       ModifyEditorElementList();
+    case KSYM_Insert:
+    case KSYM_Delete:
 
+      // this is needed to prevent interference with running "True X-Mouse"
+      if (GetKeyModStateFromEvents() & KMOD_Control)
        break;
 
-      case KSYM_Insert:
-      case KSYM_Delete:
-
-       /* this is needed to prevent interference with running "True X-Mouse" */
-       if (GetKeyModStateFromEvents() & KMOD_Control)
+      // check for last or next editor cascade block in element list
+      for (i = 0; i < num_editor_elements; i++)
+      {
+       if ((key == KSYM_Insert && i == element_shift) ||
+           (key == KSYM_Delete && new_element_shift > element_shift))
          break;
 
-       /* check for last or next editor cascade block in element list */
-       for (i = 0; i < num_editor_elements; i++)
-       {
-         if ((key == KSYM_Insert && i == element_shift) ||
-             (key == KSYM_Delete && new_element_shift > element_shift))
-           break;
+       // jump to next cascade block (or to start of element list)
+       if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
+         new_element_shift = i;
+      }
 
-         /* jump to next cascade block (or to start of element list) */
-         if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
-           new_element_shift = i;
-       }
+      if (i < num_editor_elements)
+       element_shift = new_element_shift;
 
-       if (i < num_editor_elements)
-         element_shift = new_element_shift;
+      if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+       element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
 
-       if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
-         element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+      ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+                  GDI_SCROLLBAR_ITEM_POSITION,
+                  element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
 
-       ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-                    GDI_SCROLLBAR_ITEM_POSITION,
-                    element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+      ModifyEditorElementList();
 
-       ModifyEditorElementList();
+      break;
 
-       break;
+    case KSYM_Escape:
+      if (edit_mode == ED_MODE_DRAWING)
+       RequestExitLevelEditor(setup.ask_on_escape_editor, TRUE);
+      else if (edit_mode == ED_MODE_LEVELCONFIG)
+       HandleControlButtons(level_editor_gadget[GADGET_ID_CONF]);
+      else if (edit_mode == ED_MODE_PROPERTIES)
+       HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
+      else if (edit_mode == ED_MODE_PALETTE)
+       HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
+      else             // should never happen
+       ChangeEditModeWindow(ED_MODE_DRAWING);
 
-      case KSYM_Escape:
-        if (edit_mode == ED_MODE_DRAWING)
-       {
-         RequestExitLevelEditor(setup.ask_on_escape_editor, TRUE);
-       }
-        else if (edit_mode == ED_MODE_INFO)
-       {
-         HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]);
-       }
-        else if (edit_mode == ED_MODE_PROPERTIES)
-       {
-         HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
-       }
-        else if (edit_mode == ED_MODE_PALETTE)
-       {
-         HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
-       }
-       else            /* should never happen */
-       {
-         ChangeEditModeWindow(ED_MODE_DRAWING);
-       }
+      break;
 
-        break;
+    default:
+      break;
+  }
 
-      default:
-       break;
-    }
+  if (id != GADGET_ID_NONE)
+    ClickOnGadget(level_editor_gadget[id], button);
+  else if (letter == '1' || letter == '?')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
+  else if (letter == '2')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
+  else if (letter == '3')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
+  else if (letter == '.')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+  else if (letter == 'U')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
+  else if (letter == '-' || key == KSYM_KP_Subtract)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
+  else if (letter == '0' || key == KSYM_KP_0)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
+  else if (letter == '+' || key == KSYM_KP_Add ||
+          letter == '=')       // ("Shift-=" is "+" on US keyboards)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
+  else if (key == KSYM_Return ||
+          key == KSYM_space ||
+          key == setup.shortcut.toggle_pause)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
+  else
+    for (i = 0; i < ED_NUM_CTRL_BUTTONS; i++)
+      if (letter && letter == controlbutton_info[i].shortcut)
+       if (!anyTextGadgetActive())
+         ClickOnGadget(level_editor_gadget[i], button);
 
-    if (id != GADGET_ID_NONE)
-      ClickOnGadget(level_editor_gadget[id], button);
-    else if (letter == '1' || letter == '?')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
-    else if (letter == '2')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
-    else if (letter == '3')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
-    else if (letter == '.')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
-    else if (letter == 'U')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
-    else if (letter == '-' || key == KSYM_KP_Subtract)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
-    else if (letter == '0' || key == KSYM_KP_0)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
-    else if (letter == '+' || key == KSYM_KP_Add ||
-            letter == '=')     // ("Shift-=" is "+" on US keyboards)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
-    else if (key == KSYM_Return ||
-            key == KSYM_space ||
-            key == setup.shortcut.toggle_pause)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
-    else
-      for (i = 0; i < ED_NUM_CTRL_BUTTONS; i++)
-       if (letter && letter == controlbutton_info[i].shortcut)
-         if (!anyTextGadgetActive())
-           ClickOnGadget(level_editor_gadget[i], button);
+  if (draw_with_brush)
+  {
+    if (letter == 'x')
+      FlipBrushX();
+    else if (letter == 'y')
+      FlipBrushY();
+    else if (letter == 'z')
+      RotateBrush();
   }
 }
 
-void HandleLevelEditorIdle(void)
+static void HandleLevelEditorIdle_Properties(void)
 {
   int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
   int x = editor.settings.element_graphic.x + element_border;
   int y = editor.settings.element_graphic.y + element_border;
-  static unsigned int action_delay = 0;
-  unsigned int action_delay_value = GameFrameDelay;
+  static DelayCounter action_delay = { 0 };
   int i;
 
-  if (edit_mode != ED_MODE_PROPERTIES)
-    return;
+  action_delay.value = GameFrameDelay;
 
-  if (!DelayReached(&action_delay, action_delay_value))
+  if (!DelayReached(&action_delay))
     return;
 
   for (i = 0; i < ED_NUM_SELECTBOX; i++)
@@ -13882,7 +15000,34 @@ void HandleLevelEditorIdle(void)
 
   redraw_mask |= REDRAW_FIELD;
 
-  FrameCounter++;      /* increase animation frame counter */
+  FrameCounter++;      // increase animation frame counter
+}
+
+static void HandleLevelEditorIdle_Drawing(void)
+{
+  static boolean last_highlighted = FALSE;
+  static boolean last_highlighted_similar = FALSE;
+  boolean highlighted = (GetKeyModState() & KMOD_Alt);
+  boolean highlighted_similar = (GetKeyModState() & KMOD_Shift);
+
+  if (highlighted != last_highlighted ||
+      (highlighted && highlighted_similar != last_highlighted_similar))
+  {
+    DrawAreaElementHighlight(highlighted, highlighted_similar);
+
+    redraw_mask |= REDRAW_FIELD;
+  }
+
+  last_highlighted = highlighted;
+  last_highlighted_similar = highlighted_similar;
+}
+
+void HandleLevelEditorIdle(void)
+{
+  if (edit_mode == ED_MODE_PROPERTIES)
+    HandleLevelEditorIdle_Properties();
+  else if (edit_mode == ED_MODE_DRAWING)
+    HandleLevelEditorIdle_Drawing();
 }
 
 static void ClearEditorGadgetInfoText(void)
@@ -13893,7 +15038,6 @@ static void ClearEditorGadgetInfoText(void)
 void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
 {
   char infotext[MAX_OUTPUT_LINESIZE + 1];
-  char shortcut[MAX_OUTPUT_LINESIZE + 1];
   int max_infotext_len = getMaxInfoTextLength();
 
   if (gi == NULL || strlen(gi->info_text) == 0)
@@ -13908,6 +15052,8 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
 
     if (key)
     {
+      char shortcut[MAX_OUTPUT_LINESIZE + 1];
+
       if (gi->custom_id == GADGET_ID_SINGLE_ITEMS)
        sprintf(shortcut, " ('.' or '%c')", key);
       else if (gi->custom_id == GADGET_ID_PICK_ELEMENT)
@@ -13942,7 +15088,7 @@ void HandleEditorGadgetInfoText(void *ptr)
   if (gi == NULL || gi->event.type == GD_EVENT_INFO_LEAVING)
     return;
 
-  /* misuse this function to delete brush cursor, if needed */
+  // misuse this function to delete brush cursor, if needed
   if (edit_mode == ED_MODE_DRAWING && draw_with_brush)
     DeleteBrushFromCursor();
 
@@ -13951,7 +15097,6 @@ void HandleEditorGadgetInfoText(void *ptr)
 
 static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
 {
-  static int start_lx, start_ly;
   int id = gi->custom_id;
   int type_id = gi->custom_type_id;
   int sx = gi->event.x;
@@ -13964,11 +15109,10 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
   int actual_drawing_function = drawing_function;
   int max_infotext_len = getMaxInfoTextLength();
   char infotext[MAX_OUTPUT_LINESIZE + 1];
-  char *text;
 
-  infotext[0] = '\0';          /* start with empty info text */
+  infotext[0] = '\0';          // start with empty info text
 
-  /* pressed Control key: simulate picking element */
+  // pressed Control key: simulate picking element
   if (GetKeyModState() & KMOD_Control)
     actual_drawing_function = GADGET_ID_PICK_ELEMENT;
 
@@ -13977,7 +15121,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
   if (gi->event.type == GD_EVENT_INFO_LEAVING)
     return;
 
-  /* make sure to stay inside drawing area boundaries */
+  // make sure to stay inside drawing area boundaries
   sx = (sx < min_sx ? min_sx : sx > max_sx ? max_sx : sx);
   sy = (sy < min_sy ? min_sy : sy > max_sy ? max_sy : sy);
 
@@ -13988,23 +15132,27 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
       int min_lx = 0, min_ly = 0;
       int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
 
-      /* get positions inside level field */
+      // get positions inside level field
       lx = sx + level_xpos;
       ly = sy + level_ypos;
 
-      /* make sure to stay inside level field boundaries */
+      // make sure to stay inside level field boundaries
       lx = (lx < min_lx ? min_lx : lx > max_lx ? max_lx : lx);
       ly = (ly < min_ly ? min_ly : ly > max_ly ? max_ly : ly);
 
-      /* correct drawing area positions accordingly */
+      // correct drawing area positions accordingly
       sx = lx - level_xpos;
       sy = ly - level_ypos;
     }
 
-    if (IN_ED_FIELD(sx,sy) && IN_LEV_FIELD(lx, ly))
+    if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
     {
-      if (button_status)       /* if (gi->state == GD_BUTTON_PRESSED) */
+      if (button_status)       // if (gi->state == GD_BUTTON_PRESSED)
       {
+       static int start_lx = 0;
+       static int start_ly = 0;
+       char *text;
+
        if (gi->event.type == GD_EVENT_PRESSED)
        {
          start_lx = lx;
@@ -14056,12 +15204,12 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
                  ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1);
       }
       else if (actual_drawing_function == GADGET_ID_PICK_ELEMENT)
-       strncpy(infotext, getElementInfoText(Feld[lx][ly]), max_infotext_len);
+       strncpy(infotext, getElementInfoText(Tile[lx][ly]), max_infotext_len);
       else
        sprintf(infotext, "Level position: %d, %d", lx, ly);
     }
 
-    /* misuse this function to draw brush cursor, if needed */
+    // misuse this function to draw brush cursor, if needed
     if (edit_mode == ED_MODE_DRAWING && draw_with_brush && !button_status)
     {
       if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
@@ -14069,6 +15217,9 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
       else
        DeleteBrushFromCursor();
     }
+
+    if (!draw_with_brush)
+      UpdateBrushPosition(sx, sy);
   }
   else if (actual_drawing_function == GADGET_ID_PICK_ELEMENT)
   {
@@ -14114,7 +15265,7 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed,
     struct RectWithBorder *vp_door_1 = &viewport.door_1[GAME_MODE_MAIN];
     struct RectWithBorder *vp_door_2 = &viewport.door_2[GAME_MODE_MAIN];
 
-    /* draw normal door */
+    // draw normal door
     UndrawSpecialEditorDoor();
 
     // use door animation if door 1 viewport is unchanged and contains toolbox
@@ -14132,7 +15283,7 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed,
        vp_door_2->height == VYSIZE)
       CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
     else
-      SetDoorState(DOOR_CLOSE_2);
+      SetDoorState(DOOR_CLOSE_ALL);
 
     BackToFront();