Updates for spell layouts and some deprecated layout parameters