Update tons of highlight settings; misc setting tweaks
Yet more highlight updates