Theme switch only if the default theme was changed
Conflicts:
	js/charisma.js
fixed: conflict with cherry-pick: COil/charisma/commit/07d2dfdcf0e246fe188827883a512e56567d8d69