replaced preprocessor constants with enum values
[rocksndiamonds.git] / src / editor.c
index 5f9b2b9d9e0f95807b7e5b9142c67bd6104e2842..fe006ee671a98ddc6389d958b8ec9c2870efb7b2 100644 (file)
 #define INFOTEXT_XSIZE         SXSIZE
 #define INFOTEXT_YSIZE         getFontHeight(INFOTEXT_FONT)
 #define INFOTEXT_YSIZE_FULL    (INFOTEXT_YSIZE + ED_GADGET_SMALL_DISTANCE)
-#define INFOTEXT_XPOS          SX
-#define INFOTEXT_YPOS          (SY + SYSIZE - INFOTEXT_YSIZE)
+#define INFOTEXT_X             (editor.settings.tooltip.x)
+#define INFOTEXT_Y             (editor.settings.tooltip.y)
+#define INFOTEXT_XY_REDEFINED  (INFOTEXT_X != -1 || INFOTEXT_Y != -1)
+#define INFOTEXT_XPOS          SX + (INFOTEXT_XY_REDEFINED ? INFOTEXT_X : 0)
+#define INFOTEXT_YPOS          SY + (INFOTEXT_XY_REDEFINED ? INFOTEXT_Y : \
+                                     SYSIZE - INFOTEXT_YSIZE)
 
 
 /*
   -----------------------------------------------------------------------------
 */
 
-/* drawing toolbox buttons */
-#define GADGET_ID_NONE                 -1
-#define GADGET_ID_TOOLBOX_FIRST                0
-
-#define GADGET_ID_SINGLE_ITEMS         (GADGET_ID_TOOLBOX_FIRST + 0)
-#define GADGET_ID_CONNECTED_ITEMS      (GADGET_ID_TOOLBOX_FIRST + 1)
-#define GADGET_ID_LINE                 (GADGET_ID_TOOLBOX_FIRST + 2)
-#define GADGET_ID_ARC                  (GADGET_ID_TOOLBOX_FIRST + 3)
-#define GADGET_ID_RECTANGLE            (GADGET_ID_TOOLBOX_FIRST + 4)
-#define GADGET_ID_FILLED_BOX           (GADGET_ID_TOOLBOX_FIRST + 5)
-#define GADGET_ID_WRAP_UP              (GADGET_ID_TOOLBOX_FIRST + 6)
-#define GADGET_ID_TEXT                 (GADGET_ID_TOOLBOX_FIRST + 7)
-#define GADGET_ID_FLOOD_FILL           (GADGET_ID_TOOLBOX_FIRST + 8)
-#define GADGET_ID_WRAP_LEFT            (GADGET_ID_TOOLBOX_FIRST + 9)
-#define GADGET_ID_ZOOM                 (GADGET_ID_TOOLBOX_FIRST + 10)
-#define GADGET_ID_WRAP_RIGHT           (GADGET_ID_TOOLBOX_FIRST + 11)
-#define GADGET_ID_RANDOM_PLACEMENT     (GADGET_ID_TOOLBOX_FIRST + 12)
-#define GADGET_ID_GRAB_BRUSH           (GADGET_ID_TOOLBOX_FIRST + 13)
-#define GADGET_ID_WRAP_DOWN            (GADGET_ID_TOOLBOX_FIRST + 14)
-#define GADGET_ID_PICK_ELEMENT         (GADGET_ID_TOOLBOX_FIRST + 15)
-
-#define GADGET_ID_UNDO                 (GADGET_ID_TOOLBOX_FIRST + 16)
-#define GADGET_ID_INFO                 (GADGET_ID_TOOLBOX_FIRST + 17)
-#define GADGET_ID_SAVE                 (GADGET_ID_TOOLBOX_FIRST + 18)
-#define GADGET_ID_CLEAR                        (GADGET_ID_TOOLBOX_FIRST + 19)
-#define GADGET_ID_TEST                 (GADGET_ID_TOOLBOX_FIRST + 20)
-#define GADGET_ID_EXIT                 (GADGET_ID_TOOLBOX_FIRST + 21)
-
-#define GADGET_ID_CUSTOM_COPY_FROM     (GADGET_ID_TOOLBOX_FIRST + 22)
-#define GADGET_ID_CUSTOM_COPY_TO       (GADGET_ID_TOOLBOX_FIRST + 23)
-#define GADGET_ID_CUSTOM_EXCHANGE      (GADGET_ID_TOOLBOX_FIRST + 24)
-#define GADGET_ID_CUSTOM_COPY          (GADGET_ID_TOOLBOX_FIRST + 25)
-#define GADGET_ID_CUSTOM_PASTE         (GADGET_ID_TOOLBOX_FIRST + 26)
-
-#define GADGET_ID_PROPERTIES           (GADGET_ID_TOOLBOX_FIRST + 27)
-#define GADGET_ID_ELEMENT_LEFT         (GADGET_ID_TOOLBOX_FIRST + 28)
-#define GADGET_ID_ELEMENT_MIDDLE       (GADGET_ID_TOOLBOX_FIRST + 29)
-#define GADGET_ID_ELEMENT_RIGHT                (GADGET_ID_TOOLBOX_FIRST + 30)
-#define GADGET_ID_PALETTE              (GADGET_ID_TOOLBOX_FIRST + 31)
-
-/* counter gadget identifiers */
-#define GADGET_ID_COUNTER_FIRST                (GADGET_ID_TOOLBOX_FIRST + 32)
-
-#define GADGET_ID_SELECT_LEVEL_DOWN    (GADGET_ID_COUNTER_FIRST + 0)
-#define GADGET_ID_SELECT_LEVEL_TEXT    (GADGET_ID_COUNTER_FIRST + 1)
-#define GADGET_ID_SELECT_LEVEL_UP      (GADGET_ID_COUNTER_FIRST + 2)
-#define GADGET_ID_LEVEL_XSIZE_DOWN     (GADGET_ID_COUNTER_FIRST + 3)
-#define GADGET_ID_LEVEL_XSIZE_TEXT     (GADGET_ID_COUNTER_FIRST + 4)
-#define GADGET_ID_LEVEL_XSIZE_UP       (GADGET_ID_COUNTER_FIRST + 5)
-#define GADGET_ID_LEVEL_YSIZE_DOWN     (GADGET_ID_COUNTER_FIRST + 6)
-#define GADGET_ID_LEVEL_YSIZE_TEXT     (GADGET_ID_COUNTER_FIRST + 7)
-#define GADGET_ID_LEVEL_YSIZE_UP       (GADGET_ID_COUNTER_FIRST + 8)
-#define GADGET_ID_LEVEL_RANDOM_DOWN    (GADGET_ID_COUNTER_FIRST + 9)
-#define GADGET_ID_LEVEL_RANDOM_TEXT    (GADGET_ID_COUNTER_FIRST + 10)
-#define GADGET_ID_LEVEL_RANDOM_UP      (GADGET_ID_COUNTER_FIRST + 11)
-#define GADGET_ID_LEVEL_GEMSLIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 12)
-#define GADGET_ID_LEVEL_GEMSLIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 13)
-#define GADGET_ID_LEVEL_GEMSLIMIT_UP   (GADGET_ID_COUNTER_FIRST + 14)
-#define GADGET_ID_LEVEL_TIMELIMIT_DOWN (GADGET_ID_COUNTER_FIRST + 15)
-#define GADGET_ID_LEVEL_TIMELIMIT_TEXT (GADGET_ID_COUNTER_FIRST + 16)
-#define GADGET_ID_LEVEL_TIMELIMIT_UP   (GADGET_ID_COUNTER_FIRST + 17)
-#define GADGET_ID_LEVEL_TIMESCORE_DOWN (GADGET_ID_COUNTER_FIRST + 18)
-#define GADGET_ID_LEVEL_TIMESCORE_TEXT (GADGET_ID_COUNTER_FIRST + 19)
-#define GADGET_ID_LEVEL_TIMESCORE_UP   (GADGET_ID_COUNTER_FIRST + 20)
-#define GADGET_ID_LEVEL_RANDOM_SEED_DOWN (GADGET_ID_COUNTER_FIRST + 21)
-#define GADGET_ID_LEVEL_RANDOM_SEED_TEXT (GADGET_ID_COUNTER_FIRST + 22)
-#define GADGET_ID_LEVEL_RANDOM_SEED_UP (GADGET_ID_COUNTER_FIRST + 23)
-#define GADGET_ID_LEVELSET_NUM_LEVELS_DOWN (GADGET_ID_COUNTER_FIRST + 24)
-#define GADGET_ID_LEVELSET_NUM_LEVELS_TEXT (GADGET_ID_COUNTER_FIRST + 25)
-#define GADGET_ID_LEVELSET_NUM_LEVELS_UP   (GADGET_ID_COUNTER_FIRST + 26)
-#define GADGET_ID_ELEMENT_VALUE1_DOWN  (GADGET_ID_COUNTER_FIRST + 27)
-#define GADGET_ID_ELEMENT_VALUE1_TEXT  (GADGET_ID_COUNTER_FIRST + 28)
-#define GADGET_ID_ELEMENT_VALUE1_UP    (GADGET_ID_COUNTER_FIRST + 29)
-#define GADGET_ID_ELEMENT_VALUE2_DOWN  (GADGET_ID_COUNTER_FIRST + 30)
-#define GADGET_ID_ELEMENT_VALUE2_TEXT  (GADGET_ID_COUNTER_FIRST + 31)
-#define GADGET_ID_ELEMENT_VALUE2_UP    (GADGET_ID_COUNTER_FIRST + 32)
-#define GADGET_ID_ELEMENT_VALUE3_DOWN  (GADGET_ID_COUNTER_FIRST + 33)
-#define GADGET_ID_ELEMENT_VALUE3_TEXT  (GADGET_ID_COUNTER_FIRST + 34)
-#define GADGET_ID_ELEMENT_VALUE3_UP    (GADGET_ID_COUNTER_FIRST + 35)
-#define GADGET_ID_ELEMENT_VALUE4_DOWN  (GADGET_ID_COUNTER_FIRST + 36)
-#define GADGET_ID_ELEMENT_VALUE4_TEXT  (GADGET_ID_COUNTER_FIRST + 37)
-#define GADGET_ID_ELEMENT_VALUE4_UP    (GADGET_ID_COUNTER_FIRST + 38)
-#define GADGET_ID_YAMYAM_CONTENT_DOWN  (GADGET_ID_COUNTER_FIRST + 39)
-#define GADGET_ID_YAMYAM_CONTENT_TEXT  (GADGET_ID_COUNTER_FIRST + 40)
-#define GADGET_ID_YAMYAM_CONTENT_UP    (GADGET_ID_COUNTER_FIRST + 41)
-#define GADGET_ID_BALL_CONTENT_DOWN    (GADGET_ID_COUNTER_FIRST + 42)
-#define GADGET_ID_BALL_CONTENT_TEXT    (GADGET_ID_COUNTER_FIRST + 43)
-#define GADGET_ID_BALL_CONTENT_UP      (GADGET_ID_COUNTER_FIRST + 44)
-#define GADGET_ID_ANDROID_CONTENT_DOWN (GADGET_ID_COUNTER_FIRST + 45)
-#define GADGET_ID_ANDROID_CONTENT_TEXT (GADGET_ID_COUNTER_FIRST + 46)
-#define GADGET_ID_ANDROID_CONTENT_UP   (GADGET_ID_COUNTER_FIRST + 47)
-#define GADGET_ID_ENVELOPE_XSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 48)
-#define GADGET_ID_ENVELOPE_XSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 49)
-#define GADGET_ID_ENVELOPE_XSIZE_UP    (GADGET_ID_COUNTER_FIRST + 50)
-#define GADGET_ID_ENVELOPE_YSIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 51)
-#define GADGET_ID_ENVELOPE_YSIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 52)
-#define GADGET_ID_ENVELOPE_YSIZE_UP    (GADGET_ID_COUNTER_FIRST + 53)
-#define GADGET_ID_INVENTORY_SIZE_DOWN  (GADGET_ID_COUNTER_FIRST + 54)
-#define GADGET_ID_INVENTORY_SIZE_TEXT  (GADGET_ID_COUNTER_FIRST + 55)
-#define GADGET_ID_INVENTORY_SIZE_UP    (GADGET_ID_COUNTER_FIRST + 56)
-#define GADGET_ID_CUSTOM_SCORE_DOWN    (GADGET_ID_COUNTER_FIRST + 57)
-#define GADGET_ID_CUSTOM_SCORE_TEXT    (GADGET_ID_COUNTER_FIRST + 58)
-#define GADGET_ID_CUSTOM_SCORE_UP      (GADGET_ID_COUNTER_FIRST + 59)
-#define GADGET_ID_CUSTOM_GEMCOUNT_DOWN (GADGET_ID_COUNTER_FIRST + 60)
-#define GADGET_ID_CUSTOM_GEMCOUNT_TEXT (GADGET_ID_COUNTER_FIRST + 61)
-#define GADGET_ID_CUSTOM_GEMCOUNT_UP   (GADGET_ID_COUNTER_FIRST + 62)
-#define GADGET_ID_CUSTOM_VALUE_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 63)
-#define GADGET_ID_CUSTOM_VALUE_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 64)
-#define GADGET_ID_CUSTOM_VALUE_FIX_UP  (GADGET_ID_COUNTER_FIRST + 65)
-#define GADGET_ID_CUSTOM_VALUE_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 66)
-#define GADGET_ID_CUSTOM_VALUE_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 67)
-#define GADGET_ID_CUSTOM_VALUE_RND_UP  (GADGET_ID_COUNTER_FIRST + 68)
-#define GADGET_ID_PUSH_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 69)
-#define GADGET_ID_PUSH_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 70)
-#define GADGET_ID_PUSH_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 71)
-#define GADGET_ID_PUSH_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 72)
-#define GADGET_ID_PUSH_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 73)
-#define GADGET_ID_PUSH_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 74)
-#define GADGET_ID_DROP_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 75)
-#define GADGET_ID_DROP_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 76)
-#define GADGET_ID_DROP_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 77)
-#define GADGET_ID_DROP_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 78)
-#define GADGET_ID_DROP_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 79)
-#define GADGET_ID_DROP_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 80)
-#define GADGET_ID_MOVE_DELAY_FIX_DOWN  (GADGET_ID_COUNTER_FIRST + 81)
-#define GADGET_ID_MOVE_DELAY_FIX_TEXT  (GADGET_ID_COUNTER_FIRST + 82)
-#define GADGET_ID_MOVE_DELAY_FIX_UP    (GADGET_ID_COUNTER_FIRST + 83)
-#define GADGET_ID_MOVE_DELAY_RND_DOWN  (GADGET_ID_COUNTER_FIRST + 84)
-#define GADGET_ID_MOVE_DELAY_RND_TEXT  (GADGET_ID_COUNTER_FIRST + 85)
-#define GADGET_ID_MOVE_DELAY_RND_UP    (GADGET_ID_COUNTER_FIRST + 86)
-#define GADGET_ID_EXPLOSION_DELAY_DOWN (GADGET_ID_COUNTER_FIRST + 87)
-#define GADGET_ID_EXPLOSION_DELAY_TEXT (GADGET_ID_COUNTER_FIRST + 88)
-#define GADGET_ID_EXPLOSION_DELAY_UP   (GADGET_ID_COUNTER_FIRST + 89)
-#define GADGET_ID_IGNITION_DELAY_DOWN  (GADGET_ID_COUNTER_FIRST + 90)
-#define GADGET_ID_IGNITION_DELAY_TEXT  (GADGET_ID_COUNTER_FIRST + 91)
-#define GADGET_ID_IGNITION_DELAY_UP    (GADGET_ID_COUNTER_FIRST + 92)
-#define GADGET_ID_CHANGE_DELAY_FIX_DOWN        (GADGET_ID_COUNTER_FIRST + 93)
-#define GADGET_ID_CHANGE_DELAY_FIX_TEXT        (GADGET_ID_COUNTER_FIRST + 94)
-#define GADGET_ID_CHANGE_DELAY_FIX_UP  (GADGET_ID_COUNTER_FIRST + 95)
-#define GADGET_ID_CHANGE_DELAY_RND_DOWN        (GADGET_ID_COUNTER_FIRST + 96)
-#define GADGET_ID_CHANGE_DELAY_RND_TEXT        (GADGET_ID_COUNTER_FIRST + 97)
-#define GADGET_ID_CHANGE_DELAY_RND_UP  (GADGET_ID_COUNTER_FIRST + 98)
-#define GADGET_ID_CHANGE_CONT_RND_DOWN (GADGET_ID_COUNTER_FIRST + 99)
-#define GADGET_ID_CHANGE_CONT_RND_TEXT (GADGET_ID_COUNTER_FIRST + 100)
-#define GADGET_ID_CHANGE_CONT_RND_UP   (GADGET_ID_COUNTER_FIRST + 101)
-#define GADGET_ID_GROUP_CONTENT_DOWN   (GADGET_ID_COUNTER_FIRST + 102)
-#define GADGET_ID_GROUP_CONTENT_TEXT   (GADGET_ID_COUNTER_FIRST + 103)
-#define GADGET_ID_GROUP_CONTENT_UP     (GADGET_ID_COUNTER_FIRST + 104)
-
-/* drawing area identifiers */
-#define GADGET_ID_DRAWING_AREA_FIRST   (GADGET_ID_COUNTER_FIRST + 105)
-
-#define GADGET_ID_DRAWING_LEVEL                (GADGET_ID_DRAWING_AREA_FIRST + 0)
-#define GADGET_ID_YAMYAM_CONTENT_0     (GADGET_ID_DRAWING_AREA_FIRST + 1)
-#define GADGET_ID_YAMYAM_CONTENT_1     (GADGET_ID_DRAWING_AREA_FIRST + 2)
-#define GADGET_ID_YAMYAM_CONTENT_2     (GADGET_ID_DRAWING_AREA_FIRST + 3)
-#define GADGET_ID_YAMYAM_CONTENT_3     (GADGET_ID_DRAWING_AREA_FIRST + 4)
-#define GADGET_ID_YAMYAM_CONTENT_4     (GADGET_ID_DRAWING_AREA_FIRST + 5)
-#define GADGET_ID_YAMYAM_CONTENT_5     (GADGET_ID_DRAWING_AREA_FIRST + 6)
-#define GADGET_ID_YAMYAM_CONTENT_6     (GADGET_ID_DRAWING_AREA_FIRST + 7)
-#define GADGET_ID_YAMYAM_CONTENT_7     (GADGET_ID_DRAWING_AREA_FIRST + 8)
-#define GADGET_ID_MAGIC_BALL_CONTENT_0 (GADGET_ID_DRAWING_AREA_FIRST + 9)
-#define GADGET_ID_MAGIC_BALL_CONTENT_1 (GADGET_ID_DRAWING_AREA_FIRST + 10)
-#define GADGET_ID_MAGIC_BALL_CONTENT_2 (GADGET_ID_DRAWING_AREA_FIRST + 11)
-#define GADGET_ID_MAGIC_BALL_CONTENT_3 (GADGET_ID_DRAWING_AREA_FIRST + 12)
-#define GADGET_ID_MAGIC_BALL_CONTENT_4 (GADGET_ID_DRAWING_AREA_FIRST + 13)
-#define GADGET_ID_MAGIC_BALL_CONTENT_5 (GADGET_ID_DRAWING_AREA_FIRST + 14)
-#define GADGET_ID_MAGIC_BALL_CONTENT_6 (GADGET_ID_DRAWING_AREA_FIRST + 15)
-#define GADGET_ID_MAGIC_BALL_CONTENT_7 (GADGET_ID_DRAWING_AREA_FIRST + 16)
-#define GADGET_ID_ANDROID_CONTENT      (GADGET_ID_DRAWING_AREA_FIRST + 17)
-#define GADGET_ID_AMOEBA_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 18)
-#define GADGET_ID_START_ELEMENT                (GADGET_ID_DRAWING_AREA_FIRST + 19)
-#define GADGET_ID_ARTWORK_ELEMENT      (GADGET_ID_DRAWING_AREA_FIRST + 20)
-#define GADGET_ID_EXPLOSION_ELEMENT    (GADGET_ID_DRAWING_AREA_FIRST + 21)
-#define GADGET_ID_INVENTORY_CONTENT    (GADGET_ID_DRAWING_AREA_FIRST + 22)
-#define GADGET_ID_CUSTOM_GRAPHIC       (GADGET_ID_DRAWING_AREA_FIRST + 23)
-#define GADGET_ID_CUSTOM_CONTENT       (GADGET_ID_DRAWING_AREA_FIRST + 24)
-#define GADGET_ID_CUSTOM_MOVE_ENTER    (GADGET_ID_DRAWING_AREA_FIRST + 25)
-#define GADGET_ID_CUSTOM_MOVE_LEAVE    (GADGET_ID_DRAWING_AREA_FIRST + 26)
-#define GADGET_ID_CUSTOM_CHANGE_TARGET (GADGET_ID_DRAWING_AREA_FIRST + 27)
-#define GADGET_ID_CUSTOM_CHANGE_CONTENT        (GADGET_ID_DRAWING_AREA_FIRST + 28)
-#define GADGET_ID_CUSTOM_CHANGE_TRIGGER        (GADGET_ID_DRAWING_AREA_FIRST + 29)
-#define GADGET_ID_CUSTOM_CHANGE_ACTION (GADGET_ID_DRAWING_AREA_FIRST + 30)
-#define GADGET_ID_GROUP_CONTENT                (GADGET_ID_DRAWING_AREA_FIRST + 31)
-#define GADGET_ID_RANDOM_BACKGROUND    (GADGET_ID_DRAWING_AREA_FIRST + 32)
-
-/* text input identifiers */
-#define GADGET_ID_TEXT_INPUT_FIRST     (GADGET_ID_DRAWING_AREA_FIRST + 33)
-
-#define GADGET_ID_LEVEL_NAME           (GADGET_ID_TEXT_INPUT_FIRST + 0)
-#define GADGET_ID_LEVEL_AUTHOR         (GADGET_ID_TEXT_INPUT_FIRST + 1)
-#define GADGET_ID_LEVELSET_NAME                (GADGET_ID_TEXT_INPUT_FIRST + 2)
-#define GADGET_ID_LEVELSET_AUTHOR      (GADGET_ID_TEXT_INPUT_FIRST + 3)
-#define GADGET_ID_ELEMENT_NAME         (GADGET_ID_TEXT_INPUT_FIRST + 4)
-
-/* text area identifiers */
-#define GADGET_ID_TEXT_AREA_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 5)
-
-#define GADGET_ID_ENVELOPE_INFO                (GADGET_ID_TEXT_AREA_FIRST + 0)
-
-/* selectbox identifiers */
-#define GADGET_ID_SELECTBOX_FIRST      (GADGET_ID_TEXT_AREA_FIRST + 1)
-
-#define GADGET_ID_TIME_OR_STEPS                (GADGET_ID_SELECTBOX_FIRST + 0)
-#define GADGET_ID_GAME_ENGINE_TYPE     (GADGET_ID_SELECTBOX_FIRST + 1)
-#define GADGET_ID_LEVELSET_SAVE_MODE   (GADGET_ID_SELECTBOX_FIRST + 2)
-#define GADGET_ID_WIND_DIRECTION       (GADGET_ID_SELECTBOX_FIRST + 3)
-#define GADGET_ID_PLAYER_SPEED         (GADGET_ID_SELECTBOX_FIRST + 4)
-#define GADGET_ID_CUSTOM_WALK_TO_ACTION        (GADGET_ID_SELECTBOX_FIRST + 5)
-#define GADGET_ID_CUSTOM_EXPLOSION_TYPE        (GADGET_ID_SELECTBOX_FIRST + 6)
-#define GADGET_ID_CUSTOM_DEADLINESS    (GADGET_ID_SELECTBOX_FIRST + 7)
-#define GADGET_ID_CUSTOM_MOVE_PATTERN  (GADGET_ID_SELECTBOX_FIRST + 8)
-#define GADGET_ID_CUSTOM_MOVE_DIRECTION        (GADGET_ID_SELECTBOX_FIRST + 9)
-#define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 10)
-#define GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE (GADGET_ID_SELECTBOX_FIRST + 11)
-#define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 12)
-#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 13)
-#define GADGET_ID_CUSTOM_ACCESS_TYPE   (GADGET_ID_SELECTBOX_FIRST + 14)
-#define GADGET_ID_CUSTOM_ACCESS_LAYER  (GADGET_ID_SELECTBOX_FIRST + 15)
-#define GADGET_ID_CUSTOM_ACCESS_PROTECTED (GADGET_ID_SELECTBOX_FIRST + 16)
-#define GADGET_ID_CUSTOM_ACCESS_DIRECTION (GADGET_ID_SELECTBOX_FIRST + 17)
-#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 18)
-#define GADGET_ID_CHANGE_DIRECT_ACTION (GADGET_ID_SELECTBOX_FIRST + 19)
-#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 20)
-#define GADGET_ID_CHANGE_SIDE          (GADGET_ID_SELECTBOX_FIRST + 21)
-#define GADGET_ID_CHANGE_PLAYER                (GADGET_ID_SELECTBOX_FIRST + 22)
-#define GADGET_ID_CHANGE_PAGE          (GADGET_ID_SELECTBOX_FIRST + 23)
-#define GADGET_ID_CHANGE_REPLACE_WHEN  (GADGET_ID_SELECTBOX_FIRST + 24)
-#define GADGET_ID_ACTION_TYPE          (GADGET_ID_SELECTBOX_FIRST + 25)
-#define GADGET_ID_ACTION_MODE          (GADGET_ID_SELECTBOX_FIRST + 26)
-#define GADGET_ID_ACTION_ARG           (GADGET_ID_SELECTBOX_FIRST + 27)
-#define GADGET_ID_SELECT_CHANGE_PAGE   (GADGET_ID_SELECTBOX_FIRST + 28)
-#define GADGET_ID_GROUP_CHOICE_MODE    (GADGET_ID_SELECTBOX_FIRST + 29)
-
-/* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 30)
-
-#define GADGET_ID_LEVELINFO_LEVEL      (GADGET_ID_TEXTBUTTON_FIRST + 0)
-#define GADGET_ID_LEVELINFO_LEVELSET   (GADGET_ID_TEXTBUTTON_FIRST + 1)
-#define GADGET_ID_LEVELINFO_EDITOR     (GADGET_ID_TEXTBUTTON_FIRST + 2)
-#define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 3)
-#define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 4)
-#define GADGET_ID_PROPERTIES_CONFIG_1  (GADGET_ID_TEXTBUTTON_FIRST + 5)
-#define GADGET_ID_PROPERTIES_CONFIG_2  (GADGET_ID_TEXTBUTTON_FIRST + 6)
-#define GADGET_ID_PROPERTIES_CHANGE    (GADGET_ID_TEXTBUTTON_FIRST + 7)
-#define GADGET_ID_SAVE_AS_TEMPLATE_1   (GADGET_ID_TEXTBUTTON_FIRST + 8)
-#define GADGET_ID_SAVE_AS_TEMPLATE_2   (GADGET_ID_TEXTBUTTON_FIRST + 9)
-#define GADGET_ID_SAVE_LEVELSET                (GADGET_ID_TEXTBUTTON_FIRST + 10)
-#define GADGET_ID_ADD_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 11)
-#define GADGET_ID_DEL_CHANGE_PAGE      (GADGET_ID_TEXTBUTTON_FIRST + 12)
-
-/* graphicbutton identifiers */
-#define GADGET_ID_GRAPHICBUTTON_FIRST  (GADGET_ID_TEXTBUTTON_FIRST + 13)
-
-#define GADGET_ID_PREV_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 0)
-#define GADGET_ID_NEXT_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 1)
-#define GADGET_ID_COPY_CHANGE_PAGE     (GADGET_ID_GRAPHICBUTTON_FIRST + 2)
-#define GADGET_ID_PASTE_CHANGE_PAGE    (GADGET_ID_GRAPHICBUTTON_FIRST + 3)
-
-/* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLLING_FIRST      (GADGET_ID_GRAPHICBUTTON_FIRST + 4)
-
-#define GADGET_ID_SCROLL_UP            (GADGET_ID_SCROLLING_FIRST + 0)
-#define GADGET_ID_SCROLL_DOWN          (GADGET_ID_SCROLLING_FIRST + 1)
-#define GADGET_ID_SCROLL_LEFT          (GADGET_ID_SCROLLING_FIRST + 2)
-#define GADGET_ID_SCROLL_RIGHT         (GADGET_ID_SCROLLING_FIRST + 3)
-#define GADGET_ID_SCROLL_HORIZONTAL    (GADGET_ID_SCROLLING_FIRST + 4)
-#define GADGET_ID_SCROLL_VERTICAL      (GADGET_ID_SCROLLING_FIRST + 5)
-
-/* gadgets for scrolling element list */
-#define GADGET_ID_SCROLLING_LIST_FIRST (GADGET_ID_SCROLLING_FIRST + 6)
-
-#define GADGET_ID_SCROLL_LIST_UP       (GADGET_ID_SCROLLING_LIST_FIRST + 0)
-#define GADGET_ID_SCROLL_LIST_DOWN     (GADGET_ID_SCROLLING_LIST_FIRST + 1)
-#define GADGET_ID_SCROLL_LIST_VERTICAL (GADGET_ID_SCROLLING_LIST_FIRST + 2)
-
-/* checkbuttons/radiobuttons for level/element properties */
-#define GADGET_ID_CHECKBUTTON_FIRST    (GADGET_ID_SCROLLING_LIST_FIRST + 3)
-
-#define GADGET_ID_AUTO_COUNT_GEMS      (GADGET_ID_CHECKBUTTON_FIRST + 0)
-#define GADGET_ID_RANDOM_PERCENTAGE    (GADGET_ID_CHECKBUTTON_FIRST + 1)
-#define GADGET_ID_RANDOM_QUANTITY      (GADGET_ID_CHECKBUTTON_FIRST + 2)
-#define GADGET_ID_RANDOM_RESTRICTED    (GADGET_ID_CHECKBUTTON_FIRST + 3)
-#define GADGET_ID_STICK_ELEMENT                (GADGET_ID_CHECKBUTTON_FIRST + 4)
-#define GADGET_ID_EM_SLIPPERY_GEMS     (GADGET_ID_CHECKBUTTON_FIRST + 5)
-#define GADGET_ID_EM_EXPLODES_BY_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 6)
-#define GADGET_ID_USE_SPRING_BUG       (GADGET_ID_CHECKBUTTON_FIRST + 7)
-#define GADGET_ID_USE_TIME_ORB_BUG     (GADGET_ID_CHECKBUTTON_FIRST + 8)
-#define GADGET_ID_RANDOM_BALL_CONTENT  (GADGET_ID_CHECKBUTTON_FIRST + 9)
-#define GADGET_ID_INITIAL_BALL_STATE   (GADGET_ID_CHECKBUTTON_FIRST + 10)
-#define GADGET_ID_GROW_INTO_DIGGABLE   (GADGET_ID_CHECKBUTTON_FIRST + 11)
-#define GADGET_ID_AUTO_EXIT_SOKOBAN    (GADGET_ID_CHECKBUTTON_FIRST + 12)
-#define GADGET_ID_CONTINUOUS_SNAPPING  (GADGET_ID_CHECKBUTTON_FIRST + 13)
-#define GADGET_ID_BLOCK_SNAP_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 14)
-#define GADGET_ID_BLOCK_LAST_FIELD     (GADGET_ID_CHECKBUTTON_FIRST + 15)
-#define GADGET_ID_SP_BLOCK_LAST_FIELD  (GADGET_ID_CHECKBUTTON_FIRST + 16)
-#define GADGET_ID_INSTANT_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 17)
-#define GADGET_ID_SHIFTED_RELOCATION   (GADGET_ID_CHECKBUTTON_FIRST + 18)
-#define GADGET_ID_LAZY_RELOCATION      (GADGET_ID_CHECKBUTTON_FIRST + 19)
-#define GADGET_ID_USE_START_ELEMENT    (GADGET_ID_CHECKBUTTON_FIRST + 20)
-#define GADGET_ID_USE_ARTWORK_ELEMENT  (GADGET_ID_CHECKBUTTON_FIRST + 21)
-#define GADGET_ID_USE_EXPLOSION_ELEMENT        (GADGET_ID_CHECKBUTTON_FIRST + 22)
-#define GADGET_ID_INITIAL_GRAVITY      (GADGET_ID_CHECKBUTTON_FIRST + 23)
-#define GADGET_ID_USE_INITIAL_INVENTORY        (GADGET_ID_CHECKBUTTON_FIRST + 24)
-#define GADGET_ID_CAN_PASS_TO_WALKABLE (GADGET_ID_CHECKBUTTON_FIRST + 25)
-#define GADGET_ID_CAN_FALL_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 26)
-#define GADGET_ID_CAN_MOVE_INTO_ACID   (GADGET_ID_CHECKBUTTON_FIRST + 27)
-#define GADGET_ID_DONT_COLLIDE_WITH    (GADGET_ID_CHECKBUTTON_FIRST + 28)
-#define GADGET_ID_ENVELOPE_AUTOWRAP    (GADGET_ID_CHECKBUTTON_FIRST + 29)
-#define GADGET_ID_ENVELOPE_CENTERED    (GADGET_ID_CHECKBUTTON_FIRST + 30)
-#define GADGET_ID_MM_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 31)
-#define GADGET_ID_MM_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 32)
-#define GADGET_ID_MM_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 33)
-#define GADGET_ID_DF_LASER_RED         (GADGET_ID_CHECKBUTTON_FIRST + 34)
-#define GADGET_ID_DF_LASER_GREEN       (GADGET_ID_CHECKBUTTON_FIRST + 35)
-#define GADGET_ID_DF_LASER_BLUE                (GADGET_ID_CHECKBUTTON_FIRST + 36)
-#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        (GADGET_ID_CHECKBUTTON_FIRST + 37)
-#define GADGET_ID_CUSTOM_CAN_EXPLODE   (GADGET_ID_CHECKBUTTON_FIRST + 38)
-#define GADGET_ID_CUSTOM_EXPLODE_FIRE  (GADGET_ID_CHECKBUTTON_FIRST + 39)
-#define GADGET_ID_CUSTOM_EXPLODE_SMASH (GADGET_ID_CHECKBUTTON_FIRST + 40)
-#define GADGET_ID_CUSTOM_EXPLODE_IMPACT        (GADGET_ID_CHECKBUTTON_FIRST + 41)
-#define GADGET_ID_CUSTOM_WALK_TO_OBJECT        (GADGET_ID_CHECKBUTTON_FIRST + 42)
-#define GADGET_ID_CUSTOM_DEADLY                (GADGET_ID_CHECKBUTTON_FIRST + 43)
-#define GADGET_ID_CUSTOM_CAN_MOVE      (GADGET_ID_CHECKBUTTON_FIRST + 44)
-#define GADGET_ID_CUSTOM_CAN_FALL      (GADGET_ID_CHECKBUTTON_FIRST + 45)
-#define GADGET_ID_CUSTOM_CAN_SMASH     (GADGET_ID_CHECKBUTTON_FIRST + 46)
-#define GADGET_ID_CUSTOM_SLIPPERY      (GADGET_ID_CHECKBUTTON_FIRST + 47)
-#define GADGET_ID_CUSTOM_ACCESSIBLE    (GADGET_ID_CHECKBUTTON_FIRST + 48)
-#define GADGET_ID_CUSTOM_GRAV_REACHABLE        (GADGET_ID_CHECKBUTTON_FIRST + 49)
-#define GADGET_ID_CUSTOM_USE_LAST_VALUE        (GADGET_ID_CHECKBUTTON_FIRST + 50)
-#define GADGET_ID_CUSTOM_USE_GRAPHIC   (GADGET_ID_CHECKBUTTON_FIRST + 51)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_1        (GADGET_ID_CHECKBUTTON_FIRST + 52)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_2        (GADGET_ID_CHECKBUTTON_FIRST + 53)
-#define GADGET_ID_CUSTOM_USE_TEMPLATE_3        (GADGET_ID_CHECKBUTTON_FIRST + 54)
-#define GADGET_ID_CUSTOM_CAN_CHANGE    (GADGET_ID_CHECKBUTTON_FIRST + 55)
-#define GADGET_ID_CHANGE_USE_CONTENT   (GADGET_ID_CHECKBUTTON_FIRST + 56)
-#define GADGET_ID_CHANGE_USE_EXPLOSION (GADGET_ID_CHECKBUTTON_FIRST + 57)
-#define GADGET_ID_CHANGE_ONLY_COMPLETE (GADGET_ID_CHECKBUTTON_FIRST + 58)
-#define GADGET_ID_CHANGE_USE_RANDOM    (GADGET_ID_CHECKBUTTON_FIRST + 59)
-#define GADGET_ID_CHANGE_HAS_ACTION    (GADGET_ID_CHECKBUTTON_FIRST + 60)
-#define GADGET_ID_CHANGE_DELAY         (GADGET_ID_CHECKBUTTON_FIRST + 61)
-#define GADGET_ID_CHANGE_BY_DIRECT_ACT (GADGET_ID_CHECKBUTTON_FIRST + 62)
-#define GADGET_ID_CHANGE_BY_OTHER_ACT  (GADGET_ID_CHECKBUTTON_FIRST + 63)
-
-/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    (GADGET_ID_CHECKBUTTON_FIRST + 64)
+enum
+{
+  GADGET_ID_NONE = -1,
+
+  /* drawing toolbox buttons */
+
+  GADGET_ID_SINGLE_ITEMS,
+  GADGET_ID_CONNECTED_ITEMS,
+  GADGET_ID_LINE,
+  GADGET_ID_ARC,
+  GADGET_ID_RECTANGLE,
+  GADGET_ID_FILLED_BOX,
+  GADGET_ID_WRAP_UP,
+  GADGET_ID_TEXT,
+  GADGET_ID_FLOOD_FILL,
+  GADGET_ID_WRAP_LEFT,
+  GADGET_ID_ZOOM,
+  GADGET_ID_WRAP_RIGHT,
+  GADGET_ID_RANDOM_PLACEMENT,
+  GADGET_ID_GRAB_BRUSH,
+  GADGET_ID_WRAP_DOWN,
+  GADGET_ID_PICK_ELEMENT,
+
+  GADGET_ID_UNDO,
+  GADGET_ID_INFO,
+  GADGET_ID_SAVE,
+  GADGET_ID_CLEAR,
+  GADGET_ID_TEST,
+  GADGET_ID_EXIT,
+
+  GADGET_ID_CUSTOM_COPY_FROM,
+  GADGET_ID_CUSTOM_COPY_TO,
+  GADGET_ID_CUSTOM_EXCHANGE,
+  GADGET_ID_CUSTOM_COPY,
+  GADGET_ID_CUSTOM_PASTE,
+
+  GADGET_ID_PROPERTIES,
+  GADGET_ID_ELEMENT_LEFT,
+  GADGET_ID_ELEMENT_MIDDLE,
+  GADGET_ID_ELEMENT_RIGHT,
+  GADGET_ID_PALETTE,
+
+  /* counter gadget identifiers */
+
+  GADGET_ID_SELECT_LEVEL_DOWN,
+  GADGET_ID_SELECT_LEVEL_TEXT,
+  GADGET_ID_SELECT_LEVEL_UP,
+  GADGET_ID_LEVEL_XSIZE_DOWN,
+  GADGET_ID_LEVEL_XSIZE_TEXT,
+  GADGET_ID_LEVEL_XSIZE_UP,
+  GADGET_ID_LEVEL_YSIZE_DOWN,
+  GADGET_ID_LEVEL_YSIZE_TEXT,
+  GADGET_ID_LEVEL_YSIZE_UP,
+  GADGET_ID_LEVEL_RANDOM_DOWN,
+  GADGET_ID_LEVEL_RANDOM_TEXT,
+  GADGET_ID_LEVEL_RANDOM_UP,
+  GADGET_ID_LEVEL_GEMSLIMIT_DOWN,
+  GADGET_ID_LEVEL_GEMSLIMIT_TEXT,
+  GADGET_ID_LEVEL_GEMSLIMIT_UP,
+  GADGET_ID_LEVEL_TIMELIMIT_DOWN,
+  GADGET_ID_LEVEL_TIMELIMIT_TEXT,
+  GADGET_ID_LEVEL_TIMELIMIT_UP,
+  GADGET_ID_LEVEL_TIMESCORE_DOWN,
+  GADGET_ID_LEVEL_TIMESCORE_TEXT,
+  GADGET_ID_LEVEL_TIMESCORE_UP,
+  GADGET_ID_LEVEL_RANDOM_SEED_DOWN,
+  GADGET_ID_LEVEL_RANDOM_SEED_TEXT,
+  GADGET_ID_LEVEL_RANDOM_SEED_UP,
+  GADGET_ID_LEVELSET_NUM_LEVELS_DOWN,
+  GADGET_ID_LEVELSET_NUM_LEVELS_TEXT,
+  GADGET_ID_LEVELSET_NUM_LEVELS_UP,
+  GADGET_ID_ELEMENT_VALUE1_DOWN,
+  GADGET_ID_ELEMENT_VALUE1_TEXT,
+  GADGET_ID_ELEMENT_VALUE1_UP,
+  GADGET_ID_ELEMENT_VALUE2_DOWN,
+  GADGET_ID_ELEMENT_VALUE2_TEXT,
+  GADGET_ID_ELEMENT_VALUE2_UP,
+  GADGET_ID_ELEMENT_VALUE3_DOWN,
+  GADGET_ID_ELEMENT_VALUE3_TEXT,
+  GADGET_ID_ELEMENT_VALUE3_UP,
+  GADGET_ID_ELEMENT_VALUE4_DOWN,
+  GADGET_ID_ELEMENT_VALUE4_TEXT,
+  GADGET_ID_ELEMENT_VALUE4_UP,
+  GADGET_ID_YAMYAM_CONTENT_DOWN,
+  GADGET_ID_YAMYAM_CONTENT_TEXT,
+  GADGET_ID_YAMYAM_CONTENT_UP,
+  GADGET_ID_BALL_CONTENT_DOWN,
+  GADGET_ID_BALL_CONTENT_TEXT,
+  GADGET_ID_BALL_CONTENT_UP,
+  GADGET_ID_ANDROID_CONTENT_DOWN,
+  GADGET_ID_ANDROID_CONTENT_TEXT,
+  GADGET_ID_ANDROID_CONTENT_UP,
+  GADGET_ID_ENVELOPE_XSIZE_DOWN,
+  GADGET_ID_ENVELOPE_XSIZE_TEXT,
+  GADGET_ID_ENVELOPE_XSIZE_UP,
+  GADGET_ID_ENVELOPE_YSIZE_DOWN,
+  GADGET_ID_ENVELOPE_YSIZE_TEXT,
+  GADGET_ID_ENVELOPE_YSIZE_UP,
+  GADGET_ID_INVENTORY_SIZE_DOWN,
+  GADGET_ID_INVENTORY_SIZE_TEXT,
+  GADGET_ID_INVENTORY_SIZE_UP,
+  GADGET_ID_CUSTOM_SCORE_DOWN,
+  GADGET_ID_CUSTOM_SCORE_TEXT,
+  GADGET_ID_CUSTOM_SCORE_UP,
+  GADGET_ID_CUSTOM_GEMCOUNT_DOWN,
+  GADGET_ID_CUSTOM_GEMCOUNT_TEXT,
+  GADGET_ID_CUSTOM_GEMCOUNT_UP,
+  GADGET_ID_CUSTOM_VALUE_FIX_DOWN,
+  GADGET_ID_CUSTOM_VALUE_FIX_TEXT,
+  GADGET_ID_CUSTOM_VALUE_FIX_UP,
+  GADGET_ID_CUSTOM_VALUE_RND_DOWN,
+  GADGET_ID_CUSTOM_VALUE_RND_TEXT,
+  GADGET_ID_CUSTOM_VALUE_RND_UP,
+  GADGET_ID_PUSH_DELAY_FIX_DOWN,
+  GADGET_ID_PUSH_DELAY_FIX_TEXT,
+  GADGET_ID_PUSH_DELAY_FIX_UP,
+  GADGET_ID_PUSH_DELAY_RND_DOWN,
+  GADGET_ID_PUSH_DELAY_RND_TEXT,
+  GADGET_ID_PUSH_DELAY_RND_UP,
+  GADGET_ID_DROP_DELAY_FIX_DOWN,
+  GADGET_ID_DROP_DELAY_FIX_TEXT,
+  GADGET_ID_DROP_DELAY_FIX_UP,
+  GADGET_ID_DROP_DELAY_RND_DOWN,
+  GADGET_ID_DROP_DELAY_RND_TEXT,
+  GADGET_ID_DROP_DELAY_RND_UP,
+  GADGET_ID_MOVE_DELAY_FIX_DOWN,
+  GADGET_ID_MOVE_DELAY_FIX_TEXT,
+  GADGET_ID_MOVE_DELAY_FIX_UP,
+  GADGET_ID_MOVE_DELAY_RND_DOWN,
+  GADGET_ID_MOVE_DELAY_RND_TEXT,
+  GADGET_ID_MOVE_DELAY_RND_UP,
+  GADGET_ID_EXPLOSION_DELAY_DOWN,
+  GADGET_ID_EXPLOSION_DELAY_TEXT,
+  GADGET_ID_EXPLOSION_DELAY_UP,
+  GADGET_ID_IGNITION_DELAY_DOWN,
+  GADGET_ID_IGNITION_DELAY_TEXT,
+  GADGET_ID_IGNITION_DELAY_UP,
+  GADGET_ID_CHANGE_DELAY_FIX_DOWN,
+  GADGET_ID_CHANGE_DELAY_FIX_TEXT,
+  GADGET_ID_CHANGE_DELAY_FIX_UP,
+  GADGET_ID_CHANGE_DELAY_RND_DOWN,
+  GADGET_ID_CHANGE_DELAY_RND_TEXT,
+  GADGET_ID_CHANGE_DELAY_RND_UP,
+  GADGET_ID_CHANGE_CONT_RND_DOWN,
+  GADGET_ID_CHANGE_CONT_RND_TEXT,
+  GADGET_ID_CHANGE_CONT_RND_UP,
+  GADGET_ID_GROUP_CONTENT_DOWN,
+  GADGET_ID_GROUP_CONTENT_TEXT,
+  GADGET_ID_GROUP_CONTENT_UP,
+
+  /* drawing area identifiers */
+
+  GADGET_ID_DRAWING_LEVEL,
+  GADGET_ID_YAMYAM_CONTENT_0,
+  GADGET_ID_YAMYAM_CONTENT_1,
+  GADGET_ID_YAMYAM_CONTENT_2,
+  GADGET_ID_YAMYAM_CONTENT_3,
+  GADGET_ID_YAMYAM_CONTENT_4,
+  GADGET_ID_YAMYAM_CONTENT_5,
+  GADGET_ID_YAMYAM_CONTENT_6,
+  GADGET_ID_YAMYAM_CONTENT_7,
+  GADGET_ID_MAGIC_BALL_CONTENT_0,
+  GADGET_ID_MAGIC_BALL_CONTENT_1,
+  GADGET_ID_MAGIC_BALL_CONTENT_2,
+  GADGET_ID_MAGIC_BALL_CONTENT_3,
+  GADGET_ID_MAGIC_BALL_CONTENT_4,
+  GADGET_ID_MAGIC_BALL_CONTENT_5,
+  GADGET_ID_MAGIC_BALL_CONTENT_6,
+  GADGET_ID_MAGIC_BALL_CONTENT_7,
+  GADGET_ID_ANDROID_CONTENT,
+  GADGET_ID_AMOEBA_CONTENT,
+  GADGET_ID_START_ELEMENT,
+  GADGET_ID_ARTWORK_ELEMENT,
+  GADGET_ID_EXPLOSION_ELEMENT,
+  GADGET_ID_INVENTORY_CONTENT,
+  GADGET_ID_CUSTOM_GRAPHIC,
+  GADGET_ID_CUSTOM_CONTENT,
+  GADGET_ID_CUSTOM_MOVE_ENTER,
+  GADGET_ID_CUSTOM_MOVE_LEAVE,
+  GADGET_ID_CUSTOM_CHANGE_TARGET,
+  GADGET_ID_CUSTOM_CHANGE_CONTENT,
+  GADGET_ID_CUSTOM_CHANGE_TRIGGER,
+  GADGET_ID_CUSTOM_CHANGE_ACTION,
+  GADGET_ID_GROUP_CONTENT,
+  GADGET_ID_RANDOM_BACKGROUND,
+
+  /* text input identifiers */
+
+  GADGET_ID_LEVEL_NAME,
+  GADGET_ID_LEVEL_AUTHOR,
+  GADGET_ID_LEVELSET_NAME,
+  GADGET_ID_LEVELSET_AUTHOR,
+  GADGET_ID_ELEMENT_NAME,
+
+  /* text area identifiers */
+
+  GADGET_ID_ENVELOPE_INFO,
+
+  /* selectbox identifiers */
+
+  GADGET_ID_TIME_OR_STEPS,
+  GADGET_ID_GAME_ENGINE_TYPE,
+  GADGET_ID_LEVELSET_SAVE_MODE,
+  GADGET_ID_WIND_DIRECTION,
+  GADGET_ID_PLAYER_SPEED,
+  GADGET_ID_CUSTOM_WALK_TO_ACTION,
+  GADGET_ID_CUSTOM_EXPLOSION_TYPE,
+  GADGET_ID_CUSTOM_DEADLINESS,
+  GADGET_ID_CUSTOM_MOVE_PATTERN,
+  GADGET_ID_CUSTOM_MOVE_DIRECTION,
+  GADGET_ID_CUSTOM_MOVE_STEPSIZE,
+  GADGET_ID_CUSTOM_MOVE_LEAVE_TYPE,
+  GADGET_ID_CUSTOM_SMASH_TARGETS,
+  GADGET_ID_CUSTOM_SLIPPERY_TYPE,
+  GADGET_ID_CUSTOM_ACCESS_TYPE,
+  GADGET_ID_CUSTOM_ACCESS_LAYER,
+  GADGET_ID_CUSTOM_ACCESS_PROTECTED,
+  GADGET_ID_CUSTOM_ACCESS_DIRECTION,
+  GADGET_ID_CHANGE_TIME_UNITS,
+  GADGET_ID_CHANGE_DIRECT_ACTION,
+  GADGET_ID_CHANGE_OTHER_ACTION,
+  GADGET_ID_CHANGE_SIDE,
+  GADGET_ID_CHANGE_PLAYER,
+  GADGET_ID_CHANGE_PAGE,
+  GADGET_ID_CHANGE_REPLACE_WHEN,
+  GADGET_ID_ACTION_TYPE,
+  GADGET_ID_ACTION_MODE,
+  GADGET_ID_ACTION_ARG,
+  GADGET_ID_SELECT_CHANGE_PAGE,
+  GADGET_ID_GROUP_CHOICE_MODE,
+
+  /* textbutton identifiers */
+
+  GADGET_ID_LEVELINFO_LEVEL,
+  GADGET_ID_LEVELINFO_LEVELSET,
+  GADGET_ID_LEVELINFO_EDITOR,
+  GADGET_ID_PROPERTIES_INFO,
+  GADGET_ID_PROPERTIES_CONFIG,
+  GADGET_ID_PROPERTIES_CONFIG_1,
+  GADGET_ID_PROPERTIES_CONFIG_2,
+  GADGET_ID_PROPERTIES_CHANGE,
+  GADGET_ID_SAVE_AS_TEMPLATE_1,
+  GADGET_ID_SAVE_AS_TEMPLATE_2,
+  GADGET_ID_SAVE_LEVELSET,
+  GADGET_ID_ADD_CHANGE_PAGE,
+  GADGET_ID_DEL_CHANGE_PAGE,
+
+  /* graphicbutton identifiers */
+
+  GADGET_ID_PREV_CHANGE_PAGE,
+  GADGET_ID_NEXT_CHANGE_PAGE,
+  GADGET_ID_COPY_CHANGE_PAGE,
+  GADGET_ID_PASTE_CHANGE_PAGE,
+
+  /* gadgets for scrolling of drawing area */
+
+  GADGET_ID_SCROLL_UP,
+  GADGET_ID_SCROLL_DOWN,
+  GADGET_ID_SCROLL_LEFT,
+  GADGET_ID_SCROLL_RIGHT,
+  GADGET_ID_SCROLL_HORIZONTAL,
+  GADGET_ID_SCROLL_VERTICAL,
+
+  /* gadgets for scrolling element list */
+
+  GADGET_ID_SCROLL_LIST_UP,
+  GADGET_ID_SCROLL_LIST_DOWN,
+  GADGET_ID_SCROLL_LIST_VERTICAL,
+
+  /* checkbuttons/radiobuttons for level/element properties */
+
+  GADGET_ID_AUTO_COUNT_GEMS,
+  GADGET_ID_USE_LEVELSET_ARTWORK,
+  GADGET_ID_COPY_LEVEL_TEMPLATE,
+  GADGET_ID_RANDOM_PERCENTAGE,
+  GADGET_ID_RANDOM_QUANTITY,
+  GADGET_ID_RANDOM_RESTRICTED,
+  GADGET_ID_STICK_ELEMENT,
+  GADGET_ID_EM_SLIPPERY_GEMS,
+  GADGET_ID_EM_EXPLODES_BY_FIRE,
+  GADGET_ID_USE_SPRING_BUG,
+  GADGET_ID_USE_TIME_ORB_BUG,
+  GADGET_ID_USE_LIFE_BUGS,
+  GADGET_ID_RANDOM_BALL_CONTENT,
+  GADGET_ID_INITIAL_BALL_STATE,
+  GADGET_ID_GROW_INTO_DIGGABLE,
+  GADGET_ID_AUTO_EXIT_SOKOBAN,
+  GADGET_ID_SOLVED_BY_ONE_PLAYER,
+  GADGET_ID_CONTINUOUS_SNAPPING,
+  GADGET_ID_BLOCK_SNAP_FIELD,
+  GADGET_ID_BLOCK_LAST_FIELD,
+  GADGET_ID_SP_BLOCK_LAST_FIELD,
+  GADGET_ID_INSTANT_RELOCATION,
+  GADGET_ID_SHIFTED_RELOCATION,
+  GADGET_ID_LAZY_RELOCATION,
+  GADGET_ID_USE_START_ELEMENT,
+  GADGET_ID_USE_ARTWORK_ELEMENT,
+  GADGET_ID_USE_EXPLOSION_ELEMENT,
+  GADGET_ID_INITIAL_GRAVITY,
+  GADGET_ID_USE_INITIAL_INVENTORY,
+  GADGET_ID_CAN_PASS_TO_WALKABLE,
+  GADGET_ID_CAN_FALL_INTO_ACID,
+  GADGET_ID_CAN_MOVE_INTO_ACID,
+  GADGET_ID_DONT_COLLIDE_WITH,
+  GADGET_ID_ENVELOPE_AUTOWRAP,
+  GADGET_ID_ENVELOPE_CENTERED,
+  GADGET_ID_MM_LASER_RED,
+  GADGET_ID_MM_LASER_GREEN,
+  GADGET_ID_MM_LASER_BLUE,
+  GADGET_ID_DF_LASER_RED,
+  GADGET_ID_DF_LASER_GREEN,
+  GADGET_ID_DF_LASER_BLUE,
+  GADGET_ID_CUSTOM_INDESTRUCTIBLE,
+  GADGET_ID_CUSTOM_CAN_EXPLODE,
+  GADGET_ID_CUSTOM_EXPLODE_FIRE,
+  GADGET_ID_CUSTOM_EXPLODE_SMASH,
+  GADGET_ID_CUSTOM_EXPLODE_IMPACT,
+  GADGET_ID_CUSTOM_WALK_TO_OBJECT,
+  GADGET_ID_CUSTOM_DEADLY,
+  GADGET_ID_CUSTOM_CAN_MOVE,
+  GADGET_ID_CUSTOM_CAN_FALL,
+  GADGET_ID_CUSTOM_CAN_SMASH,
+  GADGET_ID_CUSTOM_SLIPPERY,
+  GADGET_ID_CUSTOM_ACCESSIBLE,
+  GADGET_ID_CUSTOM_GRAV_REACHABLE,
+  GADGET_ID_CUSTOM_USE_LAST_VALUE,
+  GADGET_ID_CUSTOM_USE_GRAPHIC,
+  GADGET_ID_CUSTOM_USE_TEMPLATE_1,
+  GADGET_ID_CUSTOM_USE_TEMPLATE_2,
+  GADGET_ID_CUSTOM_USE_TEMPLATE_3,
+  GADGET_ID_CUSTOM_CAN_CHANGE,
+  GADGET_ID_CHANGE_USE_CONTENT,
+  GADGET_ID_CHANGE_USE_EXPLOSION,
+  GADGET_ID_CHANGE_ONLY_COMPLETE,
+  GADGET_ID_CHANGE_USE_RANDOM,
+  GADGET_ID_CHANGE_HAS_ACTION,
+  GADGET_ID_CHANGE_DELAY,
+  GADGET_ID_CHANGE_BY_DIRECT_ACT,
+  GADGET_ID_CHANGE_BY_OTHER_ACT,
+
+  NUM_STATIC_GADGET_IDS
+};
+
+/* gadgets for buttons in element list (dynamic) */
+#define GADGET_ID_ELEMENTLIST_FIRST    (NUM_STATIC_GADGET_IDS)
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define NUM_EDITOR_GADGETS             (GADGET_ID_ELEMENTLIST_LAST + 1)
 
 /* radio button numbers */
-#define RADIO_NR_NONE                  0
-#define RADIO_NR_DRAWING_TOOLBOX       1
-#define RADIO_NR_RANDOM_ELEMENTS       2
+enum
+{
+  RADIO_NR_NONE,
+  RADIO_NR_DRAWING_TOOLBOX,
+  RADIO_NR_RANDOM_ELEMENTS
+};
 
 /* values for counter gadgets */
-#define ED_COUNTER_ID_SELECT_LEVEL     0
-#define ED_COUNTER_ID_LEVEL_XSIZE      1
-#define ED_COUNTER_ID_LEVEL_YSIZE      2
-#define ED_COUNTER_ID_LEVEL_GEMSLIMIT  3
-#define ED_COUNTER_ID_LEVEL_TIMELIMIT  4
-#define ED_COUNTER_ID_LEVEL_TIMESCORE  5
-#define ED_COUNTER_ID_LEVEL_RANDOM_SEED        6
-#define ED_COUNTER_ID_LEVELSET_NUM_LEVELS 7
-#define ED_COUNTER_ID_LEVEL_RANDOM     8
-#define ED_COUNTER_ID_ELEMENT_VALUE1   9
-#define ED_COUNTER_ID_ELEMENT_VALUE2   10
-#define ED_COUNTER_ID_ELEMENT_VALUE3   11
-#define ED_COUNTER_ID_ELEMENT_VALUE4   12
-#define ED_COUNTER_ID_YAMYAM_CONTENT   13
-#define ED_COUNTER_ID_BALL_CONTENT     14
-#define ED_COUNTER_ID_ANDROID_CONTENT  15
-#define ED_COUNTER_ID_ENVELOPE_XSIZE   16
-#define ED_COUNTER_ID_ENVELOPE_YSIZE   17
-#define ED_COUNTER_ID_INVENTORY_SIZE   18
-#define ED_COUNTER_ID_CUSTOM_SCORE     19
-#define ED_COUNTER_ID_CUSTOM_GEMCOUNT  20
-#define ED_COUNTER_ID_CUSTOM_VALUE_FIX 21
-#define ED_COUNTER_ID_CUSTOM_VALUE_RND 22
-#define ED_COUNTER_ID_PUSH_DELAY_FIX   23
-#define ED_COUNTER_ID_PUSH_DELAY_RND   24
-#define ED_COUNTER_ID_DROP_DELAY_FIX   25
-#define ED_COUNTER_ID_DROP_DELAY_RND   26
-#define ED_COUNTER_ID_MOVE_DELAY_FIX   27
-#define ED_COUNTER_ID_MOVE_DELAY_RND   28
-#define ED_COUNTER_ID_EXPLOSION_DELAY  29
-#define ED_COUNTER_ID_IGNITION_DELAY   30
-#define ED_COUNTER_ID_GROUP_CONTENT    31
-#define ED_COUNTER_ID_CHANGE_DELAY_FIX 32
-#define ED_COUNTER_ID_CHANGE_DELAY_RND 33
-#define ED_COUNTER_ID_CHANGE_CONT_RND  34
-
-#define ED_NUM_COUNTERBUTTONS          35
+enum
+{
+  ED_COUNTER_ID_SELECT_LEVEL,
+  ED_COUNTER_ID_LEVEL_XSIZE,
+  ED_COUNTER_ID_LEVEL_YSIZE,
+  ED_COUNTER_ID_LEVEL_GEMSLIMIT,
+  ED_COUNTER_ID_LEVEL_TIMELIMIT,
+  ED_COUNTER_ID_LEVEL_TIMESCORE,
+  ED_COUNTER_ID_LEVEL_RANDOM_SEED,
+  ED_COUNTER_ID_LEVELSET_NUM_LEVELS,
+  ED_COUNTER_ID_LEVEL_RANDOM,
+  ED_COUNTER_ID_ELEMENT_VALUE1,
+  ED_COUNTER_ID_ELEMENT_VALUE2,
+  ED_COUNTER_ID_ELEMENT_VALUE3,
+  ED_COUNTER_ID_ELEMENT_VALUE4,
+  ED_COUNTER_ID_YAMYAM_CONTENT,
+  ED_COUNTER_ID_BALL_CONTENT,
+  ED_COUNTER_ID_ANDROID_CONTENT,
+  ED_COUNTER_ID_ENVELOPE_XSIZE,
+  ED_COUNTER_ID_ENVELOPE_YSIZE,
+  ED_COUNTER_ID_INVENTORY_SIZE,
+  ED_COUNTER_ID_CUSTOM_SCORE,
+  ED_COUNTER_ID_CUSTOM_GEMCOUNT,
+  ED_COUNTER_ID_CUSTOM_VALUE_FIX,
+  ED_COUNTER_ID_CUSTOM_VALUE_RND,
+  ED_COUNTER_ID_PUSH_DELAY_FIX,
+  ED_COUNTER_ID_PUSH_DELAY_RND,
+  ED_COUNTER_ID_DROP_DELAY_FIX,
+  ED_COUNTER_ID_DROP_DELAY_RND,
+  ED_COUNTER_ID_MOVE_DELAY_FIX,
+  ED_COUNTER_ID_MOVE_DELAY_RND,
+  ED_COUNTER_ID_EXPLOSION_DELAY,
+  ED_COUNTER_ID_IGNITION_DELAY,
+  ED_COUNTER_ID_GROUP_CONTENT,
+  ED_COUNTER_ID_CHANGE_DELAY_FIX,
+  ED_COUNTER_ID_CHANGE_DELAY_RND,
+  ED_COUNTER_ID_CHANGE_CONT_RND,
+
+  ED_NUM_COUNTERBUTTONS
+};
 
 #define ED_COUNTER_ID_LEVEL_FIRST      ED_COUNTER_ID_LEVEL_XSIZE
 #define ED_COUNTER_ID_LEVEL_LAST       ED_COUNTER_ID_LEVEL_RANDOM_SEED
 #define ED_COUNTER_ID_CHANGE_LAST      ED_COUNTER_ID_CHANGE_CONT_RND
 
 /* values for scrollbutton gadgets */
-#define ED_SCROLLBUTTON_ID_AREA_UP     0
-#define ED_SCROLLBUTTON_ID_AREA_DOWN   1
-#define ED_SCROLLBUTTON_ID_AREA_LEFT   2
-#define ED_SCROLLBUTTON_ID_AREA_RIGHT  3
-#define ED_SCROLLBUTTON_ID_LIST_UP     4
-#define ED_SCROLLBUTTON_ID_LIST_DOWN   5
+enum
+{
+  ED_SCROLLBUTTON_ID_AREA_UP,
+  ED_SCROLLBUTTON_ID_AREA_DOWN,
+  ED_SCROLLBUTTON_ID_AREA_LEFT,
+  ED_SCROLLBUTTON_ID_AREA_RIGHT,
+  ED_SCROLLBUTTON_ID_LIST_UP,
+  ED_SCROLLBUTTON_ID_LIST_DOWN,
 
-#define ED_NUM_SCROLLBUTTONS           6
+  ED_NUM_SCROLLBUTTONS
+};
 
 #define ED_SCROLLBUTTON_ID_AREA_FIRST  ED_SCROLLBUTTON_ID_AREA_UP
 #define ED_SCROLLBUTTON_ID_AREA_LAST   ED_SCROLLBUTTON_ID_AREA_RIGHT
 
 /* values for scrollbar gadgets */
-#define ED_SCROLLBAR_ID_AREA_HORIZONTAL        0
-#define ED_SCROLLBAR_ID_AREA_VERTICAL  1
-#define ED_SCROLLBAR_ID_LIST_VERTICAL  2
+enum
+{
+  ED_SCROLLBAR_ID_AREA_HORIZONTAL,
+  ED_SCROLLBAR_ID_AREA_VERTICAL,
+  ED_SCROLLBAR_ID_LIST_VERTICAL,
 
-#define ED_NUM_SCROLLBARS              3
+  ED_NUM_SCROLLBARS
+};
 
 #define ED_SCROLLBAR_ID_AREA_FIRST     ED_SCROLLBAR_ID_AREA_HORIZONTAL
 #define ED_SCROLLBAR_ID_AREA_LAST      ED_SCROLLBAR_ID_AREA_VERTICAL
 
 /* values for text input gadgets */
-#define ED_TEXTINPUT_ID_LEVEL_NAME     0
-#define ED_TEXTINPUT_ID_LEVEL_AUTHOR   1
-#define ED_TEXTINPUT_ID_LEVELSET_NAME  2
-#define ED_TEXTINPUT_ID_LEVELSET_AUTHOR        3
-#define ED_TEXTINPUT_ID_ELEMENT_NAME   4
+enum
+{
+  ED_TEXTINPUT_ID_LEVEL_NAME,
+  ED_TEXTINPUT_ID_LEVEL_AUTHOR,
+  ED_TEXTINPUT_ID_LEVELSET_NAME,
+  ED_TEXTINPUT_ID_LEVELSET_AUTHOR,
+  ED_TEXTINPUT_ID_ELEMENT_NAME,
 
-#define ED_NUM_TEXTINPUT               5
+  ED_NUM_TEXTINPUT
+};
 
 #define ED_TEXTINPUT_ID_LEVEL_FIRST    ED_TEXTINPUT_ID_LEVEL_NAME
 #define ED_TEXTINPUT_ID_LEVEL_LAST     ED_TEXTINPUT_ID_LEVEL_AUTHOR
 #define ED_TEXTINPUT_ID_LEVELSET_LAST  ED_TEXTINPUT_ID_LEVELSET_AUTHOR
 
 /* values for text area gadgets */
-#define ED_TEXTAREA_ID_ENVELOPE_INFO   0
+enum
+{
+  ED_TEXTAREA_ID_ENVELOPE_INFO,
 
-#define ED_NUM_TEXTAREAS                       1
+  ED_NUM_TEXTAREAS
+};
 
 #define ED_TEXTAREA_ID_LEVEL_FIRST     ED_TEXTAREA_ID_ENVELOPE
 #define ED_TEXTAREA_ID_LEVEL_LAST      ED_TEXTAREA_ID_ENVELOPE
 
 /* values for selectbox gadgets */
-#define ED_SELECTBOX_ID_TIME_OR_STEPS          0
-#define ED_SELECTBOX_ID_GAME_ENGINE_TYPE       1
-#define ED_SELECTBOX_ID_LEVELSET_SAVE_MODE     2
-#define ED_SELECTBOX_ID_WIND_DIRECTION         3
-#define ED_SELECTBOX_ID_PLAYER_SPEED           4
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE     5
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER    6
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED        7
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION        8
-#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION  9
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN    10
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION  11
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE   12
-#define ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE 13
-#define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS   14
-#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE   15
-#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS      16
-#define ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE  17
-#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      18
-#define ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION   19
-#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    20
-#define ED_SELECTBOX_ID_CHANGE_SIDE            21
-#define ED_SELECTBOX_ID_CHANGE_PLAYER          22
-#define ED_SELECTBOX_ID_CHANGE_PAGE            23
-#define ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN    24
-#define ED_SELECTBOX_ID_ACTION_TYPE            25
-#define ED_SELECTBOX_ID_ACTION_MODE            26
-#define ED_SELECTBOX_ID_ACTION_ARG             27
-#define ED_SELECTBOX_ID_SELECT_CHANGE_PAGE     28
-#define ED_SELECTBOX_ID_GROUP_CHOICE_MODE      29
-
-#define ED_NUM_SELECTBOX                       30
+enum
+{
+  ED_SELECTBOX_ID_TIME_OR_STEPS,
+  ED_SELECTBOX_ID_GAME_ENGINE_TYPE,
+  ED_SELECTBOX_ID_LEVELSET_SAVE_MODE,
+  ED_SELECTBOX_ID_WIND_DIRECTION,
+  ED_SELECTBOX_ID_PLAYER_SPEED,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_PROTECTED,
+  ED_SELECTBOX_ID_CUSTOM_ACCESS_DIRECTION,
+  ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE,
+  ED_SELECTBOX_ID_CUSTOM_MOVE_LEAVE_TYPE,
+  ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS,
+  ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE,
+  ED_SELECTBOX_ID_CUSTOM_DEADLINESS,
+  ED_SELECTBOX_ID_CUSTOM_EXPLOSION_TYPE,
+  ED_SELECTBOX_ID_CHANGE_TIME_UNITS,
+  ED_SELECTBOX_ID_CHANGE_DIRECT_ACTION,
+  ED_SELECTBOX_ID_CHANGE_OTHER_ACTION,
+  ED_SELECTBOX_ID_CHANGE_SIDE,
+  ED_SELECTBOX_ID_CHANGE_PLAYER,
+  ED_SELECTBOX_ID_CHANGE_PAGE,
+  ED_SELECTBOX_ID_CHANGE_REPLACE_WHEN,
+  ED_SELECTBOX_ID_ACTION_TYPE,
+  ED_SELECTBOX_ID_ACTION_MODE,
+  ED_SELECTBOX_ID_ACTION_ARG,
+  ED_SELECTBOX_ID_SELECT_CHANGE_PAGE,
+  ED_SELECTBOX_ID_GROUP_CHOICE_MODE,
+
+  ED_NUM_SELECTBOX
+};
 
 #define ED_SELECTBOX_ID_LEVEL_FIRST    ED_SELECTBOX_ID_TIME_OR_STEPS
 #define ED_SELECTBOX_ID_LEVEL_LAST     ED_SELECTBOX_ID_GAME_ENGINE_TYPE
 #define ED_SELECTBOX_ID_CHANGE_LAST    ED_SELECTBOX_ID_SELECT_CHANGE_PAGE
 
 /* values for textbutton gadgets */
-#define ED_TEXTBUTTON_ID_LEVELINFO_LEVEL       0
-#define ED_TEXTBUTTON_ID_LEVELINFO_LEVELSET    1
-#define ED_TEXTBUTTON_ID_LEVELINFO_EDITOR      2
-#define ED_TEXTBUTTON_ID_PROPERTIES_INFO       3
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG     4
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1   5
-#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2   6
-#define ED_TEXTBUTTON_ID_PROPERTIES_CHANGE     7
-#define ED_TEXTBUTTON_ID_SAVE_LEVELSET         8
-#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2    9
-#define ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1    10
-#define ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE       11
-#define ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE       12
-
-#define ED_NUM_TEXTBUTTONS                     13
+enum
+{
+  ED_TEXTBUTTON_ID_LEVELINFO_LEVEL,
+  ED_TEXTBUTTON_ID_LEVELINFO_LEVELSET,
+  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR,
+  ED_TEXTBUTTON_ID_PROPERTIES_INFO,
+  ED_TEXTBUTTON_ID_PROPERTIES_CONFIG,
+  ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_1,
+  ED_TEXTBUTTON_ID_PROPERTIES_CONFIG_2,
+  ED_TEXTBUTTON_ID_PROPERTIES_CHANGE,
+  ED_TEXTBUTTON_ID_SAVE_LEVELSET,
+  ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2,
+  ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1,
+  ED_TEXTBUTTON_ID_ADD_CHANGE_PAGE,
+  ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE,
+
+  ED_NUM_TEXTBUTTONS
+};
 
 #define ED_TAB_BUTTON_ID_LEVELINFO_FIRST ED_TEXTBUTTON_ID_LEVELINFO_LEVEL
 #define ED_TAB_BUTTON_ID_LEVELINFO_LAST  ED_TEXTBUTTON_ID_LEVELINFO_EDITOR
 #define ED_TEXTBUTTON_ID_CHANGE_LAST   ED_TEXTBUTTON_ID_DEL_CHANGE_PAGE
 
 /* values for graphicbutton gadgets */
-#define ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE   0
-#define ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE   1
-#define ED_GRAPHICBUTTON_ID_COPY_CHANGE_PAGE   2
-#define ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE  3
+enum
+{
+  ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE,
+  ED_GRAPHICBUTTON_ID_NEXT_CHANGE_PAGE,
+  ED_GRAPHICBUTTON_ID_COPY_CHANGE_PAGE,
+  ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE,
 
-#define ED_NUM_GRAPHICBUTTONS                  4
+  ED_NUM_GRAPHICBUTTONS
+};
 
 #define ED_GRAPHICBUTTON_ID_CHANGE_FIRST  ED_GRAPHICBUTTON_ID_PREV_CHANGE_PAGE
 #define ED_GRAPHICBUTTON_ID_CHANGE_LAST   ED_GRAPHICBUTTON_ID_PASTE_CHANGE_PAGE
 
 /* values for checkbutton gadgets */
-#define ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS      0
-#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    1
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3        2
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2        3
-#define ED_CHECKBUTTON_ID_STICK_ELEMENT                4
-#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     5
-#define ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE  6
-#define ED_CHECKBUTTON_ID_USE_SPRING_BUG       7
-#define ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG     8
-#define ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT  9
-#define ED_CHECKBUTTON_ID_INITIAL_BALL_STATE   10
-#define ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE   11
-#define ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN    12
-#define ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING  13
-#define ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD     14
-#define ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD     15
-#define ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD  16
-#define ED_CHECKBUTTON_ID_INSTANT_RELOCATION   17
-#define ED_CHECKBUTTON_ID_SHIFTED_RELOCATION   18
-#define ED_CHECKBUTTON_ID_LAZY_RELOCATION      19
-#define ED_CHECKBUTTON_ID_USE_START_ELEMENT    20
-#define ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT  21
-#define ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT        22
-#define ED_CHECKBUTTON_ID_INITIAL_GRAVITY      23
-#define ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY        24
-#define ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE 25
-#define ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID   26
-#define ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID   27
-#define ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH    28
-#define ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP    29
-#define ED_CHECKBUTTON_ID_ENVELOPE_CENTERED    30
-#define ED_CHECKBUTTON_ID_MM_LASER_RED         31
-#define ED_CHECKBUTTON_ID_MM_LASER_GREEN       32
-#define ED_CHECKBUTTON_ID_MM_LASER_BLUE                33
-#define ED_CHECKBUTTON_ID_DF_LASER_RED         34
-#define ED_CHECKBUTTON_ID_DF_LASER_GREEN       35
-#define ED_CHECKBUTTON_ID_DF_LASER_BLUE                36
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   37
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1        38
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    39
-#define ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE        40
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE        41
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        42
-#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE        43
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      44
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      45
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     46
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      47
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                48
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE   49
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  50
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 51
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        52
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    53
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         54
-#define ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT 55
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT  56
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 57
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   58
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 59
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    60
-#define ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION    61
-
-#define ED_NUM_CHECKBUTTONS                    62
+enum
+{
+  ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS,
+  ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK,
+  ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE,
+  ED_CHECKBUTTON_ID_RANDOM_RESTRICTED,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_3,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2,
+  ED_CHECKBUTTON_ID_STICK_ELEMENT,
+  ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS,
+  ED_CHECKBUTTON_ID_EM_EXPLODES_BY_FIRE,
+  ED_CHECKBUTTON_ID_USE_SPRING_BUG,
+  ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG,
+  ED_CHECKBUTTON_ID_USE_LIFE_BUGS,
+  ED_CHECKBUTTON_ID_RANDOM_BALL_CONTENT,
+  ED_CHECKBUTTON_ID_INITIAL_BALL_STATE,
+  ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE,
+  ED_CHECKBUTTON_ID_AUTO_EXIT_SOKOBAN,
+  ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER,
+  ED_CHECKBUTTON_ID_CONTINUOUS_SNAPPING,
+  ED_CHECKBUTTON_ID_BLOCK_SNAP_FIELD,
+  ED_CHECKBUTTON_ID_BLOCK_LAST_FIELD,
+  ED_CHECKBUTTON_ID_SP_BLOCK_LAST_FIELD,
+  ED_CHECKBUTTON_ID_INSTANT_RELOCATION,
+  ED_CHECKBUTTON_ID_SHIFTED_RELOCATION,
+  ED_CHECKBUTTON_ID_LAZY_RELOCATION,
+  ED_CHECKBUTTON_ID_USE_START_ELEMENT,
+  ED_CHECKBUTTON_ID_USE_ARTWORK_ELEMENT,
+  ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT,
+  ED_CHECKBUTTON_ID_INITIAL_GRAVITY,
+  ED_CHECKBUTTON_ID_USE_INITIAL_INVENTORY,
+  ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE,
+  ED_CHECKBUTTON_ID_CAN_FALL_INTO_ACID,
+  ED_CHECKBUTTON_ID_CAN_MOVE_INTO_ACID,
+  ED_CHECKBUTTON_ID_DONT_COLLIDE_WITH,
+  ED_CHECKBUTTON_ID_ENVELOPE_AUTOWRAP,
+  ED_CHECKBUTTON_ID_ENVELOPE_CENTERED,
+  ED_CHECKBUTTON_ID_MM_LASER_RED,
+  ED_CHECKBUTTON_ID_MM_LASER_GREEN,
+  ED_CHECKBUTTON_ID_MM_LASER_BLUE,
+  ED_CHECKBUTTON_ID_DF_LASER_RED,
+  ED_CHECKBUTTON_ID_DF_LASER_GREEN,
+  ED_CHECKBUTTON_ID_DF_LASER_BLUE,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_1,
+  ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE,
+  ED_CHECKBUTTON_ID_CUSTOM_GRAV_REACHABLE,
+  ED_CHECKBUTTON_ID_CUSTOM_USE_LAST_VALUE,
+  ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT,
+  ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH,
+  ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY,
+  ED_CHECKBUTTON_ID_CUSTOM_DEADLY,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_EXPLODE,
+  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE,
+  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH,
+  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT,
+  ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE,
+  ED_CHECKBUTTON_ID_CHANGE_DELAY,
+  ED_CHECKBUTTON_ID_CHANGE_BY_DIRECT_ACT,
+  ED_CHECKBUTTON_ID_CHANGE_BY_OTHER_ACT,
+  ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION,
+  ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT,
+  ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE,
+  ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM,
+  ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION,
+
+  ED_NUM_CHECKBUTTONS
+};
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST  ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS
 #define ED_CHECKBUTTON_ID_LEVEL_LAST   ED_CHECKBUTTON_ID_AUTO_COUNT_GEMS
 
+#define ED_CHECKBUTTON_ID_LEVELSET_FIRST ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK
+#define ED_CHECKBUTTON_ID_LEVELSET_LAST         ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE
+
 #define ED_CHECKBUTTON_ID_EDITOR_FIRST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 #define ED_CHECKBUTTON_ID_EDITOR_LAST  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2
 
 #define ED_CHECKBUTTON_ID_CHANGE_LAST  ED_CHECKBUTTON_ID_CHANGE_HAS_ACTION
 
 /* values for radiobutton gadgets */
-#define ED_RADIOBUTTON_ID_PERCENTAGE   0
-#define ED_RADIOBUTTON_ID_QUANTITY     1
+enum
+{
+  ED_RADIOBUTTON_ID_PERCENTAGE,
+  ED_RADIOBUTTON_ID_QUANTITY,
 
-#define ED_NUM_RADIOBUTTONS            2
+  ED_NUM_RADIOBUTTONS
+};
 
 #define ED_RADIOBUTTON_ID_EDITOR_FIRST ED_RADIOBUTTON_ID_PERCENTAGE
 #define ED_RADIOBUTTON_ID_EDITOR_LAST  ED_RADIOBUTTON_ID_QUANTITY
 
 /* values for drawing area gadgets */
-#define ED_DRAWING_ID_DRAWING_LEVEL            0
-#define ED_DRAWING_ID_YAMYAM_CONTENT_0         1
-#define ED_DRAWING_ID_YAMYAM_CONTENT_1         2
-#define ED_DRAWING_ID_YAMYAM_CONTENT_2         3
-#define ED_DRAWING_ID_YAMYAM_CONTENT_3         4
-#define ED_DRAWING_ID_YAMYAM_CONTENT_4         5
-#define ED_DRAWING_ID_YAMYAM_CONTENT_5         6
-#define ED_DRAWING_ID_YAMYAM_CONTENT_6         7
-#define ED_DRAWING_ID_YAMYAM_CONTENT_7         8
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_0     9
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_1     10
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_2     11
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_3     12
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_4     13
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_5     14
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_6     15
-#define ED_DRAWING_ID_MAGIC_BALL_CONTENT_7     16
-#define ED_DRAWING_ID_ANDROID_CONTENT          17
-#define ED_DRAWING_ID_AMOEBA_CONTENT           18
-#define ED_DRAWING_ID_START_ELEMENT            19
-#define ED_DRAWING_ID_ARTWORK_ELEMENT          20
-#define ED_DRAWING_ID_EXPLOSION_ELEMENT                21
-#define ED_DRAWING_ID_INVENTORY_CONTENT                22
-#define ED_DRAWING_ID_CUSTOM_GRAPHIC           23
-#define ED_DRAWING_ID_CUSTOM_CONTENT           24
-#define ED_DRAWING_ID_CUSTOM_MOVE_ENTER                25
-#define ED_DRAWING_ID_CUSTOM_MOVE_LEAVE                26
-#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET     27
-#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT    28
-#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER    29
-#define ED_DRAWING_ID_CUSTOM_CHANGE_ACTION     30
-#define ED_DRAWING_ID_GROUP_CONTENT            31
-#define ED_DRAWING_ID_RANDOM_BACKGROUND                32
-
-#define ED_NUM_DRAWING_AREAS                   33
+enum
+{
+  ED_DRAWING_ID_DRAWING_LEVEL,
+  ED_DRAWING_ID_YAMYAM_CONTENT_0,
+  ED_DRAWING_ID_YAMYAM_CONTENT_1,
+  ED_DRAWING_ID_YAMYAM_CONTENT_2,
+  ED_DRAWING_ID_YAMYAM_CONTENT_3,
+  ED_DRAWING_ID_YAMYAM_CONTENT_4,
+  ED_DRAWING_ID_YAMYAM_CONTENT_5,
+  ED_DRAWING_ID_YAMYAM_CONTENT_6,
+  ED_DRAWING_ID_YAMYAM_CONTENT_7,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_0,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_1,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_2,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_3,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_4,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_5,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_6,
+  ED_DRAWING_ID_MAGIC_BALL_CONTENT_7,
+  ED_DRAWING_ID_ANDROID_CONTENT,
+  ED_DRAWING_ID_AMOEBA_CONTENT,
+  ED_DRAWING_ID_START_ELEMENT,
+  ED_DRAWING_ID_ARTWORK_ELEMENT,
+  ED_DRAWING_ID_EXPLOSION_ELEMENT,
+  ED_DRAWING_ID_INVENTORY_CONTENT,
+  ED_DRAWING_ID_CUSTOM_GRAPHIC,
+  ED_DRAWING_ID_CUSTOM_CONTENT,
+  ED_DRAWING_ID_CUSTOM_MOVE_ENTER,
+  ED_DRAWING_ID_CUSTOM_MOVE_LEAVE,
+  ED_DRAWING_ID_CUSTOM_CHANGE_TARGET,
+  ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT,
+  ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER,
+  ED_DRAWING_ID_CUSTOM_CHANGE_ACTION,
+  ED_DRAWING_ID_GROUP_CONTENT,
+  ED_DRAWING_ID_RANDOM_BACKGROUND,
+
+  ED_NUM_DRAWING_AREAS
+};
 
 #define ED_DRAWING_ID_EDITOR_FIRST     ED_DRAWING_ID_RANDOM_BACKGROUND
 #define ED_DRAWING_ID_EDITOR_LAST      ED_DRAWING_ID_RANDOM_BACKGROUND
 
 /* default value for element tile size in drawing area */
 #define DEFAULT_EDITOR_TILESIZE                MINI_TILESIZE
+#define DEFAULT_EDITOR_TILESIZE_MM     TILESIZE
 
 
 /*
@@ -1297,6 +1344,8 @@ static struct ElementInfo custom_element;
 static char levelset_name[MAX_LEVEL_NAME_LEN + 1];
 static char levelset_author[MAX_LEVEL_AUTHOR_LEN + 1];
 static int levelset_num_levels = 100;
+static boolean levelset_use_levelset_artwork = FALSE;
+static boolean levelset_copy_level_template = FALSE;
 static int levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
 
 static struct
@@ -2417,7 +2466,7 @@ static struct
     NULL, "game engine:", NULL,                "game engine"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(9),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(10),
     GADGET_ID_LEVELSET_SAVE_MODE,      GADGET_ID_NONE,
     -1,
     options_levelset_save_mode,
@@ -2727,7 +2776,7 @@ static struct
   /* ---------- level and editor settings (buttons) ------------------------ */
 
   {
-    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(9),
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(10),
     GADGET_ID_SAVE_LEVELSET,           GADGET_ID_LEVELSET_SAVE_MODE,
     -1,                                        "Save",
     NULL, NULL, NULL,                  "Update or create level set"
@@ -2924,6 +2973,20 @@ static struct
     NULL, NULL,
     "automatically count gems needed", "set counter to number of gems"
   },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(7),
+    GADGET_ID_USE_LEVELSET_ARTWORK,    GADGET_ID_NONE,
+    &levelset_use_levelset_artwork,
+    NULL, NULL,
+    "use current custom artwork",      "use custom artwork of this level set"
+  },
+  {
+    ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(8),
+    GADGET_ID_COPY_LEVEL_TEMPLATE,     GADGET_ID_NONE,
+    &levelset_copy_level_template,
+    NULL, NULL,
+    "copy current level template",     "copy level template of this level set"
+  },
   {
     ED_LEVEL_SETTINGS_XPOS(0),         ED_LEVEL_SETTINGS_YPOS(1),
     GADGET_ID_RANDOM_RESTRICTED,       GADGET_ID_NONE,
@@ -2983,6 +3046,13 @@ static struct
     NULL, NULL,
     "use time orb bug",                        "use odd time orb behaviour"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(5),
+    GADGET_ID_USE_LIFE_BUGS,           GADGET_ID_NONE,
+    &level.use_life_bugs,
+    NULL, NULL,
+    "use buggy element behaviour",     "use odd (historic) element behaviour"
+  },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_RANDOM_BALL_CONTENT,     GADGET_ID_NONE,
@@ -3011,6 +3081,13 @@ static struct
     NULL, NULL,
     "exit level if all fields solved", "automatically finish Sokoban levels"
   },
+  {
+    ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(14),
+    GADGET_ID_SOLVED_BY_ONE_PLAYER,    GADGET_ID_NONE,
+    &level.solved_by_one_player,
+    NULL, NULL,
+    "only one player must enter exit", "level solved by first player in exit"
+  },
   {
     ED_ELEMENT_SETTINGS_XPOS(0),       ED_ELEMENT_SETTINGS_YPOS(9),
     GADGET_ID_CONTINUOUS_SNAPPING,     GADGET_ID_NONE,
@@ -3687,6 +3764,7 @@ static int level_xpos = -1, level_ypos = -1;
 
 /* actual tile size used to display playfield drawing area */
 static int ed_tilesize = DEFAULT_EDITOR_TILESIZE;
+static int ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
 
 #define IN_ED_FIELD(x,y)       IN_FIELD(x, y, ed_fieldx, ed_fieldy)
 
@@ -3715,17 +3793,18 @@ static void ModifyEditorCounterLimits(int, int, int);
 static void ModifyEditorSelectboxValue(int, int);
 static void ModifyEditorSelectboxOptions(int, struct ValueTextInfo *);
 static void ModifyEditorDrawingArea(int, int, int);
-static void ModifyEditorElementList();
-static void AdjustElementListScrollbar();
-static void RedrawDrawingElements();
-static void DrawDrawingWindow();
-static void DrawLevelInfoWindow();
-static void DrawPropertiesWindow();
-static void DrawPaletteWindow();
-static void UpdateCustomElementGraphicGadgets();
+static void ModifyEditorElementList(void);
+static void AdjustElementListScrollbar(void);
+static void RedrawDrawingElements(void);
+static void DrawDrawingWindowExt(boolean);
+static void DrawDrawingWindow(void);
+static void DrawLevelInfoWindow(void);
+static void DrawPropertiesWindow(void);
+static void DrawPaletteWindow(void);
+static void UpdateCustomElementGraphicGadgets(void);
 static boolean checkPropertiesConfig(int);
-static void SetAutomaticNumberOfGemsNeeded();
-static void ClearEditorGadgetInfoText();
+static void SetAutomaticNumberOfGemsNeeded(void);
+static void ClearEditorGadgetInfoText(void);
 static void CopyLevelToUndoBuffer(int);
 static void HandleDrawingAreas(struct GadgetInfo *);
 static void HandleCounterButtons(struct GadgetInfo *);
@@ -3739,8 +3818,11 @@ static void HandleCheckbuttons(struct GadgetInfo *);
 static void HandleControlButtons(struct GadgetInfo *);
 static void HandleDrawingAreaInfo(struct GadgetInfo *);
 static void PrintEditorGadgetInfoText(struct GadgetInfo *);
-static boolean AskToCopyAndModifyLevelTemplate();
-static boolean getDrawModeHiRes();
+static boolean AskToCopyAndModifyLevelTemplate(void);
+static boolean getDrawModeHiRes(void);
+static int getTabulatorBarWidth(void);
+static int getTabulatorBarHeight(void);
+static Pixel getTabulatorBarColor(void);
 
 static int num_editor_gadgets = 0;     /* dynamically determined */
 
@@ -3773,7 +3855,7 @@ static int editor_el_players[] =
   EL_PLAYER_4
 };
 static int *editor_el_players_ptr = editor_el_players;
-static int num_editor_el_players = SIZEOF_ARRAY_INT(editor_el_players);
+static int num_editor_el_players = ARRAY_SIZE(editor_el_players);
 
 static int editor_hl_boulderdash[] =
 {
@@ -3812,8 +3894,8 @@ static int editor_el_boulderdash[] =
 };
 static int *editor_hl_boulderdash_ptr = editor_hl_boulderdash;
 static int *editor_el_boulderdash_ptr = editor_el_boulderdash;
-static int num_editor_hl_boulderdash = SIZEOF_ARRAY_INT(editor_hl_boulderdash);
-static int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash);
+static int num_editor_hl_boulderdash = ARRAY_SIZE(editor_hl_boulderdash);
+static int num_editor_el_boulderdash = ARRAY_SIZE(editor_el_boulderdash);
 
 static int editor_hl_emerald_mine[] =
 {
@@ -3840,12 +3922,12 @@ static int editor_el_emerald_mine[] =
   EL_NUT,
   EL_BOMB,
 
-  EL_WALL_EMERALD,
-  EL_WALL_DIAMOND,
-  EL_DYNAMITE,
-  EL_DYNAMITE_ACTIVE,
+  EL_EM_DYNAMITE,
+  EL_EM_DYNAMITE_ACTIVE,
+  EL_EM_EXIT_CLOSED,
+  EL_EM_EXIT_OPEN,
 
-  EL_YAMYAM,
+  EL_YAMYAM_UP,
   EL_BUG_UP,
   EL_SPACESHIP_UP,
   EL_ROBOT,
@@ -3884,16 +3966,11 @@ static int editor_el_emerald_mine[] =
   EL_EM_GATE_2_GRAY,
   EL_EM_GATE_3_GRAY,
   EL_EM_GATE_4_GRAY,
-
-  EL_EM_EXIT_CLOSED,
-  EL_EM_EXIT_OPEN,
-  EL_EM_STEEL_EXIT_CLOSED,
-  EL_EM_STEEL_EXIT_OPEN,
 };
 static int *editor_hl_emerald_mine_ptr = editor_hl_emerald_mine;
 static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine;
-static int num_editor_hl_emerald_mine=SIZEOF_ARRAY_INT(editor_hl_emerald_mine);
-static int num_editor_el_emerald_mine=SIZEOF_ARRAY_INT(editor_el_emerald_mine);
+static int num_editor_hl_emerald_mine = ARRAY_SIZE(editor_hl_emerald_mine);
+static int num_editor_el_emerald_mine = ARRAY_SIZE(editor_el_emerald_mine);
 
 static int editor_hl_emerald_mine_club[] =
 {
@@ -3962,8 +4039,8 @@ static int editor_el_emerald_mine_club[] =
 
   EL_EMC_LENSES,
   EL_EMC_MAGNIFIER,
-  EL_EM_DYNAMITE,
-  EL_EM_DYNAMITE_ACTIVE,
+  EL_EMPTY,
+  EL_EMPTY,
 
   EL_BALLOON,
   EL_YAMYAM_UP,
@@ -3982,8 +4059,8 @@ static int editor_el_emerald_mine_club[] =
 };
 static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club;
 static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club;
-static int num_editor_hl_emerald_mine_club=SIZEOF_ARRAY_INT(editor_hl_emerald_mine_club);
-static int num_editor_el_emerald_mine_club=SIZEOF_ARRAY_INT(editor_el_emerald_mine_club);
+static int num_editor_hl_emerald_mine_club = ARRAY_SIZE(editor_hl_emerald_mine_club);
+static int num_editor_el_emerald_mine_club = ARRAY_SIZE(editor_el_emerald_mine_club);
 
 static int editor_hl_rnd[] =
 {
@@ -3995,6 +4072,11 @@ static int editor_hl_rnd[] =
 
 static int editor_el_rnd[] =
 {
+  EL_DYNAMITE,                 /* RND */
+  EL_DYNAMITE_ACTIVE,          /* RND */
+  EL_EMPTY,
+  EL_EMPTY,
+
   EL_KEY_1,
   EL_KEY_2,
   EL_KEY_3,
@@ -4038,7 +4120,7 @@ static int editor_el_rnd[] =
   EL_PACMAN_LEFT,
   EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_EMPTY,
+  EL_YAMYAM,                   /* RND */
 
   EL_BLACK_ORB,
   EL_PACMAN_DOWN,
@@ -4077,8 +4159,8 @@ static int editor_el_rnd[] =
 };
 static int *editor_hl_rnd_ptr = editor_hl_rnd;
 static int *editor_el_rnd_ptr = editor_el_rnd;
-static int num_editor_hl_rnd = SIZEOF_ARRAY_INT(editor_hl_rnd);
-static int num_editor_el_rnd = SIZEOF_ARRAY_INT(editor_el_rnd);
+static int num_editor_hl_rnd = ARRAY_SIZE(editor_hl_rnd);
+static int num_editor_el_rnd = ARRAY_SIZE(editor_el_rnd);
 
 static int editor_hl_sokoban[] =
 {
@@ -4097,8 +4179,8 @@ static int editor_el_sokoban[] =
 };
 static int *editor_hl_sokoban_ptr = editor_hl_sokoban;
 static int *editor_el_sokoban_ptr = editor_el_sokoban;
-static int num_editor_hl_sokoban = SIZEOF_ARRAY_INT(editor_hl_sokoban);
-static int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban);
+static int num_editor_hl_sokoban = ARRAY_SIZE(editor_hl_sokoban);
+static int num_editor_el_sokoban = ARRAY_SIZE(editor_el_sokoban);
 
 static int editor_hl_supaplex[] =
 {
@@ -4172,8 +4254,8 @@ static int editor_el_supaplex[] =
 };
 static int *editor_hl_supaplex_ptr = editor_hl_supaplex;
 static int *editor_el_supaplex_ptr = editor_el_supaplex;
-static int num_editor_hl_supaplex = SIZEOF_ARRAY_INT(editor_hl_supaplex);
-static int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
+static int num_editor_hl_supaplex = ARRAY_SIZE(editor_hl_supaplex);
+static int num_editor_el_supaplex = ARRAY_SIZE(editor_el_supaplex);
 
 static int editor_hl_diamond_caves[] =
 {
@@ -4185,6 +4267,11 @@ static int editor_hl_diamond_caves[] =
 
 static int editor_el_diamond_caves[] =
 {
+  EL_EM_STEEL_EXIT_CLOSED,     /* DC2 */
+  EL_EM_STEEL_EXIT_OPEN,       /* DC2 */
+  EL_WALL_EMERALD,             /* DC2 */
+  EL_WALL_DIAMOND,             /* DC2 */
+
   EL_PEARL,
   EL_CRYSTAL,
   EL_WALL_PEARL,
@@ -4329,8 +4416,8 @@ static int editor_el_diamond_caves[] =
 };
 static int *editor_hl_diamond_caves_ptr = editor_hl_diamond_caves;
 static int *editor_el_diamond_caves_ptr = editor_el_diamond_caves;
-static int num_editor_hl_diamond_caves = SIZEOF_ARRAY_INT(editor_hl_diamond_caves);
-static int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves);
+static int num_editor_hl_diamond_caves = ARRAY_SIZE(editor_hl_diamond_caves);
+static int num_editor_el_diamond_caves = ARRAY_SIZE(editor_el_diamond_caves);
 
 static int editor_hl_dx_boulderdash[] =
 {
@@ -4364,8 +4451,8 @@ static int editor_el_dx_boulderdash[] =
 };
 static int *editor_hl_dx_boulderdash_ptr = editor_hl_dx_boulderdash;
 static int *editor_el_dx_boulderdash_ptr = editor_el_dx_boulderdash;
-static int num_editor_hl_dx_boulderdash = SIZEOF_ARRAY_INT(editor_hl_dx_boulderdash);
-static int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash);
+static int num_editor_hl_dx_boulderdash = ARRAY_SIZE(editor_hl_dx_boulderdash);
+static int num_editor_el_dx_boulderdash = ARRAY_SIZE(editor_el_dx_boulderdash);
 
 static int editor_hl_mirror_magic[] =
 {
@@ -4384,13 +4471,13 @@ static int editor_el_mirror_magic[] =
 
   EL_MM_MIRROR_START,
   EL_MM_MIRROR_FIXED_START,
-  EL_MM_POLARISATOR_START,
-  EL_MM_POLARISATOR_CROSS_START,
+  EL_MM_POLARIZER_START,
+  EL_MM_POLARIZER_CROSS_START,
 
-  EL_MM_BEAMER_RED_START,
-  EL_MM_BEAMER_YELLOW_START,
-  EL_MM_BEAMER_GREEN_START,
-  EL_MM_BEAMER_BLUE_START,
+  EL_MM_TELEPORTER_RED_START,
+  EL_MM_TELEPORTER_YELLOW_START,
+  EL_MM_TELEPORTER_GREEN_START,
+  EL_MM_TELEPORTER_BLUE_START,
 
   EL_MM_PRISM,
   EL_MM_FUSE_ACTIVE,
@@ -4429,8 +4516,8 @@ static int editor_el_mirror_magic[] =
 };
 static int *editor_hl_mirror_magic_ptr = editor_hl_mirror_magic;
 static int *editor_el_mirror_magic_ptr = editor_el_mirror_magic;
-static int num_editor_hl_mirror_magic = SIZEOF_ARRAY_INT(editor_hl_mirror_magic);
-static int num_editor_el_mirror_magic = SIZEOF_ARRAY_INT(editor_el_mirror_magic);
+static int num_editor_hl_mirror_magic = ARRAY_SIZE(editor_hl_mirror_magic);
+static int num_editor_el_mirror_magic = ARRAY_SIZE(editor_el_mirror_magic);
 
 static int editor_hl_deflektor[] =
 {
@@ -4474,8 +4561,8 @@ static int editor_el_deflektor[] =
 };
 static int *editor_hl_deflektor_ptr = editor_hl_deflektor;
 static int *editor_el_deflektor_ptr = editor_el_deflektor;
-static int num_editor_hl_deflektor = SIZEOF_ARRAY_INT(editor_hl_deflektor);
-static int num_editor_el_deflektor = SIZEOF_ARRAY_INT(editor_el_deflektor);
+static int num_editor_hl_deflektor = ARRAY_SIZE(editor_hl_deflektor);
+static int num_editor_el_deflektor = ARRAY_SIZE(editor_el_deflektor);
 
 static int editor_hl_chars[] =
 {
@@ -4584,8 +4671,8 @@ static int editor_el_chars[] =
 };
 static int *editor_hl_chars_ptr = editor_hl_chars;
 static int *editor_el_chars_ptr = editor_el_chars;
-static int num_editor_hl_chars = SIZEOF_ARRAY_INT(editor_hl_chars);
-static int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars);
+static int num_editor_hl_chars = ARRAY_SIZE(editor_hl_chars);
+static int num_editor_el_chars = ARRAY_SIZE(editor_el_chars);
 
 static int editor_hl_steel_chars[] =
 {
@@ -4694,8 +4781,8 @@ static int editor_el_steel_chars[] =
 };
 static int *editor_hl_steel_chars_ptr = editor_hl_steel_chars;
 static int *editor_el_steel_chars_ptr = editor_el_steel_chars;
-static int num_editor_hl_steel_chars = SIZEOF_ARRAY_INT(editor_hl_steel_chars);
-static int num_editor_el_steel_chars = SIZEOF_ARRAY_INT(editor_el_steel_chars);
+static int num_editor_hl_steel_chars = ARRAY_SIZE(editor_hl_steel_chars);
+static int num_editor_el_steel_chars = ARRAY_SIZE(editor_el_steel_chars);
 
 static int editor_hl_custom[] =
 {
@@ -5029,8 +5116,8 @@ static int editor_el_custom[] =
 };
 static int *editor_hl_custom_ptr = editor_hl_custom;
 static int *editor_el_custom_ptr = editor_el_custom;
-static int num_editor_hl_custom = SIZEOF_ARRAY_INT(editor_hl_custom);
-static int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom);
+static int num_editor_hl_custom = ARRAY_SIZE(editor_hl_custom);
+static int num_editor_el_custom = ARRAY_SIZE(editor_el_custom);
 
 static int editor_hl_group[] =
 {
@@ -5084,8 +5171,8 @@ static int editor_el_group[] =
 };
 static int *editor_hl_group_ptr = editor_hl_group;
 static int *editor_el_group_ptr = editor_el_group;
-static int num_editor_hl_group = SIZEOF_ARRAY_INT(editor_hl_group);
-static int num_editor_el_group = SIZEOF_ARRAY_INT(editor_el_group);
+static int num_editor_hl_group = ARRAY_SIZE(editor_hl_group);
+static int num_editor_el_group = ARRAY_SIZE(editor_el_group);
 
 static int editor_hl_reference[] =
 {
@@ -5129,8 +5216,8 @@ static int editor_el_reference[] =
 };
 static int *editor_hl_reference_ptr = editor_hl_reference;
 static int *editor_el_reference_ptr = editor_el_reference;
-static int num_editor_hl_reference = SIZEOF_ARRAY_INT(editor_hl_reference);
-static int num_editor_el_reference = SIZEOF_ARRAY_INT(editor_el_reference);
+static int num_editor_hl_reference = ARRAY_SIZE(editor_hl_reference);
+static int num_editor_el_reference = ARRAY_SIZE(editor_el_reference);
 
 static int editor_hl_user_defined[] =
 {
@@ -5142,7 +5229,7 @@ static int editor_hl_user_defined[] =
 
 static int *editor_hl_user_defined_ptr = editor_hl_user_defined;
 static int *editor_el_user_defined_ptr = NULL;
-static int num_editor_hl_user_defined=SIZEOF_ARRAY_INT(editor_hl_user_defined);
+static int num_editor_hl_user_defined = ARRAY_SIZE(editor_hl_user_defined);
 static int num_editor_el_user_defined = 0;
 
 static int editor_hl_dynamic[] =
@@ -5155,7 +5242,7 @@ static int editor_hl_dynamic[] =
 
 static int *editor_hl_dynamic_ptr = editor_hl_dynamic;
 static int *editor_el_dynamic_ptr = NULL;
-static int num_editor_hl_dynamic = SIZEOF_ARRAY_INT(editor_hl_dynamic);
+static int num_editor_hl_dynamic = ARRAY_SIZE(editor_hl_dynamic);
 static int num_editor_el_dynamic = 0;
 
 static int editor_hl_empty[] = { EL_EMPTY };
@@ -5338,7 +5425,7 @@ editor_elements_info[] =
   -----------------------------------------------------------------------------
 */
 
-static int getMaxInfoTextLength()
+static int getMaxInfoTextLength(void)
 {
   return (SXSIZE / getFontWidth(INFOTEXT_FONT));
 }
@@ -5410,7 +5497,7 @@ static char *getElementDescriptionFilenameExt(char *basename)
   return NULL;
 }
 
-char *getElementDescriptionFilename(int element)
+static char *getElementDescriptionFilename(int element)
 {
   char basename[MAX_FILENAME_LEN];
   char *filename;
@@ -5430,6 +5517,13 @@ char *getElementDescriptionFilename(int element)
   return NULL;
 }
 
+static boolean suppressBorderElement(void)
+{
+  return (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+         lev_fieldx <= MAX_ED_FIELDX &&
+         lev_fieldy <= MAX_ED_FIELDY);
+}
+
 static void InitDynamicEditorElementList(int **elements, int *num_elements)
 {
   boolean element_found[NUM_FILE_ELEMENTS];
@@ -5477,7 +5571,7 @@ static void InitDynamicEditorElementList(int **elements, int *num_elements)
     (*elements)[(*num_elements)++] = EL_EMPTY;
 }
 
-static void ReinitializeElementList_EnableSections()
+static void ReinitializeElementList_EnableSections(void)
 {
   /* default: enable all element sections */
 
@@ -5586,7 +5680,7 @@ static void ReinitializeElementList_EnableSections()
   }
 }
 
-static void ReinitializeElementList()
+static void ReinitializeElementList(void)
 {
   static boolean initialization_needed = TRUE;
   int pos = 0;
@@ -5745,7 +5839,7 @@ static void ReinitializeElementList()
   AdjustElementListScrollbar();
 }
 
-void PrintEditorElementList()
+void PrintEditorElementList(void)
 {
   boolean *stop = &setup_editor_el_user_defined;
   int i, j;
@@ -5789,7 +5883,7 @@ void PrintEditorElementList()
   }
 }
 
-static void ReinitializeElementListButtons()
+static void ReinitializeElementListButtons(void)
 {
   static boolean last_setup_value_headlines = FALSE;
   static boolean initialization_needed = TRUE;
@@ -5872,6 +5966,45 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height,
   ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2);
 }
 
+static void DrawEditorLevelBorderLine(int x, int y, int xsize, int ysize)
+{
+  int xsize_tile = MAX(ed_tilesize, xsize);
+  int ysize_tile = MAX(ed_tilesize, ysize);
+  int xsize_full = xsize + 1;
+  int ysize_full = ysize + 1;
+  int xsize_thin = (xsize < ed_tilesize ? 1 : xsize);
+  int ysize_thin = (ysize < ed_tilesize ? 1 : ysize);
+  Pixel line_color = getTabulatorBarColor();
+
+  if (line_color == BLACK_PIXEL)               /* black => transparent */
+    return;
+
+  FillRectangle(drawto, SX + x, SY + y, xsize_tile, ysize_tile, BLACK_PIXEL);
+  FillRectangle(drawto, SX + x, SY + y, xsize_full, ysize_full, line_color);
+  FillRectangle(drawto, SX + x, SY + y, xsize_thin, ysize_thin, BLACK_PIXEL);
+}
+
+static void DrawEditorLevelBorderLinesIfNeeded(void)
+{
+  int xsize = lev_fieldx * ed_tilesize;
+  int ysize = lev_fieldy * ed_tilesize;
+  int line_size = getTabulatorBarHeight();
+
+  if (!suppressBorderElement())
+    return;
+
+  /* draw little border line around editable level playfield */
+
+  if (xsize < SXSIZE)
+    DrawEditorLevelBorderLine(xsize, 0, line_size, ysize);
+
+  if (ysize < SYSIZE)
+    DrawEditorLevelBorderLine(0, ysize, xsize, line_size);
+
+  if (xsize < SXSIZE && ysize < SYSIZE)
+    DrawEditorLevelBorderLine(xsize, ysize, line_size, line_size);
+}
+
 static void DrawEditorElement(int x, int y, int element)
 {
   DrawSizedElement(x, y, element, ed_tilesize);
@@ -5890,6 +6023,7 @@ static void DrawEditorElementOrWall(int x, int y, int scroll_x, int scroll_y)
 static void DrawEditorLevel(int size_x, int size_y, int scroll_x, int scroll_y)
 {
   DrawSizedLevel(size_x, size_y, scroll_x, scroll_y, ed_tilesize);
+  DrawEditorLevelBorderLinesIfNeeded();
 }
 
 static void DrawDrawingArea(int id)
@@ -5941,13 +6075,13 @@ static void ScrollEditorLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap,
-                           int *x, int *y)
+static void getEditorGraphicSource(int element, int tile_size, Bitmap **bitmap,
+                                  int *x, int *y)
 {
   getSizedGraphicSource(el2edimg(element), 0, tile_size, bitmap, x, y);
 }
 
-static void CreateControlButtons()
+static void CreateControlButtons(void)
 {
   struct GadgetInfo *gi;
   int i;
@@ -6039,6 +6173,7 @@ static void CreateControlButtons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, controlbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6113,6 +6248,7 @@ static void CreateControlButtons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6161,6 +6297,7 @@ static void CreateControlButtons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, getElementInfoText(element),
                      GDI_X, x,
                      GDI_Y, y,
@@ -6186,7 +6323,7 @@ static void CreateControlButtons()
   }
 }
 
-static void CreateCounterButtons()
+static void CreateCounterButtons(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i;
@@ -6258,6 +6395,7 @@ static void CreateCounterButtons()
 
       gi = CreateGadget(GDI_CUSTOM_ID, id,
                        GDI_CUSTOM_TYPE_ID, i,
+                       GDI_IMAGE_ID, graphic,
                        GDI_INFO_TEXT, infotext,
                        GDI_X, x,
                        GDI_Y, y,
@@ -6314,6 +6452,7 @@ static void CreateCounterButtons()
 
        gi = CreateGadget(GDI_CUSTOM_ID, id,
                          GDI_CUSTOM_TYPE_ID, i,
+                         GDI_IMAGE_ID, graphic,
                          GDI_INFO_TEXT, "enter counter value",
                          GDI_X, x,
                          GDI_Y, y,
@@ -6346,7 +6485,7 @@ static void CreateCounterButtons()
   }
 }
 
-static void CreateDrawingAreas()
+static void CreateDrawingAreas(void)
 {
   int i;
 
@@ -6400,7 +6539,7 @@ static void CreateDrawingAreas()
   }
 }
 
-static void CreateTextInputGadgets()
+static void CreateTextInputGadgets(void)
 {
   struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
   int max_infotext_len = getMaxInfoTextLength();
@@ -6471,7 +6610,7 @@ static void CreateTextInputGadgets()
   }
 }
 
-static void CreateTextAreaGadgets()
+static void CreateTextAreaGadgets(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i;
@@ -6520,7 +6659,7 @@ static void CreateTextAreaGadgets()
   }
 }
 
-static void CreateSelectboxGadgets()
+static void CreateSelectboxGadgets(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i, j;
@@ -6601,7 +6740,7 @@ static void CreateSelectboxGadgets()
   }
 }
 
-static void CreateTextbuttonGadgets()
+static void CreateTextbuttonGadgets(void)
 {
   int max_infotext_len = getMaxInfoTextLength();
   int i;
@@ -6656,6 +6795,7 @@ static void CreateTextbuttonGadgets()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6684,7 +6824,7 @@ static void CreateTextbuttonGadgets()
   }
 }
 
-static void CreateGraphicbuttonGadgets()
+static void CreateGraphicbuttonGadgets(void)
 {
   struct GadgetInfo *gi;
   unsigned int event_mask;
@@ -6696,7 +6836,8 @@ static void CreateGraphicbuttonGadgets()
     int id = graphicbutton_info[i].gadget_id;
     int x = SX + ED_SETTINGS_X(graphicbutton_info[i].x);
     int y = SY + ED_SETTINGS_Y(graphicbutton_info[i].y);
-    struct GraphicInfo *gd = &graphic_info[graphicbutton_info[i].graphic];
+    int graphic = graphicbutton_info[i].graphic;
+    struct GraphicInfo *gd = &graphic_info[graphic];
     int gd_x1 = gd->src_x;
     int gd_y1 = gd->src_y;
     int gd_x2 = gd->src_x + gd->pressed_xoffset;
@@ -6715,6 +6856,7 @@ static void CreateGraphicbuttonGadgets()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, graphicbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6738,7 +6880,7 @@ static void CreateGraphicbuttonGadgets()
   }
 }
 
-static void CreateScrollbarGadgets()
+static void CreateScrollbarGadgets(void)
 {
   int i;
 
@@ -6821,6 +6963,7 @@ static void CreateScrollbarGadgets()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, scrollbar_info[i].infotext,
                      GDI_X, scrollbar_pos[i].x,
                      GDI_Y, scrollbar_pos[i].y,
@@ -6850,7 +6993,7 @@ static void CreateScrollbarGadgets()
   }
 }
 
-static void CreateCheckbuttonGadgets()
+static void CreateCheckbuttonGadgets(void)
 {
   struct GadgetInfo *gi;
   unsigned int event_mask;
@@ -6886,6 +7029,7 @@ static void CreateCheckbuttonGadgets()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, checkbutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6911,9 +7055,10 @@ static void CreateCheckbuttonGadgets()
   }
 }
 
-static void CreateRadiobuttonGadgets()
+static void CreateRadiobuttonGadgets(void)
 {
-  struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_RADIOBUTTON];
+  int graphic = IMG_EDITOR_RADIOBUTTON;
+  struct GraphicInfo *gd = &graphic_info[graphic];
   int gd_x1 = gd->src_x;
   int gd_y1 = gd->src_y;
   int gd_x2 = gd->src_x + gd->pressed_xoffset;
@@ -6948,6 +7093,7 @@ static void CreateRadiobuttonGadgets()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
+                     GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, radiobutton_info[i].infotext,
                      GDI_X, x,
                      GDI_Y, y,
@@ -6974,7 +7120,7 @@ static void CreateRadiobuttonGadgets()
   }
 }
 
-void CreateLevelEditorGadgets()
+void CreateLevelEditorGadgets(void)
 {
   /* force EDITOR font inside level editor */
   SetFontStatus(GAME_MODE_EDITOR);
@@ -7016,7 +7162,7 @@ void CreateLevelEditorGadgets()
   ResetFontStatus();
 }
 
-void FreeLevelEditorGadgets()
+void FreeLevelEditorGadgets(void)
 {
   int i;
 
@@ -7093,7 +7239,7 @@ static void MapCounterButtons(int id)
   MapGadget(gi_up);
 }
 
-static void MapControlButtons()
+static void MapControlButtons(void)
 {
   int counter_id;
   int i;
@@ -7336,12 +7482,18 @@ static void MapCheckbuttonGadget(int id)
   MapGadget(gi);
 }
 
-static void MapMainDrawingArea()
+static void MapMainDrawingArea(void)
 {
   boolean no_horizontal_scrollbar = (lev_fieldx + 2 <= ed_fieldx);
   boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
   int i;
 
+  if (suppressBorderElement())
+  {
+    no_horizontal_scrollbar = (lev_fieldx <= ed_fieldx);
+    no_vertical_scrollbar   = (lev_fieldy <= ed_fieldy);
+  }
+
   for (i=ED_SCROLLBUTTON_ID_AREA_FIRST; i <= ED_SCROLLBUTTON_ID_AREA_LAST; i++)
   {
     if (((i == ED_SCROLLBUTTON_ID_AREA_LEFT ||
@@ -7387,12 +7539,12 @@ static void MapOrUnmapLevelEditorToolboxCustomGadgets(boolean map)
   }
 }
 
-static void MapLevelEditorToolboxCustomGadgets()
+static void MapLevelEditorToolboxCustomGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxCustomGadgets(TRUE);
 }
 
-static void UnmapLevelEditorToolboxCustomGadgets()
+static void UnmapLevelEditorToolboxCustomGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxCustomGadgets(FALSE);
 }
@@ -7428,12 +7580,12 @@ static void MapOrUnmapLevelEditorToolboxDrawingGadgets(boolean map)
   }
 }
 
-static void MapLevelEditorToolboxDrawingGadgets()
+static void MapLevelEditorToolboxDrawingGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxDrawingGadgets(TRUE);
 }
 
-static void UnmapLevelEditorToolboxDrawingGadgets()
+static void UnmapLevelEditorToolboxDrawingGadgets(void)
 {
   MapOrUnmapLevelEditorToolboxDrawingGadgets(FALSE);
 }
@@ -7443,7 +7595,7 @@ static void UnmapDrawingArea(int id)
   UnmapGadget(level_editor_gadget[drawingarea_info[id].gadget_id]);
 }
 
-static void UnmapLevelEditorFieldGadgets()
+static void UnmapLevelEditorFieldGadgets(void)
 {
   int i;
 
@@ -7453,7 +7605,7 @@ static void UnmapLevelEditorFieldGadgets()
       UnmapGadget(level_editor_gadget[i]);
 }
 
-void UnmapLevelEditorGadgets()
+void UnmapLevelEditorGadgets(void)
 {
   int i;
 
@@ -7461,7 +7613,7 @@ void UnmapLevelEditorGadgets()
     UnmapGadget(level_editor_gadget[i]);
 }
 
-static void ResetUndoBuffer()
+static void ResetUndoBuffer(void)
 {
   undo_buffer_position = -1;
   undo_buffer_steps = -1;
@@ -7472,10 +7624,13 @@ static void ResetUndoBuffer()
   level.changed = FALSE;
 }
 
-static void DrawEditModeWindow()
+static void DrawEditModeWindowExt(boolean remap_toolbox_gadgets)
 {
-  ModifyEditorElementList();
-  RedrawDrawingElements();
+  if (remap_toolbox_gadgets)
+  {
+    ModifyEditorElementList();
+    RedrawDrawingElements();
+  }
 
   if (edit_mode == ED_MODE_INFO)
     DrawLevelInfoWindow();
@@ -7484,7 +7639,17 @@ static void DrawEditModeWindow()
   else if (edit_mode == ED_MODE_PALETTE)
     DrawPaletteWindow();
   else /* edit_mode == ED_MODE_DRAWING */
-    DrawDrawingWindow();
+    DrawDrawingWindowExt(remap_toolbox_gadgets);
+}
+
+static void DrawEditModeWindow(void)
+{
+  DrawEditModeWindowExt(TRUE);
+}
+
+static void DrawEditModeWindow_PlayfieldOnly(void)
+{
+  DrawEditModeWindowExt(FALSE);
 }
 
 static void ChangeEditModeWindow(int new_edit_mode)
@@ -7494,7 +7659,7 @@ static void ChangeEditModeWindow(int new_edit_mode)
   DrawEditModeWindow();
 }
 
-static boolean LevelChanged()
+static boolean LevelChanged(void)
 {
   boolean field_changed = FALSE;
   int x, y;
@@ -7507,7 +7672,7 @@ static boolean LevelChanged()
   return (level.changed || field_changed);
 }
 
-static boolean PrepareSavingIntoPersonalLevelSet()
+static boolean PrepareSavingIntoPersonalLevelSet(void)
 {
   static LevelDirTree *last_copied_leveldir = NULL;
   static LevelDirTree *last_written_leveldir = NULL;
@@ -7649,7 +7814,7 @@ static int setSelectboxValue(int selectbox_id, int new_value)
   return new_index_value;
 }
 
-static void setSelectboxSpecialActionVariablesIfNeeded()
+static void setSelectboxSpecialActionVariablesIfNeeded(void)
 {
   int i;
 
@@ -7675,7 +7840,7 @@ static void setSelectboxSpecialActionVariablesIfNeeded()
   }
 }
 
-static void setSelectboxSpecialActionOptions()
+static void setSelectboxSpecialActionOptions(void)
 {
   int i;
 
@@ -8007,7 +8172,7 @@ static void CopyElementPropertiesToEditor(int element)
     CopyClassicElementPropertiesToEditor(element);
 }
 
-static boolean AskToCopyAndModifyLevelTemplate()
+static boolean AskToCopyAndModifyLevelTemplate(void)
 {
   if (Request("Copy and modify settings from level template?", REQ_ASK))
   {
@@ -8183,7 +8348,8 @@ static void CopyElementPropertiesToGame(int element)
     CopyClassicElementPropertiesToGame(element);
 }
 
-void CheckElementDescriptions()
+#if DEBUG
+static void CheckElementDescriptions(void)
 {
   int i;
 
@@ -8192,6 +8358,7 @@ void CheckElementDescriptions()
       Error(ERR_WARN, "no element description file for element '%s'",
            EL_NAME(i));
 }
+#endif
 
 static int getMaxEdFieldX(boolean has_scrollbar)
 {
@@ -8204,7 +8371,8 @@ static int getMaxEdFieldX(boolean has_scrollbar)
 
 static int getMaxEdFieldY(boolean has_scrollbar)
 {
-  int infotext_height = INFOTEXT_YSIZE_FULL;
+  int infotext_height = (IN_PIX_FIELD(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY) ?
+                        INFOTEXT_YSIZE_FULL : 0);
   int scrollbar_height = (has_scrollbar ? ED_SCROLLBUTTON_YSIZE : 0);
   int sysize = SYSIZE - scrollbar_height - infotext_height;
   int max_ed_fieldy = sysize / ed_tilesize;
@@ -8212,21 +8380,65 @@ static int getMaxEdFieldY(boolean has_scrollbar)
   return max_ed_fieldy;
 }
 
-void InitZoomLevelSettings(int zoom_tilesize)
+static void InitZoomLevelSettings(int zoom_tilesize)
 {
-  if (zoom_tilesize == -1)
-    zoom_tilesize = setup.auto_setup.editor_zoom_tilesize;
+  static int last_game_engine_type = GAME_ENGINE_TYPE_UNKNOWN;
+
+  if (zoom_tilesize == -1 && level.game_engine_type != last_game_engine_type)
+  {
+    ed_tilesize = setup.auto_setup.editor_zoom_tilesize;
+    ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
+
+    if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    {
+      ed_tilesize = DEFAULT_EDITOR_TILESIZE_MM;
+      ed_tilesize_default = DEFAULT_EDITOR_TILESIZE_MM;
+    }
+  }
+
+  last_game_engine_type = level.game_engine_type;
 
   // limit zoom tilesize by upper and lower bound
-  zoom_tilesize = MIN(MAX(MICRO_TILESIZE, zoom_tilesize), TILESIZE);
+  ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);
 
-  ed_tilesize = setup.auto_setup.editor_zoom_tilesize = zoom_tilesize;
+  // store zoom tilesize in auto setup file only if it was manually changed
+  if (zoom_tilesize != -1)
+    setup.auto_setup.editor_zoom_tilesize = ed_tilesize;
 
   MAX_ED_FIELDX = getMaxEdFieldX(FALSE);
   MAX_ED_FIELDY = getMaxEdFieldY(FALSE);
 }
 
-static void InitLevelSetInfo()
+static void InitDrawingElements(void)
+{
+  static int game_engine_type_last = GAME_ENGINE_TYPE_UNKNOWN;
+
+  if (level.game_engine_type == game_engine_type_last)
+    return;
+
+  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+  {
+    new_element1 = EL_SP_CHIP_SINGLE;
+    new_element2 = EL_EMPTY;
+    new_element3 = EL_SP_BASE;
+  }
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+  {
+    new_element1 = EL_MM_MIRROR_START;
+    new_element2 = EL_EMPTY;
+    new_element3 = EL_MM_WOODEN_WALL;
+  }
+  else
+  {
+    new_element1 = EL_WALL;
+    new_element2 = EL_EMPTY;
+    new_element3 = EL_SAND;
+  }
+
+  game_engine_type_last = level.game_engine_type;
+}
+
+static void InitLevelSetInfo(void)
 {
   snprintf(levelset_name,   MAX_LEVEL_NAME_LEN + 1,
           "%s", leveldir_current->name);
@@ -8235,6 +8447,9 @@ static void InitLevelSetInfo()
 
   levelset_num_levels = leveldir_current->levels;
 
+  levelset_use_levelset_artwork = FALSE;
+  levelset_copy_level_template = FALSE;
+
   levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
 }
 
@@ -8258,7 +8473,59 @@ static void ChangeEditorToLevelSet(char *levelset_subdir)
   DrawLevelEd();
 }
 
-void DrawLevelEd()
+static boolean useEditorDoorAnimation(void)
+{
+  struct RectWithBorder *vp_door_1 = &viewport.door_1[GAME_MODE_MAIN];
+  boolean door_1_viewport_unchanged =
+    (vp_door_1->x      == DX     &&
+     vp_door_1->y      == DY     &&
+     vp_door_1->width  == DXSIZE &&
+     vp_door_1->height == DYSIZE);
+  boolean door_1_contains_toolbox =
+    (EX >= DX &&
+     EY >= DY &&
+     EX + EXSIZE <= DX + DXSIZE &&
+     EY + EYSIZE <= DY + DYSIZE);
+
+  return (door_1_viewport_unchanged && door_1_contains_toolbox);
+}
+
+static void DrawEditorDoorContent(void)
+{
+  /* needed for gadgets drawn on background (like palette scrollbar) */
+  SetDoorBackgroundImage(IMG_UNDEFINED);
+
+  /* copy default editor door content to main double buffer */
+  BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto,
+            graphic_info[IMG_BACKGROUND_PALETTE].src_x,
+            graphic_info[IMG_BACKGROUND_PALETTE].src_y,
+            MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width),
+            MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height),
+            DX, DY);
+
+  /* draw bigger door */
+  DrawSpecialEditorDoor();
+
+  /* draw new control window */
+  BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
+            graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
+            graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
+            MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width),
+            MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height),
+            EX, EY);
+
+  /* draw all toolbox gadgets to editor doors */
+  MapControlButtons();
+
+  /* draw all palette gadgets to editor doors */
+  ModifyEditorElementList();
+  RedrawDrawingElements();
+
+  /* copy actual editor door content to door double buffer for OpenDoor() */
+  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
+}
+
+void DrawLevelEd(void)
 {
   int fade_mask = REDRAW_FIELD;
 
@@ -8275,10 +8542,9 @@ void DrawLevelEd()
   ClearField();
 
   InitZoomLevelSettings(-1);
+  InitDrawingElements();
   InitLevelSetInfo();
 
-  SetDoorState(DOOR_OPEN_1 | DOOR_OPEN_2);
-
 #if DEBUG
   CheckElementDescriptions();
 #endif
@@ -8302,28 +8568,6 @@ void DrawLevelEd()
     level_ypos = -1;
   }
 
-  /* needed for gadgets drawn on background (like palette scrollbar) */
-  SetDoorBackgroundImage(IMG_UNDEFINED);
-
-  /* copy default editor door content to main double buffer */
-  BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto,
-            graphic_info[IMG_BACKGROUND_PALETTE].src_x,
-            graphic_info[IMG_BACKGROUND_PALETTE].src_y,
-            MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width),
-            MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height),
-            DX, DY);
-
-  /* draw bigger door */
-  DrawSpecialEditorDoor();
-
-  /* draw new control window */
-  BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
-            graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
-            graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
-            MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width),
-            MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height),
-            EX, EY);
-
   // redraw_mask |= REDRAW_ALL;
 
   FreeLevelEditorGadgets();
@@ -8335,19 +8579,31 @@ void DrawLevelEd()
   InitElementPropertiesGfxElement();
 
   UnmapAllGadgets();
-  MapControlButtons();
 
-  DrawEditModeWindow();
+  DrawEditModeWindow_PlayfieldOnly();
 
   DrawMaskedBorder(fade_mask);
 
-  FadeIn(fade_mask);
+  // use door animation if door 1 viewport is unchanged and contains toolbox
+  if (useEditorDoorAnimation())
+  {
+    FadeIn(fade_mask);
 
-  /* copy actual editor door content to door double buffer for OpenDoor() */
-  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
+    DrawEditorDoorContent();
+
+    OpenDoor(DOOR_OPEN_1 | DOOR_FORCE_ANIM);
+  }
+  else
+  {
+    DrawEditorDoorContent();
+
+    FadeIn(fade_mask);
+  }
+
+  SetDoorState(DOOR_OPEN_1 | DOOR_OPEN_2);
 }
 
-static void AdjustDrawingAreaGadgets()
+static void AdjustDrawingAreaGadgets(void)
 {
   int ed_xsize = lev_fieldx + 2;
   int ed_ysize = lev_fieldy + 2;
@@ -8357,6 +8613,12 @@ static void AdjustDrawingAreaGadgets()
   boolean vertical_scrollbar_needed;
   int x, y, width, height;
 
+  if (suppressBorderElement())
+  {
+    ed_xsize = max_ed_fieldx;
+    ed_ysize = max_ed_fieldy;
+  }
+
   /* check if we need any scrollbars */
   horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
   vertical_scrollbar_needed   = (ed_ysize > max_ed_fieldy);
@@ -8417,7 +8679,7 @@ static void AdjustDrawingAreaGadgets()
               GDI_END);
 }
 
-static void AdjustLevelScrollPosition()
+static void AdjustLevelScrollPosition(void)
 {
   if (level_xpos < -1)
     level_xpos = -1;
@@ -8432,6 +8694,12 @@ static void AdjustLevelScrollPosition()
     level_ypos = lev_fieldy - ed_fieldy + 1;
   if (lev_fieldy < ed_fieldy - 2)
     level_ypos = -1;
+
+  if (suppressBorderElement())
+  {
+    level_xpos = 0;
+    level_ypos = 0;
+  }
 }
 
 static void AdjustEditorScrollbar(int id)
@@ -8459,7 +8727,7 @@ static void AdjustEditorScrollbar(int id)
               GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
-static void AdjustElementListScrollbar()
+static void AdjustElementListScrollbar(void)
 {
   struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL];
   int items_max, items_visible, item_position;
@@ -8543,7 +8811,7 @@ static void ModifyEditorDrawingArea(int drawingarea_id, int xsize, int ysize)
   ModifyGadget(gi, GDI_AREA_SIZE, xsize, ysize, GDI_END);
 }
 
-static void ModifyEditorElementList()
+static void ModifyEditorElementList(void)
 {
   int i;
 
@@ -8622,14 +8890,14 @@ static void PickDrawingElement(int button, int element)
   redraw_mask |= REDRAW_DOOR_1;
 }
 
-static void RedrawDrawingElements()
+static void RedrawDrawingElements(void)
 {
   PickDrawingElement(1, new_element1);
   PickDrawingElement(2, new_element2);
   PickDrawingElement(3, new_element3);
 }
 
-static void DrawDrawingWindow()
+static void DrawDrawingWindowExt(boolean remap_toolbox_gadgets)
 {
   stick_element_properties_window = FALSE;
 
@@ -8637,7 +8905,6 @@ static void DrawDrawingWindow()
   ClearField();
 
   UnmapLevelEditorFieldGadgets();
-  UnmapLevelEditorToolboxCustomGadgets();
 
   AdjustDrawingAreaGadgets();
   AdjustLevelScrollPosition();
@@ -8647,10 +8914,20 @@ static void DrawDrawingWindow()
   DrawEditorLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
   MapMainDrawingArea();
-  MapLevelEditorToolboxDrawingGadgets();
+
+  if (remap_toolbox_gadgets)
+  {
+    UnmapLevelEditorToolboxCustomGadgets();
+    MapLevelEditorToolboxDrawingGadgets();
+  }
 }
 
-static int getTabulatorBarWidth()
+static void DrawDrawingWindow(void)
+{
+  DrawDrawingWindowExt(TRUE);
+}
+
+static int getTabulatorBarWidth(void)
 {
   struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
   struct GadgetInfo *gd_gi4 = level_editor_gadget[GADGET_ID_PROPERTIES_CHANGE];
@@ -8658,18 +8935,25 @@ static int getTabulatorBarWidth()
   return gd_gi4->x - gd_gi1->x + gd_gi4->width;
 }
 
-static int getTabulatorBarHeight()
+static int getTabulatorBarHeight(void)
 {
   return ED_TAB_BAR_HEIGHT;
 }
 
-static void DrawLevelInfoTabulatorGadgets()
+static Pixel getTabulatorBarColor(void)
 {
   struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL];
   struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED];
   int gd_x = gd->x + gd_gi1->border.width / 2;
   int gd_y = gd->y + gd_gi1->height - 1;
-  Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
+
+  return GetPixel(gd->bitmap, gd_x, gd_y);
+}
+
+static void DrawLevelInfoTabulatorGadgets(void)
+{
+  struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_LEVELINFO_LEVEL];
+  Pixel tab_color = getTabulatorBarColor();
   int id_first = ED_TAB_BUTTON_ID_LEVELINFO_FIRST;
   int id_last  = ED_TAB_BUTTON_ID_LEVELINFO_LAST;
   int i;
@@ -8699,7 +8983,7 @@ static void DrawLevelInfoTabulatorGadgets()
                  getTabulatorBarWidth(), getTabulatorBarHeight(), tab_color);
 }
 
-static void DrawPropertiesTabulatorGadgets()
+static void DrawPropertiesTabulatorGadgets(void)
 {
   struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
   struct GadgetDesign *gd = &gd_gi1->alt_design[GD_BUTTON_UNPRESSED];
@@ -8767,7 +9051,7 @@ static int PrintElementDescriptionFromFile(char *filename, int font_nr,
                      TRUE, FALSE, FALSE);
 }
 
-static void DrawLevelInfoLevel()
+static void DrawLevelInfoLevel(void)
 {
   int i;
 
@@ -8796,7 +9080,7 @@ static char *getLevelSubdirFromSaveMode(int save_mode)
   return leveldir_current->subdir;
 }
 
-static void DrawLevelInfoLevelSet_DirectoryInfo()
+static void DrawLevelInfoLevelSet_DirectoryInfo(void)
 {
   char *directory_text = "Level set directory:";
   char *directory_name = getLevelSubdirFromSaveMode(levelset_save_mode);
@@ -8811,14 +9095,27 @@ static void DrawLevelInfoLevelSet_DirectoryInfo()
   PrintInfoText(directory_name, font2_nr, x, y);
 }
 
-static void DrawLevelInfoLevelSet()
+static void DrawLevelInfoLevelSet(void)
 {
+  boolean artwork_exists = checkIfCustomArtworkExistsForCurrentLevelSet();
+  boolean template_exists = fileExists(getLocalLevelTemplateFilename());
   int i;
 
   /* draw counter gadgets */
   for (i = ED_COUNTER_ID_LEVELSET_FIRST; i <= ED_COUNTER_ID_LEVELSET_LAST; i++)
     MapCounterButtons(i);
 
+  /* draw checkbutton gadgets */
+  for (i = ED_CHECKBUTTON_ID_LEVELSET_FIRST; i <= ED_CHECKBUTTON_ID_LEVELSET_LAST; i++)
+  {
+    if (levelset_save_mode == LEVELSET_SAVE_MODE_UPDATE ||
+       (i == ED_CHECKBUTTON_ID_USE_LEVELSET_ARTWORK && !artwork_exists) ||
+       (i == ED_CHECKBUTTON_ID_COPY_LEVEL_TEMPLATE  && !template_exists))
+      continue;
+
+    MapCheckbuttonGadget(i);
+  }
+
   /* draw selectbox gadgets */
   for (i = ED_SELECTBOX_ID_LEVELSET_FIRST; i <= ED_SELECTBOX_ID_LEVELSET_LAST; i++)
     MapSelectboxGadget(i);
@@ -8834,7 +9131,7 @@ static void DrawLevelInfoLevelSet()
   DrawLevelInfoLevelSet_DirectoryInfo();
 }
 
-static void DrawLevelInfoEditor()
+static void DrawLevelInfoEditor(void)
 {
   int i;
 
@@ -8857,7 +9154,7 @@ static void DrawLevelInfoEditor()
   MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_2);
 }
 
-static void DrawLevelInfoWindow()
+static void DrawLevelInfoWindow(void)
 {
   char *text = "Global Settings";
   int font_nr = FONT_TITLE_1;
@@ -8886,7 +9183,7 @@ static void DrawLevelInfoWindow()
     DrawLevelInfoEditor();
 }
 
-static void DrawCustomContentArea()
+static void DrawCustomContentArea(void)
 {
   int id = ED_DRAWING_ID_CUSTOM_CONTENT;
   struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id];
@@ -8903,7 +9200,7 @@ static void DrawCustomContentArea()
   MapDrawingArea(ED_DRAWING_ID_CUSTOM_CONTENT);
 }
 
-static void DrawCustomChangeContentArea()
+static void DrawCustomChangeContentArea(void)
 {
   int id = ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT;
   struct GadgetInfo *gi = level_editor_gadget[drawingarea_info[id].gadget_id];
@@ -8928,7 +9225,7 @@ static void RemoveElementContentArea(int id, int font_height)
                 ED_GADGET_TEXT_DISTANCE + font_height);
 }
 
-static void DrawYamYamContentAreas()
+static void DrawYamYamContentAreas(void)
 {
   int font_nr = FONT_TEXT_1;
   int font_height = getFontHeight(font_nr);
@@ -8963,7 +9260,7 @@ static void DrawYamYamContentAreas()
   DrawText(x, y + 2 * tilesize, "smashed", font_nr);
 }
 
-static void DrawMagicBallContentAreas()
+static void DrawMagicBallContentAreas(void)
 {
   int font_nr = FONT_TEXT_1;
   int font_height = getFontHeight(font_nr);
@@ -9102,7 +9399,7 @@ static void DrawEnvelopeTextArea(int envelope_nr)
   MapTextAreaGadget(ED_TEXTAREA_ID_ENVELOPE_INFO);
 }
 
-static void DrawPropertiesInfo()
+static void DrawPropertiesInfo(void)
 {
   static struct
   {
@@ -9425,7 +9722,7 @@ static boolean checkPropertiesConfig(int element)
   return FALSE;
 }
 
-static void SetAutomaticNumberOfGemsNeeded()
+static void SetAutomaticNumberOfGemsNeeded(void)
 {
   int x, y;
 
@@ -9450,7 +9747,7 @@ static void SetAutomaticNumberOfGemsNeeded()
   ModifyEditorCounterValue(ED_COUNTER_ID_LEVEL_GEMSLIMIT, level.gems_needed);
 }
 
-static void DrawPropertiesConfig()
+static void DrawPropertiesConfig(void)
 {
   boolean draw_footer_line = FALSE;
   int max_num_element_counters = 4;
@@ -9573,6 +9870,7 @@ static void DrawPropertiesConfig()
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_EXPLOSION_ELEMENT);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_GRAVITY);
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_CAN_PASS_TO_WALKABLE);
+      MapCheckbuttonGadget(ED_CHECKBUTTON_ID_SOLVED_BY_ONE_PLAYER);
 
       MapDrawingArea(ED_DRAWING_ID_START_ELEMENT);
       MapDrawingArea(ED_DRAWING_ID_ARTWORK_ELEMENT);
@@ -9633,6 +9931,10 @@ static void DrawPropertiesConfig()
   if (properties_element == EL_TIME_ORB_FULL)
     MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_TIME_ORB_BUG);
 
+  if (properties_element == EL_GAME_OF_LIFE ||
+      properties_element == EL_BIOMAZE)
+    MapCheckbuttonGadget(ED_CHECKBUTTON_ID_USE_LIFE_BUGS);
+
   if (CAN_GROW(properties_element))
   {
     checkbutton_info[ED_CHECKBUTTON_ID_GROW_INTO_DIGGABLE].y =
@@ -9792,7 +10094,7 @@ static void DrawPropertiesConfig()
   }
 }
 
-static void DrawPropertiesChangeDrawingAreas()
+static void DrawPropertiesChangeDrawingAreas(void)
 {
   if (IS_CUSTOM_ELEMENT(properties_element))
   {
@@ -9806,7 +10108,7 @@ static void DrawPropertiesChangeDrawingAreas()
   redraw_mask |= REDRAW_FIELD;
 }
 
-static void DrawPropertiesChange()
+static void DrawPropertiesChange(void)
 {
   int i;
 
@@ -9900,7 +10202,7 @@ static void DrawEditorElementName(int x, int y, int font_nr)
   }
 }
 
-static void DrawPropertiesWindow()
+static void DrawPropertiesWindow(void)
 {
   struct GraphicInfo *gd = &graphic_info[IMG_EDITOR_INPUT_TEXT];
   int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
@@ -9969,7 +10271,7 @@ static void DrawPropertiesWindow()
     DrawPropertiesConfig();
 }
 
-static void DrawPaletteWindow()
+static void DrawPaletteWindow(void)
 {
   int i;
 
@@ -9986,7 +10288,7 @@ static void DrawPaletteWindow()
   MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
 }
 
-static void UpdateCustomElementGraphicGadgets()
+static void UpdateCustomElementGraphicGadgets(void)
 {
   int i;
 
@@ -10967,10 +11269,10 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        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_POLARIZER_CROSS_1,
+       EL_MM_POLARIZER_CROSS_4,
+       EL_MM_POLARIZER_CROSS_3,
+       EL_MM_POLARIZER_CROSS_2
       },
       {
        EL_MM_PACMAN_UP,
@@ -11063,112 +11365,112 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        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_TELEPORTER_5,
+       EL_MM_TELEPORTER_4,
+       EL_MM_TELEPORTER_3,
+       EL_MM_TELEPORTER_2,
+       EL_MM_TELEPORTER_1,
+       EL_MM_TELEPORTER_16,
+       EL_MM_TELEPORTER_15,
+       EL_MM_TELEPORTER_14,
+       EL_MM_TELEPORTER_13,
+       EL_MM_TELEPORTER_12,
+       EL_MM_TELEPORTER_11,
+       EL_MM_TELEPORTER_10,
+       EL_MM_TELEPORTER_9,
+       EL_MM_TELEPORTER_8,
+       EL_MM_TELEPORTER_7,
+       EL_MM_TELEPORTER_6
       },
       {
-       EL_MM_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_TELEPORTER_RED_5,
+       EL_MM_TELEPORTER_RED_4,
+       EL_MM_TELEPORTER_RED_3,
+       EL_MM_TELEPORTER_RED_2,
+       EL_MM_TELEPORTER_RED_1,
+       EL_MM_TELEPORTER_RED_16,
+       EL_MM_TELEPORTER_RED_15,
+       EL_MM_TELEPORTER_RED_14,
+       EL_MM_TELEPORTER_RED_13,
+       EL_MM_TELEPORTER_RED_12,
+       EL_MM_TELEPORTER_RED_11,
+       EL_MM_TELEPORTER_RED_10,
+       EL_MM_TELEPORTER_RED_9,
+       EL_MM_TELEPORTER_RED_8,
+       EL_MM_TELEPORTER_RED_7,
+       EL_MM_TELEPORTER_RED_6
       },
       {
-       EL_MM_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_TELEPORTER_YELLOW_5,
+       EL_MM_TELEPORTER_YELLOW_4,
+       EL_MM_TELEPORTER_YELLOW_3,
+       EL_MM_TELEPORTER_YELLOW_2,
+       EL_MM_TELEPORTER_YELLOW_1,
+       EL_MM_TELEPORTER_YELLOW_16,
+       EL_MM_TELEPORTER_YELLOW_15,
+       EL_MM_TELEPORTER_YELLOW_14,
+       EL_MM_TELEPORTER_YELLOW_13,
+       EL_MM_TELEPORTER_YELLOW_12,
+       EL_MM_TELEPORTER_YELLOW_11,
+       EL_MM_TELEPORTER_YELLOW_10,
+       EL_MM_TELEPORTER_YELLOW_9,
+       EL_MM_TELEPORTER_YELLOW_8,
+       EL_MM_TELEPORTER_YELLOW_7,
+       EL_MM_TELEPORTER_YELLOW_6
       },
       {
-       EL_MM_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_TELEPORTER_GREEN_5,
+       EL_MM_TELEPORTER_GREEN_4,
+       EL_MM_TELEPORTER_GREEN_3,
+       EL_MM_TELEPORTER_GREEN_2,
+       EL_MM_TELEPORTER_GREEN_1,
+       EL_MM_TELEPORTER_GREEN_16,
+       EL_MM_TELEPORTER_GREEN_15,
+       EL_MM_TELEPORTER_GREEN_14,
+       EL_MM_TELEPORTER_GREEN_13,
+       EL_MM_TELEPORTER_GREEN_12,
+       EL_MM_TELEPORTER_GREEN_11,
+       EL_MM_TELEPORTER_GREEN_10,
+       EL_MM_TELEPORTER_GREEN_9,
+       EL_MM_TELEPORTER_GREEN_8,
+       EL_MM_TELEPORTER_GREEN_7,
+       EL_MM_TELEPORTER_GREEN_6
       },
       {
-       EL_MM_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_TELEPORTER_BLUE_5,
+       EL_MM_TELEPORTER_BLUE_4,
+       EL_MM_TELEPORTER_BLUE_3,
+       EL_MM_TELEPORTER_BLUE_2,
+       EL_MM_TELEPORTER_BLUE_1,
+       EL_MM_TELEPORTER_BLUE_16,
+       EL_MM_TELEPORTER_BLUE_15,
+       EL_MM_TELEPORTER_BLUE_14,
+       EL_MM_TELEPORTER_BLUE_13,
+       EL_MM_TELEPORTER_BLUE_12,
+       EL_MM_TELEPORTER_BLUE_11,
+       EL_MM_TELEPORTER_BLUE_10,
+       EL_MM_TELEPORTER_BLUE_9,
+       EL_MM_TELEPORTER_BLUE_8,
+       EL_MM_TELEPORTER_BLUE_7,
+       EL_MM_TELEPORTER_BLUE_6
       },
       {
-       EL_MM_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_MM_POLARIZER_1,
+       EL_MM_POLARIZER_16,
+       EL_MM_POLARIZER_15,
+       EL_MM_POLARIZER_14,
+       EL_MM_POLARIZER_13,
+       EL_MM_POLARIZER_12,
+       EL_MM_POLARIZER_11,
+       EL_MM_POLARIZER_10,
+       EL_MM_POLARIZER_9,
+       EL_MM_POLARIZER_8,
+       EL_MM_POLARIZER_7,
+       EL_MM_POLARIZER_6,
+       EL_MM_POLARIZER_5,
+       EL_MM_POLARIZER_4,
+       EL_MM_POLARIZER_3,
+       EL_MM_POLARIZER_2
       },
       {
        EL_DF_MIRROR_1,
@@ -11285,7 +11587,7 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
   last_y = y;
 }
 
-static void ResetIntelliDraw()
+static void ResetIntelliDraw(void)
 {
   int x, y;
 
@@ -11305,7 +11607,7 @@ static void SetDrawModeHiRes(int element)
      (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY));
 }
 
-static boolean getDrawModeHiRes()
+static boolean getDrawModeHiRes(void)
 {
   return draw_mode_hires;
 }
@@ -11742,17 +12044,17 @@ static void CopyBrushToCursor(int x, int y)
   CopyBrushExt(x, y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
 }
 
-static void DeleteBrushFromCursor()
+static void DeleteBrushFromCursor(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
 }
 
-void DumpBrush()
+void DumpBrush(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH);
 }
 
-void DumpBrush_Small()
+void DumpBrush_Small(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH_SMALL);
 }
@@ -12028,7 +12330,7 @@ static void RandomPlacement(int new_element)
   CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 }
 
-void WrapLevel(int dx, int dy)
+static void WrapLevel(int dx, int dy)
 {
   int wrap_dx = lev_fieldx - dx;
   int wrap_dy = lev_fieldy - dy;
@@ -12047,6 +12349,18 @@ void WrapLevel(int dx, int dy)
   CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
 }
 
+static void CopyLevelTemplateToUserLevelSet(char *levelset_subdir)
+{
+  char *template_filename_old = getLocalLevelTemplateFilename();
+  char *template_filename_new =
+    getPath2(getUserLevelDir(levelset_subdir), LEVELTEMPLATE_FILENAME);
+
+  if (copyFile(template_filename_old, template_filename_new) != 0)
+    Request("Cannot copy level template!", REQ_CONFIRM);
+
+  free(template_filename_new);
+}
+
 static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
   static boolean started_inside_drawing_area = FALSE;
@@ -12651,13 +12965,21 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
        Request("Updating level set failed!", REQ_CONFIRM);
       }
     }
-    else
+    else if (levelset_save_mode == LEVELSET_SAVE_MODE_CREATE)
     {
+      if (level.changed && !Request("Level has changed! Discard changes?",
+                                    REQ_ASK))
+       return;
+
       if (CreateUserLevelSet(levelset_subdir,
                             levelset_name,
                             levelset_author,
-                            levelset_num_levels))
+                            levelset_num_levels,
+                            levelset_use_levelset_artwork))
       {
+       if (levelset_copy_level_template)
+         CopyLevelTemplateToUserLevelSet(levelset_subdir);
+
        Request("New level set created!", REQ_CONFIRM);
 
        AddUserLevelSetToLevelInfo(levelset_subdir);
@@ -12878,8 +13200,11 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
   }
 
   /* 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) ||
+  if ((type_id >= ED_CHECKBUTTON_ID_LEVELSET_FIRST &&
+       type_id <= ED_CHECKBUTTON_ID_LEVELSET_LAST) ||
+      (type_id >= ED_CHECKBUTTON_ID_EDITOR_FIRST &&
+       type_id <= ED_CHECKBUTTON_ID_EDITOR_LAST &&
+       type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE_2) ||
       type_id == ED_CHECKBUTTON_ID_STICK_ELEMENT)
     return;
 
@@ -13127,7 +13452,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
     case GADGET_ID_ZOOM:
       // zoom level editor tile size in or out (or reset to default size)
       ed_tilesize = (button == 1 ? ed_tilesize * 2 :
-                    button == 2 ? DEFAULT_EDITOR_TILESIZE :
+                    button == 2 ? ed_tilesize_default :
                     button == 3 ? ed_tilesize / 2 : ed_tilesize);
 
       // limit zoom level by upper and lower bound
@@ -13574,7 +13899,7 @@ void HandleLevelEditorKeyInput(Key key)
   }
 }
 
-void HandleLevelEditorIdle()
+void HandleLevelEditorIdle(void)
 {
   int element_border = graphic_info[IMG_EDITOR_ELEMENT_BORDER].border_size;
   int x = editor.settings.element_graphic.x + element_border;
@@ -13604,7 +13929,7 @@ void HandleLevelEditorIdle()
   FrameCounter++;      /* increase animation frame counter */
 }
 
-static void ClearEditorGadgetInfoText()
+static void ClearEditorGadgetInfoText(void)
 {
   DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
@@ -13836,6 +14161,10 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed,
     /* draw normal door */
     UndrawSpecialEditorDoor();
 
+    // use door animation if door 1 viewport is unchanged and contains toolbox
+    if (useEditorDoorAnimation())
+      CloseDoor(DOOR_CLOSE_1 | DOOR_FORCE_ANIM);
+
     // close editor doors if viewport definition is the same as in main menu
     if (vp_door_1->x      == DX     &&
        vp_door_1->y      == DY     &&