Added orange, tidied up style