Rename default theme and uninstall old ones when upgrading

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #613 from Oldiesmann/release-2.1

Rename default theme and uninstall old ones when upgrading
Fixes #517
Fixes #518