Re-add zkbd and some other twiddles