refactors theme files; unifies group themeing