Adjust some colours and remove things done twice in main()