More tooling cleanup
Implement coloring on/off
Refactor structs