diff --git a/src/kaleidoscope/device/keyboardio/Atreus2.h b/src/kaleidoscope/device/keyboardio/Atreus2.h
index 64e3d38e..c62d966e 100644
--- a/src/kaleidoscope/device/keyboardio/Atreus2.h
+++ b/src/kaleidoscope/device/keyboardio/Atreus2.h
@@ -30,9 +30,16 @@ namespace device {
 namespace keyboardio {
 
 
-  ATMEGA32U4_DEVICE_PROPS(Atreus, Caterina, "atreus",                          
-                          ROW_PIN_LIST({PIN_F6, PIN_F5, PIN_F4, PIN_F1}),
-                          COL_PIN_LIST({PIN_F7, PIN_E2, PIN_C7, PIN_C6, PIN_B6, PIN_B5, PIN_D7, PIN_D6, PIN_D4, PIN_D5, PIN_D3, PIN_D2}));
+  struct AtreusProps : kaleidoscope::device::ATmega32U4KeyboardProps {          
+    struct KeyScannerProps : public kaleidoscope::driver::keyscanner::ATmegaProps {                                                                             
+      ATMEGA_KEYSCANNER_PROPS(
+         ROW_PIN_LIST({PIN_F6, PIN_F5, PIN_F4, PIN_F1}),
+         COL_PIN_LIST({PIN_F7, PIN_E2, PIN_C7, PIN_C6, PIN_B6, PIN_B5, PIN_D7, PIN_D6, PIN_D4, PIN_D5, PIN_D3, PIN_D2}));
+    };                                                                            
+    typedef kaleidoscope::driver::keyscanner::ATmega<KeyScannerProps> KeyScanner; 
+    typedef kaleidoscope::driver::bootloader::avr::Caterina BootLoader;        
+    static constexpr const char *short_name = "atreus";                             
+  };
 
 #ifndef KALEIDOSCOPE_VIRTUAL_BUILD
   class Atreus: public kaleidoscope::device::ATmega32U4Keyboard<AtreusProps> {};