Update to BlocksKit 2.0

Relates to issue #1