Overhaul of theme settings