1+ Ensure all national layouts are 'normalized' (no multiple layouts for same country/language - only variants) 2+ Write tests checking that every model/layout(variant)/option in base.xml is working 3+ Add the vendor info to the keyboard geometry description 4- Check consistence (correctness, usability) of the descriptions in the registry. Note: ask help from GNOME Usability Team. 5- Write tests which would ensure that base.xml covers everything 6- Write compatibility rules for old models/layouts/variants (potentially eternal job) 7