diff --git a/keyboards/monsgeek/m2/info.json b/keyboards/monsgeek/m2/info.json
index 59518e1e244..a7caa13a9d7 100644
--- a/keyboards/monsgeek/m2/info.json
+++ b/keyboards/monsgeek/m2/info.json
@@ -5,7 +5,17 @@
     "usb": {
         "vid": "0xFFFE",
         "pid": "0x0008",
-        "device_version": "1.0.3"
+        "device_version": "1.0.4"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "encoder": false,
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2","B10","B11","B12","B13","B14"],
diff --git a/keyboards/monsgeek/m2/keymaps/default/keymap.c b/keyboards/monsgeek/m2/keymaps/default/keymap.c
index bde70d2e0f4..27f02b8dc9d 100644
--- a/keyboards/monsgeek/m2/keymaps/default/keymap.c
+++ b/keyboards/monsgeek/m2/keymaps/default/keymap.c
@@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_FN] = LAYOUT( /* FN */
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,           _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,           _______, _______, _______, _______,
-		_______, _______, TG(WIN_WASD),_______,_______,_______,_______,_______, KC_INS, DF(MAC_B),KC_PSCR, _______, _______, RGB_MOD,           _______, _______, _______, _______,
+		_______, _______, TG(WIN_WASD),_______,_______,_______,_______,_______, KC_INS, DF(WIN_B),KC_PSCR, _______, _______, RGB_MOD,           _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,           _______, _______, _______,
 		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, RGB_VAI,  _______, _______, _______, _______,
 		_______, _______, _______,                   _______,                           _______,          _______,           RGB_SAD, RGB_VAD,  RGB_SAI, _______, _______)
diff --git a/keyboards/monsgeek/m2/keymaps/via/keymap.c b/keyboards/monsgeek/m2/keymaps/via/keymap.c
index 17418b1121d..27f02b8dc9d 100644
--- a/keyboards/monsgeek/m2/keymaps/via/keymap.c
+++ b/keyboards/monsgeek/m2/keymaps/via/keymap.c
@@ -75,10 +75,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_FN] = LAYOUT( /* FN */
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,           _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,           _______, _______, _______, _______,
-		_______, _______, TG(WIN_WASD),_______,_______,_______,_______,_______, KC_INS, DF(MAC_B),KC_PSCR, _______, _______, RGB_MOD,           _______, _______, _______, _______,
+		_______, _______, TG(WIN_WASD),_______,_______,_______,_______,_______, KC_INS, DF(WIN_B),KC_PSCR, _______, _______, RGB_MOD,           _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI,           _______, _______, _______,
 		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______, RGB_VAI,  _______, _______, _______, _______,
 		_______, _______, _______,                   _______,                           _______,          _______,           RGB_SAD, RGB_VAD,  RGB_SAI, _______, _______)
 
 };
-// clang-format on
diff --git a/keyboards/monsgeek/m2/rules.mk b/keyboards/monsgeek/m2/rules.mk
index a3770ce5977..6decd907366 100644
--- a/keyboards/monsgeek/m2/rules.mk
+++ b/keyboards/monsgeek/m2/rules.mk
@@ -1,18 +1,6 @@
 # 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
-KEYBOARD_SHARED_EP = yes
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no
-RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3733
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = spi_flash