Added Color import
Merged and fixed compilation errors