@focus8/settings-registry 0.8.3 → 0.8.4

package/src/index.ts

@@ -34,8 +34,8 @@ export type LocaleCode = 'en' | 'nb';
 export type CalendarType = 'chronological' | 'time-based';
 export type ClockType = 'digital' | 'analog';
 export type TimePickerMode = 'dials' | 'keypad';
-export type AlarmTimeout = 1 | 2 | 3 | 5 | 10;
-export const ALARM_TIMEOUTS: AlarmTimeout[] = [1, 2, 3, 5, 10];
+export type AlarmTimeout = 5 | 30 | 60 | 120 | 180 | 300 | 600;
+export const ALARM_TIMEOUTS: AlarmTimeout[] = [5, 30, 60, 120, 180, 300, 600];
 export type CalendarViewMode =
   | 'day'
   | '3-days'
@@ -103,6 +103,7 @@ export type SettingUiType =
   | 'CUSTOM_DISPLAY_DENSITY'
   | 'CUSTOM_BRIGHTNESS'
   | 'CUSTOM_SPLIT_VIEW_CONFIG'
+  | 'CUSTOM_EVENT_CATEGORIES'
   | 'HIDDEN';
 
 export type SettingOption<T = unknown> = {
@@ -110,6 +111,8 @@ export type SettingOption<T = unknown> = {
   value: T;
   /** i18n message key for the option label */
   labelKey: string;
+  /** Optional values to pass to the i18n message formatter */
+  labelValues?: Record<string, unknown>;
 };
 
 export type SliderConfig = {
@@ -220,76 +223,149 @@ export function getCategoriesForCalendarType(
 }
 
 // ---------------------------------------------------------------------------
-// Settings groups — user-facing groups that reorganize raw categories
+// Settings sections — top-level groupings (e.g. "Kalender", "Enhet")
 // ---------------------------------------------------------------------------
 
-/**
- * Settings group IDs matching the mobile app's settings menu structure.
- * These provide user-friendly groupings that may pull settings from multiple
- * raw registry categories.
- */
-export const SETTINGS_GROUP_IDS = [
+export const SETTINGS_SECTION_IDS = ['calendar', 'unit'] as const;
+export type SettingsSectionId = (typeof SETTINGS_SECTION_IDS)[number];
+
+export type SettingsSectionDef = {
+  id: SettingsSectionId;
+  labelKey: string;
+};
+
+export const SETTINGS_SECTIONS: readonly SettingsSectionDef[] = [
+  { id: 'calendar', labelKey: 'Calendar.LabelCalendar' },
+  { id: 'unit', labelKey: 'Settings.Unit' },
+];
+
+// ---------------------------------------------------------------------------
+// Settings menu items — ordered list of all items in the settings menu
+// ---------------------------------------------------------------------------
+
+export const SETTINGS_MENU_ITEM_IDS = [
   // Calendar section
   'calendarView',
+  'calendars',
+  'eventCategories',
+  'notification',
   'timer',
-  'activities',
-  'dateWeather',
-  'touch',
+  'guests',
+  'eventForm',
+  'chronologicalEventForm',
+  'weather',
+  'gallery',
+  'audioClips',
+  'gestures',
   'calendarType',
-  'chronological',
+  'sharing',
   // Unit section
-  'appearance',
-  'soundAlerts',
+  'screen',
+  'volume',
   'lockScreen',
   'language',
-  'device',
+  'wifi',
+  'devices',
+  'profiles',
+  'tts',
+  'updates',
+  'about',
+  'help',
+  'dev',
+  // Account (rendered separately)
+  'account',
+  'activityLog',
 ] as const;
 
-export type SettingsGroupId = (typeof SETTINGS_GROUP_IDS)[number];
+export type SettingsMenuItemId = (typeof SETTINGS_MENU_ITEM_IDS)[number];
 
-export type SettingsGroupDef = {
-  /** Unique group identifier */
-  id: SettingsGroupId;
-  /** i18n message key for the group label */
+export type SettingsMenuItemDef = {
+  id: SettingsMenuItemId;
   labelKey: string;
-  /** Lucide icon name */
   icon: string;
+  section: SettingsSectionId | 'account';
+  /** Screen/page identifiers rendered for this menu item */
+  screens: string[];
   /**
-   * Setting key matchers. A setting is included if its key:
-   * - equals a matcher exactly, OR
-   * - starts with a matcher that ends with '.' (prefix match)
+   * Setting key matchers for remote editing (web portal / profile editor).
+   * A setting is included if its key equals a matcher exactly, or starts
+   * with a matcher that ends with '.' (prefix match).
+   * Items without keys are navigation-only (e.g. gallery, guests).
    */
-  keys: string[];
+  keys?: string[];
   /** Only show for this calendar type (undefined = always) */
   calendarType?: CalendarType;
   /** Only show for this app mode (undefined = always) */
   appMode?: 'ENROLLED';
+  /** If true, don't wrap content in a scroll container */
+  noScrollView?: boolean;
 };
 
 /**
- * Group definitions matching the mobile app's settings structure.
- *
- * ─ i18n keys use the format `Settings.GroupLabel.<Id>` and must exist
- *   in every consumer's i18n catalog.
+ * Ordered list of all settings menu items. The array order defines the
+ * display order within each section. Items without registry setting keys
+ * are navigation-only (e.g. gallery, guests).
  */
-export const SETTINGS_GROUPS: readonly SettingsGroupDef[] = [
-  // ── Calendar section ──────────────────────────────────────────────────
+export const SETTINGS_MENU_ITEMS: readonly SettingsMenuItemDef[] = [
+  // -- Calendar section --
   {
     id: 'calendarView',
-    labelKey: 'Settings.CalendarView',
+    labelKey: 'Settings.Calendar',
     icon: 'Eye',
+    section: 'calendar',
+    screens: [
+      'calendarDayView',
+      'calendarWeekView',
+      'chronologicalHeader',
+      'chronologicalFooter',
+      'chronologicalMenu',
+      'dayColors',
+      'dateTime',
+    ],
     keys: [
       'calendarView.showCalendarNames',
       'calendarView.splitView',
       'calendarView.dayViewZoom',
       'calendarView.weekViewZoom',
       'calendarView.calendarColumns',
+      'appearance.enableDayColors',
+    ],
+  },
+  {
+    id: 'calendars',
+    labelKey: 'Common.Calendars',
+    icon: 'Calendar',
+    section: 'calendar',
+    screens: ['calendars'],
+  },
+  {
+    id: 'eventCategories',
+    labelKey: 'EventCategory.SettingsTitle',
+    icon: 'Tag',
+    section: 'calendar',
+    screens: ['eventCategories'],
+    calendarType: 'chronological',
+  },
+  {
+    id: 'notification',
+    labelKey: 'Settings.Notification',
+    icon: 'Bell',
+    section: 'calendar',
+    screens: ['notification'],
+    keys: [
+      'sound.reminderAlarmSound',
+      'sound.reminderAlarmTimeout',
+      'sound.reminderVolume',
+      'sound.allowCustomReminderSounds',
     ],
   },
   {
     id: 'timer',
     labelKey: 'Settings.TimerTitle',
     icon: 'Timer',
+    section: 'calendar',
+    screens: ['timerFeatures', 'timer'],
+    appMode: 'ENROLLED',
     keys: [
       'chronological.timer.',
       'timer.',
@@ -297,18 +373,39 @@ export const SETTINGS_GROUPS: readonly SettingsGroupDef[] = [
       'sound.timerAlarmTimeout',
       'sound.timerVolume',
     ],
-    appMode: 'ENROLLED',
   },
   {
-    id: 'activities',
-    labelKey: 'Settings.Activities',
-    icon: 'CalendarPlus',
-    keys: ['eventForm.', 'chronologicalEventForm.'],
+    id: 'guests',
+    labelKey: 'Settings.GuestUsers',
+    icon: 'Users',
+    section: 'calendar',
+    screens: ['guests'],
+  },
+  {
+    id: 'eventForm',
+    labelKey: 'SettingsEventForm.Title',
+    icon: 'ClipboardList',
+    section: 'calendar',
+    screens: ['eventForm'],
+    calendarType: 'time-based',
+    keys: ['eventForm.'],
   },
   {
-    id: 'dateWeather',
-    labelKey: 'Settings.DateWeather',
+    id: 'chronologicalEventForm',
+    labelKey: 'SettingsChronologicalEventForm.Title',
+    icon: 'Plus',
+    section: 'calendar',
+    screens: ['chronologicalEventForm'],
+    calendarType: 'chronological',
+    keys: ['chronologicalEventForm.'],
+  },
+  {
+    id: 'weather',
+    labelKey: 'Settings.WeatherTitle',
     icon: 'CloudSun',
+    section: 'calendar',
+    screens: ['weather'],
+    calendarType: 'time-based',
     keys: [
       'calendarView.showWeatherOnTimeline',
       'calendarView.weatherLocation',
@@ -316,48 +413,64 @@ export const SETTINGS_GROUPS: readonly SettingsGroupDef[] = [
     ],
   },
   {
-    id: 'touch',
+    id: 'gallery',
+    labelKey: 'Gallery.Title',
+    icon: 'Images',
+    section: 'calendar',
+    screens: ['gallery'],
+    noScrollView: true,
+  },
+  {
+    id: 'audioClips',
+    labelKey: 'AudioClips.Title',
+    icon: 'AudioLines',
+    section: 'calendar',
+    screens: ['audioClips'],
+    noScrollView: true,
+  },
+  {
+    id: 'gestures',
     labelKey: 'Settings.FunctionsTitle',
     icon: 'Hand',
+    section: 'calendar',
+    screens: ['gestures'],
     keys: ['touch.'],
   },
   {
     id: 'calendarType',
-    labelKey: 'Settings.CalendarType',
-    icon: 'ArrowLeftRight',
+    labelKey: 'Settings.Mode',
+    icon: 'SlidersHorizontal',
+    section: 'calendar',
+    screens: ['calendarType'],
     keys: ['calendarView.type'],
   },
   {
-    id: 'chronological',
-    labelKey: 'Settings.Chronological',
-    icon: 'List',
-    keys: ['chronological.'],
-    calendarType: 'chronological',
+    id: 'sharing',
+    labelKey: 'Settings.Sharing',
+    icon: 'Share2',
+    section: 'calendar',
+    screens: ['icalSubscriptions'],
   },
-  // ── Unit section ──────────────────────────────────────────────────────
+  // -- Unit section --
   {
-    id: 'appearance',
-    labelKey: 'Settings.Appearance',
-    icon: 'Palette',
-    keys: [
-      'appearance.theme',
-      'appearance.clockType',
-      'appearance.enableDayColors',
-    ],
+    id: 'screen',
+    labelKey: 'Settings.Screen',
+    icon: 'LaptopMinimal',
+    section: 'unit',
+    screens: ['displayDensity', 'darkMode'],
+    keys: ['appearance.theme', 'appearance.clockType'],
   },
   {
-    id: 'soundAlerts',
-    labelKey: 'Settings.SoundAlerts',
+    id: 'volume',
+    labelKey: 'Common.Volume',
     icon: 'Volume2',
+    section: 'unit',
+    screens: ['volume'],
+    appMode: 'ENROLLED',
     keys: [
-      'sound.reminderVolume',
       'sound.mediaVolume',
-      'sound.reminderAlarmSound',
       'sound.startAlarmSound',
       'sound.endAlarmSound',
-      'sound.reminderAlarmTimeout',
-      'sound.allowCustomReminderSounds',
-      'notification.',
       'sound.ttsEnabled',
       'sound.ttsRate',
       'sound.alarmSound',
@@ -367,26 +480,106 @@ export const SETTINGS_GROUPS: readonly SettingsGroupDef[] = [
     id: 'lockScreen',
     labelKey: 'Settings.LockScreen',
     icon: 'Lock',
-    keys: ['lockScreen.'],
+    section: 'unit',
+    screens: ['inactivity', 'lockScreen'],
     appMode: 'ENROLLED',
+    keys: ['lockScreen.'],
   },
   {
     id: 'language',
     labelKey: 'Settings.Language',
     icon: 'Globe',
+    section: 'unit',
+    screens: ['language'],
     keys: ['language.'],
   },
   {
-    id: 'device',
+    id: 'wifi',
+    labelKey: 'Settings.WifiTitle',
+    icon: 'Wifi',
+    section: 'unit',
+    screens: ['wifi'],
+    appMode: 'ENROLLED',
+  },
+  {
+    id: 'devices',
     labelKey: 'SettingsDevices.Title',
     icon: 'Smartphone',
+    section: 'unit',
+    screens: ['devices'],
     keys: [
       'device.',
       'calendarView.autoReturnToTodayEnabled',
       'calendarView.autoReturnToTodayTimeoutSeconds',
     ],
   },
-] as const;
+  {
+    id: 'profiles',
+    labelKey: 'SettingsProfiles.Title',
+    icon: 'BookCopy',
+    section: 'unit',
+    screens: ['profiles'],
+  },
+  {
+    id: 'tts',
+    labelKey: 'Settings.TtsTitle',
+    icon: 'Speech',
+    section: 'unit',
+    screens: ['tts'],
+  },
+  {
+    id: 'updates',
+    labelKey: 'Settings.UpdatesTitle',
+    icon: 'Download',
+    section: 'unit',
+    screens: ['updates'],
+  },
+  {
+    id: 'about',
+    labelKey: 'Settings.About',
+    icon: 'Info',
+    section: 'unit',
+    screens: ['restoreDefaults', 'recycleAppData', 'license', 'version'],
+  },
+  {
+    id: 'help',
+    labelKey: 'Settings.HelpTitle',
+    icon: 'CircleQuestionMark',
+    section: 'unit',
+    screens: ['help'],
+  },
+  {
+    id: 'dev',
+    labelKey: 'Settings.Dev',
+    icon: 'FolderCode',
+    section: 'unit',
+    screens: [
+      'devDeviceInfo',
+      'devComponents',
+      'devStores',
+      'devActions',
+      'devAuth',
+      'devNavigation',
+      'devNetwork',
+      'devAndroidSettings',
+    ],
+  },
+  // -- Account (rendered separately) --
+  {
+    id: 'account',
+    labelKey: 'Settings.Profile',
+    icon: 'User',
+    section: 'account',
+    screens: ['account', 'mfa'],
+  },
+  {
+    id: 'activityLog',
+    labelKey: 'SettingsActivityLog.Title',
+    icon: 'ScrollText',
+    section: 'account',
+    screens: ['activityLog'],
+  },
+];
 
 /**
  * Settings excluded from remote editing (web portal / profile management).
@@ -645,19 +838,16 @@ export const SETTINGS_LABELS: Readonly<Record<string, SettingLabelDef>> = {
   'eventForm.checklist': { labelKey: 'EventChecklist.DefaultName' },
   'eventForm.images': { labelKey: 'EventImageGallery.SectionTitle' },
   'eventForm.audioClips': { labelKey: 'EventAudioGallery.SectionTitle' },
-  'eventForm.notificationReceivers': { labelKey: 'EventForm.NotificationReceivers' },
+  'eventForm.notificationReceivers': {
+    labelKey: 'EventForm.NotificationReceivers',
+  },
   'eventForm.visibility': { labelKey: 'EventVisibility.Title' },
-};
 
-/**
- * Check whether a setting key matches a group's key matchers.
- */
-function matchesGroup(key: string, group: SettingsGroupDef): boolean {
-  return group.keys.some(
-    (matcher) =>
-      key === matcher || (matcher.endsWith('.') && key.startsWith(matcher)),
-  );
-}
+  // ── Chronological event form ────────────────────────────────────────────
+  'chronologicalEventForm.field.category': {
+    labelKey: 'ChronologicalEventForm.CategoryField',
+  },
+};
 
 /** Return the index of the first matching key pattern in the group, for sorting. */
 function groupKeyIndex(key: string, keys: readonly string[]): number {
@@ -687,78 +877,72 @@ function registryKeyOrder(): Map<string, number> {
 }
 
 /**
- * Group parsed setting entries into user-facing groups matching the mobile
- * app's settings menu structure.
- *
- * Takes a flat list of parsed settings (from `parseSettingsSnapshot`) and
- * buckets them into the standard groups, filtering by calendar type and
- * excluded keys.
+ * Group parsed setting entries using the app's menu structure (SETTINGS_MENU_ITEMS).
+ * Only includes menu items that have `keys` defined (editable settings).
+ * This ensures the web editor has the exact same menu items, order, sections,
+ * labels, and icons as the mobile app.
  */
-export function groupSettingsForDevice(
+export function groupSettingsForWeb(
   allSettings: ParsedSettingEntry[],
   calendarType: CalendarType,
   appMode?: 'ENROLLED',
-): { id: SettingsGroupId; labelKey: string; icon: string; settings: ParsedSettingEntry[] }[] {
+): {
+  id: SettingsMenuItemId;
+  labelKey: string;
+  icon: string;
+  section: SettingsSectionId | 'account';
+  settings: ParsedSettingEntry[];
+}[] {
   // Filter excluded and hidden settings
   const settings = allSettings.filter(
     (s) => !EXCLUDED_DEVICE_SETTINGS.has(s.key) && s.uiType !== 'HIDDEN',
   );
 
-  // Calendar type filtering for event form keys
   const isChronological = calendarType === 'chronological';
   const filteredSettings = settings.filter((s) => {
-    if (isChronological && s.key.startsWith('eventForm.')) {
+    if (isChronological && s.key.startsWith('eventForm.')) return false;
+    if (!isChronological && s.key.startsWith('chronologicalEventForm.'))
       return false;
-    }
-    if (!isChronological && s.key.startsWith('chronologicalEventForm.')) {
-      return false;
-    }
-    // Per-setting calendar type restriction
-    if (s.calendarType && s.calendarType !== calendarType) {
-      return false;
-    }
-    // Per-setting app mode restriction
-    if (s.appMode && s.appMode !== appMode) {
-      return false;
-    }
+    if (s.calendarType && s.calendarType !== calendarType) return false;
+    if (s.appMode && s.appMode !== appMode) return false;
     return true;
   });
 
   const claimed = new Set<string>();
   const result: {
-    id: SettingsGroupId;
+    id: SettingsMenuItemId;
     labelKey: string;
     icon: string;
+    section: SettingsSectionId | 'account';
     settings: ParsedSettingEntry[];
   }[] = [];
 
-  for (const group of SETTINGS_GROUPS) {
-    // Skip groups not relevant for current calendar type
-    if (group.calendarType && group.calendarType !== calendarType) {
-      continue;
-    }
+  for (const menuItem of SETTINGS_MENU_ITEMS) {
+    // Skip items without keys (navigation-only like gallery, guests, etc.)
+    if (!menuItem.keys || menuItem.keys.length === 0) continue;
 
-    // Skip groups not relevant for current app mode
-    if (group.appMode && group.appMode !== appMode) {
+    // Skip items not relevant for current calendar type
+    if (menuItem.calendarType && menuItem.calendarType !== calendarType)
       continue;
-    }
 
-    const matched = filteredSettings.filter(
-      (s) => !claimed.has(s.key) && matchesGroup(s.key, group),
-    );
-    if (matched.length === 0) {
-      continue;
-    }
+    // Skip items not relevant for current app mode
+    if (menuItem.appMode && menuItem.appMode !== appMode) continue;
 
-    // Sort matched settings by the order defined in group.keys,
-    // with registry declaration order as tiebreaker for prefix matches
+    const matched = filteredSettings.filter((s) => {
+      if (claimed.has(s.key)) return false;
+      return menuItem.keys!.some((k) =>
+        k.endsWith('.') ? s.key.startsWith(k) : s.key === k,
+      );
+    });
+
+    if (matched.length === 0) continue;
+
+    // Sort by key order within the menu item's keys array
     const order = registryKeyOrder();
     matched.sort((a, b) => {
-      const aIdx = groupKeyIndex(a.key, group.keys);
-      const bIdx = groupKeyIndex(b.key, group.keys);
-      if (aIdx !== bIdx) {
-        return aIdx - bIdx;
-      }
+      const aIdx = groupKeyIndex(a.key, menuItem.keys!);
+      const bIdx = groupKeyIndex(b.key, menuItem.keys!);
+      if (aIdx !== bIdx) return aIdx - bIdx;
       return (order.get(a.key) ?? Infinity) - (order.get(b.key) ?? Infinity);
     });
 
@@ -767,9 +951,10 @@ export function groupSettingsForDevice(
     }
 
     result.push({
-      id: group.id,
-      labelKey: group.labelKey,
-      icon: group.icon,
+      id: menuItem.id,
+      labelKey: menuItem.labelKey,
+      icon: menuItem.icon,
+      section: menuItem.section,
       settings: matched,
     });
   }
@@ -830,31 +1015,34 @@ export const DEFAULT_REGISTRY_CONFIG: RegistryConfig = {
 // ---------------------------------------------------------------------------
 
 const ALARM_SOUND_OPTIONS: readonly SettingOption<AlarmSound>[] = [
-  { value: 'none', labelKey: 'Settings.Option.AlarmSound.None' },
-  { value: 'alarm1', labelKey: 'Settings.Option.AlarmSound.Alarm1' },
-  { value: 'alarm2', labelKey: 'Settings.Option.AlarmSound.Alarm2' },
-  { value: 'alarm3', labelKey: 'Settings.Option.AlarmSound.Alarm3' },
-  { value: 'alarm4', labelKey: 'Settings.Option.AlarmSound.Alarm4' },
-  { value: 'alarm5', labelKey: 'Settings.Option.AlarmSound.Alarm5' },
-  { value: 'alarm6', labelKey: 'Settings.Option.AlarmSound.Alarm6' },
-  { value: 'alarm7', labelKey: 'Settings.Option.AlarmSound.Alarm7' },
-  { value: 'alarm8', labelKey: 'Settings.Option.AlarmSound.Alarm8' },
-  { value: 'alarm9', labelKey: 'Settings.Option.AlarmSound.Alarm9' },
+  { value: 'none', labelKey: 'AlarmAsset.none' },
+  { value: 'alarm1', labelKey: 'AlarmAsset.alarm1' },
+  { value: 'alarm2', labelKey: 'AlarmAsset.alarm2' },
+  { value: 'alarm3', labelKey: 'AlarmAsset.alarm3' },
+  { value: 'alarm4', labelKey: 'AlarmAsset.alarm4' },
+  { value: 'alarm5', labelKey: 'AlarmAsset.alarm5' },
+  { value: 'alarm6', labelKey: 'AlarmAsset.alarm6' },
+  { value: 'alarm7', labelKey: 'AlarmAsset.alarm7' },
+  { value: 'alarm8', labelKey: 'AlarmAsset.alarm8' },
+  { value: 'alarm9', labelKey: 'AlarmAsset.alarm9' },
 ];
 
 const ALARM_TIMEOUT_OPTIONS: readonly SettingOption<AlarmTimeout>[] = [
-  { value: 1, labelKey: 'Settings.Option.AlarmTimeout.1min' },
-  { value: 2, labelKey: 'Settings.Option.AlarmTimeout.2min' },
-  { value: 3, labelKey: 'Settings.Option.AlarmTimeout.3min' },
-  { value: 5, labelKey: 'Settings.Option.AlarmTimeout.5min' },
-  { value: 10, labelKey: 'Settings.Option.AlarmTimeout.10min' },
+  { value: 5, labelKey: 'Duration.CountSeconds', labelValues: { count: 5 } },
+  { value: 30, labelKey: 'Duration.CountSeconds', labelValues: { count: 30 } },
+  { value: 60, labelKey: 'Duration.CountMinutes', labelValues: { count: 1 } },
+  { value: 120, labelKey: 'Duration.CountMinutes', labelValues: { count: 2 } },
+  { value: 180, labelKey: 'Duration.CountMinutes', labelValues: { count: 3 } },
+  { value: 300, labelKey: 'Duration.CountMinutes', labelValues: { count: 5 } },
+  { value: 600, labelKey: 'Duration.CountMinutes', labelValues: { count: 10 } },
 ];
 
-const DAY_VIEW_ZOOM_OPTIONS: readonly SettingOption<CalendarDayViewCellZoom>[] = [
-  { value: 15, labelKey: 'Settings.Option.DayViewZoom.15min' },
-  { value: 30, labelKey: 'Settings.Option.DayViewZoom.30min' },
-  { value: 60, labelKey: 'Settings.Option.DayViewZoom.1hour' },
-];
+const DAY_VIEW_ZOOM_OPTIONS: readonly SettingOption<CalendarDayViewCellZoom>[] =
+  [
+    { value: 15, labelKey: 'Settings.Option.DayViewZoom.15min' },
+    { value: 30, labelKey: 'Settings.Option.DayViewZoom.30min' },
+    { value: 60, labelKey: 'Settings.Option.DayViewZoom.1hour' },
+  ];
 
 const TIME_OF_DAY_SLIDER: SliderConfig = { min: 0, max: 23, step: 1 };
 
@@ -912,11 +1100,16 @@ function buildEntries(config: RegistryConfig) {
       config.defaultTheme,
       'CUSTOM_THEME_PICKER',
       {
-        options: [
-          { value: 'light', labelKey: 'Settings.Option.Theme.Light' },
-          { value: 'dark', labelKey: 'Settings.Option.Theme.Dark' },
-          { value: 'system', labelKey: 'Settings.Option.Theme.System' },
-        ],
+        options: config.isEnrolled
+          ? [
+              { value: 'light', labelKey: 'Settings.Option.Theme.Light' },
+              { value: 'dark', labelKey: 'Settings.Option.Theme.Dark' },
+            ]
+          : [
+              { value: 'light', labelKey: 'Settings.Option.Theme.Light' },
+              { value: 'dark', labelKey: 'Settings.Option.Theme.Dark' },
+              { value: 'system', labelKey: 'Settings.Option.Theme.System' },
+            ],
       },
     ),
     'appearance.clockType': def<ClockType>(
@@ -1060,36 +1253,70 @@ function buildEntries(config: RegistryConfig) {
     // ═══════════════════════════════════════════════════════════════════════
     // Event form field visibility (time-based)
     // ═══════════════════════════════════════════════════════════════════════
-    'eventForm.recurrence': def<boolean>('eventForm', 'boolean', true, 'TOGGLE'),
+    'eventForm.recurrence': def<boolean>(
+      'eventForm',
+      'boolean',
+      true,
+      'TOGGLE',
+    ),
     'eventForm.location': def<boolean>('eventForm', 'boolean', true, 'TOGGLE'),
-    'eventForm.travelTime': def<boolean>('eventForm', 'boolean', false, 'TOGGLE'),
+    'eventForm.travelTime': def<boolean>(
+      'eventForm',
+      'boolean',
+      false,
+      'TOGGLE',
+    ),
     'eventForm.reminders': def<boolean>('eventForm', 'boolean', true, 'TOGGLE'),
-    'eventForm.emailReminders': def<boolean>('eventForm', 'boolean', false, 'TOGGLE'),
-    'eventForm.description': def<boolean>('eventForm', 'boolean', true, 'TOGGLE'),
+    'eventForm.emailReminders': def<boolean>(
+      'eventForm',
+      'boolean',
+      false,
+      'TOGGLE',
+    ),
+    'eventForm.description': def<boolean>(
+      'eventForm',
+      'boolean',
+      true,
+      'TOGGLE',
+    ),
     'eventForm.checklist': def<boolean>('eventForm', 'boolean', true, 'TOGGLE'),
     'eventForm.images': def<boolean>('eventForm', 'boolean', false, 'TOGGLE'),
-    'eventForm.audioClips': def<boolean>('eventForm', 'boolean', false, 'TOGGLE'),
+    'eventForm.audioClips': def<boolean>(
+      'eventForm',
+      'boolean',
+      false,
+      'TOGGLE',
+    ),
     'eventForm.notificationReceivers': def<boolean>(
       'eventForm',
       'boolean',
       true,
       'TOGGLE',
     ),
-    'eventForm.visibility': def<boolean>('eventForm', 'boolean', false, 'TOGGLE'),
+    'eventForm.visibility': def<boolean>(
+      'eventForm',
+      'boolean',
+      false,
+      'TOGGLE',
+    ),
 
     // ═══════════════════════════════════════════════════════════════════════
     // Sound & alerts
     // ═══════════════════════════════════════════════════════════════════════
     'sound.timerVolume': def<number>('sound', 'number', 0.5, 'VOLUME_SLIDER'),
-    'sound.reminderVolume': def<number>('sound', 'number', 0.5, 'VOLUME_SLIDER', { appMode: 'ENROLLED' }),
-    'sound.mediaVolume': def<number>('sound', 'number', 0.5, 'VOLUME_SLIDER', { appMode: 'ENROLLED' }),
-    'sound.alarmSound': def<AlarmSound>(
+    'sound.reminderVolume': def<number>(
       'sound',
-      'string',
-      'alarm1',
-      'SELECT',
-      { options: ALARM_SOUND_OPTIONS },
+      'number',
+      0.5,
+      'VOLUME_SLIDER',
+      { appMode: 'ENROLLED' },
     ),
+    'sound.mediaVolume': def<number>('sound', 'number', 0.5, 'VOLUME_SLIDER', {
+      appMode: 'ENROLLED',
+    }),
+    'sound.alarmSound': def<AlarmSound>('sound', 'string', 'alarm1', 'SELECT', {
+      options: ALARM_SOUND_OPTIONS,
+    }),
     'sound.reminderAlarmSound': def<AlarmSound>(
       'sound',
       'string',
@@ -1100,16 +1327,16 @@ function buildEntries(config: RegistryConfig) {
     'sound.startAlarmSound': def<AlarmSound>(
       'sound',
       'string',
-      'none',
+      'alarm1',
       'SELECT',
-      { options: ALARM_SOUND_OPTIONS, appMode: 'ENROLLED' },
+      { options: ALARM_SOUND_OPTIONS },
     ),
     'sound.endAlarmSound': def<AlarmSound>(
       'sound',
       'string',
-      'none',
+      'alarm1',
       'SELECT',
-      { options: ALARM_SOUND_OPTIONS, appMode: 'ENROLLED' },
+      { options: ALARM_SOUND_OPTIONS },
     ),
     'sound.timerAlarmSound': def<AlarmSound>(
       'sound',
@@ -1121,14 +1348,14 @@ function buildEntries(config: RegistryConfig) {
     'sound.timerAlarmTimeout': def<AlarmTimeout>(
       'sound',
       'number',
-      3,
+      180,
       'SELECT',
       { options: ALARM_TIMEOUT_OPTIONS },
     ),
     'sound.reminderAlarmTimeout': def<AlarmTimeout>(
       'sound',
       'number',
-      3,
+      180,
       'SELECT',
       { options: ALARM_TIMEOUT_OPTIONS },
     ),
@@ -1145,21 +1372,22 @@ function buildEntries(config: RegistryConfig) {
       'TOGGLE',
       { appMode: 'ENROLLED' },
     ),
-    'sound.ttsRate': def<number>(
-      'sound',
-      'number',
-      1.0,
-      'SLIDER',
-      { sliderConfig: { min: 0.5, max: 2, step: 0.1 }, appMode: 'ENROLLED' },
-    ),
+    'sound.ttsRate': def<number>('sound', 'number', 1.0, 'SLIDER', {
+      sliderConfig: { min: 0.5, max: 2, step: 0.1 },
+      appMode: 'ENROLLED',
+    }),
 
     // ═══════════════════════════════════════════════════════════════════════
     // Timer
     // ═══════════════════════════════════════════════════════════════════════
     'timer.showTimeRemaining': def<boolean>('timer', 'boolean', true, 'TOGGLE'),
-    'timer.showEndTime': def<boolean>('timer', 'boolean', true, 'TOGGLE', { calendarType: 'time-based' }),
+    'timer.showEndTime': def<boolean>('timer', 'boolean', true, 'TOGGLE', {
+      calendarType: 'time-based',
+    }),
     'timer.showRestartButton': def<boolean>('timer', 'boolean', true, 'TOGGLE'),
-    'timer.showPauseButton': def<boolean>('timer', 'boolean', true, 'TOGGLE', { calendarType: 'time-based' }),
+    'timer.showPauseButton': def<boolean>('timer', 'boolean', true, 'TOGGLE', {
+      calendarType: 'time-based',
+    }),
 
     // ═══════════════════════════════════════════════════════════════════════
     // Lock screen
@@ -1268,7 +1496,12 @@ function buildEntries(config: RegistryConfig) {
     // ═══════════════════════════════════════════════════════════════════════
     // Touch / gestures
     // ═══════════════════════════════════════════════════════════════════════
-    'touch.enableTapToCreate': def<boolean>('touch', 'boolean', false, 'TOGGLE'),
+    'touch.enableTapToCreate': def<boolean>(
+      'touch',
+      'boolean',
+      false,
+      'TOGGLE',
+    ),
     'touch.enableDragDrop': def<boolean>('touch', 'boolean', false, 'TOGGLE'),
 
     // ═══════════════════════════════════════════════════════════════════════
@@ -1537,6 +1770,12 @@ function buildEntries(config: RegistryConfig) {
     // Chronological event form
     // ═══════════════════════════════════════════════════════════════════════
     // Fixed fields
+    'chronologicalEventForm.fixedField.category': def<boolean>(
+      'chronologicalEventForm',
+      'boolean',
+      true,
+      'TOGGLE',
+    ),
     'chronologicalEventForm.fixedField.allDay': def<boolean>(
       'chronologicalEventForm',
       'boolean',
@@ -1604,6 +1843,12 @@ function buildEntries(config: RegistryConfig) {
       true,
       'TOGGLE',
     ),
+    'chronologicalEventForm.field.category': def<boolean>(
+      'chronologicalEventForm',
+      'boolean',
+      true,
+      'TOGGLE',
+    ),
     // Suggest end time
     'chronologicalEventForm.suggestEndTime.enabled': def<boolean>(
       'chronologicalEventForm',
@@ -1650,6 +1895,19 @@ function buildEntries(config: RegistryConfig) {
         ],
       },
     ),
+    // Default alarm toggles
+    'chronologicalEventForm.defaultAlarm.atStart': def<boolean>(
+      'chronologicalEventForm',
+      'boolean',
+      true,
+      'TOGGLE',
+    ),
+    'chronologicalEventForm.defaultAlarm.atEnd': def<boolean>(
+      'chronologicalEventForm',
+      'boolean',
+      false,
+      'TOGGLE',
+    ),
     // Reminder presets
     'chronologicalEventForm.reminderPresets.timed': def<number[]>(
       'chronologicalEventForm',
@@ -1917,9 +2175,8 @@ export function parseSettingsSnapshot(
     }
 
     const labelDef = SETTINGS_LABELS[key];
-    const entryDef = key in registry.entries
-      ? registry.entries[key as SettingKey]
-      : undefined;
+    const entryDef =
+      key in registry.entries ? registry.entries[key as SettingKey] : undefined;
     groups.get(category)!.push({
       key,
       name,
@@ -1928,7 +2185,9 @@ export function parseSettingsSnapshot(
       descriptionKey: labelDef?.descriptionKey,
       value,
       uiType: entryDef?.uiType ?? 'TEXT_INPUT',
-      ...(entryDef?.options && { options: entryDef.options as readonly SettingOption[] }),
+      ...(entryDef?.options && {
+        options: entryDef.options as readonly SettingOption[],
+      }),
       ...(entryDef?.sliderConfig && { sliderConfig: entryDef.sliderConfig }),
       ...(entryDef?.appMode && { appMode: entryDef.appMode }),
       ...(entryDef?.calendarType && { calendarType: entryDef.calendarType }),