diff --git a/controller_color_config.h b/controller_color_config.h
new file mode 100644
index 0000000..4abdf51
--- /dev/null
+++ b/controller_color_config.h
@@ -0,0 +1,25 @@
+// Optional override for Switch Pro colour fields.
+// Copy/modify the values below and rebuild to change how the controller appears on the Switch.
+// Each value is an 8-bit RGB component.
+
+#pragma once
+
+// Body shell colour
+#define SWITCH_COLOR_BODY_R 0x1B
+#define SWITCH_COLOR_BODY_G 0x1B
+#define SWITCH_COLOR_BODY_B 0x1D
+
+// Face/button cluster colour
+#define SWITCH_COLOR_BUTTON_R 0xFF
+#define SWITCH_COLOR_BUTTON_G 0xFF
+#define SWITCH_COLOR_BUTTON_B 0xFF
+
+// Left grip colour
+#define SWITCH_COLOR_LEFT_GRIP_R 0x00
+#define SWITCH_COLOR_LEFT_GRIP_G 0x89
+#define SWITCH_COLOR_LEFT_GRIP_B 0xEB
+
+// Right grip colour
+#define SWITCH_COLOR_RIGHT_GRIP_R 0x00
+#define SWITCH_COLOR_RIGHT_GRIP_G 0x89
+#define SWITCH_COLOR_RIGHT_GRIP_B 0xEB
diff --git a/mac_controller_uart_bridge.py b/mac_controller_uart_bridge.py
index 0d0547c..1716b49 100644
--- a/mac_controller_uart_bridge.py
+++ b/mac_controller_uart_bridge.py
@@ -581,6 +581,11 @@ def main() -> None:
                     contexts[instance_id] = ctx
                 elif event.type == sdl2.SDL_CONTROLLERDEVICEREMOVED:
                     instance_id = event.cdevice.which
+                    # ctx = contexts.get(instance_id)
+                    # if ctx and sdl2.SDL_GameControllerGetAttached(ctx.controller):
+                    #     # Spurious detach; ignore.
+                    #     console.print(f"[yellow]Ignoring spurious remove for controller {instance_id}[/yellow]")
+                    #     continue
                     ctx = contexts.pop(instance_id, None)
                     if ctx:
                         console.print(f"[yellow]Controller {instance_id} removed[/yellow]")
diff --git a/switch_pro_driver.cpp b/switch_pro_driver.cpp
index 5e71e71..138ba8f 100644
--- a/switch_pro_driver.cpp
+++ b/switch_pro_driver.cpp
@@ -44,6 +44,31 @@ static uint8_t input_mode = 0x30;
 static bool is_imu_enabled = false;
 static bool is_vibration_enabled = false;
 
+// Optional compile-time colour override (body/buttons/grips).
+#if __has_include("controller_color_config.h")
+#include "controller_color_config.h"
+#endif
+#ifndef SWITCH_COLOR_BODY_R
+#define SWITCH_COLOR_BODY_R 0x1B
+#define SWITCH_COLOR_BODY_G 0x1B
+#define SWITCH_COLOR_BODY_B 0x1D
+#endif
+#ifndef SWITCH_COLOR_BUTTON_R
+#define SWITCH_COLOR_BUTTON_R 0xFF
+#define SWITCH_COLOR_BUTTON_G 0xFF
+#define SWITCH_COLOR_BUTTON_B 0xFF
+#endif
+#ifndef SWITCH_COLOR_LEFT_GRIP_R
+#define SWITCH_COLOR_LEFT_GRIP_R 0xEC
+#define SWITCH_COLOR_LEFT_GRIP_G 0x00
+#define SWITCH_COLOR_LEFT_GRIP_B 0x8C
+#endif
+#ifndef SWITCH_COLOR_RIGHT_GRIP_R
+#define SWITCH_COLOR_RIGHT_GRIP_R 0xEC
+#define SWITCH_COLOR_RIGHT_GRIP_G 0x00
+#define SWITCH_COLOR_RIGHT_GRIP_B 0x8C
+#endif
+
 static uint16_t leftMinX, leftMinY;
 static uint16_t leftCenX, leftCenY;
 static uint16_t leftMaxX, leftMaxY;
@@ -91,16 +116,16 @@ static const uint8_t factory_config_data[0xEFF] = {
     0xFF,
 
     // body color
-    0x1B, 0x1B, 0x1D,
+    SWITCH_COLOR_BODY_R, SWITCH_COLOR_BODY_G, SWITCH_COLOR_BODY_B,
 
     // button color
-    0xFF, 0xFF, 0xFF,
+    SWITCH_COLOR_BUTTON_R, SWITCH_COLOR_BUTTON_G, SWITCH_COLOR_BUTTON_B,
 
     // left grip color
-    0xEC, 0x00, 0x8C,
+    SWITCH_COLOR_LEFT_GRIP_R, SWITCH_COLOR_LEFT_GRIP_G, SWITCH_COLOR_LEFT_GRIP_B,
 
     // right grip color
-    0xEC, 0x00, 0x8C,
+    SWITCH_COLOR_RIGHT_GRIP_R, SWITCH_COLOR_RIGHT_GRIP_G, SWITCH_COLOR_RIGHT_GRIP_B,
 
     0x01,