Fixes
Color refactoring