6 files changed, 14 insertions, 72 deletions
diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/info.json
index 5a881ce5cd..6c00c7830e 100644
--- a/keyboards/saevus/cor_tkl/info.json
+++ b/keyboards/saevus/cor_tkl/info.json
@@ -3,6 +3,12 @@
     "manufacturer": "saevus",
     "url": "",
     "maintainer": "ramonimbao",
+    "community_layouts": [
+      "tkl_f13_ansi",
+      "tkl_f13_ansi_split_bs_rshift",
+      "tkl_f13_iso",
+      "tkl_f13_iso_split_bs_rshift"
+    ],
     "layout_aliases": {
         "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
         "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
@@ -13,18 +19,24 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": false
+        "nkro": false,
+        "rgb_matrix": true
     },
     "usb": {
         "vid": "0x5001",
         "pid": "0x0003",
         "device_version": "1.0.0"
     },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12", "GP11", "GP5"],
         "rows": ["GP0", "GP1", "GP2", "GP21", "GP3", "GP4"]
     },
+    "rgb_matrix": {
+      "driver": "WS2812"
+    },
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/config.h b/keyboards/saevus/cor_tkl/keymaps/default/config.h
deleted file mode 100644
index 08636494e6..0000000000
--- a/keyboards/saevus/cor_tkl/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
index 3c5139dbe7..5d351a1578 100644
--- a/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
+++ b/keyboards/saevus/cor_tkl/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_tkl_f13_ansi_tsangan(
+    [0] = LAYOUT_tkl_f13_ansi(
         KC_ESC,  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_F13,  KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/saevus/cor_tkl/keymaps/iso/config.h b/keyboards/saevus/cor_tkl/keymaps/iso/config.h
deleted file mode 100644
index 52983591bf..0000000000
--- a/keyboards/saevus/cor_tkl/keymaps/iso/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/keymaps/via/config.h b/keyboards/saevus/cor_tkl/keymaps/via/config.h
deleted file mode 100644
index 52983591bf..0000000000
--- a/keyboards/saevus/cor_tkl/keymaps/via/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/saevus/cor_tkl/rules.mk b/keyboards/saevus/cor_tkl/rules.mk
index e53fbb2e92..997fce7e65 100644
--- a/keyboards/saevus/cor_tkl/rules.mk
+++ b/keyboards/saevus/cor_tkl/rules.mk
@@ -1,13 +1 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
-# RGB Matrix
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
 WS2812_DRIVER = vendor
-
-LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift tkl_f13_iso tkl_f13_iso_split_bs_rshift
-