Merge "Misc fix on settings themes."