Finalize refactor of the Color and Code components, revise and rerun unit tests