fixed name of element 'beamer' to 'teleporter'
[rocksndiamonds.git] / src / editor.c
index 375b942b03c6fc36a20a4749499f1f98d91a47ba..fba668d1ccc2eded15fc8841fe96f0f184f92af9 100644 (file)
 */
 
 /* values for the control window */
-#define ED_CTRL1_BUTTONS_HORIZ         4
+#define ED_CTRL1_BUTTONS_HORIZ         4       /* toolbox */
 #define ED_CTRL1_BUTTONS_VERT          4
-#define ED_CTRL2_BUTTONS_HORIZ         3
+#define ED_CTRL2_BUTTONS_HORIZ         3       /* level */
 #define ED_CTRL2_BUTTONS_VERT          2
-#define ED_CTRL3_BUTTONS_HORIZ         3
+#define ED_CTRL3_BUTTONS_HORIZ         3       /* CE and GE */
 #define ED_CTRL3_BUTTONS_VERT          1
-#define ED_CTRL4_BUTTONS_HORIZ         2
+#define ED_CTRL4_BUTTONS_HORIZ         2       /* CE and GE */
 #define ED_CTRL4_BUTTONS_VERT          1
-#define ED_CTRL5_BUTTONS_HORIZ         1
+#define ED_CTRL5_BUTTONS_HORIZ         1       /* properties */
 #define ED_CTRL5_BUTTONS_VERT          1
+#define ED_CTRL6_BUTTONS_HORIZ         3       /* properties */
+#define ED_CTRL6_BUTTONS_VERT          1
+#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_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
 #define ED_NUM_CTRL3_BUTTONS   (ED_CTRL3_BUTTONS_HORIZ * ED_CTRL3_BUTTONS_VERT)
 #define ED_NUM_CTRL4_BUTTONS   (ED_CTRL4_BUTTONS_HORIZ * ED_CTRL4_BUTTONS_VERT)
 #define ED_NUM_CTRL5_BUTTONS   (ED_CTRL5_BUTTONS_HORIZ * ED_CTRL5_BUTTONS_VERT)
+#define ED_NUM_CTRL6_BUTTONS   (ED_CTRL6_BUTTONS_HORIZ * ED_CTRL6_BUTTONS_VERT)
+#define ED_NUM_CTRL7_BUTTONS   (ED_CTRL7_BUTTONS_HORIZ * ED_CTRL7_BUTTONS_VERT)
 #define ED_NUM_CTRL1_2_BUTTONS (ED_NUM_CTRL1_BUTTONS   + ED_NUM_CTRL2_BUTTONS)
 #define ED_NUM_CTRL1_3_BUTTONS (ED_NUM_CTRL1_2_BUTTONS + ED_NUM_CTRL3_BUTTONS)
 #define ED_NUM_CTRL1_4_BUTTONS (ED_NUM_CTRL1_3_BUTTONS + ED_NUM_CTRL4_BUTTONS)
-#define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_4_BUTTONS + ED_NUM_CTRL5_BUTTONS)
+#define ED_NUM_CTRL1_5_BUTTONS (ED_NUM_CTRL1_4_BUTTONS + ED_NUM_CTRL5_BUTTONS)
+#define ED_NUM_CTRL1_6_BUTTONS (ED_NUM_CTRL1_5_BUTTONS + ED_NUM_CTRL6_BUTTONS)
+#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 */
 #define ED_ELEMENTLIST_XPOS            (editor.palette.x)
                                         ED_ELEMENTLIST_BUTTONS_VERT)
 
 /* standard distances */
-#define ED_BORDER_SIZE                 3
-#define ED_BORDER_TEXT_XSIZE           5
-#define ED_BORDER_AREA_YSIZE           1
-#define ED_ELEMENT_BORDER              8
-#define ED_ELEMENT_BORDER_INPUT                4
-
-#define ED_GADGET_DISTANCE             2
-#define ED_GADGET_TEXT_DISTANCE                (2 * ED_GADGET_DISTANCE)
-#define ED_GADGET_LINE_DISTANCE                (2 * ED_GADGET_DISTANCE)
+#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)
+#define ED_GADGET_LINE_DISTANCE                (editor.gadget.line_spacing)
+#define ED_GADGET_TEXT_DISTANCE                (editor.gadget.text_spacing)
+#define ED_TAB_BAR_HEIGHT              (editor.gadget.separator_line.height)
 #define ED_DRAWINGAREA_TEXT_DISTANCE   (ED_GADGET_TEXT_DISTANCE +      \
-                                        MINI_TILEX / 2)
+                                        ED_DRAWINGAREA_BORDER_SIZE)
+#define ED_GADGET_SPACE_DISTANCE       (getFontWidth(FONT_TEXT_1))
 
-/* values for the settings windows */
-#define ED_SETTINGS1_YPOS              MINI_TILEY
-
-#define ED_ELEMENT_SETTINGS_ELEM_XPOS  (2 * MINI_TILEX)
-#define ED_ELEMENT_SETTINGS_ELEM_YPOS  (4 * MINI_TILEY + MINI_TILEY / 2)
+/* 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 */
 #define ED_CHECKBUTTON_XSIZE        (graphic_info[IMG_EDITOR_CHECKBOX].width)
 #define ED_TABBUTTON_XSIZE          (graphic_info[IMG_EDITOR_TABBUTTON].width)
 #define ED_TABBUTTON_YSIZE          (graphic_info[IMG_EDITOR_TABBUTTON].height)
 
-#define ED_TAB_BAR_HEIGHT              ED_GADGET_DISTANCE
-
-#define ED_LEVEL_SETTINGS_BASE_XSTART  (3 * MINI_TILEX / 2)
-#define ED_LEVEL_SETTINGS_BASE_YSTART  (9 * MINI_TILEY / 2)
-#define ED_ELEMENT_SETTINGS_BASE_XSTART        (3 * MINI_TILEX / 2)
-#define ED_ELEMENT_SETTINGS_BASE_YSTART        (9 * MINI_TILEY)
-
-#define ED_LEVEL_SETTINGS_XSTART       (ED_LEVEL_SETTINGS_BASE_XSTART)
-#define ED_LEVEL_SETTINGS_YSTART       (ED_LEVEL_SETTINGS_BASE_YSTART + \
-                                        ED_TABBUTTON_YSIZE +            \
-                                        ED_TAB_BAR_HEIGHT +             \
-                                        ED_GADGET_DISTANCE +            \
-                                        getFontHeight(FONT_TEXT_1) +    \
-                                        ED_GADGET_DISTANCE)
-#define ED_ELEMENT_SETTINGS_XSTART     (ED_ELEMENT_SETTINGS_BASE_XSTART)
-#define ED_ELEMENT_SETTINGS_YSTART     (ED_ELEMENT_SETTINGS_BASE_YSTART + \
-                                        getFontHeight(FONT_INPUT_2) +     \
-                                        ED_GADGET_DISTANCE)
+#define ED_SETTINGS_LEVEL_TABS_X       (editor.settings.tabs.x)
+#define ED_SETTINGS_LEVEL_TABS_Y       (editor.settings.tabs.y)
+#define ED_SETTINGS_ELEMENT_TABS_X     (editor.settings.tabs.x)
+#define ED_SETTINGS_ELEMENT_TABS_Y     (editor.settings.tabs.y +       \
+                                        editor.settings.tabs.yoffset2)
+
+#define ED_SETTINGS_TABS_XOFFSET       (editor.settings.tabs.draw_xoffset)
+#define ED_SETTINGS_TABS_YOFFSET       (editor.settings.tabs.draw_yoffset)
+
+#define ED_LEVEL_TABS_XSTART           (ED_SETTINGS_LEVEL_TABS_X)
+#define ED_LEVEL_TABS_YSTART           (ED_SETTINGS_LEVEL_TABS_Y)
+#define ED_LEVEL_SETTINGS_XSTART       (ED_SETTINGS_LEVEL_TABS_X +     \
+                                        ED_SETTINGS_TABS_XOFFSET)
+#define ED_LEVEL_SETTINGS_YSTART       (ED_SETTINGS_LEVEL_TABS_Y +     \
+                                        ED_TABBUTTON_YSIZE +           \
+                                        ED_GADGET_TINY_DISTANCE +      \
+                                        ED_TAB_BAR_HEIGHT +            \
+                                        ED_SETTINGS_TABS_YOFFSET +     \
+                                        getFontHeight(FONT_TEXT_1) +   \
+                                        ED_GADGET_TEXT_DISTANCE)
+#define ED_ELEMENT_TABS_XSTART         (ED_SETTINGS_ELEMENT_TABS_X)
+#define ED_ELEMENT_TABS_YSTART         (ED_SETTINGS_ELEMENT_TABS_Y)
+#define ED_ELEMENT_SETTINGS_XSTART     (ED_SETTINGS_ELEMENT_TABS_X +   \
+                                        ED_SETTINGS_TABS_XOFFSET)
+#define ED_ELEMENT_SETTINGS_YSTART     (ED_SETTINGS_ELEMENT_TABS_Y +   \
+                                        ED_TABBUTTON_YSIZE +           \
+                                        ED_GADGET_TINY_DISTANCE +      \
+                                        ED_TAB_BAR_HEIGHT +            \
+                                        ED_SETTINGS_TABS_YOFFSET)
 
 #define ED_SETTINGS_XOFFSET            (ED_CHECKBUTTON_XSIZE +         \
                                         ED_GADGET_TEXT_DISTANCE)
 #define ED_SETTINGS_YOFFSET            (ED_CHECKBUTTON_YSIZE +         \
                                         ED_GADGET_LINE_DISTANCE)
 
-#define ED_POS_LEVEL_SETTINGS          (100)
-#define ED_POS_ELEMENT_SETTINGS                (200)
-
-#define ED_LEVEL_SETTINGS_XPOS(n)      (ED_POS_LEVEL_SETTINGS + (n))
-#define ED_LEVEL_SETTINGS_YPOS(n)      (ED_POS_LEVEL_SETTINGS + (n))
-
-#define ED_ELEMENT_SETTINGS_XPOS(n)    (ED_POS_ELEMENT_SETTINGS + (n))
-#define ED_ELEMENT_SETTINGS_YPOS(n)    (ED_POS_ELEMENT_SETTINGS + (n))
-
-#define IS_POS_LEVEL_SETTINGS(n)       ((n) >= ED_POS_LEVEL_SETTINGS && \
-                                        (n) < ED_POS_LEVEL_SETTINGS + 100)
-#define IS_POS_ELEMENT_SETTINGS(n)     ((n) >= ED_POS_ELEMENT_SETTINGS && \
-                                        (n) < ED_POS_ELEMENT_SETTINGS + 100)
-
-#define ED_LEVEL_SETTINGS_LINE(n)      ((n) - ED_POS_LEVEL_SETTINGS)
-#define ED_ELEMENT_SETTINGS_LINE(n)    ((n) - ED_POS_ELEMENT_SETTINGS)
+#define ED_POS_RANGE                   (10000)
+#define ED_POS_LEVEL_TABS_FIRST                (1 * ED_POS_RANGE)
+#define ED_POS_LEVEL_TABS_LAST         (2 * ED_POS_RANGE - 1)
+#define ED_POS_LEVEL_SETTINGS_FIRST    (2 * ED_POS_RANGE)
+#define ED_POS_LEVEL_SETTINGS_LAST     (3 * ED_POS_RANGE - 1)
+#define ED_POS_ELEMENT_TABS_FIRST      (3 * ED_POS_RANGE)
+#define ED_POS_ELEMENT_TABS_LAST       (4 * ED_POS_RANGE - 1)
+#define ED_POS_ELEMENT_SETTINGS_FIRST  (4 * ED_POS_RANGE)
+#define ED_POS_ELEMENT_SETTINGS_LAST   (5 * ED_POS_RANGE - 1)
+
+#define ED_LEVEL_TABS_XPOS(n)          (ED_POS_LEVEL_TABS_FIRST + (n))
+#define ED_LEVEL_TABS_YPOS(n)          (ED_POS_LEVEL_TABS_FIRST + (n))
+
+#define ED_LEVEL_SETTINGS_XPOS(n)      (ED_POS_LEVEL_SETTINGS_FIRST + (n))
+#define ED_LEVEL_SETTINGS_YPOS(n)      (ED_POS_LEVEL_SETTINGS_FIRST + (n))
+
+#define ED_ELEMENT_TABS_XPOS(n)                (ED_POS_ELEMENT_TABS_FIRST + (n))
+#define ED_ELEMENT_TABS_YPOS(n)                (ED_POS_ELEMENT_TABS_FIRST + (n))
+
+#define ED_ELEMENT_SETTINGS_XPOS(n)    (ED_POS_ELEMENT_SETTINGS_FIRST + (n))
+#define ED_ELEMENT_SETTINGS_YPOS(n)    (ED_POS_ELEMENT_SETTINGS_FIRST + (n))
+
+#define IS_POS_LEVEL_TABS(n)         ((n) >= ED_POS_LEVEL_TABS_FIRST && \
+                                      (n) <= ED_POS_LEVEL_TABS_LAST)
+#define IS_POS_LEVEL_SETTINGS(n)      ((n) >= ED_POS_LEVEL_SETTINGS_FIRST && \
+                                      (n) <= ED_POS_LEVEL_SETTINGS_LAST)
+#define IS_POS_ELEMENT_TABS(n)       ((n) >= ED_POS_ELEMENT_TABS_FIRST && \
+                                      (n) <= ED_POS_ELEMENT_TABS_LAST)
+#define IS_POS_ELEMENT_SETTINGS(n)    ((n) >= ED_POS_ELEMENT_SETTINGS_FIRST && \
+                                      (n) <= ED_POS_ELEMENT_SETTINGS_LAST)
+
+#define ED_LEVEL_TABS_LINE(n)          ((n) - ED_POS_LEVEL_TABS_FIRST)
+#define ED_LEVEL_SETTINGS_LINE(n)      ((n) - ED_POS_LEVEL_SETTINGS_FIRST)
+#define ED_ELEMENT_TABS_LINE(n)                ((n) - ED_POS_ELEMENT_TABS_FIRST)
+#define ED_ELEMENT_SETTINGS_LINE(n)    ((n) - ED_POS_ELEMENT_SETTINGS_FIRST)
+
+#define ED_LEVEL_TABS_X(n)             (ED_LEVEL_TABS_XSTART + \
+                                        (n) * ED_SETTINGS_TABS_XOFFSET)
+#define ED_LEVEL_TABS_Y(n)             (ED_LEVEL_TABS_YSTART + \
+                                        (n) * ED_SETTINGS_TABS_YOFFSET)
 
 #define ED_LEVEL_SETTINGS_X(n)         (ED_LEVEL_SETTINGS_XSTART +     \
                                         (n) * ED_SETTINGS_XOFFSET)
 #define ED_LEVEL_SETTINGS_Y(n)         (ED_LEVEL_SETTINGS_YSTART +     \
                                         (n) * ED_SETTINGS_YOFFSET)
 
+#define ED_ELEMENT_TABS_X(n)           (ED_ELEMENT_TABS_XSTART +       \
+                                        (n) * ED_SETTINGS_TABS_XOFFSET)
+#define ED_ELEMENT_TABS_Y(n)           (ED_ELEMENT_TABS_YSTART +       \
+                                        (n) * ED_SETTINGS_TABS_YOFFSET)
+
 #define ED_ELEMENT_SETTINGS_X(n)       (ED_ELEMENT_SETTINGS_XSTART +   \
                                         (n) * ED_SETTINGS_XOFFSET)
 #define ED_ELEMENT_SETTINGS_Y(n)       (ED_ELEMENT_SETTINGS_YSTART +   \
                                         (n) * ED_SETTINGS_YOFFSET)
 
+#define ED_POS_TO_LEVEL_TABS_X(n)      \
+  (ED_LEVEL_TABS_X(ED_LEVEL_TABS_LINE(n)))
+#define ED_POS_TO_LEVEL_TABS_Y(n)      \
+  (ED_LEVEL_TABS_Y(ED_LEVEL_TABS_LINE(n)))
+
 #define ED_POS_TO_LEVEL_SETTINGS_X(n)  \
   (ED_LEVEL_SETTINGS_X(ED_LEVEL_SETTINGS_LINE(n)))
 #define ED_POS_TO_LEVEL_SETTINGS_Y(n)  \
   (ED_LEVEL_SETTINGS_Y(ED_LEVEL_SETTINGS_LINE(n)))
 
+#define ED_POS_TO_ELEMENT_TABS_X(n)    \
+  (ED_ELEMENT_TABS_X(ED_ELEMENT_TABS_LINE(n)))
+#define ED_POS_TO_ELEMENT_TABS_Y(n)    \
+  (ED_ELEMENT_TABS_Y(ED_ELEMENT_TABS_LINE(n)))
+
 #define ED_POS_TO_ELEMENT_SETTINGS_X(n)        \
   (ED_ELEMENT_SETTINGS_X(ED_ELEMENT_SETTINGS_LINE(n)))
 #define ED_POS_TO_ELEMENT_SETTINGS_Y(n)        \
   (ED_ELEMENT_SETTINGS_Y(ED_ELEMENT_SETTINGS_LINE(n)))
 
-#define ED_SETTINGS_X(n)               (IS_POS_LEVEL_SETTINGS(n) ?     \
+#define ED_SETTINGS_X(n)               (IS_POS_LEVEL_TABS(n) ? \
+                                        ED_POS_TO_LEVEL_TABS_X(n) : \
+                                        IS_POS_LEVEL_SETTINGS(n) ?     \
                                         ED_POS_TO_LEVEL_SETTINGS_X(n) : \
-                                        ED_POS_TO_ELEMENT_SETTINGS_X(n))
-#define ED_SETTINGS_Y(n)               (IS_POS_LEVEL_SETTINGS(n) ?     \
+                                        IS_POS_ELEMENT_TABS(n) ?       \
+                                        ED_POS_TO_ELEMENT_TABS_X(n) : \
+                                        IS_POS_ELEMENT_SETTINGS(n) ?   \
+                                        ED_POS_TO_ELEMENT_SETTINGS_X(n) : (n))
+#define ED_SETTINGS_Y(n)               (IS_POS_LEVEL_TABS(n) ? \
+                                        ED_POS_TO_LEVEL_TABS_Y(n) : \
+                                        IS_POS_LEVEL_SETTINGS(n) ?     \
                                         ED_POS_TO_LEVEL_SETTINGS_Y(n) : \
-                                        ED_POS_TO_ELEMENT_SETTINGS_Y(n))
-
-#define ED_AREA_SETTINGS_X(i)          (ED_SETTINGS_X((i).x) + (i).xoffset)
-#define ED_AREA_SETTINGS_Y(i)          (ED_SETTINGS_Y((i).y) + (i).yoffset)
-
-#define ED_LEVEL_SETTINGS_TABS_XPOS    (ED_LEVEL_SETTINGS_BASE_XSTART)
-#define ED_LEVEL_SETTINGS_TABS_YPOS    (4 * MINI_TILEY)
-#define ED_ELEMENT_SETTINGS_TABS_XPOS  (ED_ELEMENT_SETTINGS_BASE_XSTART)
-#define ED_ELEMENT_SETTINGS_TABS_YPOS  (8 * MINI_TILEY)
+                                        IS_POS_ELEMENT_TABS(n) ?       \
+                                        ED_POS_TO_ELEMENT_TABS_Y(n) : \
+                                        IS_POS_ELEMENT_SETTINGS(n) ?   \
+                                        ED_POS_TO_ELEMENT_SETTINGS_Y(n) : (n))
+
+#define ED_SETTINGS_XOFF(n)            (5 * ((n) % 4) *                \
+                                        ED_DRAWINGAREA_TILE_SIZE)
+#define ED_SETTINGS_YOFF(n)            (5 * ((n) / 4) *                \
+                                        ED_DRAWINGAREA_TILE_SIZE)
+
+#define ED_AREA_XOFFSET_1(n)           ((n) != 0 ?                     \
+                                        ED_DRAWINGAREA_BORDER_SIZE : 0)
+#define ED_AREA_YOFFSET_1(n)           ((n) != 0 ?                     \
+                                        (ED_CHECKBUTTON_YSIZE -        \
+                                         ED_DRAWINGAREA_TILE_SIZE) / 2 : 0)
+
+#define ED_AREA_XOFFSET_2(n)     (0)
+#define ED_AREA_YOFFSET_2(n)     ((n) == 3 ?                   \
+                                  ((n) - 1) * ED_DRAWINGAREA_TILE_SIZE / 2 : 0)
+
+#define ED_AREA_SETTINGS_X(i)     (ED_SETTINGS_X((i).x) +              \
+                                   ED_SETTINGS_XOFF((i).xoffset) +     \
+                                   ED_AREA_XOFFSET_1((i).x) -          \
+                                   ED_AREA_XOFFSET_2((i).area_xsize))
+#define ED_AREA_SETTINGS_Y(i)     (ED_SETTINGS_Y((i).y) +              \
+                                   ED_SETTINGS_YOFF((i).yoffset) +     \
+                                   ED_AREA_YOFFSET_1((i).y) -          \
+                                   ED_AREA_YOFFSET_2((i).area_ysize))
 
 /* 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_1X1_LSETTINGS_YOFF     (ED_GADGET_DISTANCE)
+#define ED_AREA_1X1_LSETTINGS_YOFF     (0)
 
 #define ED_AREA_1X1_SETTINGS_XPOS(n)   ED_ELEMENT_SETTINGS_XPOS(n)
 #define ED_AREA_1X1_SETTINGS_YPOS(n)   ED_ELEMENT_SETTINGS_YPOS(n)
 #define ED_AREA_1X1_SETTINGS_XOFF      (0)
-#define ED_AREA_1X1_SETTINGS_YOFF      (ED_GADGET_DISTANCE)
+#define ED_AREA_1X1_SETTINGS_YOFF      (0)
 
 #define ED_AREA_3X3_SETTINGS_XPOS(n)   ED_ELEMENT_SETTINGS_XPOS(n)
 #define ED_AREA_3X3_SETTINGS_YPOS(n)   ED_ELEMENT_SETTINGS_YPOS(n)
 #define ED_AREA_3X3_SETTINGS_XOFF      (0)
-#define ED_AREA_3X3_SETTINGS_YOFF      (ED_GADGET_DISTANCE - MINI_TILEY)
+#define ED_AREA_3X3_SETTINGS_YOFF      (0)
+
+/* element content */
+#define ED_AREA_ELEMENT_CONTENT_XOFF(n)        (n)
+#define ED_AREA_ELEMENT_CONTENT_YOFF(n)        (n)
 
 /* yamyam content */
-#define ED_AREA_YAMYAM_CONTENT_XPOS    ED_ELEMENT_SETTINGS_XPOS(0)
-#define ED_AREA_YAMYAM_CONTENT_YPOS    ED_ELEMENT_SETTINGS_YPOS(0)
-#define ED_AREA_YAMYAM_CONTENT_XOFF(n) (MINI_TILEX / 2 +               \
-                                        5 * ((n) % 4) * MINI_TILEX)
-#define ED_AREA_YAMYAM_CONTENT_YOFF(n) (13 * MINI_TILEY / 2 +  \
-                                        6 * ((n) / 4) * MINI_TILEY)
-#define ED_AREA_YAMYAM_CONTENT_X(n)    (ED_ELEMENT_SETTINGS_X(0) +     \
-                                        ED_AREA_YAMYAM_CONTENT_XOFF(n))
-#define ED_AREA_YAMYAM_CONTENT_Y(n)    (ED_ELEMENT_SETTINGS_Y(0) +     \
-                                        ED_AREA_YAMYAM_CONTENT_YOFF(n))
+#define ED_XPOS_YAM                    0
+#define ED_YPOS_YAM                    5
+#define ED_AREA_YAMYAM_CONTENT_XPOS    ED_ELEMENT_SETTINGS_XPOS(ED_XPOS_YAM)
+#define ED_AREA_YAMYAM_CONTENT_YPOS    ED_ELEMENT_SETTINGS_YPOS(ED_YPOS_YAM)
+#define ED_AREA_YAMYAM_CONTENT_XOFF(n) ED_AREA_ELEMENT_CONTENT_XOFF(n)
+#define ED_AREA_YAMYAM_CONTENT_YOFF(n) ED_AREA_ELEMENT_CONTENT_YOFF(n)
+#define ED_AREA_YAMYAM_CONTENT_X(n)    (ED_ELEMENT_SETTINGS_X(ED_XPOS_YAM) + \
+                                        ED_SETTINGS_XOFF(n))
+#define ED_AREA_YAMYAM_CONTENT_Y(n)    (ED_ELEMENT_SETTINGS_Y(ED_YPOS_YAM) + \
+                                        ED_SETTINGS_YOFF(n) +          \
+                                        ED_AREA_YOFFSET_1(ED_YPOS_YAM) - \
+                                        ED_AREA_YOFFSET_2(3))
 
 /* magic ball content */
-#define ED_AREA_MAGIC_BALL_CONTENT_XPOS        ED_ELEMENT_SETTINGS_XPOS(0)
-#define ED_AREA_MAGIC_BALL_CONTENT_YPOS        ED_ELEMENT_SETTINGS_YPOS(0)
-#define ED_AREA_MAGIC_BALL_CONTENT_XOFF(n) (MINI_TILEX / 2 +           \
-                                           5 * ((n) % 4) * MINI_TILEX)
-#define ED_AREA_MAGIC_BALL_CONTENT_YOFF(n) (16 * MINI_TILEY / 2 +      \
-                                           6 * ((n) / 4) * MINI_TILEY)
-#define ED_AREA_MAGIC_BALL_CONTENT_X(n)        (ED_ELEMENT_SETTINGS_X(0) +     \
-                                        ED_AREA_MAGIC_BALL_CONTENT_XOFF(n))
-#define ED_AREA_MAGIC_BALL_CONTENT_Y(n)        (ED_ELEMENT_SETTINGS_Y(0) +     \
-                                        ED_AREA_MAGIC_BALL_CONTENT_YOFF(n))
+#define ED_XPOS_BALL                   0
+#define ED_YPOS_BALL                   6
+#define ED_AREA_MAGIC_BALL_CONTENT_XPOS        ED_ELEMENT_SETTINGS_XPOS(ED_XPOS_BALL)
+#define ED_AREA_MAGIC_BALL_CONTENT_YPOS        ED_ELEMENT_SETTINGS_YPOS(ED_YPOS_BALL)
+#define ED_AREA_MAGIC_BALL_CONTENT_XOFF(n) ED_AREA_ELEMENT_CONTENT_XOFF(n)
+#define ED_AREA_MAGIC_BALL_CONTENT_YOFF(n) ED_AREA_ELEMENT_CONTENT_YOFF(n)
+#define ED_AREA_MAGIC_BALL_CONTENT_X(n)        (ED_ELEMENT_SETTINGS_X(ED_XPOS_BALL) + \
+                                        ED_SETTINGS_XOFF(n))
+#define ED_AREA_MAGIC_BALL_CONTENT_Y(n)        (ED_ELEMENT_SETTINGS_Y(ED_YPOS_BALL) + \
+                                        ED_SETTINGS_YOFF(n) +          \
+                                        ED_AREA_YOFFSET_1(ED_YPOS_BALL) - \
+                                        ED_AREA_YOFFSET_2(3))
 
 /* values for scrolling gadgets for drawing area */
-#define ED_SCROLLBUTTON_XSIZE          16
-#define ED_SCROLLBUTTON_YSIZE          16
+#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_UP_XPOS              (SXSIZE - ED_SCROLLBUTTON_XSIZE)
 #define ED_SCROLL_UP_YPOS              (0)
                                         2 * ED_SCROLLBUTTON2_YSIZE)
 
 /* values for ClearEditorGadgetInfoText() and HandleEditorGadgetInfoText() */
-#define INFOTEXT_XPOS                  SX
-#define INFOTEXT_YPOS                  (SY + SYSIZE - MINI_TILEX + 2)
-#define INFOTEXT_XSIZE                 SXSIZE
-#define INFOTEXT_YSIZE                 MINI_TILEY
+#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_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)
 
 
 /*
 #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 + 28)
+#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_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)
+#define GADGET_ID_LEVELSET_NUM_LEVELS_DOWN (GADGET_ID_COUNTER_FIRST + 24)
+#define GADGET_ID_LEVELSET_NUM_LEVELS_TEXT (GADGET_ID_COUNTER_FIRST + 25)
+#define GADGET_ID_LEVELSET_NUM_LEVELS_UP   (GADGET_ID_COUNTER_FIRST + 26)
+#define GADGET_ID_ELEMENT_VALUE1_DOWN  (GADGET_ID_COUNTER_FIRST + 27)
+#define GADGET_ID_ELEMENT_VALUE1_TEXT  (GADGET_ID_COUNTER_FIRST + 28)
+#define GADGET_ID_ELEMENT_VALUE1_UP    (GADGET_ID_COUNTER_FIRST + 29)
+#define GADGET_ID_ELEMENT_VALUE2_DOWN  (GADGET_ID_COUNTER_FIRST + 30)
+#define GADGET_ID_ELEMENT_VALUE2_TEXT  (GADGET_ID_COUNTER_FIRST + 31)
+#define GADGET_ID_ELEMENT_VALUE2_UP    (GADGET_ID_COUNTER_FIRST + 32)
+#define GADGET_ID_ELEMENT_VALUE3_DOWN  (GADGET_ID_COUNTER_FIRST + 33)
+#define GADGET_ID_ELEMENT_VALUE3_TEXT  (GADGET_ID_COUNTER_FIRST + 34)
+#define GADGET_ID_ELEMENT_VALUE3_UP    (GADGET_ID_COUNTER_FIRST + 35)
+#define GADGET_ID_ELEMENT_VALUE4_DOWN  (GADGET_ID_COUNTER_FIRST + 36)
+#define GADGET_ID_ELEMENT_VALUE4_TEXT  (GADGET_ID_COUNTER_FIRST + 37)
+#define GADGET_ID_ELEMENT_VALUE4_UP    (GADGET_ID_COUNTER_FIRST + 38)
+#define GADGET_ID_YAMYAM_CONTENT_DOWN  (GADGET_ID_COUNTER_FIRST + 39)
+#define GADGET_ID_YAMYAM_CONTENT_TEXT  (GADGET_ID_COUNTER_FIRST + 40)
+#define GADGET_ID_YAMYAM_CONTENT_UP    (GADGET_ID_COUNTER_FIRST + 41)
+#define GADGET_ID_BALL_CONTENT_DOWN    (GADGET_ID_COUNTER_FIRST + 42)
+#define GADGET_ID_BALL_CONTENT_TEXT    (GADGET_ID_COUNTER_FIRST + 43)
+#define GADGET_ID_BALL_CONTENT_UP      (GADGET_ID_COUNTER_FIRST + 44)
+#define GADGET_ID_ANDROID_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 45)
+#define GADGET_ID_ANDROID_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 46)
+#define GADGET_ID_ANDROID_CONTENT_UP   (GADGET_ID_COUNTER_FIRST + 47)
+#define GADGET_ID_ENVELOPE_XSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 48)
+#define GADGET_ID_ENVELOPE_XSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 49)
+#define GADGET_ID_ENVELOPE_XSIZE_UP    (GADGET_ID_COUNTER_FIRST + 50)
+#define GADGET_ID_ENVELOPE_YSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 51)
+#define GADGET_ID_ENVELOPE_YSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 52)
+#define GADGET_ID_ENVELOPE_YSIZE_UP    (GADGET_ID_COUNTER_FIRST + 53)
+#define GADGET_ID_INVENTORY_SIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 54)
+#define GADGET_ID_INVENTORY_SIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 55)
+#define GADGET_ID_INVENTORY_SIZE_UP    (GADGET_ID_COUNTER_FIRST + 56)
+#define GADGET_ID_CUSTOM_SCORE_DOWN    (GADGET_ID_COUNTER_FIRST + 57)
+#define GADGET_ID_CUSTOM_SCORE_TEXT    (GADGET_ID_COUNTER_FIRST + 58)
+#define GADGET_ID_CUSTOM_SCORE_UP      (GADGET_ID_COUNTER_FIRST + 59)
+#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 60)
+#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 61)
+#define GADGET_ID_CUSTOM_GEMCOUNT_UP   (GADGET_ID_COUNTER_FIRST + 62)
+#define GADGET_ID_CUSTOM_VALUE_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 63)
+#define GADGET_ID_CUSTOM_VALUE_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 64)
+#define GADGET_ID_CUSTOM_VALUE_FIX_UP  (GADGET_ID_COUNTER_FIRST + 65)
+#define GADGET_ID_CUSTOM_VALUE_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 66)
+#define GADGET_ID_CUSTOM_VALUE_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 67)
+#define GADGET_ID_CUSTOM_VALUE_RND_UP  (GADGET_ID_COUNTER_FIRST + 68)
+#define GADGET_ID_PUSH_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 69)
+#define GADGET_ID_PUSH_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 70)
+#define GADGET_ID_PUSH_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 71)
+#define GADGET_ID_PUSH_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 72)
+#define GADGET_ID_PUSH_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 73)
+#define GADGET_ID_PUSH_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 74)
+#define GADGET_ID_DROP_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 75)
+#define GADGET_ID_DROP_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 76)
+#define GADGET_ID_DROP_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 77)
+#define GADGET_ID_DROP_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 78)
+#define GADGET_ID_DROP_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 79)
+#define GADGET_ID_DROP_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 80)
+#define GADGET_ID_MOVE_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 81)
+#define GADGET_ID_MOVE_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 82)
+#define GADGET_ID_MOVE_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 83)
+#define GADGET_ID_MOVE_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 84)
+#define GADGET_ID_MOVE_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 85)
+#define GADGET_ID_MOVE_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 86)
+#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 87)
+#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 88)
+#define GADGET_ID_EXPLOSION_DELAY_UP   (GADGET_ID_COUNTER_FIRST + 89)
+#define GADGET_ID_IGNITION_DELAY_DOWN  (GADGET_ID_COUNTER_FIRST + 90)
+#define GADGET_ID_IGNITION_DELAY_TEXT  (GADGET_ID_COUNTER_FIRST + 91)
+#define GADGET_ID_IGNITION_DELAY_UP    (GADGET_ID_COUNTER_FIRST + 92)
+#define GADGET_ID_CHANGE_DELAY_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 93)
+#define GADGET_ID_CHANGE_DELAY_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 94)
+#define GADGET_ID_CHANGE_DELAY_FIX_UP  (GADGET_ID_COUNTER_FIRST + 95)
+#define GADGET_ID_CHANGE_DELAY_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 96)
+#define GADGET_ID_CHANGE_DELAY_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 97)
+#define GADGET_ID_CHANGE_DELAY_RND_UP  (GADGET_ID_COUNTER_FIRST + 98)
+#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 99)
+#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 100)
+#define GADGET_ID_CHANGE_CONT_RND_UP   (GADGET_ID_COUNTER_FIRST + 101)
+#define GADGET_ID_GROUP_CONTENT_DOWN   (GADGET_ID_COUNTER_FIRST + 102)
+#define GADGET_ID_GROUP_CONTENT_TEXT   (GADGET_ID_COUNTER_FIRST + 103)
+#define GADGET_ID_GROUP_CONTENT_UP     (GADGET_ID_COUNTER_FIRST + 104)
 
 /* drawing area identifiers */
-#define GADGET_ID_DRAWING_AREA_FIRST   (GADGET_ID_COUNTER_FIRST + 102)
+#define GADGET_ID_DRAWING_AREA_FIRST   (GADGET_ID_COUNTER_FIRST + 105)
 
 #define GADGET_ID_DRAWING_LEVEL                (GADGET_ID_DRAWING_AREA_FIRST + 0)
 #define GADGET_ID_YAMYAM_CONTENT_0     (GADGET_ID_DRAWING_AREA_FIRST + 1)
 
 #define GADGET_ID_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)
+#define GADGET_ID_LEVELSET_NAME                (GADGET_ID_TEXT_INPUT_FIRST + 2)
+#define GADGET_ID_LEVELSET_AUTHOR      (GADGET_ID_TEXT_INPUT_FIRST + 3)
+#define GADGET_ID_ELEMENT_NAME         (GADGET_ID_TEXT_INPUT_FIRST + 4)
 
 /* text area identifiers */
-#define GADGET_ID_TEXT_AREA_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 3)
+#define GADGET_ID_TEXT_AREA_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 5)
 
 #define GADGET_ID_ENVELOPE_INFO                (GADGET_ID_TEXT_AREA_FIRST + 0)
 
 
 #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)
+#define GADGET_ID_LEVELSET_SAVE_MODE   (GADGET_ID_SELECTBOX_FIRST + 2)
+#define GADGET_ID_WIND_DIRECTION       (GADGET_ID_SELECTBOX_FIRST + 3)
+#define GADGET_ID_PLAYER_SPEED         (GADGET_ID_SELECTBOX_FIRST + 4)
+#define GADGET_ID_CUSTOM_WALK_TO_ACTION        (GADGET_ID_SELECTBOX_FIRST + 5)
+#define GADGET_ID_CUSTOM_EXPLOSION_TYPE        (GADGET_ID_SELECTBOX_FIRST + 6)
+#define GADGET_ID_CUSTOM_DEADLINESS    (GADGET_ID_SELECTBOX_FIRST + 7)
+#define GADGET_ID_CUSTOM_MOVE_PATTERN  (GADGET_ID_SELECTBOX_FIRST + 8)
+#define GADGET_ID_CUSTOM_MOVE_DIRECTION        (GADGET_ID_SELECTBOX_FIRST + 9)
+#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 10)
+#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 11)
+#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 12)
+#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 13)
+#define GADGET_ID_CUSTOM_ACCESS_TYPE   (GADGET_ID_SELECTBOX_FIRST + 14)
+#define GADGET_ID_CUSTOM_ACCESS_LAYER  (GADGET_ID_SELECTBOX_FIRST + 15)
+#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 16)
+#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 17)
+#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 18)
+#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 19)
+#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 20)
+#define GADGET_ID_CHANGE_SIDE          (GADGET_ID_SELECTBOX_FIRST + 21)
+#define GADGET_ID_CHANGE_PLAYER                (GADGET_ID_SELECTBOX_FIRST + 22)
+#define GADGET_ID_CHANGE_PAGE          (GADGET_ID_SELECTBOX_FIRST + 23)
+#define GADGET_ID_CHANGE_REPLACE_WHEN  (GADGET_ID_SELECTBOX_FIRST + 24)
+#define GADGET_ID_ACTION_TYPE          (GADGET_ID_SELECTBOX_FIRST + 25)
+#define GADGET_ID_ACTION_MODE          (GADGET_ID_SELECTBOX_FIRST + 26)
+#define GADGET_ID_ACTION_ARG           (GADGET_ID_SELECTBOX_FIRST + 27)
+#define GADGET_ID_SELECT_CHANGE_PAGE   (GADGET_ID_SELECTBOX_FIRST + 28)
+#define GADGET_ID_GROUP_CHOICE_MODE    (GADGET_ID_SELECTBOX_FIRST + 29)
 
 /* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 29)
+#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 30)
 
 #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     (GADGET_ID_TEXTBUTTON_FIRST + 7)
-#define GADGET_ID_ADD_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 8)
-#define GADGET_ID_DEL_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 9)
+#define GADGET_ID_LEVELINFO_LEVELSET   (GADGET_ID_TEXTBUTTON_FIRST + 1)
+#define GADGET_ID_LEVELINFO_EDITOR     (GADGET_ID_TEXTBUTTON_FIRST + 2)
+#define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 3)
+#define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 4)
+#define GADGET_ID_PROPERTIES_CONFIG_1  (GADGET_ID_TEXTBUTTON_FIRST + 5)
+#define GADGET_ID_PROPERTIES_CONFIG_2  (GADGET_ID_TEXTBUTTON_FIRST + 6)
+#define GADGET_ID_PROPERTIES_CHANGE    (GADGET_ID_TEXTBUTTON_FIRST + 7)
+#define GADGET_ID_SAVE_AS_TEMPLATE_1   (GADGET_ID_TEXTBUTTON_FIRST + 8)
+#define GADGET_ID_SAVE_AS_TEMPLATE_2   (GADGET_ID_TEXTBUTTON_FIRST + 9)
+#define GADGET_ID_SAVE_LEVELSET                (GADGET_ID_TEXTBUTTON_FIRST + 10)
+#define GADGET_ID_ADD_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 11)
+#define GADGET_ID_DEL_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 12)
 
 /* graphicbutton identifiers */
-#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 10)
+#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 13)
 
 #define GADGET_ID_PREV_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 0)
 #define GADGET_ID_NEXT_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 1)
 /* checkbuttons/radiobuttons for level/element properties */
 #define GADGET_ID_CHECKBUTTON_FIRST    (GADGET_ID_SCROLLING_LIST_FIRST + 3)
 
-#define GADGET_ID_RANDOM_PERCENTAGE    (GADGET_ID_CHECKBUTTON_FIRST + 0)
-#define GADGET_ID_RANDOM_QUANTITY      (GADGET_ID_CHECKBUTTON_FIRST + 1)
-#define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 2)
-#define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 3)
-#define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 4)
-#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 5)
-#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 6)
-#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 7)
-#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 8)
-#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 9)
-#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 10)
-#define GADGET_ID_AUTO_EXIT_SOKOBAN    (GADGET_ID_CHECKBUTTON_FIRST + 11)
-#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 12)
-#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 13)
-#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 14)
-#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 15)
-#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 16)
-#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 17)
-#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 24)
-#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 25)
-#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 26)
-#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 27)
-#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 28)
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 29)
-#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 30)
-#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 31)
-#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 32)
-#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 33)
-#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 34)
-#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 35)
-#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 36)
-#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 37)
-#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 38)
-#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 39)
-#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 40)
-#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 41)
-#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 42)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 43)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE  (GADGET_ID_CHECKBUTTON_FIRST + 44)
-#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 45)
-#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 46)
-#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 47)
-#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 48)
-#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 49)
-#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 50)
-#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 51)
-#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 52)
-#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 53)
+#define GADGET_ID_AUTO_COUNT_GEMS      (GADGET_ID_CHECKBUTTON_FIRST + 0)
+#define GADGET_ID_USE_LEVELSET_ARTWORK (GADGET_ID_CHECKBUTTON_FIRST + 1)
+#define GADGET_ID_COPY_LEVEL_TEMPLATE  (GADGET_ID_CHECKBUTTON_FIRST + 2)
+#define GADGET_ID_RANDOM_PERCENTAGE    (GADGET_ID_CHECKBUTTON_FIRST + 3)
+#define GADGET_ID_RANDOM_QUANTITY      (GADGET_ID_CHECKBUTTON_FIRST + 4)
+#define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 5)
+#define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 6)
+#define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 7)
+#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 8)
+#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 9)
+#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 10)
+#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 11)
+#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 12)
+#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 13)
+#define GADGET_ID_AUTO_EXIT_SOKOBAN    (GADGET_ID_CHECKBUTTON_FIRST + 14)
+#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 15)
+#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 16)
+#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 17)
+#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 18)
+#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 19)
+#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 20)
+#define GADGET_ID_LAZY_RELOCATION      (GADGET_ID_CHECKBUTTON_FIRST + 21)
+#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 22)
+#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 23)
+#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 24)
+#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 25)
+#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 26)
+#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 27)
+#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 28)
+#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 29)
+#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 30)
+#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 31)
+#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 32)
+#define GADGET_ID_MM_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 33)
+#define GADGET_ID_MM_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 34)
+#define GADGET_ID_MM_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 35)
+#define GADGET_ID_DF_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 36)
+#define GADGET_ID_DF_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 37)
+#define GADGET_ID_DF_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 38)
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 39)
+#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 40)
+#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 41)
+#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 42)
+#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 43)
+#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 44)
+#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 45)
+#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 46)
+#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 47)
+#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 48)
+#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 49)
+#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 50)
+#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 51)
+#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 52)
+#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 53)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE_1        (GADGET_ID_CHECKBUTTON_FIRST + 54)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE_2        (GADGET_ID_CHECKBUTTON_FIRST + 55)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE_3        (GADGET_ID_CHECKBUTTON_FIRST + 56)
+#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 57)
+#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 58)
+#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 59)
+#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 60)
+#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 61)
+#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 62)
+#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 63)
+#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 64)
+#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 65)
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 54)
+#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 66)
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #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
+#define ED_COUNTER_ID_LEVELSET_NUM_LEVELS 7
+#define ED_COUNTER_ID_LEVEL_RANDOM     8
+#define ED_COUNTER_ID_ELEMENT_VALUE1   9
+#define ED_COUNTER_ID_ELEMENT_VALUE2   10
+#define ED_COUNTER_ID_ELEMENT_VALUE3   11
+#define ED_COUNTER_ID_ELEMENT_VALUE4   12
+#define ED_COUNTER_ID_YAMYAM_CONTENT   13
+#define ED_COUNTER_ID_BALL_CONTENT     14
+#define ED_COUNTER_ID_ANDROID_CONTENT  15
+#define ED_COUNTER_ID_ENVELOPE_XSIZE   16
+#define ED_COUNTER_ID_ENVELOPE_YSIZE   17
+#define ED_COUNTER_ID_INVENTORY_SIZE   18
+#define ED_COUNTER_ID_CUSTOM_SCORE     19
+#define ED_COUNTER_ID_CUSTOM_GEMCOUNT  20
+#define ED_COUNTER_ID_CUSTOM_VALUE_FIX 21
+#define ED_COUNTER_ID_CUSTOM_VALUE_RND 22
+#define ED_COUNTER_ID_PUSH_DELAY_FIX   23
+#define ED_COUNTER_ID_PUSH_DELAY_RND   24
+#define ED_COUNTER_ID_DROP_DELAY_FIX   25
+#define ED_COUNTER_ID_DROP_DELAY_RND   26
+#define ED_COUNTER_ID_MOVE_DELAY_FIX   27
+#define ED_COUNTER_ID_MOVE_DELAY_RND   28
+#define ED_COUNTER_ID_EXPLOSION_DELAY  29
+#define ED_COUNTER_ID_IGNITION_DELAY   30
+#define ED_COUNTER_ID_GROUP_CONTENT    31
+#define ED_COUNTER_ID_CHANGE_DELAY_FIX 32
+#define ED_COUNTER_ID_CHANGE_DELAY_RND 33
+#define ED_COUNTER_ID_CHANGE_CONT_RND  34
+
+#define ED_NUM_COUNTERBUTTONS          35
 
 #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
 
 /* 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
+#define ED_TEXTINPUT_ID_LEVELSET_NAME  2
+#define ED_TEXTINPUT_ID_LEVELSET_AUTHOR        3
+#define ED_TEXTINPUT_ID_ELEMENT_NAME   4
 
-#define ED_NUM_TEXTINPUT               3
+#define ED_NUM_TEXTINPUT               5
 
 #define ED_TEXTINPUT_ID_LEVEL_FIRST    ED_TEXTINPUT_ID_LEVEL_NAME
 #define ED_TEXTINPUT_ID_LEVEL_LAST     ED_TEXTINPUT_ID_LEVEL_AUTHOR
 
+#define ED_TEXTINPUT_ID_LEVELSET_FIRST ED_TEXTINPUT_ID_LEVELSET_NAME
+#define ED_TEXTINPUT_ID_LEVELSET_LAST  ED_TEXTINPUT_ID_LEVELSET_AUTHOR
+
 /* values for text area gadgets */
 #define ED_TEXTAREA_ID_ENVELOPE_INFO   0
 
 /* values for 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
+#define ED_SELECTBOX_ID_LEVELSET_SAVE_MODE     2
+#define ED_SELECTBOX_ID_WIND_DIRECTION         3
+#define ED_SELECTBOX_ID_PLAYER_SPEED           4
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE     5
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER    6
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED        7
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION        8
+#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION  9
+#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN    10
+#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION  11
+#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE   12
+#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 13
+#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS   14
+#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE   15
+#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS      16
+#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE  17
+#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      18
+#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION   19
+#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    20
+#define ED_SELECTBOX_ID_CHANGE_SIDE            21
+#define ED_SELECTBOX_ID_CHANGE_PLAYER          22
+#define ED_SELECTBOX_ID_CHANGE_PAGE            23
+#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN    24
+#define ED_SELECTBOX_ID_ACTION_TYPE            25
+#define ED_SELECTBOX_ID_ACTION_MODE            26
+#define ED_SELECTBOX_ID_ACTION_ARG             27
+#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE     28
+#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE      29
+
+#define ED_NUM_SELECTBOX                       30
 
 #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
 
 /* 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      7
-#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE       8
-#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE       9
-
-#define ED_NUM_TEXTBUTTONS                     10
-
-#define ED_TEXTBUTTON_ID_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
-#define ED_TEXTBUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
-
-#define ED_TEXTBUTTON_ID_PROPERTIES_FIRST ED_TEXTBUTTON_ID_PROPERTIES_INFO
-#define ED_TEXTBUTTON_ID_PROPERTIES_LAST  ED_TEXTBUTTON_ID_PROPERTIES_CHANGE
+#define ED_TEXTBUTTON_ID_LEVELINFO_LEVELSET    1
+#define ED_TEXTBUTTON_ID_LEVELINFO_EDITOR      2
+#define ED_TEXTBUTTON_ID_PROPERTIES_INFO       3
+#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG     4
+#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1   5
+#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2   6
+#define ED_TEXTBUTTON_ID_PROPERTIES_CHANGE     7
+#define ED_TEXTBUTTON_ID_SAVE_LEVELSET         8
+#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2    9
+#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1    10
+#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE       11
+#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE       12
+
+#define ED_NUM_TEXTBUTTONS                     13
+
+#define ED_TAB_BUTTON_ID_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
+#define ED_TAB_BUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
+
+#define ED_TAB_BUTTON_ID_PROPERTIES_FIRST ED_TEXTBUTTON_ID_PROPERTIES_INFO
+#define ED_TAB_BUTTON_ID_PROPERTIES_LAST  ED_TEXTBUTTON_ID_PROPERTIES_CHANGE
 
 #define ED_TEXTBUTTON_ID_CHANGE_FIRST  ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE
 #define ED_TEXTBUTTON_ID_CHANGE_LAST   ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE
 #define ED_GRAPHICBUTTON_ID_CHANGE_LAST   ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE
 
 /* values for checkbutton gadgets */
-#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    0
-#define ED_CHECKBUTTON_ID_STICK_ELEMENT                1
-#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     2
-#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  3
-#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       4
-#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     5
-#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  6
-#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   7
-#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   8
-#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN    9
-#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  10
-#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     11
-#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     12
-#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  13
-#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   14
-#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   15
-#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    16
-#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  17
-#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        18
-#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      19
-#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        20
-#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 21
-#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   22
-#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   23
-#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    24
-#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    25
-#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    26
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   27
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE  28
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    29
-#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        30
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        31
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        32
-#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        33
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      34
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      35
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     36
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      37
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                38
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   39
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  40
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 41
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        42
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    43
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         44
-#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 45
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  46
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 47
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   48
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 49
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    50
-#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    51
-
-#define ED_NUM_CHECKBUTTONS                    52
+#define ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS      0
+#define ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK 1
+#define ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE  2
+#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    3
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3        4
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2        5
+#define ED_CHECKBUTTON_ID_STICK_ELEMENT                6
+#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     7
+#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  8
+#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       9
+#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     10
+#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  11
+#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   12
+#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   13
+#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN    14
+#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  15
+#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     16
+#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     17
+#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  18
+#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   19
+#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   20
+#define ED_CHECKBUTTON_ID_LAZY_RELOCATION      21
+#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    22
+#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  23
+#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        24
+#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      25
+#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        26
+#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 27
+#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   28
+#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   29
+#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    30
+#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    31
+#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    32
+#define ED_CHECKBUTTON_ID_MM_LASER_RED         33
+#define ED_CHECKBUTTON_ID_MM_LASER_GREEN       34
+#define ED_CHECKBUTTON_ID_MM_LASER_BLUE                35
+#define ED_CHECKBUTTON_ID_DF_LASER_RED         36
+#define ED_CHECKBUTTON_ID_DF_LASER_GREEN       37
+#define ED_CHECKBUTTON_ID_DF_LASER_BLUE                38
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   39
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1        40
+#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    41
+#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        42
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        43
+#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        44
+#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        45
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      46
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      47
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     48
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      49
+#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                50
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   51
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  52
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 53
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        54
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    55
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY         56
+#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 57
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  58
+#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 59
+#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   60
+#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 61
+#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    62
+#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    63
+
+#define ED_NUM_CHECKBUTTONS                    64
+
+#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_RANDOM_RESTRICTED
+#define ED_CHECKBUTTON_ID_EDITOR_LAST  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2
 
 #define ED_CHECKBUTTON_ID_CUSTOM1_FIRST        ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC
 #define ED_CHECKBUTTON_ID_CUSTOM1_LAST ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE
 
 #define ED_NUM_DRAWING_AREAS                   33
 
+#define ED_DRAWING_ID_EDITOR_FIRST     ED_DRAWING_ID_RANDOM_BACKGROUND
+#define ED_DRAWING_ID_EDITOR_LAST      ED_DRAWING_ID_RANDOM_BACKGROUND
+
 
 /*
   -----------------------------------------------------------------------------
 #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 */
 #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 */
 #define RANDOM_USE_PERCENTAGE          0
 #define RANDOM_USE_QUANTITY            1
 
+/* 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
 
 
 /*
@@ -947,7 +1113,7 @@ static struct
 {
   int graphic;
   int gadget_id;
-  struct XY *pos;
+  struct XYTileSize *pos;
   int gadget_type;
   char *infotext;
   char shortcut;
@@ -959,82 +1125,82 @@ static struct
   /* ---------- toolbox control buttons ------------------------------------ */
 
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_SINGLE,         GADGET_ID_SINGLE_ITEMS,
+    IMG_GFX_EDITOR_BUTTON_DRAW_SINGLE,         GADGET_ID_SINGLE_ITEMS,
     &editor.button.draw_single,                        GD_TYPE_RADIO_BUTTON,
     "draw single items",                       's'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_CONNECTED,      GADGET_ID_CONNECTED_ITEMS,
+    IMG_GFX_EDITOR_BUTTON_DRAW_CONNECTED,      GADGET_ID_CONNECTED_ITEMS,
     &editor.button.draw_connected,             GD_TYPE_RADIO_BUTTON,
     "draw connected items",                    'd'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_LINE,           GADGET_ID_LINE,
+    IMG_GFX_EDITOR_BUTTON_DRAW_LINE,           GADGET_ID_LINE,
     &editor.button.draw_line,                  GD_TYPE_RADIO_BUTTON,
     "draw lines",                              'l'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_ARC,            GADGET_ID_ARC,
+    IMG_GFX_EDITOR_BUTTON_DRAW_ARC,            GADGET_ID_ARC,
     &editor.button.draw_arc,                   GD_TYPE_RADIO_BUTTON,
     "draw arcs",                               'a'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_RECTANGLE,      GADGET_ID_RECTANGLE,
+    IMG_GFX_EDITOR_BUTTON_DRAW_RECTANGLE,      GADGET_ID_RECTANGLE,
     &editor.button.draw_rectangle,             GD_TYPE_RADIO_BUTTON,
     "draw outline rectangles",                 'r'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_FILLED_BOX,     GADGET_ID_FILLED_BOX,
+    IMG_GFX_EDITOR_BUTTON_DRAW_FILLED_BOX,     GADGET_ID_FILLED_BOX,
     &editor.button.draw_filled_box,            GD_TYPE_RADIO_BUTTON,
     "draw filled rectangles",                  'R'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_ROTATE_UP,           GADGET_ID_WRAP_UP,
+    IMG_GFX_EDITOR_BUTTON_ROTATE_UP,           GADGET_ID_WRAP_UP,
     &editor.button.rotate_up,                  GD_TYPE_NORMAL_BUTTON,
     "wrap (rotate) level up",                  0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_TEXT,           GADGET_ID_TEXT,
+    IMG_GFX_EDITOR_BUTTON_DRAW_TEXT,           GADGET_ID_TEXT,
     &editor.button.draw_text,                  GD_TYPE_RADIO_BUTTON,
     "enter text elements",                     't'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_FLOOD_FILL,          GADGET_ID_FLOOD_FILL,
+    IMG_GFX_EDITOR_BUTTON_FLOOD_FILL,          GADGET_ID_FLOOD_FILL,
     &editor.button.flood_fill,                 GD_TYPE_RADIO_BUTTON,
     "flood fill",                              'f'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_ROTATE_LEFT,         GADGET_ID_WRAP_LEFT,
+    IMG_GFX_EDITOR_BUTTON_ROTATE_LEFT,         GADGET_ID_WRAP_LEFT,
     &editor.button.rotate_left,                        GD_TYPE_NORMAL_BUTTON,
     "wrap (rotate) level left",                        0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_ZOOM_LEVEL,          GADGET_ID_ZOOM,
+    IMG_GFX_EDITOR_BUTTON_ZOOM_LEVEL,          GADGET_ID_ZOOM,
     &editor.button.zoom_level,                 GD_TYPE_NORMAL_BUTTON,
-    "zoom level tile size",                    '-'
+    "zoom level tile size",                    '+'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_ROTATE_RIGHT,                GADGET_ID_WRAP_RIGHT,
+    IMG_GFX_EDITOR_BUTTON_ROTATE_RIGHT,                GADGET_ID_WRAP_RIGHT,
     &editor.button.rotate_right,               GD_TYPE_NORMAL_BUTTON,
     "wrap (rotate) level right",               0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_DRAW_RANDOM,         GADGET_ID_RANDOM_PLACEMENT,
+    IMG_GFX_EDITOR_BUTTON_DRAW_RANDOM,         GADGET_ID_RANDOM_PLACEMENT,
     &editor.button.draw_random,                        GD_TYPE_NORMAL_BUTTON,
     "random element placement",                        0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_GRAB_BRUSH,          GADGET_ID_GRAB_BRUSH,
+    IMG_GFX_EDITOR_BUTTON_GRAB_BRUSH,          GADGET_ID_GRAB_BRUSH,
     &editor.button.grab_brush,                 GD_TYPE_RADIO_BUTTON,
     "grab brush",                              'b'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_ROTATE_DOWN,         GADGET_ID_WRAP_DOWN,
+    IMG_GFX_EDITOR_BUTTON_ROTATE_DOWN,         GADGET_ID_WRAP_DOWN,
     &editor.button.rotate_down,                        GD_TYPE_NORMAL_BUTTON,
     "wrap (rotate) level down",                        0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_PICK_ELEMENT,                GADGET_ID_PICK_ELEMENT,
+    IMG_GFX_EDITOR_BUTTON_PICK_ELEMENT,                GADGET_ID_PICK_ELEMENT,
     &editor.button.pick_element,               GD_TYPE_RADIO_BUTTON,
     "pick drawing element",                    ','
   },
@@ -1042,32 +1208,32 @@ static struct
   /* ---------- level control buttons -------------------------------------- */
 
   {
-    IMG_EDITOR_BUTTON_GFX_UNDO,                        GADGET_ID_UNDO,
+    IMG_GFX_EDITOR_BUTTON_UNDO,                        GADGET_ID_UNDO,
     &editor.button.undo,                       GD_TYPE_NORMAL_BUTTON,
     "undo/redo last operation",                        'u'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CONF,                        GADGET_ID_INFO,
+    IMG_GFX_EDITOR_BUTTON_CONF,                        GADGET_ID_INFO,
     &editor.button.conf,                       GD_TYPE_NORMAL_BUTTON,
     "properties of level",                     'I'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_SAVE,                        GADGET_ID_SAVE,
+    IMG_GFX_EDITOR_BUTTON_SAVE,                        GADGET_ID_SAVE,
     &editor.button.save,                       GD_TYPE_NORMAL_BUTTON,
     "save level",                              'S'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CLEAR,               GADGET_ID_CLEAR,
+    IMG_GFX_EDITOR_BUTTON_CLEAR,               GADGET_ID_CLEAR,
     &editor.button.clear,                      GD_TYPE_NORMAL_BUTTON,
     "clear level",                             'C'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_TEST,                        GADGET_ID_TEST,
+    IMG_GFX_EDITOR_BUTTON_TEST,                        GADGET_ID_TEST,
     &editor.button.test,                       GD_TYPE_NORMAL_BUTTON,
     "test level",                              'T'
   },
   {
-    IMG_EDITOR_BUTTON_GFX_EXIT,                        GADGET_ID_EXIT,
+    IMG_GFX_EDITOR_BUTTON_EXIT,                        GADGET_ID_EXIT,
     &editor.button.exit,                       GD_TYPE_NORMAL_BUTTON,
     "exit level editor",                       'E'
   },
@@ -1075,27 +1241,27 @@ static struct
   /* ---------- CE and GE control buttons ---------------------------------- */
 
   {
-    IMG_EDITOR_BUTTON_GFX_CE_COPY_FROM,                GADGET_ID_CUSTOM_COPY_FROM,
+    IMG_GFX_EDITOR_BUTTON_CE_COPY_FROM,                GADGET_ID_CUSTOM_COPY_FROM,
     &editor.button.ce_copy_from,               GD_TYPE_RADIO_BUTTON,
     "copy settings from other element",                0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CE_COPY_TO,          GADGET_ID_CUSTOM_COPY_TO,
+    IMG_GFX_EDITOR_BUTTON_CE_COPY_TO,          GADGET_ID_CUSTOM_COPY_TO,
     &editor.button.ce_copy_to,                 GD_TYPE_RADIO_BUTTON,
     "copy settings to other element",          0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CE_SWAP,             GADGET_ID_CUSTOM_EXCHANGE,
+    IMG_GFX_EDITOR_BUTTON_CE_SWAP,             GADGET_ID_CUSTOM_EXCHANGE,
     &editor.button.ce_swap,                    GD_TYPE_RADIO_BUTTON,
     "exchange element with other element",     0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CE_COPY,             GADGET_ID_CUSTOM_COPY,
+    IMG_GFX_EDITOR_BUTTON_CE_COPY,             GADGET_ID_CUSTOM_COPY,
     &editor.button.ce_copy,                    GD_TYPE_NORMAL_BUTTON,
     "copy settings from this element",         0
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CE_PASTE,            GADGET_ID_CUSTOM_PASTE,
+    IMG_GFX_EDITOR_BUTTON_CE_PASTE,            GADGET_ID_CUSTOM_PASTE,
     &editor.button.ce_paste,                   GD_TYPE_NORMAL_BUTTON,
     "paste settings to this element",          0
   },
@@ -1103,9 +1269,29 @@ static struct
   /* ---------- palette control buttons ------------------------------------ */
 
   {
-    IMG_EDITOR_BUTTON_GFX_PROPERTIES,          GADGET_ID_PROPERTIES,
+    IMG_GFX_EDITOR_BUTTON_PROPERTIES,          GADGET_ID_PROPERTIES,
     &editor.button.properties,                 GD_TYPE_NORMAL_BUTTON,
     "properties of drawing element",           'p'
+  },
+  {
+    IMG_GFX_EDITOR_BUTTON_ELEMENT_LEFT,                GADGET_ID_ELEMENT_LEFT,
+    &editor.button.element_left,               GD_TYPE_NORMAL_BUTTON,
+    "properties of drawing element 1",         '1'
+  },
+  {
+    IMG_GFX_EDITOR_BUTTON_ELEMENT_MIDDLE,      GADGET_ID_ELEMENT_MIDDLE,
+    &editor.button.element_middle,             GD_TYPE_NORMAL_BUTTON,
+    "properties of drawing element 2",         '2'
+  },
+  {
+    IMG_GFX_EDITOR_BUTTON_ELEMENT_RIGHT,       GADGET_ID_ELEMENT_RIGHT,
+    &editor.button.element_right,              GD_TYPE_NORMAL_BUTTON,
+    "properties of drawing element 3",         '3'
+  },
+  {
+    IMG_GFX_EDITOR_BUTTON_PALETTE,             GADGET_ID_PALETTE,
+    &editor.button.palette,                    GD_TYPE_NORMAL_BUTTON,
+    "show list of elements",                   'e'
   }
 };
 
@@ -1120,6 +1306,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;
@@ -1169,7 +1362,7 @@ static struct
     NULL,                              "number of gems to collect:", NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(7),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(8),
     0,                                 9999,
     GADGET_ID_LEVEL_TIMELIMIT_DOWN,    GADGET_ID_LEVEL_TIMELIMIT_UP,
     GADGET_ID_LEVEL_TIMELIMIT_TEXT,    GADGET_ID_NONE,
@@ -1177,7 +1370,7 @@ static struct
     "time or step limit to solve level:", NULL, NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(9),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(10),
     0,                                 999,
     GADGET_ID_LEVEL_TIMESCORE_DOWN,    GADGET_ID_LEVEL_TIMESCORE_UP,
     GADGET_ID_LEVEL_TIMESCORE_TEXT,    GADGET_ID_NONE,
@@ -1192,6 +1385,14 @@ static struct
     &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,
@@ -1439,14 +1640,28 @@ 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 */
@@ -1488,6 +1703,15 @@ static struct ValueTextInfo options_game_engine_type[] =
   { GAME_ENGINE_TYPE_RND,      "Rocks'n'Diamonds"              },
   { GAME_ENGINE_TYPE_EM,       "Emerald Mine"                  },
   { GAME_ENGINE_TYPE_SP,       "Supaplex"                      },
+  { GAME_ENGINE_TYPE_MM,       "Mirror Magic"                  },
+
+  { -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                            }
 };
@@ -2185,18 +2409,18 @@ static struct
   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 ---------------------------------- */
 
   {
-    -1,                                        ED_LEVEL_SETTINGS_YPOS(7),
+    -1,                                        ED_LEVEL_SETTINGS_YPOS(8),
     GADGET_ID_TIME_OR_STEPS,           GADGET_ID_LEVEL_TIMELIMIT_UP,
     -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(11),
@@ -2204,26 +2428,34 @@ static struct
     -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(10),
-    GADGET_ID_WIND_DIRECTION,          GADGET_ID_NONE,
+    GADGET_ID_LEVELSET_SAVE_MODE,      GADGET_ID_NONE,
     -1,
-    options_wind_direction,
-    &level.wind_direction_initial,
-    "initial wind direction:", NULL,   "initial wind direction"
+    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(6),
+    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,
+    NULL, "initial wind direction:", NULL,     "initial wind direction"
+  },
+  {
+    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) ------------ */
@@ -2234,7 +2466,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),
@@ -2242,7 +2474,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),
@@ -2250,7 +2482,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),
@@ -2258,7 +2490,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),
@@ -2266,7 +2498,7 @@ 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) ------------ */
@@ -2277,7 +2509,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),
@@ -2285,7 +2517,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),
@@ -2293,7 +2525,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),
@@ -2303,8 +2535,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),
@@ -2312,7 +2544,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),
@@ -2320,7 +2552,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),
@@ -2328,7 +2560,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),
@@ -2336,7 +2568,7 @@ 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) --------------- */
@@ -2347,7 +2579,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),
@@ -2355,7 +2587,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),
@@ -2363,7 +2595,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),
@@ -2371,7 +2603,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),
@@ -2379,7 +2611,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),
@@ -2387,7 +2619,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),
@@ -2395,7 +2627,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),
@@ -2403,7 +2635,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),
@@ -2411,7 +2643,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),
@@ -2419,7 +2651,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),
@@ -2427,7 +2659,7 @@ 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) --------------- */
@@ -2438,7 +2670,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"
   },
 };
 
@@ -2449,68 +2681,99 @@ static struct
   int gadget_id_align;
   int size;
   char *text;
-  char *text_left, *text_right, *infotext;
+  char *text_above, *text_left, *text_right, *infotext;
 } textbutton_info[ED_NUM_TEXTBUTTONS] =
 {
+  /* ---------- level and editor settings (tabs) --------------------------- */
+
   {
-    ED_LEVEL_SETTINGS_TABS_XPOS,       ED_LEVEL_SETTINGS_TABS_YPOS,
+    ED_LEVEL_TABS_XPOS(0),             ED_LEVEL_TABS_YPOS(0),
     GADGET_ID_LEVELINFO_LEVEL,         GADGET_ID_NONE,
-    8,                                 "Level",                        
-    NULL, NULL,                                "Configure level properties"
+    8,                                 "Level",
+    NULL, NULL, NULL,                  "Configure level properties"
+  },
+  {
+    -1,                                        -1,
+    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_LEVEL,
-    8,                                 "Editor",                       
-    NULL, NULL,                                "Configure editor properties"
+    GADGET_ID_LEVELINFO_EDITOR,                GADGET_ID_LEVELINFO_LEVELSET,
+    8,                                 "Editor",
+    NULL, NULL, NULL,                  "Configure editor properties"
   },
+
+  /* ---------- element settings (tabs) ------------------------------------ */
+
   {
-    ED_ELEMENT_SETTINGS_TABS_XPOS,     ED_ELEMENT_SETTINGS_TABS_YPOS,
+    ED_ELEMENT_TABS_XPOS(0),           ED_ELEMENT_TABS_YPOS(0),
     GADGET_ID_PROPERTIES_INFO,         GADGET_ID_NONE,
-    8,                                 "Info",                 
-    NULL, NULL,                                "Show information about element"
+    8,                                 "Info",
+    NULL, NULL, NULL,                  "Show information about element"
   },
   {
     -1,                                        -1,
     GADGET_ID_PROPERTIES_CONFIG,       GADGET_ID_PROPERTIES_INFO,
     8,                                 "Config",
-    NULL, NULL,                                "Configure element properties"
+    NULL, NULL, NULL,                  "Configure element properties"
   },
   {
     -1,                                        -1,
     GADGET_ID_PROPERTIES_CONFIG_1,     GADGET_ID_PROPERTIES_INFO,
     8,                                 "Config 1",
-    NULL, NULL,                                "Configure element properties, part 1"
+    NULL, NULL, NULL,                  "Configure element properties, part 1"
   },
   {
     -1,                                        -1,
     GADGET_ID_PROPERTIES_CONFIG_2,     GADGET_ID_PROPERTIES_CONFIG_1,
     8,                                 "Config 2",
-    NULL, NULL,                                "Configure element properties, part 2"
+    NULL, NULL, NULL,                  "Configure element properties, part 2"
   },
   {
     -1,                                        -1,
     GADGET_ID_PROPERTIES_CHANGE,       GADGET_ID_PROPERTIES_CONFIG_2,
     8,                                 "Change",
-    NULL, NULL,                                "Configure custom element change pages"
+    NULL, NULL, NULL,                  "Configure custom element change pages"
+  },
+
+  /* ---------- 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,
+    -1,                                        "Save",
+    NULL, NULL,                                "this level as level template",
+    "Save current settings as new template"
+  },
+
+  /* ---------- element settings (buttons) --------------------------------- */
+
   {
     -1,                                        -1,
-    GADGET_ID_SAVE_AS_TEMPLATE,                GADGET_ID_CUSTOM_USE_TEMPLATE,
+    GADGET_ID_SAVE_AS_TEMPLATE_1,      GADGET_ID_CUSTOM_USE_TEMPLATE_1,
     -1,                                        "Save",
-    " ", "As Template",                        "Save current settings as new template"
+    NULL, " ",                         "As Template",
+    "Save current settings as new template"
   },
   {
     -1,                                        -1,
     GADGET_ID_ADD_CHANGE_PAGE,         GADGET_ID_PASTE_CHANGE_PAGE,
     -1,                                        "New",
-    NULL, NULL,                                "Add new change page"
+    NULL, NULL, NULL,                  "Add new change page"
   },
   {
     -1,                                        -1,
     GADGET_ID_DEL_CHANGE_PAGE,         GADGET_ID_ADD_CHANGE_PAGE,
     -1,                                        "Delete",
-    NULL, NULL,                                "Delete current change page"
+    NULL, NULL, NULL,                  "Delete current change page"
   },
 };
 
@@ -2536,13 +2799,13 @@ static struct
     NULL, "change page",               "select next change page"
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CP_COPY,
+    IMG_GFX_EDITOR_BUTTON_CP_COPY,
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(14),
     GADGET_ID_COPY_CHANGE_PAGE,                GADGET_ID_NEXT_CHANGE_PAGE,
     " ", NULL,                         "copy settings from this change page"
   },
   {
-    IMG_EDITOR_BUTTON_GFX_CP_PASTE,
+    IMG_GFX_EDITOR_BUTTON_CP_PASTE,
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(14),
     GADGET_ID_PASTE_CHANGE_PAGE,       GADGET_ID_COPY_CHANGE_PAGE,
     NULL, NULL,                                "paste settings to this change page"
@@ -2663,18 +2926,53 @@ static struct
   int gadget_id;
   int gadget_id_align;
   boolean *value;
-  char *text_left, *text_right, *infotext;
+  char *text_above, *text_left, *text_right, *infotext;
 } checkbutton_info[ED_NUM_CHECKBUTTONS] =
 {
   /* ---------- level and editor settings ---------------------------------- */
 
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(6),
+    GADGET_ID_AUTO_COUNT_GEMS,         GADGET_ID_NONE,
+    &level.auto_count_gems,
+    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,
     &random_placement_background_restricted,
-    NULL,
+    NULL, NULL,
     "restrict random placement to:",   "set random placement restriction"
   },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(4),
+    GADGET_ID_CUSTOM_USE_TEMPLATE_3,   GADGET_ID_NONE,
+    &setup.editor.use_template_for_new_levels,
+    "Template for new levels and CE/GE:", NULL,
+    "use template for new levels",     "use template for level properties"
+  },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(5),
+    GADGET_ID_CUSTOM_USE_TEMPLATE_2,   GADGET_ID_NONE,
+    &level.use_custom_template,
+    NULL, NULL,
+    "use template for custom elements",        "use template for custom properties"
+  },
 
   /* ---------- element settings: configure (various elements) ------------- */
 
@@ -2682,184 +2980,233 @@ static struct
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     GADGET_ID_STICK_ELEMENT,           GADGET_ID_NONE,
     &stick_element_properties_window,
-    NULL,
+    NULL, NULL,
     "stick this screen to edit content","stick this screen to edit content"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_EM_SLIPPERY_GEMS,                GADGET_ID_NONE,
     &level.em_slippery_gems,
-    NULL,
+    NULL, NULL,
     "slip down from certain flat walls","use EM/DC style slipping behaviour"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_EM_EXPLODES_BY_FIRE,     GADGET_ID_NONE,
     &level.em_explodes_by_fire,
-    NULL,
+    NULL, NULL,
     "explodes with chain reaction",    "use R'n'D style explosion behaviour"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_USE_SPRING_BUG,          GADGET_ID_NONE,
     &level.use_spring_bug,
-    NULL,
+    NULL, NULL,
     "use spring pushing bug",          "use odd spring pushing behaviour"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_USE_TIME_ORB_BUG,                GADGET_ID_NONE,
     &level.use_time_orb_bug,
-    NULL,
+    NULL, NULL,
     "use time orb bug",                        "use odd time orb behaviour"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_RANDOM_BALL_CONTENT,     GADGET_ID_NONE,
     &level.ball_random,
-    NULL,
+    NULL, NULL,
     "create single random element",    "only create one element from content"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_INITIAL_BALL_STATE,      GADGET_ID_NONE,
     &level.ball_state_initial,
-    NULL,
+    NULL, NULL,
     "magic ball initially activated",  "activate magic ball after level start"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     GADGET_ID_GROW_INTO_DIGGABLE,      GADGET_ID_NONE,
     &level.grow_into_diggable,
-    NULL,
+    NULL, NULL,
     "can grow into anything diggable", "grow into more than just sand"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     GADGET_ID_AUTO_EXIT_SOKOBAN,       GADGET_ID_NONE,
     &level.auto_exit_sokoban,
-    NULL,
+    NULL, NULL,
     "exit level if all fields solved", "automatically finish Sokoban levels"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(8),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CONTINUOUS_SNAPPING,     GADGET_ID_NONE,
     &level.continuous_snapping,
-    NULL,
+    NULL, NULL,
     "continuous snapping",             "use snapping without releasing key"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(7),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_BLOCK_SNAP_FIELD,                GADGET_ID_NONE,
     &level.block_snap_field,
-    NULL,
+    NULL, NULL,
     "block snapped field when snapping", "use snapping delay to show animation"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_BLOCK_LAST_FIELD,                GADGET_ID_NONE,
     &level.block_last_field,
-    NULL,
+    NULL, NULL,
     "block last field when moving",    "player blocks last field when moving"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_SP_BLOCK_LAST_FIELD,     GADGET_ID_NONE,
     &level.sp_block_last_field,
-    NULL,
+    NULL, NULL,
     "block last field when moving",    "player blocks last field when moving"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(3),
     GADGET_ID_INSTANT_RELOCATION,      GADGET_ID_NONE,
     &level.instant_relocation,
-    NULL,
+    NULL, NULL,
     "no scrolling when relocating",    "player gets relocated without delay"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(4),
     GADGET_ID_SHIFTED_RELOCATION,      GADGET_ID_NONE,
     &level.shifted_relocation,
-    NULL,
+    NULL, NULL,
     "no centering when relocating",    "level not centered after relocation"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(5),
+    GADGET_ID_LAZY_RELOCATION,         GADGET_ID_NONE,
+    &level.lazy_relocation,
+    NULL, NULL,
+    "only redraw off-screen relocation","no redraw if relocation target visible"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(10),
     GADGET_ID_USE_START_ELEMENT,       GADGET_ID_NONE,
     &level.use_start_element[0],
-    NULL,
+    NULL, NULL,
     "use level start element:",               "start level at this element's position"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(10),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_USE_ARTWORK_ELEMENT,     GADGET_ID_NONE,
     &level.use_artwork_element[0],
-    NULL,
+    NULL, NULL,
     "use artwork from element:",       "use player artwork from other element"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(11),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(12),
     GADGET_ID_USE_EXPLOSION_ELEMENT,   GADGET_ID_NONE,
     &level.use_explosion_element[0],
-    NULL,
+    NULL, NULL,
     "use explosion from element:",     "use explosion properties from element"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(12),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(13),
     GADGET_ID_INITIAL_GRAVITY,         GADGET_ID_NONE,
     &level.initial_player_gravity[0],
-    NULL,
+    NULL, NULL,
     "use initial gravity",             "set initial player gravity"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_USE_INITIAL_INVENTORY,   GADGET_ID_NONE,
     &level.use_initial_inventory[0],
-    NULL,
+    NULL, NULL,
     "use initial inventory:",          "use collected elements on level start"
   },
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(5),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(6),
     GADGET_ID_CAN_PASS_TO_WALKABLE,    GADGET_ID_NONE,
     &level.can_pass_to_walkable,
-    NULL,
+    NULL, NULL,
     "can pass to walkable element",    "player can pass to empty or walkable"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_CAN_FALL_INTO_ACID,      GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_MOVE_INTO_ACID],
-    NULL,
+    NULL, NULL,
     "can fall into acid (with gravity)","player can fall into acid pool"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     GADGET_ID_CAN_MOVE_INTO_ACID,      GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_MOVE_INTO_ACID],
-    NULL,
+    NULL, NULL,
     "can move into acid",              "element can move into acid pool"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_DONT_COLLIDE_WITH,       GADGET_ID_NONE,
     &custom_element_properties[EP_DONT_COLLIDE_WITH],
-    NULL,
+    NULL, NULL,
     "deadly when colliding with",      "element is deadly when hitting player"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_ENVELOPE_AUTOWRAP,       GADGET_ID_NONE,
     &level.envelope[0].autowrap,
-    NULL,
+    NULL, NULL,
     "auto-wrap",                       "automatically wrap envelope text"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_ENVELOPE_CENTERED,       GADGET_ID_ENVELOPE_AUTOWRAP,
     &level.envelope[0].centered,
-    " ",
+    NULL, " ",
     "centered",                                "automatically center envelope text"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
+    GADGET_ID_MM_LASER_RED,            GADGET_ID_NONE,
+    &level.mm_laser_red,
+    "choose color components for laser:", NULL,
+    "red",                             "use red color components in laser"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
+    GADGET_ID_MM_LASER_GREEN,          GADGET_ID_NONE,
+    &level.mm_laser_green,
+    NULL, NULL,
+    "green",                           "use green color components in laser"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(3),
+    GADGET_ID_MM_LASER_BLUE,           GADGET_ID_NONE,
+    &level.mm_laser_blue,
+    NULL, NULL,
+    "blue",                            "use blue color components in laser"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
+    GADGET_ID_DF_LASER_RED,            GADGET_ID_NONE,
+    &level.df_laser_red,
+    "choose color components for laser:", NULL,
+    "red",                             "use red color components in laser"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
+    GADGET_ID_DF_LASER_GREEN,          GADGET_ID_NONE,
+    &level.df_laser_green,
+    NULL, NULL,
+    "green",                           "use green color components in laser"
+  },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(3),
+    GADGET_ID_DF_LASER_BLUE,           GADGET_ID_NONE,
+    &level.df_laser_blue,
+    NULL, NULL,
+    "blue",                            "use blue color components in laser"
+  },
 
   /* ---------- element settings: configure 1 (custom elements) ----------- */
 
@@ -2867,49 +3214,49 @@ static struct
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_CUSTOM_USE_GRAPHIC,      GADGET_ID_NONE,
     &custom_element.use_gfx_element,
-    NULL,
+    NULL, NULL,
     "use graphic of element:",         "use existing element graphic"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(14),
-    GADGET_ID_CUSTOM_USE_TEMPLATE,     GADGET_ID_NONE,
+    GADGET_ID_CUSTOM_USE_TEMPLATE_1,   GADGET_ID_NONE,
     &level.use_custom_template,
-    NULL,
+    NULL, NULL,
     "use template",                    "use template for custom properties"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_CUSTOM_ACCESSIBLE,       GADGET_ID_NONE,
     &custom_element_properties[EP_ACCESSIBLE],
-    NULL,
+    NULL, NULL,
     NULL,                              "player can walk to or pass this field"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CUSTOM_GRAV_REACHABLE,   GADGET_ID_NONE,
     &custom_element_properties[EP_GRAVITY_REACHABLE],
-    NULL,
+    NULL, NULL,
     "reachable despite gravity",       "player can walk/dig despite gravity"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_USE_LAST_VALUE,   GADGET_ID_NONE,
     &custom_element.use_last_ce_value,
-    NULL,
+    NULL, NULL,
     "use last CE value after change",  "use last CE value after change"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(4),
     GADGET_ID_CUSTOM_WALK_TO_OBJECT,   GADGET_ID_NONE,
     &custom_element_properties[EP_WALK_TO_OBJECT],
-    NULL,
+    NULL, NULL,
     NULL,                              "player can dig/collect/push element"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_CUSTOM_INDESTRUCTIBLE,   GADGET_ID_NONE,
     &custom_element_properties[EP_INDESTRUCTIBLE],
-    NULL,
+    NULL, NULL,
     "indestructible",                  "element is indestructible"
   },
 
@@ -2919,63 +3266,63 @@ static struct
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_CUSTOM_CAN_MOVE,         GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_MOVE],
-    NULL,
+    NULL, NULL,
     NULL,                              "element can move with some pattern"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(7),
     GADGET_ID_CUSTOM_CAN_FALL,         GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_FALL],
-    NULL,
+    NULL, NULL,
     "can fall",                                "element can fall down"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(7),
     GADGET_ID_CUSTOM_CAN_SMASH,                GADGET_ID_CUSTOM_CAN_FALL,
     &custom_element_properties[EP_CAN_SMASH],
-    " ",
+    NULL, " ",
     NULL,                              "element can smash other elements"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_CUSTOM_SLIPPERY,         GADGET_ID_NONE,
     &custom_element_properties[EP_SLIPPERY],
-    NULL,
+    NULL, NULL,
     NULL,                              "other elements can fall down from it"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CUSTOM_DEADLY,           GADGET_ID_NONE,
     &custom_element_properties[EP_DEADLY],
-    NULL,
+    NULL, NULL,
     NULL,                              "element can kill the player"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(10),
     GADGET_ID_CUSTOM_CAN_EXPLODE,      GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_EXPLODE],
-    NULL,
+    NULL, NULL,
     NULL,                              "element can explode"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_EXPLODE_FIRE,     GADGET_ID_NONE,
     &custom_element_properties[EP_EXPLODES_BY_FIRE],
-    NULL,
+    NULL, NULL,
     "by fire",                         "element can explode by fire/explosion"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_EXPLODE_SMASH,    GADGET_ID_CUSTOM_EXPLODE_FIRE,
     &custom_element_properties[EP_EXPLODES_SMASHED],
-    " ",
+    NULL, " ",
     "smashed",                         "element can explode when smashed"
   },
   {
     -1,                                        ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_EXPLODE_IMPACT,   GADGET_ID_CUSTOM_EXPLODE_SMASH,
     &custom_element_properties[EP_EXPLODES_IMPACT],
-    " ",
+    NULL, " ",
     "impact",                          "element can explode on impact"
   },
 
@@ -2985,63 +3332,63 @@ static struct
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(1),
     GADGET_ID_CUSTOM_CAN_CHANGE,       GADGET_ID_NONE,
     &custom_element_change.can_change,
-    NULL,
+    NULL, NULL,
     "element changes to:",             "change element on specified condition"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_CHANGE_DELAY,            GADGET_ID_NONE,
     &custom_element_change_events[CE_DELAY],
-    NULL,
+    NULL, NULL,
     NULL,                              "element changes after delay"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(4),
     GADGET_ID_CHANGE_BY_DIRECT_ACT,    GADGET_ID_NONE,
     &custom_element_change_events[CE_BY_DIRECT_ACTION],
-    NULL,
+    NULL, NULL,
     NULL,                              "element changes by direct action"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(5),
     GADGET_ID_CHANGE_BY_OTHER_ACT,     GADGET_ID_NONE,
     &custom_element_change_events[CE_BY_OTHER_ACTION],
-    NULL,
+    NULL, NULL,
     NULL,                              "element changes by other element"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(8),
     GADGET_ID_CHANGE_USE_EXPLOSION,    GADGET_ID_NONE,
     &custom_element_change.explode,
-    NULL,
+    NULL, NULL,
     "explode instead of change",       "element explodes instead of change"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(1),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CHANGE_USE_CONTENT,      GADGET_ID_NONE,
     &custom_element_change.use_target_content,
-    NULL,
+    NULL, NULL,
     "use extended change target:",     "element changes to more elements"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(11),
     GADGET_ID_CHANGE_ONLY_COMPLETE,    GADGET_ID_NONE,
     &custom_element_change.only_if_complete,
-    NULL,
+    NULL, NULL,
     "replace all or nothing",          "only replace when all can be changed"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(2),       ED_ELEMENT_SETTINGS_YPOS(12),
     GADGET_ID_CHANGE_USE_RANDOM,       GADGET_ID_NONE,
     &custom_element_change.use_random_replace,
-    NULL,
+    NULL, NULL,
     NULL,                              "use percentage for random replace"
   },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(13),
     GADGET_ID_CHANGE_HAS_ACTION,       GADGET_ID_NONE,
     &custom_element_change.has_action,
-    NULL,
+    NULL, NULL,
     NULL,                              "execute action on specified condition"
   },
 };
@@ -3209,7 +3556,7 @@ static struct
   /* ---------- level start element ---------------------------------------- */
 
   {
-    -1,                                        ED_AREA_1X1_SETTINGS_YPOS(9),
+    -1,                                        ED_AREA_1X1_SETTINGS_YPOS(10),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_START_ELEMENT,           GADGET_ID_USE_START_ELEMENT,
     &level.start_element[0],           1, 1,
@@ -3219,7 +3566,7 @@ static struct
   /* ---------- player artwork element ------------------------------------- */
 
   {
-    -1,                                        ED_AREA_1X1_SETTINGS_YPOS(10),
+    -1,                                        ED_AREA_1X1_SETTINGS_YPOS(11),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_ARTWORK_ELEMENT,         GADGET_ID_USE_ARTWORK_ELEMENT,
     &level.artwork_element[0],         1, 1,
@@ -3229,7 +3576,7 @@ static struct
   /* ---------- player explosion element ----------------------------------- */
 
   {
-    -1,                                        ED_AREA_1X1_SETTINGS_YPOS(11),
+    -1,                                        ED_AREA_1X1_SETTINGS_YPOS(12),
     0,                                 ED_AREA_1X1_SETTINGS_YOFF,
     GADGET_ID_EXPLOSION_ELEMENT,       GADGET_ID_USE_EXPLOSION_ELEMENT,
     &level.explosion_element[0],       1, 1,
@@ -3366,8 +3713,9 @@ static int ed_fieldx, ed_fieldy;
 /* actual position of level editor drawing area in level playfield */
 static int level_xpos = -1, level_ypos = -1;
 
-/* actual tile size used to display level editor playfield */
+/* 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)
 
@@ -3380,10 +3728,15 @@ static int new_element3 = EL_SAND;
 #define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
                                (button) == 2 ? new_element2 : \
                                (button) == 3 ? new_element3 : EL_EMPTY)
-#define BUTTON_STEPSIZE(button) ((button) == 1 ?  1 : \
-                                (button) == 2 ?  5 : \
-                                (button) == 3 ? 10 : \
-                                (button))
+
+#define BUTTON_TILE_SIZE(x)    ((x) >= TILESIZE ? TILESIZE : MINI_TILESIZE)
+
+static int use_permanent_palette = TRUE;
+
+#define PX             (use_permanent_palette ? DX : SX)
+#define PY             (use_permanent_palette ? DY : SY)
+#define PXSIZE         (use_permanent_palette ? DXSIZE : SXSIZE)
+#define PYSIZE         (use_permanent_palette ? DYSIZE : SYSIZE)
 
 /* forward declaration for internal use */
 static void ModifyEditorCounterValue(int, int);
@@ -3394,11 +3747,15 @@ static void ModifyEditorDrawingArea(int, int, int);
 static void ModifyEditorElementList();
 static void AdjustElementListScrollbar();
 static void RedrawDrawingElements();
+static void DrawDrawingWindowExt(boolean);
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
+static void DrawPaletteWindow();
 static void UpdateCustomElementGraphicGadgets();
 static boolean checkPropertiesConfig(int);
+static void SetAutomaticNumberOfGemsNeeded();
+static void ClearEditorGadgetInfoText();
 static void CopyLevelToUndoBuffer(int);
 static void HandleDrawingAreas(struct GadgetInfo *);
 static void HandleCounterButtons(struct GadgetInfo *);
@@ -3412,6 +3769,11 @@ 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 getDrawModeHiRes();
+static int getTabulatorBarWidth();
+static int getTabulatorBarHeight();
+static Pixel getTabulatorBarColor();
 
 static int num_editor_gadgets = 0;     /* dynamically determined */
 
@@ -3511,12 +3873,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,
@@ -3555,11 +3917,6 @@ 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;
@@ -3633,8 +3990,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,
@@ -3666,6 +4023,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,
@@ -3709,7 +4071,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,
@@ -3856,6 +4218,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,
@@ -4038,6 +4405,116 @@ 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 editor_hl_mirror_magic[] =
+{
+  EL_INTERNAL_CASCADE_MM_ACTIVE,
+  EL_CHAR('M'),
+  EL_CHAR('M'),
+  EL_EMPTY,
+};
+
+static int editor_el_mirror_magic[] =
+{
+  EL_MM_MCDUFFIN_RIGHT,
+  EL_MM_MCDUFFIN_UP,
+  EL_MM_MCDUFFIN_LEFT,
+  EL_MM_MCDUFFIN_DOWN,
+
+  EL_MM_MIRROR_START,
+  EL_MM_MIRROR_FIXED_START,
+  EL_MM_POLARIZER_START,
+  EL_MM_POLARIZER_CROSS_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,
+  EL_MM_PACMAN_RIGHT,
+  EL_MM_EXIT_CLOSED,
+
+  EL_MM_KETTLE,
+  EL_MM_BOMB,
+  EL_MM_KEY,
+  EL_MM_FUEL_FULL,
+
+  EL_MM_LIGHTBULB,
+  EL_MM_LIGHTBULB_ACTIVE,
+  EL_MM_GRAY_BALL,
+  EL_MM_LIGHTBALL,
+
+  EL_MM_STEEL_WALL,
+  EL_MM_WOODEN_WALL,
+  EL_MM_ICE_WALL,
+  EL_MM_AMOEBA_WALL,
+
+  EL_MM_STEEL_LOCK,
+  EL_MM_WOODEN_LOCK,
+  EL_MM_STEEL_BLOCK,
+  EL_MM_WOODEN_BLOCK,
+
+  EL_MM_STEEL_GRID_FIXED_1,
+  EL_MM_STEEL_GRID_FIXED_2,
+  EL_MM_STEEL_GRID_FIXED_3,
+  EL_MM_STEEL_GRID_FIXED_4,
+
+  EL_MM_WOODEN_GRID_FIXED_1,
+  EL_MM_WOODEN_GRID_FIXED_2,
+  EL_MM_WOODEN_GRID_FIXED_3,
+  EL_MM_WOODEN_GRID_FIXED_4
+};
+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 editor_hl_deflektor[] =
+{
+  EL_INTERNAL_CASCADE_DF_ACTIVE,
+  EL_CHAR('D'),
+  EL_CHAR('F'),
+  EL_EMPTY,
+};
+
+static int editor_el_deflektor[] =
+{
+  EL_DF_LASER_RIGHT,
+  EL_DF_LASER_UP,
+  EL_DF_LASER_LEFT,
+  EL_DF_LASER_DOWN,
+
+  EL_DF_RECEIVER_RIGHT,
+  EL_DF_RECEIVER_UP,
+  EL_DF_RECEIVER_LEFT,
+  EL_DF_RECEIVER_DOWN,
+
+  EL_DF_MIRROR_START,
+  EL_DF_MIRROR_ROTATING_START,
+  EL_DF_CELL,
+  EL_DF_MINE,
+
+  EL_DF_FIBRE_OPTIC_RED_1,
+  EL_DF_FIBRE_OPTIC_YELLOW_1,
+  EL_DF_FIBRE_OPTIC_GREEN_1,
+  EL_DF_FIBRE_OPTIC_BLUE_1,
+
+  EL_DF_STEEL_GRID_FIXED_START,
+  EL_DF_STEEL_GRID_ROTATING_START,
+  EL_DF_WOODEN_GRID_FIXED_START,
+  EL_DF_WOODEN_GRID_ROTATING_START,
+
+  EL_DF_STEEL_WALL,
+  EL_DF_WOODEN_WALL,
+  EL_DF_REFRACTOR,
+  EL_EMPTY
+};
+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 editor_hl_chars[] =
 {
   EL_INTERNAL_CASCADE_CHARS_ACTIVE,
@@ -4732,9 +5209,25 @@ static boolean use_el_empty = FALSE;
 static int *editor_elements = NULL;    /* dynamically allocated */
 static int num_editor_elements = 0;    /* dynamically determined */
 
-static boolean setup_editor_show_always = TRUE;
 static boolean setup_editor_cascade_never = FALSE;
 
+static boolean setup_editor_el_players                 = TRUE;
+static boolean setup_editor_el_boulderdash             = TRUE;
+static boolean setup_editor_el_emerald_mine            = TRUE;
+static boolean setup_editor_el_emerald_mine_club       = TRUE;
+static boolean setup_editor_el_more                    = TRUE;
+static boolean setup_editor_el_sokoban                 = TRUE;
+static boolean setup_editor_el_supaplex                        = TRUE;
+static boolean setup_editor_el_diamond_caves           = TRUE;
+static boolean setup_editor_el_dx_boulderdash          = TRUE;
+static boolean setup_editor_el_mirror_magic            = TRUE;
+static boolean setup_editor_el_deflektor               = TRUE;
+static boolean setup_editor_el_chars                   = TRUE;
+static boolean setup_editor_el_steel_chars             = TRUE;
+static boolean setup_editor_el_custom                  = TRUE;
+static boolean setup_editor_el_user_defined            = TRUE;
+static boolean setup_editor_el_dynamic                 = TRUE;
+
 static int editor_hl_unused[] = { EL_EMPTY };
 static int *editor_hl_unused_ptr = editor_hl_unused;
 static int num_editor_hl_unused = 0;
@@ -4755,97 +5248,109 @@ static struct
 editor_elements_info[] =
 {
   {
-    &setup_editor_show_always,
+    &setup_editor_el_players,
     &setup_editor_cascade_never,
     &editor_hl_unused_ptr,             &num_editor_hl_unused,
     &editor_el_players_ptr,            &num_editor_el_players
   },
   {
-    &setup.editor.el_boulderdash,
+    &setup_editor_el_boulderdash,
     &setup.editor_cascade.el_bd,
     &editor_hl_boulderdash_ptr,                &num_editor_hl_boulderdash,
     &editor_el_boulderdash_ptr,                &num_editor_el_boulderdash
   },
   {
-    &setup.editor.el_emerald_mine,
+    &setup_editor_el_emerald_mine,
     &setup.editor_cascade.el_em,
     &editor_hl_emerald_mine_ptr,       &num_editor_hl_emerald_mine,
     &editor_el_emerald_mine_ptr,       &num_editor_el_emerald_mine
   },
   {
-    &setup.editor.el_emerald_mine_club,
+    &setup_editor_el_emerald_mine_club,
     &setup.editor_cascade.el_emc,
     &editor_hl_emerald_mine_club_ptr,  &num_editor_hl_emerald_mine_club,
     &editor_el_emerald_mine_club_ptr,  &num_editor_el_emerald_mine_club
   },
   {
-    &setup.editor.el_more,
+    &setup_editor_el_more,
     &setup.editor_cascade.el_rnd,
     &editor_hl_rnd_ptr,                        &num_editor_hl_rnd,
     &editor_el_rnd_ptr,                        &num_editor_el_rnd
   },
   {
-    &setup.editor.el_sokoban,
+    &setup_editor_el_sokoban,
     &setup.editor_cascade.el_sb,
     &editor_hl_sokoban_ptr,            &num_editor_hl_sokoban,
     &editor_el_sokoban_ptr,            &num_editor_el_sokoban
   },
   {
-    &setup.editor.el_supaplex,
+    &setup_editor_el_supaplex,
     &setup.editor_cascade.el_sp,
     &editor_hl_supaplex_ptr,           &num_editor_hl_supaplex,
     &editor_el_supaplex_ptr,           &num_editor_el_supaplex
   },
   {
-    &setup.editor.el_diamond_caves,
+    &setup_editor_el_diamond_caves,
     &setup.editor_cascade.el_dc,
     &editor_hl_diamond_caves_ptr,      &num_editor_hl_diamond_caves,
     &editor_el_diamond_caves_ptr,      &num_editor_el_diamond_caves
   },
   {
-    &setup.editor.el_dx_boulderdash,
+    &setup_editor_el_dx_boulderdash,
     &setup.editor_cascade.el_dx,
     &editor_hl_dx_boulderdash_ptr,     &num_editor_hl_dx_boulderdash,
     &editor_el_dx_boulderdash_ptr,     &num_editor_el_dx_boulderdash
   },
   {
-    &setup.editor.el_chars,
+    &setup_editor_el_mirror_magic,
+    &setup.editor_cascade.el_mm,
+    &editor_hl_mirror_magic_ptr,       &num_editor_hl_mirror_magic,
+    &editor_el_mirror_magic_ptr,       &num_editor_el_mirror_magic
+  },
+  {
+    &setup_editor_el_deflektor,
+    &setup.editor_cascade.el_df,
+    &editor_hl_deflektor_ptr,          &num_editor_hl_deflektor,
+    &editor_el_deflektor_ptr,          &num_editor_el_deflektor
+  },
+  {
+    &setup_editor_el_chars,
     &setup.editor_cascade.el_chars,
     &editor_hl_chars_ptr,              &num_editor_hl_chars,
     &editor_el_chars_ptr,              &num_editor_el_chars
   },
   {
-    &setup.editor.el_steel_chars,
+    &setup_editor_el_steel_chars,
     &setup.editor_cascade.el_steel_chars,
     &editor_hl_steel_chars_ptr,                &num_editor_hl_steel_chars,
     &editor_el_steel_chars_ptr,                &num_editor_el_steel_chars
   },
   {
-    &setup.editor.el_custom,
+    &setup_editor_el_custom,
     &setup.editor_cascade.el_ce,
     &editor_hl_custom_ptr,             &num_editor_hl_custom,
     &editor_el_custom_ptr,             &num_editor_el_custom
   },
   {
-    &setup.editor.el_custom,
+    &setup_editor_el_custom,
     &setup.editor_cascade.el_ge,
     &editor_hl_group_ptr,              &num_editor_hl_group,
     &editor_el_group_ptr,              &num_editor_el_group
   },
   {
-    &setup.editor.el_custom,
+    &setup_editor_el_custom,
     &setup.editor_cascade.el_ref,
     &editor_hl_reference_ptr,          &num_editor_hl_reference,
     &editor_el_reference_ptr,          &num_editor_el_reference
   },
   {
-    &setup.editor.el_user_defined,
+    &setup_editor_el_user_defined,
     &setup.editor_cascade.el_user,
     &editor_hl_user_defined_ptr,       &num_editor_hl_user_defined,
     &editor_el_user_defined_ptr,       &num_editor_el_user_defined
   },
   {
-    &setup.editor.el_dynamic,
+    &setup_editor_el_dynamic,
     &setup.editor_cascade.el_dynamic,
     &editor_hl_dynamic_ptr,            &num_editor_hl_dynamic,
     &editor_el_dynamic_ptr,            &num_editor_el_dynamic,
@@ -4873,7 +5378,7 @@ editor_elements_info[] =
 
 static int getMaxInfoTextLength()
 {
-  return (SXSIZE / getFontWidth(FONT_TEXT_2));
+  return (SXSIZE / getFontWidth(INFOTEXT_FONT));
 }
 
 static int getTextWidthForGadget(char *text)
@@ -4963,6 +5468,13 @@ char *getElementDescriptionFilename(int element)
   return NULL;
 }
 
+static boolean suppressBorderElement()
+{
+  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];
@@ -5010,36 +5522,147 @@ static void InitDynamicEditorElementList(int **elements, int *num_elements)
     (*elements)[(*num_elements)++] = EL_EMPTY;
 }
 
-static void ReinitializeElementList()
+static void ReinitializeElementList_EnableSections()
 {
-  static boolean initialization_needed = TRUE;
-  int pos = 0;
-  int i, j;
+  /* default: enable all element sections */
 
-  if (initialization_needed)
-  {
-    LoadSetup_EditorCascade();         /* load last editor cascade state */
+  setup_editor_el_players              = TRUE;
+  setup_editor_el_boulderdash          = TRUE;
+  setup_editor_el_emerald_mine         = TRUE;
+  setup_editor_el_emerald_mine_club    = TRUE;
+  setup_editor_el_more                 = TRUE;
+  setup_editor_el_sokoban              = TRUE;
+  setup_editor_el_supaplex             = TRUE;
+  setup_editor_el_diamond_caves                = TRUE;
+  setup_editor_el_dx_boulderdash       = TRUE;
+  setup_editor_el_mirror_magic         = TRUE;
+  setup_editor_el_deflektor            = TRUE;
+  setup_editor_el_chars                        = TRUE;
+  setup_editor_el_steel_chars          = TRUE;
 
-    /* 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];
-      boolean cascade_value = *editor_elements_info[i].setup_cascade_value;
+  setup_editor_el_custom               = TRUE;
+  setup_editor_el_user_defined         = TRUE;
+  setup_editor_el_dynamic              = TRUE;
 
-      if (IS_EDITOR_CASCADE(*cascade_element))
-       *cascade_element =
-         (cascade_value ? EL_CASCADE_ACTIVE(*cascade_element) :
-          EL_CASCADE_INACTIVE(*cascade_element));
-    }
+  /* now disable all element sections not to be displayed */
 
-    initialization_needed = FALSE;
+  if (!setup.editor.el_classic)
+  {
+    setup_editor_el_players            = FALSE;
+    setup_editor_el_boulderdash                = FALSE;
+    setup_editor_el_emerald_mine       = FALSE;
+    setup_editor_el_emerald_mine_club  = FALSE;
+    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;
+    setup_editor_el_chars              = FALSE;
+    setup_editor_el_steel_chars                = FALSE;
   }
 
-  checked_free(editor_elements);
-
-  /* reload optional user defined element list for each invocation of editor */
-  LoadUserDefinedEditorElementList(&editor_el_user_defined_ptr,
-                                  &num_editor_el_user_defined);
+  if (!setup.editor.el_custom)
+  {
+    setup_editor_el_custom             = FALSE;
+  }
+
+  if (!setup.editor.el_user_defined)
+  {
+    setup_editor_el_user_defined       = FALSE;
+  }
+
+  if (!setup.editor.el_dynamic)
+  {
+    setup_editor_el_dynamic            = FALSE;
+  }
+
+  if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
+  {
+    setup_editor_el_mirror_magic       = FALSE;
+    setup_editor_el_deflektor          = FALSE;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+  {
+    setup_editor_el_boulderdash                = FALSE;
+    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;
+    setup_editor_el_steel_chars                = FALSE;
+
+    setup_editor_el_custom             = FALSE;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+  {
+    setup_editor_el_players            = FALSE;
+    setup_editor_el_boulderdash                = FALSE;
+    setup_editor_el_emerald_mine       = FALSE;
+    setup_editor_el_emerald_mine_club  = FALSE;
+    setup_editor_el_more               = FALSE;
+    setup_editor_el_sokoban            = FALSE;
+    setup_editor_el_diamond_caves      = FALSE;
+    setup_editor_el_dx_boulderdash     = FALSE;
+    setup_editor_el_mirror_magic       = FALSE;
+    setup_editor_el_deflektor          = FALSE;
+    setup_editor_el_chars              = FALSE;
+    setup_editor_el_steel_chars                = FALSE;
+
+    setup_editor_el_custom             = FALSE;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+  {
+    setup_editor_el_players            = FALSE;
+    setup_editor_el_boulderdash                = FALSE;
+    setup_editor_el_emerald_mine       = FALSE;
+    setup_editor_el_emerald_mine_club  = FALSE;
+    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_steel_chars                = FALSE;
+
+    setup_editor_el_custom             = FALSE;
+  }
+}
+
+static void ReinitializeElementList()
+{
+  static boolean initialization_needed = TRUE;
+  int pos = 0;
+  int i, j;
+
+  ReinitializeElementList_EnableSections();
+
+  if (initialization_needed)
+  {
+    LoadSetup_EditorCascade();         /* load last editor 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];
+      boolean cascade_value = *editor_elements_info[i].setup_cascade_value;
+
+      if (IS_EDITOR_CASCADE(*cascade_element))
+       *cascade_element =
+         (cascade_value ? EL_CASCADE_ACTIVE(*cascade_element) :
+          EL_CASCADE_INACTIVE(*cascade_element));
+    }
+
+    initialization_needed = FALSE;
+  }
+
+  checked_free(editor_elements);
+
+  /* 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 */
   InitDynamicEditorElementList(&editor_el_dynamic_ptr,
@@ -5060,7 +5683,7 @@ static void ReinitializeElementList()
        Error(ERR_WARN, "editor element %d is runtime element", element);
 
       if (strEqual(getElementInfoText(element), INFOTEXT_UNKNOWN_ELEMENT))
-       Error(ERR_WARN, "no element description for element %d", element);
+       Error(ERR_WARN, "no element description text for element %d", element);
     }
   }
 
@@ -5110,6 +5733,10 @@ static void ReinitializeElementList()
 
     num_editor_elements += num_editor_el_empty;
   }
+  else
+  {
+    num_editor_el_empty = 0;
+  }
 
   editor_elements = checked_malloc(num_editor_elements * sizeof(int));
 
@@ -5165,7 +5792,7 @@ static void ReinitializeElementList()
 
 void PrintEditorElementList()
 {
-  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++)
@@ -5177,9 +5804,9 @@ void PrintEditorElementList()
       int cascade_element_show = EL_CASCADE_INACTIVE(cascade_element);
       char *headline = element_info[cascade_element_show].editor_description;
 
-      printf_line_with_prefix("# ", "-", 77);
-      printf("# %s\n", headline);
-      printf_line_with_prefix("# ", "-", 77);
+      PrintLineWithPrefix("# ", "-", 77);
+      Print("# %s\n", headline);
+      PrintLineWithPrefix("# ", "-", 77);
     }
 
     for (j = 0; j < *editor_elements_info[i].headline_list_size; j++)
@@ -5189,21 +5816,21 @@ void PrintEditorElementList()
       if (IS_EDITOR_CASCADE(element))
        element = EL_CHAR_MINUS;
 
-      printf("# %s\n", element_info[element].token_name);
+      Print("# %s\n", element_info[element].token_name);
     }
 
     if (j > 0)
-      printf("#\n");
+      Print("#\n");
 
     for (j = 0; j < *editor_elements_info[i].element_list_size; j++)
     {
       int element = (*editor_elements_info[i].element_list)[j];
 
-      printf("# %s\n", element_info[element].token_name);
+      Print("# %s\n", element_info[element].token_name);
     }
 
     if (j > 0)
-      printf("#\n");
+      Print("#\n");
   }
 }
 
@@ -5244,49 +5871,101 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height,
 {
   int border_graphic =
     (input ? IMG_EDITOR_ELEMENT_BORDER_INPUT : IMG_EDITOR_ELEMENT_BORDER);
-  Bitmap *src_bitmap;
-  int src_x, src_y;
-  int bx = (input ? ED_ELEMENT_BORDER_INPUT : ED_ELEMENT_BORDER);
-  int by = (input ? ED_ELEMENT_BORDER_INPUT : ED_ELEMENT_BORDER);
-  int bx2 = TILEX - bx;
-  int by2 = TILEY - by;
+  struct GraphicInfo *g = &graphic_info[border_graphic];
+  Bitmap *src_bitmap = g->bitmap;
+  int src_x = g->src_x;
+  int src_y = g->src_y;
+  int border_size = g->border_size;
+  int border_xpos = g->width  - border_size;
+  int border_ypos = g->height - border_size;
+  int tilesize = ED_DRAWINGAREA_TILE_SIZE;
   int i;
 
-  getFixedGraphicSource(border_graphic, 0, &src_bitmap, &src_x, &src_y);
-
   BlitBitmap(src_bitmap, drawto, src_x, src_y,
-            bx, by, dest_x - bx, dest_y - by);
-  BlitBitmap(src_bitmap, drawto, src_x + bx2, src_y,
-            bx, by, dest_x + width, dest_y - by);
-  BlitBitmap(src_bitmap, drawto, src_x, src_y + by2,
-            bx, by, dest_x - bx, dest_y + height);
-  BlitBitmap(src_bitmap, drawto, src_x + bx2, src_y + by2,
-            bx, by, dest_x + width, dest_y + height);
-
-  for (i = 0; i < width / MINI_TILEX; i++)
-  {
-    BlitBitmap(src_bitmap, drawto, src_x + bx, src_y, MINI_TILEX, by,
-              dest_x + i * MINI_TILEX, dest_y - by);
-    BlitBitmap(src_bitmap, drawto, src_x + bx, src_y + by2, MINI_TILEX, by,
-              dest_x + i * MINI_TILEX, dest_y + height);
-  }
-
-  for (i = 0; i < height / MINI_TILEY; i++)
-  {
-    BlitBitmap(src_bitmap, drawto, src_x, src_y + by, bx, MINI_TILEY,
-              dest_x - bx, dest_y + i * MINI_TILEY);
-    BlitBitmap(src_bitmap, drawto, src_x + bx2, src_y + by, bx, MINI_TILEY,
-              dest_x + width, dest_y + i * MINI_TILEY);
+            border_size, border_size,
+            dest_x - border_size, dest_y - border_size);
+  BlitBitmap(src_bitmap, drawto, src_x + border_xpos, src_y,
+            border_size, border_size,
+            dest_x + width, dest_y - border_size);
+  BlitBitmap(src_bitmap, drawto, src_x, src_y + border_ypos,
+            border_size, border_size,
+            dest_x - border_size, dest_y + height);
+  BlitBitmap(src_bitmap, drawto, src_x + border_xpos, src_y + border_ypos,
+            border_size, border_size,
+            dest_x + width, dest_y + height);
+
+  for (i = 0; i < width / tilesize; i++)
+  {
+    BlitBitmap(src_bitmap, drawto, src_x + border_size, src_y,
+              tilesize, border_size,
+              dest_x + i * tilesize, dest_y - border_size);
+    BlitBitmap(src_bitmap, drawto, src_x + border_size, src_y + border_ypos,
+              tilesize, border_size,
+              dest_x + i * tilesize, dest_y + height);
+  }
+
+  for (i = 0; i < height / tilesize; i++)
+  {
+    BlitBitmap(src_bitmap, drawto, src_x, src_y + border_size,
+              border_size, tilesize,
+              dest_x - border_size, dest_y + i * tilesize);
+    BlitBitmap(src_bitmap, drawto, src_x + border_xpos, src_y + border_size,
+              border_size, tilesize,
+              dest_x + width, dest_y + i * tilesize);
   }
 
   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()
+{
+  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);
 }
 
+static void DrawEditorElementThruMask(int x, int y, int element)
+{
+  DrawSizedElementThruMask(x, y, element, ed_tilesize);
+}
+
 static void DrawEditorElementOrWall(int x, int y, int scroll_x, int scroll_y)
 {
   DrawSizedElementOrWall(x, y, scroll_x, scroll_y, ed_tilesize);
@@ -5295,6 +5974,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)
@@ -5305,13 +5985,14 @@ static void DrawDrawingArea(int id)
   int *value = drawingarea_info[id].value;
   int area_xsize = drawingarea_info[id].area_xsize;
   int area_ysize = drawingarea_info[id].area_ysize;
+  int tilesize = ED_DRAWINGAREA_TILE_SIZE;
 
   for (x = 0; x < area_xsize; x++)
     for (y = 0; y < area_ysize; y++)
-      DrawMiniGraphicExt(drawto,
-                        gi->x + x * MINI_TILEX,
-                        gi->y + y * MINI_TILEY,
-                        el2edimg(value[x * area_ysize + y]));
+      DrawSizedGraphicExt(drawto,
+                         gi->x + x * tilesize,
+                         gi->y + y * tilesize,
+                         el2edimg(value[x * area_ysize + y]), 0, tilesize);
 }
 
 static void ScrollEditorLevel(int from_x, int from_y, int scroll)
@@ -5345,13 +6026,10 @@ static void ScrollEditorLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void getElementListGraphicSource(int element, Bitmap **bitmap, int *x, int *y)
+void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap,
+                           int *x, int *y)
 {
-  int graphic = el2edimg(element);
-  int tile_size = (editor.palette.tile_size >= TILESIZE ? TILESIZE :
-                  MINI_TILESIZE);
-
-  getSizedGraphicSource(graphic, 0, tile_size, bitmap, x, y);
+  getSizedGraphicSource(el2edimg(element), 0, tile_size, bitmap, x, y);
 }
 
 static void CreateControlButtons()
@@ -5365,8 +6043,12 @@ static void CreateControlButtons()
     int id = controlbutton_info[i].gadget_id;
     int type = controlbutton_info[i].gadget_type;
     int graphic = controlbutton_info[i].graphic;
-    struct XY *pos = controlbutton_info[i].pos;
+    struct XYTileSize *pos = controlbutton_info[i].pos;
     struct GraphicInfo *gd = &graphic_info[graphic];
+    Bitmap *deco_bitmap = NULL;
+    int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
+    int tile_size = 0, deco_shift = 0;
+    boolean deco_masked = FALSE;
     int gd_x1 = gd->src_x;
     int gd_y1 = gd->src_y;
     int gd_x2 = gd->src_x + gd->pressed_xoffset;
@@ -5400,11 +6082,40 @@ static void CreateControlButtons()
        event_mask = GD_EVENT_RELEASED;
     }
 
-    if (id == GADGET_ID_PROPERTIES)
+    if (id == GADGET_ID_PROPERTIES ||
+       id == GADGET_ID_PALETTE)
     {
       x += DX;
       y += DY;
     }
+    else if (id == GADGET_ID_ELEMENT_LEFT ||
+            id == GADGET_ID_ELEMENT_MIDDLE ||
+            id == GADGET_ID_ELEMENT_RIGHT)
+    {
+      x += DX;
+      y += DY;
+
+      int element = (id == GADGET_ID_ELEMENT_LEFT   ? new_element1 :
+                    id == GADGET_ID_ELEMENT_MIDDLE ? new_element2 :
+                    id == GADGET_ID_ELEMENT_RIGHT  ? new_element3 : EL_EMPTY);
+
+      tile_size = BUTTON_TILE_SIZE(id == GADGET_ID_ELEMENT_LEFT ?
+                                  editor.button.element_left.tile_size :
+                                  id == GADGET_ID_ELEMENT_MIDDLE ?
+                                  editor.button.element_middle.tile_size :
+                                  id == GADGET_ID_ELEMENT_RIGHT ?
+                                  editor.button.element_right.tile_size : 0);
+
+      // make sure that decoration does not overlap gadget border
+      tile_size = MIN(tile_size, MIN(gd->width, gd->height));
+
+      getEditorGraphicSource(element, tile_size, &deco_bitmap, &deco_x,&deco_y);
+
+      deco_xpos = (gd->width  - tile_size) / 2;
+      deco_ypos = (gd->height - tile_size) / 2;
+      deco_shift = 1;
+      deco_masked = gd->draw_masked;
+    }
     else
     {
       x += EX;
@@ -5426,6 +6137,11 @@ static void CreateControlButtons()
                      GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2,
                      GDI_ALT_DESIGN_UNPRESSED, gd->bitmap, gd_x1a, gd_y1a,
                      GDI_ALT_DESIGN_PRESSED, gd->bitmap, gd_x2a, gd_y2a,
+                     GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y,
+                     GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
+                     GDI_DECORATION_SIZE, tile_size, tile_size,
+                     GDI_DECORATION_SHIFTING, deco_shift, deco_shift,
+                     GDI_DECORATION_MASKED, deco_masked,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
                      GDI_CALLBACK_ACTION, HandleControlButtons,
@@ -5471,8 +6187,8 @@ static void CreateControlButtons()
     if (id == GADGET_ID_SCROLL_LIST_UP ||
        id == GADGET_ID_SCROLL_LIST_DOWN)
     {
-      x += DX;
-      y += DY;
+      x += PX;
+      y += PY;
     }
     else
     {
@@ -5517,14 +6233,14 @@ static void CreateControlButtons()
     int gd_y2 = gd->src_y + gd->pressed_yoffset;
     int xx = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
     int yy = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
-    int x = DX + ED_ELEMENTLIST_XPOS + xx * gd->width;
-    int y = DY + ED_ELEMENTLIST_YPOS + yy * gd->height;
+    int x = PX + ED_ELEMENTLIST_XPOS + xx * gd->width;
+    int y = PY + ED_ELEMENTLIST_YPOS + yy * gd->height;
     int element = editor_elements[i];
-    int tile_size = (editor.palette.tile_size >= TILESIZE ? TILESIZE :
-                    MINI_TILESIZE);
+    int tile_size = BUTTON_TILE_SIZE(editor.palette.tile_size);
     unsigned int event_mask = GD_EVENT_RELEASED;
 
-    getElementListGraphicSource(element, &deco_bitmap, &deco_x, &deco_y);
+    getEditorGraphicSource(element, tile_size, &deco_bitmap, &deco_x, &deco_y);
+
     deco_xpos = (gd->width  - tile_size) / 2;
     deco_ypos = (gd->height - tile_size) / 2;
 
@@ -5592,8 +6308,8 @@ static void CreateCounterButtons()
       if (i == ED_COUNTER_ID_SELECT_LEVEL)
       {
        graphic = (j == 0 ?
-                  IMG_EDITOR_BUTTON_GFX_PREV_LEVEL :
-                  IMG_EDITOR_BUTTON_GFX_NEXT_LEVEL);
+                  IMG_GFX_EDITOR_BUTTON_PREV_LEVEL :
+                  IMG_GFX_EDITOR_BUTTON_NEXT_LEVEL);
 
        event_mask |= GD_EVENT_RELEASED;
 
@@ -5648,7 +6364,7 @@ static void CreateCounterButtons()
       right_gadget_border[id] =
        getRightGadgetBorder(gi, counterbutton_info[i].text_right);
 
-      x += gi->width + ED_GADGET_DISTANCE;     /* text count button */
+      x += gi->width + ED_GADGET_SMALL_DISTANCE;       /* text count button */
 
       if (j == 0)
       {
@@ -5661,7 +6377,7 @@ static void CreateCounterButtons()
 
        if (i == ED_COUNTER_ID_SELECT_LEVEL)
        {
-         graphic = IMG_EDITOR_INPUT_GFX_LEVEL_NUMBER;
+         graphic = IMG_GFX_EDITOR_INPUT_LEVEL_NUMBER;
 
          font_type = FONT_LEVEL_NUMBER;
          font_type_active = FONT_LEVEL_NUMBER_ACTIVE;
@@ -5709,7 +6425,7 @@ static void CreateCounterButtons()
        right_gadget_border[id] =
          getRightGadgetBorder(gi, counterbutton_info[i].text_right);
 
-       x += gi->width + ED_GADGET_DISTANCE;    /* up count button */
+       x += gi->width + ED_GADGET_SMALL_DISTANCE;      /* up count button */
       }
     }
   }
@@ -5732,10 +6448,12 @@ static void CreateDrawingAreas()
     int y = SY + ED_AREA_SETTINGS_Y(drawingarea_info[i]);
     int area_xsize = drawingarea_info[i].area_xsize;
     int area_ysize = drawingarea_info[i].area_ysize;
+    int item_size = (id == GADGET_ID_DRAWING_LEVEL ?
+                    ed_tilesize : ED_DRAWINGAREA_TILE_SIZE);
 
     event_mask =
       GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
-      GD_EVENT_OFF_BORDERS;
+      GD_EVENT_OFF_BORDERS | GD_EVENT_PIXEL_PRECISE;
 
     /* determine horizontal position to the right of specified gadget */
     if (drawingarea_info[i].gadget_id_align != GADGET_ID_NONE)
@@ -5752,7 +6470,7 @@ static void CreateDrawingAreas()
                      GDI_Y, y,
                      GDI_TYPE, GD_TYPE_DRAWING_AREA,
                      GDI_AREA_SIZE, area_xsize, area_ysize,
-                     GDI_ITEM_SIZE, ed_tilesize, ed_tilesize,
+                     GDI_ITEM_SIZE, item_size, item_size,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
                      GDI_CALLBACK_ACTION, HandleDrawingAreas,
@@ -5770,11 +6488,6 @@ static void CreateDrawingAreas()
 static void CreateTextInputGadgets()
 {
   struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
-  int border_size = gd->border_size;
-  int font_nr = FONT_INPUT_1;
-  int font_height = getFontHeight(font_nr);
-  int xoffset = TILEX + ED_ELEMENT_BORDER + 3 * border_size;
-  int yoffset = (TILEY - font_height) / 2;
   int max_infotext_len = getMaxInfoTextLength();
   int i;
 
@@ -5792,8 +6505,19 @@ static void CreateTextInputGadgets()
 
     if (i == ED_TEXTINPUT_ID_ELEMENT_NAME)
     {
-      x = ED_ELEMENT_SETTINGS_ELEM_XPOS + xoffset - border_size;
-      y = ED_ELEMENT_SETTINGS_ELEM_YPOS + yoffset - border_size;
+      int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
+      int border_size = gd->border_size;
+      int font_nr = FONT_INPUT_1;
+      int font_height = getFontHeight(font_nr);
+      int xoffset = element_border + TILEX + element_border + 3 * border_size;
+      int yoffset = element_border + (TILEY - font_height) / 2;
+
+      x = (editor.settings.element_name.x != -1 ?
+          editor.settings.element_name.x :
+          editor.settings.element_graphic.x + xoffset) - border_size;
+      y = (editor.settings.element_name.y != -1 ?
+          editor.settings.element_name.y :
+          editor.settings.element_graphic.y + yoffset) - border_size;
     }
     else
     {
@@ -5976,7 +6700,7 @@ static void CreateTextbuttonGadgets()
     int graphic =
       (is_tab_button ? IMG_EDITOR_TABBUTTON : IMG_EDITOR_TEXTBUTTON);
     int gadget_distance =
-      (is_tab_button ? ED_GADGET_DISTANCE : ED_GADGET_TEXT_DISTANCE);
+      (is_tab_button ? ED_GADGET_SMALL_DISTANCE : ED_GADGET_TEXT_DISTANCE);
     struct GraphicInfo *gd = &graphic_info[graphic];
     int gd_x1 = gd->src_x;
     int gd_y1 = gd->src_y;
@@ -5989,8 +6713,8 @@ static void CreateTextbuttonGadgets()
     struct GadgetInfo *gi;
     unsigned int event_mask;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
-    int x = SX + textbutton_info[i].x;
-    int y = SY + textbutton_info[i].y;
+    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 */
       textbutton_info[i].size = strlen(textbutton_info[i].text);
@@ -6131,25 +6855,27 @@ static void CreateScrollbarGadgets()
   scrollbar_pos[ED_SCROLLBAR_ID_AREA_VERTICAL].wheel_height = SYSIZE;
 
   scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].x =
-    DX + ED_SCROLL2_VERTICAL_XPOS;
+    PX + ED_SCROLL2_VERTICAL_XPOS;
   scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].y =
-    DY + ED_SCROLL2_VERTICAL_YPOS;
+    PY + ED_SCROLL2_VERTICAL_YPOS;
   scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].width =
     ED_SCROLL2_VERTICAL_XSIZE;
   scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].height =
     ED_SCROLL2_VERTICAL_YSIZE;
-  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_x = DX;
-  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_y = DY;
-  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_width  = DXSIZE;
-  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_height = DYSIZE;
+  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_x = PX;
+  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_y = PY;
+  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_width  = PXSIZE;
+  scrollbar_pos[ED_SCROLLBAR_ID_LIST_VERTICAL].wheel_height = PYSIZE;
 
   for (i = 0; i < ED_NUM_SCROLLBARS; i++)
   {
     int id = scrollbar_info[i].gadget_id;
     int graphic = scrollbar_info[i].graphic;
     struct GraphicInfo *gd = &graphic_info[graphic];
-    Bitmap *gd_bitmap = gd->bitmap;
-    int gd_x1, gd_x2, gd_y1, gd_y2;
+    int gd_x1 = gd->src_x;
+    int gd_y1 = gd->src_y;
+    int gd_x2 = gd->src_x + gd->pressed_xoffset;
+    int gd_y2 = gd->src_y + gd->pressed_yoffset;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
     unsigned int event_mask;
@@ -6178,11 +6904,6 @@ static void CreateScrollbarGadgets()
 
     event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
 
-    gd_x1 = gd->src_x;
-    gd_y1 = gd->src_y;
-    gd_x2 = gd->src_x + gd->pressed_xoffset;
-    gd_y2 = gd->src_y + gd->pressed_yoffset;
-
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_INFO_TEXT, scrollbar_info[i].infotext,
@@ -6199,9 +6920,9 @@ static void CreateScrollbarGadgets()
                      GDI_WHEEL_AREA_WIDTH, scrollbar_pos[i].wheel_width,
                      GDI_WHEEL_AREA_HEIGHT, scrollbar_pos[i].wheel_height,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
-                     GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
-                     GDI_BORDER_SIZE, ED_BORDER_SIZE, ED_BORDER_SIZE,
+                     GDI_DESIGN_UNPRESSED, gd->bitmap, gd_x1, gd_y1,
+                     GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2,
+                     GDI_BORDER_SIZE, gd->border_size, gd->border_size,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
                      GDI_CALLBACK_ACTION, HandleControlButtons,
@@ -6340,10 +7061,8 @@ static void CreateRadiobuttonGadgets()
 
 void CreateLevelEditorGadgets()
 {
-  int old_game_status = game_status;
-
-  /* setting 'game_status' is needed to get the right fonts for the editor */
-  game_status = GAME_MODE_EDITOR;
+  /* force EDITOR font inside level editor */
+  SetFontStatus(GAME_MODE_EDITOR);
 
   /* these values are not constant, but can change at runtime */
   ed_fieldx = MAX_ED_FIELDX - 1;
@@ -6361,6 +7080,8 @@ void CreateLevelEditorGadgets()
   editor_el_empty = checked_calloc(ED_NUM_ELEMENTLIST_BUTTONS * sizeof(int));
   editor_el_empty_ptr = editor_el_empty;
 
+  use_permanent_palette = !editor.palette.show_as_separate_screen;
+
   ReinitializeElementList();
 
   CreateControlButtons();
@@ -6377,7 +7098,7 @@ void CreateLevelEditorGadgets()
   CreateTextbuttonGadgets();
   CreateDrawingAreas();
 
-  game_status = old_game_status;
+  ResetFontStatus();
 }
 
 void FreeLevelEditorGadgets()
@@ -6466,15 +7187,19 @@ static void MapControlButtons()
   for (i = 0; i < ED_NUM_CTRL1_2_BUTTONS; i++)
     MapGadget(level_editor_gadget[i]);
 
-  /* map toolbox buttons (element properties button) */
-  MapGadget(level_editor_gadget[ED_NUM_CTRL1_4_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]);
 
-  /* 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]);
-  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_UP]);
-  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
+  if (use_permanent_palette)
+  {
+    /* 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]);
+    MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_UP]);
+    MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
+  }
 
   /* map buttons to select level */
   counter_id = ED_COUNTER_ID_SELECT_LEVEL;
@@ -6510,7 +7235,8 @@ static void MapDrawingArea(int id)
   if (id != ED_DRAWING_ID_DRAWING_LEVEL)
   {
     DrawElementBorder(gi->x, gi->y,
-                     area_xsize * MINI_TILEX, area_ysize * MINI_TILEY, TRUE);
+                     area_xsize * ED_DRAWINGAREA_TILE_SIZE,
+                     area_ysize * ED_DRAWINGAREA_TILE_SIZE, TRUE);
 
     DrawDrawingArea(id);
   }
@@ -6559,11 +7285,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);
 
@@ -6582,9 +7314,12 @@ static void MapTextbuttonGadget(int id)
   struct GadgetInfo *gi = level_editor_gadget[textbutton_info[id].gadget_id];
   int xoffset_left = getTextWidthForGadget(textbutton_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;
 
   /* only show button to delete change pages when more than minimum pages */
@@ -6592,6 +7327,9 @@ static void MapTextbuttonGadget(int id)
       custom_element.num_change_pages == MIN_CHANGE_PAGES)
     return;
 
+  if (textbutton_info[id].text_above)
+    DrawText(x, y_above, textbutton_info[id].text_above, font_nr);
+
   if (textbutton_info[id].text_left)
     DrawText(x_left, y, textbutton_info[id].text_left, font_nr);
 
@@ -6654,7 +7392,10 @@ static void MapCheckbuttonGadget(int id)
   struct GadgetInfo *gi = level_editor_gadget[checkbutton_info[id].gadget_id];
   int xoffset_left = getTextWidthForGadget(checkbutton_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 y_above = gi->y - yoffset_above;
+  int x = gi->x;
   int x_left, x_right, y;      /* set after gadget position was modified */
 
   /* set position for gadgets with dynamically determined position */
@@ -6666,6 +7407,9 @@ static void MapCheckbuttonGadget(int id)
   x_right = gi->x + gi->width + xoffset_right;
   y = gi->y + yoffset;
 
+  if (checkbutton_info[id].text_above)
+    DrawText(x, y_above, checkbutton_info[id].text_above, font_nr);
+
   if (checkbutton_info[id].text_left)
     DrawText(x_left, y, checkbutton_info[id].text_left, font_nr);
 
@@ -6683,6 +7427,12 @@ static void MapMainDrawingArea()
   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 ||
@@ -6813,17 +7563,39 @@ 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();
   else if (edit_mode == ED_MODE_PROPERTIES)
     DrawPropertiesWindow();
+  else if (edit_mode == ED_MODE_PALETTE)
+    DrawPaletteWindow();
   else /* edit_mode == ED_MODE_DRAWING */
-    DrawDrawingWindow();
+    DrawDrawingWindowExt(remap_toolbox_gadgets);
+}
+
+static void DrawEditModeWindow()
+{
+  DrawEditModeWindowExt(TRUE);
+}
+
+static void DrawEditModeWindow_PlayfieldOnly()
+{
+  DrawEditModeWindowExt(FALSE);
+}
+
+static void ChangeEditModeWindow(int new_edit_mode)
+{
+  edit_mode = (new_edit_mode != edit_mode ? new_edit_mode : ED_MODE_DRAWING);
+
+  DrawEditModeWindow();
 }
 
 static boolean LevelChanged()
@@ -6926,37 +7698,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
 
@@ -7124,6 +7866,8 @@ static void replace_custom_element_in_playfield(int element_from,
 static boolean CopyCustomElement(int element_old, int element_new,
                                 int copy_mode)
 {
+  int copy_mode_orig = copy_mode;
+
   if (copy_mode == GADGET_ID_CUSTOM_COPY)
   {
     element_new = (IS_CUSTOM_ELEMENT(element_old) ?
@@ -7155,6 +7899,13 @@ static boolean CopyCustomElement(int element_old, int element_new,
     level.changed = TRUE;
   }
 
+  /* when modifying custom/group element, ask for copying level template */
+  if (copy_mode_orig != GADGET_ID_CUSTOM_COPY && level.use_custom_template)
+  {
+    if (!AskToCopyAndModifyLevelTemplate())
+      return FALSE;
+  }
+
   if (copy_mode == GADGET_ID_CUSTOM_COPY_FROM)
   {
     copy_custom_element_settings(element_new, element_old);
@@ -7360,6 +8111,29 @@ static void CopyElementPropertiesToEditor(int element)
     CopyClassicElementPropertiesToEditor(element);
 }
 
+static boolean AskToCopyAndModifyLevelTemplate()
+{
+  if (Request("Copy and modify settings from level template?", REQ_ASK))
+  {
+    level.use_custom_template = FALSE;
+
+    ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE_1],
+                GDI_CHECKED, FALSE, GDI_END);
+    ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE_2],
+                GDI_CHECKED, FALSE, GDI_END);
+
+    return TRUE;
+  }
+  else
+  {
+    LoadLevelTemplate(-1);     /* this resets all element modifications ... */
+
+    DrawEditModeWindow();      /* ... and copies them to 'custom_element' */
+
+    return FALSE;
+  }
+}
+
 static void CopyCustomElementPropertiesToGame(int element)
 {
   int i;
@@ -7370,20 +8144,7 @@ static void CopyCustomElementPropertiesToGame(int element)
   level.changed = TRUE;
 
   if (level.use_custom_template)
-  {
-    if (Request("Copy and modify level template?", REQ_ASK))
-    {
-      level.use_custom_template = FALSE;
-      ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
-                  GDI_CHECKED, FALSE, GDI_END);
-    }
-    else
-    {
-      LoadLevelTemplate(-1);   /* this resets all element modifications ... */
-
-      DrawEditModeWindow();    /* ... and copies them to 'custom_element' */
-    }
-  }
+    AskToCopyAndModifyLevelTemplate();
 
   element_info[element] = custom_element;
   *element_info[element].change = custom_element_change;
@@ -7494,12 +8255,15 @@ static void CopyCustomElementPropertiesToGame(int element)
 
 static void CopyGroupElementPropertiesToGame(int element)
 {
-  element_info[element] = custom_element;
-  *element_info[element].group = group_element_info;
-
   /* mark that this group element has been modified */
-  element_info[element].modified_settings = TRUE;
+  custom_element.modified_settings = TRUE;
   level.changed = TRUE;
+
+  if (level.use_custom_template)
+    AskToCopyAndModifyLevelTemplate();
+
+  element_info[element] = custom_element;
+  *element_info[element].group = group_element_info;
 }
 
 static void CopyClassicElementPropertiesToGame(int element)
@@ -7529,7 +8293,8 @@ void CheckElementDescriptions()
 
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     if (getElementDescriptionFilename(i) == NULL && !IS_OBSOLETE(i))
-      Error(ERR_WARN, "no element description for element '%s'", EL_NAME(i));
+      Error(ERR_WARN, "no element description file for element '%s'",
+           EL_NAME(i));
 }
 
 static int getMaxEdFieldX(boolean has_scrollbar)
@@ -7543,7 +8308,8 @@ static int getMaxEdFieldX(boolean has_scrollbar)
 
 static int getMaxEdFieldY(boolean has_scrollbar)
 {
-  int infotext_height = INFOTEXT_YSIZE;
+  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;
@@ -7551,57 +8317,118 @@ static int getMaxEdFieldY(boolean has_scrollbar)
   return max_ed_fieldy;
 }
 
-void InitZoomLevelSettings()
+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);
 }
 
-static boolean playfield_area_changed = FALSE;
+static void InitDrawingElements()
+{
+  static int game_engine_type_last = GAME_ENGINE_TYPE_UNKNOWN;
 
-void DrawLevelEd()
+  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()
 {
-  StopAnimation();
+  snprintf(levelset_name,   MAX_LEVEL_NAME_LEN + 1,
+          "%s", leveldir_current->name);
+  snprintf(levelset_author, MAX_LEVEL_AUTHOR_LEN + 1,
+          "%s", leveldir_current->author);
 
-  CloseDoor(DOOR_CLOSE_ALL);
+  levelset_num_levels = leveldir_current->levels;
 
-  FadeOut(REDRAW_FIELD);
+  levelset_use_levelset_artwork = FALSE;
+  levelset_copy_level_template = FALSE;
 
-  /* needed after playing if editor playfield area has different size */
-  ClearRectangle(drawto, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+  levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
+}
 
-  /* needed if different viewport properties defined for editor */
-  ChangeViewportPropertiesIfNeeded();
+static void ChangeEditorToLevelSet(char *levelset_subdir)
+{
+  leveldir_current = getTreeInfoFromIdentifier(leveldir_first, levelset_subdir);
 
-  InitZoomLevelSettings();
+  // the previous level set might have used custom artwork
+  ReloadCustomArtwork(0);
 
-  playfield_area_changed = DrawingAreaChanged();
+  LoadLevelSetup_SeriesInfo();
 
-  OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
+  SaveLevelSetup_LastSeries();
+  SaveLevelSetup_SeriesInfo();
 
-#if DEBUG
-  CheckElementDescriptions();
-#endif
+  TapeErase();
 
-  if (level_editor_test_game)
-  {
-    CopyPlayfield(level.field, Feld);
-    CopyPlayfield(FieldBackup, level.field);
+  LoadLevel(level_nr);
+  LoadScore(level_nr);
 
-    level_editor_test_game = FALSE;
-  }
-  else
-  {
-    edit_mode = ED_MODE_DRAWING;
-    edit_mode_levelinfo = ED_MODE_LEVELINFO_LEVEL;
-    edit_mode_properties = ED_MODE_PROPERTIES_INFO;
+  DrawLevelEd();
+}
 
-    ResetUndoBuffer();
+static boolean useEditorDoorAnimation()
+{
+  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);
 
-    level_xpos = -1;
-    level_ypos = -1;
-  }
+  return (door_1_viewport_unchanged && door_1_contains_toolbox);
+}
 
+void DrawEditorDoorContent()
+{
   /* needed for gadgets drawn on background (like palette scrollbar) */
   SetDoorBackgroundImage(IMG_UNDEFINED);
 
@@ -7609,7 +8436,9 @@ void DrawLevelEd()
   BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto,
             graphic_info[IMG_BACKGROUND_PALETTE].src_x,
             graphic_info[IMG_BACKGROUND_PALETTE].src_y,
-            DXSIZE, DYSIZE, DX, DY);
+            MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width),
+            MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height),
+            DX, DY);
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -7618,27 +8447,97 @@ void DrawLevelEd()
   BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
             graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
             graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
-            EXSIZE, EYSIZE, EX, EY);
+            MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width),
+            MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height),
+            EX, EY);
 
-  // redraw_mask |= REDRAW_ALL;
+  /* draw all toolbox gadgets to editor doors */
+  MapControlButtons();
 
-  FreeLevelEditorGadgets();
-  CreateLevelEditorGadgets();
+  /* draw all palette gadgets to editor doors */
+  ModifyEditorElementList();
+  RedrawDrawingElements();
 
-  ReinitializeElementList();           /* update dynamic level element list */
-  ReinitializeElementListButtons();    /* custom element may look different */
+  /* 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()
+{
+  int fade_mask = REDRAW_FIELD;
+
+  FadeSoundsAndMusic();
+
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+    fade_mask = REDRAW_ALL;
+
+  FadeOut(fade_mask);
+
+  /* needed if different viewport properties defined for editor */
+  ChangeViewportPropertiesIfNeeded();
+
+  ClearField();
+
+  InitZoomLevelSettings(-1);
+  InitDrawingElements();
+  InitLevelSetInfo();
+
+#if DEBUG
+  CheckElementDescriptions();
+#endif
+
+  if (level_editor_test_game)
+  {
+    CopyPlayfield(level.field, Feld);
+    CopyPlayfield(FieldBackup, level.field);
+
+    level_editor_test_game = FALSE;
+  }
+  else
+  {
+    edit_mode = ED_MODE_DRAWING;
+    edit_mode_levelinfo = ED_MODE_LEVELINFO_LEVEL;
+    edit_mode_properties = ED_MODE_PROPERTIES_INFO;
+
+    ResetUndoBuffer();
+
+    level_xpos = -1;
+    level_ypos = -1;
+  }
+
+  // redraw_mask |= REDRAW_ALL;
+
+  FreeLevelEditorGadgets();
+  CreateLevelEditorGadgets();
+
+  ReinitializeElementList();           /* update dynamic level element list */
+  ReinitializeElementListButtons();    /* custom element may look different */
 
   InitElementPropertiesGfxElement();
 
   UnmapAllGadgets();
-  MapControlButtons();
 
-  DrawEditModeWindow();
+  DrawEditModeWindow_PlayfieldOnly();
 
-  FadeIn(playfield_area_changed ? REDRAW_ALL : REDRAW_FIELD);
+  DrawMaskedBorder(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);
+  // use door animation if door 1 viewport is unchanged and contains toolbox
+  if (useEditorDoorAnimation())
+  {
+    FadeIn(fade_mask);
+
+    DrawEditorDoorContent();
+
+    OpenDoor(DOOR_OPEN_1 | DOOR_FORCE_ANIM);
+  }
+  else
+  {
+    DrawEditorDoorContent();
+
+    FadeIn(fade_mask);
+  }
+
+  SetDoorState(DOOR_OPEN_1 | DOOR_OPEN_2);
 }
 
 static void AdjustDrawingAreaGadgets()
@@ -7651,6 +8550,12 @@ static void AdjustDrawingAreaGadgets()
   boolean vertical_scrollbar_needed;
   int x, y, width, height;
 
+  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);
@@ -7726,6 +8631,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)
@@ -7799,7 +8710,8 @@ static void ModifyEditorCounterLimits(int counter_id, int min, int max)
     struct GadgetInfo *gi_up = level_editor_gadget[gadget_id_up];
 
     ModifyGadget(gi, GDI_TEXT_SIZE, (max < 10 ? 1 : 3), GDI_END);
-    ModifyGadget(gi_up, GDI_X, gi->x + gi->width + ED_GADGET_DISTANCE,GDI_END);
+    ModifyGadget(gi_up, GDI_X, gi->x + gi->width + ED_GADGET_SMALL_DISTANCE,
+                GDI_END);
   }
 }
 
@@ -7840,16 +8752,20 @@ static void ModifyEditorElementList()
 {
   int i;
 
+  if (!use_permanent_palette && edit_mode != ED_MODE_PALETTE)
+    return;
+
   for (i = 0; i < ED_NUM_ELEMENTLIST_BUTTONS; i++)
   {
     int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
     struct GadgetInfo *gi = level_editor_gadget[gadget_id];
     struct GadgetDesign *gd = &gi->deco.design;
     int element = editor_elements[element_shift + i];
+    int tile_size = BUTTON_TILE_SIZE(editor.palette.tile_size);
 
     UnmapGadget(gi);
 
-    getElementListGraphicSource(element, &gd->bitmap, &gd->x, &gd->y);
+    getEditorGraphicSource(element, tile_size, &gd->bitmap, &gd->x, &gd->y);
 
     ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
 
@@ -7857,12 +8773,28 @@ static void ModifyEditorElementList()
   }
 }
 
-static void DrawDrawingElement(int element, struct EditorPaletteElementInfo *e)
+static void DrawDrawingElementGraphic(int element, struct XYTileSize *pos)
 {
   int graphic = el2edimg(element);
-  int tile_size = (e->tile_size >= TILESIZE ? TILESIZE : MINI_TILESIZE);
+  int tile_size = BUTTON_TILE_SIZE(pos->tile_size);
 
-  DrawSizedGraphicExt(drawto, DX + e->x, DY + e->y, graphic, 0, tile_size);
+  if (pos->x == -1 &&
+      pos->y == -1)
+    return;
+
+  DrawSizedGraphicExt(drawto, DX + pos->x, DY + pos->y, graphic, 0, tile_size);
+}
+
+static void ModifyDrawingElementButton(int element, int id)
+{
+  struct GadgetInfo *gi = level_editor_gadget[id];
+  Bitmap *deco_bitmap;
+  int deco_x, deco_y;
+  int tile_size = gi->deco.width;
+
+  getEditorGraphicSource(element, tile_size, &deco_bitmap, &deco_x, &deco_y);
+
+  ModifyGadget(gi, GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y, GDI_END);
 }
 
 static void PickDrawingElement(int button, int element)
@@ -7870,20 +8802,27 @@ static void PickDrawingElement(int button, int element)
   struct
   {
     int *new_element;
-    struct EditorPaletteElementInfo *e;
+    struct XYTileSize *pos;
+    int id;
   } de, drawing_elements[] =
   {
-    { &new_element1,   &editor.palette.element_left    },
-    { &new_element2,   &editor.palette.element_middle  },
-    { &new_element3,   &editor.palette.element_right   },
+    { &new_element1, &editor.palette.element_left,   GADGET_ID_ELEMENT_LEFT   },
+    { &new_element2, &editor.palette.element_middle, GADGET_ID_ELEMENT_MIDDLE },
+    { &new_element3, &editor.palette.element_right,  GADGET_ID_ELEMENT_RIGHT  },
   };
 
   if (button < 1 || button > 3)
     return;
 
+  if (IS_MM_WALL(element))
+    element = map_mm_wall_element(element);
+
   de = drawing_elements[button - 1];
 
-  DrawDrawingElement((*de.new_element = element), de.e);
+  *de.new_element = element;   // update global drawing element variable
+
+  DrawDrawingElementGraphic(element, de.pos);
+  ModifyDrawingElementButton(element, de.id);
 
   redraw_mask |= REDRAW_DOOR_1;
 }
@@ -7895,7 +8834,7 @@ static void RedrawDrawingElements()
   PickDrawingElement(3, new_element3);
 }
 
-static void DrawDrawingWindow()
+static void DrawDrawingWindowExt(boolean remap_toolbox_gadgets)
 {
   stick_element_properties_window = FALSE;
 
@@ -7903,7 +8842,6 @@ static void DrawDrawingWindow()
   ClearField();
 
   UnmapLevelEditorFieldGadgets();
-  UnmapLevelEditorToolboxCustomGadgets();
 
   AdjustDrawingAreaGadgets();
   AdjustLevelScrollPosition();
@@ -7913,7 +8851,17 @@ static void DrawDrawingWindow()
   DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
   MapMainDrawingArea();
-  MapLevelEditorToolboxDrawingGadgets();
+
+  if (remap_toolbox_gadgets)
+  {
+    UnmapLevelEditorToolboxCustomGadgets();
+    MapLevelEditorToolboxDrawingGadgets();
+  }
+}
+
+static void DrawDrawingWindow()
+{
+  DrawDrawingWindowExt(TRUE);
 }
 
 static int getTabulatorBarWidth()
@@ -7929,15 +8877,22 @@ static int getTabulatorBarHeight()
   return ED_TAB_BAR_HEIGHT;
 }
 
-static void DrawLevelInfoTabulatorGadgets()
+static Pixel getTabulatorBarColor()
 {
   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);
-  int id_first = ED_TEXTBUTTON_ID_LEVELINFO_LEVEL;
-  int id_last  = ED_TEXTBUTTON_ID_LEVELINFO_EDITOR;
+
+  return GetPixel(gd->bitmap, gd_x, gd_y);
+}
+
+static void DrawLevelInfoTabulatorGadgets()
+{
+  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;
 
   for (i = id_first; i <= id_last; i++)
@@ -7951,7 +8906,8 @@ static void DrawLevelInfoTabulatorGadgets()
 
     /* 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, 1, tab_color);
+      FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,
+                   ED_GADGET_TINY_DISTANCE, tab_color);
 
     ModifyGadget(gi, GDI_ACTIVE, active, GDI_END);
     MapTextbuttonGadget(i);
@@ -7959,7 +8915,8 @@ static void DrawLevelInfoTabulatorGadgets()
 
   /* 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 + 1,
+    FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height +
+                 ED_GADGET_TINY_DISTANCE,
                  getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color);
 }
 
@@ -7999,7 +8956,8 @@ static void DrawPropertiesTabulatorGadgets()
 
     /* 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, 1, tab_color);
+      FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,
+                   ED_GADGET_TINY_DISTANCE, tab_color);
 
     ModifyGadget(gi, GDI_ACTIVE, active, GDI_END);
     MapTextbuttonGadget(i);
@@ -8007,10 +8965,29 @@ static void DrawPropertiesTabulatorGadgets()
 
   /* 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 + 1,
+    FillRectangle(drawto, gd_gi1->x, gd_gi1->y + gd_gi1->height +
+                 ED_GADGET_TINY_DISTANCE,
                  getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color);
 }
 
+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()
 {
   int i;
@@ -8019,6 +8996,10 @@ static void DrawLevelInfoLevel()
   for (i = ED_COUNTER_ID_LEVEL_FIRST; i <= ED_COUNTER_ID_LEVEL_LAST; i++)
     MapCounterButtons(i);
 
+  /* draw checkbutton gadgets */
+  for (i = ED_CHECKBUTTON_ID_LEVEL_FIRST; i<= ED_CHECKBUTTON_ID_LEVEL_LAST; i++)
+    MapCheckbuttonGadget(i);
+
   /* draw selectbox gadgets */
   for (i = ED_SELECTBOX_ID_LEVEL_FIRST; i <= ED_SELECTBOX_ID_LEVEL_LAST; i++)
     MapSelectboxGadget(i);
@@ -8028,6 +9009,65 @@ static void DrawLevelInfoLevel()
     MapTextInputGadget(i);
 }
 
+static char *getLevelSubdirFromSaveMode(int save_mode)
+{
+  if (save_mode == LEVELSET_SAVE_MODE_CREATE)
+    return getNewUserLevelSubdir();
+
+  return leveldir_current->subdir;
+}
+
+static void DrawLevelInfoLevelSet_DirectoryInfo()
+{
+  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()
+{
+  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()
 {
   int i;
@@ -8046,24 +9086,37 @@ static void DrawLevelInfoEditor()
 
   /* draw drawing area */
   MapDrawingArea(ED_DRAWING_ID_RANDOM_BACKGROUND);
+
+  /* draw textbutton gadgets */
+  MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2);
 }
 
 static void DrawLevelInfoWindow()
 {
+  char *text = "Global Settings";
+  int font_nr = FONT_TITLE_1;
+  struct MenuPosInfo *pos = &editor.settings.headline;
+  int sx = SX + ALIGNED_XPOS(pos->x, getTextWidth(text, font_nr), pos->align);
+  int sy = SY + pos->y;
+
   stick_element_properties_window = FALSE;
 
+  SetAutomaticNumberOfGemsNeeded();
+
   UnmapLevelEditorFieldGadgets();
 
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearField();
 
-  DrawTextSCentered(ED_SETTINGS1_YPOS, FONT_TITLE_1, "Global Settings");
+  DrawText(sx, sy, text, font_nr);
 
   DrawLevelInfoTabulatorGadgets();
 
   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();
 }
 
@@ -8074,7 +9127,7 @@ static void DrawCustomContentArea()
   int x1 = right_gadget_border[GADGET_ID_CUSTOM_DEADLINESS];
   int x2 = right_gadget_border[GADGET_ID_CUSTOM_EXPLOSION_TYPE];
   int x3 = right_gadget_border[GADGET_ID_CUSTOM_EXPLODE_IMPACT];
-  int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE;
+  int xoffset = ED_GADGET_SPACE_DISTANCE;
 
   /* add distance for potential left text (without drawing area border) */
   x2 += getTextWidthForGadget(drawingarea_info[id].text_left);
@@ -8091,17 +9144,32 @@ static void DrawCustomChangeContentArea()
   int x1 = right_gadget_border[GADGET_ID_CHANGE_USE_CONTENT];
   int x2 = right_gadget_border[GADGET_ID_CHANGE_REPLACE_WHEN];
   int x3 = right_gadget_border[GADGET_ID_CHANGE_ONLY_COMPLETE];
-  int xoffset = ED_DRAWINGAREA_TEXT_DISTANCE;
+  int xoffset = ED_GADGET_SPACE_DISTANCE;
 
   ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END);
 
   MapDrawingArea(id);
 }
 
+static void RemoveElementContentArea(int id, int font_height)
+{
+  int border_size = ED_DRAWINGAREA_BORDER_SIZE;
+
+  DrawBackground(SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size,
+                SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size,
+                3 * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
+                3 * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size +
+                ED_GADGET_TEXT_DISTANCE + font_height);
+}
+
 static void DrawYamYamContentAreas()
 {
-  int x = SX + ED_AREA_YAMYAM_CONTENT_X(3) + 4 * MINI_TILEX;
-  int y = SY + ED_AREA_YAMYAM_CONTENT_Y(0) + ED_BORDER_AREA_YSIZE;
+  int font_nr = FONT_TEXT_1;
+  int font_height = getFontHeight(font_nr);
+  int tilesize = ED_DRAWINGAREA_TILE_SIZE;
+  int yoffset = (tilesize - font_height) / 2;
+  int x = SX + ED_AREA_YAMYAM_CONTENT_X(3) + 4 * tilesize;
+  int y = SY + ED_AREA_YAMYAM_CONTENT_Y(3) + yoffset;
   int i;
 
   /* display counter to choose number of element content areas */
@@ -8117,29 +9185,26 @@ static void DrawYamYamContentAreas()
     }
     else
     {
-      int font_height = getFontHeight(FONT_TEXT_1);
-
       UnmapDrawingArea(id);
 
       /* delete content areas in case of reducing number of them */
-      DrawBackground(SX + ED_AREA_SETTINGS_X(drawingarea_info[id])
-                    - MINI_TILEX / 2,
-                    SY + ED_AREA_SETTINGS_Y(drawingarea_info[id])
-                    - MINI_TILEY / 2,
-                    4 * MINI_TILEX,
-                    4 * MINI_TILEY + ED_GADGET_TEXT_DISTANCE + font_height);
+      RemoveElementContentArea(id, font_height);
     }
   }
 
-  DrawText(x, y + 0 * MINI_TILEY, "content", FONT_TEXT_1);
-  DrawText(x, y + 1 * MINI_TILEY, "when",    FONT_TEXT_1);
-  DrawText(x, y + 2 * MINI_TILEY, "smashed", FONT_TEXT_1);
+  DrawText(x, y + 0 * tilesize, "content", font_nr);
+  DrawText(x, y + 1 * tilesize, "when",    font_nr);
+  DrawText(x, y + 2 * tilesize, "smashed", font_nr);
 }
 
 static void DrawMagicBallContentAreas()
 {
-  int x = SX + ED_AREA_MAGIC_BALL_CONTENT_X(3) + 4 * MINI_TILEX;
-  int y = SY + ED_AREA_MAGIC_BALL_CONTENT_Y(0) + ED_BORDER_AREA_YSIZE;
+  int font_nr = FONT_TEXT_1;
+  int font_height = getFontHeight(font_nr);
+  int tilesize = ED_DRAWINGAREA_TILE_SIZE;
+  int yoffset = (tilesize - font_height) / 2;
+  int x = SX + ED_AREA_MAGIC_BALL_CONTENT_X(3) + 4 * tilesize;
+  int y = SY + ED_AREA_MAGIC_BALL_CONTENT_Y(3) + yoffset;
   int i;
 
   /* display counter to choose number of element content areas */
@@ -8155,31 +9220,25 @@ static void DrawMagicBallContentAreas()
     }
     else
     {
-      int font_height = getFontHeight(FONT_TEXT_1);
-
       UnmapDrawingArea(id);
 
       /* delete content areas in case of reducing number of them */
-      DrawBackground(SX + ED_AREA_SETTINGS_X(drawingarea_info[id])
-                    - MINI_TILEX / 2,
-                    SY + ED_AREA_SETTINGS_Y(drawingarea_info[id])
-                    - MINI_TILEY / 2,
-                    4 * MINI_TILEX,
-                    4 * MINI_TILEY + ED_GADGET_TEXT_DISTANCE + font_height);
+      RemoveElementContentArea(id, font_height);
     }
   }
 
-  DrawText(x, y + 0 * MINI_TILEY, "generated", FONT_TEXT_1);
-  DrawText(x, y + 1 * MINI_TILEY, "when",      FONT_TEXT_1);
-  DrawText(x, y + 2 * MINI_TILEY, "active",    FONT_TEXT_1);
+  DrawText(x, y + 0 * tilesize, "generated", font_nr);
+  DrawText(x, y + 1 * tilesize, "when",      font_nr);
+  DrawText(x, y + 2 * tilesize, "active",    font_nr);
 }
 
 static void DrawAndroidElementArea(int element)
 {
-  int num_elements = level.num_android_clone_elements;
   int id = ED_DRAWING_ID_ANDROID_CONTENT;
-  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - MINI_TILEX / 2;
-  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - MINI_TILEY / 2;
+  int num_elements = level.num_android_clone_elements;
+  int border_size = ED_DRAWINGAREA_BORDER_SIZE;
+  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size;
+  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size;
   int xsize = MAX_ANDROID_ELEMENTS;
   int ysize = 1;
 
@@ -8194,19 +9253,20 @@ static void DrawAndroidElementArea(int element)
   ModifyEditorDrawingArea(id, num_elements, 1);
 
   /* delete content areas in case of reducing number of them */
-  DrawBackground(sx, sy, (xsize + 1) * MINI_TILEX, (ysize + 1) * MINI_TILEY);
+  DrawBackground(sx, sy,
+                xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
+                ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
 
   MapDrawingArea(id);
 }
 
 static void DrawGroupElementArea(int element)
 {
-  int num_elements = group_element_info.num_elements;
   int id = ED_DRAWING_ID_GROUP_CONTENT;
-  int bx = ED_ELEMENT_BORDER_INPUT;
-  int by = ED_ELEMENT_BORDER_INPUT;
-  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - bx;
-  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - by;
+  int num_elements = group_element_info.num_elements;
+  int border_size = ED_DRAWINGAREA_BORDER_SIZE;
+  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size;
+  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size;
   int xsize = MAX_ELEMENTS_IN_GROUP;
   int ysize = 1;
 
@@ -8218,25 +9278,28 @@ static void DrawGroupElementArea(int element)
   ModifyEditorDrawingArea(id, num_elements, 1);
 
   /* delete content areas in case of reducing number of them */
-  DrawBackground(sx, sy, xsize * MINI_TILEX + 2*bx, ysize * MINI_TILEY + 2*by);
+  DrawBackground(sx, sy,
+                xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
+                ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
 
   MapDrawingArea(id);
 }
 
 static void DrawPlayerInitialInventoryArea(int element)
 {
+  int id = ED_DRAWING_ID_INVENTORY_CONTENT;
   int player_nr = GET_PLAYER_NR(element);
   int num_elements = level.initial_inventory_size[player_nr];
-  int id = ED_DRAWING_ID_INVENTORY_CONTENT;
-  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - MINI_TILEX / 2;
-  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - MINI_TILEY / 2;
+  int border_size = ED_DRAWINGAREA_BORDER_SIZE;
+  int sx = SX + ED_AREA_SETTINGS_X(drawingarea_info[id]) - border_size;
+  int sy = SY + ED_AREA_SETTINGS_Y(drawingarea_info[id]) - border_size;
   int xsize = MAX_INITIAL_INVENTORY_SIZE;
   int ysize = 1;
 
   /* 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);
+    sx = (right_gadget_border[drawingarea_info[id].gadget_id_align] +
+         ED_DRAWINGAREA_TEXT_DISTANCE);
 
   /* determine horizontal offset for leading text */
   if (drawingarea_info[id].text_left != NULL)
@@ -8247,7 +9310,9 @@ static void DrawPlayerInitialInventoryArea(int element)
   ModifyEditorDrawingArea(id, num_elements, 1);
 
   /* delete content areas in case of reducing number of them */
-  DrawBackground(sx, sy, (xsize + 1) * MINI_TILEX, (ysize + 1) * MINI_TILEY);
+  DrawBackground(sx, sy,
+                xsize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size,
+                ysize * ED_DRAWINGAREA_TILE_SIZE + 2 * border_size);
 
   MapDrawingArea(id);
 }
@@ -8271,43 +9336,6 @@ static void DrawEnvelopeTextArea(int envelope_nr)
   MapTextAreaGadget(ED_TEXTAREA_ID_ENVELOPE_INFO);
 }
 
-static boolean PrintInfoText(char *text, int font_nr, int start_line)
-{
-  int font_height = getFontHeight(font_nr);
-  int pad_x = ED_ELEMENT_SETTINGS_X(0);
-  int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_BORDER_SIZE;
-  int sx = SX + pad_x;
-  int sy = SY + pad_y;
-  int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
-
-  if (start_line >= max_lines_per_screen)
-    return FALSE;
-
-  DrawText(sx, sy + start_line * font_height, text, font_nr);
-
-  return TRUE;
-}
-
-static int PrintElementDescriptionFromFile(char *filename, int start_line)
-{
-  int font_nr = FONT_TEXT_2;
-  int font_width = getFontWidth(font_nr);
-  int font_height = getFontHeight(font_nr);
-  int pad_x = ED_ELEMENT_SETTINGS_X(0);
-  int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_BORDER_SIZE;
-  int sx = SX + pad_x;
-  int sy = SY + pad_y + start_line * font_height;
-  int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
-  int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
-  int max_lines_drawable = max_lines_per_screen - start_line;
-
-  if (start_line >= max_lines_per_screen)
-    return FALSE;
-
-  return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
-                     max_lines_drawable, 0, -1, TRUE, FALSE, FALSE);
-}
-
 static void DrawPropertiesInfo()
 {
   static struct
@@ -8371,23 +9399,34 @@ static void DrawPropertiesInfo()
   char *filename = getElementDescriptionFilename(properties_element);
   char *percentage_text = "In this level: ";
   char *properties_text = "Standard properties: ";
+  char *description_text = "Description:";
+  char *no_description_text = "No description available.";
+  char *none_text = "None";
   float percentage;
   int num_elements_in_level;
   int num_standard_properties = 0;
   int font1_nr = FONT_TEXT_1;
   int font2_nr = FONT_TEXT_2;
   int font1_width = getFontWidth(font1_nr);
+  int font1_height = getFontHeight(font1_nr);
   int font2_height = getFontHeight(font2_nr);
-  int pad_x = ED_ELEMENT_SETTINGS_X(0);
-  int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_BORDER_SIZE;
-  int screen_line = 0;
+  int line1_height = font1_height + ED_GADGET_LINE_DISTANCE;
+  int font2_yoffset = (font1_height - font2_height) / 2;
+  int percentage_text_len = strlen(percentage_text) * font1_width;
+  int properties_text_len = strlen(properties_text) * font1_width;
+  int xpos = ED_ELEMENT_SETTINGS_X(0);
+  int ypos = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE;
   int i, x, y;
 
   if (setup.editor.show_element_token)
   {
-    DrawTextF(pad_x, pad_y + screen_line++ * font2_height, FONT_TEXT_3,
+    int font3_nr = FONT_TEXT_3;
+    int font3_height = getFontHeight(font3_nr);
+
+    DrawTextF(xpos, ypos, font3_nr,
              "[%s]", element_info[properties_element].token_name);
-    screen_line++;
+
+    ypos += 2 * font3_height;
   }
 
   /* ----- print number of elements / percentage of this element in level */
@@ -8399,40 +9438,53 @@ static void DrawPropertiesInfo()
        num_elements_in_level++;
   percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
 
-  DrawTextS(pad_x, pad_y + screen_line * font2_height, font1_nr,
-           percentage_text);
-  DrawTextF(pad_x + strlen(percentage_text) * font1_width,
-           pad_y + screen_line++ * font2_height, font2_nr,
-           "%d (%.2f%%)", num_elements_in_level, percentage);
+  DrawTextS(xpos, ypos, font1_nr, percentage_text);
+
+  if (num_elements_in_level > 0)
+    DrawTextF(xpos + percentage_text_len, ypos + font2_yoffset, font2_nr,
+             "%d (%.2f %%)", num_elements_in_level, percentage);
+  else
+    DrawTextF(xpos + percentage_text_len, ypos + font2_yoffset, font2_nr,
+             none_text);
 
-  screen_line++;
+  ypos += 2 * MAX(font1_height, font2_height);
 
   /* ----- print standard properties of this element */
 
-  DrawTextS(pad_x, pad_y + screen_line++ * font2_height, font1_nr,
-           properties_text);
+  DrawTextS(xpos, ypos, font1_nr, properties_text);
+
+  ypos += line1_height;
 
   for (i = 0; properties[i].value != -1; i++)
   {
     if (!HAS_PROPERTY(properties_element, properties[i].value))
       continue;
 
-    DrawTextS(pad_x, pad_y + screen_line++ * font2_height, font2_nr,
-             properties[i].text);
+    DrawTextS(xpos, ypos, font2_nr, properties[i].text);
+
+    ypos += font2_height;
+
     num_standard_properties++;
   }
 
   if (num_standard_properties == 0)
-    DrawTextS(pad_x + strlen(properties_text) * font1_width,
-             pad_y + (screen_line - 1) * font2_height, font2_nr, "none");
+  {
+    DrawTextS(xpos + properties_text_len, ypos - line1_height + font2_yoffset,
+             font2_nr, none_text);
+
+    ypos -= (line1_height - font1_height);
+  }
 
-  screen_line++;
+  ypos += MAX(font1_height, font2_height);
 
   /* ----- print special description of this element */
 
-  PrintInfoText("Description:", FONT_TEXT_1, screen_line);
-  if (PrintElementDescriptionFromFile(filename, screen_line + 1) == 0)
-    PrintInfoText("No description available.", FONT_TEXT_1, screen_line);
+  PrintInfoText(description_text, font1_nr, xpos, ypos);
+
+  ypos += line1_height;
+
+  if (PrintElementDescriptionFromFile(filename, font2_nr, xpos, ypos) == 0)
+    PrintInfoText(no_description_text, font1_nr, xpos, ypos - line1_height);
 }
 
 #define TEXT_COLLECTING                "Score for collecting"
@@ -8441,6 +9493,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"
@@ -8522,6 +9578,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 },
@@ -8557,6 +9622,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   },
+  { 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            }
 };
@@ -8568,7 +9638,10 @@ 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) ||
       ELEM_IS_PLAYER(element) ||
       HAS_EDITOR_CONTENT(element) ||
       CAN_GROW(element) ||
@@ -8586,6 +9659,31 @@ static boolean checkPropertiesConfig(int element)
   return FALSE;
 }
 
+static void SetAutomaticNumberOfGemsNeeded()
+{
+  int x, y;
+
+  if (!level.auto_count_gems)
+    return;
+
+  level.gems_needed = 0;
+
+  for (x = 0; x < lev_fieldx; x++)
+  {
+    for (y = 0; y < lev_fieldy; y++)
+    {
+      int element = Feld[x][y];
+
+      if (IS_GEM(element) ||
+         element == EL_MM_KETTLE ||
+         element == EL_DF_CELL)
+       level.gems_needed++;
+    }
+  }
+
+  ModifyEditorCounterValue(ED_COUNTER_ID_LEVEL_GEMSLIMIT, level.gems_needed);
+}
+
 static void DrawPropertiesConfig()
 {
   boolean draw_footer_line = FALSE;
@@ -8595,7 +9693,11 @@ static void DrawPropertiesConfig()
 
   if (!checkPropertiesConfig(properties_element))
   {
-    PrintInfoText("No configuration options available.", FONT_TEXT_1, 0);
+    int xpos = ED_ELEMENT_SETTINGS_X(0);
+    int ypos = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE;
+
+    PrintInfoText("No configuration options available.",
+                 FONT_TEXT_1, xpos, ypos);
 
     return;
   }
@@ -8699,6 +9801,7 @@ static void DrawPropertiesConfig()
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INSTANT_RELOCATION);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SHIFTED_RELOCATION);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_LAZY_RELOCATION);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_START_ELEMENT);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT);
@@ -8749,7 +9852,8 @@ static void DrawPropertiesConfig()
       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);
   }
@@ -8776,6 +9880,9 @@ static void DrawPropertiesConfig()
       properties_element == EL_SOKOBAN_FIELD_FULL)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN);
 
+  if (IS_BALLOON_ELEMENT(properties_element))
+    MapSelectboxGadget(ED_SELECTBOX_ID_WIND_DIRECTION);
+
   if (IS_ENVELOPE(properties_element))
   {
     int counter1_id = ED_COUNTER_ID_ENVELOPE_XSIZE;
@@ -8801,6 +9908,20 @@ static void DrawPropertiesConfig()
     DrawEnvelopeTextArea(envelope_nr);
   }
 
+  if (IS_MM_MCDUFFIN(properties_element))
+  {
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_MM_LASER_RED);
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_MM_LASER_GREEN);
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_MM_LASER_BLUE);
+  }
+
+  if (IS_DF_LASER(properties_element))
+  {
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DF_LASER_RED);
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DF_LASER_GREEN);
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_DF_LASER_BLUE);
+  }
+
   if (IS_CUSTOM_ELEMENT(properties_element))
   {
     /* draw stickybutton gadget */
@@ -8824,7 +9945,7 @@ static void DrawPropertiesConfig()
        MapSelectboxGadget(i);
 
       /* draw textbutton gadgets */
-      MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE);
+      MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
 
       /* draw text input gadgets */
       MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
@@ -8864,7 +9985,7 @@ static void DrawPropertiesConfig()
 
     /* draw checkbutton gadgets */
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC);
-    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE);
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1);
 
     /* draw counter gadgets */
     MapCounterButtons(ED_COUNTER_ID_GROUP_CONTENT);
@@ -8873,7 +9994,7 @@ static void DrawPropertiesConfig()
     MapSelectboxGadget(ED_SELECTBOX_ID_GROUP_CHOICE_MODE);
 
     /* draw textbutton gadgets */
-    MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE);
+    MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
 
     /* draw drawing area gadgets */
     DrawGroupElementArea(properties_element);
@@ -8899,7 +10020,8 @@ static void DrawPropertiesConfig()
     if (tab_color != BLACK_PIXEL)              /* black => transparent */
       FillRectangle(drawto,
                    SX + ED_ELEMENT_SETTINGS_X(0),
-                   SY + ED_ELEMENT_SETTINGS_Y(14) - MINI_TILEY / 2,
+                   SY + ED_ELEMENT_SETTINGS_Y(14) - ED_SETTINGS_TABS_YOFFSET -
+                   ED_TAB_BAR_HEIGHT,
                    getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color);
   }
 }
@@ -9014,6 +10136,25 @@ static void DrawEditorElementName(int x, int y, int font_nr)
 
 static void DrawPropertiesWindow()
 {
+  struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
+  int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
+  int border_size = gd->border_size;
+  int font_nr = FONT_TEXT_1;
+  int font_height = getFontHeight(font_nr);
+  int xoffset = TILEX + element_border + 3 * border_size;
+  int yoffset = (TILEY - font_height) / 2;
+  int x1 = editor.settings.element_graphic.x + element_border;
+  int y1 = editor.settings.element_graphic.y + element_border;
+  int x2 = (editor.settings.element_name.x == -1 ? x1 + xoffset :
+           editor.settings.element_name.x);
+  int y2 = (editor.settings.element_name.y == -1 ? y1 + yoffset :
+           editor.settings.element_name.y);
+  char *text = "Element Settings";
+  int font2_nr = FONT_TITLE_1;
+  struct MenuPosInfo *pos = &editor.settings.headline;
+  int sx = SX + ALIGNED_XPOS(pos->x, getTextWidth(text, font2_nr), pos->align);
+  int sy = SY + pos->y;
+
   stick_element_properties_window = FALSE;
 
   /* make sure that previous properties edit mode exists for this element */
@@ -9044,22 +10185,13 @@ static void DrawPropertiesWindow()
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearField();
 
-  DrawTextSCentered(ED_SETTINGS1_YPOS, FONT_TITLE_1, "Element Settings");
+  DrawText(sx, sy, text, font2_nr);
 
   FrameCounter = 0;    /* restart animation frame counter */
 
-  struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
-  int border_size = gd->border_size;
-  int font_nr = FONT_TEXT_1;
-  int font_height = getFontHeight(font_nr);
-  int x = ED_ELEMENT_SETTINGS_ELEM_XPOS;
-  int y = ED_ELEMENT_SETTINGS_ELEM_YPOS;
-  int xoffset = TILEX + ED_ELEMENT_BORDER + 3 * border_size;
-  int yoffset = (TILEY - font_height) / 2;
-
-  DrawElementBorder(SX + x, SY + y, TILEX, TILEY, FALSE);
-  DrawEditorElementAnimation(SX + x, SY + y);
-  DrawEditorElementName(x + xoffset, y + yoffset, font_nr);
+  DrawElementBorder(SX + x1, SY + y1, TILEX, TILEY, FALSE);
+  DrawEditorElementAnimation(SX + x1, SY + y1);
+  DrawEditorElementName(x2, y2, font_nr);
 
   DrawPropertiesTabulatorGadgets();
 
@@ -9071,13 +10203,28 @@ static void DrawPropertiesWindow()
     DrawPropertiesConfig();
 }
 
+static void DrawPaletteWindow()
+{
+  int i;
+
+  UnmapLevelEditorFieldGadgets();
+
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
+  ClearField();
+
+  /* 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]);
+  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_UP]);
+  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
+}
+
 static void UpdateCustomElementGraphicGadgets()
 {
-  struct ElementInfo *ei = &element_info[properties_element];
   int i;
 
-  ei->gfx_element = (ei->use_gfx_element ? ei->gfx_element_initial :
-                    properties_element);
+  InitElementPropertiesGfxElement();
 
   ModifyEditorElementList();
   RedrawDrawingElements();
@@ -9522,10 +10669,33 @@ static int getClosedChip(int x, int y)
   return getChipFromOpenDirectionNotEmpty(direction_new, element_old);
 }
 
-static void SetElementSimple(int x, int y, int element, boolean change_level)
+static void SetElementSimpleExt(int x, int y, int dx, int dy, int element,
+                               boolean change_level)
 {
   int sx = x - level_xpos;
   int sy = y - level_ypos;
+  int old_element = Feld[x][y];
+  int new_element = element;
+  unsigned int new_bitmask = (getDrawModeHiRes() ? (dx + 1) << (dy * 2) : 0x0f);
+  boolean draw_masked = FALSE;
+
+  if (IS_MM_WALL_EDITOR(element))
+  {
+    element = map_mm_wall_element_editor(element) | new_bitmask;
+
+    if (IS_MM_WALL(old_element))
+      element |= MM_WALL_BITS(old_element);
+
+    if (!change_level)
+      draw_masked = TRUE;
+  }
+  else if (IS_MM_WALL(old_element) && element == EL_EMPTY)
+  {
+    int element_changed = old_element & ~new_bitmask;
+
+    if (MM_WALL_BITS(element_changed) != 0)
+      element = element_changed;
+  }
 
   IntelliDrawBuffer[x][y] = element;
 
@@ -9533,7 +10703,19 @@ static void SetElementSimple(int x, int y, int element, boolean change_level)
     Feld[x][y] = element;
 
   if (IN_ED_FIELD(sx, sy))
-    DrawEditorElement(sx, sy, element);
+  {
+    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);
+  }
+}
+
+static void SetElementSimple(int x, int y, int element, boolean change_level)
+{
+  SetElementSimpleExt(x, y, 0, 0, element, change_level);
 }
 
 static void MergeAndCloseNeighbourElements(int x1, int y1, int *element1,
@@ -9907,10 +11089,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,
@@ -9918,95 +11104,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,
       },
     };
@@ -10021,19 +11456,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);
@@ -10053,33 +11530,95 @@ static void ResetIntelliDraw()
   SetElementIntelliDraw(-1, -1, EL_UNDEFINED, FALSE, -1);
 }
 
-static void SetElementExt(int x, int y, int element, boolean change_level,
-                         int button)
+static boolean draw_mode_hires = FALSE;
+
+static void SetDrawModeHiRes(int element)
+{
+  draw_mode_hires =
+    (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+     (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY));
+}
+
+static boolean getDrawModeHiRes()
+{
+  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)
 {
   if (element < 0)
     SetElementSimple(x, y, Feld[x][y], change_level);
-  else if (GetKeyModState() & KMOD_Shift)
+  else if (GetKeyModState() & KMOD_Shift && !IS_MM_WALL_EDITOR(element))
     SetElementIntelliDraw(x, y, element, change_level, button);
   else
-    SetElementSimple(x, y, element, change_level);
+    SetElementSimpleExt(x, y, dx, dy, element, change_level);
 }
 
 static void SetElement(int x, int y, int element)
 {
-  SetElementExt(x, y, element, TRUE, -1);
+  SetElementExt(x, y, 0, 0, element, TRUE, -1);
 }
 
-static void SetElementButton(int x, int y, int element, int button)
+static void SetElementButton(int x, int y, int dx, int dy, int element,
+                            int button)
 {
-  SetElementExt(x, y, element, TRUE, button);
+  SetElementExt(x, y, dx, dy, element, TRUE, button);
 }
 
-static void DrawLineElement(int sx, int sy, int element, boolean change_level)
+static void SetElementHiRes(int sx2, int sy2, int element, boolean change_level)
 {
-  int lx = sx + level_xpos;
-  int ly = sy + level_ypos;
+  int lx = getLoResScreenPos(sx2) + level_xpos;
+  int ly = getLoResScreenPos(sy2) + level_ypos;
+  int dx = getLoResScreenMod(sx2);
+  int dy = getLoResScreenMod(sy2);
 
-  SetElementExt(lx, ly, element, change_level, -1);
+  SetElementExt(lx, ly, dx, dy, element, change_level, -1);
+}
+
+static void SetLevelElementHiRes(int lx2, int ly2, int element)
+{
+  int lx = lx2 / 2;
+  int ly = ly2 / 2;
+  int dx = lx2 % 2;
+  int dy = ly2 % 2;
+
+  SetElementExt(lx, ly, dx, dy, element, TRUE, -1);
+}
+
+static int getLevelElementHiRes(int lx2, int ly2)
+{
+  int lx = lx2 / 2;
+  int ly = ly2 / 2;
+  int dx = lx2 % 2;
+  int dy = ly2 % 2;
+  int element = Feld[lx][ly];
+  unsigned int bitmask = (dx + 1) << (dy * 2);
+
+  if (IS_MM_WALL(element))
+  {
+    if (element & bitmask)
+      return map_mm_wall_element(element);
+    else
+      return EL_EMPTY;
+  }
+
+  return element;
+}
+
+static void DrawLineElement(int x, int y, int element, boolean change_level)
+{
+  SetElementHiRes(x, y, element, change_level);
 }
 
 static void DrawLine(int from_x, int from_y, int to_x, int to_y,
@@ -10167,32 +11706,36 @@ static void DrawArcExt(int from_x, int from_y, int to_x2, int to_y2,
 
   for (x = 0; x <= radius; x++)
   {
-    int sx, sy, lx, ly;
+    int sx, sy, sx2, sy2, lx, ly;
 
     y = (int)(sqrt((float)(radius * radius - x * x)) + 0.5);
 
-    sx = from_x + x * (from_x < to_x2 ? +1 : -1);
-    sy = from_y + y * (from_y < to_y2 ? +1 : -1);
+    sx2 = from_x + x * (from_x < to_x2 ? +1 : -1);
+    sy2 = from_y + y * (from_y < to_y2 ? +1 : -1);
+    sx = getLoResScreenPos(sx2);
+    sy = getLoResScreenPos(sy2);
     lx = sx + level_xpos;
     ly = sy + level_ypos;
 
     if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
-      DrawLineElement(sx, sy, element, change_level);
+      DrawLineElement(sx2, sy2, element, change_level);
   }
 
   for (y = 0; y <= radius; y++)
   {
-    int sx, sy, lx, ly;
+    int sx, sy, sx2, sy2, lx, ly;
 
     x = (int)(sqrt((float)(radius * radius - y * y)) + 0.5);
 
-    sx = from_x + x * (from_x < to_x2 ? +1 : -1);
-    sy = from_y + y * (from_y < to_y2 ? +1 : -1);
+    sx2 = from_x + x * (from_x < to_x2 ? +1 : -1);
+    sy2 = from_y + y * (from_y < to_y2 ? +1 : -1);
+    sx = getLoResScreenPos(sx2);
+    sy = getLoResScreenPos(sy2);
     lx = sx + level_xpos;
     ly = sy + level_ypos;
 
     if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
-      DrawLineElement(sx, sy, element, change_level);
+      DrawLineElement(sx2, sy2, element, change_level);
   }
 }
 
@@ -10250,11 +11793,17 @@ static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
     redraw_mask |= REDRAW_FIELD;
 }
 
+static void DrawAreaBox(int from_x, int from_y, int to_x, int to_y,
+                       int element, boolean 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,
                       int element, boolean change_level)
 {
   if (element == -1 || change_level)
-    DrawBox(from_x, from_y, to_x, to_y, -1, FALSE);
+    DrawAreaBox(from_x, from_y, to_x, to_y, -1, FALSE);
   else
     DrawAreaBorder(from_x, from_y, to_x, to_y);
 }
@@ -10267,6 +11816,11 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y,
 #define CB_DUMP_BRUSH          4
 #define CB_DUMP_BRUSH_SMALL    5
 
+static void DrawBrushElement(int sx, int sy, int element, boolean change_level)
+{
+  DrawLineElement(sx, sy, element, change_level);
+}
+
 static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
                         int button, int mode)
 {
@@ -10339,7 +11893,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
        brush_buffer[x][y] = Feld[from_lx + x][from_ly + y];
 
        if (button != 1)
-         DrawLineElement(from_x + x, from_y + y, new_element, TRUE);
+         DrawBrushElement(from_x + x, from_y + y, new_element, TRUE);
       }
     }
 
@@ -10392,7 +11946,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
          else if (sy > border_to_y)
            border_to_y = sy;
 
-         DrawLineElement(sx, sy, element, change_level);
+         DrawBrushElement(sx, sy, element, change_level);
        }
       }
     }
@@ -10442,6 +11996,28 @@ static void FloodFill(int from_x, int from_y, int fill_element)
   FloodFillLevel(from_x, from_y, fill_element, Feld, lev_fieldx, lev_fieldy);
 }
 
+static void FloodFillWall_MM(int from_sx2, int from_sy2, int fill_element)
+{
+  int from_x = from_sx2 + 2 * level_xpos;
+  int from_y = from_sy2 + 2 * level_ypos;
+  int max_fillx = lev_fieldx * 2;
+  int max_filly = lev_fieldy * 2;
+  short FillFeld[max_fillx][max_filly];
+  int x, y;
+
+  for (x = 0; x < max_fillx; x++)
+    for (y = 0; y < max_filly; y++)
+      FillFeld[x][y] = getLevelElementHiRes(x, y);
+
+  FloodFillLevelExt(from_x, from_y, fill_element, max_fillx, max_filly,
+                   FillFeld, max_fillx, max_filly);
+
+  for (x = 0; x < max_fillx; x++)
+    for (y = 0; y < max_filly; y++)
+      if (FillFeld[x][y] == fill_element)
+       SetLevelElementHiRes(x, y, FillFeld[x][y]);
+}
+
 /* values for DrawLevelText() modes */
 #define TEXT_INIT              0
 #define TEXT_SETCURSOR         1
@@ -10705,10 +12281,25 @@ 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;
+  static int last_sx = -1, last_sy = -1;
+  static int last_sx2 = -1, last_sy2 = -1;
   int id = gi->custom_id;
+  int type_id = gi->custom_type_id;
   boolean button_press_event;
   boolean button_release_event;
   boolean inside_drawing_area = !gi->event.off_borders;
@@ -10720,14 +12311,16 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   int min_sx = 0, min_sy = 0;
   int max_sx = gi->drawing.area_xsize - 1, max_sy = gi->drawing.area_ysize - 1;
   int item_xsize = gi->drawing.item_xsize, item_ysize = gi->drawing.item_ysize;
+  int mini_item_xsize = item_xsize / 2, mini_item_ysize = item_ysize / 2;
+  int sx2 = gi->event.mx / mini_item_xsize;
+  int sy2 = gi->event.my / mini_item_ysize;
+  int dx = sx2 % 2;
+  int dy = sy2 % 2;
   int lx = 0, ly = 0;
   int min_lx = 0, min_ly = 0;
   int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
   int x, y;
 
-  /* handle info callback for each invocation of action callback */
-  gi->callback_info(gi);
-
   button_press_event = (gi->event.type == GD_EVENT_PRESSED);
   button_release_event = (gi->event.type == GD_EVENT_RELEASED);
 
@@ -10753,6 +12346,39 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
     sy = ly - level_ypos;
   }
 
+  /* also correct MM wall-sized (double) drawing area positions accordingly */
+  if (sx2 / 2 < sx || sx2 / 2 > sx)
+  {
+    dx = (sx2 / 2 < sx ? 0 : 1);
+    sx2 = sx * 2 + dx;
+  }
+  if (sy2 / 2 < sy || sy2 / 2 > sy)
+  {
+    dy = (sy2 / 2 < sy ? 0 : 1);
+    sy2 = sy * 2 + dy;
+  }
+
+  if (button_release_event)
+  {
+    last_sx = -1;
+    last_sy = -1;
+    last_sx2 = -1;
+    last_sy2 = -1;
+  }
+  else if (!button_press_event)
+  {
+    /* prevent handling events for every pixel position when moving mouse */
+    if ((sx == last_sx && sy == last_sy &&
+        !IS_MM_WALL_EDITOR(new_element) && new_element != EL_EMPTY) ||
+       (sx2 == last_sx2 && sy2 == last_sy2))
+      return;
+  }
+
+  last_sx = sx;
+  last_sy = sy;
+  last_sx2 = sx2;
+  last_sy2 = sy2;
+
   if (button_press_event)
     started_inside_drawing_area = inside_drawing_area;
 
@@ -10765,6 +12391,9 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   if (!button && !button_release_event)
     return;
 
+  /* handle info callback for each invocation of action callback */
+  gi->callback_info(gi);
+
   /* automatically switch to 'single item' drawing mode, if needed */
   actual_drawing_function =
     (draw_level || drawing_function == GADGET_ID_PICK_ELEMENT ?
@@ -10783,6 +12412,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       ResetIntelliDraw();
   }
 
+  SetDrawModeHiRes(-1);                /* reset to normal draw mode */
+
   switch (actual_drawing_function)
   {
     case GADGET_ID_SINGLE_ITEMS:
@@ -10806,6 +12437,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        }
        else
        {
+         SetDrawModeHiRes(new_element);
+
          if (new_element == EL_PLAYER_1)
          {
            /* remove player at old position */
@@ -10815,12 +12448,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
                  SetElement(x, y, EL_EMPTY);
          }
 
-         SetElementButton(lx, ly, new_element, button);
+         SetElementButton(lx, ly, dx, dy, new_element, button);
        }
       }
-      else
+      else if (!button_release_event)
       {
-       int type_id = gi->custom_type_id;
        int pos = sx * drawingarea_info[type_id].area_ysize + sy;
 
        if (item_xsize == MINI_TILEX && item_ysize == MINI_TILEY)
@@ -10832,7 +12464,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
          DrawFixedGraphicExt(drawto,
                              gi->x + sx * TILEX,
                              gi->y + sy * TILEY,
-                             el2img(new_element), 0);
+                             el2edimg(new_element), 0);
 
        if (id == GADGET_ID_CUSTOM_GRAPHIC)
          new_element = GFX_ELEMENT(new_element);
@@ -10860,6 +12492,14 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 
        if (button)
        {
+         SetDrawModeHiRes(new_element);
+
+         if (getDrawModeHiRes())
+         {
+           sx = sx2;
+           sy = sy2;
+         }
+
          if (!button_press_event)
            DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE);
 
@@ -10873,6 +12513,14 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
     case GADGET_ID_ARC:
     case GADGET_ID_RECTANGLE:
     case GADGET_ID_FILLED_BOX:
+      SetDrawModeHiRes(new_element);
+
+      if (getDrawModeHiRes())
+      {
+       sx = sx2;
+       sy = sy2;
+      }
+      /* FALLTHROUGH */
     case GADGET_ID_GRAB_BRUSH:
     case GADGET_ID_TEXT:
       {
@@ -10923,6 +12571,8 @@ 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 */
+            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;
          last_sy = sy;
@@ -10933,7 +12583,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
     case GADGET_ID_FLOOD_FILL:
       if (button_press_event && Feld[lx][ly] != new_element)
       {
-       FloodFill(lx, ly, new_element);
+       if (IS_MM_WALL_EDITOR(new_element))
+         FloodFillWall_MM(sx2, sy2, new_element);
+       else
+         FloodFill(lx, ly, new_element);
+
        DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
        CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       }
@@ -10947,17 +12601,23 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        PickDrawingElement(button, Feld[lx][ly]);
       else
       {
-       int type_id = gi->custom_type_id;
        int pos = sx * drawingarea_info[type_id].area_ysize + sy;
 
        PickDrawingElement(button, drawingarea_info[type_id].value[pos]);
       }
 
-      break;
-
     default:
       break;
   }
+
+  /* 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;
+
+  level.changed = TRUE;
 }
 
 static void HandleCounterButtons(struct GadgetInfo *gi)
@@ -10995,15 +12655,26 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
   if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
   {
-      LoadLevel(level_nr);
-      LoadScore(level_nr);
+    int last_game_engine_type = level.game_engine_type;
 
-      TapeErase();
+    LoadLevel(level_nr);
+    LoadScore(level_nr);
 
-      ResetUndoBuffer();
-      DrawEditModeWindow();
+    SaveLevelSetup_SeriesInfo();
 
-      return;
+    TapeErase();
+
+    ResetUndoBuffer();
+    DrawEditModeWindow();
+
+    if (level.game_engine_type != last_game_engine_type)
+    {
+      /* update element selection list */
+      ReinitializeElementList();
+      ModifyEditorElementList();
+    }
+
+    return;
   }
 
   switch (counter_id)
@@ -11054,6 +12725,13 @@ 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_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;
 }
 
@@ -11070,6 +12748,11 @@ static void HandleTextInputGadgets(struct GadgetInfo *gi)
     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;
 }
 
@@ -11092,7 +12775,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;
 
@@ -11114,9 +12801,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 */
+    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)
@@ -11124,24 +12822,24 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   int type_id = gi->custom_type_id;
   int i;
 
-  if (type_id >= ED_TEXTBUTTON_ID_LEVELINFO_FIRST &&
-      type_id <= ED_TEXTBUTTON_ID_LEVELINFO_LAST)
+  if (type_id >= ED_TAB_BUTTON_ID_LEVELINFO_FIRST &&
+      type_id <= ED_TAB_BUTTON_ID_LEVELINFO_LAST)
   {
     edit_mode_levelinfo = gi->custom_type_id;
 
     DrawLevelInfoWindow();
   }
-  else if (type_id >= ED_TEXTBUTTON_ID_PROPERTIES_FIRST &&
-          type_id <= ED_TEXTBUTTON_ID_PROPERTIES_LAST)
+  else if (type_id >= ED_TAB_BUTTON_ID_PROPERTIES_FIRST &&
+          type_id <= ED_TAB_BUTTON_ID_PROPERTIES_LAST)
   {
     edit_mode_properties = gi->custom_type_id;
 
     DrawPropertiesWindow();
   }
-  else if (type_id == ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE)
+  else if (type_id == ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1 ||
+          type_id == ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2)
   {
-    char *template_filename = getDefaultLevelFilename(-1);
-    boolean new_template = !fileExists(template_filename);
+    boolean new_template = !fileExists(getLocalLevelTemplateFilename());
 
     /* backup original "level.field" (needed to track playfield changes) */
     CopyPlayfield(level.field, FieldBackup);
@@ -11159,11 +12857,81 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
     /* 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 */
+    if (level.use_custom_template && !AskToCopyAndModifyLevelTemplate())
+      return;
+
     setElementChangePages(ei, ei->num_change_pages + 1);
 
     /* set new change page to be new current change page */
@@ -11181,6 +12949,10 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
   {
     struct ElementInfo *ei = &element_info[properties_element];
 
+    /* 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 */
     for (i = ei->current_change_page; i < ei->num_change_pages - 1; i++)
       ei->change_page[i] = ei->change_page[i + 1];
@@ -11220,10 +12992,16 @@ static void HandleGraphicbuttonGadgets(struct GadgetInfo *gi)
     int current_change_page = ei->current_change_page;
 
     if (type_id == ED_GRAPHICBUTTON_ID_COPY_CHANGE_PAGE)
+    {
       element_info[EL_INTERNAL_CLIPBOARD_CHANGE].change_page[0] =
        ei->change_page[current_change_page];
+    }
     else if (type_id == ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE)
     {
+      /* when modifying custom element, ask for copying level template */
+      if (level.use_custom_template && !AskToCopyAndModifyLevelTemplate())
+       return;
+
       ei->change_page[current_change_page] =
        element_info[EL_INTERNAL_CLIPBOARD_CHANGE].change_page[0];
 
@@ -11236,8 +13014,15 @@ static void HandleGraphicbuttonGadgets(struct GadgetInfo *gi)
 
 static void HandleRadiobuttons(struct GadgetInfo *gi)
 {
-  *radiobutton_info[gi->custom_type_id].value =
-    radiobutton_info[gi->custom_type_id].checked_value;
+  int type_id = gi->custom_type_id;
+
+  *radiobutton_info[type_id].value =
+    radiobutton_info[type_id].checked_value;
+
+  /* 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;
 
   level.changed = TRUE;
 }
@@ -11255,7 +13040,7 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
         type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST) ||
        (type_id >= ED_CHECKBUTTON_ID_CHANGE_FIRST &&
         type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST)) &&
-       type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE))
+       type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1))
   {
     CopyElementPropertiesToGame(properties_element);
   }
@@ -11264,24 +13049,95 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
   {
     UpdateCustomElementGraphicGadgets();
   }
-  else if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE)
+  else if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1 ||
+          type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2)
   {
-    char *template_filename = getDefaultLevelFilename(-1);
+    boolean template_related_changes_found = FALSE;
+    int i;
+
+    /* 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)
+       template_related_changes_found = TRUE;
 
-    if (level.use_custom_template && !fileExists(template_filename))
+    if (level.use_custom_template &&
+       !fileExists(getGlobalLevelTemplateFilename()))
     {
       Request("No level template found!", REQ_CONFIRM);
 
       level.use_custom_template = FALSE;
+
       ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);
 
       return;
     }
 
+    if (level.use_custom_template &&
+       template_related_changes_found &&
+       !Request("Discard changes and use level template?", REQ_ASK))
+    {
+      level.use_custom_template = FALSE;
+
+      ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);
+
+      return;
+    }
+
+    if (!level.use_custom_template &&
+       Request("Copy settings from level template?", REQ_ASK))
+    {
+      return;
+    }
+
     LoadLevelTemplate(level.use_custom_template ? -1 : level_nr);
 
     DrawEditModeWindow();
   }
+  else if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3)
+  {
+    if (setup.editor.use_template_for_new_levels &&
+       !fileExists(getGlobalLevelTemplateFilename()))
+    {
+      Request("No level template found!", REQ_CONFIRM);
+
+      return;
+    }
+
+    if (setup.editor.use_template_for_new_levels &&
+       level.changed &&
+       !Request("Discard level and load template?", REQ_ASK))
+    {
+      return;
+    }
+
+    if (!setup.editor.use_template_for_new_levels &&
+       level.changed &&
+       !Request("Discard level and use empty level?", REQ_ASK))
+    {
+      return;
+    }
+
+    LoadLevel(level_nr);
+    LoadScore(level_nr);
+
+    TapeErase();
+
+    ResetUndoBuffer();
+    DrawEditModeWindow();
+  }
+  else if (type_id == ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS)
+  {
+    SetAutomaticNumberOfGemsNeeded();
+  }
+
+  /* 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_STICK_ELEMENT)
+    return;
 
   level.changed = TRUE;
 }
@@ -11291,10 +13147,12 @@ static void HandleControlButtons(struct GadgetInfo *gi)
   static int last_level_drawing_function = GADGET_ID_SINGLE_ITEMS;
   static int last_edit_mode = ED_MODE_DRAWING;
   static int last_custom_copy_mode = -1;
+  static int last_button = 0;
   int id = gi->custom_id;
   int button = gi->event.button;
   int step = BUTTON_STEPSIZE(button);
   int new_element = BUTTON_ELEMENT(button);
+  int last_properties_element = properties_element;
   int x, y;
 
   if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
@@ -11306,15 +13164,21 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       edit_mode != ED_MODE_DRAWING &&
       drawing_function != GADGET_ID_PICK_ELEMENT &&
       !(GetKeyModState() & KMOD_Control))
-  {
-    DrawDrawingWindow();
-    edit_mode = ED_MODE_DRAWING;
-  }
+    ChangeEditModeWindow(ED_MODE_DRAWING);
 
   /* 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 */
+  if (editor.palette.show_on_element_buttons &&
+      id >= GADGET_ID_ELEMENT_LEFT && id <= GADGET_ID_ELEMENT_RIGHT)
+  {
+    last_button = id - GADGET_ID_ELEMENT_LEFT + 1;
+
+    id = GADGET_ID_PALETTE;
+  }
+
   switch (id)
   {
     case GADGET_ID_SCROLL_LEFT:
@@ -11395,12 +13259,18 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
     case GADGET_ID_SCROLL_HORIZONTAL:
       level_xpos = gi->event.item_position - 1;
+
       DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+      BackToFront();
+
       break;
 
     case GADGET_ID_SCROLL_VERTICAL:
       level_ypos = gi->event.item_position - 1;
+
       DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+      BackToFront();
+
       break;
 
     case GADGET_ID_SCROLL_LIST_UP:
@@ -11428,26 +13298,52 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_PROPERTIES:
+      // always switch off element properties when they are already displayed
+      last_properties_element = new_element;
+    case GADGET_ID_ELEMENT_LEFT:
+    case GADGET_ID_ELEMENT_MIDDLE:
+    case GADGET_ID_ELEMENT_RIGHT:
+      properties_element = (id == GADGET_ID_ELEMENT_LEFT   ? new_element1 :
+                           id == GADGET_ID_ELEMENT_MIDDLE ? new_element2 :
+                           id == GADGET_ID_ELEMENT_RIGHT  ? new_element3 :
+                           new_element);
+
       if (edit_mode != ED_MODE_PROPERTIES)
       {
-       properties_element = new_element;
-       DrawPropertiesWindow();
-       edit_mode = ED_MODE_PROPERTIES;
+       last_edit_mode = edit_mode;
+
+       ChangeEditModeWindow(ED_MODE_PROPERTIES);
 
        last_level_drawing_function = drawing_function;
        ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS],
                      MB_LEFTBUTTON);
       }
+      else if (properties_element != last_properties_element)
+      {
+       DrawEditModeWindow();
+      }
       else
       {
-       DrawDrawingWindow();
-       edit_mode = ED_MODE_DRAWING;
+       ChangeEditModeWindow(last_edit_mode);
 
        ClickOnGadget(level_editor_gadget[last_level_drawing_function],
                      MB_LEFTBUTTON);
       }
       break;
 
+    case GADGET_ID_PALETTE:
+      if (edit_mode != ED_MODE_PALETTE)
+      {
+       last_edit_mode = edit_mode;
+
+       ChangeEditModeWindow(ED_MODE_PALETTE);
+      }
+      else
+      {
+       ChangeEditModeWindow(last_edit_mode);
+      }
+      break;
+
     case GADGET_ID_WRAP_LEFT:
       WrapLevel(-step, 0);
       break;
@@ -11487,17 +13383,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 */
+       PrintEditorGadgetInfoText(level_editor_gadget[id]);
+      }
+
+      /* save current editor zoom tilesize */
+      SaveSetup_AutoSetup();
+
       break;
 
     case GADGET_ID_CUSTOM_COPY_FROM:
@@ -11516,6 +13420,9 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_UNDO:
+      if (button == 1 && GetKeyModState() & (KMOD_Shift|KMOD_Control))
+       button = 3;
+
       if (button == 1 && undo_buffer_steps == 0)
       {
        Request("Undo buffer empty!", REQ_CONFIRM);
@@ -11534,10 +13441,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
 
       if (edit_mode != ED_MODE_DRAWING)
-      {
-       DrawDrawingWindow();
-       edit_mode = ED_MODE_DRAWING;
-      }
+       ChangeEditModeWindow(ED_MODE_DRAWING);
 
       if (button == 1)
       {
@@ -11574,27 +13478,21 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       if (edit_mode != ED_MODE_INFO)
       {
        last_edit_mode = edit_mode;
-       edit_mode = ED_MODE_INFO;
 
-       DrawLevelInfoWindow();
+       ChangeEditModeWindow(ED_MODE_INFO);
       }
       else
       {
-       edit_mode = last_edit_mode;
-
-       DrawEditModeWindow();
+       ChangeEditModeWindow(last_edit_mode);
       }
       break;
 
     case GADGET_ID_CLEAR:
       if (edit_mode != ED_MODE_DRAWING)
-      {
-       DrawDrawingWindow();
-       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);
@@ -11624,6 +13522,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (leveldir_former->readonly)
          ModifyLevelInfoForSavingIntoPersonalLevelSet(leveldir_former->name);
 
+       SetAutomaticNumberOfGemsNeeded();
+
        CopyPlayfield(Feld, level.field);
        SaveLevel(level_nr);
 
@@ -11732,6 +13632,10 @@ static void HandleControlButtons(struct GadgetInfo *gi)
          break;
        }
 
+       /* change element of button used to show palette */
+       if (editor.palette.show_on_element_buttons)
+         button = last_button;
+
        PickDrawingElement(button, new_element);
 
        if (!stick_element_properties_window &&
@@ -11746,6 +13650,9 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (drawing_function == GADGET_ID_PICK_ELEMENT)
          ClickOnGadget(level_editor_gadget[last_drawing_function],
                        MB_LEFTBUTTON);
+
+       if (!use_permanent_palette)
+         ChangeEditModeWindow(last_edit_mode);
       }
 #ifdef DEBUG
       else if (gi->event.type == GD_EVENT_PRESSED)
@@ -11782,6 +13689,7 @@ void HandleLevelEditorKeyInput(Key key)
   {
     int id = GADGET_ID_NONE;
     int new_element_shift = element_shift;
+    int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
     int i;
 
     switch (key)
@@ -11798,13 +13706,23 @@ void HandleLevelEditorKeyInput(Key key)
       case KSYM_Down:
        id = GADGET_ID_SCROLL_DOWN;
        break;
+
       case KSYM_Page_Up:
-       id = GADGET_ID_SCROLL_LIST_UP;
-       button = ED_ELEMENTLIST_BUTTONS_VERT - 1;
-       break;
       case KSYM_Page_Down:
-       id = GADGET_ID_SCROLL_LIST_DOWN;
-       button = ED_ELEMENTLIST_BUTTONS_VERT - 1;
+       step *= (key == KSYM_Page_Up ? -1 : +1);
+        element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+
+        if (element_shift < 0)
+          element_shift = 0;
+        if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+          element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+
+        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+                     GDI_SCROLLBAR_ITEM_POSITION,
+                     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+
+       ModifyEditorElementList();
+
        break;
 
       case KSYM_Home:
@@ -11866,10 +13784,13 @@ void HandleLevelEditorKeyInput(Key key)
        {
          HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
        }
+        else if (edit_mode == ED_MODE_PALETTE)
+       {
+         HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
+       }
        else            /* should never happen */
        {
-         DrawDrawingWindow();
-         edit_mode = ED_MODE_DRAWING;
+         ChangeEditModeWindow(ED_MODE_DRAWING);
        }
 
         break;
@@ -11880,20 +13801,23 @@ void HandleLevelEditorKeyInput(Key key)
 
     if (id != GADGET_ID_NONE)
       ClickOnGadget(level_editor_gadget[id], button);
-    else if (letter >= '1' && letter <= '3')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_PROPERTIES], letter - '0');
-    else if (letter == '?')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_PROPERTIES], button);
+    else if (letter == '1' || letter == '?')
+      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
+    else if (letter == '2')
+      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
+    else if (letter == '3')
+      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
     else if (letter == '.')
       ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
     else if (letter == 'U')
       ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
-    else if (key == KSYM_KP_Subtract)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
-    else if (key == KSYM_KP_0 || letter == '0')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
-    else if (key == KSYM_KP_Add || letter == '+')
+    else if (letter == '-' || key == KSYM_KP_Subtract)
       ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
+    else if (letter == '0' || key == KSYM_KP_0)
+      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
+    else if (letter == '+' || key == KSYM_KP_Add ||
+            letter == '=')     // ("Shift-=" is "+" on US keyboards)
+      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
     else if (key == KSYM_Return ||
             key == KSYM_space ||
             key == setup.shortcut.toggle_pause)
@@ -11908,9 +13832,11 @@ void HandleLevelEditorKeyInput(Key key)
 
 void HandleLevelEditorIdle()
 {
+  int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
+  int x = editor.settings.element_graphic.x + element_border;
+  int y = editor.settings.element_graphic.y + element_border;
   static unsigned int action_delay = 0;
   unsigned int action_delay_value = GameFrameDelay;
-  int xpos = 1, ypos = 2;
   int i;
 
   if (edit_mode != ED_MODE_PROPERTIES)
@@ -11927,16 +13853,14 @@ void HandleLevelEditorIdle()
       return;
   }
 
-  DrawEditorElementAnimation(SX + xpos * TILEX,
-                            SY + ypos * TILEY + MINI_TILEY / 2);
+  DrawEditorElementAnimation(SX + x, SY + y);
 
-  MarkTileDirty(xpos, ypos);
-  MarkTileDirty(xpos, ypos + 1);
+  redraw_mask |= REDRAW_FIELD;
 
   FrameCounter++;      /* increase animation frame counter */
 }
 
-void ClearEditorGadgetInfoText()
+static void ClearEditorGadgetInfoText()
 {
   DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
@@ -11947,7 +13871,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
   char shortcut[MAX_OUTPUT_LINESIZE + 1];
   int max_infotext_len = getMaxInfoTextLength();
 
-  if (gi == NULL || gi->info_text == NULL)
+  if (gi == NULL || strlen(gi->info_text) == 0)
     return;
 
   strncpy(infotext, gi->info_text, max_infotext_len);
@@ -11968,7 +13892,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
       else if (gi->custom_id == GADGET_ID_UNDO)
        sprintf(shortcut, " ('%c/Shift-U')", key);
       else if (gi->custom_id == GADGET_ID_ZOOM)
-       sprintf(shortcut, " ('%c', '0', '+')", key);
+       sprintf(shortcut, " ('%c', '0', '-')", key);
       else
        sprintf(shortcut, " ('%s%c')",
                (key >= 'A' && key <= 'Z' ? "Shift-" : ""), key);
@@ -11978,7 +13902,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
     }
   }
 
-  DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FONT_TEXT_2);
+  DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, INFOTEXT_FONT);
 }
 
 void HandleEditorGadgetInfoText(void *ptr)
@@ -12151,7 +14075,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
   infotext[max_infotext_len] = '\0';
 
   if (strlen(infotext) > 0)
-    DrawTextS(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, infotext);
+    DrawTextS(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, INFOTEXT_FONT, infotext);
 }
 
 void RequestExitLevelEditor(boolean ask_if_level_has_changed,
@@ -12162,14 +14086,37 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed,
       Request("Level has changed! Exit without saving?",
              REQ_ASK | REQ_STAY_OPEN))
   {
-    SetDoorState(DOOR_CLOSE_2);
+    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 */
+    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     &&
+       vp_door_1->width  == DXSIZE &&
+       vp_door_1->height == DYSIZE &&
+       vp_door_2->x      == VX     &&
+       vp_door_2->y      == VY     &&
+       vp_door_2->width  == VXSIZE &&
+       vp_door_2->height == VYSIZE)
+      CloseDoor(DOOR_CLOSE_ALL | DOOR_NO_DELAY);
+    else
+      SetDoorState(DOOR_CLOSE_2);
+
+    BackToFront();
 
     if (quick_quit)
       FadeSkipNextFadeIn();
 
-    game_status = GAME_MODE_MAIN;
+    SetGameStatus(GAME_MODE_MAIN);
 
-    DrawAndFadeInMainMenu(playfield_area_changed ? REDRAW_ALL : REDRAW_FIELD);
+    DrawMainMenu();
   }
   else
   {