diff --git a/src/main.cpp b/src/main.cpp
index d7e866a2a..7af4cf60c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -396,6 +396,10 @@ void setup()
         meshtastic_Config_DisplayConfig_OledType::meshtastic_Config_DisplayConfig_OledType_OLED_AUTO;
     OLEDDISPLAY_GEOMETRY screen_geometry = GEOMETRY_128_64;
 
+#ifdef OLED_GEOMETRY
+    screen_geometry = OLED_GEOMETRY;
+#endif
+
 #ifdef USE_SEGGER
     auto mode = false ? SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL : SEGGER_RTT_MODE_NO_BLOCK_TRIM;
 #ifdef NRF52840_XXAA
@@ -882,8 +886,7 @@ void setup()
     if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
 
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
-    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_SPISSD1306)
+    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(USE_SSD1306_SPI)
         screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
 #elif defined(ARCH_PORTDUINO)
         if ((screen_found.port != ScanI2C::I2CPort::NO_I2C || settingsMap[displayPanel]) &&
@@ -1146,8 +1149,7 @@ void setup()
 // Don't call screen setup until after nodedb is setup (because we need
 // the current region name)
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
-    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_SPISSD1306)
+    defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(USE_SSD1306_SPI)
     if (screen)
         screen->setup();
 #elif defined(ARCH_PORTDUINO)
diff --git a/variants/esp32c6/m5stack_unitc6l/variant.h b/variants/esp32c6/m5stack_unitc6l/variant.h
index b49cf882a..d973aa281 100644
--- a/variants/esp32c6/m5stack_unitc6l/variant.h
+++ b/variants/esp32c6/m5stack_unitc6l/variant.h
@@ -49,4 +49,4 @@ void c6l_init();
 // #define OLED_DG 1
 #endif
 #define SCREEN_TRANSITION_FRAMERATE 10
-#define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness
\ No newline at end of file
+#define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness