removed fixed type Event ...

and changed to calendar_types. same change than in 2.3