rnd-20030807-1-src
[rocksndiamonds.git] / src / editor.c
index c235a7c6bf4d5d5ee045319d10b815392bf97089..87184cd88820a0be03ce083009a8f5b696f79bbe 100644 (file)
@@ -20,6 +20,7 @@
 #include "tools.h"
 #include "files.h"
 #include "game.h"
+#include "init.h"
 #include "tape.h"
 
 
@@ -69,7 +70,9 @@
 
 /* standard distances */
 #define ED_BORDER_SIZE                 3
-#define ED_BORDER2_SIZE                        5
+#define ED_BORDER_TEXT_XSIZE           5
+#define ED_BORDER_AREA_YSIZE           1
+
 #define ED_GADGET_DISTANCE             2
 #define ED_GADGET_TEXT_DISTANCE                (2 * ED_GADGET_DISTANCE)
 
 #define ED_AREA_ELEM_CONTENT_XPOS      ( 2 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT_YPOS      (22 * MINI_TILEY)
 
+/* yamyam content */
+#define ED_AREA_YAMYAM_CONTENT_XPOS(n) (ED_AREA_ELEM_CONTENT_XPOS + \
+                                        5 * (n % 4) * MINI_TILEX)
+#define ED_AREA_YAMYAM_CONTENT_YPOS(n) (ED_AREA_ELEM_CONTENT_YPOS + \
+                                        6 * (n / 4) * MINI_TILEY)
+
 /* custom change target */
 #define ED_AREA_ELEM_CONTENT2_XPOS     (20 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT2_YPOS     (ED_SETTINGS_YPOS(2) + \
 #define ED_AREA_ELEM_CONTENT4_YPOS     (ED_SETTINGS_YPOS(12) + \
                                         ED_GADGET_DISTANCE - MINI_TILEY)
 /* custom change trigger element */
-#define ED_AREA_ELEM_CONTENT5_XPOS     (30 * MINI_TILEX + MINI_TILEX / 2)
+#define ED_AREA_ELEM_CONTENT5_XPOS     (28 * MINI_TILEX)
 #define ED_AREA_ELEM_CONTENT5_YPOS     (ED_SETTINGS_YPOS(7) + \
                                         ED_GADGET_DISTANCE)
 /* extended custom change target */
 #define ED_SELECTBOX_XSIZE             ED_WIN_COUNT_XSIZE
 #define ED_SELECTBOX_YSIZE             ED_WIN_COUNT_YSIZE
 
+#define ED_SELECTBOX_BUTTON_XSIZE      14
+
 #define ED_TEXTBUTTON_XPOS             ED_WIN_COUNT_XPOS
 #define ED_TEXTBUTTON_YPOS             (ED_WIN_COUNT_YPOS + \
                                         4 * (2 + ED_WIN_COUNT_YSIZE))
 
 #define GADGET_ID_LEVEL_NAME           (GADGET_ID_TEXT_INPUT_FIRST + 0)
 #define GADGET_ID_LEVEL_AUTHOR         (GADGET_ID_TEXT_INPUT_FIRST + 1)
+#define GADGET_ID_ELEMENT_NAME         (GADGET_ID_TEXT_INPUT_FIRST + 2)
 
 /* selectbox identifiers */
-#define GADGET_ID_SELECTBOX_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 2)
+#define GADGET_ID_SELECTBOX_FIRST      (GADGET_ID_TEXT_INPUT_FIRST + 3)
 
 #define GADGET_ID_CUSTOM_WALK_TO_ACTION        (GADGET_ID_SELECTBOX_FIRST + 0)
 #define GADGET_ID_CUSTOM_CONSISTENCY   (GADGET_ID_SELECTBOX_FIRST + 1)
 #define GADGET_ID_CUSTOM_MOVE_DIRECTION        (GADGET_ID_SELECTBOX_FIRST + 4)
 #define GADGET_ID_CUSTOM_MOVE_STEPSIZE (GADGET_ID_SELECTBOX_FIRST + 5)
 #define GADGET_ID_CUSTOM_SMASH_TARGETS (GADGET_ID_SELECTBOX_FIRST + 6)
-#define GADGET_ID_CUSTOM_ACCESS_TYPE   (GADGET_ID_SELECTBOX_FIRST + 7)
-#define GADGET_ID_CUSTOM_ACCESS_LAYER  (GADGET_ID_SELECTBOX_FIRST + 8)
-#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 9)
-#define GADGET_ID_CHANGE_PLAYER_ACTION (GADGET_ID_SELECTBOX_FIRST + 10)
-#define GADGET_ID_CHANGE_COLLIDE_ACTION        (GADGET_ID_SELECTBOX_FIRST + 11)
-#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 12)
-#define GADGET_ID_CHANGE_POWER         (GADGET_ID_SELECTBOX_FIRST + 13)
+#define GADGET_ID_CUSTOM_SLIPPERY_TYPE (GADGET_ID_SELECTBOX_FIRST + 7)
+#define GADGET_ID_CUSTOM_ACCESS_TYPE   (GADGET_ID_SELECTBOX_FIRST + 8)
+#define GADGET_ID_CUSTOM_ACCESS_LAYER  (GADGET_ID_SELECTBOX_FIRST + 9)
+#define GADGET_ID_CHANGE_TIME_UNITS    (GADGET_ID_SELECTBOX_FIRST + 10)
+#define GADGET_ID_CHANGE_PLAYER_ACTION (GADGET_ID_SELECTBOX_FIRST + 11)
+#define GADGET_ID_CHANGE_COLLIDE_ACTION        (GADGET_ID_SELECTBOX_FIRST + 12)
+#define GADGET_ID_CHANGE_OTHER_ACTION  (GADGET_ID_SELECTBOX_FIRST + 13)
+#define GADGET_ID_CHANGE_POWER         (GADGET_ID_SELECTBOX_FIRST + 14)
 
 /* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 14)
+#define GADGET_ID_TEXTBUTTON_FIRST     (GADGET_ID_SELECTBOX_FIRST + 15)
 
 #define GADGET_ID_PROPERTIES_INFO      (GADGET_ID_TEXTBUTTON_FIRST + 0)
 #define GADGET_ID_PROPERTIES_CONFIG    (GADGET_ID_TEXTBUTTON_FIRST + 1)
 /* values for text input gadgets */
 #define ED_TEXTINPUT_ID_LEVEL_NAME     0
 #define ED_TEXTINPUT_ID_LEVEL_AUTHOR   1
+#define ED_TEXTINPUT_ID_ELEMENT_NAME   2
 
-#define ED_NUM_TEXTINPUT               2
+#define ED_NUM_TEXTINPUT               3
 
 #define ED_TEXTINPUT_ID_LEVEL_FIRST    ED_TEXTINPUT_ID_LEVEL_NAME
 #define ED_TEXTINPUT_ID_LEVEL_LAST     ED_TEXTINPUT_ID_LEVEL_AUTHOR
 
 /* values for selectbox gadgets */
-#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION  0
-#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY     1
-#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS      2
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE     0
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER    1
+#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION  2
 #define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN    3
 #define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION  4
 #define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE   5
 #define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS   6
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE     7
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER    8
-#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      9
-#define ED_SELECTBOX_ID_CHANGE_PLAYER_ACTION   10
-#define ED_SELECTBOX_ID_CHANGE_COLLIDE_ACTION  11
-#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    12
-#define ED_SELECTBOX_ID_CHANGE_POWER           13
+#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE   7
+#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS      8
+#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY     9
+#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS      10
+#define ED_SELECTBOX_ID_CHANGE_PLAYER_ACTION   11
+#define ED_SELECTBOX_ID_CHANGE_COLLIDE_ACTION  12
+#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION    13
+#define ED_SELECTBOX_ID_CHANGE_POWER           14
 
-#define ED_NUM_SELECTBOX                       14
+#define ED_NUM_SELECTBOX                       15
 
-#define ED_SELECTBOX_ID_CUSTOM_FIRST   ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
-#define ED_SELECTBOX_ID_CUSTOM_LAST    ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER
+#define ED_SELECTBOX_ID_CUSTOM_FIRST   ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE
+#define ED_SELECTBOX_ID_CUSTOM_LAST    ED_SELECTBOX_ID_CUSTOM_CONSISTENCY
 
 #define ED_SELECTBOX_ID_CHANGE_FIRST   ED_SELECTBOX_ID_CHANGE_TIME_UNITS
 #define ED_SELECTBOX_ID_CHANGE_LAST    ED_SELECTBOX_ID_CHANGE_POWER
 #define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED    2
 #define ED_CHECKBUTTON_ID_STICK_ELEMENT                3
 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS     4
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT        5
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  6
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 7
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        8
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        9
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                10
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      11
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      12
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     13
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      14
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    15
+#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE    5
+#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT        6
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE      7
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL      8
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH     9
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY      10
+#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY                11
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT        12
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE  13
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH 14
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT        15
 #define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC   16
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE  17
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    18
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   19
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 20
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 21
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    22
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY         23
-#define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER     24
-#define ED_CHECKBUTTON_ID_CHANGE_BY_COLLISION  25
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER      26
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE    17
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY         18
+#define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER     19
+#define ED_CHECKBUTTON_ID_CHANGE_BY_COLLISION  20
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER      21
+#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION 22
+#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT   23
+#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE 24
+#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM    25
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE  26
 
 #define ED_NUM_CHECKBUTTONS                    27
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST  ED_CHECKBUTTON_ID_DOUBLE_SPEED
 #define ED_CHECKBUTTON_ID_LEVEL_LAST   ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 
-#define ED_CHECKBUTTON_ID_CUSTOM_FIRST ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT
-#define ED_CHECKBUTTON_ID_CUSTOM_LAST  ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_FIRST ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_LAST  ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT
 
 #define ED_CHECKBUTTON_ID_CHANGE_FIRST ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC
-#define ED_CHECKBUTTON_ID_CHANGE_LAST  ED_CHECKBUTTON_ID_CHANGE_BY_OTHER
+#define ED_CHECKBUTTON_ID_CHANGE_LAST  ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE
 
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE   0
 #define ED_RADIOBUTTON_ID_LEVEL_FIRST  ED_RADIOBUTTON_ID_PERCENTAGE
 #define ED_RADIOBUTTON_ID_LEVEL_LAST   ED_RADIOBUTTON_ID_QUANTITY
 
+/* values for drawing area gadgets */
+#define ED_DRAWING_ID_DRAWING_LEVEL            0
+#define ED_DRAWING_ID_ELEMENT_CONTENT_0                1
+#define ED_DRAWING_ID_ELEMENT_CONTENT_1                2
+#define ED_DRAWING_ID_ELEMENT_CONTENT_2                3
+#define ED_DRAWING_ID_ELEMENT_CONTENT_3                4
+#define ED_DRAWING_ID_ELEMENT_CONTENT_4                5
+#define ED_DRAWING_ID_ELEMENT_CONTENT_5                6
+#define ED_DRAWING_ID_ELEMENT_CONTENT_6                7
+#define ED_DRAWING_ID_ELEMENT_CONTENT_7                8
+#define ED_DRAWING_ID_AMOEBA_CONTENT           9
+#define ED_DRAWING_ID_CUSTOM_GRAPHIC           10
+#define ED_DRAWING_ID_CUSTOM_CONTENT           11
+#define ED_DRAWING_ID_CUSTOM_CHANGE_TARGET     12
+#define ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT    13
+#define ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER    14
+#define ED_DRAWING_ID_RANDOM_BACKGROUND                15
+
+#define ED_NUM_DRAWING_AREAS                   16
+
 
 /*
   -----------------------------------------------------------------------------
@@ -697,6 +732,7 @@ static struct
   int min_value, max_value;
   int gadget_id_down, gadget_id_up;
   int gadget_id_text;
+  int gadget_id_align;
   int *value;
   char *text_above, *text_left, *text_right;
 } counterbutton_info[ED_NUM_COUNTERBUTTONS] =
@@ -707,7 +743,7 @@ static struct
     DX + 5 - SX,                       DY + 3 - SY,
     1,                                 100,
     GADGET_ID_SELECT_LEVEL_DOWN,       GADGET_ID_SELECT_LEVEL_UP,
-    GADGET_ID_SELECT_LEVEL_TEXT,
+    GADGET_ID_SELECT_LEVEL_TEXT,       GADGET_ID_NONE,
     &level_nr,
     NULL,                              NULL, NULL
   },
@@ -715,49 +751,49 @@ static struct
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(2),
     MIN_LEV_FIELDX,                    MAX_LEV_FIELDX,
     GADGET_ID_LEVEL_XSIZE_DOWN,                GADGET_ID_LEVEL_XSIZE_UP,
-    GADGET_ID_LEVEL_XSIZE_TEXT,
+    GADGET_ID_LEVEL_XSIZE_TEXT,                GADGET_ID_NONE,
     &level.fieldx,
-    "playfield size",                  NULL, "width",
+    "playfield size:",                 NULL, "width",
   },
   {
     ED_SETTINGS_XPOS(0) + 2 * DXSIZE,  ED_COUNTER_YPOS(2),
     MIN_LEV_FIELDY,                    MAX_LEV_FIELDY,
     GADGET_ID_LEVEL_YSIZE_DOWN,                GADGET_ID_LEVEL_YSIZE_UP,
-    GADGET_ID_LEVEL_YSIZE_TEXT,
+    GADGET_ID_LEVEL_YSIZE_TEXT,                GADGET_ID_LEVEL_XSIZE_UP,
     &level.fieldy,
-    NULL,                              NULL, "height",
+    NULL,                              " ", "height",
   },
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(3),
     0,                                 999,
     GADGET_ID_LEVEL_GEMSLIMIT_DOWN,    GADGET_ID_LEVEL_GEMSLIMIT_UP,
-    GADGET_ID_LEVEL_GEMSLIMIT_TEXT,
+    GADGET_ID_LEVEL_GEMSLIMIT_TEXT,    GADGET_ID_NONE,
     &level.gems_needed,
-    "number of emeralds to collect",   NULL, NULL
+    "number of emeralds to collect:",  NULL, NULL
   },
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(4),
     0,                                 999,
     GADGET_ID_LEVEL_TIMELIMIT_DOWN,    GADGET_ID_LEVEL_TIMELIMIT_UP,
-    GADGET_ID_LEVEL_TIMELIMIT_TEXT,
+    GADGET_ID_LEVEL_TIMELIMIT_TEXT,    GADGET_ID_NONE,
     &level.time,
-    "time available to solve level",   NULL, "(0 => no time limit)"
+    "time available to solve level:",  NULL, "(0 => no time limit)"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(5),
     0,                                 255,
     GADGET_ID_LEVEL_TIMESCORE_DOWN,    GADGET_ID_LEVEL_TIMESCORE_UP,
-    GADGET_ID_LEVEL_TIMESCORE_TEXT,
+    GADGET_ID_LEVEL_TIMESCORE_TEXT,    GADGET_ID_NONE,
     &level.score[SC_TIME_BONUS],
-    "score for each 10 seconds left",  NULL, NULL
+    "score for each 10 seconds left:", NULL, NULL
   },
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER2_YPOS(8),
     1,                                 100,
     GADGET_ID_LEVEL_RANDOM_DOWN,       GADGET_ID_LEVEL_RANDOM_UP,
-    GADGET_ID_LEVEL_RANDOM_TEXT,
+    GADGET_ID_LEVEL_RANDOM_TEXT,       GADGET_ID_NONE,
     &random_placement_value,
-    "random element placement",                NULL, "in"
+    "random element placement:",       NULL, "in"
   },
 
   /* ---------- element settings: configure (various elements) ------------- */
@@ -766,7 +802,7 @@ static struct
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(0),
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_ELEMENT_SCORE_DOWN,      GADGET_ID_ELEMENT_SCORE_UP,
-    GADGET_ID_ELEMENT_SCORE_TEXT,
+    GADGET_ID_ELEMENT_SCORE_TEXT,      GADGET_ID_NONE,
     NULL,                              /* will be set when used */
     NULL,                              NULL, NULL
   },
@@ -774,7 +810,7 @@ static struct
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(6),
     MIN_ELEMENT_CONTENTS,              MAX_ELEMENT_CONTENTS,
     GADGET_ID_ELEMENT_CONTENT_DOWN,    GADGET_ID_ELEMENT_CONTENT_UP,
-    GADGET_ID_ELEMENT_CONTENT_TEXT,
+    GADGET_ID_ELEMENT_CONTENT_TEXT,    GADGET_ID_NONE,
     &level.num_yamyam_contents,
     NULL,                              NULL, "number of content areas"
   },
@@ -785,7 +821,7 @@ static struct
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(3),
     MIN_SCORE,                         MAX_SCORE,
     GADGET_ID_CUSTOM_SCORE_DOWN,       GADGET_ID_CUSTOM_SCORE_UP,
-    GADGET_ID_CUSTOM_SCORE_TEXT,
+    GADGET_ID_CUSTOM_SCORE_TEXT,       GADGET_ID_NONE,
     &custom_element.score,
     NULL,                              "collect score", NULL
   },
@@ -793,7 +829,7 @@ static struct
     ED_SETTINGS_XPOS(13) + 10,         ED_SETTINGS_YPOS(3),
     MIN_GEM_COUNT,                     MAX_GEM_COUNT,
     GADGET_ID_CUSTOM_GEMCOUNT_DOWN,    GADGET_ID_CUSTOM_GEMCOUNT_UP,
-    GADGET_ID_CUSTOM_GEMCOUNT_TEXT,
+    GADGET_ID_CUSTOM_GEMCOUNT_TEXT,    GADGET_ID_CUSTOM_SCORE_UP,
     &custom_element.gem_count,
     NULL,                              "gems", NULL
   },
@@ -801,7 +837,7 @@ static struct
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(4),
     0,                                 999,
     GADGET_ID_PUSH_DELAY_FIX_DOWN,     GADGET_ID_PUSH_DELAY_FIX_UP,
-    GADGET_ID_PUSH_DELAY_FIX_TEXT,
+    GADGET_ID_PUSH_DELAY_FIX_TEXT,     GADGET_ID_NONE,
     &custom_element.push_delay_fixed,
     NULL,                              "push delay", NULL
   },
@@ -809,7 +845,7 @@ static struct
     ED_COUNT_PUSH_DELAY_RND_XPOS,      ED_SETTINGS_YPOS(4),
     0,                                 999,
     GADGET_ID_PUSH_DELAY_RND_DOWN,     GADGET_ID_PUSH_DELAY_RND_UP,
-    GADGET_ID_PUSH_DELAY_RND_TEXT,
+    GADGET_ID_PUSH_DELAY_RND_TEXT,     GADGET_ID_PUSH_DELAY_FIX_UP,
     &custom_element.push_delay_random,
     NULL,                              "+random", NULL
   },
@@ -817,7 +853,7 @@ static struct
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(7),
     0,                                 999,
     GADGET_ID_MOVE_DELAY_FIX_DOWN,     GADGET_ID_MOVE_DELAY_FIX_UP,
-    GADGET_ID_MOVE_DELAY_FIX_TEXT,
+    GADGET_ID_MOVE_DELAY_FIX_TEXT,     GADGET_ID_NONE,
     &custom_element.move_delay_fixed,
     NULL,                              "move delay", NULL
   },
@@ -825,7 +861,7 @@ static struct
     ED_COUNT_MOVE_DELAY_RND_XPOS,      ED_SETTINGS_YPOS(7),
     0,                                 999,
     GADGET_ID_MOVE_DELAY_RND_DOWN,     GADGET_ID_MOVE_DELAY_RND_UP,
-    GADGET_ID_MOVE_DELAY_RND_TEXT,
+    GADGET_ID_MOVE_DELAY_RND_TEXT,     GADGET_ID_MOVE_DELAY_FIX_UP,
     &custom_element.move_delay_random,
     NULL,                              "+random", NULL
   },
@@ -836,15 +872,15 @@ static struct
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(3),
     0,                                 999,
     GADGET_ID_CHANGE_DELAY_FIX_DOWN,   GADGET_ID_CHANGE_DELAY_FIX_UP,
-    GADGET_ID_CHANGE_DELAY_FIX_TEXT,
+    GADGET_ID_CHANGE_DELAY_FIX_TEXT,   GADGET_ID_NONE,
     &custom_element.change.delay_fixed,
     NULL,                              "delay", NULL,
   },
   {
-    ED_COUNT_CHANGE_DELAY_RND_XPOS,    ED_SETTINGS_YPOS(3),
+    ED_COUNT_CHANGE_DELAY_RND_XPOS+20, ED_SETTINGS_YPOS(3),
     0,                                 999,
     GADGET_ID_CHANGE_DELAY_RND_DOWN,   GADGET_ID_CHANGE_DELAY_RND_UP,
-    GADGET_ID_CHANGE_DELAY_RND_TEXT,
+    GADGET_ID_CHANGE_DELAY_RND_TEXT,   GADGET_ID_CHANGE_DELAY_FIX_UP,
     &custom_element.change.delay_random,
     NULL,                              "+random", NULL
   },
@@ -852,9 +888,9 @@ static struct
     ED_SETTINGS_XPOS(3),               ED_SETTINGS_YPOS(12),
     0,                                 100,
     GADGET_ID_CHANGE_CONT_RND_DOWN,    GADGET_ID_CHANGE_CONT_RND_UP,
-    GADGET_ID_CHANGE_CONT_RND_TEXT,
+    GADGET_ID_CHANGE_CONT_RND_TEXT,    GADGET_ID_NONE,
     &custom_element.change.random,
-    NULL,                              "use random change:", NULL
+    NULL,                              "use random change:", "(%)"
   },
 };
 
@@ -880,6 +916,13 @@ static struct
     MAX_LEVEL_AUTHOR_LEN,
     level.author,
     "Author"
+  },
+  {
+    5 * MINI_TILEX,                    5 * MINI_TILEY - ED_BORDER_SIZE,
+    GADGET_ID_ELEMENT_NAME,
+    MAX_ELEMENT_NAME_LEN - 2,          /* currently 2 chars less editable */
+    custom_element.description,
+    NULL
   }
 };
 
@@ -889,7 +932,6 @@ static struct ValueTextInfo options_access_type[] =
   { EP_PASSABLE,               "pass"                          },
   { -1,                                NULL                            }
 };
-static int value_access_type = 0;
 
 static struct ValueTextInfo options_access_layer[] =
 {
@@ -898,7 +940,6 @@ static struct ValueTextInfo options_access_layer[] =
   { EP_ACCESSIBLE_UNDER,       "under"                         },
   { -1,                                NULL                            }
 };
-static int value_access_layer = 0;
 
 static struct ValueTextInfo options_walk_to_action[] =
 {
@@ -907,7 +948,6 @@ static struct ValueTextInfo options_walk_to_action[] =
   { EP_PUSHABLE,               "pushable"                      },
   { -1,                                NULL                            }
 };
-static int value_walk_to_action = 0;
 
 static struct ValueTextInfo options_move_pattern[] =
 {
@@ -950,11 +990,22 @@ static struct ValueTextInfo options_move_stepsize[] =
 static struct ValueTextInfo options_smash_targets[] =
 {
   { EP_CAN_SMASH_PLAYER,       "player"                        },
+#if 0
   { EP_CAN_SMASH_ENEMIES,      "enemies"                       },
+#endif
   { EP_CAN_SMASH_EVERYTHING,   "everything"                    },
   { -1,                                NULL                            }
 };
-static int value_smash_targets = 0;
+
+static struct ValueTextInfo options_slippery_type[] =
+{
+  { SLIPPERY_ANY_RANDOM,       "random"                        },
+  { SLIPPERY_ANY_LEFT_RIGHT,   "left, right"                   },
+  { SLIPPERY_ANY_RIGHT_LEFT,   "right, left"                   },
+  { SLIPPERY_ONLY_LEFT,                "only left"                     },
+  { SLIPPERY_ONLY_RIGHT,       "only right"                    },
+  { -1,                                NULL                            }
+};
 
 static struct ValueTextInfo options_deadliness[] =
 {
@@ -963,7 +1014,6 @@ static struct ValueTextInfo options_deadliness[] =
   { EP_DONT_TOUCH,             "touching"                      },
   { -1,                                NULL                            }
 };
-static int value_deadliness = 0;
 
 static struct ValueTextInfo options_consistency[] =
 {
@@ -971,7 +1021,6 @@ static struct ValueTextInfo options_consistency[] =
   { EP_INDESTRUCTIBLE,         "indestructible"                },
   { -1,                                NULL                            }
 };
-static int value_consistency = 0;
 
 static struct ValueTextInfo options_time_units[] =
 {
@@ -987,7 +1036,6 @@ static struct ValueTextInfo options_change_player_action[] =
   { CE_PUSHED_BY_PLAYER,       "pushed"                        },
   { -1,                                NULL                            }
 };
-static int value_change_player_action = 0;
 
 static struct ValueTextInfo options_change_collide_action[] =
 {
@@ -996,19 +1044,18 @@ static struct ValueTextInfo options_change_collide_action[] =
   { CE_SMASHED,                        "when smashed"                  },
   { -1,                                NULL                            }
 };
-static int value_change_collide_action = 0;
 
 static struct ValueTextInfo options_change_other_action[] =
 {
-  { CE_OTHER_COLLECTING,       "collecting"                    },
-  { CE_OTHER_TOUCHING,         "touching"                      },
-  { CE_OTHER_PRESSING,         "pressing"                      },
-  { CE_OTHER_PUSHING,          "pushing"                       },
-  { CE_OTHER_CHANGING,         "change of"                     },
-  { CE_OTHER_EXPLODING,                "explosion of"                  },
-  { -1,                                NULL                            }
+  { CE_OTHER_IS_TOUCHING,              "touching"                      },
+  { CE_OTHER_IS_CHANGING,              "change of"                     },
+  { CE_OTHER_IS_EXPLODING,             "explosion of"                  },
+  { CE_OTHER_GETS_TOUCHED,             "player touches"                },
+  { CE_OTHER_GETS_PRESSED,             "player presses"                },
+  { CE_OTHER_GETS_PUSHED,              "player pushes"                 },
+  { CE_OTHER_GETS_COLLECTED,           "player collects"               },
+  { -1,                                NULL                                    }
 };
-static int value_change_other_action = 0;
 
 static struct ValueTextInfo options_change_power[] =
 {
@@ -1022,6 +1069,7 @@ static struct
 {
   int x, y;
   int gadget_id;
+  int gadget_id_align;
   int size;    /* char size of selectbox or '-1' (dynamically determined) */
   struct ValueTextInfo *options;
   int *value;
@@ -1032,31 +1080,31 @@ static struct
 
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(1),
-    GADGET_ID_CUSTOM_ACCESS_TYPE,
+    GADGET_ID_CUSTOM_ACCESS_TYPE,      GADGET_ID_NONE,
     -1,
     options_access_type,
-    &value_access_type,
+    &custom_element.access_type,
     "player can", NULL, "type of access to this field"
   },
   {
     ED_SETTINGS_XPOS(11),              ED_SETTINGS_YPOS(1),
-    GADGET_ID_CUSTOM_ACCESS_LAYER,
+    GADGET_ID_CUSTOM_ACCESS_LAYER,     GADGET_ID_CUSTOM_ACCESS_TYPE,
     -1,
     options_access_layer,
-    &value_access_layer,
+    &custom_element.access_layer,
     NULL, NULL, "layer of access for this field"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(2),
-    GADGET_ID_CUSTOM_WALK_TO_ACTION,
+    GADGET_ID_CUSTOM_WALK_TO_ACTION,   GADGET_ID_NONE,
     -1,
     options_walk_to_action,
-    &value_walk_to_action,
+    &custom_element.walk_to_action,
     NULL, NULL, "diggable/collectible/pushable"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(5),
-    GADGET_ID_CUSTOM_MOVE_PATTERN,
+    GADGET_ID_CUSTOM_MOVE_PATTERN,     GADGET_ID_NONE,
     -1,
     options_move_pattern,
     &custom_element.move_pattern,
@@ -1064,7 +1112,7 @@ static struct
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(6),
-    GADGET_ID_CUSTOM_MOVE_DIRECTION,
+    GADGET_ID_CUSTOM_MOVE_DIRECTION,   GADGET_ID_NONE,
     -1,
     options_move_direction,
     &custom_element.move_direction_initial,
@@ -1072,7 +1120,7 @@ static struct
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(8),
-    GADGET_ID_CUSTOM_MOVE_STEPSIZE,
+    GADGET_ID_CUSTOM_MOVE_STEPSIZE,    GADGET_ID_NONE,
     -1,
     options_move_stepsize,
     &custom_element.move_stepsize,
@@ -1080,26 +1128,34 @@ static struct
   },
   {
     ED_SETTINGS_XPOS(7),               ED_SETTINGS_YPOS(9),
-    GADGET_ID_CUSTOM_SMASH_TARGETS,
+    GADGET_ID_CUSTOM_SMASH_TARGETS,    GADGET_ID_CUSTOM_CAN_SMASH,
     -1,
     options_smash_targets,
-    &value_smash_targets,
+    &custom_element.smash_targets,
     "can smash", NULL, "elements that can be smashed"
   },
+  {
+    ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(10),
+    GADGET_ID_CUSTOM_SLIPPERY_TYPE,    GADGET_ID_NONE,
+    -1,
+    options_slippery_type,
+    &custom_element.slippery_type,
+    "slippery", NULL, "where other elements fall down"
+  },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(11),
-    GADGET_ID_CUSTOM_DEADLINESS,
+    GADGET_ID_CUSTOM_DEADLINESS,       GADGET_ID_NONE,
     -1,
     options_deadliness,
-    &value_deadliness,
+    &custom_element.deadliness,
     "deadly when", NULL, "deadliness of element"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(12),
-    GADGET_ID_CUSTOM_CONSISTENCY,
+    GADGET_ID_CUSTOM_CONSISTENCY,      GADGET_ID_NONE,
     -1,
     options_consistency,
-    &value_consistency,
+    &custom_element.consistency,
     NULL, "explodes to:", "consistency/destructibility"
   },
 
@@ -1107,7 +1163,7 @@ static struct
 
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(4),
-    GADGET_ID_CHANGE_TIME_UNITS,
+    GADGET_ID_CHANGE_TIME_UNITS,       GADGET_ID_NONE,
     -1,
     options_time_units,
     &custom_element.change.delay_frames,
@@ -1115,31 +1171,31 @@ static struct
   },
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(5),
-    GADGET_ID_CHANGE_PLAYER_ACTION,
+    GADGET_ID_CHANGE_PLAYER_ACTION,    GADGET_ID_NONE,
     -1,
     options_change_player_action,
-    &value_change_player_action,
+    &custom_element.change_player_action,
     NULL, "by player", "type of player contact"
   },
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(6),
-    GADGET_ID_CHANGE_COLLIDE_ACTION,
+    GADGET_ID_CHANGE_COLLIDE_ACTION,   GADGET_ID_NONE,
     -1,
     options_change_collide_action,
-    &value_change_collide_action,
+    &custom_element.change_collide_action,
     NULL, NULL, "change after impact or smash"
   },
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(7),
-    GADGET_ID_CHANGE_OTHER_ACTION,
+    GADGET_ID_CHANGE_OTHER_ACTION,     GADGET_ID_NONE,
     -1,
     options_change_other_action,
-    &value_change_other_action,
-    NULL, "other element:", "type of other element action"
+    &custom_element.change_other_action,
+    NULL, "element:", "type of other element action"
   },
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(10),
-    GADGET_ID_CHANGE_POWER,
+    GADGET_ID_CHANGE_POWER,            GADGET_ID_NONE,
     -1,
     options_change_power,
     &custom_element.change.power,
@@ -1151,28 +1207,29 @@ static struct
 {
   int x, y;
   int gadget_id;
+  int gadget_id_align;
   int size;
   char *text, *infotext;
 } textbutton_info[ED_NUM_TEXTBUTTON] =
 {
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(1),
-    GADGET_ID_PROPERTIES_INFO,
+    GADGET_ID_PROPERTIES_INFO,         GADGET_ID_NONE,
     11, "Information",                 "Show information about element"
   },
   {
     ED_SETTINGS_XPOS(0) + 166,         ED_COUNTER_YPOS(1),
-    GADGET_ID_PROPERTIES_CONFIG,
+    GADGET_ID_PROPERTIES_CONFIG,       GADGET_ID_NONE,
     11, "Configure",                   "Configure element properties"
   },
   {
     ED_SETTINGS_XPOS(0) + 332,         ED_COUNTER_YPOS(1),
-    GADGET_ID_PROPERTIES_ADVANCED,
+    GADGET_ID_PROPERTIES_ADVANCED,     GADGET_ID_NONE,
     11, "Advanced",                    "Advanced element configuration"
   },
   {
     ED_SETTINGS_XPOS(0) + 262,         ED_SETTINGS_YPOS(13),
-    GADGET_ID_SAVE_AS_TEMPLATE,
+    GADGET_ID_SAVE_AS_TEMPLATE,                GADGET_ID_CUSTOM_USE_TEMPLATE,
     -1, "Save as template",            "Save current settings as new template"
   },
 };
@@ -1263,25 +1320,26 @@ static struct
 {
   int x, y;
   int gadget_id;
+  int gadget_id_align;
   int radio_button_nr;
   int *value;
   int checked_value;
-  char *text_right, *infotext;
+  char *text_left, *text_right, *infotext;
 } radiobutton_info[ED_NUM_RADIOBUTTONS] =
 {
   {
     ED_SETTINGS_XPOS(0) + 160,         ED_COUNTER2_YPOS(8),
-    GADGET_ID_RANDOM_PERCENTAGE,
+    GADGET_ID_RANDOM_PERCENTAGE,       GADGET_ID_LEVEL_RANDOM_UP,
     RADIO_NR_RANDOM_ELEMENTS,
     &random_placement_method,          RANDOM_USE_PERCENTAGE,
-    "percentage",                      "use percentage for random elements"
+    " ", "percentage",                 "use percentage for random elements"
   },
   {
     ED_SETTINGS_XPOS(0) + 340,         ED_COUNTER2_YPOS(8),
-    GADGET_ID_RANDOM_QUANTITY,
+    GADGET_ID_RANDOM_QUANTITY,         GADGET_ID_RANDOM_PERCENTAGE,
     RADIO_NR_RANDOM_ELEMENTS,
     &random_placement_method,          RANDOM_USE_QUANTITY,
-    "quantity",                                "use quantity for random elements"
+    " ", "quantity",                   "use quantity for random elements"
   }
 };
 
@@ -1289,43 +1347,47 @@ static struct
 {
   int x, y;
   int gadget_id;
+  int gadget_id_align;
   boolean *value;
-  char *text_right, *infotext;
+  char *text_left, *text_right, *infotext;
 } checkbutton_info[ED_NUM_CHECKBUTTONS] =
 {
   /* ---------- level and editor settings ---------------------------------- */
 
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(6) - MINI_TILEY,
-    GADGET_ID_DOUBLE_SPEED,
+    GADGET_ID_DOUBLE_SPEED,            GADGET_ID_NONE,
     &level.double_speed,
-    "double speed movement",           "set movement speed of player"
+    NULL, "double speed movement",     "set movement speed of player"
   },
   {
     ED_SETTINGS_XPOS(0) + 340,         ED_COUNTER_YPOS(6) - MINI_TILEY,
-    GADGET_ID_GRAVITY,
-    &level.gravity,
-    "gravity",                         "set level gravity"
+    GADGET_ID_GRAVITY,                 GADGET_ID_DOUBLE_SPEED,
+    &level.initial_gravity,
+    " ", "gravity",                    "set level gravity"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER2_YPOS(9) - MINI_TILEY,
-    GADGET_ID_RANDOM_RESTRICTED,
+    GADGET_ID_RANDOM_RESTRICTED,       GADGET_ID_NONE,
     &random_placement_background_restricted,
-    "restrict random placement to",    "set random placement restriction"
+    NULL,
+    "restrict random placement to:",   "set random placement restriction"
   },
 
   /* ---------- element settings: configure (various elements) ------------- */
 
   {
     ED_SETTINGS_XPOS(0),               0,      /* set at runtime */
-    GADGET_ID_STICK_ELEMENT,
+    GADGET_ID_STICK_ELEMENT,           GADGET_ID_NONE,
     &stick_element_properties_window,
+    NULL,
     "stick this screen to edit content","stick this screen to edit content"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_COUNTER_YPOS(4),
-    GADGET_ID_EM_SLIPPERY_GEMS,
+    GADGET_ID_EM_SLIPPERY_GEMS,                GADGET_ID_NONE,
     &level.em_slippery_gems,
+    NULL,
     "slip down from certain flat walls","use EM style slipping behaviour"
   },
 
@@ -1333,138 +1395,271 @@ static struct
 
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(1),
-    GADGET_ID_CUSTOM_ACCESSIBLE,
+    GADGET_ID_CUSTOM_ACCESSIBLE,       GADGET_ID_NONE,
     &custom_element_properties[EP_ACCESSIBLE],
-    NULL,                              "player can walk to or pass this field"
+    NULL, NULL,                                "player can walk to or pass this field"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(2),
-    GADGET_ID_CUSTOM_WALK_TO_OBJECT,
+    GADGET_ID_CUSTOM_WALK_TO_OBJECT,   GADGET_ID_NONE,
     &custom_element_properties[EP_WALK_TO_OBJECT],
-    NULL,                              "player can dig/collect/push element"
+    NULL, NULL,                                "player can dig/collect/push element"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(5),
-    GADGET_ID_CUSTOM_CAN_MOVE,
+    GADGET_ID_CUSTOM_CAN_MOVE,         GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_MOVE],
-    NULL,                              "element can move in some direction"
+    NULL, NULL,                                "element can move in some direction"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(9),
-    GADGET_ID_CUSTOM_CAN_FALL,
+    GADGET_ID_CUSTOM_CAN_FALL,         GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_FALL],
-    "can fall",                                "element can fall down"
+    NULL, "can fall",                  "element can fall down"
   },
   {
     ED_SETTINGS_XPOS(6),               ED_SETTINGS_YPOS(9),
-    GADGET_ID_CUSTOM_CAN_SMASH,
+    GADGET_ID_CUSTOM_CAN_SMASH,                GADGET_ID_CUSTOM_CAN_FALL,
     &custom_element_properties[EP_CAN_SMASH],
-    NULL,                              "element can smash other elements"
+    " ", NULL,                         "element can smash other elements"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(10),
-    GADGET_ID_CUSTOM_SLIPPERY,
+    GADGET_ID_CUSTOM_SLIPPERY,         GADGET_ID_NONE,
     &custom_element_properties[EP_SLIPPERY],
-    "slippery",                                "other elements can fall down from it"
+    NULL, NULL,                                "other elements can fall down from it"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(11),
-    GADGET_ID_CUSTOM_DEADLY,
+    GADGET_ID_CUSTOM_DEADLY,           GADGET_ID_NONE,
     &custom_element_properties[EP_DEADLY],
-    NULL,                              "element can kill the player"
+    NULL, NULL,                                "element can kill the player"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(12),
-    GADGET_ID_CUSTOM_EXPLODE_RESULT,
+    GADGET_ID_CUSTOM_EXPLODE_RESULT,   GADGET_ID_NONE,
     &custom_element_properties[EP_EXPLODE_RESULT],
-    NULL,                              "set consistency/destructibility"
+    NULL, NULL,                                "set consistency/destructibility"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(13),
-    GADGET_ID_CUSTOM_EXPLODE_FIRE,
-    &custom_element_properties[EP_CAN_EXPLODE_BY_FIRE],
-    "by fire",                         "element can explode by fire/explosion"
+    GADGET_ID_CUSTOM_EXPLODE_FIRE,     GADGET_ID_NONE,
+    &custom_element.can_explode_by_fire,
+    NULL, "by fire",                   "element can explode by fire/explosion"
   },
   {
     ED_SETTINGS_XPOS(7),               ED_SETTINGS_YPOS(13),
-    GADGET_ID_CUSTOM_EXPLODE_SMASH,
-    &custom_element_properties[EP_CAN_EXPLODE_SMASHED],
-    "smashed",                         "element can explode when smashed"
+    GADGET_ID_CUSTOM_EXPLODE_SMASH,    GADGET_ID_CUSTOM_EXPLODE_FIRE,
+    &custom_element.can_explode_smashed,
+    " ", "smashed",                    "element can explode when smashed"
   },
   {
     ED_SETTINGS_XPOS(13),              ED_SETTINGS_YPOS(13),
-    GADGET_ID_CUSTOM_EXPLODE_IMPACT,
-    &custom_element_properties[EP_CAN_EXPLODE_IMPACT],
-    "impact",                          "element can explode on impact"
+    GADGET_ID_CUSTOM_EXPLODE_IMPACT,   GADGET_ID_CUSTOM_EXPLODE_SMASH,
+    &custom_element.can_explode_impact,
+    " ", "impact",                     "element can explode on impact"
   },
 
   /* ---------- element settings: advanced (custom elements) --------------- */
 
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(1),
-    GADGET_ID_CUSTOM_USE_GRAPHIC,
+    GADGET_ID_CUSTOM_USE_GRAPHIC,      GADGET_ID_NONE,
     &custom_element.use_gfx_element,
-    "use graphic of element:",         "use graphic for custom element"
+    NULL, "use graphic of element:",   "use graphic for custom element"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(2),
-    GADGET_ID_CUSTOM_CAN_CHANGE,
+    GADGET_ID_CUSTOM_CAN_CHANGE,       GADGET_ID_NONE,
     &custom_element_properties[EP_CAN_CHANGE],
-    "element changes to    after/when:","element can change to other element"
+    NULL, "element changes to:",       "element can change to other element"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(3),
-    GADGET_ID_CHANGE_DELAY,
+    GADGET_ID_CHANGE_DELAY,            GADGET_ID_NONE,
     &custom_element_change_events[CE_DELAY],
-    NULL,                              "element changes after delay"
+    NULL, NULL,                                "element changes after delay"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(5),
-    GADGET_ID_CHANGE_BY_PLAYER,
+    GADGET_ID_CHANGE_BY_PLAYER,                GADGET_ID_NONE,
     &custom_element_change_events[CE_BY_PLAYER],
-    NULL,                              "element changes by player contact"
+    NULL, NULL,                                "element changes by player contact"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(6),
-    GADGET_ID_CHANGE_BY_COLLISION,
+    GADGET_ID_CHANGE_BY_COLLISION,     GADGET_ID_NONE,
     &custom_element_change_events[CE_BY_COLLISION],
-    NULL,                              "element changes by impact or smash"
+    NULL, NULL,                                "element changes by impact or smash"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(7),
-    GADGET_ID_CHANGE_BY_OTHER,
+    GADGET_ID_CHANGE_BY_OTHER,         GADGET_ID_NONE,
     &custom_element_change_events[CE_BY_OTHER],
-    NULL,                              "element changes by other element"
+    NULL, NULL,                                "element changes by other element"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(8),
-    GADGET_ID_CHANGE_USE_EXPLOSION,
+    GADGET_ID_CHANGE_USE_EXPLOSION,    GADGET_ID_NONE,
     &custom_element.change.explode,
-    "explode instead of change",       "element explodes instead of change"
+    NULL, "explode instead of change", "element explodes instead of change"
   },
   {
     ED_SETTINGS_XPOS(1),               ED_SETTINGS_YPOS(9),
-    GADGET_ID_CHANGE_USE_CONTENT,
+    GADGET_ID_CHANGE_USE_CONTENT,      GADGET_ID_NONE,
     &custom_element.change.use_content,
-    "use extended change target:",     "element changes to more elements"
+    NULL, "use extended change target:","element changes to more elements"
   },
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(11),
-    GADGET_ID_CHANGE_ONLY_COMPLETE,
+    GADGET_ID_CHANGE_ONLY_COMPLETE,    GADGET_ID_NONE,
     &custom_element.change.only_complete,
-    "only use complete change",                "only use complete extended content"
+    NULL, "only use complete change",  "only use complete extended content"
   },
   {
     ED_SETTINGS_XPOS(2),               ED_SETTINGS_YPOS(12),
-    GADGET_ID_CHANGE_USE_RANDOM,
+    GADGET_ID_CHANGE_USE_RANDOM,       GADGET_ID_NONE,
     &custom_element.change.use_random_change,
-    NULL,                              "use random value for new content"
+    NULL, NULL,                                "use random value for new content"
   },
   {
     ED_SETTINGS_XPOS(0),               ED_SETTINGS_YPOS(13),
-    GADGET_ID_CUSTOM_USE_TEMPLATE,
-    &custom_element.use_template,
-    "use template",                    "use template for custom properties"
+    GADGET_ID_CUSTOM_USE_TEMPLATE,     GADGET_ID_NONE,
+    &level.use_custom_template,
+    NULL, "use template",              "use template for custom properties"
+  },
+};
+
+static struct
+{
+  int x, y;
+  int area_xsize, area_ysize;
+  int gadget_id;
+  int gadget_id_align;
+  char *text_left, *text_right;
+} drawingarea_info[ED_NUM_DRAWING_AREAS] =
+{
+  /* ---------- level playfield content ------------------------------------ */
+
+  {
+    0, 0,
+    MAX_ED_FIELDX, MAX_ED_FIELDY,
+    GADGET_ID_DRAWING_LEVEL,           GADGET_ID_NONE,
+    NULL, NULL
+  },
+
+  /* ---------- yam yam content -------------------------------------------- */
+
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(0),    ED_AREA_YAMYAM_CONTENT_YPOS(0),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_0,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(1),    ED_AREA_YAMYAM_CONTENT_YPOS(1),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_1,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(2),    ED_AREA_YAMYAM_CONTENT_YPOS(2),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_2,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(3),    ED_AREA_YAMYAM_CONTENT_YPOS(3),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_3,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(4),    ED_AREA_YAMYAM_CONTENT_YPOS(4),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_4,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(5),    ED_AREA_YAMYAM_CONTENT_YPOS(5),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_5,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(6),    ED_AREA_YAMYAM_CONTENT_YPOS(6),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_6,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+  {
+    ED_AREA_YAMYAM_CONTENT_XPOS(7),    ED_AREA_YAMYAM_CONTENT_YPOS(7),
+    3, 3,
+    GADGET_ID_ELEMENT_CONTENT_7,       GADGET_ID_NONE,
+    NULL, NULL
+  },
+
+  /* ---------- amoeba content --------------------------------------------- */
+
+  {
+    ED_AREA_ELEM_CONTENT_XPOS,         ED_AREA_ELEM_CONTENT_YPOS,
+    1, 1,
+    GADGET_ID_AMOEBA_CONTENT,          GADGET_ID_NONE,
+    NULL, NULL
+  },
+
+  /* ---------- custom graphic --------------------------------------------- */
+
+  {
+    ED_AREA_ELEM_CONTENT3_XPOS,                ED_AREA_ELEM_CONTENT3_YPOS,
+    1, 1,
+    GADGET_ID_CUSTOM_GRAPHIC,          GADGET_ID_CUSTOM_USE_GRAPHIC,
+    NULL, NULL
+  },
+
+  /* ---------- custom content (when exploding) ---------------------------- */
+
+  {
+    ED_AREA_ELEM_CONTENT4_XPOS,                ED_AREA_ELEM_CONTENT4_YPOS,
+    3, 3,
+    GADGET_ID_CUSTOM_CONTENT,          GADGET_ID_NONE, /* align three rows */
+    NULL, NULL
+  },
+
+  /* ---------- custom change target --------------------------------------- */
+
+  {
+    ED_AREA_ELEM_CONTENT2_XPOS,                ED_AREA_ELEM_CONTENT2_YPOS,
+    1, 1,
+    GADGET_ID_CUSTOM_CHANGE_TARGET,    GADGET_ID_CUSTOM_CAN_CHANGE,
+    NULL, "after/when:"
+  },
+
+  /* ---------- custom change content (extended change target) ------------- */
+
+  {
+    ED_AREA_ELEM_CONTENT6_XPOS,                ED_AREA_ELEM_CONTENT6_YPOS,
+    3, 3,
+    GADGET_ID_CUSTOM_CHANGE_CONTENT,   GADGET_ID_NONE, /* align three rows */
+    NULL, NULL
+  },
+
+  /* ---------- custom change trigger (element causing change) ------------- */
+
+  {
+    ED_AREA_ELEM_CONTENT5_XPOS,                ED_AREA_ELEM_CONTENT5_YPOS,
+    1, 1,
+    GADGET_ID_CUSTOM_CHANGE_TRIGGER,   GADGET_ID_CHANGE_OTHER_ACTION,
+    NULL, NULL
+  },
+
+  /* ---------- random background (for random painting) -------------------- */
+
+  {
+    ED_AREA_RANDOM_BACKGROUND_XPOS,    ED_AREA_RANDOM_BACKGROUND_YPOS,
+    1, 1,
+    GADGET_ID_RANDOM_BACKGROUND,       GADGET_ID_RANDOM_RESTRICTED,
+    NULL, NULL
   },
 };
 
@@ -1498,6 +1693,7 @@ static void ModifyEditorCounter(int, int);
 static void ModifyEditorCounterLimits(int, int, int);
 static void ModifyEditorSelectbox(int, int);
 static void ModifyEditorElementList();
+static void RedrawDrawingElements();
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
@@ -1514,6 +1710,7 @@ static void HandleControlButtons(struct GadgetInfo *);
 static void HandleDrawingAreaInfo(struct GadgetInfo *);
 
 static struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
+static int right_gadget_border[NUM_EDITOR_GADGETS];
 
 static int drawing_function = GADGET_ID_SINGLE_ITEMS;
 static int last_drawing_function = GADGET_ID_SINGLE_ITEMS;
@@ -1603,7 +1800,7 @@ static int editor_el_emerald_mine[] =
 
   EL_STEELWALL,
   EL_WALL,
-  EL_WALL_CRUMBLED,
+  EL_WALL_SLIPPERY,
   EL_MAGIC_WALL,
 
   EL_EMERALD,
@@ -1924,7 +2121,7 @@ static int editor_el_diamond_caves[] =
 
   EL_LANDMINE,
   EL_INVISIBLE_SAND,
-  EL_STEELWALL_SLANTED,
+  EL_STEELWALL_SLIPPERY,
   EL_EMPTY,
 
   EL_SIGN_EXCLAMATION,
@@ -2366,14 +2563,22 @@ static void ReinitializeElementListButtons()
   initialization_needed = FALSE;
 }
 
-static int getCounterGadgetWidth()
+static int getMaxInfoTextLength()
 {
-  return (DXSIZE + getFontWidth(FONT_INPUT_1) - 2 * ED_GADGET_DISTANCE);
+  return (SXSIZE / getFontWidth(FONT_TEXT_2));
 }
 
-static int getMaxInfoTextLength()
+static int getFullTextWidth(char *text)
 {
-  return (SXSIZE / getFontWidth(FONT_TEXT_2));
+  if (text == NULL)
+    return 0;
+
+  return (strlen(text) * getFontWidth(FONT_TEXT_1) + ED_GADGET_TEXT_DISTANCE);
+}
+
+static int getRightGadgetBorder(struct GadgetInfo *gi, char *text)
+{
+  return (gi->x + gi->width + getFullTextWidth(text));
 }
 
 static char *getElementInfoText(int element)
@@ -2382,7 +2587,9 @@ static char *getElementInfoText(int element)
 
   if (element < NUM_FILE_ELEMENTS)
   {
-    if (element_info[element].custom_description != NULL)
+    if (strlen(element_info[element].description) > 0)
+      info_text = element_info[element].description;
+    else if (element_info[element].custom_description != NULL)
       info_text = element_info[element].custom_description;
     else if (element_info[element].editor_description != NULL)
       info_text = element_info[element].editor_description;
@@ -2647,15 +2854,18 @@ static void CreateCounterButtons()
   for (i=0; i<ED_NUM_COUNTERBUTTONS; i++)
   {
     int j;
-    int xpos = SX + counterbutton_info[i].x;   /* xpos of down count button */
-    int ypos = SY + counterbutton_info[i].y;
-    int xoffset = 0;
+    int x = SX + counterbutton_info[i].x;      /* down count button */
+    int y = SY + counterbutton_info[i].y;
 
-    /* determine horizontal offset for leading counter text */
+    /* determine horizontal position to the right of specified gadget */
+    if (counterbutton_info[i].gadget_id_align != GADGET_ID_NONE)
+      x = (right_gadget_border[counterbutton_info[i].gadget_id_align] +
+          ED_GADGET_TEXT_DISTANCE);
+
+    /* determine horizontal offset for leading text */
     if (counterbutton_info[i].text_left != NULL)
-      xoffset = (getFontWidth(FONT_TEXT_1) *
-                strlen(counterbutton_info[i].text_left) +
-                ED_GADGET_TEXT_DISTANCE);
+      x += (getFontWidth(FONT_TEXT_1) * strlen(counterbutton_info[i].text_left)
+           + ED_GADGET_TEXT_DISTANCE);
 
     for (j=0; j<2; j++)
     {
@@ -2681,8 +2891,8 @@ static void CreateCounterButtons()
        event_mask |= GD_EVENT_RELEASED;
 
        if (j == 1)
-         xpos += 2 * ED_GADGET_DISTANCE;
-       ypos += ED_GADGET_DISTANCE;
+         x += 2 * ED_GADGET_DISTANCE;
+       y += ED_GADGET_DISTANCE;
 
        gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[sid].gd_x;
        gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
@@ -2706,8 +2916,8 @@ static void CreateCounterButtons()
       gi = CreateGadget(GDI_CUSTOM_ID, id,
                        GDI_CUSTOM_TYPE_ID, i,
                        GDI_INFO_TEXT, infotext,
-                       GDI_X, xpos + xoffset,
-                       GDI_Y, ypos,
+                       GDI_X, x,
+                       GDI_Y, y,
                        GDI_WIDTH, x_size,
                        GDI_HEIGHT, y_size,
                        GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
@@ -2723,7 +2933,10 @@ static void CreateCounterButtons()
        Error(ERR_EXIT, "cannot create gadget");
 
       level_editor_gadget[id] = gi;
-      xpos += gi->width + ED_GADGET_DISTANCE;  /* xpos of text count button */
+      right_gadget_border[id] =
+       getRightGadgetBorder(gi, counterbutton_info[i].text_right);
+
+      x += gi->width + ED_GADGET_DISTANCE;     /* text count button */
 
       if (j == 0)
       {
@@ -2739,8 +2952,8 @@ static void CreateCounterButtons()
          font_type = FONT_LEVEL_NUMBER;
          font_type_active = FONT_LEVEL_NUMBER;
 
-         xpos += 2 * ED_GADGET_DISTANCE;
-         ypos -= ED_GADGET_DISTANCE;
+         x += 2 * ED_GADGET_DISTANCE;
+         y -= ED_GADGET_DISTANCE;
 
          gd_x = DOOR_GFX_PAGEX6 + ED_WIN_COUNT2_XPOS;
          gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT2_YPOS;
@@ -2755,8 +2968,8 @@ static void CreateCounterButtons()
        gi = CreateGadget(GDI_CUSTOM_ID, id,
                          GDI_CUSTOM_TYPE_ID, i,
                          GDI_INFO_TEXT, "enter counter value",
-                         GDI_X, xpos + xoffset,
-                         GDI_Y, ypos,
+                         GDI_X, x,
+                         GDI_Y, y,
                          GDI_TYPE, GD_TYPE_TEXTINPUT_NUMERIC,
                          GDI_NUMBER_VALUE, 0,
                          GDI_NUMBER_MIN, counterbutton_info[i].min_value,
@@ -2777,7 +2990,10 @@ static void CreateCounterButtons()
          Error(ERR_EXIT, "cannot create gadget");
 
        level_editor_gadget[id] = gi;
-       xpos += gi->width + ED_GADGET_DISTANCE; /* xpos of up count button */
+       right_gadget_border[id] =
+         getRightGadgetBorder(gi, counterbutton_info[i].text_right);
+
+       x += gi->width + ED_GADGET_DISTANCE;    /* up count button */
       }
     }
   }
@@ -2785,47 +3001,38 @@ static void CreateCounterButtons()
 
 static void CreateDrawingAreas()
 {
-  struct GadgetInfo *gi;
-  unsigned long event_mask;
-  int id;
   int i;
 
-  event_mask =
-    GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
-    GD_EVENT_OFF_BORDERS;
-
-  /* one for the level drawing area ... */
-  id = GADGET_ID_DRAWING_LEVEL;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_X, SX,
-                   GDI_Y, SY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_AREA_SIZE, ed_fieldx, ed_fieldy,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... up to eight areas for element content ... */
-  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
+  for (i=0; i<ED_NUM_DRAWING_AREAS; i++)
   {
-    int gx = SX + ED_AREA_ELEM_CONTENT_XPOS + 5 * (i % 4) * MINI_TILEX;
-    int gy = SX + ED_AREA_ELEM_CONTENT_YPOS + 6 * (i / 4) * MINI_TILEY;
+    struct GadgetInfo *gi;
+    unsigned long event_mask;
+    int id = drawingarea_info[i].gadget_id;
+    int x = SX + drawingarea_info[i].x;
+    int y = SY + drawingarea_info[i].y;
+    int area_xsize = drawingarea_info[i].area_xsize;
+    int area_ysize = drawingarea_info[i].area_ysize;
+
+    event_mask =
+      GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
+      GD_EVENT_OFF_BORDERS;
+
+    /* determine horizontal position to the right of specified gadget */
+    if (drawingarea_info[i].gadget_id_align != GADGET_ID_NONE)
+      x = (right_gadget_border[drawingarea_info[i].gadget_id_align] +
+          ED_GADGET_TEXT_DISTANCE + MINI_TILEX / 2);
+
+    /* determine horizontal offset for leading text */
+    if (drawingarea_info[i].text_left != NULL)
+      x += (getFontWidth(FONT_TEXT_1) * strlen(drawingarea_info[i].text_left) +
+           ED_GADGET_TEXT_DISTANCE + MINI_TILEX / 2);
 
-    id = GADGET_ID_ELEMENT_CONTENT_0 + i;
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
-                     GDI_X, gx,
-                     GDI_Y, gy,
-                     GDI_WIDTH, 3 * MINI_TILEX,
-                     GDI_HEIGHT, 3 * MINI_TILEY,
+                     GDI_X, x,
+                     GDI_Y, y,
                      GDI_TYPE, GD_TYPE_DRAWING_AREA,
+                     GDI_AREA_SIZE, area_xsize, area_ysize,
                      GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
@@ -2836,142 +3043,9 @@ static void CreateDrawingAreas()
       Error(ERR_EXIT, "cannot create gadget");
 
     level_editor_gadget[id] = gi;
+    right_gadget_border[id] =
+      getRightGadgetBorder(gi, drawingarea_info[i].text_right);
   }
-
-  /* ... one for the amoeba content ... */
-  id = GADGET_ID_AMOEBA_CONTENT;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_X, SX + ED_AREA_ELEM_CONTENT_XPOS,
-                   GDI_Y, SY + ED_AREA_ELEM_CONTENT_YPOS,
-                   GDI_WIDTH, MINI_TILEX,
-                   GDI_HEIGHT, MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... one for each custom element optional graphic element ... */
-  id = GADGET_ID_CUSTOM_GRAPHIC;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_X, SX + ED_AREA_ELEM_CONTENT3_XPOS,
-                   GDI_Y, SY + ED_AREA_ELEM_CONTENT3_YPOS,
-                   GDI_WIDTH, MINI_TILEX,
-                   GDI_HEIGHT, MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... one area for custom element explosion content ... */
-  id = GADGET_ID_CUSTOM_CONTENT;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_CUSTOM_TYPE_ID, i,
-                   GDI_X, SX + ED_AREA_ELEM_CONTENT4_XPOS,
-                   GDI_Y, SX + ED_AREA_ELEM_CONTENT4_YPOS,
-                   GDI_WIDTH, 3 * MINI_TILEX,
-                   GDI_HEIGHT, 3 * MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... one for each custom element change target element ... */
-  id = GADGET_ID_CUSTOM_CHANGE_TARGET;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_X, SX + ED_AREA_ELEM_CONTENT2_XPOS,
-                   GDI_Y, SY + ED_AREA_ELEM_CONTENT2_YPOS,
-                   GDI_WIDTH, MINI_TILEX,
-                   GDI_HEIGHT, MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... one area for extended custom element change target content ... */
-  id = GADGET_ID_CUSTOM_CHANGE_CONTENT;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_CUSTOM_TYPE_ID, i,
-                   GDI_X, SX + ED_AREA_ELEM_CONTENT6_XPOS,
-                   GDI_Y, SX + ED_AREA_ELEM_CONTENT6_YPOS,
-                   GDI_WIDTH, 3 * MINI_TILEX,
-                   GDI_HEIGHT, 3 * MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... one for each custom element change trigger element ... */
-  id = GADGET_ID_CUSTOM_CHANGE_TRIGGER;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_X, SX + ED_AREA_ELEM_CONTENT5_XPOS,
-                   GDI_Y, SY + ED_AREA_ELEM_CONTENT5_YPOS,
-                   GDI_WIDTH, MINI_TILEX,
-                   GDI_HEIGHT, MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
-
-  /* ... and one for random placement background restrictions */
-  id = GADGET_ID_RANDOM_BACKGROUND;
-  gi = CreateGadget(GDI_CUSTOM_ID, id,
-                   GDI_X, SX + ED_AREA_RANDOM_BACKGROUND_XPOS,
-                   GDI_Y, SY + ED_AREA_RANDOM_BACKGROUND_YPOS,
-                   GDI_WIDTH, MINI_TILEX,
-                   GDI_HEIGHT, MINI_TILEY,
-                   GDI_TYPE, GD_TYPE_DRAWING_AREA,
-                   GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
-                   GDI_EVENT_MASK, event_mask,
-                   GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
-                   GDI_CALLBACK_ACTION, HandleDrawingAreas,
-                   GDI_END);
-
-  if (gi == NULL)
-    Error(ERR_EXIT, "cannot create gadget");
-
-  level_editor_gadget[id] = gi;
 }
 
 static void CreateTextInputGadgets()
@@ -3031,11 +3105,12 @@ static void CreateSelectboxGadgets()
   {
     Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x, gd_y;
-    int xoffset = 0;
     struct GadgetInfo *gi;
     unsigned long event_mask;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = selectbox_info[i].gadget_id;
+    int x = SX + selectbox_info[i].x;
+    int y = SY + selectbox_info[i].y;
 
     if (selectbox_info[i].size == -1)  /* dynamically determine size */
     {
@@ -3057,11 +3132,15 @@ static void CreateSelectboxGadgets()
     gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
     gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
 
-    /* determine horizontal offset for leading selectbox text */
+    /* determine horizontal position to the right of specified gadget */
+    if (selectbox_info[i].gadget_id_align != GADGET_ID_NONE)
+      x = (right_gadget_border[selectbox_info[i].gadget_id_align] +
+          ED_GADGET_TEXT_DISTANCE);
+
+    /* determine horizontal offset for leading text */
     if (selectbox_info[i].text_left != NULL)
-      xoffset = (getFontWidth(FONT_TEXT_1) *
-                strlen(selectbox_info[i].text_left) +
-                ED_GADGET_TEXT_DISTANCE);
+      x += (getFontWidth(FONT_TEXT_1) * strlen(selectbox_info[i].text_left) +
+           ED_GADGET_TEXT_DISTANCE);
 
     sprintf(infotext, "Select %s", selectbox_info[i].infotext);
     infotext[max_infotext_len] = '\0';
@@ -3069,8 +3148,8 @@ static void CreateSelectboxGadgets()
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_INFO_TEXT, infotext,
-                     GDI_X, SX + selectbox_info[i].x + xoffset,
-                     GDI_Y, SY + selectbox_info[i].y,
+                     GDI_X, x,
+                     GDI_Y, y,
                      GDI_TYPE, GD_TYPE_SELECTBOX,
                      GDI_SELECTBOX_OPTIONS, selectbox_info[i].options,
                      GDI_TEXT_SIZE, selectbox_info[i].size,
@@ -3079,7 +3158,7 @@ static void CreateSelectboxGadgets()
                      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
                      GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
                      GDI_BORDER_SIZE, ED_BORDER_SIZE, ED_BORDER_SIZE,
-                     GDI_BORDER_SIZE_SELECTBUTTON, getFontWidth(FONT_INPUT_1),
+                     GDI_BORDER_SIZE_SELECTBUTTON, ED_SELECTBOX_BUTTON_XSIZE,
                      GDI_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
@@ -3090,6 +3169,8 @@ static void CreateSelectboxGadgets()
       Error(ERR_EXIT, "cannot create gadget");
 
     level_editor_gadget[id] = gi;
+    right_gadget_border[id] =
+      getRightGadgetBorder(gi, selectbox_info[i].text_right);
   }
 }
 
@@ -3106,6 +3187,8 @@ static void CreateTextbuttonGadgets()
     unsigned long event_mask;
     char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = textbutton_info[i].gadget_id;
+    int x = SX + textbutton_info[i].x;
+    int y = SY + textbutton_info[i].y;
 
     if (textbutton_info[i].size == -1) /* dynamically determine size */
       textbutton_info[i].size = strlen(textbutton_info[i].text);
@@ -3130,11 +3213,16 @@ static void CreateTextbuttonGadgets()
     sprintf(infotext, "%s", textbutton_info[i].infotext);
     infotext[max_infotext_len] = '\0';
 
+    /* determine horizontal position to the right of specified gadget */
+    if (textbutton_info[i].gadget_id_align != GADGET_ID_NONE)
+      x = (right_gadget_border[textbutton_info[i].gadget_id_align] +
+          ED_GADGET_TEXT_DISTANCE);
+
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_INFO_TEXT, infotext,
-                     GDI_X, SX + textbutton_info[i].x,
-                     GDI_Y, SY + textbutton_info[i].y,
+                     GDI_X, x,
+                     GDI_Y, y,
                      GDI_TYPE, GD_TYPE_TEXT_BUTTON,
                      GDI_TEXT_VALUE, textbutton_info[i].text,
                      GDI_TEXT_SIZE, textbutton_info[i].size,
@@ -3143,7 +3231,7 @@ static void CreateTextbuttonGadgets()
                      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
                      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y1,
                      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y2,
-                     GDI_BORDER_SIZE, ED_BORDER2_SIZE, ED_BORDER_SIZE,
+                     GDI_BORDER_SIZE, ED_BORDER_TEXT_XSIZE, ED_BORDER_SIZE,
                      GDI_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
                      GDI_DECORATION_SHIFTING, 1, 1,
                      GDI_EVENT_MASK, event_mask,
@@ -3175,7 +3263,7 @@ static void CreateScrollbarGadgets()
     {
       items_max = num_editor_elements / ED_ELEMENTLIST_BUTTONS_HORIZ;
       items_visible = ED_ELEMENTLIST_BUTTONS_VERT;
-      item_position = 0;
+      item_position = element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ;
     }
     else       /* drawing area scrollbars */
     {
@@ -3234,7 +3322,6 @@ static void CreateCheckbuttonGadgets()
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
-  boolean checked;
   int i;
 
   event_mask = GD_EVENT_PRESSED;
@@ -3245,69 +3332,114 @@ static void CreateCheckbuttonGadgets()
   gd_x4 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_CHECKED_XPOS;
   gd_y  = DOOR_GFX_PAGEY1 + ED_RADIOBUTTON_YPOS;
 
-  for (i=0; i<ED_NUM_RADIOBUTTONS; i++)
+  for (i=0; i<ED_NUM_CHECKBUTTONS; i++)
   {
-    int id = radiobutton_info[i].gadget_id;
+    int id = checkbutton_info[i].gadget_id;
+    int x = SX + checkbutton_info[i].x;
+    int y = SY + checkbutton_info[i].y;
 
-    checked =
-      (*radiobutton_info[i].value == radiobutton_info[i].checked_value);
+    if (id == GADGET_ID_STICK_ELEMENT)
+      gd_y  = DOOR_GFX_PAGEY1 + ED_STICKYBUTTON_YPOS;
+    else
+      gd_y  = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
+
+    /* determine horizontal position to the right of specified gadget */
+    if (checkbutton_info[i].gadget_id_align != GADGET_ID_NONE)
+      x = (right_gadget_border[checkbutton_info[i].gadget_id_align] +
+          ED_GADGET_TEXT_DISTANCE);
+
+    /* determine horizontal offset for leading text */
+    if (checkbutton_info[i].text_left != NULL)
+      x += (getFontWidth(FONT_TEXT_1) * strlen(checkbutton_info[i].text_left) +
+           ED_GADGET_TEXT_DISTANCE);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
-                     GDI_INFO_TEXT, radiobutton_info[i].infotext,
-                     GDI_X, SX + radiobutton_info[i].x,
-                     GDI_Y, SY + radiobutton_info[i].y,
+                     GDI_INFO_TEXT, checkbutton_info[i].infotext,
+                     GDI_X, x,
+                     GDI_Y, y,
                      GDI_WIDTH, ED_CHECKBUTTON_XSIZE,
                      GDI_HEIGHT, ED_CHECKBUTTON_YSIZE,
-                     GDI_TYPE, GD_TYPE_RADIO_BUTTON,
-                     GDI_RADIO_NR, radiobutton_info[i].radio_button_nr,
-                     GDI_CHECKED, checked,
+                     GDI_TYPE, GD_TYPE_CHECK_BUTTON,
+                     GDI_CHECKED, *checkbutton_info[i].value,
                      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
                      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
                      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x3, gd_y,
                      GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x4, gd_y,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
-                     GDI_CALLBACK_ACTION, HandleRadiobuttons,
+                     GDI_CALLBACK_ACTION, HandleCheckbuttons,
                      GDI_END);
 
     if (gi == NULL)
       Error(ERR_EXIT, "cannot create gadget");
 
     level_editor_gadget[id] = gi;
+    right_gadget_border[id] =
+      getRightGadgetBorder(gi, checkbutton_info[i].text_right);
   }
+}
 
-  for (i=0; i<ED_NUM_CHECKBUTTONS; i++)
+static void CreateRadiobuttonGadgets()
+{
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
+  int i;
+
+  event_mask = GD_EVENT_PRESSED;
+
+  gd_x1 = DOOR_GFX_PAGEX4 + ED_CHECKBUTTON_UNCHECKED_XPOS;
+  gd_x2 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_UNCHECKED_XPOS;
+  gd_x3 = DOOR_GFX_PAGEX4 + ED_CHECKBUTTON_CHECKED_XPOS;
+  gd_x4 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_CHECKED_XPOS;
+  gd_y  = DOOR_GFX_PAGEY1 + ED_RADIOBUTTON_YPOS;
+
+  for (i=0; i<ED_NUM_RADIOBUTTONS; i++)
   {
-    int id = checkbutton_info[i].gadget_id;
+    int id = radiobutton_info[i].gadget_id;
+    int x = SX + radiobutton_info[i].x;
+    int y = SY + radiobutton_info[i].y;
 
-    if (id == GADGET_ID_STICK_ELEMENT)
-      gd_y  = DOOR_GFX_PAGEY1 + ED_STICKYBUTTON_YPOS;
-    else
-      gd_y  = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
+    int checked =
+      (*radiobutton_info[i].value == radiobutton_info[i].checked_value);
+
+    /* determine horizontal position to the right of specified gadget */
+    if (radiobutton_info[i].gadget_id_align != GADGET_ID_NONE)
+      x = (right_gadget_border[radiobutton_info[i].gadget_id_align] +
+          ED_GADGET_TEXT_DISTANCE);
+
+    /* determine horizontal offset for leading text */
+    if (radiobutton_info[i].text_left != NULL)
+      x += (getFontWidth(FONT_TEXT_1) * strlen(radiobutton_info[i].text_left) +
+           ED_GADGET_TEXT_DISTANCE);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
-                     GDI_INFO_TEXT, checkbutton_info[i].infotext,
-                     GDI_X, SX + checkbutton_info[i].x,
-                     GDI_Y, SY + checkbutton_info[i].y,
+                     GDI_INFO_TEXT, radiobutton_info[i].infotext,
+                     GDI_X, x,
+                     GDI_Y, y,
                      GDI_WIDTH, ED_CHECKBUTTON_XSIZE,
                      GDI_HEIGHT, ED_CHECKBUTTON_YSIZE,
-                     GDI_TYPE, GD_TYPE_CHECK_BUTTON,
-                     GDI_CHECKED, *checkbutton_info[i].value,
+                     GDI_TYPE, GD_TYPE_RADIO_BUTTON,
+                     GDI_RADIO_NR, radiobutton_info[i].radio_button_nr,
+                     GDI_CHECKED, checked,
                      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
                      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
                      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x3, gd_y,
                      GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x4, gd_y,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
-                     GDI_CALLBACK_ACTION, HandleCheckbuttons,
+                     GDI_CALLBACK_ACTION, HandleRadiobuttons,
                      GDI_END);
 
     if (gi == NULL)
       Error(ERR_EXIT, "cannot create gadget");
 
     level_editor_gadget[id] = gi;
+    right_gadget_border[id] =
+      getRightGadgetBorder(gi, radiobutton_info[i].text_right);
   }
 }
 
@@ -3321,13 +3453,16 @@ void CreateLevelEditorGadgets()
   ReinitializeElementList();
 
   CreateControlButtons();
+  CreateScrollbarGadgets();
+
+  /* order of function calls is important because of cross-references */
+  CreateCheckbuttonGadgets();
   CreateCounterButtons();
-  CreateDrawingAreas();
+  CreateRadiobuttonGadgets();
   CreateTextInputGadgets();
-  CreateSelectboxGadgets();
   CreateTextbuttonGadgets();
-  CreateScrollbarGadgets();
-  CreateCheckbuttonGadgets();
+  CreateSelectboxGadgets();
+  CreateDrawingAreas();
 
   game_status = old_game_status;
 }
@@ -3342,47 +3477,37 @@ void FreeLevelEditorGadgets()
 
 static void MapCounterButtons(int id)
 {
+  int gadget_id_down = counterbutton_info[id].gadget_id_down;
+  int gadget_id_up   = counterbutton_info[id].gadget_id_up;
+  struct GadgetInfo *gi_down = level_editor_gadget[gadget_id_down];
+  struct GadgetInfo *gi_up   = level_editor_gadget[gadget_id_up];
+#if 0
   char infotext[MAX_OUTPUT_LINESIZE + 1];
   int max_infotext_len = getMaxInfoTextLength();
-  int xoffset_above = 0;
-  int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE);
   int xoffset_left = 0;
   int yoffset_left = ED_BORDER_SIZE;
   int xoffset_right = getCounterGadgetWidth();
   int yoffset_right = ED_BORDER_SIZE;
-  int x, y;
+#else
+  int xoffset_left = getFullTextWidth(counterbutton_info[id].text_left);
+  int xoffset_right = ED_GADGET_TEXT_DISTANCE;
+  int yoffset_above = MINI_TILEX + ED_GADGET_DISTANCE;
+  int yoffset = ED_BORDER_SIZE;
+  int x_left = gi_down->x - xoffset_left;
+  int x_right = gi_up->x + gi_up->width + xoffset_right;
+  int y_above = gi_down->y - yoffset_above;
+  int x = gi_down->x;
+  int y = gi_up->y + yoffset;
+#endif
 
   if (counterbutton_info[id].text_above)
-  {
-    x = SX + counterbutton_info[id].x + xoffset_above;
-    y = SY + counterbutton_info[id].y + yoffset_above;
-
-    sprintf(infotext, "%s:", counterbutton_info[id].text_above);
-    infotext[max_infotext_len] = '\0';
-    DrawText(x, y, infotext, FONT_TEXT_1);
-  }
+    DrawText(x, y_above, counterbutton_info[id].text_above, FONT_TEXT_1);
 
   if (counterbutton_info[id].text_left)
-  {
-    x = SX + counterbutton_info[id].x + xoffset_left;
-    y = SY + counterbutton_info[id].y + yoffset_left;
-
-    sprintf(infotext, "%s", counterbutton_info[id].text_left);
-    infotext[max_infotext_len] = '\0';
-    DrawText(x, y, infotext, FONT_TEXT_1);
-  }
+    DrawText(x_left, y, counterbutton_info[id].text_left, FONT_TEXT_1);
 
   if (counterbutton_info[id].text_right)
-  {
-    int gadget_id = counterbutton_info[id].gadget_id_down;
-
-    x = level_editor_gadget[gadget_id]->x + xoffset_right;
-    y = SY + counterbutton_info[id].y + yoffset_right;
-
-    sprintf(infotext, "%s", counterbutton_info[id].text_right);
-    infotext[max_infotext_len] = '\0';
-    DrawText(x, y, infotext, FONT_TEXT_1);
-  }
+    DrawText(x_right, y, counterbutton_info[id].text_right, FONT_TEXT_1);
 
   ModifyEditorCounter(id, *counterbutton_info[id].value);
 
@@ -3417,7 +3542,7 @@ static void MapControlButtons()
 
 static void MapDrawingArea(int id)
 {
-  MapGadget(level_editor_gadget[id]);
+  MapGadget(level_editor_gadget[drawingarea_info[id].gadget_id]);
 }
 
 static void MapTextInputGadget(int id)
@@ -3429,9 +3554,12 @@ static void MapTextInputGadget(int id)
   int x = textinput_info[id].x + xoffset_above;
   int y = textinput_info[id].y + yoffset_above;
 
-  sprintf(infotext, "%s:", textinput_info[id].infotext);
-  infotext[max_infotext_len] = '\0';
-  DrawTextF(x, y, FONT_TEXT_1, infotext);
+  if (textinput_info[id].infotext)
+  {
+    sprintf(infotext, "%s:", textinput_info[id].infotext);
+    infotext[max_infotext_len] = '\0';
+    DrawTextF(x, y, FONT_TEXT_1, infotext);
+  }
 
   ModifyGadget(level_editor_gadget[textinput_info[id].gadget_id],
               GDI_TEXT_VALUE, textinput_info[id].value, GDI_END);
@@ -3441,24 +3569,28 @@ static void MapTextInputGadget(int id)
 
 static void MapSelectboxGadget(int id)
 {
+  struct GadgetInfo *gi = level_editor_gadget[selectbox_info[id].gadget_id];
+#if 0
   int xoffset_left = 0;
   int yoffset_left = ED_BORDER_SIZE;
   int xoffset_right = ED_GADGET_TEXT_DISTANCE;
   int yoffset_right = ED_BORDER_SIZE;
   int x = selectbox_info[id].x + xoffset_left;
   int y = selectbox_info[id].y + yoffset_left;
+#else
+  int xoffset_left = getFullTextWidth(selectbox_info[id].text_left);
+  int xoffset_right = ED_GADGET_TEXT_DISTANCE;
+  int yoffset = ED_BORDER_SIZE;
+  int x_left = gi->x - xoffset_left;
+  int x_right = gi->x + gi->width + xoffset_right;
+  int y = gi->y + yoffset;
+#endif
 
-  DrawTextF(x, y, FONT_TEXT_1, selectbox_info[id].text_left);
+  if (selectbox_info[id].text_left)
+    DrawText(x_left, y, selectbox_info[id].text_left, FONT_TEXT_1);
 
   if (selectbox_info[id].text_right)
-  {
-    struct GadgetInfo *gi = level_editor_gadget[selectbox_info[id].gadget_id];
-
-    x = gi->x + gi->width + xoffset_right;
-    y = SY + selectbox_info[id].y + yoffset_right;
-
-    DrawText(x, y, selectbox_info[id].text_right, FONT_TEXT_1);
-  }
+    DrawText(x_right, y, selectbox_info[id].text_right, FONT_TEXT_1);
 
   ModifyEditorSelectbox(id, *selectbox_info[id].value);
 
@@ -3472,14 +3604,29 @@ static void MapTextbuttonGadget(int id)
 
 static void MapRadiobuttonGadget(int id)
 {
+  struct GadgetInfo *gi = level_editor_gadget[radiobutton_info[id].gadget_id];
+#if 0
   int xoffset_right = ED_XOFFSET_CHECKBOX;
   int yoffset_right = ED_BORDER_SIZE;
   int x = radiobutton_info[id].x + xoffset_right;
   int y = radiobutton_info[id].y + yoffset_right;
+#else
+  int xoffset_left = getFullTextWidth(checkbutton_info[id].text_left);
+  int xoffset_right = ED_GADGET_TEXT_DISTANCE;
+  int yoffset = ED_BORDER_SIZE;
+  int x_left = gi->x - xoffset_left;
+  int x_right = gi->x + gi->width + xoffset_right;
+  int y = gi->y + yoffset;
+#endif
   boolean checked =
     (*radiobutton_info[id].value == radiobutton_info[id].checked_value);
 
-  DrawTextF(x, y, FONT_TEXT_1, radiobutton_info[id].text_right);
+  if (radiobutton_info[id].text_left)
+    DrawText(x_left, y, radiobutton_info[id].text_left, FONT_TEXT_1);
+
+  if (radiobutton_info[id].text_right)
+    DrawText(x_right, y, radiobutton_info[id].text_right, FONT_TEXT_1);
+
   ModifyGadget(level_editor_gadget[radiobutton_info[id].gadget_id],
               GDI_CHECKED, checked, GDI_END);
 
@@ -3488,15 +3635,32 @@ static void MapRadiobuttonGadget(int id)
 
 static void MapCheckbuttonGadget(int id)
 {
+  struct GadgetInfo *gi = level_editor_gadget[checkbutton_info[id].gadget_id];
+#if 0
   int xoffset_right = ED_XOFFSET_CHECKBOX;
   int yoffset_right = ED_BORDER_SIZE;
   int x = checkbutton_info[id].x + xoffset_right;
   int y = checkbutton_info[id].y + yoffset_right;
+#else
+  int xoffset_left = getFullTextWidth(checkbutton_info[id].text_left);
+  int xoffset_right = ED_GADGET_TEXT_DISTANCE;
+  int yoffset = ED_BORDER_SIZE;
+  int x_left = gi->x - xoffset_left;
+  int x_right = gi->x + gi->width + xoffset_right;
+  int y = gi->y + yoffset;
+#endif
 
-  DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[id].text_right);
+  /* special case needed for "sticky" gadget */
   ModifyGadget(level_editor_gadget[checkbutton_info[id].gadget_id],
               GDI_CHECKED, *checkbutton_info[id].value,
               GDI_Y, SY + checkbutton_info[id].y, GDI_END);
+  y = gi->y + yoffset;
+
+  if (checkbutton_info[id].text_left)
+    DrawText(x_left, y, checkbutton_info[id].text_left, FONT_TEXT_1);
+
+  if (checkbutton_info[id].text_right)
+    DrawText(x_right, y, checkbutton_info[id].text_right, FONT_TEXT_1);
 
   MapGadget(level_editor_gadget[checkbutton_info[id].gadget_id]);
 }
@@ -3529,7 +3693,7 @@ static void MapMainDrawingArea()
     MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
   }
 
-  MapDrawingArea(GADGET_ID_DRAWING_LEVEL);
+  MapDrawingArea(ED_DRAWING_ID_DRAWING_LEVEL);
 }
 
 static void UnmapDrawingArea(int id)
@@ -3563,6 +3727,9 @@ static void ResetUndoBuffer()
 
 static void DrawEditModeWindow()
 {
+  ModifyEditorElementList();
+  RedrawDrawingElements();
+
   if (edit_mode == ED_MODE_INFO)
     DrawLevelInfoWindow();
   else if (edit_mode == ED_MODE_PROPERTIES)
@@ -3578,7 +3745,7 @@ static boolean LevelChanged()
 
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
-      if (Feld[x][y] != Ur[x][y])
+      if (Feld[x][y] != level.field[x][y])
        level_changed = TRUE;
 
   return level_changed;
@@ -3612,7 +3779,10 @@ static void CopyCustomElementPropertiesToEditor(int element)
 {
   int i;
 
-  custom_element = element_info[properties_element];
+  /* needed here to initialize combined element properties */
+  InitElementPropertiesEngine(level.game_version);
+
+  custom_element = element_info[element];
 
   for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
     custom_element_properties[i] = HAS_PROPERTY(element, i);
@@ -3620,155 +3790,205 @@ static void CopyCustomElementPropertiesToEditor(int element)
   for (i=0; i < NUM_CHANGE_EVENTS; i++)
     custom_element_change_events[i] = HAS_CHANGE_EVENT(element, i);
 
+  /* ---------- element settings: configure (custom elements) ------------- */
+
+  /* set accessible layer selectbox help value */
+  custom_element.access_type =
+    (IS_WALKABLE(element) ? EP_WALKABLE :
+     IS_PASSABLE(element) ? EP_PASSABLE :
+     custom_element.access_type);
+  custom_element.access_layer =
+    (IS_ACCESSIBLE_OVER(element) ? EP_ACCESSIBLE_OVER :
+     IS_ACCESSIBLE_INSIDE(element) ? EP_ACCESSIBLE_INSIDE :
+     IS_ACCESSIBLE_UNDER(element) ? EP_ACCESSIBLE_UNDER :
+     custom_element.access_layer);
+  custom_element_properties[EP_ACCESSIBLE] =
+    (IS_ACCESSIBLE_OVER(element) ||
+     IS_ACCESSIBLE_INSIDE(element) ||
+     IS_ACCESSIBLE_UNDER(element));
+
   /* set walk-to-object action selectbox help value */
-  value_walk_to_action =
+  custom_element.walk_to_action =
     (IS_DIGGABLE(element) ? EP_DIGGABLE :
      IS_COLLECTIBLE(element) ? EP_COLLECTIBLE :
      IS_PUSHABLE(element) ? EP_PUSHABLE :
-     EP_DIGGABLE);
+     custom_element.walk_to_action);
   custom_element_properties[EP_WALK_TO_OBJECT] =
     (IS_DIGGABLE(element) ||
      IS_COLLECTIBLE(element) ||
      IS_PUSHABLE(element));
 
-  /* set consistency selectbox help value */
-  value_consistency =
-    (CAN_EXPLODE(element) ? EP_CAN_EXPLODE :
-     IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE :
-     EP_CAN_EXPLODE);
-  custom_element_properties[EP_EXPLODE_RESULT] =
-    (CAN_EXPLODE(element) ||
-     IS_INDESTRUCTIBLE(element));
+  /* set smash targets selectbox help value */
+  custom_element.smash_targets =
+    (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
+     CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
+     CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
+     custom_element.smash_targets);
+  custom_element_properties[EP_CAN_SMASH] =
+    (CAN_SMASH_EVERYTHING(element) ||
+     CAN_SMASH_ENEMIES(element) ||
+     CAN_SMASH_PLAYER(element));
 
   /* set deadliness selectbox help value */
-  value_deadliness =
+  custom_element.deadliness =
     (DONT_TOUCH(element) ? EP_DONT_TOUCH :
      DONT_COLLIDE_WITH(element) ? EP_DONT_COLLIDE_WITH :
      DONT_RUN_INTO(element) ? EP_DONT_RUN_INTO :
-     EP_DONT_RUN_INTO);
+     custom_element.deadliness);
   custom_element_properties[EP_DEADLY] =
     (DONT_TOUCH(element) ||
      DONT_COLLIDE_WITH(element) ||
      DONT_RUN_INTO(element));
 
-  /* set smash targets selectbox help value */
-  value_smash_targets =
-    (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
-     CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
-     CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
-     EP_CAN_SMASH_PLAYER);
-  custom_element_properties[EP_CAN_SMASH] =
-    (CAN_SMASH_EVERYTHING(element) ||
-     CAN_SMASH_ENEMIES(element) ||
-     CAN_SMASH_PLAYER(element));
+  /* set consistency selectbox help value */
+  custom_element.consistency =
+    (IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE :
+     CAN_EXPLODE(element) ? EP_CAN_EXPLODE :
+     custom_element.consistency);
+  custom_element_properties[EP_EXPLODE_RESULT] =
+    (IS_INDESTRUCTIBLE(element) ||
+     CAN_EXPLODE(element));
 
-  /* set accessible layer selectbox help value */
-  value_access_type =
-    (IS_WALKABLE(element) ? EP_WALKABLE :
-     IS_PASSABLE(element) ? EP_PASSABLE :
-     EP_WALKABLE);
-  value_access_layer =
-    (IS_ACCESSIBLE_OVER(element) ? EP_ACCESSIBLE_OVER :
-     IS_ACCESSIBLE_INSIDE(element) ? EP_ACCESSIBLE_INSIDE :
-     IS_ACCESSIBLE_UNDER(element) ? EP_ACCESSIBLE_UNDER :
-     EP_ACCESSIBLE_OVER);
-  custom_element_properties[EP_ACCESSIBLE] =
-    (IS_ACCESSIBLE_OVER(element) ||
-     IS_ACCESSIBLE_INSIDE(element) ||
-     IS_ACCESSIBLE_UNDER(element));
+  /* special case: sub-settings dependent from main setting */
+  if (CAN_EXPLODE_BY_FIRE(element))
+    custom_element.can_explode_by_fire = TRUE;
+  if (CAN_EXPLODE_SMASHED(element))
+    custom_element.can_explode_smashed = TRUE;
+  if (CAN_EXPLODE_IMPACT(element))
+    custom_element.can_explode_impact  = TRUE;
+
+  /* ---------- element settings: advanced (custom elements) --------------- */
 
   /* set change by player selectbox help value */
-  value_change_player_action =
+  custom_element.change_player_action =
     (HAS_CHANGE_EVENT(element, CE_PUSHED_BY_PLAYER) ? CE_PUSHED_BY_PLAYER :
      HAS_CHANGE_EVENT(element, CE_PRESSED_BY_PLAYER) ? CE_PRESSED_BY_PLAYER :
      HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
-     CE_PRESSED_BY_PLAYER);
+     custom_element.change_player_action);
 
-  /* set change by impact/smash selectbox help value */
-  value_change_collide_action =
+  /* set change by collision selectbox help value */
+  custom_element.change_collide_action =
     (HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED :
      HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT :
      HAS_CHANGE_EVENT(element, CE_COLLISION) ? CE_COLLISION :
-     CE_COLLISION);
+     custom_element.change_collide_action);
 
   /* set change by other element action selectbox help value */
-  value_change_other_action =
-    (HAS_CHANGE_EVENT(element, CE_OTHER_EXPLODING) ? CE_OTHER_EXPLODING :
-     HAS_CHANGE_EVENT(element, CE_OTHER_CHANGING) ? CE_OTHER_CHANGING :
-     HAS_CHANGE_EVENT(element, CE_OTHER_PUSHING) ? CE_OTHER_PUSHING :
-     HAS_CHANGE_EVENT(element, CE_OTHER_PRESSING) ? CE_OTHER_PRESSING :
-     HAS_CHANGE_EVENT(element, CE_OTHER_TOUCHING) ? CE_OTHER_TOUCHING :
-     HAS_CHANGE_EVENT(element, CE_OTHER_COLLECTING) ? CE_OTHER_COLLECTING :
-     CE_OTHER_COLLECTING);
+  custom_element.change_other_action =
+    (HAS_CHANGE_EVENT(element, CE_OTHER_GETS_COLLECTED) ? CE_OTHER_GETS_COLLECTED :
+     HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PUSHED) ? CE_OTHER_GETS_PUSHED :
+     HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PRESSED) ? CE_OTHER_GETS_PRESSED :
+     HAS_CHANGE_EVENT(element, CE_OTHER_GETS_TOUCHED) ? CE_OTHER_GETS_TOUCHED :
+     HAS_CHANGE_EVENT(element, CE_OTHER_IS_EXPLODING) ? CE_OTHER_IS_EXPLODING :
+     HAS_CHANGE_EVENT(element, CE_OTHER_IS_CHANGING) ? CE_OTHER_IS_CHANGING :
+     HAS_CHANGE_EVENT(element, CE_OTHER_IS_TOUCHING) ? CE_OTHER_IS_TOUCHING :
+     custom_element.change_other_action);
 }
 
 static void CopyCustomElementPropertiesToGame(int element)
 {
   int i;
+  int access_type_and_layer;
+
+  if (level.use_custom_template)
+  {
+    if (Request("Copy and modify level tem- plate ?", REQ_ASK))
+    {
+      level.use_custom_template = FALSE;
+      ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
+                  GDI_CHECKED, FALSE, GDI_END);
+    }
+    else
+    {
+      LoadLevelTemplate(-1);
+
+      DrawEditModeWindow();
+    }
+  }
+
+  element_info[element] = custom_element;
+
+  /* ---------- element settings: configure (custom elements) ------------- */
 
-  element_info[properties_element] = custom_element;
+  /* set accessible property from checkbox and selectbox */
+  custom_element_properties[EP_WALKABLE_OVER] = FALSE;
+  custom_element_properties[EP_WALKABLE_INSIDE] = FALSE;
+  custom_element_properties[EP_WALKABLE_UNDER] = FALSE;
+  custom_element_properties[EP_PASSABLE_OVER] = FALSE;
+  custom_element_properties[EP_PASSABLE_INSIDE] = FALSE;
+  custom_element_properties[EP_PASSABLE_UNDER] = FALSE;
+  access_type_and_layer = ((custom_element.access_type == EP_WALKABLE ?
+                           EP_WALKABLE_OVER : EP_PASSABLE_OVER) +
+                          (custom_element.access_layer - EP_ACCESSIBLE_OVER));
+  custom_element_properties[access_type_and_layer] =
+    custom_element_properties[EP_ACCESSIBLE];
 
   /* set walk-to-object property from checkbox and selectbox */
   custom_element_properties[EP_DIGGABLE] = FALSE;
   custom_element_properties[EP_COLLECTIBLE] = FALSE;
   custom_element_properties[EP_PUSHABLE] = FALSE;
-  custom_element_properties[value_walk_to_action] =
+  custom_element_properties[custom_element.walk_to_action] =
     custom_element_properties[EP_WALK_TO_OBJECT];
 
-  /* set consistency property from checkbox and selectbox */
-  custom_element_properties[EP_CAN_EXPLODE] = FALSE;
-  custom_element_properties[EP_INDESTRUCTIBLE] = FALSE;
-  custom_element_properties[value_consistency] =
-    custom_element_properties[EP_EXPLODE_RESULT];
+  /* set smash property from checkbox and selectbox */
+  custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
+  custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
+  custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
+  custom_element_properties[custom_element.smash_targets] =
+    custom_element_properties[EP_CAN_SMASH];
 
   /* set deadliness property from checkbox and selectbox */
   custom_element_properties[EP_DONT_RUN_INTO] = FALSE;
   custom_element_properties[EP_DONT_COLLIDE_WITH] = FALSE;
   custom_element_properties[EP_DONT_TOUCH] = FALSE;
-  custom_element_properties[value_deadliness] =
+  custom_element_properties[custom_element.deadliness] =
     custom_element_properties[EP_DEADLY];
 
-  /* set smash property from checkbox and selectbox */
-  custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
-  custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
-  custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
-  custom_element_properties[value_smash_targets] =
-    custom_element_properties[EP_CAN_SMASH];
+  /* set consistency property from checkbox and selectbox */
+  custom_element_properties[EP_INDESTRUCTIBLE] = FALSE;
+  custom_element_properties[EP_CAN_EXPLODE] = FALSE;
+  custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = FALSE;
+  custom_element_properties[EP_CAN_EXPLODE_SMASHED] = FALSE;
+  custom_element_properties[EP_CAN_EXPLODE_IMPACT] = FALSE;
+  custom_element_properties[custom_element.consistency] =
+    custom_element_properties[EP_EXPLODE_RESULT];
 
-  /* set accessible property from checkbox and selectbox */
-  custom_element_properties[EP_WALKABLE_OVER] = FALSE;
-  custom_element_properties[EP_WALKABLE_INSIDE] = FALSE;
-  custom_element_properties[EP_WALKABLE_UNDER] = FALSE;
-  custom_element_properties[EP_PASSABLE_OVER] = FALSE;
-  custom_element_properties[EP_PASSABLE_INSIDE] = FALSE;
-  custom_element_properties[EP_PASSABLE_UNDER] = FALSE;
-  custom_element_properties[((value_access_type == EP_WALKABLE ?
-                             EP_WALKABLE_OVER : EP_PASSABLE_OVER) +
-                            (value_access_layer - EP_ACCESSIBLE_OVER))] =
-    custom_element_properties[EP_ACCESSIBLE];
+  /* special case: sub-settings dependent from main setting */
+  if (custom_element_properties[EP_CAN_EXPLODE])
+  {
+    custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] =
+      custom_element.can_explode_by_fire;
+    custom_element_properties[EP_CAN_EXPLODE_SMASHED] =
+      custom_element.can_explode_smashed;
+    custom_element_properties[EP_CAN_EXPLODE_IMPACT] =
+      custom_element.can_explode_impact;
+  }
+
+  /* ---------- element settings: advanced (custom elements) --------------- */
 
   /* set player change event from checkbox and selectbox */
   custom_element_change_events[CE_TOUCHED_BY_PLAYER] = FALSE;
   custom_element_change_events[CE_PRESSED_BY_PLAYER] = FALSE;
   custom_element_change_events[CE_PUSHED_BY_PLAYER] = FALSE;
-  custom_element_change_events[value_change_player_action] =
+  custom_element_change_events[custom_element.change_player_action] =
     custom_element_change_events[CE_BY_PLAYER];
 
-  /* set player change event from checkbox and selectbox */
+  /* set collision change event from checkbox and selectbox */
   custom_element_change_events[CE_COLLISION] = FALSE;
   custom_element_change_events[CE_IMPACT] = FALSE;
   custom_element_change_events[CE_SMASHED] = FALSE;
-  custom_element_change_events[value_change_collide_action] =
+  custom_element_change_events[custom_element.change_collide_action] =
     custom_element_change_events[CE_BY_COLLISION];
 
   /* set other element action change event from checkbox and selectbox */
-  custom_element_change_events[CE_OTHER_COLLECTING] = FALSE;
-  custom_element_change_events[CE_OTHER_TOUCHING] = FALSE;
-  custom_element_change_events[CE_OTHER_PRESSING] = FALSE;
-  custom_element_change_events[CE_OTHER_PUSHING] = FALSE;
-  custom_element_change_events[CE_OTHER_CHANGING] = FALSE;
-  custom_element_change_events[CE_OTHER_EXPLODING] = FALSE;
-  custom_element_change_events[value_change_other_action] =
+  custom_element_change_events[CE_OTHER_IS_TOUCHING] = FALSE;
+  custom_element_change_events[CE_OTHER_IS_CHANGING] = FALSE;
+  custom_element_change_events[CE_OTHER_IS_EXPLODING] = FALSE;
+  custom_element_change_events[CE_OTHER_GETS_TOUCHED] = FALSE;
+  custom_element_change_events[CE_OTHER_GETS_PRESSED] = FALSE;
+  custom_element_change_events[CE_OTHER_GETS_PUSHED] = FALSE;
+  custom_element_change_events[CE_OTHER_GETS_COLLECTED] = FALSE;
+  custom_element_change_events[custom_element.change_other_action] =
     custom_element_change_events[CE_BY_OTHER];
 
   for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
@@ -3778,7 +3998,7 @@ static void CopyCustomElementPropertiesToGame(int element)
     SET_CHANGE_EVENT(element, i, custom_element_change_events[i]);
 
   /* copy change events also to special level editor variable */
-  custom_element = element_info[properties_element];
+  custom_element = element_info[element];
 }
 
 void DrawLevelEd()
@@ -3788,8 +4008,8 @@ void DrawLevelEd()
 
   if (level_editor_test_game)
   {
-    CopyPlayfield(Ur, Feld);
-    CopyPlayfield(FieldBackup, Ur);
+    CopyPlayfield(level.field, Feld);
+    CopyPlayfield(FieldBackup, level.field);
 
     level_editor_test_game = FALSE;
   }
@@ -3808,16 +4028,10 @@ void DrawLevelEd()
   BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
             DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
+#if 0
   /* draw mouse button brush elements */
-  DrawMiniGraphicExt(drawto,
-                    DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-                    el2edimg(new_element1));
-  DrawMiniGraphicExt(drawto,
-                    DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-                    el2edimg(new_element2));
-  DrawMiniGraphicExt(drawto,
-                    DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-                    el2edimg(new_element3));
+  RedrawDrawingElements();
+#endif
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -3829,16 +4043,19 @@ void DrawLevelEd()
   redraw_mask |= REDRAW_ALL;
 
   ReinitializeElementListButtons();    /* only needed after setup changes */
+#if 0
+  ModifyEditorElementList();           /* may be needed for custom elements */
+#endif
 
   UnmapTapeButtons();
   MapControlButtons();
 
+  DrawEditModeWindow();
+
   /* copy actual editor door content to door double buffer for OpenDoor() */
   BlitBitmap(drawto, bitmap_db_door,
             DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
-  DrawEditModeWindow();
-
   OpenDoor(DOOR_OPEN_1);
 }
 
@@ -4079,15 +4296,18 @@ static void DrawElementBorder(int dest_x, int dest_y, int width, int height,
 
 static void DrawRandomPlacementBackgroundArea()
 {
+  struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_RANDOM_BACKGROUND];
+#if 0
   int area_x = ED_AREA_RANDOM_BACKGROUND_XPOS / MINI_TILEX;
   int area_y = ED_AREA_RANDOM_BACKGROUND_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_RANDOM_BACKGROUND_XPOS;
   int area_sy = SY + ED_AREA_RANDOM_BACKGROUND_YPOS;
+#endif
 
-  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
-  DrawMiniElement(area_x, area_y, random_placement_background_element);
+  DrawElementBorder(gi->x, gi->y, MINI_TILEX, MINI_TILEY, TRUE);
+  DrawMiniElement(gi->x, gi->y, random_placement_background_element);
 
-  MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND);
+  MapDrawingArea(ED_DRAWING_ID_RANDOM_BACKGROUND);
 }
 
 static void DrawLevelInfoWindow()
@@ -4137,16 +4357,18 @@ static void DrawAmoebaContentArea()
 
   DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", FONT_TEXT_1);
 
-  MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
+  MapDrawingArea(ED_DRAWING_ID_AMOEBA_CONTENT);
 }
 
 static void DrawCustomGraphicElementArea()
 {
   struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_GRAPHIC];
+#if 0
   int xpos = ED_AREA_ELEM_CONTENT3_XPOS;
   int ypos = ED_AREA_ELEM_CONTENT3_YPOS;
   int area_sx = SX + xpos;
   int area_sy = SY + ypos;
+#endif
 
   if (!IS_CUSTOM_ELEMENT(properties_element))
   {
@@ -4156,18 +4378,24 @@ static void DrawCustomGraphicElementArea()
     return;
   }
 
-  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
+  DrawElementBorder(gi->x, gi->y, MINI_TILEX, MINI_TILEY, TRUE);
   DrawMiniGraphicExt(drawto, gi->x, gi->y,
                     el2edimg(custom_element.gfx_element));
 
-  MapDrawingArea(GADGET_ID_CUSTOM_GRAPHIC);
+  MapDrawingArea(ED_DRAWING_ID_CUSTOM_GRAPHIC);
 }
 
 static void DrawCustomContentArea()
 {
   struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CONTENT];
+#if 0
   int area_sx = SX + ED_AREA_ELEM_CONTENT4_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT4_YPOS;
+#endif
+  int x1 = right_gadget_border[GADGET_ID_CUSTOM_DEADLINESS];
+  int x2 = right_gadget_border[GADGET_ID_CUSTOM_CONSISTENCY];
+  int x3 = right_gadget_border[GADGET_ID_CUSTOM_EXPLODE_IMPACT];
+  int xoffset = ED_GADGET_TEXT_DISTANCE + MINI_TILEX / 2;
   int x, y;
 
   if (!IS_CUSTOM_ELEMENT(properties_element))
@@ -4178,23 +4406,35 @@ static void DrawCustomContentArea()
     return;
   }
 
-  DrawElementBorder(area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY, TRUE);
+  ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END);
+
+  DrawElementBorder(gi->x, gi->y, 3 * MINI_TILEX, 3 * MINI_TILEY, TRUE);
 
   for (y=0; y<3; y++)
     for (x=0; x<3; x++)
       DrawMiniGraphicExt(drawto, gi->x + x * MINI_TILEX,gi->y + y * MINI_TILEY,
                         el2edimg(custom_element.content[x][y]));
 
-  MapDrawingArea(GADGET_ID_CUSTOM_CONTENT);
+  MapDrawingArea(ED_DRAWING_ID_CUSTOM_CONTENT);
 }
 
 static void DrawCustomChangeTargetArea()
 {
-  struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_TARGET];
+  int id = ED_DRAWING_ID_CUSTOM_CHANGE_TARGET;
+  int gadget_id = drawingarea_info[id].gadget_id;
+  struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+#if 0
   int xpos = ED_AREA_ELEM_CONTENT2_XPOS;
   int ypos = ED_AREA_ELEM_CONTENT2_YPOS;
   int area_sx = SX + xpos;
   int area_sy = SY + ypos;
+#endif
+  int xoffset_left = 0;
+  int yoffset_left = ED_BORDER_AREA_YSIZE;
+  int xoffset_right = ED_GADGET_TEXT_DISTANCE + MINI_TILEX / 2;
+  int yoffset_right = ED_BORDER_AREA_YSIZE;
+  int x = drawingarea_info[id].x + xoffset_left;
+  int y = drawingarea_info[id].y + yoffset_left;
 
   if (!IS_CUSTOM_ELEMENT(properties_element))
   {
@@ -4204,18 +4444,35 @@ static void DrawCustomChangeTargetArea()
     return;
   }
 
-  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
+  DrawElementBorder(gi->x, gi->y, MINI_TILEX, MINI_TILEY, TRUE);
   DrawMiniGraphicExt(drawto, gi->x, gi->y,
                     el2edimg(custom_element.change.target_element));
 
-  MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TARGET);
+  MapDrawingArea(ED_DRAWING_ID_CUSTOM_CHANGE_TARGET);
+
+  if (drawingarea_info[id].text_left)
+    DrawTextF(x, y, FONT_TEXT_1, drawingarea_info[id].text_left);
+
+  if (drawingarea_info[id].text_right)
+  {
+    x = gi->x + gi->width + xoffset_right;
+    y = SY + drawingarea_info[id].y + yoffset_right;
+
+    DrawText(x, y, drawingarea_info[id].text_right, FONT_TEXT_1);
+  }
 }
 
 static void DrawCustomChangeContentArea()
 {
   struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_CONTENT];
+#if 0
   int area_sx = SX + ED_AREA_ELEM_CONTENT6_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT6_YPOS;
+#endif
+  int x1 = right_gadget_border[GADGET_ID_CHANGE_USE_CONTENT];
+  int x2 = right_gadget_border[GADGET_ID_CHANGE_POWER];
+  int x3 = right_gadget_border[GADGET_ID_CHANGE_ONLY_COMPLETE];
+  int xoffset = ED_GADGET_TEXT_DISTANCE + MINI_TILEX / 2;
   int x, y;
 
   if (!IS_CUSTOM_ELEMENT(properties_element))
@@ -4226,23 +4483,27 @@ static void DrawCustomChangeContentArea()
     return;
   }
 
-  DrawElementBorder(area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY, TRUE);
+  ModifyGadget(gi, GDI_X, MAX(x1, MAX(x2, x3)) + xoffset, GDI_END);
+
+  DrawElementBorder(gi->x, gi->y, 3 * MINI_TILEX, 3 * MINI_TILEY, TRUE);
 
   for (y=0; y<3; y++)
     for (x=0; x<3; x++)
       DrawMiniGraphicExt(drawto, gi->x + x * MINI_TILEX,gi->y + y * MINI_TILEY,
                         el2edimg(custom_element.change.content[x][y]));
 
-  MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_CONTENT);
+  MapDrawingArea(ED_DRAWING_ID_CUSTOM_CHANGE_CONTENT);
 }
 
 static void DrawCustomChangeTriggerArea()
 {
   struct GadgetInfo *gi = level_editor_gadget[GADGET_ID_CUSTOM_CHANGE_TRIGGER];
+#if 0
   int xpos = ED_AREA_ELEM_CONTENT5_XPOS;
   int ypos = ED_AREA_ELEM_CONTENT5_YPOS;
   int area_sx = SX + xpos;
   int area_sy = SY + ypos;
+#endif
 
   if (!IS_CUSTOM_ELEMENT(properties_element))
   {
@@ -4252,11 +4513,11 @@ static void DrawCustomChangeTriggerArea()
     return;
   }
 
-  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
+  DrawElementBorder(gi->x, gi->y, MINI_TILEX, MINI_TILEY, TRUE);
   DrawMiniGraphicExt(drawto, gi->x, gi->y,
-                    el2edimg(custom_element.change.trigger));
+                    el2edimg(custom_element.change.trigger_element));
 
-  MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TRIGGER);
+  MapDrawingArea(ED_DRAWING_ID_CUSTOM_CHANGE_TRIGGER);
 }
 
 static void DrawElementContentAreas()
@@ -4301,7 +4562,7 @@ static void DrawElementContentAreas()
   }
 
   for (i=0; i<level.num_yamyam_contents; i++)
-    MapDrawingArea(GADGET_ID_ELEMENT_CONTENT_0 + i);
+    MapDrawingArea(ED_DRAWING_ID_ELEMENT_CONTENT_0 + i);
 }
 
 char *getElementDescriptionFilename(int element)
@@ -4489,19 +4750,9 @@ static void DrawPropertiesTabulatorGadgets()
   int gd_y = gd->y + gd_gi->height - 1;
   Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y);
   int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
-#if 1
   int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
-#else
-  int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
-#endif
   int i;
 
-#if 0
-  /* draw additional "configure" tabulator for configurable elements */
-  if (checkPropertiesConfig())
-    id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
-#endif
-
   /* draw additional "advanced" tabulator for custom elements */
   if (IS_CUSTOM_ELEMENT(properties_element))
     id_last = ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED;
@@ -4540,9 +4791,13 @@ static void DrawPropertiesInfo()
   properties[] =
   {
     /* configurable properties */
-    { EP_INDESTRUCTIBLE,       "- undestructible"                      },
-    { EP_SLIPPERY,             "- slippery for falling objects"        },
-    { EP_EM_SLIPPERY_WALL,     "- slippery for some gems (EM style)"   },
+
+    { EP_WALKABLE_OVER,                "- player can walk over it"             },
+    { EP_WALKABLE_INSIDE,      "- player can walk inside it"           },
+    { EP_WALKABLE_UNDER,       "- player can walk under it"            },
+    { EP_PASSABLE_OVER,                "- player can pass over it"             },
+    { EP_PASSABLE_INSIDE,      "- player can pass through it"          },
+    { EP_PASSABLE_UNDER,       "- player can pass under it"            },
 
     { EP_DIGGABLE,             "- diggable"                            },
     { EP_COLLECTIBLE,          "- collectible"                         },
@@ -4550,27 +4805,27 @@ static void DrawPropertiesInfo()
 
     { EP_CAN_MOVE,             "- can move"                            },
     { EP_CAN_FALL,             "- can fall"                            },
-#if 0
-    { EP_CAN_SMASH,            "- can smash"                           },
-#endif
+
     { EP_CAN_SMASH_PLAYER,     "- can smash player"                    },
+#if 0
     { EP_CAN_SMASH_ENEMIES,    "- can smash good and bad guys"         },
+#endif
     { EP_CAN_SMASH_EVERYTHING, "- can smash everything smashable"      },
-    { EP_CAN_EXPLODE,          "- can explode"                         },
-    { EP_CAN_EXPLODE_BY_FIRE,  "  - by fire or explosions"             },
-    { EP_CAN_EXPLODE_SMASHED,  "  - when smashed"                      },
-    { EP_CAN_EXPLODE_IMPACT,   "  - on impact"                         },
+
+    { EP_SLIPPERY,             "- slippery for falling objects"        },
+    { EP_EM_SLIPPERY_WALL,     "- slippery for some gems (EM style)"   },
 
     { EP_DONT_RUN_INTO,                "- deadly when running into"            },
     { EP_DONT_COLLIDE_WITH,    "- deadly when colliding with"          },
     { EP_DONT_TOUCH,           "- deadly when touching"                },
 
-    { EP_WALKABLE_OVER,                "- player can walk over it"             },
-    { EP_WALKABLE_INSIDE,      "- player can walk inside it"           },
-    { EP_WALKABLE_UNDER,       "- player can walk under it"            },
-    { EP_PASSABLE_OVER,                "- player can pass over it"             },
-    { EP_PASSABLE_INSIDE,      "- player can pass through it"          },
-    { EP_PASSABLE_UNDER,       "- player can pass under it"            },
+    { EP_INDESTRUCTIBLE,       "- undestructible"                      },
+
+    { EP_CAN_EXPLODE_BY_FIRE,  "- can explode by fire or explosions"   },
+    { EP_CAN_EXPLODE_SMASHED,  "- can explode when smashed"            },
+    { EP_CAN_EXPLODE_IMPACT,   "- can explode on impact"               },
+
+    { EP_CAN_CHANGE,           "- can change to other element"         },
 
     /* pre-defined properties */
     { EP_CAN_PASS_MAGIC_WALL,  "- can pass magic walls"                },
@@ -4790,9 +5045,22 @@ static void DrawPropertiesConfig()
 
     /* draw drawing area gadgets */
     DrawCustomContentArea();
+
+    /* draw text input gadgets */
+    MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
   }
 }
 
+static void DrawPropertiesAdvancedDrawingAreas()
+{
+  DrawCustomGraphicElementArea();
+  DrawCustomChangeTargetArea();
+  DrawCustomChangeTriggerArea();
+  DrawCustomChangeContentArea();
+
+  redraw_mask |= REDRAW_FIELD;
+}
+
 static void DrawPropertiesAdvanced()
 {
   int i;
@@ -4819,10 +5087,7 @@ static void DrawPropertiesAdvanced()
   MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE);
 
   /* draw drawing area gadgets */
-  DrawCustomGraphicElementArea();
-  DrawCustomChangeTargetArea();
-  DrawCustomChangeContentArea();
-  DrawCustomChangeTriggerArea();
+  DrawPropertiesAdvancedDrawingAreas();
 }
 
 static void DrawElementName(int x, int y, int element)
@@ -4882,12 +5147,6 @@ static void DrawPropertiesWindow()
       !IS_CUSTOM_ELEMENT(properties_element))
     edit_mode_properties = ED_MODE_PROPERTIES_CONFIG;
 
-#if 0
-  if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG &&
-      !checkPropertiesConfig())
-    edit_mode_properties = ED_MODE_PROPERTIES_INFO;
-#endif
-
   if (IS_CUSTOM_ELEMENT(properties_element))
     CopyCustomElementPropertiesToEditor(properties_element);
 
@@ -4922,6 +5181,16 @@ static void DrawPropertiesWindow()
     DrawPropertiesAdvanced();
 }
 
+static void UpdateCustomElementGraphicGadgets()
+{
+  ModifyEditorElementList();
+  RedrawDrawingElements();
+
+  if (edit_mode == ED_MODE_PROPERTIES &&
+      edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED)
+    DrawPropertiesAdvancedDrawingAreas();
+}
+
 static void DrawLineElement(int sx, int sy, int element, boolean change_level)
 {
   int lx = sx + level_xpos;
@@ -5656,32 +5925,36 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        {
          new_element = GFX_ELEMENT(new_element);
          custom_element.gfx_element = new_element;
-         element_info[properties_element] = custom_element;
 
-         ModifyEditorElementList();
-         RedrawDrawingElements();
+         CopyCustomElementPropertiesToGame(properties_element);
+
+         UpdateCustomElementGraphicGadgets();
 
          FrameCounter = 0;     /* restart animation frame counter */
        }
        else if (id == GADGET_ID_CUSTOM_CONTENT)
        {
          custom_element.content[sx][sy] = new_element;
-         element_info[properties_element] = custom_element;
+
+         CopyCustomElementPropertiesToGame(properties_element);
        }
        else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
        {
          custom_element.change.target_element = new_element;
-         element_info[properties_element] = custom_element;
+
+         CopyCustomElementPropertiesToGame(properties_element);
        }
        else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
        {
          custom_element.change.content[sx][sy] = new_element;
-         element_info[properties_element] = custom_element;
+
+         CopyCustomElementPropertiesToGame(properties_element);
        }
        else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
        {
-         custom_element.change.trigger = new_element;
-         element_info[properties_element] = custom_element;
+         custom_element.change.trigger_element = new_element;
+
+         CopyCustomElementPropertiesToGame(properties_element);
        }
        else if (id == GADGET_ID_RANDOM_BACKGROUND)
          random_placement_background_element = new_element;
@@ -5798,7 +6071,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
        PickDrawingElement(button, custom_element.change.content[sx][sy]);
       else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
-       PickDrawingElement(button, custom_element.change.trigger);
+       PickDrawingElement(button, custom_element.change.trigger_element);
       else if (id == GADGET_ID_RANDOM_BACKGROUND)
        PickDrawingElement(button, random_placement_background_element);
       else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
@@ -5880,7 +6153,16 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
 static void HandleTextInputGadgets(struct GadgetInfo *gi)
 {
-  strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
+  int type_id = gi->custom_type_id;
+
+  strcpy(textinput_info[type_id].value, gi->text.value);
+
+  if (type_id == ED_TEXTINPUT_ID_ELEMENT_NAME)
+  {
+    CopyCustomElementPropertiesToGame(properties_element);
+
+    ModifyEditorElementList(); /* update changed button info text */
+  }
 }
 
 static void HandleSelectboxGadgets(struct GadgetInfo *gi)
@@ -5899,13 +6181,26 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
 
 static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
 {
-  if (gi->custom_type_id >= ED_TEXTBUTTON_ID_PROPERTIES_INFO &&
-      gi->custom_type_id <= ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED)
+  int type_id = gi->custom_type_id;
+
+  if (type_id >= ED_TEXTBUTTON_ID_PROPERTIES_INFO &&
+      type_id <= ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED)
   {
     edit_mode_properties = gi->custom_type_id;
 
     DrawPropertiesWindow();
   }
+  else if (type_id == ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE)
+  {
+    boolean new_template = (!LevelFileExists(-1));
+
+    if (new_template ||
+       Request("Save this tem- plate and kill the old ?", REQ_ASK))
+      SaveLevelTemplate();
+
+    if (new_template)
+      Request("Tem- plate saved !", REQ_CONFIRM);
+  }
 }
 
 static void HandleRadiobuttons(struct GadgetInfo *gi)
@@ -5923,13 +6218,31 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
   if ((type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST &&
        type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST) ||
       (type_id >= ED_CHECKBUTTON_ID_CHANGE_FIRST &&
-       type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST))
+       type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST &&
+       type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE))
+  {
     CopyCustomElementPropertiesToGame(properties_element);
+  }
 
   if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC)
   {
-    ModifyEditorElementList();
-    RedrawDrawingElements();
+    UpdateCustomElementGraphicGadgets();
+  }
+  else if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE)
+  {
+    if (level.use_custom_template && !LevelFileExists(-1))
+    {
+      Request("No level tem- plate found !", REQ_CONFIRM);
+
+      level.use_custom_template = FALSE;
+      ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);
+
+      return;
+    }
+
+    LoadLevelTemplate(level.use_custom_template ? -1 : level_nr);
+
+    DrawEditModeWindow();
   }
 }
 
@@ -6177,12 +6490,18 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
-       if (Request("Save this level and kill the old ?", REQ_ASK))
+       boolean new_level = (!LevelFileExists(level_nr));
+
+       if (new_level ||
+           Request("Save this level and kill the old ?", REQ_ASK))
        {
-         CopyPlayfield(Feld, Ur);
+         CopyPlayfield(Feld, level.field);
 
          SaveLevel(level_nr);
        }
+
+       if (new_level)
+         Request("Level saved !", REQ_CONFIRM);
       }
       break;
 
@@ -6194,8 +6513,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (LevelChanged())
          level.game_version = GAME_VERSION_ACTUAL;
 
-       CopyPlayfield(Ur, FieldBackup);
-       CopyPlayfield(Feld, Ur);
+       CopyPlayfield(level.field, FieldBackup);
+       CopyPlayfield(Feld, level.field);
 
        UnmapLevelEditorGadgets();
        UndrawSpecialEditorDoor();
@@ -6544,7 +6863,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
                getElementInfoText(custom_element.change.content[sx][sy]));
     else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
-               getElementInfoText(custom_element.change.trigger));
+               getElementInfoText(custom_element.change.trigger_element));
     else if (id == GADGET_ID_RANDOM_BACKGROUND)
       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
                getElementInfoText(random_placement_background_element));