4 files changed, 7 insertions, 16 deletions
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 1308312950..2eda942c15 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Copy and worked on with love from the EZ team
 
 #pragma once
-#include "config_common.h"
-
-#define BOOTMAGIC_LITE_ROW 13
-#define BOOTMAGIC_LITE_COLUMN 2
 
 /* Defaults */
 #ifndef BALLSTEP
@@ -47,9 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_DELAY 0
 #define TAPPING_TOGGLE  1
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 #define TAPPING_TERM    200
 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
@@ -64,5 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
 
-#define DEBOUNCE    5
 #define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index 753a5e2e73..f38051809d 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -8,6 +8,11 @@
         "pid": "0x1307",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [13, 2]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT_gergo": "LAYOUT"
     },
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index 3898246e30..c352be24e1 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -153,7 +153,7 @@ void matrix_init(void) {
   }
 
     debounce_init(MATRIX_ROWS);
-    matrix_init_quantum();
+    matrix_init_kb();
 }
 
 void matrix_power_up(void) {
@@ -260,7 +260,7 @@ uint8_t matrix_scan(void) {
     }
 
     debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
-    matrix_scan_quantum();
+    matrix_scan_kb();
 
     enableInterrupts();
 
diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
index 0f877e2d4b..95e12cc36c 100644
--- a/keyboards/gboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #