5 files changed, 25 insertions, 24 deletions
diff --git a/keyboards/rgbkb/zen/post_rules.mk b/keyboards/rgbkb/zen/post_rules.mk
new file mode 100644
index 0000000000..3ddb449efa
--- /dev/null
+++ b/keyboards/rgbkb/zen/post_rules.mk
@@ -0,0 +1,14 @@
+ifeq ($(strip $(CTPC)), yes)
+  CONVERT_TO_PROTON_C=yes
+endif
+
+ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
+  SPLIT_KEYBOARD = no       # currently unsupported on ARM
+  RGBLIGHT_ENABLE = no      # currently unsupported on ARM
+
+  EXTRAFLAGS += -DUSE_PROTON_C
+else
+  # Currently moved to Pro Micro only section because of lack of Proton-C support
+  SPLIT_KEYBOARD = yes
+  RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+endif
diff --git a/keyboards/rgbkb/zen/rev2/post_rules.mk b/keyboards/rgbkb/zen/rev2/post_rules.mk
new file mode 100644
index 0000000000..2a4397e980
--- /dev/null
+++ b/keyboards/rgbkb/zen/rev2/post_rules.mk
@@ -0,0 +1,5 @@
+# Setup so that OLED can be turned on/off easily
+ifeq ($(strip $(OLED_ENABLE)), yes)
+  # Custom local font file
+  OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
+endif
diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c
index 7bc0072467..5461890272 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.c
+++ b/keyboards/rgbkb/zen/rev2/rev2.c
@@ -47,20 +47,23 @@ void render_status(void) {
   oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR("     "), false); // Line 16
 }
 
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
   if (is_keyboard_master())
     return OLED_ROTATION_270;  // flips the display 270 degrees if mainhand
   return rotation;
 }
 
-__attribute__((weak))
-void oled_task_user(void) {
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
   if (is_keyboard_master()) {
     render_status();
   } else {
     render_logo();
     oled_scroll_left();
   }
+  return false;
 }
 
 #endif
diff --git a/keyboards/rgbkb/zen/rev2/rules.mk b/keyboards/rgbkb/zen/rev2/rules.mk
index 9bb8b8cd0d..6dd9d2e270 100644
--- a/keyboards/rgbkb/zen/rev2/rules.mk
+++ b/keyboards/rgbkb/zen/rev2/rules.mk
@@ -1,9 +1,3 @@
 ENCODER_ENABLE = yes
 
 OLED_ENABLE = no
-
-# Setup so that OLED can be turned on/off easily
-ifeq ($(strip $(OLED_ENABLE)), yes)
-  # Custom local font file
-  OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
-endif
diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk
index 9d6d2e1258..98a8a59edb 100644
--- a/keyboards/rgbkb/zen/rules.mk
+++ b/keyboards/rgbkb/zen/rules.mk
@@ -4,21 +4,6 @@ MCU = atmega32u4
 # Bootloader selection
 BOOTLOADER = caterina
 
-ifeq ($(strip $(CTPC)), yes)
-  CONVERT_TO_PROTON_C=yes
-endif
-
-ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
-  SPLIT_KEYBOARD = no       # currently unsupported on ARM
-  RGBLIGHT_ENABLE = no      # currently unsupported on ARM
-
-  EXTRAFLAGS += -DUSE_PROTON_C
-else
-  # Currently moved to Pro Micro only section because of lack of Proton-C support
-  SPLIT_KEYBOARD = yes
-  RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-endif
-
 # Build Options
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically