Fixup annepro2 (#23206)

Co-authored-by: Joel Challis <git@zvecr.com>

9 files changed, 138 insertions, 278 deletions

diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json
index 091d0b1c5b..0f738c0999 100644
--- a/keyboards/annepro2/c15/info.json
+++ b/keyboards/annepro2/c15/info.json
@@ -3,129 +3,9 @@
     "usb": {
         "pid": "0x8008"
     },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["C4", "C5", "B10", "B11", "C0", "A15", "A8", "A10", "A11", "A12", "A13", "A14", "B2", "B3"],
         "rows": ["C2", "C1", "B5", "B4", "C3"]
-    },
-    "rgb_matrix": {
-        "animations":{
-           "alphas_mods": true,
-           "gradient_up_down": true,
-           "gradient_left_right": true,
-           "breathing": true,
-           "band_sat": true,
-           "band_val": true,
-           "band_pinwheel_sat": true,
-           "band_pinwheel_val": true,
-           "band_spiral_sat": true,
-           "band_spiral_val": true,
-           "cycle_all": true,
-           "cycle_left_right": true,
-           "cycle_up_down": true,
-           "rainbow_moving_chevron": true,
-           "cycle_out_in": true,
-           "cycle_out_in_dual": true,
-           "cycle_pinwheel": true,
-           "cycle_spiral": true,
-           "dual_beacon": true,
-           "rainbow_beacon": true,
-           "rainbow_pinwheels": true,
-           "raindrops": true,
-           "jellybean_raindrops": true,
-           "hue_breathing": true,
-           "hue_pendulum": true,
-           "hue_wave": true,
-           "pixel_fractal": true,
-           "pixel_flow": true,
-           "pixel_rain": true,
-           "typing_heatmap": true,
-           "digital_rain": true,
-           "solid_reactive_simple": true,
-           "solid_reactive": true,
-           "solid_reactive_wide": true,
-           "solid_reactive_multiwide": true,
-           "solid_reactive_cross": true,
-           "solid_reactive_multicross": true,
-           "solid_reactive_nexus": true,
-           "solid_reactive_multinexus": true,
-           "splash": true,
-           "multisplash": true,
-           "solid_splash": true,
-           "solid_multisplash": true
-        },
-        "driver": "custom",
-        "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
-            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
-            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
-            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
-            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
-            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
-            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
-            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
-            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
-            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
-            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
-            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
-            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
-            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
-            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
-            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
-            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
-            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
-            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
-            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
-            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
-            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
-            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
-            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
-            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
-            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
-            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
-            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
-            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
-            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
-            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
-            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
-            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
-            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
-            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
-            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
-            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
-            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
-            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
-            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
-            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
-            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
-            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
-            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
-            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
-            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
-            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
-            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
-            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
-            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
-            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
-            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
-            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
-            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
-            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
-            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
-            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
-            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
-            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
-        ],
-        "led_flush_limit": 40
-    },
-    "community_layouts": ["60_ansi"]
+    }
 }
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index c3bf551e4b..f35d9002ef 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -13,19 +13,6 @@ BOARD = ANNEPRO2_C15
 BOOTLOADER = custom
 PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-
-# Custom RGB matrix handling
-RGB_MATRIX_ENABLE = yes
-
 # Anne Pro 2
 SRC = \
 	annepro2_ble.c \
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json
index 8c765338a5..b3f3d367fe 100644
--- a/keyboards/annepro2/c18/info.json
+++ b/keyboards/annepro2/c18/info.json
@@ -3,129 +3,9 @@
     "usb": {
         "pid": "0x8009"
     },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["C4", "C5", "D0", "B15", "C11", "A15", "C12", "C13", "A8", "A10", "A11", "A14", "D2", "D3"],
         "rows": ["B5", "B4", "B3", "B2", "D1"]
-    },
-    "rgb_matrix": {
-        "animations":{
-           "alphas_mods": true,
-           "gradient_up_down": true,
-           "gradient_left_right": true,
-           "breathing": true,
-           "band_sat": true,
-           "band_val": true,
-           "band_pinwheel_sat": true,
-           "band_pinwheel_val": true,
-           "band_spiral_sat": true,
-           "band_spiral_val": true,
-           "cycle_all": true,
-           "cycle_left_right": true,
-           "cycle_up_down": true,
-           "rainbow_moving_chevron": true,
-           "cycle_out_in": true,
-           "cycle_out_in_dual": true,
-           "cycle_pinwheel": true,
-           "cycle_spiral": true,
-           "dual_beacon": true,
-           "rainbow_beacon": true,
-           "rainbow_pinwheels": true,
-           "raindrops": true,
-           "jellybean_raindrops": true,
-           "hue_breathing": true,
-           "hue_pendulum": true,
-           "hue_wave": true,
-           "pixel_fractal": true,
-           "pixel_flow": true,
-           "pixel_rain": true,
-           "typing_heatmap": true,
-           "digital_rain": true,
-           "solid_reactive_simple": true,
-           "solid_reactive": true,
-           "solid_reactive_wide": true,
-           "solid_reactive_multiwide": true,
-           "solid_reactive_cross": true,
-           "solid_reactive_multicross": true,
-           "solid_reactive_nexus": true,
-           "solid_reactive_multinexus": true,
-           "splash": true,
-           "multisplash": true,
-           "solid_splash": true,
-           "solid_multisplash": true
-        },
-        "driver": "custom",
-        "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
-            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
-            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
-            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
-            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
-            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
-            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
-            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
-            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
-            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
-            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
-            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
-            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
-            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
-            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
-            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
-            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
-            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
-            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
-            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
-            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
-            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
-            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
-            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
-            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
-            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
-            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
-            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
-            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
-            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
-            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
-            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
-            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
-            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
-            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
-            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
-            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
-            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
-            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
-            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
-            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
-            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
-            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
-            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
-            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
-            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
-            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
-            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
-            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
-            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
-            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
-            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
-            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
-            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
-            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
-            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
-            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
-            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
-            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
-        ],
-        "led_flush_limit": 40
-    },
-    "community_layouts": ["60_ansi", "60_iso"]
+    }
 }
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index 484099b3ae..b310454c5d 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -13,19 +13,6 @@ BOARD = ANNEPRO2_C18
 BOOTLOADER = custom
 PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-
-# Custom RGB matrix handling
-RGB_MATRIX_ENABLE = yes
-
 # Anne Pro 2
 SRC = \
 	annepro2_ble.c \
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
index f90edcfa83..8c7041005f 100644
--- a/keyboards/annepro2/info.json
+++ b/keyboards/annepro2/info.json
@@ -9,6 +9,132 @@
     "build": {
         "lto": true
     },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations":{
+           "alphas_mods": true,
+           "gradient_up_down": true,
+           "gradient_left_right": true,
+           "breathing": true,
+           "band_sat": true,
+           "band_val": true,
+           "band_pinwheel_sat": true,
+           "band_pinwheel_val": true,
+           "band_spiral_sat": true,
+           "band_spiral_val": true,
+           "cycle_all": true,
+           "cycle_left_right": true,
+           "cycle_up_down": true,
+           "rainbow_moving_chevron": true,
+           "cycle_out_in": true,
+           "cycle_out_in_dual": true,
+           "cycle_pinwheel": true,
+           "cycle_spiral": true,
+           "dual_beacon": true,
+           "rainbow_beacon": true,
+           "rainbow_pinwheels": true,
+           "raindrops": true,
+           "jellybean_raindrops": true,
+           "hue_breathing": true,
+           "hue_pendulum": true,
+           "hue_wave": true,
+           "pixel_fractal": true,
+           "pixel_flow": true,
+           "pixel_rain": true,
+           "typing_heatmap": true,
+           "digital_rain": true,
+           "solid_reactive_simple": true,
+           "solid_reactive": true,
+           "solid_reactive_wide": true,
+           "solid_reactive_multiwide": true,
+           "solid_reactive_cross": true,
+           "solid_reactive_multicross": true,
+           "solid_reactive_nexus": true,
+           "solid_reactive_multinexus": true,
+           "splash": true,
+           "multisplash": true,
+           "solid_splash": true,
+           "solid_multisplash": true
+        },
+        "driver": "custom",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
+            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
+        ],
+        "led_flush_limit": 40
+    },
+    "community_layouts": ["60_ansi", "60_iso"],
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/annepro2/keymaps/default-full-caps/keymap.c b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
index cb6147d40a..7d517a179a 100644
--- a/keyboards/annepro2/keymaps/default-full-caps/keymap.c
+++ b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
@@ -97,10 +97,10 @@ enum anne_pro_layers {
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______,       _______,      KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______,       _______,      KC_PSCR, KC_HOME, KC_END,  _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______,       _______,      KC_PGUP, KC_PGDN, _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______,       _______,      KC_INS,  KC_DEL,  _______,
-    _______, _______,    _______,                                     _______,                         _______,      MO(FN1), MO(FN2), _______
+    _______, _______,    _______,                                     _______,                         _______,      _______, _______, _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
index ca042dcd32..298f44398b 100644
--- a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
+++ b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
@@ -97,10 +97,10 @@ enum anne_pro_layers {
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
-    _______, _______,    _______,                                     _______,                   _______, MO(FN1), MO(FN2), _______
+    _______, _______,    _______,                                     _______,                   _______, _______, _______, _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c
index 8af2d9a32c..38be6ec54a 100644
--- a/keyboards/annepro2/keymaps/default/keymap.c
+++ b/keyboards/annepro2/keymaps/default/keymap.c
@@ -97,10 +97,10 @@ enum anne_pro_layers {
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,        _______,
+    _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,        _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______,       KC_INS,        KC_DEL,        _______,
-    _______, _______,    _______,                                     _______,                   _______,       MO(FN1),       MO(FN2),       _______
+    _______, _______,    _______,                                     _______,                   _______,       _______,       _______,       _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/iso_default/keymap.c b/keyboards/annepro2/keymaps/iso_default/keymap.c
index 4c1b259504..a495390603 100644
--- a/keyboards/annepro2/keymaps/iso_default/keymap.c
+++ b/keyboards/annepro2/keymaps/iso_default/keymap.c
@@ -76,9 +76,9 @@ enum anne_pro_layers {
  [FN1] = LAYOUT_60_iso( /* FN1 */
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,
-    MO(FN1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______,
     _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
-    _______, _______, _______,                            _______,                   KC_APP,  MO(FN1), MO(FN2), _______
+    _______, _______, _______,                            _______,                   KC_APP,  _______, MO(FN2), _______
 ),
   /*
   * Layer FN2
@@ -98,9 +98,9 @@ enum anne_pro_layers {
  [FN2] = LAYOUT_60_iso( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
     _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,
-    MO(FN1), KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,       _______,
+    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,       _______,
     _______, _______,    _______,    _______,    _______,    _______, _______, _______, _______, _______,       KC_INS,        KC_DEL,        _______,
-    _______, _______,    _______,                                     _______,                   KC_APP,        MO(FN1),       MO(FN2),       _______
+    _______, _______,    _______,                                     _______,                   KC_APP,        _______,       _______,       _______
  ),
 };
 // clang-format on