diff --git a/keyboards/fingerpunch/ffkb_byomcu/v2/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ffkb_byomcu/v2/keymaps/sadekbaroudi/keymap.c
index 8786134b07..2bbcedbdb1 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/v2/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/ffkb_byomcu/v2/keymaps/sadekbaroudi/keymap.c
@@ -38,9 +38,9 @@
               K33, K34, K35, K36, K37, K38 \
   ) \
   LAYOUT_wrapper( \
-        FP_SCROLL_TOG,   K01,            K02,            K03,            LT(_FUNCTION, K04),     K05,                      K06,                   LT(_FUNCTION, K07),    K08,              K09,            K0A,          KC_BSLS, \
-        KC_MS_BTN1,      LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                      LT(_MOUSE, K16),       RSFT_T(K17),           RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),  LCTL(KC_V), \
-        FP_SNIPE_TOG,    K21,            K22,            K23,            K24,                    K25,                      K26,                   K27,                   K28,              K29,            K2A,          FP_SUPER_TAB, \
+        M_KI_R_SWAP,     K01,            K02,            K03,            LT(_FUNCTION, K04),     K05,                      K06,                   LT(_FUNCTION, K07),    K08,              K09,            K0A,          KC_BSLS, \
+        M_KI_SEL_TR,     LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                      LT(_MOUSE, K16),       RSFT_T(K17),           RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),  LCTL(KC_V), \
+        M_KI_MV,         K21,            K22,            K23,            K24,                    K25,                      K26,                   K27,                   K28,              K29,            K2A,          FP_SUPER_TAB, \
                                  KC_MUTE,                K33,            LT(_NAVIGATION,K34),    LT(_FUNCTION,K35),        LT(_MEDIA,K36),        LT(_SYMBOLS,K37),      K38,              LCTL(KC_BSPC), \
                                                                                                            N_DEL_LINE \
     )
diff --git a/users/sadekbaroudi/config.h b/users/sadekbaroudi/config.h
index 66f64da4ab..aea323c47f 100755
--- a/users/sadekbaroudi/config.h
+++ b/users/sadekbaroudi/config.h
@@ -77,3 +77,10 @@
 #define RGBLED_NUM 12
 #endif
 
+// To enable this, just pass RGB_MATRIX_BAND_VAL_LAYERS=yes at the command line when building
+#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_BAND_VAL_LAYERS)
+#define FP_LAYER_LIGHTING_MODE_2 RGB_MATRIX_BAND_VAL
+#define FP_LAYER_LIGHTING_MODE_3 RGB_MATRIX_BAND_VAL
+#define FP_LAYER_LIGHTING_MODE_4 RGB_MATRIX_BAND_VAL
+#define FP_LAYER_LIGHTING_MODE_5 RGB_MATRIX_BAND_VAL
+#endif
diff --git a/users/sadekbaroudi/process_records.c b/users/sadekbaroudi/process_records.c
index ae5201b2ae..4cfceb6776 100755
--- a/users/sadekbaroudi/process_records.c
+++ b/users/sadekbaroudi/process_records.c
@@ -7,6 +7,9 @@
 #include "drivers/haptic/DRV2605L.h"
 #endif
 
+ // for alternating between 45 degree angle routing and free angle routing with one key
+bool kicad_free_angle_routing = false;
+
 __attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
 
 __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
@@ -199,6 +202,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             #endif
             break;
         // COMMENT TO DISABLE MACROS
+        case M_KI_R_SWAP:
+            if (record->event.pressed) {
+                register_code(KC_LSFT);
+                register_code(KC_LCTL);
+                SEND_STRING(SS_TAP(X_COMM) SS_DELAY(300));
+                unregister_code(KC_LSFT);
+                unregister_code(KC_LCTL);
+                // If we're in free angle routing, we tap down to go back to 45 degree angle routing
+                if (kicad_free_angle_routing) {
+                    SEND_STRING(SS_TAP(X_DOWN) SS_TAP(X_ENTER));
+                } else {
+                    SEND_STRING(SS_TAP(X_UP) SS_TAP(X_ENTER));
+                }
+                kicad_free_angle_routing = !kicad_free_angle_routing;
+            }
+            break;
         case M_KI_R_ANGLE:
             if (record->event.pressed) {
                 register_code(KC_LSFT);
diff --git a/users/sadekbaroudi/process_records.h b/users/sadekbaroudi/process_records.h
index 7201f23ecc..351212d1e0 100755
--- a/users/sadekbaroudi/process_records.h
+++ b/users/sadekbaroudi/process_records.h
@@ -37,6 +37,7 @@ enum userspace_custom_keycodes {
     KC_RGB_BLT,                     // Toggles RGB Base Layer Override mode
     RGB_IDL,                        // RGB Idling animations
     KC_MAKE,                        // Run keyboard's customized make command
+    M_KI_R_SWAP,
     M_KI_R_ANGLE,
     M_KI_R_FREE,
     L_GREP,
diff --git a/users/sadekbaroudi/rules.mk b/users/sadekbaroudi/rules.mk
index ee97ddb2a5..02aebce629 100755
--- a/users/sadekbaroudi/rules.mk
+++ b/users/sadekbaroudi/rules.mk
@@ -34,6 +34,11 @@ ifeq ($(strip $(RGB_LED_RING)), yes)
     OPT_DEFS += -DRGB_LED_RING
 endif
 
+RGB_MATRIX_BAND_VAL_LAYERS := no
+ifeq ($(strip $(RGB_MATRIX_BAND_VAL_LAYERS)), yes)
+    OPT_DEFS += -DRGB_MATRIX_BAND_VAL_LAYERS
+endif
+
 ifneq ($(strip $(NO_SECRETS)), yes)
     ifneq ("$(wildcard $(USER_PATH)/secrets.c)","")
         SRC += secrets.c