Something about the 2d Settings again...

I'm just merging to stay on top of any changes before I start doing
things with lights...