diff --git a/keyboards/momokai/tap_trio_pro/analogkeys.h b/keyboards/momokai/tap_trio_pro/analogkeys.h
index 879602e1c66..c4f05c1ed99 100644
--- a/keyboards/momokai/tap_trio_pro/analogkeys.h
+++ b/keyboards/momokai/tap_trio_pro/analogkeys.h
@@ -1,11 +1,19 @@
-/* Copyright 2023 RephlexZero (@RephlexZero) 2024 peepeetee (@peepeetee) 2024 minisbett (@minisbett)
+/* Copyright 2023 RephlexZero (@RephlexZero)
+             2024 peepeetee (@peepeetee)
+             2024 minisbett (@minisbett)
+             2025 Jenna Fligor (@Ex-32)
 SPDX-License-Identifier: GPL-2.0-or-later */
 
 #pragma once
 
 #include <stdint.h>
 
-enum analog_key_modes { dynamic_actuation = 0, continuous_dynamic_actuation, static_actuation, flashing };
+enum analog_key_modes {
+    dynamic_actuation = 0,
+    continuous_dynamic_actuation = 1,
+    static_actuation = 2,
+    flashing = 3,
+};
 
 /* global struct to save keypress logic params */
 typedef struct {
diff --git a/keyboards/momokai/tap_trio_pro/keyboard.json b/keyboards/momokai/tap_trio_pro/keyboard.json
index d731d34cbec..bdf19928a10 100644
--- a/keyboards/momokai/tap_trio_pro/keyboard.json
+++ b/keyboards/momokai/tap_trio_pro/keyboard.json
@@ -16,17 +16,16 @@
         "deferred_exec": true
     },
     "bootmagic": {
-        "matrix": [2, 0]
+        "matrix": [1, 0]
     },
     "debounce": 0,
     "build": {
         "lto": true
       },
     "matrix_pins": {
-        "direct":[
-        ["NO_PIN", "GP0", "NO_PIN" ],
-        ["GP28", "GP27", "GP26" ],
-        ["GP10", "GP9", "GP8" ]
+        "direct": [
+            ["GP28", "GP27", "GP26" ],
+            ["GP10", "GP9", "GP8" ]
         ]
     },
 
@@ -38,15 +37,6 @@
         "pid": "0x0016",
         "vid": "0x69F9"
     },
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {
-                "pin_a": "GP2",
-                "pin_b": "GP1"
-            }
-        ]
-    },
     "ws2812": {
         "pin": "GP29",
         "driver": "vendor"
@@ -112,15 +102,13 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
 
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-
-                {"matrix": [2, 0], "x": 0.5, "y": 2.25, "w": 0.5, "h": 0.5},
-                {"matrix": [2, 1], "x": 1, "y": 2.25, "w": 0.5, "h": 0.5},
-                {"matrix": [2, 2], "x": 1.5, "y": 2.25, "w": 0.5, "h": 0.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.25, "w": 0.5, "h": 0.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5}
             ]
         }
     }
diff --git a/keyboards/momokai/tap_trio_pro/keymaps/via/keymap.c b/keyboards/momokai/tap_trio_pro/keymaps/via/keymap.c
index c83cbad8efe..84824e214c1 100644
--- a/keyboards/momokai/tap_trio_pro/keymaps/via/keymap.c
+++ b/keyboards/momokai/tap_trio_pro/keymaps/via/keymap.c
@@ -5,14 +5,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-                KC_MUTE,
         KC_Z,   KC_X,   KC_C,
         KC_GRV,   KC_ESC,   KC_F2
     ),
 };
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0]   =  { ENCODER_CCW_CW(KC_VOLD,  KC_VOLU) },
-};
-#endif
diff --git a/keyboards/momokai/tap_trio_pro/tap_trio_pro.c b/keyboards/momokai/tap_trio_pro/tap_trio_pro.c
index 6eabd2d0735..c85cbacab43 100644
--- a/keyboards/momokai/tap_trio_pro/tap_trio_pro.c
+++ b/keyboards/momokai/tap_trio_pro/tap_trio_pro.c
@@ -1,4 +1,6 @@
-/* Copyright 2023 RephlexZero (@RephlexZero) peepeetee (@peepeetee)
+/* Copyright 2023 RephlexZero (@RephlexZero)
+             2023 peepeetee (@peepeetee)
+             2025 Jenna Fligor (@Ex-32)
 SPDX-License-Identifier: GPL-2.0-or-later */
 #include <stdint.h>
 #include <stdio.h>
@@ -139,11 +141,11 @@ void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
 
 enum via_dynamic_actuation {
     id_mode = 1,
-    id_actuation_point,
-    id_press_sensitivity,
-    id_release_sensitivity,
-    id_press_hysteresis,
-    id_release_hysteresis,
+    id_actuation_point = 2,
+    id_press_sensitivity = 3,
+    id_release_sensitivity = 4,
+    id_press_hysteresis = 5,
+    id_release_hysteresis = 6,
 };
 
 void via_config_set_value(uint8_t *data) {