changes names and labels based off theme
Merge branch 'master' of https://github.com/chpatton013/clue