Clean up some properties and properly set the orange tint colour