rename colors to 0-15 and add diffs