added layout migration to themes model
Merge branch 'leland'