Theme updates.
Fix calendar removal.