Update Cappuccino + Re nib2cib everything

FIX #1085