23a24,25
>   from StandardLibrary import Object, AddWithRetentionAndNoJunk;
> 
25c27
<         RequiresSaving, CalendarSpecificSettings;
---
>         RequiresSaving;
27,32c29,34
<   from Options import Options, RegularUserOptions, Scheduling,
<         SchedulingDefaults;
<   export ScheduledItem, Appointment, Meeting, Task, Event, Title, StartTime,
<         Duration, StartOrDueDate, EndDate, WeeklyDetails, Category, Categories,
<         Location, Security, Priority, Date, Hours, Minutes, DateNumber, Time,
<         Hour, Minute, AmOrPm, DayName, MonthName;
---
>   from Options import Options, Scheduling, SchedulingDefaults;
> 
>   export ScheduledItem, Appointment, Title, StartTime, Duration,
>         StartOrDueDate, EndDate, WeeklyDetails, Category, Categories, Location,
>         Security, Priority, Date, Hours, Minutes, DateNumber, Time, Hour,
>         Minute, AmOrPm, DayName, MonthName;
508c510
<   object Category
---
>   object Category inherits from Object is
925c927
<         the possibles list. *);
---
>         the possibles list.
1277,1278c1279
<         forall (c':Category)
<             (c' in cs') iff (c' in cs) or (c' = c);
---
>         AddWithRetentionAndNoJunk(c, cs, cs');
1329c1330
<         appt' = cdb.workspace.calendars[1].settings.options.sched.defaults.appt;
---
>         appt' = cdb.workspace.calendars[1].options.sched.defaults.appt;