Fix DDL data and color