diff --git a/.gitmodules b/.gitmodules
index 20b8f35d..2fa7c983 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "lib/ts-code"]
 	path = lib/ts-code
 	url = https://github.com/MausTec/ts-code.git
+[submodule "lib/mt-accessory-common"]
+	path = lib/mt-accessory-common
+	url = https://github.com/maustec/mt-accessory-common
diff --git a/bin/pio/build_flags.py b/bin/pio/build_flags.py
index 1d9cfbd7..61b65288 100644
--- a/bin/pio/build_flags.py
+++ b/bin/pio/build_flags.py
@@ -24,7 +24,7 @@
     print("Error: " + err.output.decode("utf-8"), file=sys.stderr)
     exit(1)
 
-if branch != "main":
-    print("-DEOM_FW_VERSION='\"%s/%s\"'" % (branch, revision))
+if branch != "main" and branch != "master":
+    print("-DEOM_FW_VERSION='\"%s+%s\"'" % (revision, branch))
 else:
     print("-DEOM_FW_VERSION='\"%s\"'" % revision)
diff --git a/lib/mt-accessory-common b/lib/mt-accessory-common
new file mode 160000
index 00000000..84e84ff4
--- /dev/null
+++ b/lib/mt-accessory-common
@@ -0,0 +1 @@
+Subproject commit 84e84ff499cf3a2f14d77ec3ab02cb9a9fb6d4b8
diff --git a/src/menus/BluetoothDevicesMenu.cpp b/src/menus/BluetoothDevicesMenu.cpp
index 9bbf8e59..caa71241 100644
--- a/src/menus/BluetoothDevicesMenu.cpp
+++ b/src/menus/BluetoothDevicesMenu.cpp
@@ -3,8 +3,6 @@
 #include "UserInterface.h"
 #include "OrgasmControl.h"
 
-#include <vector>
-
 static void doDisconnect(UIMenu *menu, void *d) {
   BluetoothDriver::Device *device = (BluetoothDriver::Device*) d;
   
@@ -22,7 +20,6 @@ static void doDisconnect(UIMenu *menu, void *d) {
 }
 
 static void setVibrateMode(UIMenu *menu, int m) {
-  // ButtplugDevice *device = (ButtplugDevice*) menu->getCurrentArg();
   // VibrationMode mode = (VibrationMode) m;
 
   // Serial.print("Setting mode to: ");
@@ -40,8 +37,6 @@ static void setVibrateMode(UIMenu *menu, int m) {
 }
 
 static void buildVibrateModeMenu(UIMenu *menu) {
-  // ButtplugDevice *device = (ButtplugDevice*) menu->getCurrentArg();
-
   menu->addItem("Depletion", &setVibrateMode, (int) VibrationMode::Depletion);
   menu->addItem("Enhancement", &setVibrateMode, (int) VibrationMode::Enhancement);
   menu->addItem("Ramp-Stop", &setVibrateMode, (int) VibrationMode::RampStop);
@@ -56,7 +51,7 @@ static void buildDeviceMenu(UIMenu *menu) {
 
   menu->setTitle(buf);
   menu->addItem("Disconnect", &doDisconnect, device);
-  menu->addItem(&VibrateModeMenu, device);
+  // menu->addItem(&VibrateModeMenu, device);
 }
 
 UIMenu ManageDeviceMenu("Manage Device", &buildDeviceMenu);