Fixing color system more - Not stable