Improved colors
Updated cluster list using table