Sorry, the last version still had some regressions from a failed merge. This version should re-fix some old issues and fix some new.
Also OrbitUsesLightColor was set to false by default. Now it is set to true instead (which is also the default value in game).
Sorry for the inconveniences.