Add tests and fix some colors
Update screenshot with color fixes