diff --git a/keyboards/cornia/cornia.c b/keyboards/cornia/cornia.c
index 3d8d90cf2927..aaa30fc0484a 100644
--- a/keyboards/cornia/cornia.c
+++ b/keyboards/cornia/cornia.c
@@ -16,8 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-#include "./cornia.h"
-
 // 'Cornia', 32x32px
 #define OLED_LOGO_CORNIA {\
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, \
@@ -36,3 +34,11 @@ void cornia_render_logo(void) {
     oled_write_raw_P(logo, sizeof(logo));
 #endif
 }
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    cornia_render_logo();
+    return true;
+}
diff --git a/keyboards/cornia/cornia.h b/keyboards/cornia/cornia.h
index 264ddd63930f..2cee8d4a685f 100644
--- a/keyboards/cornia/cornia.h
+++ b/keyboards/cornia/cornia.h
@@ -16,6 +16,6 @@
 
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 void cornia_render_logo(void);
diff --git a/keyboards/cornia/keymaps/fire/callback_oled.c b/keyboards/cornia/keymaps/fire/callback_oled.c
index 2c3422477b37..7e0b87a649c2 100644
--- a/keyboards/cornia/keymaps/fire/callback_oled.c
+++ b/keyboards/cornia/keymaps/fire/callback_oled.c
@@ -17,7 +17,6 @@
 #include QMK_KEYBOARD_H
 
 #include "./keymap.h"
-#include "./cornia.h"
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     return OLED_ROTATION_270;
diff --git a/keyboards/cornia/v0_6/rules.mk b/keyboards/cornia/v0_6/rules.mk
deleted file mode 100644
index 0a8e43f4efad..000000000000
--- a/keyboards/cornia/v0_6/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2024 Vaarai
-#
-# 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/>.
-
-# Add I²C HAL dependencies
-OPT_DEFS += -DHAL_USE_I2C=TRUE
diff --git a/keyboards/cornia/v1/rules.mk b/keyboards/cornia/v1/rules.mk
deleted file mode 100644
index 0a8e43f4efad..000000000000
--- a/keyboards/cornia/v1/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2024 Vaarai
-#
-# 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/>.
-
-# Add I²C HAL dependencies
-OPT_DEFS += -DHAL_USE_I2C=TRUE