Added color exploration and feedback back to repo. Now conflict mess should be sorted out.