DO NOT MERGE: Change theme after exit from SettingsActivity, fix bugs.