Renaming to color so removing colors first
Working on layout a little