GoC theme changes
Merge remote-tracking branch 'origin/master'
Some more fixes to group templating.