Move highlight CSS to local, and tweak