diff --git a/android/app/build.gradle b/android/app/build.gradle
index f288ffc..3d086ac 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "nl.eddydevink.sylda"
         minSdk 26
         targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         buildConfigField "String", "BUILD_NUMBER", "\"${new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(new Date())}\""
     }
 
diff --git a/android/app/src/main/assets/firmware/client/firmware.bin b/android/app/src/main/assets/firmware/client/firmware.bin
index 37c5422..17a4002 100644
Binary files a/android/app/src/main/assets/firmware/client/firmware.bin and b/android/app/src/main/assets/firmware/client/firmware.bin differ
diff --git a/android/app/src/main/assets/firmware/server/firmware.bin b/android/app/src/main/assets/firmware/server/firmware.bin
index 0e91add..6c018bc 100644
Binary files a/android/app/src/main/assets/firmware/server/firmware.bin and b/android/app/src/main/assets/firmware/server/firmware.bin differ
diff --git a/android/app/src/main/java/nl/eddydevink/sylda/MainActivity.kt b/android/app/src/main/java/nl/eddydevink/sylda/MainActivity.kt
index 1e8f5bc..8f73a52 100644
--- a/android/app/src/main/java/nl/eddydevink/sylda/MainActivity.kt
+++ b/android/app/src/main/java/nl/eddydevink/sylda/MainActivity.kt
@@ -40,9 +40,8 @@ class MainActivity : AppCompatActivity(), BleCallbacks {
                 statusText.text = getString(R.string.status_connected)
                 setupRelayButton()
                 setupRelay2Button()
-                val isServer = PrefsHelper.getDeviceMode(this@MainActivity) == "server"
-                relay1Button.isEnabled = isServer
-                relay2Button.isEnabled = isServer
+                relay1Button.isEnabled = true
+                relay2Button.isEnabled = true
             }
             BleStatus.Disconnected -> {
                 statusText.text = getString(R.string.status_connecting)
@@ -107,9 +106,8 @@ class MainActivity : AppCompatActivity(), BleCallbacks {
         }
         setupRelayButton()
         setupRelay2Button()
-        val isServer = PrefsHelper.getDeviceMode(this) == "server"
-        relay1Button.isEnabled = isServer
-        relay2Button.isEnabled = isServer
+        relay1Button.isEnabled = true
+        relay2Button.isEnabled = true
     }
 
     @Deprecated("Deprecated in Java")
diff --git a/platformio.ini b/platformio.ini
index b22a594..f46d332 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,7 +11,7 @@ build_flags =
 lib_deps =
     fastled/FastLED@^3
     h2zero/NimBLE-Arduino@^2
-upload_port = /dev/ttyACM1
+upload_port = /dev/serial/by-id/usb-Espressif_USB_JTAG_serial_debug_unit_44:1B:F6:F4:CF:14-if00
 upload_speed = 115200
 upload_flags = --no-stub
 build_src_filter = +<main.cpp> -<client.cpp>
diff --git a/src/client.cpp b/src/client.cpp
index addf69a..059d4b8 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -368,8 +368,8 @@ void loop() {
     }
     prevBtnActive = btnActive;
 
-    bool relay1State = t1Active || btnActive;
-    bool relay2State = t2Active;
+    bool relay1State = !t1Active || btnActive;
+    bool relay2State = !t2Active;
 
     CRGB ledColor;
 
@@ -459,8 +459,8 @@ void loop() {
     static uint32_t heartbeat = 0;
     if (millis() - heartbeat > 60000) {
         Serial.printf("[heartbeat] t1=%s t2=%s btn=%s r1=%s r2=%s connected=%s\n",
-            t1Active ? "YES" : "no",
-            t2Active ? "YES" : "no",
+            !t1Active ? "YES" : "no",
+            !t2Active ? "YES" : "no",
             btnActive ? "YES" : "no",
             relay1State ? "ON" : "OFF",
             relay2State ? "ON" : "OFF",