Fix: Regression in deluxe_ub1 support, fix: formatting issue with keydata.h