Style header and footer
Resolve conflicts
Merge branch 'master' of https://github.com/plattebasintimelapse/Theme-Refresh
Sync with Abe