Flat theme updates
Merge branch 'flat' into develop