Added some additional groups to the themes, and other minor changes.