[DEV] Begin to add color