To make it a bit more organized (PSD use), combine all the same colors on one shape layer.