diff --git a/Wallet.Avalonia/AllNavigationView.axaml b/Wallet.Avalonia/AllNavigationView.axaml
index 0695386..9176701 100644
--- a/Wallet.Avalonia/AllNavigationView.axaml
+++ b/Wallet.Avalonia/AllNavigationView.axaml
@@ -5,9 +5,9 @@
     xmlns:vm="using:Wallet"
     x:DataType="vm:AllNavigationViewModel"
     Content="All"
-    IsSelected="{Binding Selected}">
+    IsSelected="{Binding IsSelected}">
     <Interaction.Behaviors>
-        <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
diff --git a/Wallet.Avalonia/ArchiveNavigationView.axaml b/Wallet.Avalonia/ArchiveNavigationView.axaml
index 5e5bab7..f827b2a 100644
--- a/Wallet.Avalonia/ArchiveNavigationView.axaml
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml
@@ -5,9 +5,9 @@
     xmlns:vm="using:Wallet"
     x:DataType="vm:ArchiveNavigationViewModel"
     Content="Archive"
-    IsSelected="{Binding Selected, Mode=TwoWay}">
+    IsSelected="{Binding IsSelected}">
     <Interaction.Behaviors>
-        <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
diff --git a/Wallet.Avalonia/ArchiveNavigationView.axaml.cs b/Wallet.Avalonia/ArchiveNavigationView.axaml.cs
index c1d5be6..d22244e 100644
--- a/Wallet.Avalonia/ArchiveNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml.cs
@@ -2,7 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
 
 namespace Wallet.Avalonia;
 
-public partial class ArchiveNavigationView : NavigationViewItem
+public partial class ArchiveNavigationView :
+    NavigationViewItem
 {
-    public ArchiveNavigationView() => InitializeComponent();
+    public ArchiveNavigationView() => 
+        InitializeComponent();
 }
\ No newline at end of file
diff --git a/Wallet.Avalonia/CategoryNavigationView.axaml b/Wallet.Avalonia/CategoryNavigationView.axaml
index 7b44830..08b2cde 100644
--- a/Wallet.Avalonia/CategoryNavigationView.axaml
+++ b/Wallet.Avalonia/CategoryNavigationView.axaml
@@ -5,13 +5,13 @@
     xmlns:vm="using:Wallet"
     x:DataType="vm:CategoryNavigationViewModel"
     Content="{Binding Value}"
-    IsSelected="{Binding Selected}">
+    IsSelected="{Binding IsSelected}">
     <Interaction.Behaviors>
-        <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
@@ -21,7 +21,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">
diff --git a/Wallet.Avalonia/FavouritesNavigationView.axaml b/Wallet.Avalonia/FavouritesNavigationView.axaml
index 219f8a1..4f655a7 100644
--- a/Wallet.Avalonia/FavouritesNavigationView.axaml
+++ b/Wallet.Avalonia/FavouritesNavigationView.axaml
@@ -5,13 +5,13 @@
     xmlns:vm="using:Wallet"
     x:DataType="vm:FavouritesNavigationViewModel"
     Content="Favourites"
-    IsSelected="{Binding Selected, Mode=TwoWay}">
+    IsSelected="{Binding IsSelected}">
     <Interaction.Behaviors>
-        <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Wallet">
@@ -21,7 +21,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Left" Route="ItemCollection">
diff --git a/Wallet.Avalonia/MainView.axaml b/Wallet.Avalonia/MainView.axaml
index 92d6ac0..d07544a 100644
--- a/Wallet.Avalonia/MainView.axaml
+++ b/Wallet.Avalonia/MainView.axaml
@@ -6,9 +6,9 @@
     x:DataType="vm:MainViewModel">
     <NavigationView
         FooterMenuItemsSource="{Binding Footer}"
+        IsSettingsVisible="False"
         MenuItemTemplate="{Binding Template}"
         MenuItemsSource="{Binding}"
-		IsSettingsVisible="False"
         SelectedItem="{Binding SelectedItem}"
         SelectionFollowsFocus="True">
         <NavigationView.Resources>
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index 2deef15..1f8b67a 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -7,17 +7,17 @@
     x:Name="NavigationViewItem"
     x:DataType="vm:WalletNavigationViewModel"
     Content="{Binding Name}"
-    IsExpanded="{Binding Expanded}"
-    IsSelected="{Binding Selected}"
+    IsExpanded="{Binding IsExpanded}"
+    IsSelected="{Binding IsSelected}"
     MenuItemsSource="{Binding}"
     NavigationViewExtension.IsItemInvokedEnabled="True"
     SelectsOnInvoked="True">
     <Interaction.Behaviors>
-        <DataTriggerBehavior Binding="{Binding Opened}" Value="False">
+        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="OpenWallet">
@@ -29,11 +29,11 @@
                     Value="True" />
             </ConditionAction>
         </DataTriggerBehavior>
-        <DataTriggerBehavior Binding="{Binding Opened}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="True">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <ChangePropertyAction
@@ -47,8 +47,8 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
-                        <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="OpenWallet">
@@ -58,7 +58,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="True" />
                         <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
@@ -70,7 +70,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
+                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="OpenWallet">
@@ -80,18 +80,18 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
-                        <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
+                        <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="True" />
                         <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <InvokeNavigationViewItemAction />
             </ConditionAction>
         </AttachedEventTriggerBehaviour>
-        <DataTriggerBehavior Binding="{Binding Opened}" Value="False">
+        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
             <RemoveClassAction ClassName="Closed" />
             <AddClassAction ClassName="Closed" RemoveIfExists="True" />
         </DataTriggerBehavior>
-        <DataTriggerBehavior Binding="{Binding Opened}" Value="True">
+        <DataTriggerBehavior Binding="{Binding IsOpened}" Value="True">
             <RemoveClassAction ClassName="Opened" />
             <AddClassAction ClassName="Opened" RemoveIfExists="True" />
         </DataTriggerBehavior>
diff --git a/Wallet/AllNavigationViewModel.cs b/Wallet/AllNavigationViewModel.cs
index 3379c70..11740c3 100644
--- a/Wallet/AllNavigationViewModel.cs
+++ b/Wallet/AllNavigationViewModel.cs
@@ -6,15 +6,4 @@ public partial class AllNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory, IMediator mediator,
     IPublisher publisher, ISubscriber subscriber, IDisposer disposer, int key, string value) :
     FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),
-    INotificationHandler<NotifyEventArgs<Item<int>>>
-{
-    //public Task Handle(NotifyEventArgs<Item<int>> args)
-    //{
-    //    if (args.Sender is Item<int> item)
-    //    {
-    //        Key = item.Value;
-    //    }
-
-    //    return Task.CompletedTask;
-    //}
-}
\ No newline at end of file
+    INotificationHandler<NotifyEventArgs<Item<int>>>;
\ No newline at end of file
diff --git a/Wallet/CreateItemViewModelHandler.cs b/Wallet/CreateItemViewModelHandler.cs
index 2bb7080..7ba9ec3 100644
--- a/Wallet/CreateItemViewModelHandler.cs
+++ b/Wallet/CreateItemViewModelHandler.cs
@@ -29,7 +29,7 @@ public class CreateItemViewModelHandler(IServiceFactory serviceFactory,
 
         itemHeaderConfigurationDecorator.Set(configuration);
 
-        if (serviceFactory.Create<ItemViewModel>(args => args.OnInitialize(), args.Parameters) is ItemViewModel itemViewModel)
+        if (serviceFactory.Create<ItemViewModel>(args => args.Initialize(), args.Parameters) is ItemViewModel itemViewModel)
         {
             itemViewModel.Add<ItemHeaderViewModel>(configuration, state, "", name);
             itemViewModel.Add<ItemContentViewModel>();
diff --git a/Wallet/FilterNavigationViewModel.cs b/Wallet/FilterNavigationViewModel.cs
index 340abdb..54a6f84 100644
--- a/Wallet/FilterNavigationViewModel.cs
+++ b/Wallet/FilterNavigationViewModel.cs
@@ -19,10 +19,10 @@ public abstract partial class FilterNavigationViewModel(IServiceProvider provide
     INotificationHandler<NotifyEventArgs<Item<int>>>
 {
     [ObservableProperty]
-    private bool activated;
+    private bool isActivated;
 
     [ObservableProperty]
-    private bool selected;
+    private bool isSelected;
 
     public Task Handle(NotifyEventArgs<Item<int>> args)
     {
@@ -35,10 +35,10 @@ public abstract partial class FilterNavigationViewModel(IServiceProvider provide
     }
 
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
-        Task.FromResult(Activated = false);
+        Task.FromResult(IsActivated = false);
 
     public Task Handle(ActivatedEventArgs<Wallet> args) =>
-        Task.FromResult(Activated = true);
+        Task.FromResult(IsActivated = true);
 }
 
 [Notification(typeof(NotifyEventArgs<Item<int>>), nameof(Value))]
@@ -61,7 +61,7 @@ public abstract partial class FilterNavigationViewModel<TWalletNavigation>(IServ
     private bool activated;
 
     [ObservableProperty]
-    private bool selected;
+    private bool isSelected;
 
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
         Task.FromResult(Activated = false);
diff --git a/Wallet/ItemCategoryCollectionViewModel.cs b/Wallet/ItemCategoryCollectionViewModel.cs
index 27ef536..716dbcd 100644
--- a/Wallet/ItemCategoryCollectionViewModel.cs
+++ b/Wallet/ItemCategoryCollectionViewModel.cs
@@ -16,13 +16,13 @@ public partial class ItemCategoryCollectionViewModel(IServiceProvider provider,
     [ObservableProperty]
     private IContentTemplate template = template;
 
-    public override Task OnActivated()
+    public override Task Activated()
     {
         Publisher.Publish(Notify.As(Factory.Create<WalletCommandHeaderCollection>(new List<IDisposable>
         {
             Factory.Create<BackActionViewModel>(),
         })));
 
-        return base.OnActivated();
+        return base.Activated();
     }
 }
diff --git a/Wallet/ItemCategoryNavigationViewModel.cs b/Wallet/ItemCategoryNavigationViewModel.cs
index cd4bfc0..e7f5162 100644
--- a/Wallet/ItemCategoryNavigationViewModel.cs
+++ b/Wallet/ItemCategoryNavigationViewModel.cs
@@ -11,7 +11,7 @@ public partial class ItemCategoryNavigationViewModel(IServiceProvider provider,
     ISubscriber subscriber,
     IDisposer disposer,
     string name,
-    bool selected = false) :
+    bool isSelected = false) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer),
     ISelectable,
     IRemovable
@@ -20,7 +20,7 @@ public partial class ItemCategoryNavigationViewModel(IServiceProvider provider,
     private string name = name;
 
     [ObservableProperty]
-    private bool selected = selected;
+    private bool isSelected = isSelected;
 
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Notify.As(new ItemCategory<string>(Name)));
diff --git a/Wallet/ItemCollectionViewModel.cs b/Wallet/ItemCollectionViewModel.cs
index 45e1c62..3230405 100644
--- a/Wallet/ItemCollectionViewModel.cs
+++ b/Wallet/ItemCollectionViewModel.cs
@@ -59,7 +59,7 @@ public partial class ItemCollectionViewModel :
         return Task.CompletedTask;
     }
 
-    public override Task OnActivated()
+    public override Task Activated()
     {
         Publisher.Publish(Notify.As(Factory.Create<WalletCommandHeaderCollection>(new List<IDisposable>
         {
@@ -67,7 +67,7 @@ public partial class ItemCollectionViewModel :
             Factory.Create<SearchWalletActionViewModel>(),
         })));
 
-        return base.OnActivated();
+        return base.Activated();
     }
 
     protected override SynchronizeExpression BuildAggregateExpression() =>
diff --git a/Wallet/ItemNavigationViewModel.cs b/Wallet/ItemNavigationViewModel.cs
index c5fcfc3..5bcf900 100644
--- a/Wallet/ItemNavigationViewModel.cs
+++ b/Wallet/ItemNavigationViewModel.cs
@@ -15,7 +15,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     string name = "",
     string description = "",
     string category = "",
-    bool selected = false,
+    bool isSelected = false,
     bool favourite = false,
     bool archived = false) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer),
@@ -50,7 +50,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     private string named = $"{named}";
 
     [ObservableProperty]
-    private bool selected = selected;
+    private bool isSelected = isSelected;
 
     public IContentTemplate Template { get; set; } = template;
 
diff --git a/Wallet/ItemViewModel.cs b/Wallet/ItemViewModel.cs
index 3058284..3b77fe7 100644
--- a/Wallet/ItemViewModel.cs
+++ b/Wallet/ItemViewModel.cs
@@ -101,7 +101,7 @@ public partial class ItemViewModel :
         return Task.CompletedTask;
     }
 
-    public override Task OnActivated()
+    public override Task Activated()
     {
         if (Archived)
         {
@@ -131,7 +131,7 @@ public partial class ItemViewModel :
             }
         }
 
-        return base.OnActivated();
+        return base.Activated();
     }
 
     protected override SynchronizeExpression BuildAggregateExpression() =>
diff --git a/Wallet/MaskedTextEntryViewModelHandler.cs b/Wallet/MaskedTextEntryViewModelHandler.cs
index 0a13524..49c783b 100644
--- a/Wallet/MaskedTextEntryViewModelHandler.cs
+++ b/Wallet/MaskedTextEntryViewModelHandler.cs
@@ -14,7 +14,7 @@ public class MaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<MaskedTextEntryViewModel>(args => args.OnInitialize(), 
+            if (serviceFactory.Create<MaskedTextEntryViewModel>(args => args.Initialize(), 
                 [.. args.Parameters, configuration, configuration.Pattern, label, value, width])
                 is MaskedTextEntryViewModel viewModel)
             {
diff --git a/Wallet/MultilineTextEntryViewModelHandler.cs b/Wallet/MultilineTextEntryViewModelHandler.cs
index 862b83b..6817d76 100644
--- a/Wallet/MultilineTextEntryViewModelHandler.cs
+++ b/Wallet/MultilineTextEntryViewModelHandler.cs
@@ -14,7 +14,7 @@ public class MultilineTextEntryViewModelHandler(IServiceFactory serviceFactory)
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<MultilineTextEntryViewModel>(args => args.OnInitialize(), 
+            if (serviceFactory.Create<MultilineTextEntryViewModel>(args => args.Initialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is MultilineTextEntryViewModel viewModel)
             {
diff --git a/Wallet/OpenWalletViewModel.cs b/Wallet/OpenWalletViewModel.cs
index 51bf381..1a3b04a 100644
--- a/Wallet/OpenWalletViewModel.cs
+++ b/Wallet/OpenWalletViewModel.cs
@@ -14,7 +14,6 @@ public partial class OpenWalletViewModel : Observable
     [ObservableProperty]
     private string? password;
 
-
     [ObservableProperty]
     private string? repeatedPassword;
 
@@ -28,7 +27,6 @@ public partial class OpenWalletViewModel : Observable
         string name) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
         this.validation = validation;
-
         Name = name;
     }
 
diff --git a/Wallet/PasswordEntryViewModelHandler.cs b/Wallet/PasswordEntryViewModelHandler.cs
index a6da90c..324b64d 100644
--- a/Wallet/PasswordEntryViewModelHandler.cs
+++ b/Wallet/PasswordEntryViewModelHandler.cs
@@ -14,7 +14,7 @@ public class PasswordEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<PasswordEntryViewModel>(args => args.OnInitialize(), 
+            if (serviceFactory.Create<PasswordEntryViewModel>(args => args.Initialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is PasswordEntryViewModel viewModel)
             {
diff --git a/Wallet/PinEntryViewModelHandler.cs b/Wallet/PinEntryViewModelHandler.cs
index e57d06b..612350b 100644
--- a/Wallet/PinEntryViewModelHandler.cs
+++ b/Wallet/PinEntryViewModelHandler.cs
@@ -14,7 +14,7 @@ public class PinEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<PinEntryViewModel>(args => args.OnInitialize(), 
+            if (serviceFactory.Create<PinEntryViewModel>(args => args.Initialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is PinEntryViewModel viewModel)
             {
diff --git a/Wallet/SynchronizeCategoriesNavigationViewModelHandler.cs b/Wallet/SynchronizeCategoriesNavigationViewModelHandler.cs
index a21182b..af351c7 100644
--- a/Wallet/SynchronizeCategoriesNavigationViewModelHandler.cs
+++ b/Wallet/SynchronizeCategoriesNavigationViewModelHandler.cs
@@ -18,7 +18,7 @@ public class SynchronizeCategoriesNavigationViewModelHandler(IMediator mediator,
             int count = counts?.FirstOrDefault(x => x.Name == configuration.Key).Count ?? 0;
             string name = configuration.Key;
 
-            if (serviceFactory.Create<CategoryNavigationViewModel>(args => args.OnInitialize(), count, name)
+            if (serviceFactory.Create<CategoryNavigationViewModel>(args => args.Initialize(), count, name)
                 is CategoryNavigationViewModel viewModel)
             {
                 publisher.Publish(Create.As(viewModel), nameof(CategoriesNavigationViewModel));
diff --git a/Wallet/SynchronizeItemCategoryViewModelHandler.cs b/Wallet/SynchronizeItemCategoryViewModelHandler.cs
index 3db98fb..088664d 100644
--- a/Wallet/SynchronizeItemCategoryViewModelHandler.cs
+++ b/Wallet/SynchronizeItemCategoryViewModelHandler.cs
@@ -12,7 +12,7 @@ public class SynchronizeItemCategoryViewModelHandler(IItemConfigurationCollectio
         bool selected = true;
         foreach (KeyValuePair<string, Func<ItemConfiguration>> configuration in configurations)
         {
-            if (serviceFactory.Create<ItemCategoryNavigationViewModel>(args => args.OnInitialize(), 
+            if (serviceFactory.Create<ItemCategoryNavigationViewModel>(args => args.Initialize(), 
                 configuration.Key, selected)
                 is ItemCategoryNavigationViewModel viewModel)
             {
diff --git a/Wallet/SynchronizeItemCollectionViewModelHandler.cs b/Wallet/SynchronizeItemCollectionViewModelHandler.cs
index 25857b0..bb53f02 100644
--- a/Wallet/SynchronizeItemCollectionViewModelHandler.cs
+++ b/Wallet/SynchronizeItemCollectionViewModelHandler.cs
@@ -31,7 +31,7 @@ public class SynchronizeItemCollectionViewModelHandler(IMediator mediator,
                     IDecoratorService<Item<(Guid, string)>> decoratorService = serviceScope.ServiceProvider
                         .GetRequiredService<IDecoratorService<Item<(Guid, string)>>>();
 
-                    if (serviceFactory.Create<ItemNavigationViewModel>(args => args.OnInitialize(), 
+                    if (serviceFactory.Create<ItemNavigationViewModel>(args => args.Initialize(), 
                         Id, Name, "Description", Category, selected, Favourite, Archived) 
                         is ItemNavigationViewModel viewModel)
                     {
diff --git a/Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs b/Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs
index 6dcc72e..49bc4bf 100644
--- a/Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs
+++ b/Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs
@@ -22,7 +22,7 @@ public class SynchronizeItemContentFromCategoryViewModelHandler(IItemConfigurati
                     foreach (ItemSectionConfiguration configurationSection in configuration.Sections)
                     {
                         string id = $"{nameof(ItemSection)}:{Guid.NewGuid()}";
-                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.OnInitialize(), id)
+                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.Initialize(), id)
                             is ItemSectionViewModel sectionViewModel)
                         {
                             publisher.Publish(Create.As(sectionViewModel), nameof(ItemContentViewModel));
diff --git a/Wallet/SynchronizeItemContentViewModelHandler.cs b/Wallet/SynchronizeItemContentViewModelHandler.cs
index dd682b5..b057605 100644
--- a/Wallet/SynchronizeItemContentViewModelHandler.cs
+++ b/Wallet/SynchronizeItemContentViewModelHandler.cs
@@ -25,7 +25,7 @@ public class SynchronizeItemContentViewModelHandler(IDecoratorService<Item<(Guid
                     foreach (ItemSectionConfiguration configurationSection in configuration.Sections)
                     {
                         string id = $"{nameof(ItemSection)}:{Guid.NewGuid()}";
-                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.OnInitialize(), id)
+                        if (serviceFactory.Create<ItemSectionViewModel>(args => args.Initialize(), id)
                             is ItemSectionViewModel sectionViewModel)
                         {
                             publisher.Publish(Create.As(sectionViewModel), nameof(ItemContentViewModel));
diff --git a/Wallet/SynchronizeMainViewModelHandler.cs b/Wallet/SynchronizeMainViewModelHandler.cs
index 80f98cd..4fcc87f 100644
--- a/Wallet/SynchronizeMainViewModelHandler.cs
+++ b/Wallet/SynchronizeMainViewModelHandler.cs
@@ -19,7 +19,7 @@ public class SynchronizeMainViewModelHandler(IPublisher publisher,
             {
                 if (Wallet.Services.GetRequiredService<IServiceFactory>() is IServiceFactory factory)
                 {
-                    if (factory.Create<WalletNavigationViewModel>(args => args.OnInitialize(), descriptor.Name, selected) 
+                    if (factory.Create<WalletNavigationViewModel>(args => args.Initialize(), descriptor.Name, selected) 
                         is WalletNavigationViewModel viewModel)
                     {
                         publisher.Publish(Create.As<IMainNavigationViewModel>(viewModel),
diff --git a/Wallet/TextEntryViewModelHandler.cs b/Wallet/TextEntryViewModelHandler.cs
index 6f76994..2eb8731 100644
--- a/Wallet/TextEntryViewModelHandler.cs
+++ b/Wallet/TextEntryViewModelHandler.cs
@@ -14,7 +14,7 @@ public class TextEntryViewModelHandler(IServiceFactory serviceFactory) :
             string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
-            if (serviceFactory.Create<TextEntryViewModel>(args => args.OnInitialize(), 
+            if (serviceFactory.Create<TextEntryViewModel>(args => args.Initialize(), 
                 [.. args.Parameters, configuration, label, value, width])
                 is TextEntryViewModel viewModel)
             {
diff --git a/Wallet/WalletActivatedHandler.cs b/Wallet/WalletActivatedHandler.cs
index 5292e15..91993bf 100644
--- a/Wallet/WalletActivatedHandler.cs
+++ b/Wallet/WalletActivatedHandler.cs
@@ -22,7 +22,7 @@ public class WalletActivatedHandler(IWalletHostCollection Wallets,
             {
                 if (host.Services.GetRequiredService<IServiceFactory>() is IServiceFactory serviceFactory)
                 {
-                    if (serviceFactory.Create<WalletNavigationViewModel>(args => args.OnInitialize(), 
+                    if (serviceFactory.Create<WalletNavigationViewModel>(args => args.Initialize(), 
                         descriptor.Name, false) 
                         is WalletNavigationViewModel viewModel)
                     {
diff --git a/Wallet/WalletInitializer.cs b/Wallet/WalletInitializer.cs
index ca25df2..c64fe2c 100644
--- a/Wallet/WalletInitializer.cs
+++ b/Wallet/WalletInitializer.cs
@@ -7,7 +7,7 @@ public class WalletInitializer(IEnumerable<IConfigurationDescriptor<WalletConfig
     IWalletHostCollection Wallets) : 
     IInitialization
 {
-    public async Task OnInitialize()
+    public async Task Initialize()
     {
         foreach (IConfigurationDescriptor<WalletConfiguration> configuration in configurations)
         {
diff --git a/Wallet/WalletNavigationViewModel.cs b/Wallet/WalletNavigationViewModel.cs
index 324eb6b..2aabb95 100644
--- a/Wallet/WalletNavigationViewModel.cs
+++ b/Wallet/WalletNavigationViewModel.cs
@@ -13,19 +13,19 @@ public partial class WalletNavigationViewModel :
     ISelectable
 {
     [ObservableProperty]
-    private bool activated;
-
-    [ObservableProperty]
-    private bool expanded = true;
+    private bool isExpanded = true;
 
     [ObservableProperty]
     private string name;
 
     [ObservableProperty]
-    private bool opened;
+    private bool isOpened;
 
     [ObservableProperty]
-    private bool selected;
+    private bool isSelected;
+
+    [ObservableProperty]
+    private bool isActivated;
 
     public WalletNavigationViewModel(IServiceProvider provider,
         IServiceFactory factory,
@@ -35,11 +35,11 @@ public partial class WalletNavigationViewModel :
         IDisposer disposer,
         IContentTemplate template,
         string name,
-        bool selected) : base(provider, factory, mediator, publisher, subscriber, disposer)
+        bool isSelected) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
         Template = template;
         Name = name;
-        Selected = selected;
+        IsSelected = isSelected;
     }
 
     public IContentTemplate Template { get; set; }
@@ -53,21 +53,21 @@ public partial class WalletNavigationViewModel :
 
         Publisher.Publish(Changed.As<Item>());
 
-        Opened = true;
+        IsOpened = true;
         return Task.CompletedTask;
     }
 
     public Task Handle(ClosedEventArgs<Wallet> args)
     {
-        Opened = true;
+        IsOpened = true;
         Clear();
 
         return Task.CompletedTask;
     }
 
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
-        Task.FromResult(Activated = false);
+        Task.FromResult(IsActivated = false);
 
     public Task Handle(ActivatedEventArgs<Wallet> args) =>
-        Task.FromResult(Activated = true);
+        Task.FromResult(IsActivated = true);
 }
\ No newline at end of file
diff --git a/Wallet/WalletViewModel.cs b/Wallet/WalletViewModel.cs
index 8212825..265f60c 100644
--- a/Wallet/WalletViewModel.cs
+++ b/Wallet/WalletViewModel.cs
@@ -25,15 +25,15 @@ public partial class WalletViewModel :
         Filter = filter;
     }
 
-    public override async Task OnActivated()
+    public override async Task Activated()
     {
-        Publisher.Publish(Activated.As<Wallet>());
-        await base.OnActivated();
+        Publisher.Publish(Toolkit.Foundation.Activated.As<Wallet>());
+        await base.Activated();
     }
 
-    public override async Task OnDeactivated()
+    public override async Task Deactivated()
     {
-        Publisher.Publish(Deactivated.As<Wallet>());
-        await base.OnDeactivated();
+        Publisher.Publish(Toolkit.Foundation.Deactivated.As<Wallet>());
+        await base.Deactivated();
     }
 }
\ No newline at end of file