Handle changing theme names smartly (Fix #650)
Merge pull request #653 from ralsina/theme-renaming

Handle changing theme names smartly (Fix #650)