Tidy up theme settings
Fix order of settings