diff --git a/fs/screen_one.json b/fs/screen_one.json
index dff8059..1bfa2d4 100644
--- a/fs/screen_one.json
+++ b/fs/screen_one.json
@@ -19,7 +19,7 @@
       "h": 56,
       "label": "On",
       "type": 1,
-      "mqtt": [ "/s/cmnd/5C:CF:7F:20:29:6E/Power On" ]
+      "mqtt": [ {"topic": "/s/cmnd/5C:CF:7F:20:29:6E/Power", "message": "On"} ]
     },
     {
       "name": "heli_led_off",
@@ -29,7 +29,7 @@
       "h": 56,
       "label": "Off",
       "type": 1,
-      "mqtt": [ "/s/cmnd/5C:CF:7F:20:29:6E/Power Off" ]
+      "mqtt": [ {"topic": "/s/cmnd/5C:CF:7F:20:29:6E/Power", "message": "Off"} ]
     },
     {
       "name": "heli_led_toggle",
@@ -39,7 +39,7 @@
       "h": 56,
       "label": "Toggle",
       "type": 1,
-      "mqtt": [ "/s/cmnd/5C:CF:7F:20:29:6E/Power Toggle" ]
+      "mqtt": [ {"topic": "/s/cmnd/5C:CF:7F:20:29:6E/Power", "message": "Toggle"} ]
     }
   ]
 }
diff --git a/fs/screen_two.json b/fs/screen_two.json
index 6ada64f..a92677b 100644
--- a/fs/screen_two.json
+++ b/fs/screen_two.json
@@ -18,7 +18,8 @@
       "w": 48,
       "h": 48,
       "label": "Two",
-      "type": 0
+      "type": 1,
+      "mqtt": [ {"topic": "esp32_XXXXXX/rpc/Button.Touch", "message": {"args": {"idx":0}}} ]
     }
   ]
 }