fixed bug when using Shift+click (IntelliDraw) in editor using empty space
[rocksndiamonds.git] / src / editor.c
index 9b06a74e92313240432d5f4320a862141cb0aece..12562f7671feb4c9f27e3e949e33845bf17e389f 100644 (file)
 #define INFOTEXT_UNKNOWN_ELEMENT       "unknown"
 
 
-/*
-  -----------------------------------------------------------------------------
-  screen and artwork graphic pixel position definitions
-  -----------------------------------------------------------------------------
-*/
-
-/* values for the control window */
-#define ED_CTRL1_BUTTONS_HORIZ         4       /* toolbox */
+// ----------------------------------------------------------------------------
+// screen and artwork graphic pixel position definitions
+// ----------------------------------------------------------------------------
+
+// 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)
 #define INFOTEXT_YSIZE_FULL    (INFOTEXT_YSIZE + ED_GADGET_SMALL_DISTANCE)
-#define INFOTEXT_XPOS          SX
-#define INFOTEXT_YPOS          (SY + 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_ELEMENT_VALUE1_DOWN  (GADGET_ID_COUNTER_FIRST + 24)
-#define GADGET_ID_ELEMENT_VALUE1_TEXT  (GADGET_ID_COUNTER_FIRST + 25)
-#define GADGET_ID_ELEMENT_VALUE1_UP    (GADGET_ID_COUNTER_FIRST + 26)
-#define GADGET_ID_ELEMENT_VALUE2_DOWN  (GADGET_ID_COUNTER_FIRST + 27)
-#define GADGET_ID_ELEMENT_VALUE2_TEXT  (GADGET_ID_COUNTER_FIRST + 28)
-#define GADGET_ID_ELEMENT_VALUE2_UP    (GADGET_ID_COUNTER_FIRST + 29)
-#define GADGET_ID_ELEMENT_VALUE3_DOWN  (GADGET_ID_COUNTER_FIRST + 30)
-#define GADGET_ID_ELEMENT_VALUE3_TEXT  (GADGET_ID_COUNTER_FIRST + 31)
-#define GADGET_ID_ELEMENT_VALUE3_UP    (GADGET_ID_COUNTER_FIRST + 32)
-#define GADGET_ID_ELEMENT_VALUE4_DOWN  (GADGET_ID_COUNTER_FIRST + 33)
-#define GADGET_ID_ELEMENT_VALUE4_TEXT  (GADGET_ID_COUNTER_FIRST + 34)
-#define GADGET_ID_ELEMENT_VALUE4_UP    (GADGET_ID_COUNTER_FIRST + 35)
-#define GADGET_ID_YAMYAM_CONTENT_DOWN  (GADGET_ID_COUNTER_FIRST + 36)
-#define GADGET_ID_YAMYAM_CONTENT_TEXT  (GADGET_ID_COUNTER_FIRST + 37)
-#define GADGET_ID_YAMYAM_CONTENT_UP    (GADGET_ID_COUNTER_FIRST + 38)
-#define GADGET_ID_BALL_CONTENT_DOWN    (GADGET_ID_COUNTER_FIRST + 39)
-#define GADGET_ID_BALL_CONTENT_TEXT    (GADGET_ID_COUNTER_FIRST + 40)
-#define GADGET_ID_BALL_CONTENT_UP      (GADGET_ID_COUNTER_FIRST + 41)
-#define GADGET_ID_ANDROID_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 42)
-#define GADGET_ID_ANDROID_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 43)
-#define GADGET_ID_ANDROID_CONTENT_UP   (GADGET_ID_COUNTER_FIRST + 44)
-#define GADGET_ID_ENVELOPE_XSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 45)
-#define GADGET_ID_ENVELOPE_XSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 46)
-#define GADGET_ID_ENVELOPE_XSIZE_UP    (GADGET_ID_COUNTER_FIRST + 47)
-#define GADGET_ID_ENVELOPE_YSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 48)
-#define GADGET_ID_ENVELOPE_YSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 49)
-#define GADGET_ID_ENVELOPE_YSIZE_UP    (GADGET_ID_COUNTER_FIRST + 50)
-#define GADGET_ID_INVENTORY_SIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 51)
-#define GADGET_ID_INVENTORY_SIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 52)
-#define GADGET_ID_INVENTORY_SIZE_UP    (GADGET_ID_COUNTER_FIRST + 53)
-#define GADGET_ID_CUSTOM_SCORE_DOWN    (GADGET_ID_COUNTER_FIRST + 54)
-#define GADGET_ID_CUSTOM_SCORE_TEXT    (GADGET_ID_COUNTER_FIRST + 55)
-#define GADGET_ID_CUSTOM_SCORE_UP      (GADGET_ID_COUNTER_FIRST + 56)
-#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 57)
-#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 58)
-#define GADGET_ID_CUSTOM_GEMCOUNT_UP   (GADGET_ID_COUNTER_FIRST + 59)
-#define GADGET_ID_CUSTOM_VALUE_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 60)
-#define GADGET_ID_CUSTOM_VALUE_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 61)
-#define GADGET_ID_CUSTOM_VALUE_FIX_UP  (GADGET_ID_COUNTER_FIRST + 62)
-#define GADGET_ID_CUSTOM_VALUE_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 63)
-#define GADGET_ID_CUSTOM_VALUE_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 64)
-#define GADGET_ID_CUSTOM_VALUE_RND_UP  (GADGET_ID_COUNTER_FIRST + 65)
-#define GADGET_ID_PUSH_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 66)
-#define GADGET_ID_PUSH_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 67)
-#define GADGET_ID_PUSH_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 68)
-#define GADGET_ID_PUSH_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 69)
-#define GADGET_ID_PUSH_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 70)
-#define GADGET_ID_PUSH_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 71)
-#define GADGET_ID_DROP_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 72)
-#define GADGET_ID_DROP_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 73)
-#define GADGET_ID_DROP_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 74)
-#define GADGET_ID_DROP_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 75)
-#define GADGET_ID_DROP_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 76)
-#define GADGET_ID_DROP_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 77)
-#define GADGET_ID_MOVE_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 78)
-#define GADGET_ID_MOVE_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 79)
-#define GADGET_ID_MOVE_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 80)
-#define GADGET_ID_MOVE_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 81)
-#define GADGET_ID_MOVE_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 82)
-#define GADGET_ID_MOVE_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 83)
-#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 84)
-#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 85)
-#define GADGET_ID_EXPLOSION_DELAY_UP   (GADGET_ID_COUNTER_FIRST + 86)
-#define GADGET_ID_IGNITION_DELAY_DOWN  (GADGET_ID_COUNTER_FIRST + 87)
-#define GADGET_ID_IGNITION_DELAY_TEXT  (GADGET_ID_COUNTER_FIRST + 88)
-#define GADGET_ID_IGNITION_DELAY_UP    (GADGET_ID_COUNTER_FIRST + 89)
-#define GADGET_ID_CHANGE_DELAY_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 90)
-#define GADGET_ID_CHANGE_DELAY_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 91)
-#define GADGET_ID_CHANGE_DELAY_FIX_UP  (GADGET_ID_COUNTER_FIRST + 92)
-#define GADGET_ID_CHANGE_DELAY_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 93)
-#define GADGET_ID_CHANGE_DELAY_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 94)
-#define GADGET_ID_CHANGE_DELAY_RND_UP  (GADGET_ID_COUNTER_FIRST + 95)
-#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 96)
-#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 97)
-#define GADGET_ID_CHANGE_CONT_RND_UP   (GADGET_ID_COUNTER_FIRST + 98)
-#define GADGET_ID_GROUP_CONTENT_DOWN   (GADGET_ID_COUNTER_FIRST + 99)
-#define GADGET_ID_GROUP_CONTENT_TEXT   (GADGET_ID_COUNTER_FIRST + 100)
-#define GADGET_ID_GROUP_CONTENT_UP     (GADGET_ID_COUNTER_FIRST + 101)
-
-/* drawing area identifiers */
-#define GADGET_ID_DRAWING_AREA_FIRST   (GADGET_ID_COUNTER_FIRST + 102)
-
-#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_ELEMENT_NAME         (GADGET_ID_TEXT_INPUT_FIRST + 2)
-
-/* text area identifiers */
-#define GADGET_ID_TEXT_AREA_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 3)
-
-#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_WIND_DIRECTION       (GADGET_ID_SELECTBOX_FIRST + 2)
-#define GADGET_ID_PLAYER_SPEED         (GADGET_ID_SELECTBOX_FIRST + 3)
-#define GADGET_ID_CUSTOM_WALK_TO_ACTION        (GADGET_ID_SELECTBOX_FIRST + 4)
-#define GADGET_ID_CUSTOM_EXPLOSION_TYPE        (GADGET_ID_SELECTBOX_FIRST + 5)
-#define GADGET_ID_CUSTOM_DEADLINESS    (GADGET_ID_SELECTBOX_FIRST + 6)
-#define GADGET_ID_CUSTOM_MOVE_PATTERN  (GADGET_ID_SELECTBOX_FIRST + 7)
-#define GADGET_ID_CUSTOM_MOVE_DIRECTION        (GADGET_ID_SELECTBOX_FIRST + 8)
-#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 9)
-#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 10)
-#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 11)
-#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 12)
-#define GADGET_ID_CUSTOM_ACCESS_TYPE   (GADGET_ID_SELECTBOX_FIRST + 13)
-#define GADGET_ID_CUSTOM_ACCESS_LAYER  (GADGET_ID_SELECTBOX_FIRST + 14)
-#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 15)
-#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 16)
-#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 17)
-#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 18)
-#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 19)
-#define GADGET_ID_CHANGE_SIDE          (GADGET_ID_SELECTBOX_FIRST + 20)
-#define GADGET_ID_CHANGE_PLAYER                (GADGET_ID_SELECTBOX_FIRST + 21)
-#define GADGET_ID_CHANGE_PAGE          (GADGET_ID_SELECTBOX_FIRST + 22)
-#define GADGET_ID_CHANGE_REPLACE_WHEN  (GADGET_ID_SELECTBOX_FIRST + 23)
-#define GADGET_ID_ACTION_TYPE          (GADGET_ID_SELECTBOX_FIRST + 24)
-#define GADGET_ID_ACTION_MODE          (GADGET_ID_SELECTBOX_FIRST + 25)
-#define GADGET_ID_ACTION_ARG           (GADGET_ID_SELECTBOX_FIRST + 26)
-#define GADGET_ID_SELECT_CHANGE_PAGE   (GADGET_ID_SELECTBOX_FIRST + 27)
-#define GADGET_ID_GROUP_CHOICE_MODE    (GADGET_ID_SELECTBOX_FIRST + 28)
-
-/* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 29)
-
-#define GADGET_ID_LEVELINFO_LEVEL      (GADGET_ID_TEXTBUTTON_FIRST + 0)
-#define GADGET_ID_LEVELINFO_EDITOR     (GADGET_ID_TEXTBUTTON_FIRST + 1)
-#define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 2)
-#define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 3)
-#define GADGET_ID_PROPERTIES_CONFIG_1  (GADGET_ID_TEXTBUTTON_FIRST + 4)
-#define GADGET_ID_PROPERTIES_CONFIG_2  (GADGET_ID_TEXTBUTTON_FIRST + 5)
-#define GADGET_ID_PROPERTIES_CHANGE    (GADGET_ID_TEXTBUTTON_FIRST + 6)
-#define GADGET_ID_SAVE_AS_TEMPLATE_1   (GADGET_ID_TEXTBUTTON_FIRST + 7)
-#define GADGET_ID_SAVE_AS_TEMPLATE_2   (GADGET_ID_TEXTBUTTON_FIRST + 8)
-#define GADGET_ID_ADD_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 9)
-#define GADGET_ID_DEL_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 10)
-
-/* graphicbutton identifiers */
-#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 11)
-
-#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_RANDOM_PERCENTAGE    (GADGET_ID_CHECKBUTTON_FIRST + 1)
-#define GADGET_ID_RANDOM_QUANTITY      (GADGET_ID_CHECKBUTTON_FIRST + 2)
-#define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 3)
-#define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 4)
-#define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 5)
-#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 6)
-#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 7)
-#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 8)
-#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 9)
-#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 10)
-#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 11)
-#define GADGET_ID_AUTO_EXIT_SOKOBAN    (GADGET_ID_CHECKBUTTON_FIRST + 12)
-#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 13)
-#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 14)
-#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 15)
-#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 16)
-#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 17)
-#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_LAZY_RELOCATION      (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 24)
-#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 25)
-#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 26)
-#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 27)
-#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 28)
-#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 29)
-#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 30)
-#define GADGET_ID_MM_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 31)
-#define GADGET_ID_MM_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 32)
-#define GADGET_ID_MM_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 33)
-#define GADGET_ID_DF_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 34)
-#define GADGET_ID_DF_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 35)
-#define GADGET_ID_DF_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 36)
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 37)
-#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 38)
-#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 39)
-#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 40)
-#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 41)
-#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 42)
-#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 43)
-#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 44)
-#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 45)
-#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 46)
-#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 47)
-#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 48)
-#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 49)
-#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 50)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 51)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_1        (GADGET_ID_CHECKBUTTON_FIRST + 52)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_2        (GADGET_ID_CHECKBUTTON_FIRST + 53)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_3        (GADGET_ID_CHECKBUTTON_FIRST + 54)
-#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 55)
-#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 56)
-#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 57)
-#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 58)
-#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 59)
-#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 60)
-#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 61)
-#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 62)
-#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 63)
-
-/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 64)
+#define INFOTEXT_X             (editor.settings.tooltip.x)
+#define INFOTEXT_Y             (editor.settings.tooltip.y)
+#define INFOTEXT_XY_REDEFINED  (INFOTEXT_X != -1 || INFOTEXT_Y != -1)
+#define INFOTEXT_XPOS          SX + (INFOTEXT_XY_REDEFINED ? INFOTEXT_X : 0)
+#define INFOTEXT_YPOS          SY + (INFOTEXT_XY_REDEFINED ? INFOTEXT_Y : \
+                                     SYSIZE - INFOTEXT_YSIZE)
+
+
+// ----------------------------------------------------------------------------
+// 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_INFO,
+  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_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_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_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_GAME_ENGINE_TYPE,
+  GADGET_ID_LEVELSET_SAVE_MODE,
+  GADGET_ID_WIND_DIRECTION,
+  GADGET_ID_PLAYER_SPEED,
+  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_LEVELINFO_LEVEL,
+  GADGET_ID_LEVELINFO_LEVELSET,
+  GADGET_ID_LEVELINFO_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_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_STATE,
+  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_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_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_LEVEL_RANDOM     7
-#define ED_COUNTER_ID_ELEMENT_VALUE1   8
-#define ED_COUNTER_ID_ELEMENT_VALUE2   9
-#define ED_COUNTER_ID_ELEMENT_VALUE3   10
-#define ED_COUNTER_ID_ELEMENT_VALUE4   11
-#define ED_COUNTER_ID_YAMYAM_CONTENT   12
-#define ED_COUNTER_ID_BALL_CONTENT     13
-#define ED_COUNTER_ID_ANDROID_CONTENT  14
-#define ED_COUNTER_ID_ENVELOPE_XSIZE   15
-#define ED_COUNTER_ID_ENVELOPE_YSIZE   16
-#define ED_COUNTER_ID_INVENTORY_SIZE   17
-#define ED_COUNTER_ID_CUSTOM_SCORE     18
-#define ED_COUNTER_ID_CUSTOM_GEMCOUNT  19
-#define ED_COUNTER_ID_CUSTOM_VALUE_FIX 20
-#define ED_COUNTER_ID_CUSTOM_VALUE_RND 21
-#define ED_COUNTER_ID_PUSH_DELAY_FIX   22
-#define ED_COUNTER_ID_PUSH_DELAY_RND   23
-#define ED_COUNTER_ID_DROP_DELAY_FIX   24
-#define ED_COUNTER_ID_DROP_DELAY_RND   25
-#define ED_COUNTER_ID_MOVE_DELAY_FIX   26
-#define ED_COUNTER_ID_MOVE_DELAY_RND   27
-#define ED_COUNTER_ID_EXPLOSION_DELAY  28
-#define ED_COUNTER_ID_IGNITION_DELAY   29
-#define ED_COUNTER_ID_GROUP_CONTENT    30
-#define ED_COUNTER_ID_CHANGE_DELAY_FIX 31
-#define ED_COUNTER_ID_CHANGE_DELAY_RND 32
-#define ED_COUNTER_ID_CHANGE_CONT_RND  33
-
-#define ED_NUM_COUNTERBUTTONS          34
+// 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_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_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_LEVELSET_FIRST   ED_COUNTER_ID_LEVELSET_NUM_LEVELS
+#define ED_COUNTER_ID_LEVELSET_LAST    ED_COUNTER_ID_LEVELSET_NUM_LEVELS
 #define ED_COUNTER_ID_EDITOR_FIRST     ED_COUNTER_ID_LEVEL_RANDOM
 #define ED_COUNTER_ID_EDITOR_LAST      ED_COUNTER_ID_LEVEL_RANDOM
 
 #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_ELEMENT_NAME   2
+// 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               3
+  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
 
-/* values for text area gadgets */
-#define ED_TEXTAREA_ID_ENVELOPE_INFO   0
+#define ED_TEXTINPUT_ID_LEVELSET_FIRST ED_TEXTINPUT_ID_LEVELSET_NAME
+#define ED_TEXTINPUT_ID_LEVELSET_LAST  ED_TEXTINPUT_ID_LEVELSET_AUTHOR
 
-#define ED_NUM_TEXTAREAS                       1
+// values for text area gadgets
+enum
+{
+  ED_TEXTAREA_ID_ENVELOPE_INFO,
+
+  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_WIND_DIRECTION         2
-#define ED_SELECTBOX_ID_PLAYER_SPEED           3
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE     4
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER    5
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED        6
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION        7
-#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION  8
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN    9
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION  10      
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE   11
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 12
-#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS   13
-#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE   14
-#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS      15
-#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE  16
-#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      17
-#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION   18
-#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    19
-#define ED_SELECTBOX_ID_CHANGE_SIDE            20
-#define ED_SELECTBOX_ID_CHANGE_PLAYER          21
-#define ED_SELECTBOX_ID_CHANGE_PAGE            22
-#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN    23
-#define ED_SELECTBOX_ID_ACTION_TYPE            24
-#define ED_SELECTBOX_ID_ACTION_MODE            25
-#define ED_SELECTBOX_ID_ACTION_ARG             26
-#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE     27
-#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE      28
-
-#define ED_NUM_SELECTBOX                       29
+// values for selectbox gadgets
+enum
+{
+  ED_SELECTBOX_ID_TIME_OR_STEPS,
+  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_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_WIND_DIRECTION
+#define ED_SELECTBOX_ID_LEVEL_LAST     ED_SELECTBOX_ID_GAME_ENGINE_TYPE
+
+#define ED_SELECTBOX_ID_LEVELSET_FIRST ED_SELECTBOX_ID_LEVELSET_SAVE_MODE
+#define ED_SELECTBOX_ID_LEVELSET_LAST  ED_SELECTBOX_ID_LEVELSET_SAVE_MODE
 
 #define ED_SELECTBOX_ID_CUSTOM1_FIRST  ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE
 #define ED_SELECTBOX_ID_CUSTOM1_LAST   ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
 #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_EDITOR      1
-#define ED_TEXTBUTTON_ID_PROPERTIES_INFO       2
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG     3
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1   4
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2   5
-#define ED_TEXTBUTTON_ID_PROPERTIES_CHANGE     6
-#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2    7
-#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1    8
-#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE       9
-#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE       10
-
-#define ED_NUM_TEXTBUTTONS                     11
+// values for textbutton gadgets
+enum
+{
+  ED_TEXTBUTTON_ID_LEVELINFO_LEVEL,
+  ED_TEXTBUTTON_ID_LEVELINFO_LEVELSET,
+  ED_TEXTBUTTON_ID_LEVELINFO_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_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
 #define ED_TAB_BUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
 #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_RANDOM_RESTRICTED    1
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3        2
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2        3
-#define ED_CHECKBUTTON_ID_STICK_ELEMENT                4
-#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     5
-#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  6
-#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       7
-#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     8
-#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  9
-#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   10
-#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   11
-#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN    12
-#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  13
-#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     14
-#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     15
-#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  16
-#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   17
-#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   18
-#define ED_CHECKBUTTON_ID_LAZY_RELOCATION      19
-#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    20
-#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  21
-#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        22
-#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      23
-#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        24
-#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 25
-#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   26
-#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   27
-#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    28
-#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    29
-#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    30
-#define ED_CHECKBUTTON_ID_MM_LASER_RED         31
-#define ED_CHECKBUTTON_ID_MM_LASER_GREEN       32
-#define ED_CHECKBUTTON_ID_MM_LASER_BLUE                33
-#define ED_CHECKBUTTON_ID_DF_LASER_RED         34
-#define ED_CHECKBUTTON_ID_DF_LASER_GREEN       35
-#define ED_CHECKBUTTON_ID_DF_LASER_BLUE                36
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   37
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1        38
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    39
-#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        40
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        41
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        42
-#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        43
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      44
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      45
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     46
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      47
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                48
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   49
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  50
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 51
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        52
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    53
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         54
-#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 55
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  56
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 57
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   58
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 59
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    60
-#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    61
-
-#define ED_NUM_CHECKBUTTONS                    62
+// values for checkbutton gadgets
+enum
+{
+  ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS,
+  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_STATE,
+  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_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_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_LEVELSET_FIRST ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK
+#define ED_CHECKBUTTON_ID_LEVELSET_LAST         ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE
+
 #define ED_CHECKBUTTON_ID_EDITOR_FIRST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 #define ED_CHECKBUTTON_ID_EDITOR_LAST  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2
 
 #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_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_PROPERTIES             2
 #define ED_MODE_PALETTE                        3
 
-/* sub-screens in the global settings section */
+// 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 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
 
-/* default value for element tile size in drawing area */
+// 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
 #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
 {
@@ -1080,10 +1152,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,
@@ -1166,7 +1238,7 @@ static struct
     "pick drawing element",                    ','
   },
 
-  /* ---------- level control buttons -------------------------------------- */
+  // ---------- level control buttons -----------------------------------------
 
   {
     IMG_GFX_EDITOR_BUTTON_UNDO,                        GADGET_ID_UNDO,
@@ -1199,7 +1271,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,
@@ -1227,7 +1299,7 @@ static struct
     "paste settings to this element",          0
   },
 
-  /* ---------- palette control buttons ------------------------------------ */
+  // ---------- palette control buttons ---------------------------------------
 
   {
     IMG_GFX_EDITOR_BUTTON_PROPERTIES,          GADGET_ID_PROPERTIES,
@@ -1267,6 +1339,13 @@ static struct ElementChangeInfo custom_element_change;
 static struct ElementGroupInfo group_element_info;
 static struct ElementInfo custom_element;
 
+static char levelset_name[MAX_LEVEL_NAME_LEN + 1];
+static char levelset_author[MAX_LEVEL_AUTHOR_LEN + 1];
+static int levelset_num_levels = 100;
+static boolean levelset_use_levelset_artwork = FALSE;
+static boolean levelset_copy_level_template = FALSE;
+static int levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
+
 static struct
 {
   int x, y;
@@ -1278,10 +1357,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,
@@ -1289,7 +1368,7 @@ static struct
     NULL,                              NULL, NULL
   },
 
-  /* ---------- level and editor settings ---------------------------------- */
+  // ---------- level and editor settings -------------------------------------
 
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(4),
@@ -1332,13 +1411,21 @@ static struct
     "score for each second/step left:",        NULL, NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(13),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(12),
     0,                                 9999,
     GADGET_ID_LEVEL_RANDOM_SEED_DOWN,  GADGET_ID_LEVEL_RANDOM_SEED_UP,
     GADGET_ID_LEVEL_RANDOM_SEED_TEXT,  GADGET_ID_NONE,
     &level.random_seed,
     NULL,                              "random seed:", "(0 => random)"
   },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(4),
+    1,                                 MAX_LEVELS,
+    GADGET_ID_LEVELSET_NUM_LEVELS_DOWN,        GADGET_ID_LEVELSET_NUM_LEVELS_UP,
+    GADGET_ID_LEVELSET_NUM_LEVELS_TEXT,        GADGET_ID_NONE,
+    &levelset_num_levels,
+    "number of levels:",               NULL, NULL,
+  },
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(0),
     1,                                 100,
@@ -1348,14 +1435,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
   },
   {
@@ -1363,7 +1450,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
   },
   {
@@ -1371,7 +1458,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
   },
   {
@@ -1379,7 +1466,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
   },
   {
@@ -1411,7 +1498,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",
   },
   {
@@ -1419,7 +1506,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",
   },
   {
@@ -1431,7 +1518,7 @@ static struct
     NULL,                              NULL, "number of inventory elements"
   },
 
-  /* ---------- element settings: configure 1 (custom elements) ------------ */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(5),
@@ -1498,7 +1585,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),
@@ -1533,7 +1620,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),
@@ -1544,7 +1631,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),
@@ -1586,19 +1673,33 @@ static struct
     GADGET_ID_LEVEL_NAME,
     MAX_LEVEL_NAME_LEN,
     level.name,
-    "Title:", "Title"
+    "Title:", "Title for this level"
   },
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(2),
     GADGET_ID_LEVEL_AUTHOR,
     MAX_LEVEL_AUTHOR_LEN,
     level.author,
-    "Author:", "Author"
+    "Author:", "Author for this level"
+  },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(0),
+    GADGET_ID_LEVELSET_NAME,
+    MAX_LEVEL_NAME_LEN,
+    levelset_name,
+    "Title:", "Title for this or new level set"
+  },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(2),
+    GADGET_ID_LEVELSET_AUTHOR,
+    MAX_LEVEL_AUTHOR_LEN,
+    levelset_author,
+    "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"
   }
@@ -1640,6 +1741,14 @@ static struct ValueTextInfo options_game_engine_type[] =
   { -1,                                NULL                            }
 };
 
+static struct ValueTextInfo options_levelset_save_mode[] =
+{
+  { LEVELSET_SAVE_MODE_UPDATE, "Update this level set"         },
+  { LEVELSET_SAVE_MODE_CREATE, "Create new level set"          },
+
+  { -1,                                NULL                            }
+};
+
 static struct ValueTextInfo options_wind_direction[] =
 {
   { MV_START_NONE,             "none"                          },
@@ -2330,13 +2439,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_left, *text_right, *infotext;
+  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),
@@ -2344,37 +2453,45 @@ static struct
     -1,
     options_time_or_steps,
     &level.use_step_counter,
-    NULL, "(0 => no limit)",           "time or step limit"
+    NULL, NULL, "(0 => no limit)",     "time or step limit"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(12),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(11),
     GADGET_ID_GAME_ENGINE_TYPE,                GADGET_ID_NONE,
     -1,
     options_game_engine_type,
     &level.game_engine_type,
-    "game engine:", NULL,              "game engine"
+    NULL, "game engine:", NULL,                "game engine"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(11),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(10),
+    GADGET_ID_LEVELSET_SAVE_MODE,      GADGET_ID_NONE,
+    -1,
+    options_levelset_save_mode,
+    &levelset_save_mode,
+    "Action:", NULL, NULL,             "action when saving level set"
+  },
+
+  // ---------- element settings: configure (several elements) ----------------
+
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     GADGET_ID_WIND_DIRECTION,          GADGET_ID_NONE,
     -1,
     options_wind_direction,
     &level.wind_direction_initial,
-    "initial wind direction:", NULL,   "initial wind direction"
+    NULL, "initial wind direction:", NULL,     "initial wind direction"
   },
-
-  /* ---------- element settings: configure (several elements) ------------- */
-
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(7),
     GADGET_ID_PLAYER_SPEED,            GADGET_ID_NONE,
     -1,
     options_player_speed,
     &level.initial_player_stepsize[0],
-    "initial player speed:", NULL,     "initial player speed"
+    NULL, "initial player speed:", NULL,       "initial player speed"
   },
 
-  /* ---------- element settings: configure 1 (custom elements) ------------ */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(2),
@@ -2382,7 +2499,7 @@ static struct
     -1,
     options_access_type,
     &custom_element.access_type,
-    NULL, NULL,                                "type of access to this field"
+    NULL, NULL, NULL,                  "type of access to this field"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(2),
@@ -2390,7 +2507,7 @@ static struct
     -1,
     options_access_layer,
     &custom_element.access_layer,
-    NULL, NULL,                                "layer of access for this field"
+    NULL, NULL, NULL,                  "layer of access for this field"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(2),
@@ -2398,7 +2515,7 @@ static struct
     -1,
     options_access_protected,
     &custom_element.access_protected,
-    NULL, NULL,                                "protected access for this field"
+    NULL, NULL, NULL,                  "protected access for this field"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(3),
@@ -2406,7 +2523,7 @@ static struct
     -1,
     options_access_direction,
     &custom_element.access_direction,
-    "from", NULL,                      "access direction for this field"
+    NULL, "from", NULL,                        "access direction for this field"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(4),
@@ -2414,10 +2531,10 @@ static struct
     -1,
     options_walk_to_action,
     &custom_element.walk_to_action,
-    NULL, NULL,                                "diggable/collectible/pushable"
+    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),
@@ -2425,7 +2542,7 @@ static struct
     -1,
     options_move_pattern,
     &custom_element.move_pattern,
-    "can move", NULL,                  "element move pattern"
+    NULL, "can move", NULL,            "element move pattern"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(2),
@@ -2433,7 +2550,7 @@ static struct
     -1,
     options_move_direction,
     &custom_element.move_direction_initial,
-    "starts moving", NULL,             "initial element move direction"
+    NULL, "starts moving", NULL,       "initial element move direction"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(4),
@@ -2441,7 +2558,7 @@ static struct
     -1,
     options_move_stepsize,
     &custom_element.move_stepsize,
-    "move/fall speed", NULL,           "speed of element movement"
+    NULL, "move/fall speed", NULL,     "speed of element movement"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(3),
@@ -2451,8 +2568,8 @@ static struct
     &custom_element.move_leave_type,
     // left text with leading spaces to place gadget next to "can dig" gadget
     // (needed because drawing area gadgets created after selectbox gadgets)
-    // "can dig:    can", ":",         "leave behind or change element"
-    "            can", ":",            "leave behind or change element"
+    // NULL, "can dig:    can", ":",   "leave behind or change element"
+    NULL, "            can", ":",      "leave behind or change element"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(7),
@@ -2460,7 +2577,7 @@ static struct
     -1,
     options_smash_targets,
     &custom_element.smash_targets,
-    "can smash", NULL,                 "elements that can be smashed"
+    NULL, "can smash", NULL,           "elements that can be smashed"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(8),
@@ -2468,7 +2585,7 @@ static struct
     -1,
     options_slippery_type,
     &custom_element.slippery_type,
-    "slippery", NULL,                  "where other elements fall down"
+    NULL, "slippery", NULL,            "where other elements fall down"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(9),
@@ -2476,7 +2593,7 @@ static struct
     -1,
     options_deadliness,
     &custom_element.deadliness,
-    "deadly when", NULL,               "deadliness of element"
+    NULL, "deadly when", NULL,         "deadliness of element"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(10),
@@ -2484,10 +2601,10 @@ static struct
     -1,
     options_explosion_type,
     &custom_element.explosion_type,
-    "can explode", NULL,               "explosion type"
+    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),
@@ -2495,7 +2612,7 @@ static struct
     -1,
     options_time_units,
     &custom_element_change.delay_frames,
-    "delay time given in", NULL,       "delay time units for change"
+    NULL, "delay time given in", NULL, "delay time units for change"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(4),
@@ -2503,7 +2620,7 @@ static struct
     -1,
     options_change_direct_action,
     &custom_element_change.direct_action,
-    NULL, NULL,                                "type of direct action"
+    NULL, NULL, NULL,                  "type of direct action"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(5),
@@ -2511,7 +2628,7 @@ static struct
     -1,
     options_change_other_action,
     &custom_element_change.other_action,
-    NULL, "element:",                  "type of other element action"
+    NULL, NULL, "element:",            "type of other element action"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(6),
@@ -2519,7 +2636,7 @@ static struct
     -1,
     options_change_trigger_side,
     &custom_element_change.trigger_side,
-    "at", "side",                      "element side triggering change"
+    NULL, "at", "side",                        "element side triggering change"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(7),
@@ -2527,7 +2644,7 @@ static struct
     -1,
     options_change_trigger_player,
     &custom_element_change.trigger_player,
-    "player:", " ",                    "player that causes change"
+    NULL, "player:", " ",              "player that causes change"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(7),
@@ -2535,7 +2652,7 @@ static struct
     -1,
     options_change_trigger_page,
     &custom_element_change.trigger_page,
-    "page:", NULL,                     "change page that causes change"
+    NULL, "page:", NULL,               "change page that causes change"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(10),
@@ -2543,7 +2660,7 @@ static struct
     -1,
     options_change_replace_when,
     &custom_element_change.replace_when,
-    "replace when", NULL,              "which elements can be replaced"
+    NULL, "replace when", NULL,                "which elements can be replaced"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(13),
@@ -2551,7 +2668,7 @@ static struct
     -1,
     options_action_type,
     &custom_element_change.action_type,
-    NULL, NULL,                                "action on specified condition"
+    NULL, NULL, NULL,                  "action on specified condition"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(13),
@@ -2559,7 +2676,7 @@ static struct
     -1,
     options_action_mode_none,
     &custom_element_change.action_mode,
-    NULL, NULL,                                "action operator"
+    NULL, NULL, NULL,                  "action operator"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(13),
@@ -2567,7 +2684,7 @@ static struct
     -1,
     options_action_arg_none,
     &custom_element_change.action_arg,
-    NULL, NULL,                                "action parameter"
+    NULL, NULL, NULL,                  "action parameter"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(14),
@@ -2575,10 +2692,10 @@ static struct
     3,
     options_change_page,
     &custom_element.current_change_page,
-    NULL, NULL,                                "element change page"
+    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),
@@ -2586,7 +2703,7 @@ static struct
     -1,
     options_group_choice_mode,
     &group_element_info.choice_mode,
-    "choice type:", NULL,              "type of group element choice"
+    NULL, "choice type:", NULL,                "type of group element choice"
   },
 };
 
@@ -2600,27 +2717,33 @@ 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,
-    8,                                 "Level",                        
+    8,                                 "Level",
     NULL, NULL, NULL,                  "Configure level properties"
   },
   {
     -1,                                        -1,
-    GADGET_ID_LEVELINFO_EDITOR,                GADGET_ID_LEVELINFO_LEVEL,
-    8,                                 "Editor",                       
+    GADGET_ID_LEVELINFO_LEVELSET,      GADGET_ID_LEVELINFO_LEVEL,
+    8,                                 "Levelset",
+    NULL, NULL, NULL,                  "Update this or create new level set"
+  },
+  {
+    -1,                                        -1,
+    GADGET_ID_LEVELINFO_EDITOR,                GADGET_ID_LEVELINFO_LEVELSET,
+    8,                                 "Editor",
     NULL, NULL, NULL,                  "Configure editor properties"
   },
 
-  /* ---------- element settings (tabs) ------------------------------------ */
+  // ---------- element settings (tabs) ---------------------------------------
 
   {
     ED_ELEMENT_TABS_XPOS(0),           ED_ELEMENT_TABS_YPOS(0),
     GADGET_ID_PROPERTIES_INFO,         GADGET_ID_NONE,
-    8,                                 "Info",                 
+    8,                                 "Info",
     NULL, NULL, NULL,                  "Show information about element"
   },
   {
@@ -2648,8 +2771,14 @@ 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),
+    GADGET_ID_SAVE_LEVELSET,           GADGET_ID_LEVELSET_SAVE_MODE,
+    -1,                                        "Save",
+    NULL, NULL, NULL,                  "Update or create level set"
+  },
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(6),
     GADGET_ID_SAVE_AS_TEMPLATE_2,      GADGET_ID_NONE,
@@ -2658,7 +2787,7 @@ static struct
     "Save current settings as new template"
   },
 
-  /* ---------- element settings (buttons) --------------------------------- */
+  // ---------- element settings (buttons) ------------------------------------
 
   {
     -1,                                        -1,
@@ -2833,7 +2962,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),
@@ -2842,6 +2971,20 @@ static struct
     NULL, NULL,
     "automatically count gems needed", "set counter to number of gems"
   },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(7),
+    GADGET_ID_USE_LEVELSET_ARTWORK,    GADGET_ID_NONE,
+    &levelset_use_levelset_artwork,
+    NULL, NULL,
+    "use current custom artwork",      "use custom artwork of this level set"
+  },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(8),
+    GADGET_ID_COPY_LEVEL_TEMPLATE,     GADGET_ID_NONE,
+    &levelset_copy_level_template,
+    NULL, NULL,
+    "copy current level template",     "copy level template of this level set"
+  },
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(1),
     GADGET_ID_RANDOM_RESTRICTED,       GADGET_ID_NONE,
@@ -2864,7 +3007,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),
@@ -2901,6 +3044,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,
@@ -2924,10 +3074,31 @@ 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),
+    GADGET_ID_SOLVED_BY_ONE_PLAYER,    GADGET_ID_NONE,
+    &level.solved_by_one_player,
+    NULL, NULL,
+    "only one player must enter exit", "level solved by first player in exit"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
@@ -3098,7 +3269,7 @@ static struct
     "blue",                            "use blue color components in laser"
   },
 
-  /* ---------- element settings: configure 1 (custom elements) ----------- */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
@@ -3150,7 +3321,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),
@@ -3216,7 +3387,7 @@ static struct
     "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),
@@ -3294,18 +3465,18 @@ static struct
   char *text_left, *text_right, *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 */
+    -1, -1,    // these values are not constant, but can change at runtime
     NULL, NULL, NULL,                  NULL
   },
 
-  /* ---------- yam yam content -------------------------------------------- */
+  // ---------- yam yam content -----------------------------------------------
 
   {
     ED_AREA_YAMYAM_CONTENT_XPOS,       ED_AREA_YAMYAM_CONTENT_YPOS,
@@ -3364,7 +3535,7 @@ static struct
     NULL, NULL, "8",                   NULL
   },
 
-  /* ---------- magic ball content ----------------------------------------- */
+  // ---------- magic ball content --------------------------------------------
 
   {
     ED_AREA_MAGIC_BALL_CONTENT_XPOS,   ED_AREA_MAGIC_BALL_CONTENT_YPOS,
@@ -3423,7 +3594,7 @@ static struct
     NULL, NULL, "8",                   NULL
   },
 
-  /* ---------- android content -------------------------------------------- */
+  // ---------- android content -----------------------------------------------
 
   {
     ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(5),
@@ -3433,7 +3604,7 @@ static struct
     "elements:", NULL, NULL,           "elements android can clone"
   },
 
-  /* ---------- amoeba content --------------------------------------------- */
+  // ---------- amoeba content ------------------------------------------------
 
   {
     ED_AREA_1X1_SETTINGS_XPOS(0),      ED_AREA_1X1_SETTINGS_YPOS(3),
@@ -3443,7 +3614,7 @@ static struct
     "content:", NULL, NULL,            "amoeba content"
   },
 
-  /* ---------- level start element ---------------------------------------- */
+  // ---------- level start element -------------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(10),
@@ -3453,7 +3624,7 @@ static struct
     NULL, NULL, NULL,                  "level start element"
   },
 
-  /* ---------- player artwork element ------------------------------------- */
+  // ---------- player artwork element ----------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(11),
@@ -3463,7 +3634,7 @@ static struct
     NULL, NULL, NULL,                  "element for player artwork"
   },
 
-  /* ---------- player explosion element ----------------------------------- */
+  // ---------- player explosion element --------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(12),
@@ -3473,7 +3644,7 @@ static struct
     NULL, NULL, NULL,                  "element for player explosion"
   },
 
-  /* ---------- player initial inventory ----------------------------------- */
+  // ---------- player initial inventory --------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(1),
@@ -3483,9 +3654,9 @@ static struct
     NULL, NULL, NULL,                  "content for initial inventory"
   },
 
-  /* ---------- element settings: configure 1 (custom elements) ----------- */
+  // ---------- element settings: configure 1 (custom elements) ---------------
 
-  /* ---------- custom graphic --------------------------------------------- */
+  // ---------- custom graphic ------------------------------------------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(1),
@@ -3495,19 +3666,19 @@ static struct
     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),
     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
   },
 
-  /* ---------- 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),
@@ -3524,9 +3695,9 @@ static struct
     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),
@@ -3536,17 +3707,17 @@ static struct
     NULL, "after/when:", 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"
   },
 
-  /* ---------- custom change trigger (element causing change) ------------- */
+  // ---------- custom change trigger (element causing change) ----------------
 
   {
     -1,                                        ED_AREA_1X1_SETTINGS_YPOS(5),
@@ -3556,7 +3727,7 @@ static struct
     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),
@@ -3566,7 +3737,7 @@ static struct
     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),
@@ -3576,7 +3747,7 @@ static struct
     "content:", NULL, NULL,            NULL
   },
 
-  /* ---------- random background (for random painting) -------------------- */
+  // ---------- random background (for random painting) -----------------------
 
   {
     -1,                                        ED_AREA_1X1_LSETTINGS_YPOS(1),
@@ -3588,27 +3759,26 @@ static struct
 };
 
 
-/*
-  -----------------------------------------------------------------------------
-  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)
 
-/* 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;
@@ -3627,22 +3797,26 @@ 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);
 static void ModifyEditorSelectboxOptions(int, struct ValueTextInfo *);
 static void ModifyEditorDrawingArea(int, int, int);
-static void ModifyEditorElementList();
-static void AdjustElementListScrollbar();
-static void RedrawDrawingElements();
-static void DrawDrawingWindow();
-static void DrawLevelInfoWindow();
-static void DrawPropertiesWindow();
-static void DrawPaletteWindow();
-static void UpdateCustomElementGraphicGadgets();
+static void ModifyEditorElementList(void);
+static void AdjustElementListScrollbar(void);
+static void RedrawDrawingElements(void);
+static void DrawDrawingWindowExt(boolean);
+static void DrawDrawingWindow(void);
+static void DrawLevelInfoWindow(void);
+static void DrawPropertiesWindow(void);
+static void DrawPaletteWindow(void);
+static void UpdateCustomElementGraphicGadgets(void);
 static boolean checkPropertiesConfig(int);
-static void SetAutomaticNumberOfGemsNeeded();
+static void SetAutomaticNumberOfGemsNeeded(void);
+static void ClearEditorGadgetInfoText(void);
 static void CopyLevelToUndoBuffer(int);
 static void HandleDrawingAreas(struct GadgetInfo *);
 static void HandleCounterButtons(struct GadgetInfo *);
@@ -3656,9 +3830,13 @@ static void HandleCheckbuttons(struct GadgetInfo *);
 static void HandleControlButtons(struct GadgetInfo *);
 static void HandleDrawingAreaInfo(struct GadgetInfo *);
 static void PrintEditorGadgetInfoText(struct GadgetInfo *);
-static boolean AskToCopyAndModifyLevelTemplate();
+static boolean AskToCopyAndModifyLevelTemplate(void);
+static boolean getDrawModeHiRes(void);
+static int getTabulatorBarWidth(void);
+static int getTabulatorBarHeight(void);
+static Pixel getTabulatorBarColor(void);
 
-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;
@@ -3689,7 +3867,7 @@ static int editor_el_players[] =
   EL_PLAYER_4
 };
 static int *editor_el_players_ptr = editor_el_players;
-static int num_editor_el_players = SIZEOF_ARRAY_INT(editor_el_players);
+static int num_editor_el_players = ARRAY_SIZE(editor_el_players);
 
 static int editor_hl_boulderdash[] =
 {
@@ -3728,8 +3906,8 @@ static int editor_el_boulderdash[] =
 };
 static int *editor_hl_boulderdash_ptr = editor_hl_boulderdash;
 static int *editor_el_boulderdash_ptr = editor_el_boulderdash;
-static int num_editor_hl_boulderdash = SIZEOF_ARRAY_INT(editor_hl_boulderdash);
-static int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash);
+static int num_editor_hl_boulderdash = ARRAY_SIZE(editor_hl_boulderdash);
+static int num_editor_el_boulderdash = ARRAY_SIZE(editor_el_boulderdash);
 
 static int editor_hl_emerald_mine[] =
 {
@@ -3756,12 +3934,12 @@ static int editor_el_emerald_mine[] =
   EL_NUT,
   EL_BOMB,
 
-  EL_WALL_EMERALD,
-  EL_WALL_DIAMOND,
-  EL_DYNAMITE,
-  EL_DYNAMITE_ACTIVE,
+  EL_EM_DYNAMITE,
+  EL_EM_DYNAMITE_ACTIVE,
+  EL_EM_EXIT_CLOSED,
+  EL_EM_EXIT_OPEN,
 
-  EL_YAMYAM,
+  EL_YAMYAM_UP,
   EL_BUG_UP,
   EL_SPACESHIP_UP,
   EL_ROBOT,
@@ -3800,16 +3978,11 @@ static int editor_el_emerald_mine[] =
   EL_EM_GATE_2_GRAY,
   EL_EM_GATE_3_GRAY,
   EL_EM_GATE_4_GRAY,
-
-  EL_EM_EXIT_CLOSED,
-  EL_EM_EXIT_OPEN,
-  EL_EM_STEEL_EXIT_CLOSED,
-  EL_EM_STEEL_EXIT_OPEN,
 };
 static int *editor_hl_emerald_mine_ptr = editor_hl_emerald_mine;
 static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine;
-static int num_editor_hl_emerald_mine=SIZEOF_ARRAY_INT(editor_hl_emerald_mine);
-static int num_editor_el_emerald_mine=SIZEOF_ARRAY_INT(editor_el_emerald_mine);
+static int num_editor_hl_emerald_mine = ARRAY_SIZE(editor_hl_emerald_mine);
+static int num_editor_el_emerald_mine = ARRAY_SIZE(editor_el_emerald_mine);
 
 static int editor_hl_emerald_mine_club[] =
 {
@@ -3878,8 +4051,8 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_LENSES,
   EL_EMC_MAGNIFIER,
-  EL_EM_DYNAMITE,
-  EL_EM_DYNAMITE_ACTIVE,
+  EL_EMPTY,
+  EL_EMPTY,
 
   EL_BALLOON,
   EL_YAMYAM_UP,
@@ -3898,8 +4071,8 @@ static int editor_el_emerald_mine_club[] =
 };
 static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club;
 static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club;
-static int num_editor_hl_emerald_mine_club=SIZEOF_ARRAY_INT(editor_hl_emerald_mine_club);
-static int num_editor_el_emerald_mine_club=SIZEOF_ARRAY_INT(editor_el_emerald_mine_club);
+static int num_editor_hl_emerald_mine_club = ARRAY_SIZE(editor_hl_emerald_mine_club);
+static int num_editor_el_emerald_mine_club = ARRAY_SIZE(editor_el_emerald_mine_club);
 
 static int editor_hl_rnd[] =
 {
@@ -3911,6 +4084,11 @@ static int editor_hl_rnd[] =
 
 static int editor_el_rnd[] =
 {
+  EL_DYNAMITE,                 // RND
+  EL_DYNAMITE_ACTIVE,          // RND
+  EL_EMPTY,
+  EL_EMPTY,
+
   EL_KEY_1,
   EL_KEY_2,
   EL_KEY_3,
@@ -3954,7 +4132,7 @@ static int editor_el_rnd[] =
   EL_PACMAN_LEFT,
   EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_EMPTY,
+  EL_YAMYAM,                   // RND
 
   EL_BLACK_ORB,
   EL_PACMAN_DOWN,
@@ -3993,8 +4171,8 @@ static int editor_el_rnd[] =
 };
 static int *editor_hl_rnd_ptr = editor_hl_rnd;
 static int *editor_el_rnd_ptr = editor_el_rnd;
-static int num_editor_hl_rnd = SIZEOF_ARRAY_INT(editor_hl_rnd);
-static int num_editor_el_rnd = SIZEOF_ARRAY_INT(editor_el_rnd);
+static int num_editor_hl_rnd = ARRAY_SIZE(editor_hl_rnd);
+static int num_editor_el_rnd = ARRAY_SIZE(editor_el_rnd);
 
 static int editor_hl_sokoban[] =
 {
@@ -4013,8 +4191,8 @@ static int editor_el_sokoban[] =
 };
 static int *editor_hl_sokoban_ptr = editor_hl_sokoban;
 static int *editor_el_sokoban_ptr = editor_el_sokoban;
-static int num_editor_hl_sokoban = SIZEOF_ARRAY_INT(editor_hl_sokoban);
-static int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban);
+static int num_editor_hl_sokoban = ARRAY_SIZE(editor_hl_sokoban);
+static int num_editor_el_sokoban = ARRAY_SIZE(editor_el_sokoban);
 
 static int editor_hl_supaplex[] =
 {
@@ -4088,8 +4266,8 @@ static int editor_el_supaplex[] =
 };
 static int *editor_hl_supaplex_ptr = editor_hl_supaplex;
 static int *editor_el_supaplex_ptr = editor_el_supaplex;
-static int num_editor_hl_supaplex = SIZEOF_ARRAY_INT(editor_hl_supaplex);
-static int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
+static int num_editor_hl_supaplex = ARRAY_SIZE(editor_hl_supaplex);
+static int num_editor_el_supaplex = ARRAY_SIZE(editor_el_supaplex);
 
 static int editor_hl_diamond_caves[] =
 {
@@ -4101,6 +4279,11 @@ 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_PEARL,
   EL_CRYSTAL,
   EL_WALL_PEARL,
@@ -4245,8 +4428,8 @@ static int editor_el_diamond_caves[] =
 };
 static int *editor_hl_diamond_caves_ptr = editor_hl_diamond_caves;
 static int *editor_el_diamond_caves_ptr = editor_el_diamond_caves;
-static int num_editor_hl_diamond_caves = SIZEOF_ARRAY_INT(editor_hl_diamond_caves);
-static int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves);
+static int num_editor_hl_diamond_caves = ARRAY_SIZE(editor_hl_diamond_caves);
+static int num_editor_el_diamond_caves = ARRAY_SIZE(editor_el_diamond_caves);
 
 static int editor_hl_dx_boulderdash[] =
 {
@@ -4280,8 +4463,8 @@ static int editor_el_dx_boulderdash[] =
 };
 static int *editor_hl_dx_boulderdash_ptr = editor_hl_dx_boulderdash;
 static int *editor_el_dx_boulderdash_ptr = editor_el_dx_boulderdash;
-static int num_editor_hl_dx_boulderdash = SIZEOF_ARRAY_INT(editor_hl_dx_boulderdash);
-static int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash);
+static int num_editor_hl_dx_boulderdash = ARRAY_SIZE(editor_hl_dx_boulderdash);
+static int num_editor_el_dx_boulderdash = ARRAY_SIZE(editor_el_dx_boulderdash);
 
 static int editor_hl_mirror_magic[] =
 {
@@ -4300,13 +4483,13 @@ static int editor_el_mirror_magic[] =
 
   EL_MM_MIRROR_START,
   EL_MM_MIRROR_FIXED_START,
-  EL_MM_POLARISATOR_START,
-  EL_MM_POLARISATOR_CROSS_START,
+  EL_MM_POLARIZER_START,
+  EL_MM_POLARIZER_CROSS_START,
 
-  EL_MM_BEAMER_RED_START,
-  EL_MM_BEAMER_YELLOW_START,
-  EL_MM_BEAMER_GREEN_START,
-  EL_MM_BEAMER_BLUE_START,
+  EL_MM_TELEPORTER_RED_START,
+  EL_MM_TELEPORTER_YELLOW_START,
+  EL_MM_TELEPORTER_GREEN_START,
+  EL_MM_TELEPORTER_BLUE_START,
 
   EL_MM_PRISM,
   EL_MM_FUSE_ACTIVE,
@@ -4345,8 +4528,8 @@ static int editor_el_mirror_magic[] =
 };
 static int *editor_hl_mirror_magic_ptr = editor_hl_mirror_magic;
 static int *editor_el_mirror_magic_ptr = editor_el_mirror_magic;
-static int num_editor_hl_mirror_magic = SIZEOF_ARRAY_INT(editor_hl_mirror_magic);
-static int num_editor_el_mirror_magic = SIZEOF_ARRAY_INT(editor_el_mirror_magic);
+static int num_editor_hl_mirror_magic = ARRAY_SIZE(editor_hl_mirror_magic);
+static int num_editor_el_mirror_magic = ARRAY_SIZE(editor_el_mirror_magic);
 
 static int editor_hl_deflektor[] =
 {
@@ -4390,8 +4573,8 @@ static int editor_el_deflektor[] =
 };
 static int *editor_hl_deflektor_ptr = editor_hl_deflektor;
 static int *editor_el_deflektor_ptr = editor_el_deflektor;
-static int num_editor_hl_deflektor = SIZEOF_ARRAY_INT(editor_hl_deflektor);
-static int num_editor_el_deflektor = SIZEOF_ARRAY_INT(editor_el_deflektor);
+static int num_editor_hl_deflektor = ARRAY_SIZE(editor_hl_deflektor);
+static int num_editor_el_deflektor = ARRAY_SIZE(editor_el_deflektor);
 
 static int editor_hl_chars[] =
 {
@@ -4500,8 +4683,8 @@ static int editor_el_chars[] =
 };
 static int *editor_hl_chars_ptr = editor_hl_chars;
 static int *editor_el_chars_ptr = editor_el_chars;
-static int num_editor_hl_chars = SIZEOF_ARRAY_INT(editor_hl_chars);
-static int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars);
+static int num_editor_hl_chars = ARRAY_SIZE(editor_hl_chars);
+static int num_editor_el_chars = ARRAY_SIZE(editor_el_chars);
 
 static int editor_hl_steel_chars[] =
 {
@@ -4610,8 +4793,8 @@ static int editor_el_steel_chars[] =
 };
 static int *editor_hl_steel_chars_ptr = editor_hl_steel_chars;
 static int *editor_el_steel_chars_ptr = editor_el_steel_chars;
-static int num_editor_hl_steel_chars = SIZEOF_ARRAY_INT(editor_hl_steel_chars);
-static int num_editor_el_steel_chars = SIZEOF_ARRAY_INT(editor_el_steel_chars);
+static int num_editor_hl_steel_chars = ARRAY_SIZE(editor_hl_steel_chars);
+static int num_editor_el_steel_chars = ARRAY_SIZE(editor_el_steel_chars);
 
 static int editor_hl_custom[] =
 {
@@ -4945,8 +5128,8 @@ static int editor_el_custom[] =
 };
 static int *editor_hl_custom_ptr = editor_hl_custom;
 static int *editor_el_custom_ptr = editor_el_custom;
-static int num_editor_hl_custom = SIZEOF_ARRAY_INT(editor_hl_custom);
-static int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom);
+static int num_editor_hl_custom = ARRAY_SIZE(editor_hl_custom);
+static int num_editor_el_custom = ARRAY_SIZE(editor_el_custom);
 
 static int editor_hl_group[] =
 {
@@ -5000,8 +5183,8 @@ static int editor_el_group[] =
 };
 static int *editor_hl_group_ptr = editor_hl_group;
 static int *editor_el_group_ptr = editor_el_group;
-static int num_editor_hl_group = SIZEOF_ARRAY_INT(editor_hl_group);
-static int num_editor_el_group = SIZEOF_ARRAY_INT(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_reference[] =
 {
@@ -5045,8 +5228,8 @@ static int editor_el_reference[] =
 };
 static int *editor_hl_reference_ptr = editor_hl_reference;
 static int *editor_el_reference_ptr = editor_el_reference;
-static int num_editor_hl_reference = SIZEOF_ARRAY_INT(editor_hl_reference);
-static int num_editor_el_reference = SIZEOF_ARRAY_INT(editor_el_reference);
+static int num_editor_hl_reference = ARRAY_SIZE(editor_hl_reference);
+static int num_editor_el_reference = ARRAY_SIZE(editor_el_reference);
 
 static int editor_hl_user_defined[] =
 {
@@ -5058,7 +5241,7 @@ static int editor_hl_user_defined[] =
 
 static int *editor_hl_user_defined_ptr = editor_hl_user_defined;
 static int *editor_el_user_defined_ptr = NULL;
-static int num_editor_hl_user_defined=SIZEOF_ARRAY_INT(editor_hl_user_defined);
+static int num_editor_hl_user_defined = ARRAY_SIZE(editor_hl_user_defined);
 static int num_editor_el_user_defined = 0;
 
 static int editor_hl_dynamic[] =
@@ -5071,21 +5254,21 @@ static int editor_hl_dynamic[] =
 
 static int *editor_hl_dynamic_ptr = editor_hl_dynamic;
 static int *editor_el_dynamic_ptr = NULL;
-static int num_editor_hl_dynamic = SIZEOF_ARRAY_INT(editor_hl_dynamic);
+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;
 
@@ -5248,13 +5431,11 @@ editor_elements_info[] =
 };
 
 
-/*
-  -----------------------------------------------------------------------------
-  functions
-  -----------------------------------------------------------------------------
-*/
+// ----------------------------------------------------------------------------
+// functions
+// ----------------------------------------------------------------------------
 
-static int getMaxInfoTextLength()
+static int getMaxInfoTextLength(void)
 {
   return (SXSIZE / getFontWidth(INFOTEXT_FONT));
 }
@@ -5311,14 +5492,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;
@@ -5326,18 +5507,18 @@ static char *getElementDescriptionFilenameExt(char *basename)
   return NULL;
 }
 
-char *getElementDescriptionFilename(int element)
+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)
@@ -5346,56 +5527,63 @@ char *getElementDescriptionFilename(int element)
   return NULL;
 }
 
+static boolean suppressBorderElement(void)
+{
+  return (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+         lev_fieldx <= MAX_ED_FIELDX &&
+         lev_fieldy <= MAX_ED_FIELDY);
+}
+
 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 */
+      if (Feld[x][y] < NUM_FILE_ELEMENTS)      // should always be true
        element_found[Feld[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 elements)
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     if (element_found[i] && !(IS_CUSTOM_ELEMENT(i) || IS_GROUP_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 elements)
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     if (element_found[i] && (IS_CUSTOM_ELEMENT(i) || IS_GROUP_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()
+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;
@@ -5415,7 +5603,7 @@ static void ReinitializeElementList_EnableSections()
   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)
   {
@@ -5460,6 +5648,7 @@ static void ReinitializeElementList_EnableSections()
     setup_editor_el_more               = FALSE;
     setup_editor_el_sokoban            = FALSE;
     setup_editor_el_supaplex           = FALSE;
+    setup_editor_el_diamond_caves      = FALSE;
     setup_editor_el_dx_boulderdash     = FALSE;
     setup_editor_el_mirror_magic       = FALSE;
     setup_editor_el_deflektor          = FALSE;
@@ -5501,7 +5690,7 @@ static void ReinitializeElementList_EnableSections()
   }
 }
 
-static void ReinitializeElementList()
+static void ReinitializeElementList(void)
 {
   static boolean initialization_needed = TRUE;
   int pos = 0;
@@ -5511,9 +5700,9 @@ static void ReinitializeElementList()
 
   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];
@@ -5530,19 +5719,19 @@ static void ReinitializeElementList()
 
   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++)
@@ -5560,7 +5749,7 @@ static void ReinitializeElementList()
   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;
@@ -5571,7 +5760,7 @@ static void ReinitializeElementList()
       {
        // 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++)
        {
@@ -5588,8 +5777,8 @@ static void ReinitializeElementList()
       // 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;
     }
@@ -5597,16 +5786,20 @@ static void ReinitializeElementList()
 
   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;
 
     num_editor_elements += num_editor_el_empty;
   }
+  else
+  {
+    num_editor_el_empty = 0;
+  }
 
   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;
@@ -5617,7 +5810,7 @@ static void ReinitializeElementList()
       {
        // 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++)
        {
@@ -5639,8 +5832,8 @@ static void ReinitializeElementList()
       // 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++)
@@ -5652,13 +5845,13 @@ static void ReinitializeElementList()
     }
   }
 
-  /* (this function is also called before editor gadgets are initialized!) */
+  // (this function is also called before editor gadgets are initialized!)
   AdjustElementListScrollbar();
 }
 
-void PrintEditorElementList()
+void PrintEditorElementList(void)
 {
-  boolean *stop = &setup.editor.el_user_defined;
+  boolean *stop = &setup_editor_el_user_defined;
   int i, j;
 
   for (i = 0; editor_elements_info[i].setup_value != stop; i++)
@@ -5700,13 +5893,13 @@ void PrintEditorElementList()
   }
 }
 
-static void ReinitializeElementListButtons()
+static void ReinitializeElementListButtons(void)
 {
   static boolean last_setup_value_headlines = FALSE;
   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;
@@ -5723,7 +5916,7 @@ static void ReinitializeElementListButtons()
   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 =
@@ -5783,6 +5976,45 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height,
   ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2);
 }
 
+static void DrawEditorLevelBorderLine(int x, int y, int xsize, int ysize)
+{
+  int xsize_tile = MAX(ed_tilesize, xsize);
+  int ysize_tile = MAX(ed_tilesize, ysize);
+  int xsize_full = xsize + 1;
+  int ysize_full = ysize + 1;
+  int xsize_thin = (xsize < ed_tilesize ? 1 : xsize);
+  int ysize_thin = (ysize < ed_tilesize ? 1 : ysize);
+  Pixel line_color = getTabulatorBarColor();
+
+  if (line_color == BLACK_PIXEL)               // black => transparent
+    return;
+
+  FillRectangle(drawto, SX + x, SY + y, xsize_tile, ysize_tile, BLACK_PIXEL);
+  FillRectangle(drawto, SX + x, SY + y, xsize_full, ysize_full, line_color);
+  FillRectangle(drawto, SX + x, SY + y, xsize_thin, ysize_thin, BLACK_PIXEL);
+}
+
+static void DrawEditorLevelBorderLinesIfNeeded(void)
+{
+  int xsize = lev_fieldx * ed_tilesize;
+  int ysize = lev_fieldy * ed_tilesize;
+  int line_size = getTabulatorBarHeight();
+
+  if (!suppressBorderElement())
+    return;
+
+  // draw little border line around editable level playfield
+
+  if (xsize < SXSIZE)
+    DrawEditorLevelBorderLine(xsize, 0, line_size, ysize);
+
+  if (ysize < SYSIZE)
+    DrawEditorLevelBorderLine(0, ysize, xsize, line_size);
+
+  if (xsize < SXSIZE && ysize < SYSIZE)
+    DrawEditorLevelBorderLine(xsize, ysize, line_size, line_size);
+}
+
 static void DrawEditorElement(int x, int y, int element)
 {
   DrawSizedElement(x, y, element, ed_tilesize);
@@ -5801,6 +6033,7 @@ static void DrawEditorElementOrWall(int x, int y, int scroll_x, int scroll_y)
 static void DrawEditorLevel(int size_x, int size_y, int scroll_x, int scroll_y)
 {
   DrawSizedLevel(size_x, size_y, scroll_x, scroll_y, ed_tilesize);
+  DrawEditorLevelBorderLinesIfNeeded();
 }
 
 static void DrawDrawingArea(int id)
@@ -5852,18 +6085,18 @@ static void ScrollEditorLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap,
-                           int *x, int *y)
+static void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap,
+                                  int *x, int *y)
 {
   getSizedGraphicSource(el2edimg(element), 0, tile_size, bitmap, x, y);
 }
 
-static void CreateControlButtons()
+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;
@@ -5950,6 +6183,7 @@ static void CreateControlButtons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, controlbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -5979,7 +6213,7 @@ static void CreateControlButtons()
     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;
@@ -5993,7 +6227,7 @@ static void CreateControlButtons()
   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;
@@ -6024,6 +6258,7 @@ static void CreateControlButtons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6044,7 +6279,7 @@ static void CreateControlButtons()
     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;
@@ -6072,6 +6307,7 @@ static void CreateControlButtons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, getElementInfoText(element),
                      GDI_X, x,
                      GDI_Y, y,
@@ -6097,7 +6333,7 @@ static void CreateControlButtons()
   }
 }
 
-static void CreateCounterButtons()
+static void CreateCounterButtons(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i;
@@ -6105,15 +6341,15 @@ static void CreateCounterButtons()
   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);
 
@@ -6169,6 +6405,7 @@ static void CreateCounterButtons()
 
       gi = CreateGadget(GDI_CUSTOM_ID, id,
                        GDI_CUSTOM_TYPE_ID, i,
+                       GDI_IMAGE_ID, graphic,
                        GDI_INFO_TEXT, infotext,
                        GDI_X, x,
                        GDI_Y, y,
@@ -6190,7 +6427,7 @@ static void CreateCounterButtons()
       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)
       {
@@ -6225,6 +6462,7 @@ static void CreateCounterButtons()
 
        gi = CreateGadget(GDI_CUSTOM_ID, id,
                          GDI_CUSTOM_TYPE_ID, i,
+                         GDI_IMAGE_ID, graphic,
                          GDI_INFO_TEXT, "enter counter value",
                          GDI_X, x,
                          GDI_Y, y,
@@ -6232,7 +6470,7 @@ static void CreateCounterButtons()
                          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,
@@ -6251,17 +6489,17 @@ static void CreateCounterButtons()
        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
       }
     }
   }
 }
 
-static void CreateDrawingAreas()
+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;
 
@@ -6281,12 +6519,12 @@ static void CreateDrawingAreas()
       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);
 
@@ -6311,7 +6549,7 @@ static void CreateDrawingAreas()
   }
 }
 
-static void CreateTextInputGadgets()
+static void CreateTextInputGadgets(void)
 {
   struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
   int max_infotext_len = getMaxInfoTextLength();
@@ -6382,7 +6620,7 @@ static void CreateTextInputGadgets()
   }
 }
 
-static void CreateTextAreaGadgets()
+static void CreateTextAreaGadgets(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i;
@@ -6431,7 +6669,7 @@ static void CreateTextAreaGadgets()
   }
 }
 
-static void CreateSelectboxGadgets()
+static void CreateSelectboxGadgets(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i, j;
@@ -6452,29 +6690,29 @@ static void CreateSelectboxGadgets()
     int x = SX + ED_SETTINGS_X(selectbox_info[i].x);
     int y = SY + ED_SETTINGS_Y(selectbox_info[i].y);
 
-    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);
 
@@ -6512,7 +6750,7 @@ static void CreateSelectboxGadgets()
   }
 }
 
-static void CreateTextbuttonGadgets()
+static void CreateTextbuttonGadgets(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i;
@@ -6542,7 +6780,7 @@ static void CreateTextbuttonGadgets()
     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;
@@ -6550,7 +6788,7 @@ static void CreateTextbuttonGadgets()
     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;
@@ -6561,12 +6799,13 @@ static void CreateTextbuttonGadgets()
        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);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6595,19 +6834,20 @@ static void CreateTextbuttonGadgets()
   }
 }
 
-static void CreateGraphicbuttonGadgets()
+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;
     int x = SX + ED_SETTINGS_X(graphicbutton_info[i].x);
     int y = SY + ED_SETTINGS_Y(graphicbutton_info[i].y);
-    struct GraphicInfo *gd = &graphic_info[graphicbutton_info[i].graphic];
+    int graphic = graphicbutton_info[i].graphic;
+    struct GraphicInfo *gd = &graphic_info[graphic];
     int gd_x1 = gd->src_x;
     int gd_y1 = gd->src_y;
     int gd_x2 = gd->src_x + gd->pressed_xoffset;
@@ -6615,17 +6855,18 @@ static void CreateGraphicbuttonGadgets()
 
     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);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, graphicbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6649,11 +6890,11 @@ static void CreateGraphicbuttonGadgets()
   }
 }
 
-static void CreateScrollbarGadgets()
+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 =
@@ -6712,7 +6953,7 @@ static void CreateScrollbarGadgets()
       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)
       {
@@ -6732,6 +6973,7 @@ static void CreateScrollbarGadgets()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, scrollbar_info[i].infotext,
                      GDI_X, scrollbar_pos[i].x,
                      GDI_Y, scrollbar_pos[i].y,
@@ -6761,7 +7003,7 @@ static void CreateScrollbarGadgets()
   }
 }
 
-static void CreateCheckbuttonGadgets()
+static void CreateCheckbuttonGadgets(void)
 {
   struct GadgetInfo *gi;
   unsigned int event_mask;
@@ -6786,17 +7028,18 @@ static void CreateCheckbuttonGadgets()
     int x = SX + ED_SETTINGS_X(checkbutton_info[i].x);
     int y = SY + ED_SETTINGS_Y(checkbutton_info[i].y);
 
-    /* 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);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, checkbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6822,9 +7065,10 @@ static void CreateCheckbuttonGadgets()
   }
 }
 
-static void CreateRadiobuttonGadgets()
+static void CreateRadiobuttonGadgets(void)
 {
-  struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_RADIOBUTTON];
+  int graphic = IMG_EDITOR_RADIOBUTTON;
+  struct GraphicInfo *gd = &graphic_info[graphic];
   int gd_x1 = gd->src_x;
   int gd_y1 = gd->src_y;
   int gd_x2 = gd->src_x + gd->pressed_xoffset;
@@ -6848,17 +7092,18 @@ static void CreateRadiobuttonGadgets()
     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);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, radiobutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6885,12 +7130,12 @@ static void CreateRadiobuttonGadgets()
   }
 }
 
-void CreateLevelEditorGadgets()
+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;
 
@@ -6903,7 +7148,10 @@ void CreateLevelEditorGadgets()
   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;
@@ -6913,7 +7161,7 @@ void CreateLevelEditorGadgets()
   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();
@@ -6927,7 +7175,7 @@ void CreateLevelEditorGadgets()
   ResetFontStatus();
 }
 
-void FreeLevelEditorGadgets()
+void FreeLevelEditorGadgets(void)
 {
   int i;
 
@@ -6961,21 +7209,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)
   {
@@ -6987,7 +7235,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)
@@ -7004,22 +7252,22 @@ static void MapCounterButtons(int id)
   MapGadget(gi_up);
 }
 
-static void MapControlButtons()
+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]);
@@ -7027,7 +7275,7 @@ static void MapControlButtons()
     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;
@@ -7111,11 +7359,17 @@ static void MapSelectboxGadget(int id)
   struct GadgetInfo *gi = level_editor_gadget[selectbox_info[id].gadget_id];
   int xoffset_left = getTextWidthForGadget(selectbox_info[id].text_left);
   int xoffset_right = ED_GADGET_TEXT_DISTANCE;
+  int yoffset_above = font_height + ED_GADGET_LINE_DISTANCE;
   int yoffset = (gi->height - font_height) / 2;
   int x_left = gi->x - xoffset_left;
   int x_right = gi->x + gi->width + xoffset_right;
+  int y_above = gi->y - yoffset_above;
+  int x = gi->x;
   int y = gi->y + yoffset;
 
+  if (selectbox_info[id].text_above)
+    DrawText(x, y_above, selectbox_info[id].text_above, font_nr);
+
   if (selectbox_info[id].text_left)
     DrawText(x_left, y, selectbox_info[id].text_left, font_nr);
 
@@ -7142,7 +7396,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;
@@ -7216,10 +7470,10 @@ 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 */
+  // 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);
 
@@ -7241,12 +7495,18 @@ static void MapCheckbuttonGadget(int id)
   MapGadget(gi);
 }
 
-static void MapMainDrawingArea()
+static void MapMainDrawingArea(void)
 {
   boolean no_horizontal_scrollbar = (lev_fieldx + 2 <= ed_fieldx);
   boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
   int i;
 
+  if (suppressBorderElement())
+  {
+    no_horizontal_scrollbar = (lev_fieldx <= ed_fieldx);
+    no_vertical_scrollbar   = (lev_fieldy <= ed_fieldy);
+  }
+
   for (i=ED_SCROLLBUTTON_ID_AREA_FIRST; i <= ED_SCROLLBUTTON_ID_AREA_LAST; i++)
   {
     if (((i == ED_SCROLLBUTTON_ID_AREA_LEFT ||
@@ -7292,12 +7552,12 @@ static void MapOrUnmapLevelEditorToolboxCustomGadgets(boolean map)
   }
 }
 
-static void MapLevelEditorToolboxCustomGadgets()
+static void MapLevelEditorToolboxCustomGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxCustomGadgets(TRUE);
 }
 
-static void UnmapLevelEditorToolboxCustomGadgets()
+static void UnmapLevelEditorToolboxCustomGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxCustomGadgets(FALSE);
 }
@@ -7333,12 +7593,12 @@ static void MapOrUnmapLevelEditorToolboxDrawingGadgets(boolean map)
   }
 }
 
-static void MapLevelEditorToolboxDrawingGadgets()
+static void MapLevelEditorToolboxDrawingGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxDrawingGadgets(TRUE);
 }
 
-static void UnmapLevelEditorToolboxDrawingGadgets()
+static void UnmapLevelEditorToolboxDrawingGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxDrawingGadgets(FALSE);
 }
@@ -7348,7 +7608,7 @@ static void UnmapDrawingArea(int id)
   UnmapGadget(level_editor_gadget[drawingarea_info[id].gadget_id]);
 }
 
-static void UnmapLevelEditorFieldGadgets()
+static void UnmapLevelEditorFieldGadgets(void)
 {
   int i;
 
@@ -7358,7 +7618,7 @@ static void UnmapLevelEditorFieldGadgets()
       UnmapGadget(level_editor_gadget[i]);
 }
 
-void UnmapLevelEditorGadgets()
+void UnmapLevelEditorGadgets(void)
 {
   int i;
 
@@ -7366,7 +7626,7 @@ void UnmapLevelEditorGadgets()
     UnmapGadget(level_editor_gadget[i]);
 }
 
-static void ResetUndoBuffer()
+static void ResetUndoBuffer(void)
 {
   undo_buffer_position = -1;
   undo_buffer_steps = -1;
@@ -7377,10 +7637,13 @@ static void ResetUndoBuffer()
   level.changed = FALSE;
 }
 
-static void DrawEditModeWindow()
+static void DrawEditModeWindowExt(boolean remap_toolbox_gadgets)
 {
-  ModifyEditorElementList();
-  RedrawDrawingElements();
+  if (remap_toolbox_gadgets)
+  {
+    ModifyEditorElementList();
+    RedrawDrawingElements();
+  }
 
   if (edit_mode == ED_MODE_INFO)
     DrawLevelInfoWindow();
@@ -7388,8 +7651,18 @@ static void DrawEditModeWindow()
     DrawPropertiesWindow();
   else if (edit_mode == ED_MODE_PALETTE)
     DrawPaletteWindow();
-  else /* edit_mode == ED_MODE_DRAWING */
-    DrawDrawingWindow();
+  else // edit_mode == ED_MODE_DRAWING
+    DrawDrawingWindowExt(remap_toolbox_gadgets);
+}
+
+static void DrawEditModeWindow(void)
+{
+  DrawEditModeWindowExt(TRUE);
+}
+
+static void DrawEditModeWindow_PlayfieldOnly(void)
+{
+  DrawEditModeWindowExt(FALSE);
 }
 
 static void ChangeEditModeWindow(int new_edit_mode)
@@ -7399,7 +7672,7 @@ static void ChangeEditModeWindow(int new_edit_mode)
   DrawEditModeWindow();
 }
 
-static boolean LevelChanged()
+static boolean LevelChanged(void)
 {
   boolean field_changed = FALSE;
   int x, y;
@@ -7412,7 +7685,7 @@ static boolean LevelChanged()
   return (level.changed || field_changed);
 }
 
-static boolean PrepareSavingIntoPersonalLevelSet()
+static boolean PrepareSavingIntoPersonalLevelSet(void)
 {
   static LevelDirTree *last_copied_leveldir = NULL;
   static LevelDirTree *last_written_leveldir = NULL;
@@ -7499,37 +7772,7 @@ static void ModifyLevelInfoForSavingIntoPersonalLevelSet(char *former_name)
   }
 
   if (level_nr > leveldir_current->last_level)
-  {
-    static char *temp_levelinfo = NULL;
-    FILE *temp_file = NULL;
-    char line[MAX_LINE_LEN];
-
-    setString(&temp_levelinfo,
-             getPath2(getCurrentLevelDir(),
-                      getStringCat2(LEVELINFO_FILENAME, ".new")));
-
-    if ((file = fopen(filename_levelinfo, MODE_READ)) &&
-       (temp_file = fopen(temp_levelinfo, MODE_WRITE)))
-    {
-      while (fgets(line, MAX_LINE_LEN, file))
-      {
-       if (!strPrefix(line, "levels:"))
-         fputs(line, temp_file);
-       else
-         fprintf(temp_file, "%-32s%d\n", "levels:", level_nr + 9);
-      }
-    }
-
-    if (temp_file)
-      fclose(temp_file);
-
-    if (file)
-      fclose(file);
-
-    // needs error handling; also, ok on dos/win?
-    unlink(filename_levelinfo);
-    rename(temp_levelinfo, filename_levelinfo);
-  }
+    UpdateUserLevelSet(getLoginName(), NULL, NULL, level_nr + 9);
 
   // else: allow the save even if annotation failed
 
@@ -7584,23 +7827,23 @@ static int setSelectboxValue(int selectbox_id, int new_value)
   return new_index_value;
 }
 
-static void setSelectboxSpecialActionVariablesIfNeeded()
+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;
@@ -7610,11 +7853,11 @@ static void setSelectboxSpecialActionVariablesIfNeeded()
   }
 }
 
-static void setSelectboxSpecialActionOptions()
+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)
@@ -7676,7 +7919,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;
@@ -7730,7 +7973,7 @@ static boolean CopyCustomElement(int element_old, int element_new,
     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())
@@ -7771,7 +8014,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);
@@ -7783,7 +8026,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 =
@@ -7792,10 +8035,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);
 
@@ -7805,9 +8048,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 :
@@ -7824,7 +8067,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 :
@@ -7839,7 +8082,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 :
@@ -7850,7 +8093,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 :
@@ -7863,9 +8106,9 @@ 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_PRESSED_BY_PLAYER) ? CE_PRESSED_BY_PLAYER :
@@ -7887,7 +8130,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
      HAS_CHANGE_EVENT(element, CE_SCORE_GETS_ZERO) ? CE_SCORE_GETS_ZERO :
      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_PRESSES_X) ? CE_PLAYER_PRESSES_X :
@@ -7918,7 +8161,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
 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 CopyClassicElementPropertiesToEditor(int element)
@@ -7942,7 +8185,7 @@ static void CopyElementPropertiesToEditor(int element)
     CopyClassicElementPropertiesToEditor(element);
 }
 
-static boolean AskToCopyAndModifyLevelTemplate()
+static boolean AskToCopyAndModifyLevelTemplate(void)
 {
   if (Request("Copy and modify settings from level template?", REQ_ASK))
   {
@@ -7957,9 +8200,9 @@ static boolean AskToCopyAndModifyLevelTemplate()
   }
   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;
   }
@@ -7970,7 +8213,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;
 
@@ -7980,9 +8223,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;
@@ -7998,7 +8241,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;
@@ -8007,14 +8250,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;
@@ -8022,9 +8265,9 @@ 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_TOUCHED_BY_PLAYER] = FALSE;
   custom_element_change_events[CE_PRESSED_BY_PLAYER] = FALSE;
   custom_element_change_events[CE_SWITCHED_BY_PLAYER] = FALSE;
@@ -8046,7 +8289,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   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_TOUCHES_X] = FALSE;
   custom_element_change_events[CE_PLAYER_PRESSES_X] = FALSE;
   custom_element_change_events[CE_PLAYER_SWITCHES_X] = FALSE;
@@ -8079,14 +8322,14 @@ 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;
 }
 
 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;
 
@@ -8118,7 +8361,8 @@ static void CopyElementPropertiesToGame(int element)
     CopyClassicElementPropertiesToGame(element);
 }
 
-void CheckElementDescriptions()
+#if DEBUG
+static void CheckElementDescriptions(void)
 {
   int i;
 
@@ -8127,6 +8371,7 @@ void CheckElementDescriptions()
       Error(ERR_WARN, "no element description file for element '%s'",
            EL_NAME(i));
 }
+#endif
 
 static int getMaxEdFieldX(boolean has_scrollbar)
 {
@@ -8139,7 +8384,8 @@ static int getMaxEdFieldX(boolean has_scrollbar)
 
 static int getMaxEdFieldY(boolean has_scrollbar)
 {
-  int infotext_height = INFOTEXT_YSIZE_FULL;
+  int infotext_height = (IN_PIX_FIELD(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY) ?
+                        INFOTEXT_YSIZE_FULL : 0);
   int scrollbar_height = (has_scrollbar ? ED_SCROLLBUTTON_YSIZE : 0);
   int sysize = SYSIZE - scrollbar_height - infotext_height;
   int max_ed_fieldy = sysize / ed_tilesize;
@@ -8147,31 +8393,172 @@ static int getMaxEdFieldY(boolean has_scrollbar)
   return max_ed_fieldy;
 }
 
-void InitZoomLevelSettings()
+static void InitZoomLevelSettings(int zoom_tilesize)
 {
+  static int last_game_engine_type = GAME_ENGINE_TYPE_UNKNOWN;
+
+  if (zoom_tilesize == -1 && level.game_engine_type != last_game_engine_type)
+  {
+    ed_tilesize = setup.auto_setup.editor_zoom_tilesize;
+    ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
+
+    if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    {
+      ed_tilesize = DEFAULT_EDITOR_TILESIZE_MM;
+      ed_tilesize_default = DEFAULT_EDITOR_TILESIZE_MM;
+    }
+  }
+
+  last_game_engine_type = level.game_engine_type;
+
+  // limit zoom tilesize by upper and lower bound
+  ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);
+
+  // store zoom tilesize in auto setup file only if it was manually changed
+  if (zoom_tilesize != -1)
+    setup.auto_setup.editor_zoom_tilesize = ed_tilesize;
+
   MAX_ED_FIELDX = getMaxEdFieldX(FALSE);
   MAX_ED_FIELDY = getMaxEdFieldY(FALSE);
 }
 
-void DrawLevelEd()
+static void InitDrawingElements(void)
+{
+  static int game_engine_type_last = GAME_ENGINE_TYPE_UNKNOWN;
+
+  if (level.game_engine_type == game_engine_type_last)
+    return;
+
+  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+  {
+    new_element1 = EL_SP_CHIP_SINGLE;
+    new_element2 = EL_EMPTY;
+    new_element3 = EL_SP_BASE;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+  {
+    new_element1 = EL_MM_MIRROR_START;
+    new_element2 = EL_EMPTY;
+    new_element3 = EL_MM_WOODEN_WALL;
+  }
+  else
+  {
+    new_element1 = EL_WALL;
+    new_element2 = EL_EMPTY;
+    new_element3 = EL_SAND;
+  }
+
+  game_engine_type_last = level.game_engine_type;
+}
+
+static void InitLevelSetInfo(void)
+{
+  snprintf(levelset_name,   MAX_LEVEL_NAME_LEN + 1,
+          "%s", leveldir_current->name);
+  snprintf(levelset_author, MAX_LEVEL_AUTHOR_LEN + 1,
+          "%s", leveldir_current->author);
+
+  levelset_num_levels = leveldir_current->levels;
+
+  levelset_use_levelset_artwork = FALSE;
+  levelset_copy_level_template = FALSE;
+
+  levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
+}
+
+static void ChangeEditorToLevelSet(char *levelset_subdir)
+{
+  leveldir_current = getTreeInfoFromIdentifier(leveldir_first, levelset_subdir);
+
+  // the previous level set might have used custom artwork
+  ReloadCustomArtwork(0);
+
+  LoadLevelSetup_SeriesInfo();
+
+  SaveLevelSetup_LastSeries();
+  SaveLevelSetup_SeriesInfo();
+
+  TapeErase();
+
+  LoadLevel(level_nr);
+  LoadScore(level_nr);
+
+  DrawLevelEd();
+}
+
+static boolean useEditorDoorAnimation(void)
+{
+  struct RectWithBorder *vp_door_1 = &viewport.door_1[GAME_MODE_MAIN];
+  boolean door_1_viewport_unchanged =
+    (vp_door_1->x      == DX     &&
+     vp_door_1->y      == DY     &&
+     vp_door_1->width  == DXSIZE &&
+     vp_door_1->height == DYSIZE);
+  boolean door_1_contains_toolbox =
+    (EX >= DX &&
+     EY >= DY &&
+     EX + EXSIZE <= DX + DXSIZE &&
+     EY + EYSIZE <= DY + DYSIZE);
+
+  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)
+  SetDoorBackgroundImage(IMG_UNDEFINED);
+
+  // copy default editor door content to main double buffer
+  DrawEditorDoorBackground(IMG_BACKGROUND_PALETTE, DX, DY, DXSIZE, DYSIZE);
+
+  // draw bigger door
+  DrawSpecialEditorDoor();
+
+  // draw new control window
+  DrawEditorDoorBackground(IMG_BACKGROUND_TOOLBOX, EX, EY, EXSIZE, EYSIZE);
+
+  // draw all toolbox gadgets to editor doors
+  MapControlButtons();
+
+  // draw all palette gadgets to editor doors
+  ModifyEditorElementList();
+  RedrawDrawingElements();
+
+  // copy actual editor door content to door double buffer for OpenDoor()
+  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
+}
+
+void DrawLevelEd(void)
 {
   int fade_mask = REDRAW_FIELD;
 
   FadeSoundsAndMusic();
 
-  if (CheckIfGlobalBorderHasChanged())
+  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();
 
-  InitZoomLevelSettings();
-
-  OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
+  InitZoomLevelSettings(-1);
+  InitDrawingElements();
+  InitLevelSetInfo();
 
 #if DEBUG
   CheckElementDescriptions();
@@ -8196,74 +8583,70 @@ void DrawLevelEd()
     level_ypos = -1;
   }
 
-  /* 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);
-
-  /* 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);
-
   // redraw_mask |= REDRAW_ALL;
 
   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();
 
   UnmapAllGadgets();
-  MapControlButtons();
 
-  DrawEditModeWindow();
+  DrawEditModeWindow_PlayfieldOnly();
 
   DrawMaskedBorder(fade_mask);
 
-  FadeIn(fade_mask);
+  // use door animation if door 1 viewport is unchanged and contains toolbox
+  if (useEditorDoorAnimation())
+  {
+    FadeIn(fade_mask);
 
-  /* copy actual editor door content to door double buffer for OpenDoor() */
-  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
-}
+    DrawEditorDoorContent();
 
-static void AdjustDrawingAreaGadgets()
-{
-  int ed_xsize = lev_fieldx + 2;
-  int ed_ysize = lev_fieldy + 2;
+    OpenDoor(DOOR_OPEN_1 | DOOR_FORCE_ANIM);
+  }
+  else
+  {
+    DrawEditorDoorContent();
+
+    FadeIn(fade_mask);
+  }
+
+  SetDoorState(DOOR_OPEN_1 | DOOR_OPEN_2);
+}
+
+static void AdjustDrawingAreaGadgets(void)
+{
+  int ed_xsize = lev_fieldx + 2;
+  int ed_ysize = lev_fieldy + 2;
   int max_ed_fieldx = MAX_ED_FIELDX;
   int max_ed_fieldy = MAX_ED_FIELDY;
   boolean horizontal_scrollbar_needed;
   boolean vertical_scrollbar_needed;
   int x, y, width, height;
 
-  /* check if we need any scrollbars */
+  if (suppressBorderElement())
+  {
+    ed_xsize = max_ed_fieldx;
+    ed_ysize = max_ed_fieldy;
+  }
+
+  // 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);
 
@@ -8276,13 +8659,13 @@ static void AdjustDrawingAreaGadgets()
   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);
@@ -8296,7 +8679,7 @@ static void AdjustDrawingAreaGadgets()
               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);
@@ -8311,7 +8694,7 @@ static void AdjustDrawingAreaGadgets()
               GDI_END);
 }
 
-static void AdjustLevelScrollPosition()
+static void AdjustLevelScrollPosition(void)
 {
   if (level_xpos < -1)
     level_xpos = -1;
@@ -8326,6 +8709,12 @@ static void AdjustLevelScrollPosition()
     level_ypos = lev_fieldy - ed_fieldy + 1;
   if (lev_fieldy < ed_fieldy - 2)
     level_ypos = -1;
+
+  if (suppressBorderElement())
+  {
+    level_xpos = 0;
+    level_ypos = 0;
+  }
 }
 
 static void AdjustEditorScrollbar(int id)
@@ -8353,12 +8742,12 @@ static void AdjustEditorScrollbar(int id)
               GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
-static void AdjustElementListScrollbar()
+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)
@@ -8421,7 +8810,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);
 }
@@ -8437,7 +8826,7 @@ static void ModifyEditorDrawingArea(int drawingarea_id, int xsize, int ysize)
   ModifyGadget(gi, GDI_AREA_SIZE, xsize, ysize, GDI_END);
 }
 
-static void ModifyEditorElementList()
+static void ModifyEditorElementList(void)
 {
   int i;
 
@@ -8516,14 +8905,14 @@ static void PickDrawingElement(int button, int element)
   redraw_mask |= REDRAW_DOOR_1;
 }
 
-static void RedrawDrawingElements()
+static void RedrawDrawingElements(void)
 {
   PickDrawingElement(1, new_element1);
   PickDrawingElement(2, new_element2);
   PickDrawingElement(3, new_element3);
 }
 
-static void DrawDrawingWindow()
+static void DrawDrawingWindowExt(boolean remap_toolbox_gadgets)
 {
   stick_element_properties_window = FALSE;
 
@@ -8531,7 +8920,6 @@ static void DrawDrawingWindow()
   ClearField();
 
   UnmapLevelEditorFieldGadgets();
-  UnmapLevelEditorToolboxCustomGadgets();
 
   AdjustDrawingAreaGadgets();
   AdjustLevelScrollPosition();
@@ -8541,10 +8929,20 @@ static void DrawDrawingWindow()
   DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
   MapMainDrawingArea();
-  MapLevelEditorToolboxDrawingGadgets();
+
+  if (remap_toolbox_gadgets)
+  {
+    UnmapLevelEditorToolboxCustomGadgets();
+    MapLevelEditorToolboxDrawingGadgets();
+  }
+}
+
+static void DrawDrawingWindow(void)
+{
+  DrawDrawingWindowExt(TRUE);
 }
 
-static int getTabulatorBarWidth()
+static int getTabulatorBarWidth(void)
 {
   struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
   struct GadgetInfo *gd_gi4 = level_editor_gadget[GADGET_ID_PROPERTIES_CHANGE];
@@ -8552,18 +8950,25 @@ static int getTabulatorBarWidth()
   return gd_gi4->x - gd_gi1->x + gd_gi4->width;
 }
 
-static int getTabulatorBarHeight()
+static int getTabulatorBarHeight(void)
 {
   return ED_TAB_BAR_HEIGHT;
 }
 
-static void DrawLevelInfoTabulatorGadgets()
+static Pixel getTabulatorBarColor(void)
 {
   struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_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;
-  Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
+
+  return GetPixel(gd->bitmap, gd_x, gd_y);
+}
+
+static void DrawLevelInfoTabulatorGadgets(void)
+{
+  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL];
+  Pixel tab_color = getTabulatorBarColor();
   int id_first = ED_TAB_BUTTON_ID_LEVELINFO_FIRST;
   int id_last  = ED_TAB_BUTTON_ID_LEVELINFO_LAST;
   int i;
@@ -8574,11 +8979,11 @@ static void DrawLevelInfoTabulatorGadgets()
     struct GadgetInfo *gi = level_editor_gadget[gadget_id];
     boolean active = (i != edit_mode_levelinfo);
 
-    /* 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);
 
@@ -8586,14 +8991,14 @@ static void DrawLevelInfoTabulatorGadgets()
     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);
 }
 
-static void DrawPropertiesTabulatorGadgets()
+static void DrawPropertiesTabulatorGadgets(void)
 {
   struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
   struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED];
@@ -8604,11 +9009,11 @@ static void DrawPropertiesTabulatorGadgets()
   int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
   int i;
 
-  /* draw two config tabulators for player elements */
+  // draw two config tabulators for player elements
   if (ELEM_IS_PLAYER(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;
 
@@ -8618,17 +9023,17 @@ static void DrawPropertiesTabulatorGadgets()
     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_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);
 
@@ -8636,58 +9041,135 @@ static void DrawPropertiesTabulatorGadgets()
     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);
 }
 
-static void DrawLevelInfoLevel()
+static void PrintInfoText(char *text, int font_nr, int xpos, int ypos)
+{
+  DrawText(SX + xpos, SY + ypos, text, font_nr);
+}
+
+static int PrintElementDescriptionFromFile(char *filename, int font_nr,
+                                          int xpos, int ypos)
+{
+  int font_width = getFontWidth(font_nr);
+  int font_height = getFontHeight(font_nr);
+  int max_chars_per_line = (SXSIZE - 2 * xpos) / font_width;
+  int max_lines_drawable = (SYSIZE - ypos) / font_height - 1;
+
+  return DrawTextFile(SX + xpos, SY + ypos, filename, font_nr,
+                     max_chars_per_line, -1, max_lines_drawable, 0, -1,
+                     TRUE, FALSE, FALSE);
+}
+
+static void DrawLevelInfoLevel(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);
 }
 
-static void DrawLevelInfoEditor()
+static char *getLevelSubdirFromSaveMode(int save_mode)
+{
+  if (save_mode == LEVELSET_SAVE_MODE_CREATE)
+    return getNewUserLevelSubdir();
+
+  return leveldir_current->subdir;
+}
+
+static void DrawLevelInfoLevelSet_DirectoryInfo(void)
+{
+  char *directory_text = "Level set directory:";
+  char *directory_name = getLevelSubdirFromSaveMode(levelset_save_mode);
+  int font1_nr = FONT_TEXT_1;
+  int font2_nr = FONT_TEXT_2;
+  int font1_height = getFontHeight(font1_nr);
+  int yoffset_above = font1_height + ED_GADGET_LINE_DISTANCE;
+  int x = ED_LEVEL_SETTINGS_X(0);
+  int y = ED_LEVEL_SETTINGS_Y(6);
+
+  PrintInfoText(directory_text, font1_nr, x, y - yoffset_above);
+  PrintInfoText(directory_name, font2_nr, x, y);
+}
+
+static void DrawLevelInfoLevelSet(void)
+{
+  boolean artwork_exists = checkIfCustomArtworkExistsForCurrentLevelSet();
+  boolean template_exists = fileExists(getLocalLevelTemplateFilename());
+  int i;
+
+  // draw counter gadgets
+  for (i = ED_COUNTER_ID_LEVELSET_FIRST; i <= ED_COUNTER_ID_LEVELSET_LAST; i++)
+    MapCounterButtons(i);
+
+  // 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 ||
+       (i == ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK && !artwork_exists) ||
+       (i == ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE  && !template_exists))
+      continue;
+
+    MapCheckbuttonGadget(i);
+  }
+
+  // draw selectbox gadgets
+  for (i = ED_SELECTBOX_ID_LEVELSET_FIRST; i <= ED_SELECTBOX_ID_LEVELSET_LAST; i++)
+    MapSelectboxGadget(i);
+
+  // draw text input gadgets
+  for (i = ED_TEXTINPUT_ID_LEVELSET_FIRST; i <= ED_TEXTINPUT_ID_LEVELSET_LAST; i++)
+    MapTextInputGadget(i);
+
+  // draw textbutton gadgets
+  MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_LEVELSET);
+
+  // draw info text
+  DrawLevelInfoLevelSet_DirectoryInfo();
+}
+
+static void DrawLevelInfoEditor(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()
+static void DrawLevelInfoWindow(void)
 {
   char *text = "Global Settings";
   int font_nr = FONT_TITLE_1;
@@ -8710,11 +9192,13 @@ static void DrawLevelInfoWindow()
 
   if (edit_mode_levelinfo == ED_MODE_LEVELINFO_LEVEL)
     DrawLevelInfoLevel();
-  else /* (edit_mode_levelinfo == ED_MODE_LEVELINFO_EDITOR) */
+  else if (edit_mode_levelinfo == ED_MODE_LEVELINFO_LEVELSET)
+    DrawLevelInfoLevelSet();
+  else if (edit_mode_levelinfo == ED_MODE_LEVELINFO_EDITOR)
     DrawLevelInfoEditor();
 }
 
-static void DrawCustomContentArea()
+static void DrawCustomContentArea(void)
 {
   int id = ED_DRAWING_ID_CUSTOM_CONTENT;
   struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id];
@@ -8723,7 +9207,7 @@ static void DrawCustomContentArea()
   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);
@@ -8731,7 +9215,7 @@ static void DrawCustomContentArea()
   MapDrawingArea(ED_DRAWING_ID_CUSTOM_CONTENT);
 }
 
-static void DrawCustomChangeContentArea()
+static void DrawCustomChangeContentArea(void)
 {
   int id = ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT;
   struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id];
@@ -8756,7 +9240,7 @@ static void RemoveElementContentArea(int id, int font_height)
                 ED_GADGET_TEXT_DISTANCE + font_height);
 }
 
-static void DrawYamYamContentAreas()
+static void DrawYamYamContentAreas(void)
 {
   int font_nr = FONT_TEXT_1;
   int font_height = getFontHeight(font_nr);
@@ -8766,7 +9250,7 @@ static void DrawYamYamContentAreas()
   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++)
@@ -8781,7 +9265,7 @@ static void DrawYamYamContentAreas()
     {
       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);
     }
   }
@@ -8791,7 +9275,7 @@ static void DrawYamYamContentAreas()
   DrawText(x, y + 2 * tilesize, "smashed", font_nr);
 }
 
-static void DrawMagicBallContentAreas()
+static void DrawMagicBallContentAreas(void)
 {
   int font_nr = FONT_TEXT_1;
   int font_height = getFontHeight(font_nr);
@@ -8801,7 +9285,7 @@ static void DrawMagicBallContentAreas()
   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++)
@@ -8816,7 +9300,7 @@ static void DrawMagicBallContentAreas()
     {
       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);
     }
   }
@@ -8836,7 +9320,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)
@@ -8846,7 +9330,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);
@@ -8871,7 +9355,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);
@@ -8890,12 +9374,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);
 
@@ -8903,7 +9387,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);
@@ -8930,25 +9414,7 @@ static void DrawEnvelopeTextArea(int envelope_nr)
   MapTextAreaGadget(ED_TEXTAREA_ID_ENVELOPE_INFO);
 }
 
-static void PrintInfoText(char *text, int font_nr, int xpos, int ypos)
-{
-  DrawText(SX + xpos, SY + ypos, text, font_nr);
-}
-
-static int PrintElementDescriptionFromFile(char *filename, int font_nr,
-                                          int xpos, int ypos)
-{
-  int font_width = getFontWidth(font_nr);
-  int font_height = getFontHeight(font_nr);
-  int max_chars_per_line = (SXSIZE - 2 * xpos) / font_width;
-  int max_lines_drawable = (SYSIZE - ypos) / font_height - 1;
-
-  return DrawTextFile(SX + xpos, SY + ypos, filename, font_nr,
-                     max_chars_per_line, -1, max_lines_drawable, 0, -1,
-                     TRUE, FALSE, FALSE);
-}
-
-static void DrawPropertiesInfo()
+static void DrawPropertiesInfo(void)
 {
   static struct
   {
@@ -8957,7 +9423,7 @@ static void DrawPropertiesInfo()
   }
   properties[] =
   {
-    /* configurable properties */
+    // configurable properties
 
     { EP_WALKABLE_OVER,                "- player can walk over it"             },
     { EP_WALKABLE_INSIDE,      "- player can walk inside it"           },
@@ -8998,7 +9464,7 @@ static void DrawPropertiesInfo()
 
     { 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"                     },
@@ -9041,7 +9507,7 @@ static void DrawPropertiesInfo()
     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++) 
@@ -9061,7 +9527,7 @@ static void DrawPropertiesInfo()
 
   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);
 
@@ -9089,7 +9555,7 @@ static void DrawPropertiesInfo()
 
   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);
 
@@ -9105,6 +9571,10 @@ static void DrawPropertiesInfo()
 #define TEXT_CRACKING          "Score for cracking"
 #define TEXT_AMOEBA_SPEED      "Speed of amoeba growth"
 #define TEXT_DURATION          "Duration when activated"
+#define TEXT_DELAY_ON          "Delay before activating"
+#define TEXT_DELAY_OFF         "Delay before deactivating"
+#define TEXT_DELAY_EXPLODING   "Delay before exploding"
+#define TEXT_DELAY_MOVING      "Delay before moving"
 #define TEXT_BALL_DELAY                "Element generation delay"
 #define TEXT_MOVE_SPEED                "Speed of android moving"
 #define TEXT_CLONE_SPEED       "Speed of android cloning"
@@ -9186,6 +9656,15 @@ static struct
   { EL_EMC_KEY_7,      &level.score[SC_KEY],           TEXT_COLLECTING },
   { EL_EMC_KEY_8,      &level.score[SC_KEY],           TEXT_COLLECTING },
   { EL_DC_KEY_WHITE,   &level.score[SC_KEY],           TEXT_COLLECTING },
+  { EL_MM_KETTLE,      &level.score[SC_EMERALD],       TEXT_COLLECTING },
+  { EL_DF_CELL,                &level.score[SC_EMERALD],       TEXT_COLLECTING },
+  { EL_MM_KEY,         &level.score[SC_KEY],           TEXT_COLLECTING },
+  { EL_MM_LIGHTBALL,   &level.score[SC_ELEM_BONUS],    TEXT_COLLECTING },
+  { EL_MM_PACMAN,      &level.score[SC_PACMAN],        TEXT_SMASHING   },
+  { EL_MM_PACMAN_RIGHT,        &level.score[SC_PACMAN],        TEXT_SMASHING   },
+  { EL_MM_PACMAN_UP,   &level.score[SC_PACMAN],        TEXT_SMASHING   },
+  { EL_MM_PACMAN_LEFT, &level.score[SC_PACMAN],        TEXT_SMASHING   },
+  { EL_MM_PACMAN_DOWN, &level.score[SC_PACMAN],        TEXT_SMASHING   },
   { EL_AMOEBA_WET,     &level.amoeba_speed,            TEXT_AMOEBA_SPEED },
   { EL_AMOEBA_DRY,     &level.amoeba_speed,            TEXT_AMOEBA_SPEED },
   { EL_AMOEBA_FULL,    &level.amoeba_speed,            TEXT_AMOEBA_SPEED },
@@ -9221,10 +9700,11 @@ static struct
   { EL_SPRING,         &level.slurp_score,             TEXT_SLURPING   },
   { EL_EMC_LENSES,     &level.lenses_time,             TEXT_DURATION   },
   { EL_EMC_MAGNIFIER,  &level.magnify_time,            TEXT_DURATION   },
-#if 0
-  /* defined, but currently not used in MM engine */
-  { EL_MM_FUSE_ACTIVE, &level.mm_time_fuse,            TEXT_DURATION   },
-#endif
+  { 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_STEEL_BLOCK, &level.mm_time_block,           TEXT_DELAY_MOVING },
+  { EL_MM_WOODEN_BLOCK,        &level.mm_time_block,           TEXT_DELAY_MOVING },
 
   { -1,                        NULL,                           NULL            }
 };
@@ -9236,6 +9716,7 @@ static boolean checkPropertiesConfig(int element)
   if (IS_GEM(element) ||
       IS_CUSTOM_ELEMENT(element) ||
       IS_GROUP_ELEMENT(element) ||
+      IS_BALLOON_ELEMENT(element) ||
       IS_ENVELOPE(element) ||
       IS_MM_MCDUFFIN(element) ||
       IS_DF_LASER(element) ||
@@ -9256,7 +9737,7 @@ static boolean checkPropertiesConfig(int element)
   return FALSE;
 }
 
-static void SetAutomaticNumberOfGemsNeeded()
+static void SetAutomaticNumberOfGemsNeeded(void)
 {
   int x, y;
 
@@ -9271,17 +9752,50 @@ static void SetAutomaticNumberOfGemsNeeded()
     {
       int element = Feld[x][y];
 
-      if (IS_GEM(element) ||
-         element == EL_MM_KETTLE ||
-         element == EL_DF_CELL)
-       level.gems_needed++;
+      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;
+
+       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;
+      }
     }
   }
 
   ModifyEditorCounterValue(ED_COUNTER_ID_LEVEL_GEMSLIMIT, level.gems_needed);
 }
 
-static void DrawPropertiesConfig()
+static void DrawPropertiesConfig(void)
 {
   boolean draw_footer_line = FALSE;
   int max_num_element_counters = 4;
@@ -9299,7 +9813,7 @@ static void DrawPropertiesConfig()
     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)
@@ -9321,12 +9835,12 @@ static void DrawPropertiesConfig()
       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;
       }
@@ -9341,7 +9855,7 @@ static void DrawPropertiesConfig()
 
   if (HAS_EDITOR_CONTENT(properties_element))
   {
-    /* draw stickybutton gadget */
+    // draw stickybutton gadget
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_STICK_ELEMENT);
 
     if (IS_AMOEBOID(properties_element))
@@ -9367,7 +9881,7 @@ static void DrawPropertiesConfig()
   {
     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)
     {
@@ -9404,6 +9918,7 @@ static void DrawPropertiesConfig()
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_GRAVITY);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER);
 
       MapDrawingArea(ED_DRAWING_ID_START_ELEMENT);
       MapDrawingArea(ED_DRAWING_ID_ARTWORK_ELEMENT);
@@ -9422,13 +9937,13 @@ static void DrawPropertiesConfig()
       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);
 
-      /* draw counter gadgets */
+      // draw counter gadgets
       MapCounterButtons(ED_COUNTER_ID_INVENTORY_SIZE);
 
-      /* draw drawing area gadgets */
+      // draw drawing area gadgets
       DrawPlayerInitialInventoryArea(properties_element);
     }
   }
@@ -9444,12 +9959,13 @@ static void DrawPropertiesConfig()
       (!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 :
-                      HAS_EDITOR_CONTENT(properties_element) ? 1 : 0);
+                              IS_BALLOON_ELEMENT(properties_element) ||
+                              HAS_EDITOR_CONTENT(properties_element) ? 1 : 0);
 
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID);
   }
@@ -9463,6 +9979,10 @@ static void DrawPropertiesConfig()
   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 =
@@ -9471,10 +9991,25 @@ static void DrawPropertiesConfig()
     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))
   {
@@ -9490,11 +10025,11 @@ static void DrawPropertiesConfig()
     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);
 
@@ -9517,55 +10052,55 @@ static void DrawPropertiesConfig()
 
   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();
@@ -9573,35 +10108,35 @@ static void DrawPropertiesConfig()
   }
   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 */
+    // draw drawing area gadgets
     DrawGroupElementArea(properties_element);
 
-    /* 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;
   }
 
-  /* 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];
@@ -9610,7 +10145,7 @@ static void DrawPropertiesConfig()
     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 -
@@ -9619,7 +10154,7 @@ static void DrawPropertiesConfig()
   }
 }
 
-static void DrawPropertiesChangeDrawingAreas()
+static void DrawPropertiesChangeDrawingAreas(void)
 {
   if (IS_CUSTOM_ELEMENT(properties_element))
   {
@@ -9633,42 +10168,42 @@ static void DrawPropertiesChangeDrawingAreas()
   redraw_mask |= REDRAW_FIELD;
 }
 
-static void DrawPropertiesChange()
+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();
 }
 
@@ -9727,7 +10262,7 @@ static void DrawEditorElementName(int x, int y, int font_nr)
   }
 }
 
-static void DrawPropertiesWindow()
+static void DrawPropertiesWindow(void)
 {
   struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
   int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
@@ -9750,7 +10285,7 @@ static void DrawPropertiesWindow()
 
   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;
@@ -9780,7 +10315,7 @@ static void DrawPropertiesWindow()
 
   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);
@@ -9792,11 +10327,11 @@ static void DrawPropertiesWindow()
     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();
 }
 
-static void DrawPaletteWindow()
+static void DrawPaletteWindow(void)
 {
   int i;
 
@@ -9805,7 +10340,7 @@ static void DrawPaletteWindow()
   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]);
@@ -9813,7 +10348,7 @@ static void DrawPaletteWindow()
   MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
 }
 
-static void UpdateCustomElementGraphicGadgets()
+static void UpdateCustomElementGraphicGadgets(void)
 {
   int i;
 
@@ -9822,7 +10357,7 @@ static void UpdateCustomElementGraphicGadgets()
   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];
@@ -9868,7 +10403,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;
@@ -10268,7 +10803,8 @@ 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];
-  unsigned int new_bitmask = (dx + 1) << (dy * 2);
+  int new_element = element;
+  unsigned int new_bitmask = (getDrawModeHiRes() ? (dx + 1) << (dy * 2) : 0x0f);
   boolean draw_masked = FALSE;
 
   if (IS_MM_WALL_EDITOR(element))
@@ -10296,7 +10832,9 @@ static void SetElementSimpleExt(int x, int y, int dx, int dy, int element,
 
   if (IN_ED_FIELD(sx, sy))
   {
-    if (draw_masked)
+    if (IS_MM_WALL(old_element) && new_element == EL_EMPTY)
+      DrawSizedWallParts_MM(sx, sy, EL_EMPTY, ed_tilesize, FALSE, new_bitmask);
+    else if (draw_masked)
       DrawEditorElementThruMask(sx, sy, element);
     else
       DrawEditorElement(sx, sy, element);
@@ -10313,15 +10851,15 @@ 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);
 }
@@ -10354,7 +10892,7 @@ 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_TUBE(old_element))
       direction |= getOpenDirectionFromTube(old_element);
 
@@ -10392,7 +10930,7 @@ 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);
 
@@ -10430,7 +10968,7 @@ 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);
 
@@ -10454,7 +10992,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)
@@ -10473,7 +11011,7 @@ 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);
 
@@ -10510,7 +11048,7 @@ 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);
 
@@ -10547,7 +11085,7 @@ 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++)
     {
@@ -10679,10 +11217,14 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
       { EL_EM_EXIT_CLOSED,             EL_EM_EXIT_OPEN                 },
       { EL_EM_STEEL_EXIT_CLOSED,       EL_EM_STEEL_EXIT_OPEN           },
       { EL_QUICKSAND_FAST_EMPTY,       EL_QUICKSAND_FAST_FULL          },
+      { EL_MM_EXIT_CLOSED,             EL_MM_EXIT_OPEN                 },
+      { EL_MM_FUSE,                    EL_MM_FUSE_ACTIVE               },
+      { EL_MM_LIGHTBULB,               EL_MM_LIGHTBULB_ACTIVE          },
+      { EL_MM_FUEL_EMPTY,              EL_MM_FUEL_FULL                 },
 
       { -1,                            -1                              },
     };
-    static int rotatable_elements[][4] =
+    static int rotatable_elements_4[][4] =
     {
       {
        EL_BUG_UP,
@@ -10690,95 +11232,344 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        EL_BUG_DOWN,
        EL_BUG_LEFT
       },
-
       {
        EL_SPACESHIP_UP,
        EL_SPACESHIP_RIGHT,
        EL_SPACESHIP_DOWN,
        EL_SPACESHIP_LEFT
       },
-
       {
        EL_BD_BUTTERFLY_UP,
        EL_BD_BUTTERFLY_RIGHT,
        EL_BD_BUTTERFLY_DOWN,
        EL_BD_BUTTERFLY_LEFT
       },
-
       {
        EL_BD_FIREFLY_UP,
        EL_BD_FIREFLY_RIGHT,
        EL_BD_FIREFLY_DOWN,
        EL_BD_FIREFLY_LEFT
       },
-
       {
        EL_PACMAN_UP,
        EL_PACMAN_RIGHT,
        EL_PACMAN_DOWN,
        EL_PACMAN_LEFT
       },
-
       {
        EL_YAMYAM_UP,
        EL_YAMYAM_RIGHT,
        EL_YAMYAM_DOWN,
        EL_YAMYAM_LEFT
       },
-
       {
        EL_ARROW_UP,
        EL_ARROW_RIGHT,
        EL_ARROW_DOWN,
        EL_ARROW_LEFT
       },
-
       {
        EL_SP_PORT_UP,
        EL_SP_PORT_RIGHT,
        EL_SP_PORT_DOWN,
        EL_SP_PORT_LEFT
       },
-
       {
        EL_SP_GRAVITY_PORT_UP,
        EL_SP_GRAVITY_PORT_RIGHT,
        EL_SP_GRAVITY_PORT_DOWN,
        EL_SP_GRAVITY_PORT_LEFT
       },
-
       {
        EL_SP_GRAVITY_ON_PORT_UP,
        EL_SP_GRAVITY_ON_PORT_RIGHT,
        EL_SP_GRAVITY_ON_PORT_DOWN,
        EL_SP_GRAVITY_ON_PORT_LEFT
       },
-
       {
        EL_SP_GRAVITY_OFF_PORT_UP,
        EL_SP_GRAVITY_OFF_PORT_RIGHT,
        EL_SP_GRAVITY_OFF_PORT_DOWN,
        EL_SP_GRAVITY_OFF_PORT_LEFT
       },
-
       {
        EL_MOLE_UP,
        EL_MOLE_RIGHT,
        EL_MOLE_DOWN,
        EL_MOLE_LEFT
       },
-
       {
        EL_BALLOON_SWITCH_UP,
        EL_BALLOON_SWITCH_RIGHT,
        EL_BALLOON_SWITCH_DOWN,
        EL_BALLOON_SWITCH_LEFT
       },
+      {
+       EL_MM_MCDUFFIN_UP,
+       EL_MM_MCDUFFIN_RIGHT,
+       EL_MM_MCDUFFIN_DOWN,
+       EL_MM_MCDUFFIN_LEFT
+      },
+      {
+       EL_MM_MIRROR_FIXED_1,
+       EL_MM_MIRROR_FIXED_4,
+       EL_MM_MIRROR_FIXED_3,
+       EL_MM_MIRROR_FIXED_2
+      },
+      {
+       EL_MM_STEEL_GRID_FIXED_1,
+       EL_MM_STEEL_GRID_FIXED_4,
+       EL_MM_STEEL_GRID_FIXED_2,
+       EL_MM_STEEL_GRID_FIXED_3
+      },
+      {
+       EL_MM_WOODEN_GRID_FIXED_1,
+       EL_MM_WOODEN_GRID_FIXED_4,
+       EL_MM_WOODEN_GRID_FIXED_2,
+       EL_MM_WOODEN_GRID_FIXED_3
+      },
+      {
+       EL_MM_POLARIZER_CROSS_1,
+       EL_MM_POLARIZER_CROSS_4,
+       EL_MM_POLARIZER_CROSS_3,
+       EL_MM_POLARIZER_CROSS_2
+      },
+      {
+       EL_MM_PACMAN_UP,
+       EL_MM_PACMAN_RIGHT,
+       EL_MM_PACMAN_DOWN,
+       EL_MM_PACMAN_LEFT
+      },
+      {
+       EL_DF_LASER_UP,
+       EL_DF_LASER_RIGHT,
+       EL_DF_LASER_DOWN,
+       EL_DF_LASER_LEFT
+      },
+      {
+       EL_DF_RECEIVER_UP,
+       EL_DF_RECEIVER_RIGHT,
+       EL_DF_RECEIVER_DOWN,
+       EL_DF_RECEIVER_LEFT
+      },
 
       {
        -1,
+      },
+    };
+    static int rotatable_elements_8[][8] =
+    {
+      {
+       EL_DF_STEEL_GRID_FIXED_1,
+       EL_DF_STEEL_GRID_FIXED_8,
+       EL_DF_STEEL_GRID_FIXED_7,
+       EL_DF_STEEL_GRID_FIXED_6,
+       EL_DF_STEEL_GRID_FIXED_5,
+       EL_DF_STEEL_GRID_FIXED_4,
+       EL_DF_STEEL_GRID_FIXED_3,
+       EL_DF_STEEL_GRID_FIXED_2
+      },
+      {
+       EL_DF_WOODEN_GRID_FIXED_1,
+       EL_DF_WOODEN_GRID_FIXED_8,
+       EL_DF_WOODEN_GRID_FIXED_7,
+       EL_DF_WOODEN_GRID_FIXED_6,
+       EL_DF_WOODEN_GRID_FIXED_5,
+       EL_DF_WOODEN_GRID_FIXED_4,
+       EL_DF_WOODEN_GRID_FIXED_3,
+       EL_DF_WOODEN_GRID_FIXED_2
+      },
+      {
+       EL_DF_STEEL_GRID_ROTATING_1,
+       EL_DF_STEEL_GRID_ROTATING_8,
+       EL_DF_STEEL_GRID_ROTATING_7,
+       EL_DF_STEEL_GRID_ROTATING_6,
+       EL_DF_STEEL_GRID_ROTATING_5,
+       EL_DF_STEEL_GRID_ROTATING_4,
+       EL_DF_STEEL_GRID_ROTATING_3,
+       EL_DF_STEEL_GRID_ROTATING_2
+      },
+      {
+       EL_DF_WOODEN_GRID_ROTATING_1,
+       EL_DF_WOODEN_GRID_ROTATING_8,
+       EL_DF_WOODEN_GRID_ROTATING_7,
+       EL_DF_WOODEN_GRID_ROTATING_6,
+       EL_DF_WOODEN_GRID_ROTATING_5,
+       EL_DF_WOODEN_GRID_ROTATING_4,
+       EL_DF_WOODEN_GRID_ROTATING_3,
+       EL_DF_WOODEN_GRID_ROTATING_2
+      },
+
+      {
        -1,
-       -1,
+      },
+    };
+    static int rotatable_elements_16[][16] =
+    {
+      {
+       EL_MM_MIRROR_1,
+       EL_MM_MIRROR_16,
+       EL_MM_MIRROR_15,
+       EL_MM_MIRROR_14,
+       EL_MM_MIRROR_13,
+       EL_MM_MIRROR_12,
+       EL_MM_MIRROR_11,
+       EL_MM_MIRROR_10,
+       EL_MM_MIRROR_9,
+       EL_MM_MIRROR_8,
+       EL_MM_MIRROR_7,
+       EL_MM_MIRROR_6,
+       EL_MM_MIRROR_5,
+       EL_MM_MIRROR_4,
+       EL_MM_MIRROR_3,
+       EL_MM_MIRROR_2
+      },
+      {
+       EL_MM_TELEPORTER_5,
+       EL_MM_TELEPORTER_4,
+       EL_MM_TELEPORTER_3,
+       EL_MM_TELEPORTER_2,
+       EL_MM_TELEPORTER_1,
+       EL_MM_TELEPORTER_16,
+       EL_MM_TELEPORTER_15,
+       EL_MM_TELEPORTER_14,
+       EL_MM_TELEPORTER_13,
+       EL_MM_TELEPORTER_12,
+       EL_MM_TELEPORTER_11,
+       EL_MM_TELEPORTER_10,
+       EL_MM_TELEPORTER_9,
+       EL_MM_TELEPORTER_8,
+       EL_MM_TELEPORTER_7,
+       EL_MM_TELEPORTER_6
+      },
+      {
+       EL_MM_TELEPORTER_RED_5,
+       EL_MM_TELEPORTER_RED_4,
+       EL_MM_TELEPORTER_RED_3,
+       EL_MM_TELEPORTER_RED_2,
+       EL_MM_TELEPORTER_RED_1,
+       EL_MM_TELEPORTER_RED_16,
+       EL_MM_TELEPORTER_RED_15,
+       EL_MM_TELEPORTER_RED_14,
+       EL_MM_TELEPORTER_RED_13,
+       EL_MM_TELEPORTER_RED_12,
+       EL_MM_TELEPORTER_RED_11,
+       EL_MM_TELEPORTER_RED_10,
+       EL_MM_TELEPORTER_RED_9,
+       EL_MM_TELEPORTER_RED_8,
+       EL_MM_TELEPORTER_RED_7,
+       EL_MM_TELEPORTER_RED_6
+      },
+      {
+       EL_MM_TELEPORTER_YELLOW_5,
+       EL_MM_TELEPORTER_YELLOW_4,
+       EL_MM_TELEPORTER_YELLOW_3,
+       EL_MM_TELEPORTER_YELLOW_2,
+       EL_MM_TELEPORTER_YELLOW_1,
+       EL_MM_TELEPORTER_YELLOW_16,
+       EL_MM_TELEPORTER_YELLOW_15,
+       EL_MM_TELEPORTER_YELLOW_14,
+       EL_MM_TELEPORTER_YELLOW_13,
+       EL_MM_TELEPORTER_YELLOW_12,
+       EL_MM_TELEPORTER_YELLOW_11,
+       EL_MM_TELEPORTER_YELLOW_10,
+       EL_MM_TELEPORTER_YELLOW_9,
+       EL_MM_TELEPORTER_YELLOW_8,
+       EL_MM_TELEPORTER_YELLOW_7,
+       EL_MM_TELEPORTER_YELLOW_6
+      },
+      {
+       EL_MM_TELEPORTER_GREEN_5,
+       EL_MM_TELEPORTER_GREEN_4,
+       EL_MM_TELEPORTER_GREEN_3,
+       EL_MM_TELEPORTER_GREEN_2,
+       EL_MM_TELEPORTER_GREEN_1,
+       EL_MM_TELEPORTER_GREEN_16,
+       EL_MM_TELEPORTER_GREEN_15,
+       EL_MM_TELEPORTER_GREEN_14,
+       EL_MM_TELEPORTER_GREEN_13,
+       EL_MM_TELEPORTER_GREEN_12,
+       EL_MM_TELEPORTER_GREEN_11,
+       EL_MM_TELEPORTER_GREEN_10,
+       EL_MM_TELEPORTER_GREEN_9,
+       EL_MM_TELEPORTER_GREEN_8,
+       EL_MM_TELEPORTER_GREEN_7,
+       EL_MM_TELEPORTER_GREEN_6
+      },
+      {
+       EL_MM_TELEPORTER_BLUE_5,
+       EL_MM_TELEPORTER_BLUE_4,
+       EL_MM_TELEPORTER_BLUE_3,
+       EL_MM_TELEPORTER_BLUE_2,
+       EL_MM_TELEPORTER_BLUE_1,
+       EL_MM_TELEPORTER_BLUE_16,
+       EL_MM_TELEPORTER_BLUE_15,
+       EL_MM_TELEPORTER_BLUE_14,
+       EL_MM_TELEPORTER_BLUE_13,
+       EL_MM_TELEPORTER_BLUE_12,
+       EL_MM_TELEPORTER_BLUE_11,
+       EL_MM_TELEPORTER_BLUE_10,
+       EL_MM_TELEPORTER_BLUE_9,
+       EL_MM_TELEPORTER_BLUE_8,
+       EL_MM_TELEPORTER_BLUE_7,
+       EL_MM_TELEPORTER_BLUE_6
+      },
+      {
+       EL_MM_POLARIZER_1,
+       EL_MM_POLARIZER_16,
+       EL_MM_POLARIZER_15,
+       EL_MM_POLARIZER_14,
+       EL_MM_POLARIZER_13,
+       EL_MM_POLARIZER_12,
+       EL_MM_POLARIZER_11,
+       EL_MM_POLARIZER_10,
+       EL_MM_POLARIZER_9,
+       EL_MM_POLARIZER_8,
+       EL_MM_POLARIZER_7,
+       EL_MM_POLARIZER_6,
+       EL_MM_POLARIZER_5,
+       EL_MM_POLARIZER_4,
+       EL_MM_POLARIZER_3,
+       EL_MM_POLARIZER_2
+      },
+      {
+       EL_DF_MIRROR_1,
+       EL_DF_MIRROR_16,
+       EL_DF_MIRROR_15,
+       EL_DF_MIRROR_14,
+       EL_DF_MIRROR_13,
+       EL_DF_MIRROR_12,
+       EL_DF_MIRROR_11,
+       EL_DF_MIRROR_10,
+       EL_DF_MIRROR_9,
+       EL_DF_MIRROR_8,
+       EL_DF_MIRROR_7,
+       EL_DF_MIRROR_6,
+       EL_DF_MIRROR_5,
+       EL_DF_MIRROR_4,
+       EL_DF_MIRROR_3,
+       EL_DF_MIRROR_2
+      },
+      {
+       EL_DF_MIRROR_ROTATING_1,
+       EL_DF_MIRROR_ROTATING_16,
+       EL_DF_MIRROR_ROTATING_15,
+       EL_DF_MIRROR_ROTATING_14,
+       EL_DF_MIRROR_ROTATING_13,
+       EL_DF_MIRROR_ROTATING_12,
+       EL_DF_MIRROR_ROTATING_11,
+       EL_DF_MIRROR_ROTATING_10,
+       EL_DF_MIRROR_ROTATING_9,
+       EL_DF_MIRROR_ROTATING_8,
+       EL_DF_MIRROR_ROTATING_7,
+       EL_DF_MIRROR_ROTATING_6,
+       EL_DF_MIRROR_ROTATING_5,
+       EL_DF_MIRROR_ROTATING_4,
+       EL_DF_MIRROR_ROTATING_3,
+       EL_DF_MIRROR_ROTATING_2
+      },
+
+      {
        -1,
       },
     };
@@ -10793,19 +11584,61 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        new_element = (old_element == element1 ? element2 : element1);
     }
 
-    for (i = 0; rotatable_elements[i][0] != -1; i++)
+    for (i = 0; rotatable_elements_4[i][0] != -1; i++)
     {
       for (j = 0; j < 4; j++)
       {
-       int element = rotatable_elements[i][j];
+       int element = rotatable_elements_4[i][j];
 
        if (old_element == element)
-         new_element = (button == 1 ? rotatable_elements[i][(j + 3) % 4] :
-                        button == 2 ? rotatable_elements[i][0]           :
-                        button == 3 ? rotatable_elements[i][(j + 1) % 4] :
+         new_element = (button == 1 ? rotatable_elements_4[i][(j + 3) % 4] :
+                        button == 2 ? rotatable_elements_4[i][0]           :
+                        button == 3 ? rotatable_elements_4[i][(j + 1) % 4] :
                         old_element);
       }
     }
+
+    for (i = 0; rotatable_elements_8[i][0] != -1; i++)
+    {
+      for (j = 0; j < 8; j++)
+      {
+       int element = rotatable_elements_8[i][j];
+
+       if (old_element == element)
+         new_element = (button == 1 ? rotatable_elements_8[i][(j + 7) % 8] :
+                        button == 2 ? rotatable_elements_8[i][0]           :
+                        button == 3 ? rotatable_elements_8[i][(j + 1) % 8] :
+                        old_element);
+      }
+    }
+
+    for (i = 0; rotatable_elements_16[i][0] != -1; i++)
+    {
+      for (j = 0; j < 16; j++)
+      {
+       int element = rotatable_elements_16[i][j];
+
+       if (old_element == element)
+         new_element = (button == 1 ? rotatable_elements_16[i][(j + 15) % 16] :
+                        button == 2 ? rotatable_elements_16[i][0]             :
+                        button == 3 ? rotatable_elements_16[i][(j + 1)  % 16] :
+                        old_element);
+      }
+    }
+
+    if (old_element != new_element)
+    {
+      int max_infotext_len = getMaxInfoTextLength();
+      char infotext[MAX_OUTPUT_LINESIZE + 1];
+
+      strncpy(infotext, getElementInfoText(new_element), max_infotext_len);
+      infotext[max_infotext_len] = '\0';
+
+      ClearEditorGadgetInfoText();
+
+      DrawTextS(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, INFOTEXT_FONT,
+               infotext);
+    }
   }
 
   SetElementSimple(x, y, new_element, change_level);
@@ -10814,7 +11647,7 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
   last_y = y;
 }
 
-static void ResetIntelliDraw()
+static void ResetIntelliDraw(void)
 {
   int x, y;
 
@@ -10825,6 +11658,40 @@ static void ResetIntelliDraw()
   SetElementIntelliDraw(-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 void SetDrawModeHiRes(int element)
+{
+  draw_mode_hires =
+    (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+     isHiresDrawElement(element));
+}
+
+static boolean getDrawModeHiRes(void)
+{
+  return draw_mode_hires;
+}
+
+static int getLoResScreenPos(int pos)
+{
+  return (getDrawModeHiRes() ? pos / 2 : pos);
+}
+
+static int getLoResScreenMod(int pos)
+{
+  return (getDrawModeHiRes() ? pos % 2 : 0);
+}
+
 static void SetElementExt(int x, int y, int dx, int dy, int element,
                          boolean change_level, int button)
 {
@@ -10849,10 +11716,10 @@ static void SetElementButton(int x, int y, int dx, int dy, int element,
 
 static void SetElementHiRes(int sx2, int sy2, int element, boolean change_level)
 {
-  int lx = sx2 / 2 + level_xpos;
-  int ly = sy2 / 2 + level_ypos;
-  int dx = sx2 % 2;
-  int dy = sy2 % 2;
+  int lx = getLoResScreenPos(sx2) + level_xpos;
+  int ly = getLoResScreenPos(sy2) + level_ypos;
+  int dx = getLoResScreenMod(sx2);
+  int dy = getLoResScreenMod(sy2);
 
   SetElementExt(lx, ly, dx, dy, element, change_level, -1);
 }
@@ -10887,9 +11754,9 @@ static int getLevelElementHiRes(int lx2, int ly2)
   return element;
 }
 
-static void DrawLineElement(int sx2, int sy2, int element, boolean change_level)
+static void DrawLineElement(int x, int y, int element, boolean change_level)
 {
-  SetElementHiRes(sx2, sy2, element, change_level);
+  SetElementHiRes(x, y, element, change_level);
 }
 
 static void DrawLine(int from_x, int from_y, int to_x, int to_y,
@@ -10901,19 +11768,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;
 
@@ -10925,7 +11792,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;
 
@@ -10972,36 +11839,40 @@ 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++)
   {
-    int sx2, sy2, lx, ly;
+    int sx, sy, sx2, sy2, lx, ly;
 
     y = (int)(sqrt((float)(radius * radius - x * x)) + 0.5);
 
     sx2 = from_x + x * (from_x < to_x2 ? +1 : -1);
     sy2 = from_y + y * (from_y < to_y2 ? +1 : -1);
-    lx = sx2 / 2 + level_xpos;
-    ly = sy2 / 2 + level_ypos;
+    sx = getLoResScreenPos(sx2);
+    sy = getLoResScreenPos(sy2);
+    lx = sx + level_xpos;
+    ly = sy + level_ypos;
 
-    if (IN_ED_FIELD(sx2 / 2, sy2 / 2) && IN_LEV_FIELD(lx, ly))
+    if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
       DrawLineElement(sx2, sy2, element, change_level);
   }
 
   for (y = 0; y <= radius; y++)
   {
-    int sx2, sy2, lx, ly;
+    int sx, sy, sx2, sy2, lx, ly;
 
     x = (int)(sqrt((float)(radius * radius - y * y)) + 0.5);
 
     sx2 = from_x + x * (from_x < to_x2 ? +1 : -1);
     sy2 = from_y + y * (from_y < to_y2 ? +1 : -1);
-    lx = sx2 / 2 + level_xpos;
-    ly = sy2 / 2 + level_ypos;
+    sx = getLoResScreenPos(sx2);
+    sy = getLoResScreenPos(sy2);
+    lx = sx + level_xpos;
+    ly = sy + level_ypos;
 
-    if (IN_ED_FIELD(sx2 / 2, sy2 / 2) && IN_LEV_FIELD(lx, ly))
+    if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
       DrawLineElement(sx2, sy2, element, change_level);
   }
 }
@@ -11063,7 +11934,7 @@ static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
 static void DrawAreaBox(int from_x, int from_y, int to_x, int to_y,
                        int element, boolean change_level)
 {
-  DrawBox(from_x * 2, from_y * 2, to_x * 2, to_y * 2, element, change_level);
+  DrawBox(from_x, from_y, to_x, to_y, element, change_level);
 }
 
 static void SelectArea(int from_x, int from_y, int to_x, int to_y,
@@ -11075,17 +11946,28 @@ 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 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 void DrawBrushElement(int sx, int sy, int element, boolean change_level)
 {
-  DrawLineElement(sx * 2, sy * 2, element, change_level);
+  DrawLineElement(sx, sy, element, change_level);
 }
 
 static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
@@ -11094,26 +11976,31 @@ 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)
-    {
-      Error(ERR_WARN, "no brush selected");
-
+    if (edit_mode != ED_MODE_DRAWING)
       return;
-    }
 
-    for (y = 0; y < brush_height; y++)
+    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);
+
+    for (y = 0; y < height; y++)
     {
-      for (x = 0; x < brush_width; x++)
+      for (x = 0; x < width; x++)
       {
-       int element = brush_buffer[x][y];
+       int element = (draw_with_brush ? brush_buffer[x][y] : Feld[x][y]);
        int element_mapped = element;
+       char *prefix = (mode == CB_DUMP_BRUSH ||
+                       mode == CB_BRUSH_TO_CLIPBOARD ? "`" : "¸");
 
        if (IS_CUSTOM_ELEMENT(element))
          element_mapped = EL_CUSTOM_START;
@@ -11122,13 +12009,176 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
        else if (element >= NUM_FILE_ELEMENTS)
          element_mapped = EL_UNKNOWN;
 
-       // dump brush as level sketch text for the R'n'D forum:
+       // copy brush to level sketch text buffer 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);
+       snprintf(part, MAX_CB_PART_SIZE + 1, "%s%03d", prefix, element_mapped);
+       strcat(text, part);
+      }
+
+      strcat(text, "\n");
+    }
+
+    if (mode == CB_BRUSH_TO_CLIPBOARD ||
+       mode == CB_BRUSH_TO_CLIPBOARD_SMALL)
+      SDL_SetClipboardText(text);
+    else
+      printf("%s", text);
+
+    return;
+  }
+
+  if (mode == CB_CLIPBOARD_TO_BRUSH)
+  {
+    if (edit_mode != ED_MODE_DRAWING)
+      return;
+
+    if (!SDL_HasClipboardText())
+    {
+      Request("Clipboard is empty!", REQ_CONFIRM);
+
+      return;
+    }
+
+    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 stop = FALSE;
+
+    while (*ptr && !stop)
+    {
+      boolean prefix_found = 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;
+       }
+      }
+
+      // continue with next character if prefix not found
+      if (!prefix_found)
+      {
+       ptr++;          // !!! FIX THIS for real UTF-8 handling !!!
+
+       continue;
       }
 
-      printf("\n");
+      // continue with next character if prefix not found
+      if (strlen(ptr) < 3)
+       break;
+
+      if (ptr[0] >= '0' && ptr[0] <= '9' &&
+         ptr[1] >= '0' && ptr[1] <= '9' &&
+         ptr[2] >= '0' && ptr[2] <= '9')
+      {
+       int element = ((ptr[0] - '0') * 100 +
+                      (ptr[1] - '0') * 10 +
+                      (ptr[2] - '0'));
+
+       ptr += 3;
+
+       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 || *ptr == '\n')
+       {
+         x = 0;
+         y++;
+
+         if (y >= MAX_LEV_FIELDY)
+           stop = TRUE;
+       }
+      }
+    }
+
+    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++)
+         Feld[x][y] = brush_buffer[x][y];
+
+      lev_fieldx = level.fieldx = brush_width;
+      lev_fieldy = level.fieldy = brush_height;
+
+      SetBorderElement();
+
+      DrawEditModeWindow();
+      CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
     }
 
     return;
@@ -11186,6 +12236,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;
     }
 
@@ -11223,8 +12274,15 @@ 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;
   }
+
+  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,
@@ -11243,21 +12301,41 @@ static void CopyBrushToCursor(int x, int y)
   CopyBrushExt(x, y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
 }
 
-static void DeleteBrushFromCursor()
+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);
 }
 
-void DumpBrush()
+void DumpBrush(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH);
 }
 
-void DumpBrush_Small()
+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);
+}
+
 static void FloodFill(int from_x, int from_y, int fill_element)
 {
   FloodFillLevel(from_x, from_y, fill_element, Feld, lev_fieldx, lev_fieldy);
@@ -11285,7 +12363,7 @@ static void FloodFillWall_MM(int from_sx2, int from_sy2, int fill_element)
        SetLevelElementHiRes(x, y, FillFeld[x][y]);
 }
 
-/* values for DrawLevelText() modes */
+// values for DrawLevelText() modes
 #define TEXT_INIT              0
 #define TEXT_SETCURSOR         1
 #define TEXT_WRITECHAR         2
@@ -11303,7 +12381,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
   int letter_element = EL_CHAR_ASCII0 + letter;
   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)
@@ -11348,6 +12426,8 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
     case TEXT_SETCURSOR:
       DrawEditorElement(last_sx, last_sy, Feld[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;
@@ -11383,7 +12463,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
       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);
@@ -11392,6 +12472,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
     case TEXT_END:
       CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       DrawEditorElement(sx, sy, Feld[lx][ly]);
+      StopTextInput();
       typing = FALSE;
       break;
 
@@ -11454,21 +12535,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];
 
-  /* check if drawing operation forces change of border style */
+  // check if drawing operation forces change of border style
   CheckLevelBorderElement(TRUE);
 
   level.changed = TRUE;
@@ -11483,7 +12564,7 @@ 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] =
@@ -11495,12 +12576,12 @@ static void RandomPlacement(int new_element)
       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++)
@@ -11515,7 +12596,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;
@@ -11529,7 +12610,7 @@ static void RandomPlacement(int new_element)
   CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 }
 
-void WrapLevel(int dx, int dy)
+static void WrapLevel(int dx, int dy)
 {
   int wrap_dx = lev_fieldx - dx;
   int wrap_dy = lev_fieldy - dy;
@@ -11548,6 +12629,18 @@ void WrapLevel(int dx, int dy)
   CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
 }
 
+static void CopyLevelTemplateToUserLevelSet(char *levelset_subdir)
+{
+  char *template_filename_old = getLocalLevelTemplateFilename();
+  char *template_filename_new =
+    getPath2(getUserLevelDir(levelset_subdir), LEVELTEMPLATE_FILENAME);
+
+  if (copyFile(template_filename_old, template_filename_new) != 0)
+    Request("Cannot copy level template!", REQ_CONFIRM);
+
+  free(template_filename_new);
+}
+
 static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
   static boolean started_inside_drawing_area = FALSE;
@@ -11579,38 +12672,38 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   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 */
+    // 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)
   {
-    sx2 = sx * 2;
     dx = (sx2 / 2 < sx ? 0 : 1);
+    sx2 = sx * 2 + dx;
   }
   if (sy2 / 2 < sy || sy2 / 2 > sy)
   {
-    sy2 = sy * 2;
     dy = (sy2 / 2 < sy ? 0 : 1);
+    sy2 = sy * 2 + dy;
   }
 
   if (button_release_event)
@@ -11622,9 +12715,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   }
   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) ? Feld[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;
   }
@@ -11646,15 +12743,15 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   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;
@@ -11667,6 +12764,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       ResetIntelliDraw();
   }
 
+  SetDrawModeHiRes(-1);                // reset to normal draw mode
+
   switch (actual_drawing_function)
   {
     case GADGET_ID_SINGLE_ITEMS:
@@ -11690,9 +12789,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        }
        else
        {
+         SetDrawModeHiRes(new_element);
+
          if (new_element == EL_PLAYER_1)
          {
-           /* 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)
@@ -11728,7 +12829,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        {
          UpdateCustomElementGraphicGadgets();
 
-         FrameCounter = 0;     /* restart animation frame counter */
+         FrameCounter = 0;     // restart animation frame counter
        }
       }
       break;
@@ -11743,8 +12844,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 
        if (button)
        {
-         sx = sx2;
-         sy = sy2;
+         SetDrawModeHiRes(new_element);
+
+         if (getDrawModeHiRes())
+         {
+           sx = sx2;
+           sy = sy2;
+         }
 
          if (!button_press_event)
            DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE);
@@ -11759,9 +12865,14 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
     case GADGET_ID_ARC:
     case GADGET_ID_RECTANGLE:
     case GADGET_ID_FILLED_BOX:
-      sx = sx2;
-      sy = sy2;
-      /* FALLTHROUGH */
+      SetDrawModeHiRes(new_element);
+
+      if (getDrawModeHiRes())
+      {
+       sx = sx2;
+       sy = sy2;
+      }
+      // FALLTHROUGH
     case GADGET_ID_GRAB_BRUSH:
     case GADGET_ID_TEXT:
       {
@@ -11781,7 +12892,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)
@@ -11812,7 +12923,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;
@@ -11851,9 +12962,10 @@ 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 ||
       actual_drawing_function == GADGET_ID_PICK_ELEMENT)
     return;
 
@@ -11895,6 +13007,8 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
   if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
   {
+    int last_game_engine_type = level.game_engine_type;
+
     LoadLevel(level_nr);
     LoadScore(level_nr);
 
@@ -11905,6 +13019,13 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
     ResetUndoBuffer();
     DrawEditModeWindow();
 
+    if (level.game_engine_type != last_game_engine_type)
+    {
+      // update element selection list
+      ReinitializeElementList();
+      ModifyEditorElementList();
+    }
+
     return;
   }
 
@@ -11941,7 +13062,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;
@@ -11956,9 +13077,11 @@ 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 */
-  if (counter_id >= ED_COUNTER_ID_EDITOR_FIRST &&
-      counter_id <= ED_COUNTER_ID_EDITOR_LAST)
+  // 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 &&
+       counter_id <= ED_COUNTER_ID_EDITOR_LAST))
     return;
 
   level.changed = TRUE;
@@ -11974,9 +13097,14 @@ 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
+  if (type_id >= ED_TEXTINPUT_ID_LEVELSET_FIRST &&
+      type_id <= ED_TEXTINPUT_ID_LEVELSET_LAST)
+    return;
+
   level.changed = TRUE;
 }
 
@@ -11999,7 +13127,11 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
 
   *selectbox_info[type_id].value = value_new;
 
-  if (type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE)
+  if (type_id == ED_SELECTBOX_ID_LEVELSET_SAVE_MODE)
+  {
+    DrawLevelInfoWindow();
+  }
+  else if (type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE)
   {
     element_info[properties_element].current_change_page = gi->selectbox.index;
 
@@ -12013,7 +13145,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();
 
@@ -12021,15 +13153,20 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
     }
 
     CopyElementPropertiesToGame(properties_element);
-
-    level.changed = TRUE;
   }
   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
+  if (type_id == ED_SELECTBOX_ID_LEVELSET_SAVE_MODE ||
+      type_id == ED_SELECTBOX_ID_SELECT_CHANGE_PAGE)
+    return;
+
+  level.changed = TRUE;
 }
 
 static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
@@ -12056,10 +13193,10 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   {
     boolean new_template = !fileExists(getLocalLevelTemplateFilename());
 
-    /* backup original "level.field" (needed to track playfield changes) */
+    // backup original "level.field" (needed to track playfield changes)
     CopyPlayfield(level.field, FieldBackup);
 
-    /* "SaveLevelTemplate()" uses "level.field", so copy editor playfield */
+    // "SaveLevelTemplate()" uses "level.field", so copy editor playfield
     CopyPlayfield(Feld, level.field);
 
     if (new_template ||
@@ -12069,21 +13206,87 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
     if (new_template)
       Request("Template saved!", REQ_CONFIRM);
 
-    /* restore original "level.field" (needed to track playfield changes) */
+    // restore original "level.field" (needed to track playfield changes)
     CopyPlayfield(FieldBackup, level.field);
   }
+  else if (type_id == ED_TEXTBUTTON_ID_SAVE_LEVELSET)
+  {
+    char *levelset_subdir = getLevelSubdirFromSaveMode(levelset_save_mode);
+
+    if (levelset_save_mode == LEVELSET_SAVE_MODE_UPDATE &&
+       leveldir_current->readonly)
+    {
+      Request("This level set is read only!", REQ_CONFIRM);
+
+      return;
+    }
+
+    if (strEqual(levelset_name, ""))
+    {
+      Request("Please enter level set title!", REQ_CONFIRM);
+
+      return;
+    }
+
+    if (strEqual(levelset_author, ""))
+    {
+      Request("Please enter level set author!", REQ_CONFIRM);
+
+      return;
+    }
+
+    if (levelset_save_mode == LEVELSET_SAVE_MODE_UPDATE)
+    {
+      if (UpdateUserLevelSet(levelset_subdir,
+                            levelset_name,
+                            levelset_author,
+                            levelset_num_levels))
+      {
+       Request("Level set updated!", REQ_CONFIRM);
+      }
+      else
+      {
+       Request("Updating level set failed!", REQ_CONFIRM);
+      }
+    }
+    else if (levelset_save_mode == LEVELSET_SAVE_MODE_CREATE)
+    {
+      if (level.changed && !Request("Level has changed! Discard changes?",
+                                    REQ_ASK))
+       return;
+
+      if (CreateUserLevelSet(levelset_subdir,
+                            levelset_name,
+                            levelset_author,
+                            levelset_num_levels,
+                            levelset_use_levelset_artwork))
+      {
+       if (levelset_copy_level_template)
+         CopyLevelTemplateToUserLevelSet(levelset_subdir);
+
+       Request("New level set created!", REQ_CONFIRM);
+
+       AddUserLevelSetToLevelInfo(levelset_subdir);
+       ChangeEditorToLevelSet(levelset_subdir);
+      }
+      else
+      {
+       Request("Creating new level set failed!", REQ_CONFIRM);
+      }
+    }
+  }
   else if (type_id == ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE &&
           custom_element.num_change_pages < MAX_CHANGE_PAGES)
   {
     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];
 
@@ -12098,11 +13301,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];
 
@@ -12147,7 +13350,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;
 
@@ -12168,7 +13371,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;
@@ -12204,7 +13407,7 @@ 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 or group elements have been changed
     for (i = 0; i < NUM_FILE_ELEMENTS; i++)
       if ((IS_CUSTOM_ELEMENT(i) || IS_GROUP_ELEMENT(i)) &&
          element_info[i].modified_settings)
@@ -12280,9 +13483,12 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
     SetAutomaticNumberOfGemsNeeded();
   }
 
-  /* do not mark level as modified for certain non-level-changing gadgets */
-  if ((type_id >= ED_CHECKBUTTON_ID_EDITOR_FIRST &&
-       type_id <= ED_CHECKBUTTON_ID_EDITOR_LAST) ||
+  // 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 &&
+       type_id <= ED_CHECKBUTTON_ID_EDITOR_LAST &&
+       type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2) ||
       type_id == ED_CHECKBUTTON_ID_STICK_ELEMENT)
     return;
 
@@ -12313,11 +13519,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)
   {
@@ -12530,22 +13736,25 @@ static void HandleControlButtons(struct GadgetInfo *gi)
     case GADGET_ID_ZOOM:
       // zoom level editor tile size in or out (or reset to default size)
       ed_tilesize = (button == 1 ? ed_tilesize * 2 :
-                    button == 2 ? DEFAULT_EDITOR_TILESIZE :
+                    button == 2 ? ed_tilesize_default :
                     button == 3 ? ed_tilesize / 2 : ed_tilesize);
 
       // limit zoom level by upper and lower bound
       ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);
 
-      InitZoomLevelSettings();
+      InitZoomLevelSettings(ed_tilesize);
 
       if (edit_mode == ED_MODE_DRAWING)
       {
        DrawDrawingWindow();
 
-       /* redraw zoom gadget info text */
+       // redraw zoom gadget info text
        PrintEditorGadgetInfoText(level_editor_gadget[id]);
       }
 
+      // save current editor zoom tilesize
+      SaveSetup_AutoSetup();
+
       break;
 
     case GADGET_ID_CUSTOM_COPY_FROM:
@@ -12589,7 +13798,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;
@@ -12599,7 +13808,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       else
       {
-       /* redo */
+       // redo
 
        undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
 
@@ -12611,7 +13820,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        for (y = 0; y < lev_fieldy; y++)
          Feld[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);
@@ -12635,8 +13844,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       if (edit_mode != ED_MODE_DRAWING)
        ChangeEditModeWindow(ED_MODE_DRAWING);
 
-      for (x = 0; x < MAX_LEV_FIELDX; x++) 
-       for (y = 0; y < MAX_LEV_FIELDY; y++) 
+      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);
 
       CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
@@ -12646,8 +13855,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;
@@ -12688,7 +13897,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;
 
@@ -12709,7 +13918,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;
@@ -12721,7 +13930,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:
@@ -12745,14 +13954,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;
@@ -12776,7 +13985,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;
 
@@ -12885,18 +14094,18 @@ void HandleLevelEditorKeyInput(Key key)
       case KSYM_Insert:
       case KSYM_Delete:
 
-       /* this is needed to prevent interference with running "True X-Mouse" */
+       // this is needed to prevent interference with running "True X-Mouse"
        if (GetKeyModStateFromEvents() & KMOD_Control)
          break;
 
-       /* check for last or next editor cascade block in element list */
+       // 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) */
+         // jump to next cascade block (or to start of element list)
          if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
            new_element_shift = i;
        }
@@ -12932,7 +14141,7 @@ void HandleLevelEditorKeyInput(Key key)
        {
          HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
        }
-       else            /* should never happen */
+       else            // should never happen
        {
          ChangeEditModeWindow(ED_MODE_DRAWING);
        }
@@ -12974,7 +14183,7 @@ void HandleLevelEditorKeyInput(Key key)
   }
 }
 
-void HandleLevelEditorIdle()
+void HandleLevelEditorIdle(void)
 {
   int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
   int x = editor.settings.element_graphic.x + element_border;
@@ -13001,10 +14210,10 @@ void HandleLevelEditorIdle()
 
   redraw_mask |= REDRAW_FIELD;
 
-  FrameCounter++;      /* increase animation frame counter */
+  FrameCounter++;      // increase animation frame counter
 }
 
-void ClearEditorGadgetInfoText()
+static void ClearEditorGadgetInfoText(void)
 {
   DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
@@ -13061,7 +14270,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();
 
@@ -13085,9 +14294,9 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
   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;
 
@@ -13096,7 +14305,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);
 
@@ -13107,22 +14316,22 @@ 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 (button_status)       /* if (gi->state == GD_BUTTON_PRESSED) */
+      if (button_status)       // if (gi->state == GD_BUTTON_PRESSED)
       {
        if (gi->event.type == GD_EVENT_PRESSED)
        {
@@ -13180,7 +14389,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
        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))
@@ -13188,6 +14397,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)
   {
@@ -13233,9 +14445,13 @@ 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
+    if (useEditorDoorAnimation())
+      CloseDoor(DOOR_CLOSE_1 | DOOR_FORCE_ANIM);
+
     // close editor doors if viewport definition is the same as in main menu
     if (vp_door_1->x      == DX     &&
        vp_door_1->y      == DY     &&