Fix colours and better hovering