diff --git a/config/adv360pro.keymap b/config/adv360pro.keymap
index 55e3a5b..c7a49a2 100644
--- a/config/adv360pro.keymap
+++ b/config/adv360pro.keymap
@@ -13,8 +13,8 @@
 		&kp AMPERSAND &kp LEFT_BRACKET  &kp LEFT_BRACE  &kp RIGHT_BRACE     &kp LEFT_PARENTHESIS &kp EQUAL    &none                                                                                              &mo 3  &kp ASTRK    &kp RIGHT_PARENTHESIS &kp PLUS      &kp RIGHT_BRACKET &kp EXCLAMATION &kp HASH
 		&kp TAB       &kp COLON         &kp COMMA       &kp DOT             &kp P                &kp Y        &none                                                                                              &none  &kp F        &kp G                 &kp C         &kp R             &kp L           &kp BSLH
 		&kp LCTRL     &kp A             &kp O           &kp E               &kp U                &kp I        &none               &kp LCMD      &kp LALT                    &kp RALT     &kp RCMD                &none  &kp D        &kp H                 &kp T         &kp N             &kp S           &kp MINUS
-		&mo 4         &kp SINGLE_QUOTE  &kp Q           &kp J               &kp K                &kp X                                          &kp F16                     &kp F16                                     &kp B        &kp M                 &kp W         &kp V             &kp Z           &mo 4
-		&kp LSHIFT    &kp DOLLAR        &kp TILDE       &kp LEFT            &kp DOWN                                 &kp BSPC     &kp LCTRL     &kp F13                     &kp ESCAPE   &kp ENTER     &kp SPACE                     &kp UP                &kp RIGHT     &kp SLASH         &kp AT          &kp RSHIFT
+		&mo 4         &kp SINGLE_QUOTE  &kp Q           &kp J               &kp K                &kp X                                          &kp F9                      &kp F9                                      &kp B        &kp M                 &kp W         &kp V             &kp Z           &mo 4
+		&kp LSHIFT    &kp DOLLAR        &kp TILDE       &kp LEFT            &kp DOWN                                 &kp BSPC     &kp LCTRL     &kp F8                      &kp ESCAPE   &kp ENTER     &kp SPACE                     &kp UP                &kp RIGHT     &kp SLASH         &kp AT          &kp RSHIFT
 	    >;
 	};
         keypad {
diff --git a/config/boards/arm/adv360pro/adv360pro_left_defconfig b/config/boards/arm/adv360pro/adv360pro_left_defconfig
index 293e9ee..d9ba398 100644
--- a/config/boards/arm/adv360pro/adv360pro_left_defconfig
+++ b/config/boards/arm/adv360pro/adv360pro_left_defconfig
@@ -39,6 +39,8 @@ CONFIG_ZMK_RGB_UNDERGLOW_ON_START=y
 CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=4
 CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
 
+CONFIG_BT_BAS=y
+
 #Backlighting configuration
 CONFIG_PWM=y
 CONFIG_LED_PWM=y
@@ -55,8 +57,8 @@ CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y
 
 # avoid debouncing: https://zmk.dev/docs/features/debouncing
-CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=0
-CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=12
+CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=3
+CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=15
 
 # https://github.com/wilser/EW-Nauticus-Adv360/blob/2c9834e14059/config/boards/arm/adv360/adv360_left_defconfig#L71-L75
 # EW test 'idle' setting for hacking the small LED status lights timeout
diff --git a/config/boards/arm/adv360pro/adv360pro_right_defconfig b/config/boards/arm/adv360pro/adv360pro_right_defconfig
index 9b93e8f..f0c596c 100644
--- a/config/boards/arm/adv360pro/adv360pro_right_defconfig
+++ b/config/boards/arm/adv360pro/adv360pro_right_defconfig
@@ -54,8 +54,8 @@ CONFIG_BUILD_OUTPUT_UF2=y
 CONFIG_ZMK_BLE=y
 
 # avoid debouncing: https://zmk.dev/docs/features/debouncing
-CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=0
-CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=12
+CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=3
+CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=15
 
 # EW test 'idle' setting for hacking the small LED status lights timeout - see notes in LEFT file
 CONFIG_ZMK_IDLE_TIMEOUT=600000
diff --git a/config/west.yml b/config/west.yml
index c344759..4558e2b 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -8,8 +8,8 @@ manifest:
       url-base: https://github.com/zchee
   projects:
     - name: zmk
-      remote: zchee
-      revision: advantage360
+      remote: refil
+      revision: adv360-z3.2-beta
       import: app/west.yml
   self:
     path: config