Updat colors
Update colors
Minor changes
Merge Makefile