Theme fixes
Merge pull request #5 from GeographicaGS/dev

Theme fixes