diff --git a/bluetooth/classic_discoverable/src/conferences/9999demo.h b/bluetooth/classic_discoverable/src/conferences/9999demo.h
index e9f5e78..5ab1e69 100644
--- a/bluetooth/classic_discoverable/src/conferences/9999demo.h
+++ b/bluetooth/classic_discoverable/src/conferences/9999demo.h
@@ -1,13 +1,17 @@
 #if defined(EASY)
-#define MAC_ADDR {0xF2, 0x0B, 0xAC, 0x11, 0x24, 0x03}
-#define NAME "Demo Chase BTC Easy Fox"
+// RFHS_CHALLENGE_NAME "Bluetooth Classic Easy Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the Bluetooth Classic Easy Fox?'"
+#define NAME "Molly BTC Easy Fox"
+#define MAC_ADDR {0xF2, 0x81, 0x5A, 0xC1, 0xA3, 0x26}
 #define TIME_TO_WAKE 300
 #define TIME_TO_SLEEP 0
 #endif
 
 #if defined(HARD)
-#define MAC_ADDR {0xF2, 0xB4, 0xEF, 0xB3, 0x48, 0xC2}
-#define NAME "Demo Marshall BTC Hard Fox"
+// RFHS_CHALLENGE_NAME "Bluetooth Classic Hard Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the Bluetooth Classic Hard Fox?'"
+#define NAME "Case BTC Hard Fox"
+#define MAC_ADDR {0xF2, 0xF6, 0x6D, 0xBC, 0x2A, 0x80}
 #define TIME_TO_WAKE 30
 #define TIME_TO_SLEEP 30
 #endif
diff --git a/bluetooth/iBeacon/src/conferences/9999demo.h b/bluetooth/iBeacon/src/conferences/9999demo.h
index 7e22d4b..d52b4c9 100644
--- a/bluetooth/iBeacon/src/conferences/9999demo.h
+++ b/bluetooth/iBeacon/src/conferences/9999demo.h
@@ -1,35 +1,34 @@
-// Bash to generate MAC address
-// Note: least significant bit of first byte must be zero, here it's fixed to 0xF2
-// printf '0xF2, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X\n' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]
-
-// Bash to generate UUID
-// uuidgen | tr '[[:lower:]]' '[[:upper:]]'
-
 #if defined(EASY)
-#define DEVICE_NAME         "Demo Skye BLE Easy Fox"
-#define BEACON_UUID         "3BDB3CAB-CA78-48C1-9DBC-1CF8C338CA2A"
+// RFHS_CHALLENGE_NAME "BLE Easy Fox"
+// FOX_KEYWORDS        "Hunter should ask 'Are you the BLE Easy Fox?'"
+#define DEVICE_NAME         "Bruce BLE Easy Fox"
+#define BEACON_UUID         "A2AFA582-E4E8-4599-B28B-4E11AC6DD6E8"
 #define MANUFACTURER_ID     0x4c00
 #define MAJOR               5
 #define MINOR               88
 #define SIGNAL_POWER        0xc5
-#define MAC_ADDR            {0xF2, 0xCF, 0x52, 0xCA, 0x3E, 0xF9}
+#define MAC_ADDR            {0xF2, 0x82, 0x42, 0xD0, 0x84, 0xBC}
 
 #elif defined(MEDIUM)
-#define DEVICE_NAME         "Demo Rocky BLE Medium Fox"
-#define BEACON_UUID         "71F24C1B-BBA4-4EB3-8D62-787A7BF440EC"
+// RFHS_CHALLENGE_NAME "BLE Medium Fox"
+// FOX_KEYWORDS        "Hunter should ask 'Are you the BLE Medium Fox?'"
+#define DEVICE_NAME         "Cath BLE Medium Fox"
+#define BEACON_UUID         "162EEB7B-743C-47E9-9414-BBD6149B4E40"
 #define MANUFACTURER_ID     0x4c00
 #define MAJOR               5
 #define MINOR               88
 #define SIGNAL_POWER        0xc5
-#define MAC_ADDR            {0xF2, 0x3F, 0x21, 0xF5, 0x89, 0x58}
+#define MAC_ADDR            {0xF2, 0x63, 0x89, 0x10, 0x8D, 0x1D}
 
 #elif defined(HARD)
-#define DEVICE_NAME         "Demo Rubble BLE Hard Fox"
-#define BEACON_UUID         "4A79F8EB-67C5-48EB-8587-1A659E90A0AE"
+// RFHS_CHALLENGE_NAME "BLE Hard Fox"
+// FOX_KEYWORDS        "Hunter should ask 'Are you the BLE Hard Fox?'"
+#define DEVICE_NAME         "3Jane BLE Hard Fox"
+#define BEACON_UUID         "DB6A0ED0-1DC3-4348-BD78-E997A0C082A3"
 #define MANUFACTURER_ID     0x4c00
 #define MAJOR               5
 #define MINOR               88
 #define SIGNAL_POWER        0xc5
-#define MAC_ADDR            {0xF2, 0x3B, 0x4F, 0x07, 0x0B, 0xA2}
+#define MAC_ADDR            {0xF2, 0xAC, 0x87, 0x05, 0x0A, 0xC7}
 
 #endif
diff --git a/include/rfhsledmacros.h b/include/rfhsledmacros.h
index 4ab7c26..1466a18 100644
--- a/include/rfhsledmacros.h
+++ b/include/rfhsledmacros.h
@@ -39,8 +39,8 @@ void ledcolor(uint32_t colorcode) {
   analogWrite(LED_BLUE,  255 - leds[0].b);
 
 #elif defined(ARDUINO_XIAO_ESP32C5)
-  // ON when awake, OFF when going to sleep.
-  if (colorcode == 0) {
+  // ON when any color except red, OFF when red
+  if (colorcode == 0xff0000) {
     digitalWrite(DATA_PIN, HIGH);  // off
   } else {
     digitalWrite(DATA_PIN, LOW);   // on
@@ -82,7 +82,7 @@ void rfhsledfatal() {
   while (1) {
     ledcolor(0xff0000);  // RED
     delay(200);
-    ledcolor(0xFFF700);  // Yellow
+    ledcolor(0xfff700);  // Yellow
     delay(200);
   }
 }
diff --git a/wifi/wifi_ap_client/src/conferences/9999demo.h b/wifi/wifi_ap_client/src/conferences/9999demo.h
index fdb5616..23d217e 100644
--- a/wifi/wifi_ap_client/src/conferences/9999demo.h
+++ b/wifi/wifi_ap_client/src/conferences/9999demo.h
@@ -17,11 +17,13 @@
 
 #if defined(AP)
 #if defined(EASY)
-// set mac address
-#define MAC_ADDR {0xF2, 0xE2, 0xF5, 0x12, 0xC6, 0xC9}
+// RFHS_CHALLENGE_NAME "WiFi AP Easy Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the WiFi AP Easy Fox?'"
 // Network config
-#define FSSID "Demo Zuma WiFi AP Easy Fox"
+#define FSSID "Hiro WiFi AP Easy Fox"
 #define PSK "0123456789"
+// set mac address
+#define MAC_ADDR {0xF2, 0xF4, 0x90, 0x22, 0x0D, 0x0F}
 // 1-13 permitted 0 means random
 #define CHANNEL 1
 // 0 broadcast 1 hidden
@@ -37,11 +39,13 @@
 #endif
 
 #if defined(HARD)
-// set mac address
-#define MAC_ADDR {0xF2, 0xA2, 0xD3, 0xD4, 0xF3, 0x40}
+// RFHS_CHALLENGE_NAME "WiFi AP Hard Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the WiFi AP Hard Fox?'"
 // Network config
-#define FSSID "Demo Everest WiFi AP Hard Fox"
+#define FSSID "YT WiFi AP Hard Fox"
 #define PSK "0123456789"
+// set mac address
+#define MAC_ADDR {0xF2, 0x72, 0xC1, 0x79, 0x16, 0x1B}
 // 1-13 permitted 0 means random
 #define CHANNEL 0
 // 0 broadcast 1 hidden
@@ -57,12 +61,13 @@
 #endif
 
 #if defined(FIVEEASY)
-#define RFHS_CHALLENGE_NAME "WiFi 5GHz AP Easy Fox"
+// RFHS_CHALLENGE_NAME "WiFi 5GHz AP Easy Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the WiFi 5GHz AP Easy Fox?'"
 // Network config
-#define FSSID "Demo Rex WiFi 5GHz AP Easy Fox"
+#define FSSID "Enzo WiFi 5GHz AP Easy Fox"
 #define PSK "0123456789"
 // set mac address
-#define MAC_ADDR {0xF2, 0xC6, 0xB7, 0xE2, 0xE9, 0x85}
+#define MAC_ADDR {0xF2, 0x77, 0x20, 0x34, 0x0A, 0xC7}
 // 1-13 permitted 0 means random
 #define CHANNEL 36
 // 0 broadcast 1 hidden
@@ -78,12 +83,13 @@
 #endif
 
 #if defined(FIVEHARD)
-#define RFHS_CHALLENGE_NAME "WiFi 5GHz AP Hard Fox"
+// RFHS_CHALLENGE_NAME "WiFi 5GHz AP Hard Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the WiFi 5GHz AP Hard Fox?'"
 // Network config
-#define FSSID "Demo Liberty WiFi 5GHzAPHardFox"
+#define FSSID "Lagos WiFi 5GHz AP Hard Fox"
 #define PSK "0123456789"
 // set mac address
-#define MAC_ADDR {0xF2, 0x81, 0x41, 0xD1, 0x30, 0xD1}
+#define MAC_ADDR {0xF2, 0x13, 0xD4, 0x3C, 0x51, 0x4B}
 // 1-13 permitted 0 means random
 #define CHANNEL 0
 // 0 broadcast 1 hidden
@@ -101,11 +107,13 @@
 
 #if defined(CLIENT)
 #if defined(EASY)
+// RFHS_CHALLENGE_NAME "WiFi Client Easy Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the WiFi Client Easy Fox?'"
 // set mac address
-#define MAC_ADDR {0xF2, 0x99, 0x68, 0x88, 0x95, 0xBA}
-// Network config
-#define FSSID "Demo Tracker WiFi Client Easy Fox"
+#define FSSID "Ng WiFi Client Easy Fox"
 #define PSK "0123456789"
+#define MAC_ADDR {0xF2, 0x44, 0x5E, 0x10, 0x97, 0xF4}
+// Network config
 // checks run during startup so we want to stay
 // running no longer than a few minutes to force
 // checks to run and led to update
@@ -115,11 +123,13 @@
 #endif
 
 #if defined(HARD)
-// set mac address
-#define MAC_ADDR {0xF2, 0xE2, 0x63, 0xAA, 0x91, 0x6F}
+// RFHS_CHALLENGE_NAME "WiFi Client Hard Fox"
+// FOX_KEYWORDS "Hunter should ask 'Are you the WiFi Client Hard Fox?'"
 // Network config
-#define FSSID "Demo Robo-Dog WiFi Client Hard Fox"
+#define FSSID "Mr Lee WiFi Client Hard Fox"
 #define PSK "0123456789"
+// set mac address
+#define MAC_ADDR {0xF2, 0x83, 0x27, 0x31, 0x80, 0xC7}
 // checks run during startup so we want to stay
 // running no longer than a few minutes to force
 // checks to run and led to update