Merge pull request #733 from sylus/master

Migrate Updates and more Layouts
WET-BOEW updates