4 files changed, 6 insertions, 19 deletions
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
index e996752af1..91c434bba4 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
 
 /*
  * Keyboard Matrix Assignments
@@ -59,10 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
   #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
 #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* Set lower left modifier key as a bootmagic key */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 5761467ac6..8e36e83b94 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -8,6 +8,11 @@
         "pid": "0x000A",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
index 0bf0d42d5a..0bb0c2221d 100644
--- a/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
+++ b/keyboards/paprikman/albacore/keymaps/pulp/keymap.c
@@ -18,7 +18,7 @@
 uint16_t layer_timer;
 
 enum layer_keycodes {
-  TG_LAYER = USER00
+  TG_LAYER = QK_KB_0
 };
 
 uint8_t get_hold_layer(void) {
diff --git a/keyboards/paprikman/albacore/rules.mk b/keyboards/paprikman/albacore/rules.mk
index cbfd971b0f..c982617812 100644
--- a/keyboards/paprikman/albacore/rules.mk
+++ b/keyboards/paprikman/albacore/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #