Converted *almost* everything to CoffeeKup

Sadly there were a couple of things where eco was still better. I'll
soon find a way to use CoffeeKup for this though... You'll see...