diff --git a/Wino.Calendar.ViewModels/AppShellViewModel.cs b/Wino.Calendar.ViewModels/AppShellViewModel.cs
index 376ec624..a938c35c 100644
--- a/Wino.Calendar.ViewModels/AppShellViewModel.cs
+++ b/Wino.Calendar.ViewModels/AppShellViewModel.cs
@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Interfaces;
 using Wino.Core.Domain.Collections;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
@@ -26,6 +29,7 @@ namespace Wino.Calendar.ViewModels
         public event EventHandler<CalendarDisplayType> DisplayTypeChanged;
         public IPreferencesService PreferencesService { get; }
         public IStatePersistanceService StatePersistenceService { get; }
+        public IAccountCalendarStateService AccountCalendarStateService { get; }
         public INavigationService NavigationService { get; }
         public IWinoServerConnectionManager ServerConnectionManager { get; }
 
@@ -63,9 +67,16 @@ namespace Wino.Calendar.ViewModels
 
         public AppShellViewModel(IPreferencesService preferencesService,
                                  IStatePersistanceService statePersistanceService,
+                                 IAccountService accountService,
+                                 ICalendarService calendarService,
+                                 IAccountCalendarStateService accountCalendarStateService,
                                  INavigationService navigationService,
                                  IWinoServerConnectionManager serverConnectionManager)
         {
+            _accountService = accountService;
+            _calendarService = calendarService;
+
+            AccountCalendarStateService = accountCalendarStateService;
             NavigationService = navigationService;
             ServerConnectionManager = serverConnectionManager;
             PreferencesService = preferencesService;
@@ -86,11 +97,53 @@ namespace Wino.Calendar.ViewModels
             }
         }
 
-        public override void OnNavigatedTo(NavigationMode mode, object parameters)
+        public override async void OnNavigatedTo(NavigationMode mode, object parameters)
         {
             base.OnNavigatedTo(mode, parameters);
 
             UpdateDateNavigationHeaderItems();
+
+            await InitializeAccountCalendarsAsync();
+        }
+
+        private void AddGroupedAccountCalendarViewModel(GroupedAccountCalendarViewModel groupedAccountCalendarViewModel)
+        {
+            foreach (var calendarViewModel in groupedAccountCalendarViewModel.AccountCalendars)
+            {
+                calendarViewModel.CalendarSelectionStateChanged += UpdateAccountCalendarRequested;
+            }
+
+            AccountCalendarStateService.GroupedAccountCalendars.Add(groupedAccountCalendarViewModel);
+        }
+
+        private async void UpdateAccountCalendarRequested(object sender, AccountCalendarViewModel e)
+            => await _calendarService.UpdateAccountCalendarAsync(e.AccountCalendar).ConfigureAwait(false);
+
+        private async Task InitializeAccountCalendarsAsync()
+        {
+            await Dispatcher.ExecuteOnUIThread(() => AccountCalendarStateService.GroupedAccountCalendars.Clear());
+
+            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+
+            foreach (var account in accounts)
+            {
+                var accountCalendars = await _calendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
+                var calendarViewModels = new List<AccountCalendarViewModel>();
+
+                foreach (var calendar in accountCalendars)
+                {
+                    var calendarViewModel = new AccountCalendarViewModel(account, calendar);
+
+                    calendarViewModels.Add(calendarViewModel);
+                }
+
+                var groupedAccountCalendarViewModel = new GroupedAccountCalendarViewModel(account, calendarViewModels);
+
+                await Dispatcher.ExecuteOnUIThread(() =>
+                {
+                    AddGroupedAccountCalendarViewModel(groupedAccountCalendarViewModel);
+                });
+            }
         }
 
         private void ForceNavigateCalendarDate()
@@ -177,6 +230,8 @@ namespace Wino.Calendar.ViewModels
         }
 
         private DateTime? _navigationDate;
+        private readonly IAccountService _accountService;
+        private readonly ICalendarService _calendarService;
 
         public override void OnPageLoaded()
         {
diff --git a/Wino.Calendar.ViewModels/CalendarPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarPageViewModel.cs
index 5b1474ca..77cc9e3b 100644
--- a/Wino.Calendar.ViewModels/CalendarPageViewModel.cs
+++ b/Wino.Calendar.ViewModels/CalendarPageViewModel.cs
@@ -7,18 +7,21 @@ using System.Threading.Tasks;
 using CommunityToolkit.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
+using Wino.Calendar.ViewModels.Interfaces;
 using Wino.Core.Domain.Collections;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Calendar.CalendarTypeStrategies;
+using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
 
 namespace Wino.Calendar.ViewModels
 {
     public partial class CalendarPageViewModel : CalendarBaseViewModel,
-        IRecipient<LoadCalendarMessage>
+        IRecipient<LoadCalendarMessage>,
+        IRecipient<CalendarSettingsUpdatedMessage>
     {
         [ObservableProperty]
         private ObservableRangeCollection<DayRangeRenderModel> _dayRanges = [];
@@ -32,9 +35,11 @@ namespace Wino.Calendar.ViewModels
         [ObservableProperty]
         private bool _isCalendarEnabled = true;
 
-        // Get rid of some of the items if we have too many.
+        // TODO: Get rid of some of the items if we have too many.
         private const int maxDayRangeSize = 10;
+
         private readonly ICalendarService _calendarService;
+        private readonly IAccountCalendarStateService _accountCalendarStateService;
         private readonly IPreferencesService _preferencesService;
 
         // Store latest rendered options.
@@ -49,13 +54,14 @@ namespace Wino.Calendar.ViewModels
 
         public CalendarPageViewModel(IStatePersistanceService statePersistanceService,
                                      ICalendarService calendarService,
+                                     IAccountCalendarStateService accountCalendarStateService,
                                      IPreferencesService preferencesService)
         {
             StatePersistanceService = statePersistanceService;
-            _calendarService = calendarService;
-            _preferencesService = preferencesService;
 
-            _currentSettings = _preferencesService.GetCurrentCalendarSettings();
+            _calendarService = calendarService;
+            _accountCalendarStateService = accountCalendarStateService;
+            _preferencesService = preferencesService;
         }
 
         // TODO: Replace when calendar settings are updated.
@@ -70,10 +76,25 @@ namespace Wino.Calendar.ViewModels
             };
         }
 
+        public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+        {
+            // Do not call base method because that will unregister messenger recipient.
+            // This is a singleton view model and should not be unregistered.
+        }
+
+        public override void OnNavigatedTo(NavigationMode mode, object parameters)
+        {
+            base.OnNavigatedTo(mode, parameters);
+
+            _currentSettings = _preferencesService.GetCurrentCalendarSettings();
+        }
+
         partial void OnIsCalendarEnabledChanging(bool oldValue, bool newValue) => Messenger.Send(new CalendarEnableStatusChangedMessage(newValue));
 
         private bool ShouldResetDayRanges(LoadCalendarMessage message)
         {
+            if (message.ForceRedraw) return true;
+
             // Never reset if the initiative is from the app.
             if (message.CalendarInitInitiative == CalendarInitInitiative.App) return false;
 
@@ -168,14 +189,14 @@ namespace Wino.Calendar.ViewModels
 
             DateRange flipLoadRange = null;
 
-            if (calendarInitInitiative == CalendarInitInitiative.User)
+            var initializedDateRange = GetLoadedDateRange();
+
+            if (calendarInitInitiative == CalendarInitInitiative.User || initializedDateRange == null)
             {
                 flipLoadRange = strategy.GetRenderDateRange(displayDate, StatePersistanceService.DayDisplayCount);
             }
             else
             {
-                var initializedDateRange = GetLoadedDateRange();
-
                 // App is trying to load.
                 // This should be based on direction. We'll load the next or previous range.
                 // DisplayDate is either the start or end date of the current visible range.
@@ -214,7 +235,7 @@ namespace Wino.Calendar.ViewModels
             {
                 foreach (var day in renderModel.CalendarDays)
                 {
-                    var events = await _calendarService.GetCalendarEventsAsync(Guid.Parse("13e8e385-a1bb-4764-95b4-757901cad35a"), day.Period.Start, day.Period.End).ConfigureAwait(false);
+                    var events = await _calendarService.GetCalendarEventsAsync(Guid.Parse("9ead7613-dacb-4163-8d33-2e32e65008a1"), day.Period.Start, day.Period.End).ConfigureAwait(false);
 
                     foreach (var calendarItem in events)
                     {
@@ -343,6 +364,8 @@ namespace Wino.Calendar.ViewModels
 
             var initializedDateRange = GetLoadedDateRange();
 
+            if (initializedDateRange == null) return false;
+
             var selectedDate = message.DisplayDate;
 
             return selectedDate >= initializedDateRange.StartDate && selectedDate <= initializedDateRange.EndDate;
@@ -391,67 +414,14 @@ namespace Wino.Calendar.ViewModels
             }
         }
 
-        protected override async void OnCalendarEventAdded(ICalendarItem calendarItem)
+        public void Receive(CalendarSettingsUpdatedMessage message)
         {
-            base.OnCalendarEventAdded(calendarItem);
+            _currentSettings = _preferencesService.GetCurrentCalendarSettings();
 
-            // Test
-            //var eventDays = DayRanges.SelectMany(a => a.CalendarDays).Where(b => b.Period.Start.Date == calendarItem.StartTime.Date);
+            // TODO: This might need throttling due to slider in the settings page for hour height.
+            // or make sure the slider does not update on each tick but on focus lost.
 
-            //var beforeAllDay = new CalendarItem(calendarItem.StartTime.Date.AddHours(0), calendarItem.StartTime.Date.AddMinutes(30))
-            //{
-            //    Title = "kj"
-            //};
-
-            //var allday = new CalendarItem(calendarItem.StartTime.Date.AddHours(1), calendarItem.StartTime.Date.AddHours(10).AddMinutes(59))
-            //{
-            //    Title = "All day"
-            //};
-
-            //var test = new CalendarItem(calendarItem.StartTime.Date.AddHours(4), calendarItem.StartTime.Date.AddHours(4).AddMinutes(30))
-            //{
-            //    Title = "test"
-            //};
-
-            //var hour = new CalendarItem(calendarItem.StartTime.Date.AddHours(7), calendarItem.StartTime.Date.AddHours(8))
-            //{
-            //    Title = "1 h"
-            //};
-
-            //var hourandhalf = new CalendarItem(calendarItem.StartTime.Date.AddHours(7), calendarItem.StartTime.Date.AddHours(8).AddMinutes(30))
-            //{
-            //    Title = "1.5 h"
-            //};
-            //var halfhour1 = new CalendarItem(calendarItem.StartTime.Date.AddHours(7), calendarItem.StartTime.Date.AddHours(7).AddMinutes(30))
-            //{
-            //    Title = "30 min"
-            //};
-
-            //var halfhour2 = new CalendarItem(calendarItem.StartTime.Date.AddHours(7).AddMinutes(30), calendarItem.StartTime.Date.AddHours(8))
-            //{
-            //    Title = "30 min"
-            //};
-            //var halfhour3 = new CalendarItem(calendarItem.StartTime.Date.AddHours(8), calendarItem.StartTime.Date.AddHours(8).AddMinutes(30))
-            //{
-            //    Title = "30 min"
-            //};
-
-            //foreach (var day in eventDays)
-            //{
-            //    await ExecuteUIThread(() =>
-            //    {
-            //        day.Events.Add(beforeAllDay);
-            //        day.Events.Add(allday);
-            //        day.Events.Add(hourandhalf);
-            //        day.Events.Add(hour);
-            //        day.Events.Add(halfhour1);
-            //        day.Events.Add(halfhour2);
-            //        day.Events.Add(halfhour3);
-            //        day.Events.Add(test);
-            //    });
-            //}
-
-            //return;
+            Messenger.Send(new LoadCalendarMessage(DateTime.UtcNow.Date, CalendarInitInitiative.App, true));
         }
     }
 }
diff --git a/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs b/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs
new file mode 100644
index 00000000..26f687d5
--- /dev/null
+++ b/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs
@@ -0,0 +1,75 @@
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Calendar.ViewModels.Data
+{
+    public partial class AccountCalendarViewModel : ObservableObject, IAccountCalendar
+    {
+        public event EventHandler<AccountCalendarViewModel> CalendarSelectionStateChanged;
+
+        public MailAccount Account { get; }
+        public AccountCalendar AccountCalendar { get; }
+
+        public AccountCalendarViewModel(MailAccount account, AccountCalendar accountCalendar)
+        {
+            Account = account;
+            AccountCalendar = accountCalendar;
+
+            IsChecked = accountCalendar.IsExtended;
+        }
+
+        [ObservableProperty]
+        private bool _isChecked;
+
+        partial void OnIsCheckedChanged(bool value)
+        {
+            IsExtended = value;
+            CalendarSelectionStateChanged?.Invoke(this, this);
+        }
+
+        public string Name
+        {
+            get => AccountCalendar.Name;
+            set => SetProperty(AccountCalendar.Name, value, AccountCalendar, (u, n) => u.Name = n);
+        }
+
+        public string TextColorHex
+        {
+            get => AccountCalendar.TextColorHex;
+            set => SetProperty(AccountCalendar.TextColorHex, value, AccountCalendar, (u, t) => u.TextColorHex = t);
+        }
+
+        public string BackgroundColorHex
+        {
+            get => AccountCalendar.BackgroundColorHex;
+            set => SetProperty(AccountCalendar.BackgroundColorHex, value, AccountCalendar, (u, b) => u.BackgroundColorHex = b);
+        }
+
+        public bool IsExtended
+        {
+            get => AccountCalendar.IsExtended;
+            set => SetProperty(AccountCalendar.IsExtended, value, AccountCalendar, (u, i) => u.IsExtended = i);
+        }
+
+        public bool IsPrimary
+        {
+            get => AccountCalendar.IsPrimary;
+            set => SetProperty(AccountCalendar.IsPrimary, value, AccountCalendar, (u, i) => u.IsPrimary = i);
+        }
+
+        public Guid AccountId
+        {
+            get => AccountCalendar.AccountId;
+            set => SetProperty(AccountCalendar.AccountId, value, AccountCalendar, (u, a) => u.AccountId = a);
+        }
+
+        public string RemoteCalendarId
+        {
+            get => AccountCalendar.RemoteCalendarId;
+            set => SetProperty(AccountCalendar.RemoteCalendarId, value, AccountCalendar, (u, r) => u.RemoteCalendarId = r);
+        }
+    }
+}
diff --git a/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs b/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs
new file mode 100644
index 00000000..6d13dc78
--- /dev/null
+++ b/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs
@@ -0,0 +1,116 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Calendar.ViewModels.Data
+{
+    public partial class GroupedAccountCalendarViewModel : ObservableObject
+    {
+        public MailAccount Account { get; }
+        public ObservableCollection<AccountCalendarViewModel> AccountCalendars { get; }
+
+        public GroupedAccountCalendarViewModel(MailAccount account, IEnumerable<AccountCalendarViewModel> calendarViewModels)
+        {
+            Account = account;
+            AccountCalendars = new ObservableCollection<AccountCalendarViewModel>(calendarViewModels);
+
+            ManageIsCheckedState();
+
+            foreach (var calendarViewModel in calendarViewModels)
+            {
+                calendarViewModel.PropertyChanged += CalendarPropertyChanged;
+            }
+
+            AccountCalendars.CollectionChanged += CalendarListUpdated;
+        }
+
+        private void CalendarListUpdated(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (AccountCalendarViewModel calendar in e.NewItems)
+                {
+                    calendar.PropertyChanged += CalendarPropertyChanged;
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (AccountCalendarViewModel calendar in e.OldItems)
+                {
+                    calendar.PropertyChanged -= CalendarPropertyChanged;
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                foreach (AccountCalendarViewModel calendar in e.OldItems)
+                {
+                    calendar.PropertyChanged -= CalendarPropertyChanged;
+                }
+            }
+        }
+
+        private void CalendarPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (sender is AccountCalendarViewModel viewModel)
+            {
+                if (e.PropertyName == nameof(AccountCalendarViewModel.IsChecked))
+                {
+                    ManageIsCheckedState();
+                }
+            }
+        }
+
+        [ObservableProperty]
+        private bool _isExpanded = true;
+
+        [ObservableProperty]
+        private bool? isCheckedState = true;
+
+        private bool _isExternalPropChangeBlocked = false;
+
+        private void ManageIsCheckedState()
+        {
+            _isExternalPropChangeBlocked = true;
+
+            if (AccountCalendars.All(c => c.IsChecked))
+            {
+                IsCheckedState = true;
+            }
+            else if (AccountCalendars.All(c => !c.IsChecked))
+            {
+                IsCheckedState = false;
+            }
+            else
+            {
+                IsCheckedState = null;
+            }
+
+            _isExternalPropChangeBlocked = false;
+        }
+
+        partial void OnIsCheckedStateChanged(bool? newValue)
+        {
+            if (_isExternalPropChangeBlocked) return;
+
+            if (newValue == null)
+            {
+                // Only primary calendars must be checked.
+
+                foreach (var calendar in AccountCalendars)
+                {
+                    calendar.IsChecked = calendar.IsPrimary;
+                }
+            }
+            else
+            {
+                foreach (var calendar in AccountCalendars)
+                {
+                    calendar.IsChecked = newValue.GetValueOrDefault();
+                }
+            }
+        }
+    }
+}
diff --git a/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs b/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs
new file mode 100644
index 00000000..d97d614b
--- /dev/null
+++ b/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs
@@ -0,0 +1,10 @@
+using System.Collections.ObjectModel;
+using Wino.Calendar.ViewModels.Data;
+
+namespace Wino.Calendar.ViewModels.Interfaces
+{
+    public interface IAccountCalendarStateService
+    {
+        ObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; }
+    }
+}
diff --git a/Wino.Calendar/App.xaml.cs b/Wino.Calendar/App.xaml.cs
index 86fa9960..e7ca3f84 100644
--- a/Wino.Calendar/App.xaml.cs
+++ b/Wino.Calendar/App.xaml.cs
@@ -12,6 +12,7 @@ using Wino.Activation;
 using Wino.Calendar.Activation;
 using Wino.Calendar.Services;
 using Wino.Calendar.ViewModels;
+using Wino.Calendar.ViewModels.Interfaces;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
@@ -71,6 +72,7 @@ namespace Wino.Calendar
             services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
             services.AddTransient<IProviderService, ProviderService>();
             services.AddSingleton<IAuthenticatorConfig, CalendarAuthenticatorConfig>();
+            services.AddSingleton<IAccountCalendarStateService, AccountCalendarStateService>();
         }
 
         private void RegisterViewModels(IServiceCollection services)
diff --git a/Wino.Calendar/Services/AccountCalendarStateService.cs b/Wino.Calendar/Services/AccountCalendarStateService.cs
new file mode 100644
index 00000000..2520d947
--- /dev/null
+++ b/Wino.Calendar/Services/AccountCalendarStateService.cs
@@ -0,0 +1,13 @@
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Interfaces;
+
+namespace Wino.Calendar.Services
+{
+    public partial class AccountCalendarStateService : ObservableObject, IAccountCalendarStateService
+    {
+        [ObservableProperty]
+        private ObservableCollection<GroupedAccountCalendarViewModel> _groupedAccountCalendars = new ObservableCollection<GroupedAccountCalendarViewModel>();
+    }
+}
diff --git a/Wino.Calendar/Views/AppShell.xaml b/Wino.Calendar/Views/AppShell.xaml
index e7d875f7..127ce31d 100644
--- a/Wino.Calendar/Views/AppShell.xaml
+++ b/Wino.Calendar/Views/AppShell.xaml
@@ -9,6 +9,7 @@
     xmlns:coreControls="using:Wino.Core.UWP.Controls"
     xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:helpers="using:Wino.Helpers"
     xmlns:local="using:Wino.Calendar.Views"
@@ -174,20 +175,87 @@
                         HighlightedDateRange="{x:Bind ViewModel.HighlightedDateRange, Mode=OneWay}"
                         TodayBackgroundColor="{ThemeResource SystemAccentColor}" />
 
-                    <ScrollViewer
+                    <!--  Account Calendars Host  -->
+                    <ListView
                         Grid.Row="1"
-                        HorizontalScrollMode="Disabled"
-                        VerticalScrollBarVisibility="Hidden">
-                        <Grid>
+                        ItemsSource="{x:Bind ViewModel.AccountCalendarStateService.GroupedAccountCalendars}"
+                        SelectionMode="None">
+                        <ListView.Header>
+                            <TextBlock
+                                Margin="20,12,12,12"
+                                FontSize="16"
+                                Text="Calendars" />
+                        </ListView.Header>
+                        <ListView.ItemTemplate>
+                            <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
+                                <muxc:Expander
+                                    HorizontalAlignment="Stretch"
+                                    HorizontalContentAlignment="Stretch"
+                                    IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}">
+                                    <muxc:Expander.Header>
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <CheckBox
+                                                Width="26"
+                                                MinWidth="0"
+                                                IsChecked="{x:Bind IsCheckedState, Mode=TwoWay}"
+                                                IsThreeState="True" />
+
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                TextWrapping="Wrap">
+                                                <Run FontWeight="SemiBold" Text="{x:Bind Account.Name}" />
+                                                <Run FontSize="12" Text="(" /><Run FontSize="12" Text="{x:Bind Account.Address}" /><Run FontSize="12" Text=")" />
+                                            </TextBlock>
+                                        </Grid>
+                                    </muxc:Expander.Header>
+                                    <muxc:Expander.Content>
+                                        <ItemsControl ItemsSource="{x:Bind AccountCalendars}">
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                                    <CheckBox
+                                                        HorizontalAlignment="Stretch"
+                                                        VerticalAlignment="Center"
+                                                        HorizontalContentAlignment="Stretch"
+                                                        VerticalContentAlignment="Stretch"
+                                                        IsChecked="{x:Bind IsChecked, Mode=TwoWay}">
+                                                        <Border
+                                                            Margin="0,0,0,4"
+                                                            Padding="4,2,4,2"
+                                                            HorizontalAlignment="Stretch"
+                                                            VerticalAlignment="Center"
+                                                            Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
+                                                            CornerRadius="3">
+                                                            <TextBlock
+                                                                FontSize="14"
+                                                                Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(TextColorHex), Mode=OneWay}"
+                                                                Text="{x:Bind Name, Mode=OneWay}"
+                                                                TextWrapping="Wrap" />
+                                                        </Border>
+                                                    </CheckBox>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </muxc:Expander.Content>
+                                </muxc:Expander>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                        <ListView.Footer>
                             <Button
                                 Margin="14,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Bottom"
                                 Command="{x:Bind ViewModel.SyncCommand}"
                                 Content="Test Sync" />
-                        </Grid>
-                    </ScrollViewer>
+                        </ListView.Footer>
+                    </ListView>
 
+                    <!--  Menu Items  -->
                     <ListView
                         Grid.Row="2"
                         ItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
@@ -219,6 +287,7 @@
                             </ListViewItem>
                         </ListView.Items>
                     </ListView>
+
                     <!--<CommandBar Grid.Row="2" DefaultLabelPosition="Right">
                         <AppBarButton Label="Manage Accounts">
                             <AppBarButton.Icon>
@@ -270,11 +339,15 @@
                     <VisualState.StateTriggers>
                         <AdaptiveTrigger MinWindowWidth="1200" />
                     </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="MainSplitView.IsPaneOpen" Value="True" />
+                    </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="SmallScreen">
                     <VisualState.Setters>
                         <Setter Target="NavigationTitleStack.Visibility" Value="Collapsed" />
                         <Setter Target="SearchBox.(Grid.ColumnSpan)" Value="2" />
+                        <Setter Target="MainSplitView.IsPaneOpen" Value="False" />
                     </VisualState.Setters>
                     <VisualState.StateTriggers>
                         <AdaptiveTrigger MinWindowWidth="0" />
diff --git a/Wino.Calendar/Views/CalendarPage.xaml b/Wino.Calendar/Views/CalendarPage.xaml
index 76063891..4ac1b8a4 100644
--- a/Wino.Calendar/Views/CalendarPage.xaml
+++ b/Wino.Calendar/Views/CalendarPage.xaml
@@ -56,7 +56,6 @@
 
                             <TimePicker x:Name="EventTimePicker" ClockIdentifier="24HourClock" />
 
-
                             <!--  Create events dialog  -->
                             <Button
                                 x:Name="AddEvent"
diff --git a/Wino.Calendar/Views/Settings/PersonalizationPage.xaml b/Wino.Calendar/Views/Settings/PersonalizationPage.xaml
index 504e7853..0a66743a 100644
--- a/Wino.Calendar/Views/Settings/PersonalizationPage.xaml
+++ b/Wino.Calendar/Views/Settings/PersonalizationPage.xaml
@@ -67,7 +67,10 @@
                 Text="{x:Bind domain:Translator.SettingsElementThemeSelectionDisabled}" />
 
             <!--  App Themes  -->
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsApplicationTheme_Description}" Header="{x:Bind domain:Translator.SettingsApplicationTheme_Title}">
+            <controls:SettingsExpander
+                Description="{x:Bind domain:Translator.SettingsApplicationTheme_Description}"
+                Header="{x:Bind domain:Translator.SettingsApplicationTheme_Title}"
+                IsExpanded="True">
                 <controls:SettingsExpander.HeaderIcon>
                     <PathIcon Data="F1 M 5 3.75 C 5 3.554688 5.056966 3.372396 5.170898 3.203125 C 5.284831 3.033855 5.432942 2.913412 5.615234 2.841797 C 5.712891 2.802734 5.810547 2.765301 5.908203 2.729492 C 6.005859 2.693686 6.103516 2.659506 6.201172 2.626953 C 6.520182 2.509766 6.80664 2.320965 7.060547 2.060547 C 7.314453 1.800131 7.503255 1.513672 7.626953 1.201172 C 7.685547 1.057943 7.740885 0.914715 7.792969 0.771484 C 7.845052 0.628256 7.910156 0.499676 7.988281 0.385742 C 8.066406 0.271811 8.165689 0.179037 8.286133 0.107422 C 8.406575 0.035809 8.561197 0 8.75 0 C 8.971354 0 9.14388 0.047201 9.267578 0.141602 C 9.391275 0.236004 9.495442 0.361328 9.580078 0.517578 C 9.664713 0.673828 9.744466 0.847982 9.819336 1.040039 C 9.894205 1.232098 9.988606 1.424154 10.102539 1.616211 C 10.216471 1.80827 10.366211 1.993816 10.551758 2.172852 C 10.737305 2.351889 10.986328 2.5 11.298828 2.617188 L 11.884766 2.841797 C 12.067057 2.913412 12.215168 3.033855 12.329102 3.203125 C 12.443033 3.372396 12.5 3.554688 12.5 3.75 C 12.5 3.951824 12.444661 4.134115 12.333984 4.296875 C 12.223307 4.459636 12.073567 4.576823 11.884766 4.648438 L 11.298828 4.873047 C 10.986328 4.996746 10.737305 5.146485 10.551758 5.322266 C 10.366211 5.498048 10.216471 5.683595 10.102539 5.878906 C 9.988606 6.07422 9.895833 6.267904 9.824219 6.459961 C 9.752604 6.652019 9.674479 6.824545 9.589844 6.977539 C 9.505208 7.130534 9.399414 7.255859 9.272461 7.353516 C 9.145508 7.451172 8.971354 7.5 8.75 7.5 C 8.548177 7.5 8.365885 7.444662 8.203125 7.333984 C 8.040364 7.223309 7.923177 7.073568 7.851562 6.884766 L 7.626953 6.298828 C 7.503255 5.986328 7.353515 5.735678 7.177734 5.546875 C 7.001953 5.358074 6.816406 5.206707 6.621094 5.092773 C 6.425781 4.978842 6.232096 4.886068 6.040039 4.814453 C 5.847981 4.74284 5.673828 4.666342 5.517578 4.584961 C 5.361328 4.503581 5.236002 4.399414 5.141602 4.272461 C 5.0472 4.145508 5 3.971355 5 3.75 Z M 10.751953 3.75 C 10.302734 3.561199 9.903971 3.292645 9.555664 2.944336 C 9.207356 2.596029 8.938802 2.197266 8.75 1.748047 C 8.561197 2.197266 8.292643 2.596029 7.944336 2.944336 C 7.596028 3.292645 7.197266 3.561199 6.748047 3.75 C 7.197266 3.938803 7.596028 4.207357 7.944336 4.555664 C 8.292643 4.903972 8.561197 5.302734 8.75 5.751953 C 8.938802 5.302734 9.207356 4.903972 9.555664 4.555664 C 9.903971 4.207357 10.302734 3.938803 10.751953 3.75 Z M 10 10 C 10 9.772136 10.065104 9.563803 10.195312 9.375 C 10.325521 9.186198 10.494791 9.049479 10.703125 8.964844 L 12.03125 8.457031 C 12.389322 8.320312 12.672525 8.139648 12.880859 7.915039 C 13.089192 7.690431 13.256836 7.451173 13.383789 7.197266 C 13.510742 6.94336 13.613281 6.684571 13.691406 6.420898 C 13.769531 6.157228 13.859049 5.921225 13.959961 5.712891 C 14.060872 5.504558 14.189453 5.333659 14.345703 5.200195 C 14.501953 5.066732 14.720052 5.000001 15 5 C 15.214843 5.000001 15.419921 5.063478 15.615234 5.19043 C 15.810546 5.317384 15.947265 5.485027 16.025391 5.693359 C 16.116535 5.921225 16.202799 6.144206 16.28418 6.362305 C 16.365559 6.580404 16.451822 6.803386 16.542969 7.03125 C 16.679688 7.382812 16.860352 7.662761 17.084961 7.871094 C 17.30957 8.079428 17.548828 8.24707 17.802734 8.374023 C 18.056641 8.500977 18.31543 8.606771 18.579102 8.691406 C 18.842773 8.776042 19.078775 8.868815 19.287109 8.969727 C 19.495441 9.070639 19.66634 9.199219 19.799805 9.355469 C 19.933268 9.511719 20 9.726562 20 10 C 20 10.221354 19.934895 10.426433 19.804688 10.615234 C 19.674479 10.804037 19.505207 10.940756 19.296875 11.025391 L 17.958984 11.542969 C 17.60091 11.679688 17.317707 11.860352 17.109375 12.084961 C 16.901041 12.30957 16.733398 12.550456 16.606445 12.807617 C 16.479492 13.064779 16.375324 13.323568 16.293945 13.583984 C 16.212564 13.844401 16.123047 14.078776 16.025391 14.287109 C 15.927733 14.495443 15.80078 14.666342 15.644531 14.799805 C 15.48828 14.933269 15.273437 15 15 15 C 14.772135 15 14.563802 14.936523 14.375 14.80957 C 14.186197 14.682617 14.049479 14.511719 13.964844 14.296875 L 13.457031 12.96875 C 13.320312 12.617188 13.141275 12.33724 12.919922 12.128906 C 12.698567 11.920573 12.45931 11.751303 12.202148 11.621094 C 11.944986 11.490886 11.686197 11.385092 11.425781 11.303711 C 11.165364 11.222331 10.929361 11.129558 10.717773 11.025391 C 10.506185 10.921225 10.333658 10.792644 10.200195 10.639648 C 10.066731 10.486654 10 10.273438 10 10 Z M 18.486328 10 C 18.128254 9.863281 17.792969 9.726562 17.480469 9.589844 C 17.167969 9.453125 16.883137 9.29362 16.625977 9.111328 C 16.368814 8.929037 16.136066 8.709311 15.927734 8.452148 C 15.7194 8.194987 15.537108 7.87435 15.380859 7.490234 L 15 6.513672 L 14.628906 7.480469 C 14.479166 7.871094 14.30013 8.194987 14.091797 8.452148 C 13.883463 8.709311 13.647461 8.929037 13.383789 9.111328 C 13.120117 9.29362 12.832031 9.451498 12.519531 9.584961 C 12.207031 9.718425 11.871744 9.856771 11.513672 10 C 11.884765 10.136719 12.226562 10.271811 12.539062 10.405273 C 12.851562 10.538737 13.136393 10.696615 13.393555 10.878906 C 13.650716 11.061198 13.880208 11.282553 14.082031 11.542969 C 14.283854 11.803386 14.46289 12.128906 14.619141 12.519531 L 15 13.486328 C 15.136718 13.128256 15.271809 12.792969 15.405273 12.480469 C 15.538736 12.167969 15.696614 11.881511 15.878906 11.621094 C 16.061197 11.360678 16.280924 11.12793 16.538086 10.922852 C 16.795246 10.717773 17.119141 10.537109 17.509766 10.380859 Z M 1.25 14.365234 C 1.25 14.12435 1.318359 13.90625 1.455078 13.710938 C 1.591797 13.515625 1.770833 13.372396 1.992188 13.28125 L 3.691406 12.626953 C 4.0625 12.483725 4.357096 12.288412 4.575195 12.041016 C 4.793294 11.79362 4.970703 11.526693 5.107422 11.240234 C 5.244141 10.953776 5.356445 10.662436 5.444336 10.366211 C 5.532227 10.069987 5.633138 9.803061 5.74707 9.56543 C 5.861002 9.3278 6.002604 9.132487 6.171875 8.979492 C 6.341146 8.826498 6.575521 8.75 6.875 8.75 C 7.109375 8.75 7.325846 8.818359 7.524414 8.955078 C 7.722981 9.091797 7.867838 9.270834 7.958984 9.492188 C 8.069661 9.778646 8.180338 10.063477 8.291016 10.34668 C 8.401692 10.629883 8.512369 10.914714 8.623047 11.201172 C 8.727213 11.474609 8.863932 11.705729 9.033203 11.894531 C 9.202474 12.083334 9.388021 12.242839 9.589844 12.373047 C 9.791666 12.503256 10.003255 12.612305 10.224609 12.700195 C 10.445963 12.788086 10.665689 12.869467 10.883789 12.944336 C 11.101888 13.019206 11.308594 13.092448 11.503906 13.164062 C 11.699219 13.235678 11.870117 13.323568 12.016602 13.427734 C 12.163086 13.531901 12.280273 13.658854 12.368164 13.808594 C 12.456055 13.958334 12.5 14.143881 12.5 14.365234 C 12.5 14.60612 12.433268 14.825847 12.299805 15.024414 C 12.16634 15.222982 11.985676 15.367839 11.757812 15.458984 C 11.471354 15.569662 11.186523 15.680339 10.90332 15.791016 C 10.620117 15.901693 10.335286 16.012371 10.048828 16.123047 C 9.684244 16.266277 9.392903 16.459961 9.174805 16.704102 C 8.956705 16.948242 8.779297 17.21517 8.642578 17.504883 C 8.505859 17.794596 8.390299 18.087564 8.295898 18.383789 C 8.201497 18.680014 8.098958 18.946939 7.988281 19.18457 C 7.877604 19.422201 7.73763 19.617514 7.568359 19.770508 C 7.399088 19.923502 7.167969 20 6.875 20 C 6.627604 20 6.40625 19.933268 6.210938 19.799805 C 6.015625 19.666342 5.872396 19.482422 5.78125 19.248047 L 5.126953 17.548828 C 4.983724 17.177734 4.788411 16.883139 4.541016 16.665039 C 4.29362 16.446941 4.026692 16.27116 3.740234 16.137695 C 3.453776 16.004232 3.162435 15.891928 2.866211 15.800781 C 2.569987 15.709636 2.30306 15.608725 2.06543 15.498047 C 1.827799 15.38737 1.632487 15.245769 1.479492 15.073242 C 1.326497 14.900717 1.25 14.664714 1.25 14.365234 Z M 11.103516 14.365234 C 10.856119 14.267578 10.605469 14.17155 10.351562 14.077148 C 10.097656 13.982748 9.847005 13.886719 9.599609 13.789062 C 9.163411 13.619792 8.805338 13.411459 8.525391 13.164062 C 8.245442 12.916667 8.009439 12.636719 7.817383 12.324219 C 7.625325 12.011719 7.45931 11.67155 7.319336 11.303711 C 7.179362 10.935873 7.03125 10.550131 6.875 10.146484 C 6.71875 10.556641 6.570638 10.944011 6.430664 11.308594 C 6.29069 11.673178 6.124674 12.011719 5.932617 12.324219 C 5.74056 12.636719 5.50293 12.916667 5.219727 13.164062 C 4.936523 13.411459 4.576823 13.619792 4.140625 13.789062 L 2.646484 14.365234 C 3.05013 14.521484 3.434245 14.669597 3.798828 14.80957 C 4.163411 14.949545 4.501953 15.115561 4.814453 15.307617 C 5.126953 15.499675 5.406901 15.737305 5.654297 16.020508 C 5.901692 16.303711 6.113281 16.663412 6.289062 17.099609 L 6.875 18.603516 L 7.460938 17.089844 C 7.630208 16.653646 7.840169 16.295572 8.09082 16.015625 C 8.341471 15.735678 8.621419 15.499675 8.930664 15.307617 C 9.239908 15.115561 9.57845 14.949545 9.946289 14.80957 C 10.314127 14.669597 10.699869 14.521484 11.103516 14.365234 Z " />
                 </controls:SettingsExpander.HeaderIcon>
diff --git a/Wino.Calendar/Wino.Calendar.csproj b/Wino.Calendar/Wino.Calendar.csproj
index 7d32d5da..99401d3e 100644
--- a/Wino.Calendar/Wino.Calendar.csproj
+++ b/Wino.Calendar/Wino.Calendar.csproj
@@ -155,6 +155,7 @@
     </Compile>
     <Compile Include="Models\CalendarItemMeasurement.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\AccountCalendarStateService.cs" />
     <Compile Include="Services\CalendarAuthenticatorConfig.cs" />
     <Compile Include="Services\DialogService.cs" />
     <Compile Include="Services\NavigationService.cs" />
@@ -367,4 +368,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs b/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs
index 4e5f9c8f..045363cd 100644
--- a/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs
+++ b/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs
@@ -1,18 +1,21 @@
 using System;
 using SQLite;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Core.Domain.Entities.Calendar
 {
-    public class AccountCalendar
+    public class AccountCalendar : IAccountCalendar
     {
         [PrimaryKey]
         public Guid Id { get; set; }
+        public Guid AccountId { get; set; }
         public string RemoteCalendarId { get; set; }
         public string SynchronizationDeltaToken { get; set; }
-        public Guid AccountId { get; set; }
         public string Name { get; set; }
-        public string ColorHex { get; set; }
-        public string TimeZone { get; set; }
         public bool IsPrimary { get; set; }
+        public bool IsExtended { get; set; } = true;
+        public string TextColorHex { get; set; }
+        public string BackgroundColorHex { get; set; }
+        public string TimeZone { get; set; }
     }
 }
diff --git a/Wino.Core.Domain/Interfaces/IAccountCalendar.cs b/Wino.Core.Domain/Interfaces/IAccountCalendar.cs
new file mode 100644
index 00000000..e388fd63
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IAccountCalendar.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Wino.Core.Domain.Interfaces
+{
+    public interface IAccountCalendar
+    {
+        string Name { get; set; }
+        string TextColorHex { get; set; }
+        string BackgroundColorHex { get; set; }
+        bool IsPrimary { get; set; }
+        Guid AccountId { get; set; }
+        string RemoteCalendarId { get; set; }
+        bool IsExtended { get; set; }
+    }
+}
diff --git a/Wino.Core/Extensions/GoogleIntegratorExtensions.cs b/Wino.Core/Extensions/GoogleIntegratorExtensions.cs
index 1ec651ba..7128dc37 100644
--- a/Wino.Core/Extensions/GoogleIntegratorExtensions.cs
+++ b/Wino.Core/Extensions/GoogleIntegratorExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
+using CommunityToolkit.Diagnostics;
 using Google.Apis.Calendar.v3.Data;
 using Google.Apis.Gmail.v1.Data;
 using MimeKit;
@@ -9,6 +10,7 @@ using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Misc;
 using Wino.Services;
 using Wino.Services.Extensions;
 
@@ -170,7 +172,7 @@ namespace Wino.Core.Extensions
 
         public static AccountCalendar AsCalendar(this CalendarListEntry calendarListEntry, Guid accountId)
         {
-            return new AccountCalendar()
+            var calendar = new AccountCalendar()
             {
                 RemoteCalendarId = calendarListEntry.Id,
                 AccountId = accountId,
@@ -179,6 +181,25 @@ namespace Wino.Core.Extensions
                 TimeZone = calendarListEntry.TimeZone,
                 IsPrimary = calendarListEntry.Primary.GetValueOrDefault(),
             };
+
+            // Optional background color.
+            if (calendarListEntry.BackgroundColor != null) calendar.BackgroundColorHex = calendarListEntry.BackgroundColor;
+
+            if (!string.IsNullOrEmpty(calendarListEntry.ForegroundColor))
+            {
+                calendar.TextColorHex = calendarListEntry.ForegroundColor;
+            }
+            else
+            {
+                // Calendars must have text color assigned.
+                // Generate one if not provided.
+
+                var randomColor = RandomFlatColorGenerator.Generate();
+
+                calendar.TextColorHex = randomColor.ToHexString();
+            }
+
+            return calendar;
         }
 
         /// <summary>
diff --git a/Wino.Core/Misc/RandomFlatColorGenerator.cs b/Wino.Core/Misc/RandomFlatColorGenerator.cs
new file mode 100644
index 00000000..67876162
--- /dev/null
+++ b/Wino.Core/Misc/RandomFlatColorGenerator.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Drawing;
+
+namespace Wino.Core.Misc
+{
+    public static class RandomFlatColorGenerator
+    {
+        public static Color Generate()
+        {
+            Random random = new();
+            int hue = random.Next(0, 360);      // Full hue range
+            int saturation = 70 + random.Next(30); // High saturation (70-100%)
+            int lightness = 50 + random.Next(20);  // Bright colors (50-70%)
+
+            return FromHsl(hue, saturation, lightness);
+        }
+
+        private static Color FromHsl(int h, int s, int l)
+        {
+            double hue = h / 360.0;
+            double saturation = s / 100.0;
+            double lightness = l / 100.0;
+
+            // Conversion from HSL to RGB
+            var chroma = (1 - Math.Abs(2 * lightness - 1)) * saturation;
+            var x = chroma * (1 - Math.Abs((hue * 6) % 2 - 1));
+            var m = lightness - chroma / 2;
+
+            double r = 0, g = 0, b = 0;
+
+            if (hue < 1.0 / 6.0) { r = chroma; g = x; b = 0; }
+            else if (hue < 2.0 / 6.0) { r = x; g = chroma; b = 0; }
+            else if (hue < 3.0 / 6.0) { r = 0; g = chroma; b = x; }
+            else if (hue < 4.0 / 6.0) { r = 0; g = x; b = chroma; }
+            else if (hue < 5.0 / 6.0) { r = x; g = 0; b = chroma; }
+            else { r = chroma; g = 0; b = x; }
+
+            return Color.FromArgb(
+                (int)((r + m) * 255),
+                (int)((g + m) * 255),
+                (int)((b + m) * 255));
+        }
+    }
+}
diff --git a/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs b/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs
index f2faca15..c859efa0 100644
--- a/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs
+++ b/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs
@@ -9,5 +9,6 @@ namespace Wino.Messaging.Client.Calendar
     /// <param name="DisplayType">Type of the calendar.</param>
     /// <param name="DisplayDate">Exact date to highlight.</param>
     /// <param name="DayDisplayCount">How many days to load with Day calendar display type.</param>
-    public record LoadCalendarMessage(DateTime DisplayDate, CalendarInitInitiative CalendarInitInitiative);
+    /// <param name="ForceRedraw">Remove all days and force re-render of everything. Used when settings are updated.</param>
+    public record LoadCalendarMessage(DateTime DisplayDate, CalendarInitInitiative CalendarInitInitiative, bool ForceRedraw = false);
 }