Cider and theme fixups.