Fix case-ordering.
Set proper brush style if needed.

We occasionally had brushes with "NoBrush" style, resulting in no visual
change.
Also handle StateMachineStates here.