More incremental changes toward ColorList.