Themes layout fixes
Merge branch 'master' of https://github.com/iwazzz/swampy-cms