diff --git a/Platformio/src/commandHandler.h b/Platformio/src/commandHandler.h
index 2158b90..e8aae39 100644
--- a/Platformio/src/commandHandler.h
+++ b/Platformio/src/commandHandler.h
@@ -14,25 +14,25 @@
   Doing so you can switch between the keyboards without changing the UI code (keys.cpp and gui*.cpp)
 */
 
-#define KEYBOARD_UP                  KEYBOARD_MQTT_UP
-#define KEYBOARD_DOWN                KEYBOARD_MQTT_DOWN
-#define KEYBOARD_RIGHT               KEYBOARD_MQTT_RIGHT
-#define KEYBOARD_LEFT                KEYBOARD_MQTT_LEFT
-#define KEYBOARD_SELECT              KEYBOARD_MQTT_SELECT
-#define KEYBOARD_SENDSTRING          KEYBOARD_MQTT_SENDSTRING
-#define KEYBOARD_BACK                KEYBOARD_MQTT_BACK
-#define KEYBOARD_HOME                KEYBOARD_MQTT_HOME
-#define KEYBOARD_MENU                KEYBOARD_MQTT_MENU
-#define KEYBOARD_SCAN_PREVIOUS_TRACK KEYBOARD_MQTT_SCAN_PREVIOUS_TRACK
-#define KEYBOARD_REWIND_LONG         KEYBOARD_MQTT_REWIND_LONG
-#define KEYBOARD_REWIND              KEYBOARD_MQTT_REWIND
-#define KEYBOARD_PLAYPAUSE           KEYBOARD_MQTT_PLAYPAUSE
-#define KEYBOARD_FASTFORWARD         KEYBOARD_MQTT_FASTFORWARD
-#define KEYBOARD_FASTFORWARD_LONG    KEYBOARD_MQTT_FASTFORWARD_LONG
-#define KEYBOARD_SCAN_NEXT_TRACK     KEYBOARD_MQTT_SCAN_NEXT_TRACK
-#define KEYBOARD_MUTE                KEYBOARD_MQTT_MUTE
-#define KEYBOARD_VOLUME_INCREMENT    KEYBOARD_MQTT_VOLUME_INCREMENT
-#define KEYBOARD_VOLUME_DECREMENT    KEYBOARD_MQTT_VOLUME_DECREMENT
+#define KEYBOARD_UP                  KEYBOARD_BLE_UP
+#define KEYBOARD_DOWN                KEYBOARD_BLE_DOWN
+#define KEYBOARD_RIGHT               KEYBOARD_BLE_RIGHT
+#define KEYBOARD_LEFT                KEYBOARD_BLE_LEFT
+#define KEYBOARD_SELECT              KEYBOARD_BLE_SELECT
+#define KEYBOARD_SENDSTRING          KEYBOARD_BLE_SENDSTRING
+#define KEYBOARD_BACK                KEYBOARD_BLE_BACK
+#define KEYBOARD_HOME                KEYBOARD_BLE_HOME
+#define KEYBOARD_MENU                KEYBOARD_BLE_MENU
+#define KEYBOARD_SCAN_PREVIOUS_TRACK KEYBOARD_BLE_SCAN_PREVIOUS_TRACK
+#define KEYBOARD_REWIND_LONG         KEYBOARD_BLE_REWIND_LONG
+#define KEYBOARD_REWIND              KEYBOARD_BLE_REWIND
+#define KEYBOARD_PLAYPAUSE           KEYBOARD_BLE_PLAYPAUSE
+#define KEYBOARD_FASTFORWARD         KEYBOARD_BLE_FASTFORWARD
+#define KEYBOARD_FASTFORWARD_LONG    KEYBOARD_BLE_FASTFORWARD_LONG
+#define KEYBOARD_SCAN_NEXT_TRACK     KEYBOARD_BLE_SCAN_NEXT_TRACK
+#define KEYBOARD_MUTE                KEYBOARD_BLE_MUTE
+#define KEYBOARD_VOLUME_INCREMENT    KEYBOARD_BLE_VOLUME_INCREMENT
+#define KEYBOARD_VOLUME_DECREMENT    KEYBOARD_BLE_VOLUME_DECREMENT
 
 #define ALLDEVICES_POWER_TOGGLE      "AllDevices_power_toggle"
 #define SCENE_TV                     "Scene_tv"