Removed unused directives
Unified color library