Remove all extraneous themes
Fixed merge conflicts in pictures
Merge pull request #980 from jaypoulz/jp923

Jp923