Added new colors and organized imports