There are both in this shipment, but since it's been so long, a lot of it is previously spoken for. We'll update the website with what's available as soon as we know when it's arriving.
Bul estimates my next shipment after this one will arrive in December, so if there's anything you're willing to wait for - contact us and we can add it to that shipment.