Fixing coloring and schema