added support for text above selectboxes (but not using it yet)
[rocksndiamonds.git] / src / editor.c
index 081e134d692628c9aa3ab8a4f801c3b23ad72acd..761ff632485f8ebc44968c35d883ca5cf42e6dc0 100644 (file)
 #define ED_TABBUTTON_XSIZE          (graphic_info[IMG_EDITOR_TABBUTTON].width)
 #define ED_TABBUTTON_YSIZE          (graphic_info[IMG_EDITOR_TABBUTTON].height)
 
-#define ED_LEVEL_SETTINGS_TABS_X       (editor.settings.tabs.x)
-#define ED_LEVEL_SETTINGS_TABS_Y       (editor.settings.tabs.y)
-#define ED_ELEMENT_SETTINGS_TABS_X     (editor.settings.tabs.x)
-#define ED_ELEMENT_SETTINGS_TABS_Y     (editor.settings.tabs.y +       \
+#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_SETTINGS_XSTART       (ED_LEVEL_SETTINGS_TABS_X +     \
+#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_LEVEL_SETTINGS_TABS_Y +     \
+#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_SETTINGS_XSTART     (ED_ELEMENT_SETTINGS_TABS_X +   \
+#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_ELEMENT_SETTINGS_TABS_Y +   \
+#define ED_ELEMENT_SETTINGS_YSTART     (ED_SETTINGS_ELEMENT_TABS_Y +   \
                                         ED_TABBUTTON_YSIZE +           \
                                         ED_GADGET_TINY_DISTANCE +      \
                                         ED_TAB_BAR_HEIGHT +            \
 #define ED_SETTINGS_YOFFSET            (ED_CHECKBUTTON_YSIZE +         \
                                         ED_GADGET_LINE_DISTANCE)
 
-#define ED_POS_LEVEL_SETTINGS_RANGE    (10000)
-#define ED_POS_LEVEL_SETTINGS_FIRST    (1 * ED_POS_LEVEL_SETTINGS_RANGE)
-#define ED_POS_LEVEL_SETTINGS_LAST     (2 * ED_POS_LEVEL_SETTINGS_RANGE - 1)
-#define ED_POS_ELEMENT_SETTINGS_FIRST  (2 * ED_POS_LEVEL_SETTINGS_RANGE)
-#define ED_POS_ELEMENT_SETTINGS_LAST   (3 * ED_POS_LEVEL_SETTINGS_RANGE - 1)
+#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) : \
+                                        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_SETTINGS(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) : \
+                                        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_TAB_SETTINGS_X(n)           (IS_POS_LEVEL_SETTINGS(n) ?     \
-                                        ED_LEVEL_SETTINGS_TABS_X :     \
-                                        ED_ELEMENT_SETTINGS_TABS_X)
-#define ED_TAB_SETTINGS_Y(n)           (IS_POS_LEVEL_SETTINGS(n) ?     \
-                                        ED_LEVEL_SETTINGS_TABS_Y :     \
-                                        ED_ELEMENT_SETTINGS_TABS_Y)
-
 #define ED_SETTINGS_XOFF(n)            (5 * ((n) % 4) *                \
                                         ED_DRAWINGAREA_TILE_SIZE)
 #define ED_SETTINGS_YOFF(n)            (5 * ((n) / 4) *                \
 #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_SAVE_AS_TEMPLATE_1   (GADGET_ID_TEXTBUTTON_FIRST + 7)
+#define GADGET_ID_SAVE_AS_TEMPLATE_2   (GADGET_ID_TEXTBUTTON_FIRST + 8)
+#define GADGET_ID_ADD_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 9)
+#define GADGET_ID_DEL_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 10)
 
 /* graphicbutton identifiers */
-#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 10)
+#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 11)
 
 #define GADGET_ID_PREV_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 0)
 #define GADGET_ID_NEXT_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 1)
 /* 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_LAZY_RELOCATION      (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 24)
-#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 25)
-#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 26)
-#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 27)
-#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 28)
-#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 29)
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 30)
-#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 31)
-#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 32)
-#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 33)
-#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 34)
-#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 35)
-#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 36)
-#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 37)
-#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 38)
-#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 39)
-#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 40)
-#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 41)
-#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 42)
-#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 43)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 44)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE  (GADGET_ID_CHECKBUTTON_FIRST + 45)
-#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 46)
-#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 47)
-#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 48)
-#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 49)
-#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 50)
-#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 51)
-#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 52)
-#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 53)
-#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 54)
+#define GADGET_ID_AUTO_COUNT_GEMS      (GADGET_ID_CHECKBUTTON_FIRST + 0)
+#define GADGET_ID_RANDOM_PERCENTAGE    (GADGET_ID_CHECKBUTTON_FIRST + 1)
+#define GADGET_ID_RANDOM_QUANTITY      (GADGET_ID_CHECKBUTTON_FIRST + 2)
+#define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 3)
+#define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 4)
+#define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 5)
+#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 6)
+#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 7)
+#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 8)
+#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 9)
+#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 10)
+#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 11)
+#define GADGET_ID_AUTO_EXIT_SOKOBAN    (GADGET_ID_CHECKBUTTON_FIRST + 12)
+#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 13)
+#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 14)
+#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 15)
+#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 16)
+#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 17)
+#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 18)
+#define GADGET_ID_LAZY_RELOCATION      (GADGET_ID_CHECKBUTTON_FIRST + 19)
+#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 20)
+#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 21)
+#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 22)
+#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 23)
+#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 24)
+#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 25)
+#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 26)
+#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 27)
+#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 28)
+#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 29)
+#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 30)
+#define GADGET_ID_MM_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 31)
+#define GADGET_ID_MM_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 32)
+#define GADGET_ID_MM_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 33)
+#define GADGET_ID_DF_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 34)
+#define GADGET_ID_DF_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 35)
+#define GADGET_ID_DF_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 36)
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 37)
+#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 38)
+#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 39)
+#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 40)
+#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 41)
+#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 42)
+#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 43)
+#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 44)
+#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 45)
+#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 46)
+#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 47)
+#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 48)
+#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 49)
+#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 50)
+#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 51)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE_1        (GADGET_ID_CHECKBUTTON_FIRST + 52)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE_2        (GADGET_ID_CHECKBUTTON_FIRST + 53)
+#define GADGET_ID_CUSTOM_USE_TEMPLATE_3        (GADGET_ID_CHECKBUTTON_FIRST + 54)
+#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 55)
+#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 56)
+#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 57)
+#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 58)
+#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 59)
+#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 60)
+#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 61)
+#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 62)
+#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 63)
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 55)
+#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 64)
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define ED_NUM_SELECTBOX                       29
 
 #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_CUSTOM1_FIRST  ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE
 #define ED_SELECTBOX_ID_CUSTOM1_LAST   ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
 #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_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2    7
+#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1    8
+#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE       9
+#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE       10
 
-#define ED_NUM_TEXTBUTTONS                     10
+#define ED_NUM_TEXTBUTTONS                     11
 
-#define ED_TEXTBUTTON_ID_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
-#define ED_TEXTBUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
+#define ED_TAB_BUTTON_ID_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
+#define ED_TAB_BUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
 
-#define ED_TEXTBUTTON_ID_PROPERTIES_FIRST ED_TEXTBUTTON_ID_PROPERTIES_INFO
-#define ED_TEXTBUTTON_ID_PROPERTIES_LAST  ED_TEXTBUTTON_ID_PROPERTIES_CHANGE
+#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_LAZY_RELOCATION      16
-#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    17
-#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  18
-#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        19
-#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      20
-#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        21
-#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 22
-#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   23
-#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   24
-#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    25
-#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    26
-#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    27
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   28
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE  29
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    30
-#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        31
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        32
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        33
-#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        34
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      35
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      36
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     37
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      38
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                39
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   40
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  41
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 42
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        43
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    44
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         45
-#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 46
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  47
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 48
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   49
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 50
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    51
-#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    52
-
-#define ED_NUM_CHECKBUTTONS                    53
+#define ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS      0
+#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    1
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3        2
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2        3
+#define ED_CHECKBUTTON_ID_STICK_ELEMENT                4
+#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     5
+#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  6
+#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       7
+#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     8
+#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  9
+#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   10
+#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   11
+#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN    12
+#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  13
+#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     14
+#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     15
+#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  16
+#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   17
+#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   18
+#define ED_CHECKBUTTON_ID_LAZY_RELOCATION      19
+#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    20
+#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  21
+#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        22
+#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      23
+#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        24
+#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 25
+#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   26
+#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   27
+#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    28
+#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    29
+#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    30
+#define ED_CHECKBUTTON_ID_MM_LASER_RED         31
+#define ED_CHECKBUTTON_ID_MM_LASER_GREEN       32
+#define ED_CHECKBUTTON_ID_MM_LASER_BLUE                33
+#define ED_CHECKBUTTON_ID_DF_LASER_RED         34
+#define ED_CHECKBUTTON_ID_DF_LASER_GREEN       35
+#define ED_CHECKBUTTON_ID_DF_LASER_BLUE                36
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   37
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1        38
+#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    39
+#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        40
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        41
+#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        42
+#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        43
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      44
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      45
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     46
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      47
+#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                48
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   49
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  50
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 51
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        52
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    53
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY         54
+#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 55
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  56
+#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 57
+#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   58
+#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 59
+#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    60
+#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    61
+
+#define ED_NUM_CHECKBUTTONS                    62
+
+#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_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
+
 
 /*
   -----------------------------------------------------------------------------
@@ -1249,7 +1316,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,
@@ -1257,7 +1324,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,
@@ -1568,6 +1635,7 @@ 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                            }
 };
@@ -2265,18 +2333,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),
@@ -2284,26 +2352,26 @@ static struct
     -1,
     options_game_engine_type,
     &level.game_engine_type,
-    "game engine:", NULL,              "game engine"
+    NULL, "game engine:", NULL,                "game engine"
   },
+
+  /* ---------- element settings: configure (several elements) ------------- */
+
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(10),
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
     GADGET_ID_WIND_DIRECTION,          GADGET_ID_NONE,
     -1,
     options_wind_direction,
     &level.wind_direction_initial,
-    "initial wind direction:", NULL,   "initial wind direction"
+    NULL, "initial wind direction:", NULL,     "initial wind direction"
   },
-
-  /* ---------- element settings: configure (several elements) ------------- */
-
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(7),
     GADGET_ID_PLAYER_SPEED,            GADGET_ID_NONE,
     -1,
     options_player_speed,
     &level.initial_player_stepsize[0],
-    "initial player speed:", NULL,     "initial player speed"
+    NULL, "initial player speed:", NULL,       "initial player speed"
   },
 
   /* ---------- element settings: configure 1 (custom elements) ------------ */
@@ -2314,7 +2382,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),
@@ -2322,7 +2390,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),
@@ -2330,7 +2398,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),
@@ -2338,7 +2406,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),
@@ -2346,7 +2414,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) ------------ */
@@ -2357,7 +2425,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),
@@ -2365,7 +2433,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),
@@ -2373,7 +2441,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),
@@ -2383,8 +2451,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),
@@ -2392,7 +2460,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),
@@ -2400,7 +2468,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),
@@ -2408,7 +2476,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),
@@ -2416,7 +2484,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) --------------- */
@@ -2427,7 +2495,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),
@@ -2435,7 +2503,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),
@@ -2443,7 +2511,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),
@@ -2451,7 +2519,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),
@@ -2459,7 +2527,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),
@@ -2467,7 +2535,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),
@@ -2475,7 +2543,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),
@@ -2483,7 +2551,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),
@@ -2491,7 +2559,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),
@@ -2499,7 +2567,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),
@@ -2507,7 +2575,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) --------------- */
@@ -2518,7 +2586,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"
   },
 };
 
@@ -2529,68 +2597,87 @@ 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_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(0),
+    ED_LEVEL_TABS_XPOS(0),             ED_LEVEL_TABS_YPOS(0),
     GADGET_ID_LEVELINFO_LEVEL,         GADGET_ID_NONE,
     8,                                 "Level",                        
-    NULL, NULL,                                "Configure level properties"
+    NULL, NULL, NULL,                  "Configure level properties"
   },
   {
     -1,                                        -1,
     GADGET_ID_LEVELINFO_EDITOR,                GADGET_ID_LEVELINFO_LEVEL,
     8,                                 "Editor",                       
-    NULL, NULL,                                "Configure editor properties"
+    NULL, NULL, NULL,                  "Configure editor properties"
   },
+
+  /* ---------- element settings (tabs) ------------------------------------ */
+
   {
-    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(0),
+    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"
+    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(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"
   },
 };
 
@@ -2743,18 +2830,39 @@ 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(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) ------------- */
 
@@ -2762,191 +2870,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(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(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(5),
     GADGET_ID_LAZY_RELOCATION,         GADGET_ID_NONE,
     &level.lazy_relocation,
-    NULL,
+    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(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(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(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(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) ----------- */
 
@@ -2954,49 +3104,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"
   },
 
@@ -3006,63 +3156,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"
   },
 
@@ -3072,63 +3222,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"
   },
 };
@@ -3492,6 +3642,8 @@ 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 *);
@@ -3505,6 +3657,8 @@ 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 num_editor_gadgets = 0;     /* dynamically determined */
 
@@ -4131,6 +4285,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_POLARISATOR_START,
+  EL_MM_POLARISATOR_CROSS_START,
+
+  EL_MM_BEAMER_RED_START,
+  EL_MM_BEAMER_YELLOW_START,
+  EL_MM_BEAMER_GREEN_START,
+  EL_MM_BEAMER_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,
@@ -4825,9 +5089,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;
@@ -4848,97 +5128,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,
@@ -5103,12 +5395,123 @@ static void InitDynamicEditorElementList(int **elements, int *num_elements)
     (*elements)[(*num_elements)++] = EL_EMPTY;
 }
 
+static void ReinitializeElementList_EnableSections()
+{
+  /* default: enable all element sections */
+
+  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;
+
+  setup_editor_el_custom               = TRUE;
+  setup_editor_el_user_defined         = TRUE;
+  setup_editor_el_dynamic              = TRUE;
+
+  /* now disable all element sections not to be displayed */
+
+  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;
+  }
+
+  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 */
@@ -5153,7 +5556,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);
     }
   }
 
@@ -5258,7 +5661,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++)
@@ -5388,6 +5791,11 @@ 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);
@@ -5874,7 +6282,7 @@ static void CreateDrawingAreas()
 
     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)
@@ -6134,8 +6542,8 @@ static void CreateTextbuttonGadgets()
     struct GadgetInfo *gi;
     unsigned int event_mask;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
-    int x = SX + ED_TAB_SETTINGS_X(textbutton_info[i].x);
-    int y = SY + ED_TAB_SETTINGS_Y(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);
@@ -6706,11 +7114,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);
 
@@ -6729,9 +7143,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 */
@@ -6739,6 +7156,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);
 
@@ -6801,7 +7221,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 */
@@ -6813,6 +7236,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);
 
@@ -7280,6 +7706,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) ?
@@ -7311,6 +7739,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);
@@ -7516,20 +7951,26 @@ static void CopyElementPropertiesToEditor(int element)
     CopyClassicElementPropertiesToEditor(element);
 }
 
-static void AskToCopyAndModifyLevelTemplate()
+static boolean AskToCopyAndModifyLevelTemplate()
 {
-  if (Request("Copy and modify level template?", REQ_ASK))
+  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],
+    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;
   }
 }
 
@@ -7692,7 +8133,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)
@@ -7714,8 +8156,16 @@ static int getMaxEdFieldY(boolean has_scrollbar)
   return max_ed_fieldy;
 }
 
-void InitZoomLevelSettings()
+void InitZoomLevelSettings(int zoom_tilesize)
 {
+  if (zoom_tilesize == -1)
+    zoom_tilesize = setup.auto_setup.editor_zoom_tilesize;
+
+  // limit zoom tilesize by upper and lower bound
+  zoom_tilesize = MIN(MAX(MICRO_TILESIZE, zoom_tilesize), TILESIZE);
+
+  ed_tilesize = setup.auto_setup.editor_zoom_tilesize = zoom_tilesize;
+
   MAX_ED_FIELDX = getMaxEdFieldX(FALSE);
   MAX_ED_FIELDY = getMaxEdFieldY(FALSE);
 }
@@ -7736,7 +8186,7 @@ void DrawLevelEd()
 
   ClearField();
 
-  InitZoomLevelSettings();
+  InitZoomLevelSettings(-1);
 
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
 
@@ -8070,6 +8520,9 @@ static void PickDrawingElement(int button, int element)
   if (button < 1 || button > 3)
     return;
 
+  if (IS_MM_WALL(element))
+    element = map_mm_wall_element(element);
+
   de = drawing_elements[button - 1];
 
   *de.new_element = element;   // update global drawing element variable
@@ -8128,8 +8581,8 @@ static void DrawLevelInfoTabulatorGadgets()
   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;
+  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++)
@@ -8215,6 +8668,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);
@@ -8242,6 +8699,9 @@ 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()
@@ -8254,6 +8714,8 @@ static void DrawLevelInfoWindow()
 
   stick_element_properties_window = FALSE;
 
+  SetAutomaticNumberOfGemsNeeded();
+
   UnmapLevelEditorFieldGadgets();
 
   SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
@@ -8485,41 +8947,22 @@ static void DrawEnvelopeTextArea(int envelope_nr)
   MapTextAreaGadget(ED_TEXTAREA_ID_ENVELOPE_INFO);
 }
 
-static boolean PrintInfoText(char *text, int font_nr, int start_line)
+static void PrintInfoText(char *text, int font_nr, int xpos, int ypos)
 {
-  int font_height = getFontHeight(font_nr);
-  int pad_x = ED_ELEMENT_SETTINGS_X(0);
-  int pad_y = ED_ELEMENT_SETTINGS_Y(0) + ED_GADGET_SMALL_DISTANCE;
-  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;
+  DrawText(SX + xpos, SY + ypos, text, font_nr);
 }
 
-static int PrintElementDescriptionFromFile(char *filename, int start_line)
+static int PrintElementDescriptionFromFile(char *filename, int font_nr,
+                                          int xpos, int ypos)
 {
-  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_GADGET_SMALL_DISTANCE;
-  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;
+  int max_chars_per_line = (SXSIZE - 2 * xpos) / font_width;
+  int max_lines_drawable = (SYSIZE - ypos) / font_height - 1;
 
-  return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
-                     max_lines_drawable, 0, -1, TRUE, FALSE, FALSE);
+  return DrawTextFile(SX + xpos, SY + ypos, filename, font_nr,
+                     max_chars_per_line, -1, max_lines_drawable, 0, -1,
+                     TRUE, FALSE, FALSE);
 }
 
 static void DrawPropertiesInfo()
@@ -8585,23 +9028,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_GADGET_SMALL_DISTANCE;
-  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 */
@@ -8613,40 +9067,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"
@@ -8655,6 +9122,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"
@@ -8736,6 +9207,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 },
@@ -8771,6 +9251,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            }
 };
@@ -8782,7 +9267,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) ||
@@ -8800,6 +9288,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;
@@ -8809,7 +9322,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;
   }
@@ -8964,7 +9481,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);
   }
@@ -8991,6 +9509,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;
@@ -9016,6 +9537,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 */
@@ -9039,7 +9574,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);
@@ -9079,7 +9614,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);
@@ -9088,7 +9623,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);
@@ -9763,10 +10298,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;
 
@@ -9774,7 +10332,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,
@@ -10148,10 +10718,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,
@@ -10159,95 +10733,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_POLARISATOR_CROSS_1,
+       EL_MM_POLARISATOR_CROSS_4,
+       EL_MM_POLARISATOR_CROSS_3,
+       EL_MM_POLARISATOR_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_BEAMER_5,
+       EL_MM_BEAMER_4,
+       EL_MM_BEAMER_3,
+       EL_MM_BEAMER_2,
+       EL_MM_BEAMER_1,
+       EL_MM_BEAMER_16,
+       EL_MM_BEAMER_15,
+       EL_MM_BEAMER_14,
+       EL_MM_BEAMER_13,
+       EL_MM_BEAMER_12,
+       EL_MM_BEAMER_11,
+       EL_MM_BEAMER_10,
+       EL_MM_BEAMER_9,
+       EL_MM_BEAMER_8,
+       EL_MM_BEAMER_7,
+       EL_MM_BEAMER_6
+      },
+      {
+       EL_MM_BEAMER_RED_5,
+       EL_MM_BEAMER_RED_4,
+       EL_MM_BEAMER_RED_3,
+       EL_MM_BEAMER_RED_2,
+       EL_MM_BEAMER_RED_1,
+       EL_MM_BEAMER_RED_16,
+       EL_MM_BEAMER_RED_15,
+       EL_MM_BEAMER_RED_14,
+       EL_MM_BEAMER_RED_13,
+       EL_MM_BEAMER_RED_12,
+       EL_MM_BEAMER_RED_11,
+       EL_MM_BEAMER_RED_10,
+       EL_MM_BEAMER_RED_9,
+       EL_MM_BEAMER_RED_8,
+       EL_MM_BEAMER_RED_7,
+       EL_MM_BEAMER_RED_6
+      },
+      {
+       EL_MM_BEAMER_YELLOW_5,
+       EL_MM_BEAMER_YELLOW_4,
+       EL_MM_BEAMER_YELLOW_3,
+       EL_MM_BEAMER_YELLOW_2,
+       EL_MM_BEAMER_YELLOW_1,
+       EL_MM_BEAMER_YELLOW_16,
+       EL_MM_BEAMER_YELLOW_15,
+       EL_MM_BEAMER_YELLOW_14,
+       EL_MM_BEAMER_YELLOW_13,
+       EL_MM_BEAMER_YELLOW_12,
+       EL_MM_BEAMER_YELLOW_11,
+       EL_MM_BEAMER_YELLOW_10,
+       EL_MM_BEAMER_YELLOW_9,
+       EL_MM_BEAMER_YELLOW_8,
+       EL_MM_BEAMER_YELLOW_7,
+       EL_MM_BEAMER_YELLOW_6
+      },
+      {
+       EL_MM_BEAMER_GREEN_5,
+       EL_MM_BEAMER_GREEN_4,
+       EL_MM_BEAMER_GREEN_3,
+       EL_MM_BEAMER_GREEN_2,
+       EL_MM_BEAMER_GREEN_1,
+       EL_MM_BEAMER_GREEN_16,
+       EL_MM_BEAMER_GREEN_15,
+       EL_MM_BEAMER_GREEN_14,
+       EL_MM_BEAMER_GREEN_13,
+       EL_MM_BEAMER_GREEN_12,
+       EL_MM_BEAMER_GREEN_11,
+       EL_MM_BEAMER_GREEN_10,
+       EL_MM_BEAMER_GREEN_9,
+       EL_MM_BEAMER_GREEN_8,
+       EL_MM_BEAMER_GREEN_7,
+       EL_MM_BEAMER_GREEN_6
+      },
+      {
+       EL_MM_BEAMER_BLUE_5,
+       EL_MM_BEAMER_BLUE_4,
+       EL_MM_BEAMER_BLUE_3,
+       EL_MM_BEAMER_BLUE_2,
+       EL_MM_BEAMER_BLUE_1,
+       EL_MM_BEAMER_BLUE_16,
+       EL_MM_BEAMER_BLUE_15,
+       EL_MM_BEAMER_BLUE_14,
+       EL_MM_BEAMER_BLUE_13,
+       EL_MM_BEAMER_BLUE_12,
+       EL_MM_BEAMER_BLUE_11,
+       EL_MM_BEAMER_BLUE_10,
+       EL_MM_BEAMER_BLUE_9,
+       EL_MM_BEAMER_BLUE_8,
+       EL_MM_BEAMER_BLUE_7,
+       EL_MM_BEAMER_BLUE_6
+      },
+      {
+       EL_MM_POLARISATOR_1,
+       EL_MM_POLARISATOR_16,
+       EL_MM_POLARISATOR_15,
+       EL_MM_POLARISATOR_14,
+       EL_MM_POLARISATOR_13,
+       EL_MM_POLARISATOR_12,
+       EL_MM_POLARISATOR_11,
+       EL_MM_POLARISATOR_10,
+       EL_MM_POLARISATOR_9,
+       EL_MM_POLARISATOR_8,
+       EL_MM_POLARISATOR_7,
+       EL_MM_POLARISATOR_6,
+       EL_MM_POLARISATOR_5,
+       EL_MM_POLARISATOR_4,
+       EL_MM_POLARISATOR_3,
+       EL_MM_POLARISATOR_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,
       },
     };
@@ -10262,19 +11085,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);
@@ -10294,33 +11159,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, 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;
+}
 
-  SetElementExt(lx, ly, element, change_level, -1);
+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,
@@ -10408,32 +11335,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);
   }
 }
 
@@ -10491,11 +11422,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);
 }
@@ -10508,6 +11445,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)
 {
@@ -10580,7 +11522,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);
       }
     }
 
@@ -10633,7 +11575,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);
        }
       }
     }
@@ -10683,6 +11625,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
@@ -10949,7 +11913,10 @@ void WrapLevel(int dx, int dy)
 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;
@@ -10961,14 +11928,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);
 
@@ -10994,6 +11963,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;
 
@@ -11006,6 +12008,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 ?
@@ -11024,6 +12029,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       ResetIntelliDraw();
   }
 
+  SetDrawModeHiRes(-1);                /* reset to normal draw mode */
+
   switch (actual_drawing_function)
   {
     case GADGET_ID_SINGLE_ITEMS:
@@ -11047,6 +12054,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        }
        else
        {
+         SetDrawModeHiRes(new_element);
+
          if (new_element == EL_PLAYER_1)
          {
            /* remove player at old position */
@@ -11056,12 +12065,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)
@@ -11101,6 +12109,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);
 
@@ -11114,6 +12130,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:
       {
@@ -11164,6 +12188,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;
@@ -11174,7 +12200,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);
       }
@@ -11188,17 +12218,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)
@@ -11236,15 +12272,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)
@@ -11295,6 +12342,11 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
        counter_id <= ED_COUNTER_ID_CHANGE_LAST))
     CopyElementPropertiesToGame(properties_element);
 
+  /* do not mark level as modified for certain non-level-changing gadgets */
+  if (counter_id >= ED_COUNTER_ID_EDITOR_FIRST &&
+      counter_id <= ED_COUNTER_ID_EDITOR_LAST)
+    return;
+
   level.changed = TRUE;
 }
 
@@ -11355,9 +12407,19 @@ 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_SELECT_CHANGE_PAGE)
+    return;
+
+  level.changed = TRUE;
 }
 
 static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
@@ -11365,21 +12427,22 @@ 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)
   {
     boolean new_template = !fileExists(getLocalLevelTemplateFilename());
 
@@ -11404,6 +12467,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;
+
     setElementChangePages(ei, ei->num_change_pages + 1);
 
     /* set new change page to be new current change page */
@@ -11421,6 +12488,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];
@@ -11460,10 +12531,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];
 
@@ -11476,8 +12553,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;
 }
@@ -11495,7 +12579,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);
   }
@@ -11504,8 +12588,18 @@ 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)
   {
+    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(getGlobalLevelTemplateFilename()))
     {
@@ -11519,6 +12613,7 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
     }
 
     if (level.use_custom_template &&
+       template_related_changes_found &&
        !Request("Discard changes and use level template?", REQ_ASK))
     {
       level.use_custom_template = FALSE;
@@ -11528,10 +12623,58 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
       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_EDITOR_FIRST &&
+       type_id <= ED_CHECKBUTTON_ID_EDITOR_LAST) ||
+      type_id == ED_CHECKBUTTON_ID_STICK_ELEMENT)
+    return;
 
   level.changed = TRUE;
 }
@@ -11783,11 +12926,19 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       // 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:
@@ -11806,6 +12957,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);
@@ -11874,8 +13028,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       if (edit_mode != ED_MODE_DRAWING)
        ChangeEditModeWindow(ED_MODE_DRAWING);
 
-      for (x = 0; x < MAX_LEV_FIELDX; x++) 
-       for (y = 0; y < MAX_LEV_FIELDY; y++) 
+      for (x = 0; x < MAX_LEV_FIELDX; x++)
+       for (y = 0; y < MAX_LEV_FIELDY; y++)
          Feld[x][y] = (button == 1 ? EL_EMPTY : new_element);
 
       CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
@@ -11905,6 +13059,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (leveldir_former->readonly)
          ModifyLevelInfoForSavingIntoPersonalLevelSet(leveldir_former->name);
 
+       SetAutomaticNumberOfGemsNeeded();
+
        CopyPlayfield(Feld, level.field);
        SaveLevel(level_nr);
 
@@ -12241,7 +13397,7 @@ void HandleLevelEditorIdle()
   FrameCounter++;      /* increase animation frame counter */
 }
 
-void ClearEditorGadgetInfoText()
+static void ClearEditorGadgetInfoText()
 {
   DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
@@ -12273,7 +13429,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);