Added ability to change colours, only have main colours for now. Also cleaned up variables