Better colours
Found a bug, working on it