diff --git a/app/boards/arm/glove80/Kconfig.defconfig b/app/boards/arm/glove80/Kconfig.defconfig
index ec5b2f3d..58cf8954 100644
--- a/app/boards/arm/glove80/Kconfig.defconfig
+++ b/app/boards/arm/glove80/Kconfig.defconfig
@@ -9,9 +9,6 @@ config BOARD
 config ZMK_SPLIT_BLE_ROLE_CENTRAL
     default y
 
-config ZMK_KEYBOARD_NAME
-    default "Glove80"
-
 endif # BOARD_GLOVE80_LH
 
 if BOARD_GLOVE80_RH
@@ -35,12 +32,6 @@ config ZMK_BLE
 config ZMK_USB
     default y
 
-config ZMK_BATTERY_VOLTAGE_DIVIDER
-    default y
-
-config ZMK_BATTERY_NRF_VDDH
-    default y
-
 config ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS
     default 5
 
diff --git a/app/boards/arm/glove80/glove80_lh-pinctrl.dtsi b/app/boards/arm/glove80/glove80_lh-pinctrl.dtsi
index f82a8c10..3dbf3d7e 100644
--- a/app/boards/arm/glove80/glove80_lh-pinctrl.dtsi
+++ b/app/boards/arm/glove80/glove80_lh-pinctrl.dtsi
@@ -4,19 +4,15 @@
  */
 
 &pinctrl {
-    spi1_default: spi1_default {
+    spi3_default: spi3_default {
         group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>, // WS2812_VEXT_DATA
-            <NRF_PSEL(SPIM_SCK, 0, 13)>,          // not connected
-            <NRF_PSEL(SPIM_MISO, 0, 14)>;         // not connected
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>; // WS2812_VEXT_DATA
         };
     };
 
-    spi1_sleep: spi1_sleep {
+    spi3_sleep: spi3_sleep {
         group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>,
-            <NRF_PSEL(SPIM_SCK, 0, 13)>,
-            <NRF_PSEL(SPIM_MISO, 0, 14)>;
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 27)>;
             low-power-enable;
         };
     };
@@ -30,21 +26,21 @@
     pwm0_sleep: pwm0_sleep {
         group1 {
             psels = <NRF_PSEL(PWM_OUT0, 1, 15)>;
-            low-power-enable;
+            bias-pull-down;
         };
     };
 
     uart0_default: uart0_default {
         group1 {
             psels = <NRF_PSEL(UART_TX, 0, 22)>, // EXT1
-                <NRF_PSEL(UART_RX, 0, 21)>;     // EXT2
+                    <NRF_PSEL(UART_RX, 0, 21)>; // EXT2
         };
     };
 
     uart0_sleep: uart0_sleep {
         group1 {
             psels = <NRF_PSEL(UART_TX, 0, 22)>,
-                <NRF_PSEL(UART_RX, 0, 21)>;
+                    <NRF_PSEL(UART_RX, 0, 21)>;
             low-power-enable;
         };
     };
diff --git a/app/boards/arm/glove80/glove80_lh.dts b/app/boards/arm/glove80/glove80_lh.dts
index 645d1927..ed40e0d2 100644
--- a/app/boards/arm/glove80/glove80_lh.dts
+++ b/app/boards/arm/glove80/glove80_lh.dts
@@ -35,26 +35,18 @@
         init-delay-ms = <100>;
     };
 
-    vbatt: vbatt-divider {
-        compatible = "zmk,battery-voltage-divider";
-        label = "BATTERY";
-        io-channels = <&adc 5>;
-        output-ohms = <820000>;
-        full-ohms = <(1500000 + 820000)>;
-    };
-
-    vbatt-vddh {
+    vbatt: vbatt {
         compatible = "zmk,battery-nrf-vddh";
-        label = "BATTERY-VDDH";
+        label = "BATTERY";
     };
 };
 
-&spi1 {
+&spi3 {
     compatible = "nordic,nrf-spim";
     status = "okay";
 
-    pinctrl-0 = <&spi1_default>;
-    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
     pinctrl-names = "default", "sleep";
 
     led_strip: ws2812@0 {
diff --git a/app/boards/arm/glove80/glove80_rh-pinctrl.dtsi b/app/boards/arm/glove80/glove80_rh-pinctrl.dtsi
index 3213838b..454a2621 100644
--- a/app/boards/arm/glove80/glove80_rh-pinctrl.dtsi
+++ b/app/boards/arm/glove80/glove80_rh-pinctrl.dtsi
@@ -4,19 +4,15 @@
  */
 
 &pinctrl {
-    spi1_default: spi1_default {
+    spi3_default: spi3_default {
         group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>, // WS2812_VEXT_DATA
-            <NRF_PSEL(SPIM_SCK, 0, 27)>,          // no connection
-            <NRF_PSEL(SPIM_MISO, 0, 14)>;         // no connection
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>; // WS2812_VEXT_DATA
         };
     };
 
-    spi1_sleep: spi1_sleep {
+    spi3_sleep: spi3_sleep {
         group1 {
-            psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>,
-            <NRF_PSEL(SPIM_SCK, 0, 27)>,
-            <NRF_PSEL(SPIM_MISO, 0, 14)>;
+            psels = <NRF_PSEL(SPIM_MOSI, 0, 13)>;
             low-power-enable;
         };
     };
@@ -30,21 +26,21 @@
     pwm0_sleep: pwm0_sleep {
         group1 {
             psels = <NRF_PSEL(PWM_OUT0, 0, 16)>;
-            low-power-enable;
+            bias-pull-down;
         };
     };
 
     uart0_default: uart0_default {
         group1 {
             psels = <NRF_PSEL(UART_TX, 0, 21)>, // EXT1
-                <NRF_PSEL(UART_RX, 0, 24)>;     // EXT2
+                    <NRF_PSEL(UART_RX, 0, 24)>;  // EXT2
         };
     };
 
     uart0_sleep: uart0_sleep {
         group1 {
             psels = <NRF_PSEL(UART_TX, 0, 21)>,
-                <NRF_PSEL(UART_RX, 0, 24)>;
+                    <NRF_PSEL(UART_RX, 0, 24)>;
             low-power-enable;
         };
     };
diff --git a/app/boards/arm/glove80/glove80_rh.dts b/app/boards/arm/glove80/glove80_rh.dts
index ebcca439..288f6368 100644
--- a/app/boards/arm/glove80/glove80_rh.dts
+++ b/app/boards/arm/glove80/glove80_rh.dts
@@ -36,26 +36,18 @@
         init-delay-ms = <100>;
     };
 
-    vbatt: vbatt-divider {
-        compatible = "zmk,battery-voltage-divider";
-        label = "BATTERY";
-        io-channels = <&adc 5>;
-        output-ohms = <820000>;
-        full-ohms = <(1500000 + 820000)>;
-    };
-
-    vbatt-vddh {
+    vbatt: vbatt {
         compatible = "zmk,battery-nrf-vddh";
-        label = "BATTERY-VDDH";
+        label = "BATTERY";
     };
 };
 
-&spi1 {
+&spi3 {
     compatible = "nordic,nrf-spim";
     status = "okay";
 
-    pinctrl-0 = <&spi1_default>;
-    pinctrl-1 = <&spi1_sleep>;
+    pinctrl-0 = <&spi3_default>;
+    pinctrl-1 = <&spi3_sleep>;
     pinctrl-names = "default", "sleep";
 
     led_strip: ws2812@0 {