Still fixing themes
Merge branch 'master' of https://github.com/GoldProgramming/GoldSuite