Small changes

Use color_xs instead of recreating colors
File structure change (prevent conflicts)
Small coding style clean-ups