Removed references to Harry Potter,

because J.K. Rowling is the figurehead of a hate group
and I don't want to condone that in any way.

I liked a 2-word phrase she wrote once, "mischief managed", but that was
decades ago...  and now she is the face of a transphobic movement known as
TERFs.  She turned out to be a pretty terrible person who uses her massive
wealth and influence to spread hate and oppress people.

To be clear:

    Trans rights are human rights.

... and anyone who has a problem with that has no place in this project.

Patch suggested by SiteRelEnby, and TBH it's embarrassing that I didn't remove
the phrase sooner.  It seemed fun and innocent in 2017 when this project
started, but ... things changed.

https://github.com/SiteRelEnby/anduril2/commit/a1cee423b4e0e16909a90d5c3e6a7b70df30d755

22 files changed, 324 insertions, 324 deletions

diff --git a/spaghetti-monster/anduril/battcheck-mode.c b/spaghetti-monster/anduril/battcheck-mode.c
index 0ef6b0a..462540e 100644
--- a/spaghetti-monster/anduril/battcheck-mode.c
+++ b/spaghetti-monster/anduril/battcheck-mode.c
@@ -16,7 +16,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // 2 clicks: next blinky mode
@@ -28,7 +28,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
         #elif defined(USE_SOS_MODE) && defined(USE_SOS_MODE_IN_BLINKY_GROUP)
         set_state(sos_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #ifdef DEFAULT_BLINK_CHANNEL
@@ -44,7 +44,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 7H: voltage config mode
     else if (event == EV_click7_hold) {
         push_state(voltage_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
diff --git a/spaghetti-monster/anduril/beacon-mode.c b/spaghetti-monster/anduril/beacon-mode.c
index 6359b74..5aff508 100644
--- a/spaghetti-monster/anduril/beacon-mode.c
+++ b/spaghetti-monster/anduril/beacon-mode.c
@@ -19,7 +19,7 @@ uint8_t beacon_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // TODO: use sleep ticks to measure time between pulses,
     //       to save power
@@ -33,20 +33,20 @@ uint8_t beacon_state(Event event, uint16_t arg) {
         #elif defined(USE_THERMAL_REGULATION)
         set_state(tempcheck_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: configure beacon timing
     else if (event == EV_click1_hold) {
         if (0 == (arg % TICKS_PER_SECOND)) {
             blink_once();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // release hold: save new timing
     else if (event == EV_click1_hold_release) {
         cfg.beacon_seconds = 1 + (arg / TICKS_PER_SECOND);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/anduril/candle-mode.c b/spaghetti-monster/anduril/candle-mode.c
index bfb0377..ab47c34 100644
--- a/spaghetti-monster/anduril/candle-mode.c
+++ b/spaghetti-monster/anduril/candle-mode.c
@@ -35,14 +35,14 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
     // if the timer just expired, shut off
     if (sunset_active  &&  (! sunset_timer)) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // ifdef USE_SUNSET_TIMER
 
 
     if (event == EV_enter_state) {
         ramp_direction = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_SUNSET_TIMER
     // 2 clicks: cancel timer
@@ -50,7 +50,7 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
         // parent state just rotated through strobe/flasher modes,
         // so cancel timer...  in case any time was left over from earlier
         sunset_timer = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // ifdef USE_SUNSET_TIMER
     // hold: change brightness (brighter)
@@ -64,19 +64,19 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
         candle_mode_brightness += ramp_direction;
         if (candle_mode_brightness < 1) candle_mode_brightness = 1;
         else if (candle_mode_brightness > MAX_CANDLE_LEVEL) candle_mode_brightness = MAX_CANDLE_LEVEL;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
         ramp_direction = -ramp_direction;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
         ramp_direction = 1;
         if (candle_mode_brightness > 1)
             candle_mode_brightness --;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // clock tick: animate candle brightness
     else if (event == EV_tick) {
@@ -129,7 +129,7 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
             // random amplitude
             //candle_wave3_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
             candle_wave3_depth = pseudo_rand() % (CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/anduril/channel-modes.c b/spaghetti-monster/anduril/channel-modes.c
index 76cbf7e..cecf0bf 100644
--- a/spaghetti-monster/anduril/channel-modes.c
+++ b/spaghetti-monster/anduril/channel-modes.c
@@ -129,7 +129,7 @@ uint8_t channel_mode_state(Event event, uint16_t arg) {
     // channel toggle menu on ... 9H?
     else if (event == EV_click9_hold) {
         push_state(channel_mode_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
diff --git a/spaghetti-monster/anduril/config-mode.c b/spaghetti-monster/anduril/config-mode.c
index b8b3398..d379cd9 100644
--- a/spaghetti-monster/anduril/config-mode.c
+++ b/spaghetti-monster/anduril/config-mode.c
@@ -166,7 +166,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
         else {
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // count clicks: click = +1, hold = +10
@@ -186,7 +186,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
         set_channel_mode(CONFIG_BLINK_CHANNEL);
         #endif
         set_level(RAMP_SIZE/2);  // flash briefly
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // eat all other events; don't pass any through to parent
diff --git a/spaghetti-monster/anduril/ff-strobe-modes.c b/spaghetti-monster/anduril/ff-strobe-modes.c
index 9e7f2bb..b7a7303 100644
--- a/spaghetti-monster/anduril/ff-strobe-modes.c
+++ b/spaghetti-monster/anduril/ff-strobe-modes.c
@@ -12,19 +12,19 @@ uint8_t boring_strobe_state(Event event, uint16_t arg) {
     uint8_t st = boring_strobe_type;
 
     if (event == EV_enter_state) {
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         // reset to police strobe for next time
         boring_strobe_type = 0;
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         boring_strobe_type = (st + 1) % NUM_BORING_STROBES;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/anduril/lockout-mode.c b/spaghetti-monster/anduril/lockout-mode.c
index ee78a19..422d081 100644
--- a/spaghetti-monster/anduril/lockout-mode.c
+++ b/spaghetti-monster/anduril/lockout-mode.c
@@ -59,7 +59,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
             rgb_led_update(cfg.rgb_led_lockout_mode, arg);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #if defined(TICK_DURING_STANDBY) && (defined(USE_INDICATOR_LED) || defined(USE_AUX_RGB_LEDS))
@@ -77,7 +77,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         #elif defined(USE_AUX_RGB_LEDS)
         rgb_led_update(cfg.rgb_led_lockout_mode, arg);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -85,7 +85,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     else if (event == EV_3clicks) {
         blink_once();
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // 4 clicks: exit and turn on
@@ -98,7 +98,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         else
         #endif
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // 4 clicks, but hold last: exit and start at floor
@@ -109,13 +109,13 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         current_event = 0;
         // ... and back to ramp mode
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // 5 clicks: exit and turn on at ceiling level
     else if (event == EV_5clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #if NUM_CHANNEL_MODES > 1
@@ -155,7 +155,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         #elif defined(USE_AUX_RGB_LEDS)
         #endif
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #elif defined(USE_AUX_RGB_LEDS)
     // 7 clicks: change RGB aux LED pattern
@@ -166,7 +166,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         rgb_led_update(cfg.rgb_led_lockout_mode, 0);
         save_config();
         blink_once();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 7H: change RGB aux LED color
     else if (event == EV_click7_hold) {
@@ -178,13 +178,13 @@ uint8_t lockout_state(Event event, uint16_t arg) {
             //save_config();
         }
         rgb_led_update(cfg.rgb_led_lockout_mode, arg);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 7H, release: save new color
     else if (event == EV_click7_hold_release) {
         setting_rgb_mode_now = 0;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -199,7 +199,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     // 10H: configure the autolock option
     else if (event == EV_click10_hold) {
         push_state(autolock_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
diff --git a/spaghetti-monster/anduril/momentary-mode.c b/spaghetti-monster/anduril/momentary-mode.c
index 2d8d57b..a765142 100644
--- a/spaghetti-monster/anduril/momentary-mode.c
+++ b/spaghetti-monster/anduril/momentary-mode.c
@@ -22,14 +22,14 @@ uint8_t momentary_state(Event event, uint16_t arg) {
         if (momentary_mode == 0) {
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // button was released
     else if ((event & (B_CLICK | B_PRESS)) == (B_CLICK)) {
         momentary_active = 0;
         set_level(0);
         //go_to_standby = 1;  // sleep while light is off
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // Sleep, dammit!  (but wait a few seconds first)
@@ -59,7 +59,7 @@ uint8_t momentary_state(Event event, uint16_t arg) {
         #ifdef USE_STROBE_STATE
         }
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
diff --git a/spaghetti-monster/anduril/off-mode.c b/spaghetti-monster/anduril/off-mode.c
index c1ae2e4..ab67d96 100644
--- a/spaghetti-monster/anduril/off-mode.c
+++ b/spaghetti-monster/anduril/off-mode.c
@@ -28,7 +28,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         // sleep while off  (lower power use)
         // (unless delay requested; give the ADC some time to catch up)
         if (! arg) { go_to_standby = 1; }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // go back to sleep eventually if we got bumped but didn't leave "off" state
@@ -42,7 +42,7 @@ uint8_t off_state(Event event, uint16_t arg) {
             rgb_led_update(cfg.rgb_led_off_mode, arg);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #if defined(TICK_DURING_STANDBY)
@@ -69,7 +69,7 @@ uint8_t off_state(Event event, uint16_t arg) {
                 set_state(lockout_state, 0);
             }
         #endif  // ifdef USE_AUTOLOCK
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -77,7 +77,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     // hold (initially): go to lowest level (floor), but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(nearest_level(1));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // B_TIMING_ON == B_PRESS_T
 
@@ -95,7 +95,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         #endif
         #ifdef USE_RAMP_AFTER_MOON_CONFIG
         if (cfg.dont_ramp_after_moon) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         #endif
         // don't start ramping immediately;
@@ -104,13 +104,13 @@ uint8_t off_state(Event event, uint16_t arg) {
         if (arg >= (!cfg.ramp_style) * HOLD_TIMEOUT) {  // more consistent
             set_state(steady_state, 1);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // hold, release quickly: go to lowest level (floor)
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #if (B_TIMING_ON != B_TIMEOUT_T)
@@ -124,7 +124,7 @@ uint8_t off_state(Event event, uint16_t arg) {
             }
         #endif
         set_level(nearest_level(memorized_level));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // if (B_TIMING_ON != B_TIMEOUT_T)
 
@@ -138,7 +138,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         //        (need to duplicate manual mem logic here, probably)
         set_state(steady_state, memorized_level);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // click, hold: momentary at ceiling or turbo
@@ -167,30 +167,30 @@ uint8_t off_state(Event event, uint16_t arg) {
         #endif
 
         set_level(turbo_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     else if (event == EV_click2_hold_release) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // 2 clicks: highest mode (ceiling)
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // 3 clicks (initial press): off, to prep for later events
     else if (event == EV_click3_press) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #ifdef USE_BATTCHECK
     // 3 clicks: battcheck mode / blinky mode group 1
     else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -199,7 +199,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     else if (event == EV_4clicks) {
         blink_once();
         set_state(lockout_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -207,7 +207,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     // 13 clicks and hold the last click: invoke factory reset (reboot)
     else if (event == EV_click13_hold) {
         reboot();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -215,7 +215,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     // 15+ clicks: show the version number
     else if (event == EV_15clicks) {
         set_state(version_check_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -230,7 +230,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         else {  // configure simple UI ramp
             push_state(simple_ui_config_state, 0);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     ////////// Every action below here is blocked in the (non-Extended) Simple UI //////////
@@ -246,12 +246,12 @@ uint8_t off_state(Event event, uint16_t arg) {
     #ifdef USE_STROBE_STATE
     else if (event == EV_click3_hold) {
         set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #elif defined(USE_BORING_STROBE_STATE)
     else if (event == EV_click3_hold) {
         set_state(boring_strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -271,7 +271,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         // redundant, sleep tick does the same thing
         //indicator_led_update(cfg.indicator_led_mode & 0x03, arg);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #elif defined(USE_AUX_RGB_LEDS)
     // 7 clicks: change RGB aux LED pattern
@@ -282,7 +282,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         rgb_led_update(cfg.rgb_led_off_mode, 0);
         save_config();
         blink_once();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 7 clicks (hold last): change RGB aux LED color
     else if (event == EV_click7_hold) {
@@ -294,12 +294,12 @@ uint8_t off_state(Event event, uint16_t arg) {
             //save_config();
         }
         rgb_led_update(cfg.rgb_led_off_mode, arg);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     else if (event == EV_click7_hold_release) {
         setting_rgb_mode_now = 0;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // end 7 clicks
 
@@ -317,7 +317,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         blink_once();
         cfg.simple_ui_active = 1;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // ifdef USE_SIMPLE_UI
 
@@ -326,7 +326,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     else if (event == EV_5clicks) {
         blink_once();
         set_state(momentary_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -335,7 +335,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     else if (event == EV_6clicks) {
         blink_once();
         set_state(tactical_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -343,7 +343,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     // 9 clicks, but hold last click: configure misc global settings
     else if ((event == EV_click9_hold) && (!arg)) {
         push_state(globals_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
diff --git a/spaghetti-monster/anduril/ramp-mode.c b/spaghetti-monster/anduril/ramp-mode.c
index 1799e97..4fef2c2 100644
--- a/spaghetti-monster/anduril/ramp-mode.c
+++ b/spaghetti-monster/anduril/ramp-mode.c
@@ -79,7 +79,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
     // if the timer just expired, shut off
     else if (sunset_active  &&  (! sunset_timer)) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // ifdef USE_SUNSET_TIMER
 
@@ -99,25 +99,25 @@ uint8_t steady_state(Event event, uint16_t arg) {
         arg = nearest_level(arg);
         set_level_and_therm_target(arg);
         ramp_direction = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if (B_TIMING_OFF == B_RELEASE_T)
     // 1 click (early): off, if configured for early response
     else if (event == EV_click1_release) {
         level_before_off = actual_level;
         set_level_and_therm_target(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks (early): abort turning off, if configured for early response
     else if (event == EV_click2_press) {
         set_level_and_therm_target(level_before_off);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // if (B_TIMING_OFF == B_RELEASE_T)
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
@@ -130,7 +130,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SUNSET_TIMER
         reset_sunset_timer();
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #ifdef USE_LOCKOUT_MODE
@@ -138,7 +138,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
     else if (event == EV_4clicks) {
         set_level(0);
         set_state(lockout_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -147,12 +147,12 @@ uint8_t steady_state(Event event, uint16_t arg) {
     else if ((event == EV_click1_hold) || (event == EV_click2_hold)) {
         // ramp slower in discrete mode
         if (cfg.ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         #ifdef USE_RAMP_SPEED_CONFIG
         // ramp slower if user configured things that way
         if ((! cfg.ramp_style) && (arg % ramp_speed)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         #endif
         // fix ramp direction on first frame if necessary
@@ -228,7 +228,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SUNSET_TIMER
         reset_sunset_timer();
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if ((event == EV_click1_hold_release)
@@ -237,7 +237,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef START_AT_MEMORIZED_LEVEL
         save_config_wl();
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     else if (event == EV_tick) {
@@ -292,7 +292,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             }
         }
         #endif  // ifdef USE_SET_LEVEL_GRADUALLY
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #ifdef USE_THERMAL_REGULATION
@@ -322,7 +322,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepdown);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -341,7 +341,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepup);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_SET_LEVEL_GRADUALLY
     // temperature is within target window
@@ -352,7 +352,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             gradual_target = actual_level + 1;
         else if (gradual_target < actual_level)
             gradual_target = actual_level - 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // ifdef USE_SET_LEVEL_GRADUALLY
     #endif  // ifdef USE_THERMAL_REGULATION
@@ -397,7 +397,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SUNSET_TIMER
         reset_sunset_timer();
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // If we allowed 3C in Simple UI, now block further actions
@@ -428,7 +428,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level_and_therm_target(turbo_level);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     else if ((event == EV_click3_hold_release)
             #ifdef USE_CHANNEL_MODE_ARGS
@@ -442,7 +442,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
                 return EVENT_NOT_HANDLED;
         #endif
         set_level_and_therm_target(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     #ifdef USE_MOMENTARY_MODE
@@ -450,7 +450,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
     else if (event == EV_5clicks) {
         set_level(0);
         set_state(momentary_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -458,7 +458,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
     // 7H: configure this ramp mode
     else if (event == EV_click7_hold) {
         push_state(ramp_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -468,7 +468,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         manual_memory_save();
         save_config();
         blink_once();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     else if (event == EV_click10_hold) {
         #ifdef USE_RAMP_EXTRAS_CONFIG
@@ -482,7 +482,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             blink_once();
         }
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif  // ifdef USE_MANUAL_MEMORY
 
diff --git a/spaghetti-monster/anduril/sos-mode.c b/spaghetti-monster/anduril/sos-mode.c
index 4704297..2a4e97c 100644
--- a/spaghetti-monster/anduril/sos-mode.c
+++ b/spaghetti-monster/anduril/sos-mode.c
@@ -11,7 +11,7 @@ uint8_t sos_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: next blinky mode
     else if (event == EV_2clicks) {
@@ -22,7 +22,7 @@ uint8_t sos_state(Event event, uint16_t arg) {
         #elif defined(USE_BEACON_MODE)
         set_state(beacon_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/anduril/strobe-modes.c b/spaghetti-monster/anduril/strobe-modes.c
index 9963c80..0a4ff98 100644
--- a/spaghetti-monster/anduril/strobe-modes.c
+++ b/spaghetti-monster/anduril/strobe-modes.c
@@ -29,24 +29,24 @@ uint8_t strobe_state(Event event, uint16_t arg) {
     // init anything which needs to be initialized
     else if (event == EV_enter_state) {
         ramp_direction = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         cfg.strobe_type = (st + 1) % NUM_STROBES;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: rotate backward through strobe/flasher modes
     else if (event == EV_4clicks) {
         cfg.strobe_type = (st - 1 + NUM_STROBES) % NUM_STROBES;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change speed (go faster)
     //       or change brightness (brighter)
@@ -83,14 +83,14 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         }
         #endif
 
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     // ... and save new strobe settings
     else if (event == EV_click1_hold_release) {
         ramp_direction = -ramp_direction;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change speed (go slower)
     //       or change brightness (dimmer)
@@ -124,19 +124,19 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         }
         #endif
 
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // release hold: save new strobe settings
     else if (event == EV_click2_hold_release) {
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_MOMENTARY_MODE
     // 5 clicks: go to momentary mode (momentary strobe)
     else if (event == EV_5clicks) {
         set_state(momentary_state, 0);
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #if defined(USE_LIGHTNING_MODE) || defined(USE_CANDLE_MODE)
@@ -146,7 +146,7 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         if (arg == AUTO_REVERSE_TIME) ramp_direction = 1;
 
         pseudo_rand_seed += arg;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
diff --git a/spaghetti-monster/anduril/sunset-timer.c b/spaghetti-monster/anduril/sunset-timer.c
index bb59ec9..e4fc512 100644
--- a/spaghetti-monster/anduril/sunset-timer.c
+++ b/spaghetti-monster/anduril/sunset-timer.c
@@ -17,7 +17,7 @@ uint8_t sunset_timer_state(Event event, uint16_t arg) {
     if (event == EV_enter_state) {
         sunset_timer = 0;
         sunset_ticks = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: maybe "bump" the timer if it's active and almost expired
     else if (event == EV_hold) {
@@ -40,7 +40,7 @@ uint8_t sunset_timer_state(Event event, uint16_t arg) {
                 blink_once();
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // tick: count down until time expires
     else if (event == EV_tick) {
@@ -53,7 +53,7 @@ uint8_t sunset_timer_state(Event event, uint16_t arg) {
                 sunset_timer --;
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/anduril/tactical-mode.c b/spaghetti-monster/anduril/tactical-mode.c
index 2f5c3b0..8f2e73d 100644
--- a/spaghetti-monster/anduril/tactical-mode.c
+++ b/spaghetti-monster/anduril/tactical-mode.c
@@ -83,7 +83,7 @@ uint8_t tactical_state(Event event, uint16_t arg) {
     // 7H: configure tactical mode
     else if (event == EV_click7_hold) {
         push_state(tactical_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return ret;
diff --git a/spaghetti-monster/anduril/tempcheck-mode.c b/spaghetti-monster/anduril/tempcheck-mode.c
index 4a413c9..5d160bd 100644
--- a/spaghetti-monster/anduril/tempcheck-mode.c
+++ b/spaghetti-monster/anduril/tempcheck-mode.c
@@ -10,7 +10,7 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: next blinky mode
     else if (event == EV_2clicks) {
@@ -21,12 +21,12 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
         #elif defined(USE_BATTCHECK)
         set_state(battcheck_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 7H: thermal config mode
     else if (event == EV_click7_hold) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/baton/baton.c b/spaghetti-monster/baton/baton.c
index 8a80134..e672755 100644
--- a/spaghetti-monster/baton/baton.c
+++ b/spaghetti-monster/baton/baton.c
@@ -152,12 +152,12 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         PWM1_LVL = 0;  PWM2_LVL = 0;  // make sure emitters are off
         // sleep 1 second after user stops pressing buttons
         if (arg > TICKS_PER_SECOND) { go_to_standby = 1; }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: exit, and turn on at "low" level
     else if (event == EV_4clicks) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/darkhorse/darkhorse.c b/spaghetti-monster/darkhorse/darkhorse.c
index 4058c2f..aa37b92 100644
--- a/spaghetti-monster/darkhorse/darkhorse.c
+++ b/spaghetti-monster/darkhorse/darkhorse.c
@@ -166,12 +166,12 @@ uint8_t any_mode_state(Event event, uint16_t arg, uint8_t *primary, uint8_t *sec
     // turn on LED when entering the mode
     if (event == EV_enter_state) {
         set_any_mode(*primary, *secondary, modes);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change brightness (low, med, hi, always starting at low)
     else if (event == EV_click1_hold) {
@@ -187,14 +187,14 @@ uint8_t any_mode_state(Event event, uint16_t arg, uint8_t *primary, uint8_t *sec
                 set_state(hi_mode_state, 0);
                 break;
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: toggle primary/secondary level
     else if (event == EV_2clicks) {
         *primary ^= 1;
         set_any_mode(*primary, *secondary, modes);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click-release-hold: change secondary level
     else if (event == EV_click2_hold) {
@@ -204,7 +204,7 @@ uint8_t any_mode_state(Event event, uint16_t arg, uint8_t *primary, uint8_t *sec
             *primary = 0;
             set_any_mode(*primary, *secondary, modes);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold, release: save secondary level
     else if (event == EV_click2_hold_release) {
@@ -259,20 +259,20 @@ uint8_t strobe_beacon_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click (initially): cancel current blink
     // FIXME: this is no longer necessary; FSM does this automatically now
     if (event == EV_click1_release) {
         interrupt_nice_delays();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: rotate through blinky modes
     else if (event == EV_2clicks) {
         strobe_beacon_mode = (strobe_beacon_mode + 1) & 3;
         save_config();
         interrupt_nice_delays();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/fireflies-ui/fireflies-ui.c b/spaghetti-monster/fireflies-ui/fireflies-ui.c
index 93a3180..34f8293 100644
--- a/spaghetti-monster/fireflies-ui/fireflies-ui.c
+++ b/spaghetti-monster/fireflies-ui/fireflies-ui.c
@@ -460,7 +460,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         #endif
         // sleep while off  (lower power use)
         go_to_standby = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // go back to sleep eventually if we got bumped but didn't leave "off" state
     else if (event == EV_tick) {
@@ -470,7 +470,7 @@ uint8_t off_state(Event event, uint16_t arg) {
             indicator_led(indicator_led_mode & 0x03);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(TICK_DURING_STANDBY) && defined(USE_INDICATOR_LED)
     // blink the indicator LED, maybe
@@ -478,13 +478,13 @@ uint8_t off_state(Event event, uint16_t arg) {
         if ((indicator_led_mode & 0b00000011) == 0b00000011) {
             indicator_blink(arg);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold (initially): go to lowest level (floor), but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(nearest_level(1));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
@@ -500,75 +500,75 @@ uint8_t off_state(Event event, uint16_t arg) {
         if (arg >= (!ramp_style) * HOLD_TIMEOUT) {  // more consistent
             set_state(steady_state, 1);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold, release quickly: go to lowest level (floor)
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(nearest_level(memorized_level));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: go to highest level (ceiling) (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: highest mode (ceiling)
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks (initial press): off, to prep for later events
     else if (event == EV_click3_press) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_BATTCHECK
     // 3 clicks: battcheck mode / blinky mode group 1
     else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // click, click, long-click: strobe mode
     #ifdef USE_STROBE_STATE
     else if (event == EV_click3_hold) {
         set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #elif defined(USE_BORING_STROBE_STATE)
     else if (event == EV_click3_hold) {
         set_state(boring_strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 4 clicks: soft lockout
     else if (event == EV_4clicks) {
         blink_confirm(2);
         set_state(lockout_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 5 clicks: momentary mode
     else if (event == EV_5clicks) {
         blink_confirm(1);
         set_state(momentary_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_MUGGLE_MODE
     // 6 clicks: muggle mode
     else if (event == EV_6clicks) {
         blink_confirm(1);
         set_state(muggle_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_INDICATOR_LED
@@ -586,19 +586,19 @@ uint8_t off_state(Event event, uint16_t arg) {
         indicator_led_mode = (indicator_led_mode & 0b11111100) | mode;
         indicator_led(mode);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 8 clicks: temperature check
     else if (event == EV_8clicks) {
         set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_TENCLICK_THERMAL_CONFIG
     // 10 clicks: thermal config mode
     else if (event == EV_10clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -637,12 +637,12 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_REVERSING
         ramp_direction = 1;
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
@@ -659,7 +659,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             #endif
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: toggle smooth vs discrete ramping
     else if (event == EV_3clicks) {
@@ -677,20 +677,20 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #endif
         blip();
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_RAMP_CONFIG
     // 4 clicks: configure this ramp mode
     else if (event == EV_4clicks) {
         push_state(ramp_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         #ifdef USE_REVERSING
         // fix ramp direction on first frame if necessary
@@ -744,7 +744,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_REVERSING) || defined(START_AT_MEMORIZED_LEVEL)
     // reverse ramp direction on hold release
@@ -755,7 +755,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef START_AT_MEMORIZED_LEVEL
         save_config_wl();
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // click, hold: change brightness (dimmer)
@@ -765,7 +765,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #endif
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         // TODO? make it ramp up instead, if already at min?
         memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
@@ -804,13 +804,13 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef START_AT_MEMORIZED_LEVEL
     // click, release, hold, release: save new ramp level (if necessary)
     else if (event == EV_click2_hold_release) {
         save_config_wl();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
@@ -822,7 +822,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SET_LEVEL_GRADUALLY
         // make thermal adjustment speed scale with magnitude
         if ((arg & 1) && (actual_level < THERM_FASTER_LEVEL)) {
-            return MISCHIEF_MANAGED;  // adjust slower when not a high mode
+            return EVENT_HANDLED;  // adjust slower when not a high mode
         }
         #ifdef THERM_HARD_TURBO_DROP
         else if ((! (actual_level < THERM_FASTER_LEVEL))
@@ -864,7 +864,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_THERMAL_REGULATION
@@ -893,7 +893,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepdown);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -912,7 +912,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepup);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -1004,18 +1004,18 @@ uint8_t strobe_state(Event event, uint16_t arg) {
     // init anything which needs to be initialized
     else if (event == EV_enter_state) {
         ramp_direction = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         strobe_type = (st + 1) % NUM_STROBES;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change speed (go faster)
     //       or change brightness (brighter)
@@ -1052,14 +1052,14 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         }
         #endif
 
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     // ... and save new strobe settings
     else if (event == EV_click1_hold_release) {
         ramp_direction = -ramp_direction;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change speed (go slower)
     //       or change brightness (dimmer)
@@ -1093,12 +1093,12 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         }
         #endif
 
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // release hold: save new strobe settings
     else if (event == EV_click2_hold_release) {
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_LIGHTNING_MODE) || defined(USE_CANDLE_MODE)
     // clock tick: bump the random seed
@@ -1107,7 +1107,7 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         if (arg == TICKS_PER_SECOND) ramp_direction = 1;
 
         pseudo_rand_seed += arg;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -1223,14 +1223,14 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
     if (event == EV_enter_state) {
         candle_mode_timer = 0;  // in case any time was left over from earlier
         ramp_direction = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: cancel timer
     else if (event == EV_2clicks) {
         // parent state just rotated through strobe/flasher modes,
         // so cancel timer...  in case any time was left over from earlier
         candle_mode_timer = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
@@ -1243,19 +1243,19 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
         candle_mode_brightness += ramp_direction;
         if (candle_mode_brightness < 1) candle_mode_brightness = 1;
         else if (candle_mode_brightness > MAX_CANDLE_LEVEL) candle_mode_brightness = MAX_CANDLE_LEVEL;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
         ramp_direction = -ramp_direction;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
         ramp_direction = 1;
         if (candle_mode_brightness > 1)
             candle_mode_brightness --;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: add 30m to candle timer
     else if (event == EV_3clicks) {
@@ -1266,7 +1266,7 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
             set_level(actual_level + 32);
             delay_4ms(2);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // clock tick: animate candle brightness
     else if (event == EV_tick) {
@@ -1328,7 +1328,7 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
             // random amplitude
             //candle_wave3_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
             candle_wave3_depth = pseudo_rand() % (CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1345,19 +1345,19 @@ uint8_t boring_strobe_state(Event event, uint16_t arg) {
     momentary_mode = 1;  // 0 = ramping, 1 = strobes
 
     if (event == EV_enter_state) {
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         // reset to police strobe for next time
         boring_strobe_type = 0;
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         boring_strobe_type = (st + 1) % NUM_BORING_STROBES;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1411,7 +1411,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_GOODNIGHT_MODE) || defined(USE_BEACON_MODE)
     // 2 clicks: next mode
@@ -1421,7 +1421,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
         #elif defined(USE_BEACON_MODE)
         set_state(beacon_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -1434,19 +1434,19 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if 0  // not part of a loop in this UI
     // 2 clicks: battcheck mode
     else if (event == EV_2clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 4 clicks: thermal config mode
     else if (event == EV_4clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1458,7 +1458,7 @@ uint8_t beacon_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // TODO: use sleep ticks to measure time between pulses,
     //       to save power
@@ -1469,12 +1469,12 @@ uint8_t beacon_state(Event event, uint16_t arg) {
         #else
         set_state(battcheck_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: beacon config mode
     else if (event == EV_4clicks) {
         push_state(beacon_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1490,12 +1490,12 @@ uint8_t goodnight_state(Event event, uint16_t arg) {
         ticks_since_stepdown = 0;
         blink_confirm(2);
         set_level(GOODNIGHT_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: beacon mode
     else if (event == EV_2clicks) {
@@ -1504,7 +1504,7 @@ uint8_t goodnight_state(Event event, uint16_t arg) {
         #elif defined(USE_TEMPCHECK_MODE)
         set_state(tempcheck_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // tick: step down (maybe) or off (maybe)
     else if (event == EV_tick) {
@@ -1520,7 +1520,7 @@ uint8_t goodnight_state(Event event, uint16_t arg) {
                 set_state(off_state, 0);
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1572,14 +1572,14 @@ uint8_t lockout_state(Event event, uint16_t arg) {
             indicator_led(indicator_led_mode >> 2);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(TICK_DURING_STANDBY) && defined(USE_INDICATOR_LED)
     else if (event == EV_sleep_tick) {
         if ((indicator_led_mode & 0b00001100) == 0b00001100) {
             indicator_blink(arg);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_INDICATOR_LED
@@ -1597,7 +1597,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         indicator_led_mode = (mode << 2) + (indicator_led_mode & 0x03);
         indicator_led(mode);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if 0  // old method, deprecated in favor of "7 clicks from off"
     // click, click, hold: rotate through indicator LED modes (off mode)
@@ -1624,12 +1624,12 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         indicator_led(mode);
         #endif
         //save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, click, hold, release: save indicator LED mode (off mode)
     else if (event == EV_click3_hold_release) {
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #endif
@@ -1637,7 +1637,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     else if (event == EV_4clicks) {
         blink_confirm(1);
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -1660,14 +1660,14 @@ uint8_t momentary_state(Event event, uint16_t arg) {
         if (momentary_mode == 0) {
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // button was released
     else if ((event & (B_CLICK | B_PRESS)) == (B_CLICK)) {
         momentary_active = 0;
         set_level(0);
         //go_to_standby = 1;  // sleep while light is off
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // Sleep, dammit!  (but wait a few seconds first)
@@ -1688,7 +1688,7 @@ uint8_t momentary_state(Event event, uint16_t arg) {
                 // TODO: lighted button should use lockout config?
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -1721,7 +1721,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
             //memorized_level = MAX_1x7135;
             memorized_level = (MUGGLE_FLOOR + MUGGLE_CEILING) / 2;
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // initial press: moon hint
     else if (event == EV_click1_press) {
@@ -1749,12 +1749,12 @@ uint8_t muggle_state(Event event, uint16_t arg) {
             set_level(memorized_level);
         }
         */
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change brightness
     else if (event == EV_click1_hold) {
         // ramp at half speed
-        if (arg & 1) return MISCHIEF_MANAGED;
+        if (arg & 1) return EVENT_HANDLED;
 
         // if off, start at bottom
         if (muggle_off_mode) {
@@ -1776,7 +1776,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
             memorized_level = m;
             set_level(m);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
@@ -1784,7 +1784,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         #ifdef START_AT_MEMORIZED_LEVEL
         save_config_wl();  // momentary use should retain brightness level
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     /*
     // click, hold: change brightness (dimmer)
@@ -1793,7 +1793,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         if (memorized_level > MUGGLE_FLOOR)
             memorized_level = actual_level - 1;
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     */
     // 6 clicks: exit muggle mode
@@ -1802,7 +1802,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         muggle_mode_active = 0;
         save_config();
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // tick: housekeeping
     else if (event == EV_tick) {
@@ -1815,7 +1815,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
                 go_to_standby = 1;  // sleep while light is off
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_THERMAL_REGULATION
     // overheating is handled specially in muggle mode
@@ -1827,7 +1827,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         uint8_t new = actual_level - arg;
         if (new < MUGGLE_FLOOR) { new = MUGGLE_FLOOR; }
         set_level(new);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // low voltage is handled specially in muggle mode
@@ -1838,7 +1838,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         } else {
             muggle_off_mode = 1;
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -1854,7 +1854,7 @@ uint8_t config_state_base(Event event, uint16_t arg,
     if (event == EV_enter_state) {
         config_step = 0;
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance forward through config steps
     else if (event == EV_tick) {
@@ -1868,13 +1868,13 @@ uint8_t config_state_base(Event event, uint16_t arg,
             //set_state(retstate, retval);
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
         config_state_values[config_step] = number_entry_value;
         config_step ++;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     //return EVENT_NOT_HANDLED;
     // eat all other events; don't pass any through to parent
@@ -1978,7 +1978,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
         blinks_left = arg;
         entry_step = 0;
         wait_ticks = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance through the process:
     // 0: wait a moment
@@ -2035,7 +2035,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             number_entry_value = value;
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // count clicks
     else if (event == EV_click1_release) {
@@ -2048,7 +2048,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             delay_4ms(8/2);
             set_level(0);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/meteor/meteor.c b/spaghetti-monster/meteor/meteor.c
index 7d854a1..9c1c000 100644
--- a/spaghetti-monster/meteor/meteor.c
+++ b/spaghetti-monster/meteor/meteor.c
@@ -262,7 +262,7 @@ uint8_t base_on_state(Event event, uint16_t arg, uint8_t *mode, uint8_t *group)
     // 1 click: off
     if (event == EV_1click) {
         set_state(base_off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_THERMAL_REGULATION
     // overheating: drop by an amount proportional to how far we are above the ceiling
@@ -312,17 +312,17 @@ uint8_t ui1_on_state(Event event, uint16_t arg) {
     else if (event == EV_2clicks) {
         *mode ^= 1;
         set_any_mode(*mode, group);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: turbo
     else if (event == EV_hold) {
         if (arg == 0) set_level(MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // release: exit turbo
     else if (event == EV_click1_hold_release) {
         set_any_mode(*mode, group);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return base_on_state(event, arg, mode, group);
 }
@@ -361,7 +361,7 @@ uint8_t ui2_on_state(Event event, uint16_t arg) {
     else if (event == EV_2clicks) {
         *mode ^= 1;
         set_any_mode(*mode, group);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: rotate through low/mid/high/turbo
     else if (event == EV_hold) {
@@ -371,7 +371,7 @@ uint8_t ui2_on_state(Event event, uint16_t arg) {
         else if (arg % HOLD_TIMEOUT == 1) {
             set_any_mode(*mode, group);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return base_on_state(event, arg, mode, group);
 }
@@ -413,7 +413,7 @@ uint8_t ui3_on_state(Event event, uint16_t arg) {
     /*
     else if (event == EV_click1_hold) {
         set_level(levels[*mode]);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     */
     // hold: turbo
@@ -427,7 +427,7 @@ uint8_t blinky_base_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(base_off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/ramping-ui/ramping-ui.c b/spaghetti-monster/ramping-ui/ramping-ui.c
index 5eb7d8f..583498a 100644
--- a/spaghetti-monster/ramping-ui/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui/ramping-ui.c
@@ -59,43 +59,43 @@ uint8_t off_state(Event event, uint16_t arg) {
         set_level(0);
         // sleep while off  (lower power use)
         go_to_standby = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks (initial press): off, to prep for later events
     else if (event == EV_click2_press) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: strobe mode
     else if (event == EV_3clicks) {
         set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_BATTCHECK
     // 4 clicks: battcheck mode
     else if (event == EV_4clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold: go to lowest level
@@ -104,17 +104,17 @@ uint8_t off_state(Event event, uint16_t arg) {
         // give the user time to release at moon level
         if (arg >= HOLD_TIMEOUT)
             set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold, release quickly: go to lowest level
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: go to highest level (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -131,12 +131,12 @@ uint8_t steady_state(Event event, uint16_t arg) {
         target_level = arg;
         #endif
         set_level(arg);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
@@ -153,12 +153,12 @@ uint8_t steady_state(Event event, uint16_t arg) {
             #endif
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: go to strobe modes
     else if (event == EV_3clicks) {
         set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: toggle smooth vs discrete ramping
     else if (event == EV_4clicks) {
@@ -167,13 +167,13 @@ uint8_t steady_state(Event event, uint16_t arg) {
         set_level(0);
         delay_4ms(20/4);
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
         // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         // FIXME: make it ramp down instead, if already at max
         if (actual_level + ramp_step_size < MAX_LEVEL)
@@ -190,13 +190,13 @@ uint8_t steady_state(Event event, uint16_t arg) {
             delay_4ms(8/4);
         }
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
         // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         // FIXME: make it ramp up instead, if already at min
         if (actual_level > ramp_step_size)
@@ -214,7 +214,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             delay_4ms(8/4);
         }
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_THERMAL_REGULATION
     // TODO: test this on a real light
@@ -225,7 +225,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
             set_level(stepdown);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -235,7 +235,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             if (stepup > target_level) stepup = target_level;
             set_level(stepup);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -244,36 +244,36 @@ uint8_t steady_state(Event event, uint16_t arg) {
 
 uint8_t strobe_state(Event event, uint16_t arg) {
     if (event == EV_enter_state) {
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: toggle party strobe vs tactical strobe
     else if (event == EV_2clicks) {
         strobe_type ^= 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: go back to regular modes
     else if (event == EV_3clicks) {
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change speed (go faster)
     else if (event == EV_click1_hold) {
         if ((arg & 1) == 0) {
             if (strobe_delay > 8) strobe_delay --;
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change speed (go slower)
     else if (event == EV_click2_hold) {
         if ((arg & 1) == 0) {
             if (strobe_delay < 255) strobe_delay ++;
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -284,12 +284,12 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: tempcheck mode
     else if (event == EV_2clicks) {
         set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -298,7 +298,7 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/rampingios/rampingiosv3.c b/spaghetti-monster/rampingios/rampingiosv3.c
index 7b6baee..e990a5a 100644
--- a/spaghetti-monster/rampingios/rampingiosv3.c
+++ b/spaghetti-monster/rampingios/rampingiosv3.c
@@ -247,7 +247,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         #endif
         // sleep while off  (lower power use)
         go_to_standby = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // go back to sleep eventually if we got bumped but didn't leave "off" state
     else if (event == EV_tick) {
@@ -257,7 +257,7 @@ uint8_t off_state(Event event, uint16_t arg) {
             indicator_led(indicator_led_mode & 0x03);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(TICK_DURING_STANDBY) && defined(USE_INDICATOR_LED)
     // blink the indicator LED, maybe
@@ -265,13 +265,13 @@ uint8_t off_state(Event event, uint16_t arg) {
         if ((indicator_led_mode & 0b00000011) == 0b00000011) {
             indicator_blink(arg);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold (initially): go to lowest level (floor), but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(nearest_level(1));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
@@ -290,56 +290,56 @@ uint8_t off_state(Event event, uint16_t arg) {
         if (arg >= (!ramp_style) * HOLD_TIMEOUT) {  // more consistent
             set_state(steady_state, 1);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold, release quickly: go to lowest level (floor)
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(nearest_level(memorized_level));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: go to highest level (ceiling) (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: highest mode (ceiling)
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks (initial press): off, to prep for later events
     else if (event == EV_click3_press) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_BATTCHECK
     // 3 clicks: battcheck mode / blinky mode group 1
     else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 4 clicks: momentary
     else if (event == EV_4clicks) {
         blink_confirm(1);
         set_state(momentary_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 6 clicks: lockout mode
     else if (event == EV_6clicks) {
         blink_confirm(2);
         set_state(lockout_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_INDICATOR_LED
     // 7 clicks: next aux LED mode
@@ -357,19 +357,19 @@ uint8_t off_state(Event event, uint16_t arg) {
         indicator_led_mode = (indicator_led_mode & 0b11111100) | mode;
         indicator_led(mode);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 8 clicks: beacon mode
     else if (event == EV_8clicks) {
         set_state(beacon_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_TENCLICK_THERMAL_CONFIG
     // 10 clicks: thermal config mode
     else if (event == EV_10clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -407,12 +407,12 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_REVERSING
         ramp_direction = 1;
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
@@ -429,7 +429,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             #endif
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: toggle smooth vs discrete ramping
     else if (event == EV_3clicks) {
@@ -445,20 +445,20 @@ uint8_t steady_state(Event event, uint16_t arg) {
         set_level(0);
         delay_4ms(20/4);
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_RAMP_CONFIG
     // 4 clicks: configure this ramp mode
     else if (event == EV_4clicks) {
         push_state(ramp_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         #ifdef USE_REVERSING
         // make it ramp down instead, if already at max
@@ -510,7 +510,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_REVERSING)
     // reverse ramp direction on hold release
@@ -518,7 +518,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_REVERSING
         ramp_direction = -ramp_direction;
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // click, hold: change brightness (dimmer)
@@ -528,7 +528,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #endif
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         // TODO? make it ramp up instead, if already at min?
         memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
@@ -569,7 +569,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
     else if (event == EV_tick) {
@@ -580,7 +580,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SET_LEVEL_GRADUALLY
         // make thermal adjustment speed scale with magnitude
         if ((arg & 1) && (actual_level < THERM_FASTER_LEVEL)) {
-            return MISCHIEF_MANAGED;  // adjust slower when not a high mode
+            return EVENT_HANDLED;  // adjust slower when not a high mode
         }
         #ifdef THERM_HARD_TURBO_DROP
         else if ((! (actual_level < THERM_FASTER_LEVEL))
@@ -622,7 +622,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_THERMAL_REGULATION
@@ -654,7 +654,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepdown);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -676,7 +676,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepup);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -688,12 +688,12 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: tempcheck mode
     else if (event == EV_2clicks) {
         set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -705,12 +705,12 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: thermal config mode
     else if (event == EV_4clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -722,14 +722,14 @@ uint8_t beacon_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // TODO: use sleep ticks to measure time between pulses,
     //       to save power
     // 4 clicks: beacon config mode
     else if (event == EV_4clicks) {
         push_state(beacon_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -781,14 +781,14 @@ uint8_t lockout_state(Event event, uint16_t arg) {
             indicator_led(indicator_led_mode >> 2);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(TICK_DURING_STANDBY) && defined(USE_INDICATOR_LED)
     else if (event == EV_sleep_tick) {
         if ((indicator_led_mode & 0b00001100) == 0b00001100) {
             indicator_blink(arg);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_INDICATOR_LED
@@ -806,14 +806,14 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         indicator_led_mode = (mode << 2) + (indicator_led_mode & 0x03);
         indicator_led(mode);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 6 clicks: exit
     else if (event == EV_6clicks) {
         blink_confirm(1);
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -827,13 +827,13 @@ uint8_t momentary_state(Event event, uint16_t arg) {
     // button is being held
     if ((event & (B_CLICK | B_PRESS)) == (B_CLICK | B_PRESS)) {
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // button was released
     else if ((event & (B_CLICK | B_PRESS)) == (B_CLICK)) {
         set_level(0);
         //go_to_standby = 1;  // sleep while light is off
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // Sleep, dammit!  (but wait a few seconds first)
@@ -846,7 +846,7 @@ uint8_t momentary_state(Event event, uint16_t arg) {
             go_to_standby = 1;  // sleep while light is off
             // TODO: lighted button should use lockout config?
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -861,7 +861,7 @@ uint8_t config_state_base(Event event, uint16_t arg,
     if (event == EV_enter_state) {
         config_step = 0;
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance forward through config steps
     else if (event == EV_tick) {
@@ -875,13 +875,13 @@ uint8_t config_state_base(Event event, uint16_t arg,
             //set_state(retstate, retval);
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
         config_state_values[config_step] = number_entry_value;
         config_step ++;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     //return EVENT_NOT_HANDLED;
     // eat all other events; don't pass any through to parent
@@ -985,7 +985,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
         blinks_left = arg;
         entry_step = 0;
         wait_ticks = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance through the process:
     // 0: wait a moment
@@ -1042,7 +1042,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             number_entry_value = value;
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // count clicks
     else if (event == EV_click1_release) {
@@ -1055,7 +1055,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             delay_4ms(8/2);
             set_level(0);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
diff --git a/spaghetti-monster/werner/werner.c b/spaghetti-monster/werner/werner.c
index 1c3d4ad..f3241ee 100644
--- a/spaghetti-monster/werner/werner.c
+++ b/spaghetti-monster/werner/werner.c
@@ -152,19 +152,19 @@ uint8_t off_state(Event event, uint16_t arg) {
         set_level(0);
         // sleep while off  (lower power use)
         go_to_standby = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // go back to sleep eventually if we got bumped but didn't leave "off" state
     else if (event == EV_tick) {
         if (arg > TICKS_PER_SECOND*2) {
             go_to_standby = 1;
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(nearest_level(1));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
@@ -173,49 +173,49 @@ uint8_t off_state(Event event, uint16_t arg) {
         if (arg >= HOLD_TIMEOUT) {
             set_state(steady_state, 1);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold, release quickly: go to lowest level
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(nearest_level(memorized_level));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks (initial press): off, to prep for later events
     else if (event == EV_click2_press) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: go to highest level (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
         set_state(steady_state, nearest_level(MAX_LEVEL));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_BATTCHECK
     // 3 clicks: battcheck mode / blinky mode group
     else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 4 clicks: configure ramp
     else if (event == EV_4clicks) {
         push_state(ramp_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -240,7 +240,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         target_level = arg;
         #endif
         set_level(nearest_level(arg));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click: brighter
     else if (event == EV_click1_release) {
@@ -253,25 +253,25 @@ uint8_t steady_state(Event event, uint16_t arg) {
         empty_event_sequence();
         // remember mode for later
         save_config_wl();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: dimmer
     else if (event == EV_click1_hold) {
         // ramp slower in discrete mode
         if (arg % HOLD_TIMEOUT != 0) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
         save_config_wl();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_SET_LEVEL_GRADUALLY)
     // gradual thermal regulation
@@ -279,7 +279,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SET_LEVEL_GRADUALLY
         // make thermal adjustment speed scale with magnitude
         if ((arg & 1) && (actual_level < THERM_FASTER_LEVEL)) {
-            return MISCHIEF_MANAGED;  // adjust slower when not a high mode
+            return EVENT_HANDLED;  // adjust slower when not a high mode
         }
         #ifdef THERM_HARD_TURBO_DROP
         else if ((! (actual_level < THERM_FASTER_LEVEL))
@@ -317,7 +317,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_THERMAL_REGULATION
@@ -342,7 +342,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepdown);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -358,7 +358,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepup);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -370,14 +370,14 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_THERMAL_REGULATION
     // 2 clicks: tempcheck mode
     else if (event == EV_2clicks) {
         blink_confirm(2);
         set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -389,18 +389,18 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: battcheck mode
     else if (event == EV_2clicks) {
         blink_confirm(1);
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: thermal config mode
     else if (event == EV_4clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -415,7 +415,7 @@ uint8_t config_state_base(Event event, uint16_t arg,
     if (event == EV_enter_state) {
         config_step = 0;
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance forward through config steps
     else if (event == EV_tick) {
@@ -429,13 +429,13 @@ uint8_t config_state_base(Event event, uint16_t arg,
             //set_state(retstate, retval);
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
         config_state_values[config_step] = number_entry_value;
         config_step ++;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     //return EVENT_NOT_HANDLED;
     // eat all other events; don't pass any through to parent
@@ -502,7 +502,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
         blinks_left = arg;
         entry_step = 0;
         wait_ticks = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance through the process:
     // 0: wait a moment
@@ -559,7 +559,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             number_entry_value = value;
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // count clicks
     else if (event == EV_click1_release) {
@@ -572,7 +572,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             delay_4ms(8/2);
             set_level(0);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }