Fixed the an item with the same key ex when changing the themes.
Merge branch 'master' of https://github.com/bsanders/softeng