Update feature: Update cerber theme with #623