New layout & mk-generator script.