[D#532] Layout and lang defines near completion