Fix color derp
Indenting
introducing snappoints

Change-Id: I5c9b2e03febe19a1d30344eb7ade26ef81e31b41