diff --git a/iNKORE.UI.WPF.Modern.sln b/iNKORE.UI.WPF.Modern.sln
index 58890bb6..b9cb6b51 100644
--- a/iNKORE.UI.WPF.Modern.sln
+++ b/iNKORE.UI.WPF.Modern.sln
@@ -59,8 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingsNavigationTest", "s
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ButtonsOnTitlebar", "samples\ButtonsOnTitlebar\ButtonsOnTitlebar.csproj", "{B7A35355-ED5B-494C-9BB8-6EBA1155E60E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TabControlTest", "samples\TabControlTest\TabControlTest.csproj", "{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -395,26 +393,6 @@ Global
 		{B7A35355-ED5B-494C-9BB8-6EBA1155E60E}.Release|x64.Build.0 = Release|Any CPU
 		{B7A35355-ED5B-494C-9BB8-6EBA1155E60E}.Release|x86.ActiveCfg = Release|Any CPU
 		{B7A35355-ED5B-494C-9BB8-6EBA1155E60E}.Release|x86.Build.0 = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|ARM.Build.0 = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|x64.Build.0 = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Debug|x86.Build.0 = Debug|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|ARM.Build.0 = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|ARM64.Build.0 = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|x64.ActiveCfg = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|x64.Build.0 = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|x86.ActiveCfg = Release|Any CPU
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -435,7 +413,6 @@ Global
 		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 		{AF682B4E-6A51-474A-8D80-0738A94C72FA} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 		{B7A35355-ED5B-494C-9BB8-6EBA1155E60E} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
-		{103A71A3-95FD-60C8-2D1F-3AA459BD0DDB} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6251E140-0FAA-4DE9-B245-1C5BE188E578}
diff --git a/samples/TabControlTest/App.xaml b/samples/TabControlTest/App.xaml
deleted file mode 100644
index d2b6c52b..00000000
--- a/samples/TabControlTest/App.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Application x:Class="TabControlTest.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:TabControlTest"
-             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ui:ThemeResources/>
-                <ui:XamlControlsResources />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/samples/TabControlTest/App.xaml.cs b/samples/TabControlTest/App.xaml.cs
deleted file mode 100644
index 15aa2e83..00000000
--- a/samples/TabControlTest/App.xaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Configuration;
-using System.Data;
-using System.Windows;
-
-namespace TabControlTest;
-
-/// <summary>
-/// Interaction logic for App.xaml
-/// </summary>
-public partial class App : Application
-{
-}
-
diff --git a/samples/TabControlTest/AssemblyInfo.cs b/samples/TabControlTest/AssemblyInfo.cs
deleted file mode 100644
index cc29e7f7..00000000
--- a/samples/TabControlTest/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly:ThemeInfo(
-    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
-                                                //(used if a resource is not found in the page,
-                                                // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
-                                                //(used if a resource is not found in the page,
-                                                // app, or any theme specific resource dictionaries)
-)]
diff --git a/samples/TabControlTest/MainWindow.xaml b/samples/TabControlTest/MainWindow.xaml
deleted file mode 100644
index 3e3585bf..00000000
--- a/samples/TabControlTest/MainWindow.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Window x:Class="TabControlTest.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:TabControlTest"
-        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
-    <Grid>  
-        <TabControl x:Name="tabControl" ItemsSource="{Binding TabItems}"/>
-    </Grid>
-</Window>
diff --git a/samples/TabControlTest/MainWindow.xaml.cs b/samples/TabControlTest/MainWindow.xaml.cs
deleted file mode 100644
index c56b5c70..00000000
--- a/samples/TabControlTest/MainWindow.xaml.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using iNKORE.UI.WPF.Modern.Controls;
-using System.Collections.ObjectModel;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace TabControlTest;
-
-/// <summary>
-/// Interaction logic for MainWindow.xaml
-/// </summary>
-public partial class MainWindow : Window
-{
-    public MainWindow()
-    {
-        InitializeComponent();
-
-        DataContext = this;
-        AddTestingMenuItems();
-
-        tabControl.RegisterTabClosingEvent((menuControl, e) => 
-        {
-            if (e.Tab.Tag is not "ConfirmClose")
-            {
-                TabItems.Remove(e.Tab);
-                return;
-            }
-
-            var msgResult = MessageBox.Show("Confirm closing?", "Confirm", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-            if (msgResult != MessageBoxResult.OK)
-            {
-                e.Cancel = true;
-                return;
-            }
-
-            // when using ItemsSource, manually remove tab item.
-            TabItems.Remove(e.Tab);
-        });
-    }
-
-    public ObservableCollection<TabItem> TabItems { get; } = [];
-
-    private void AddTestingMenuItems()
-    {
-        var item1 = new TabItem()
-        {
-            Header = "Closeable"
-        };
-
-        var item2 = new TabItem()
-        {
-            Header = "ConfirmToClose",
-            Tag = "ConfirmClose"
-        };
-
-        TabItems.Add(item1);
-        TabItems.Add(item2);
-    }
-}
\ No newline at end of file
diff --git a/samples/TabControlTest/TabControlTest.csproj b/samples/TabControlTest/TabControlTest.csproj
deleted file mode 100644
index 83ac89e9..00000000
--- a/samples/TabControlTest/TabControlTest.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\Inkore.UI.WPF.Modern\iNKORE.UI.WPF.Modern.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/samples/WpfApp1/MainWindow.xaml b/samples/WpfApp1/MainWindow.xaml
index 9270aed3..cb6621f0 100644
--- a/samples/WpfApp1/MainWindow.xaml
+++ b/samples/WpfApp1/MainWindow.xaml
@@ -11,26 +11,21 @@
         ui:WindowHelper.UseModernWindowStyle="True"
         Loaded="Window_Loaded" Background="{DynamicResource {x:Static ui:ThemeKeys.AcrylicBackgroundFillColorDefaultBrushKey}}">
     <Canvas>
-
-        <ui:ScrollViewerEx Height="198" Width="229" Canvas.Left="50" Canvas.Top="34" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <Button x:Name="Button_MessageBox" Click="Button_MessageBox_Click" Height="1000">
-                <ui:IconAndText Icon="{x:Static ui:SegoeFluentIcons.Message}" Content="MessageBox Test"/>
-            </Button>
-        </ui:ScrollViewerEx>
-        <ui:ScrollViewerEx Height="198" Width="229" Canvas.Left="367" Canvas.Top="34" VerticalScrollBarVisibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Center">
-            <Button x:Name="Button_MessageBox1" Click="Button_MessageBox_Click" Height="1000">
-                <ui:IconAndText Icon="{x:Static ui:SegoeFluentIcons.Message}" Content="MessageBox Test"/>
-            </Button>
-        </ui:ScrollViewerEx>
-        <ui:ScrollViewerEx Height="198" Width="229" Canvas.Left="51" Canvas.Top="253" VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <Button x:Name="Button_MessageBox2" Click="Button_MessageBox_Click" Height="1000">
-                <ui:IconAndText Icon="{x:Static ui:SegoeFluentIcons.Message}" Content="MessageBox Test"/>
-            </Button>
-        </ui:ScrollViewerEx>
-        <ui:ScrollViewerEx Height="198" Width="229" Canvas.Left="368" Canvas.Top="256" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <Button x:Name="Button_MessageBox3" Click="Button_MessageBox_Click" Height="40">
-                <ui:IconAndText Icon="{x:Static ui:SegoeFluentIcons.Message}" Content="MessageBox Test"/>
-            </Button>
-        </ui:ScrollViewerEx>
+        <ikw:SimpleStackPanel Height="259" Width="678">
+            <Expander Style="{StaticResource {x:Static ui:ThemeKeys.ExpanderCardStyleKey}}" Header="Welcome">
+                <Expander.Content>
+                    <Grid HorizontalAlignment="Stretch" Background="Red">
+                        <TextBlock HorizontalAlignment="Right">Test</TextBlock>
+                    </Grid>
+                </Expander.Content>
+            </Expander>
+            <Expander Style="{StaticResource {x:Static ui:ThemeKeys.ExpanderCardStyleKey}}" Header="Welcome" HorizontalAlignment="Stretch">
+                <Expander.Content>
+                    <Grid HorizontalAlignment="Stretch" Background="Red">
+                        <TextBlock HorizontalAlignment="Right">Test</TextBlock>
+                    </Grid>
+                </Expander.Content>
+            </Expander>
+        </ikw:SimpleStackPanel>
     </Canvas>
 </Window>
diff --git a/samples/WpfApp1/WpfApp1.csproj b/samples/WpfApp1/WpfApp1.csproj
index 21cd1caa..6a4b2aac 100644
--- a/samples/WpfApp1/WpfApp1.csproj
+++ b/samples/WpfApp1/WpfApp1.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Inkore.UI.WPF.Modern.Controls\iNKORE.UI.WPF.Modern.Controls.csproj" />
+    <ProjectReference Include="..\..\source\iNKORE.UI.WPF.Modern.Controls\iNKORE.UI.WPF.Modern.Controls.csproj" />
     <ProjectReference Include="..\..\source\Inkore.UI.WPF.Modern\iNKORE.UI.WPF.Modern.csproj" />
   </ItemGroup>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml
index 16b8f0e6..a4c45494 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml
@@ -8,7 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-    mc:Ignorable="d" d:DesignWidth="734.51">
+    mc:Ignorable="d" d:DesignWidth="907.31">
 
     <Page.Resources>
         <Style BasedOn="{StaticResource DefaultTabControlStyle}" TargetType="TabControl">
@@ -18,7 +18,7 @@
 
     <ikw:SimpleStackPanel>
         <local:ControlExample x:Name="Example1" HeaderText="A basic TabControl">
-            <TabControl x:Name="tabControl">
+            <TabControl x:Name="tabControl" ui:TabControlHelper.TabCloseRequested="tabControl_TabCloseRequested">
                 <ui:TabControlHelper.TabStripHeader>
                     <Button
                         HorizontalAlignment="Stretch"
@@ -38,14 +38,18 @@
             </TabControl>
 
             <local:ControlExample.Options>
-                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}" Spacing="0">
                     <ui:RadioButtons
                         Header="TabStripPlacement"
                         ItemsSource="{Binding Source={x:Type Dock}, Converter={StaticResource EnumValuesConverter}}"
                         SelectedItem="{Binding ElementName=tabControl, Path=TabStripPlacement}"
                         SelectionChanged="RadioButtons_SelectionChanged"/>
-                    <CheckBox x:Name="ShowHeaderAndFooterCheckBox" Content="Show header and footer" 
-                        Click="ShowHeaderAndFooterCheckBox_Click"/>
+                    
+                    <CheckBox x:Name="ShowHeaderAndFooterCheckBox" Content="Header &amp; Footer" 
+                        Click="ShowHeaderAndFooterCheckBox_Click" Margin="0,12,0,0"/>
+                    <CheckBox x:Name="IsClosableCheckBox" Content="IsClosable" 
+                        Click="IsClosableCheckBox_Click" IsChecked="True"/>
+
                 </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
@@ -66,10 +70,9 @@
                         Text="See TabViewWindowingSamplePage.xaml and *.cs files to see the complete code"
                         TextWrapping="Wrap" /> -->
 
-                    <TabControl
-                        MinHeight="475"
+                    <TabControl MinHeight="475"
                         Loaded="TabView_Loaded"
-                        SelectedIndex="0">
+                        SelectedIndex="0" ui:TabControlHelper.TabCloseRequested="tabControl_TabCloseRequested">
                         <ui:TabControlHelper.TabStripHeader>
                             <TextBlock
                                 Margin="8,6"
@@ -103,7 +106,8 @@
                         MinWidth="490"
                         MinHeight="0"
                         SelectedIndex="0"
-                        ui:TabControlHelper.IsAddTabButtonVisible="False">
+                        ui:TabControlHelper.IsAddTabButtonVisible="False"
+                        ui:TabControlHelper.TabCloseRequested="tabControl_TabCloseRequested">
                         <TabControl.Items>
                             <TabItem Header="CMD Prompt">
                                 <ui:TabItemHelper.Icon>
@@ -127,7 +131,8 @@
         </local:ControlExample>
 
         <local:ControlExample x:Name="Example4" HeaderText="A TabControl with accent colored TabStrip background">
-            <TabControl x:Name="tabControl3" ui:ThemeManager.HasThemeResources="True">
+            <TabControl x:Name="tabControl3" ui:ThemeManager.HasThemeResources="True"
+                ui:TabControlHelper.TabCloseRequested="tabControl_TabCloseRequested">
                 <TabControl.Resources>
                     <ui:ResourceDictionaryEx>
                         <ui:ResourceDictionaryEx.ThemeDictionaries>
@@ -145,7 +150,8 @@
 
         
         <local:ControlExample x:Name="Example5" HeaderText="A TabControl with customized headers">
-            <TabControl x:Name="tabControl2">
+            <TabControl x:Name="tabControl2"
+                ui:TabControlHelper.TabCloseRequested="tabControl_TabCloseRequested">
                 <TabControl.Resources>
                     <sys:Double x:Key="TabViewItemHeaderFontSize">24</sys:Double>
                     <sys:Double x:Key="TabViewItemHeaderIconSize">32</sys:Double>
@@ -158,37 +164,57 @@
             </TabControl>
         </local:ControlExample>
 
-        <local:ControlExample x:Name="Example6" HeaderText="A TabControl with customized closing handler">
+        <local:ControlExample x:Name="Example6" HeaderText="A TabControl with closing handler">
             <ikw:SimpleStackPanel>
                 <TextBlock TextWrapping="Wrap" Margin="0,0,0,12">
-                    The <Bold>TabControl</Bold> now supports intercepting tab close requests via the 
-                    <Bold>TabItemCloseRequest</Bold> event. This allows preventing the close operation 
-                    dynamically - for example, to prompt the user for confirmation or prevent closing under certain conditions. 
-                    Simply handle the event and set <Bold>e.Cancel = true</Bold> to keep the tab open.
+                    The <Bold>TabControl</Bold> comes with a close button. To handle the close request,
+                    subscribe to the <Bold>TabCloseRequested</Bold> event. In the event handler, you should
+                    remove the tab from the TabControl's Items collection to close it if desired.
+                    Feel free to implement custom logic such as confirmation dialogs or saving states.
+                    <LineBreak/><LineBreak/>
+                    You can set <Bold>TabItem.(ui:TabItemHelper.IsClosable)</Bold> attached property to <Bold>False</Bold> to hide and disable
+                    the close button for specific tabs (or all tabs).
                 </TextBlock>
                 
-                <TabControl x:Name="tabControl6" MinHeight="160">
-                    <TabItem x:Name="TabItem_Example6_Tab1" Header="Closable">
+                <TabControl x:Name="tabControl6" MinHeight="160"
+                    ui:TabControlHelper.TabCloseRequested="tabControl6_TabCloseRequested">
+                    <TabItem x:Name="TabItem_Example6_Tab1" Header="Closable 1">
+                        <TextBlock TextWrapping="Wrap" Margin="12">
+                            This tab can be closed normally by clicking the close button. When the close button is clicked,
+                            codebehind will handle the <Bold>TabCloseRequested</Bold> event and remove this tab from the TabControl's
+                            Items collection.
+                        </TextBlock>
+                    </TabItem>
+                    <TabItem x:Name="TabItem_Example6_Tab2" Header="Closable 2">
                         <TextBlock TextWrapping="Wrap" Margin="12">
-                            This tab demonstrates the default close behavior. When the close button is clicked, the tab closes immediately 
-                            without any interception or confirmation. TabItemCloseRequest handler will not do anything for this tab.
+                            This tab can be closed normally by clicking the close button. When the close button is clicked,
+                            codebehind will handle the <Bold>TabCloseRequested</Bold> event and remove this tab from the TabControl's
+                            Items collection.
                         </TextBlock>
                     </TabItem>
-                    <TabItem x:Name="TabItem_Example6_Tab2" Header="Confirm To Close" Tag="ConfirmClose">
+                    <TabItem x:Name="TabItem_Example6_Tab3" Header="Confirm To Close" Tag="ConfirmClose">
                         <TextBlock TextWrapping="Wrap" Margin="12">
-                            This tab intercepts the close request using the <Bold>TabItemCloseRequest</Bold> event. 
-                            When the close button is clicked, a confirmation dialog appears. If the user chooses to cancel, 
-                            the tab remains open. This is useful for preserving unsaved work or preventing accidental closure.
+                            This tab requires confirmation before closing. When the close button is clicked,
+                            the <Bold>TabItemCloseRequest</Bold> event is handled in codebehind, prompting the user
+                            with a confirmation dialog. If the user confirms, the tab is closed; otherwise, the event 
+                            handler will not do anything, leaving the tab open.
                         </TextBlock>
                     </TabItem>
-                    <TabItem x:Name="TabItem_Example6_Tab3" Header="DON'T TOUCH ME!" Tag="NiceTry">
+                    <TabItem x:Name="TabItem_Example6_Tab4" Header="DON'T TOUCH ME!" Tag="NiceTry">
                         <TextBlock TextWrapping="Wrap" Margin="12">
-                            This tab is configured to reject all close requests. The <Bold>TabItemCloseRequest</Bold> event is handled 
-                            and <Bold>e.Cancel</Bold> is always set to <Bold>true</Bold>, making the tab effectively non-closable. 
-                            <LineBreak/>
-                            This is not usually recommended for user experience, but it demonstrates the flexibility of the event handling.
+                            This tab cannot be closed. When the close button is clicked, the <Bold>TabItemCloseRequest</Bold>
+                            handler doesn't do anything, preventing the tab from being closed.
                         </TextBlock>
                     </TabItem>
+                    <TabItem x:Name="TabItem_Example6_Tab5" Header="Unclosable (nobutt) "
+                        ui:TabItemHelper.IsClosable="False">
+                        <TextBlock TextWrapping="Wrap" Margin="12">
+                            This tab cannot be closed because the close button is hidden and disabled by setting
+                            <Bold>ui:TabItemHelper.IsClosable</Bold> attached property to <Bold>False</Bold>,
+                            thus, the close button is not shown.
+                        </TextBlock>
+                    </TabItem>
+
                 </TabControl>
 
                 <Button x:Name="Button_Example6_ResetTabs" Content="Reset Tabs" Click="Button_Example6_ResetTabs_Click" HorizontalAlignment="Left" Margin="0,12,0,0"/>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml.cs b/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml.cs
index 082626c5..8ef28094 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml.cs
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Windows/TabViewPage.xaml.cs
@@ -87,29 +87,6 @@ private void RadioButtons_SelectionChanged(object sender, SelectionChangedEventA
         private void InitializeExample6()
         {
             ResetExample6Tabs();
-
-            tabControl.RegisterTabClosingEvent((menuControl, e) =>
-            {
-                if (e.Tab.Tag is "ConfirmClose")
-                {
-                    var msgResult = MessageBox.Show("Do you want to close this tab?", "Confirm", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-                    if (msgResult != MessageBoxResult.OK)
-                    {
-                        e.Cancel = true;
-                        return;
-                    }
-                }
-                else if (e.Tab.Tag is "NiceTry")
-                {
-                    e.Cancel = true;
-
-                    if ((e.Tab.Header as string) != NiceTry)
-                        e.Tab.Header = NiceTry;
-                    else e.Tab.Header = "You can't close me!";
-
-                    return;
-                }
-            });
         }
 
         private void ResetExample6Tabs()
@@ -118,8 +95,10 @@ private void ResetExample6Tabs()
             tabControl6.Items.Add(TabItem_Example6_Tab1);
             tabControl6.Items.Add(TabItem_Example6_Tab2);
             tabControl6.Items.Add(TabItem_Example6_Tab3);
+            tabControl6.Items.Add(TabItem_Example6_Tab4);
+            tabControl6.Items.Add(TabItem_Example6_Tab5);
 
-            TabItem_Example6_Tab3.Header = "DON'T TOUCH ME!";
+            TabItem_Example6_Tab4.Header = "DON'T TOUCH ME!";
         }
 
         private void Button_Example6_ResetTabs_Click(object sender, RoutedEventArgs e)
@@ -243,45 +222,95 @@ public void UpdateExampleCode()
 ";
 
         public string Example6Xaml => $@"
-<TabControl x:Name=""tabControl6"">
-    <TabItem x:Name=""TabItem_Example6_Tab1"" Header=""Closable""/>
-    <TabItem x:Name=""TabItem_Example6_Tab2"" Header=""Confirm To Close"" Tag=""ConfirmClose""/>
-    <TabItem x:Name=""TabItem_Example6_Tab3"" Header=""DON'T TOUCH ME!"" Tag=""NiceTry""/>
+<TabControl x:Name=""tabControl6"" ui:TabControlHelper.TabCloseRequested=""tabControl6_TabCloseRequested"">
+    <TabItem x:Name=""TabItem_Example6_Tab1"" Header=""Closable 1"" />
+    <TabItem x:Name=""TabItem_Example6_Tab2"" Header=""Closable 2"" />
+    <TabItem x:Name=""TabItem_Example6_Tab3"" Header=""Confirm To Close"" Tag=""ConfirmClose"" />
+    <TabItem x:Name=""TabItem_Example6_Tab4"" Header=""DON'T TOUCH ME!"" Tag=""NiceTry"" />
+    <TabItem x:Name=""TabItem_Example6_Tab5"" Header=""Unclosable (nobutt) "" />
 </TabControl>
 ";
 
         public string Example6CS => $@"
-// Invoked during the constructor after InitializeComponent or at any later time
-private void InitializeExample6()
+private void tabControl6_TabCloseRequested(object sender, TabViewTabCloseRequestedEventArgs e)
 {{
-    ResetExample6Tabs();
+    var doClose = true;
 
-    tabControl.RegisterTabClosingEvent((menuControl, e) =>
+    if (e.Tab.Tag is ""ConfirmClose"")
     {{
-        if (e.Tab.Tag is ""ConfirmClose"")
+        var msgResult = MessageBox.Show(""Do you want to close this tab?"", ""Confirm"", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+        if (msgResult != MessageBoxResult.OK)
         {{
-            var msgResult = MessageBox.Show(""Do you want to close this tab?"", ""Confirm"", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-            if (msgResult != MessageBoxResult.OK)
-            {{
-                e.Cancel = true;
-                return;
-            }}
+            doClose = false;
+            return;
         }}
-        else if (e.Tab.Tag is ""NiceTry"")
-        {{
-            e.Cancel = true;
+    }}
+    else if (e.Tab.Tag is ""NiceTry"")
+    {{
+        doClose = false;
 
-            if ((e.Tab.Header as string) != NiceTry)
-                e.Tab.Header = NiceTry;
-            else e.Tab.Header = ""You can't close me!"";
+        if ((e.Tab.Header as string) != NiceTry)
+            e.Tab.Header = NiceTry;
+        else e.Tab.Header = ""You can't close me!"";
 
-            return;
-        }}
-    }});
+        return;
+    }}
+            
+    if (doClose && sender is TabControl tabControl)
+    {{
+        // Do remove the tab in order to close it.
+        tabControl.Items.Remove(e.Tab);
+    }}
 }}
 ";
 
+        private void IsClosableCheckBox_Click(object sender, RoutedEventArgs e)
+        {
+            var isClosable = IsClosableCheckBox.IsChecked == true;
+
+            foreach (TabItem tab in tabControl.Items)
+            {
+                TabItemHelper.SetIsClosable(tab, isClosable);
+            }
+        }
+
 
         #endregion
+
+        private void tabControl_TabCloseRequested(object sender, TabViewTabCloseRequestedEventArgs e)
+        {
+            MessageBox.Show($"You are closing tab: {e.Tab.Header}", "Tab Close Requested", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void tabControl6_TabCloseRequested(object sender, TabViewTabCloseRequestedEventArgs e)
+        {
+            var doClose = true;
+
+            if (e.Tab.Tag is "ConfirmClose")
+            {
+                var msgResult = MessageBox.Show("Do you want to close this tab?", "Confirm", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+                if (msgResult != MessageBoxResult.OK)
+                {
+                    doClose = false;
+                    return;
+                }
+            }
+            else if (e.Tab.Tag is "NiceTry")
+            {
+                doClose = false;
+
+                if ((e.Tab.Header as string) != NiceTry)
+                    e.Tab.Header = NiceTry;
+                else e.Tab.Header = "You can't close me!";
+
+                return;
+            }
+            
+            if (doClose && sender is TabControl tabControl)
+            {
+                // Do remove the tab in order to close it.
+                tabControl.Items.Remove(e.Tab);
+            }
+        }
     }
 }
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabControlHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabControlHelper.cs
index 490f3c44..39bb9ed8 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabControlHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabControlHelper.cs
@@ -302,24 +302,51 @@ public static void SetIsAddTabButtonVisible(TabControl element, bool value)
 
         #endregion
 
-        #region TabControlHelperEvents
+
+        #region TabCloseRequestedEvent
 
         /// <summary>
-        /// Identifies the TabControlHelperEvents dependency property.
+        /// The event is raised when a tab's close button is clicked.
+        /// 
         /// </summary>
-        public static readonly DependencyProperty TabControlHelperEventsProperty = DependencyProperty.RegisterAttached(
-            "TabControlHelperEvents",
-            typeof(TabControlHelperEvents),
-            typeof(TabControlHelper),
-            new PropertyMetadata(new TabControlHelperEvents()));
+        public static readonly RoutedEvent TabCloseRequestedEvent = EventManager.RegisterRoutedEvent(
+            "TabCloseRequested",
+            RoutingStrategy.Direct,
+            typeof(EventHandler<TabViewTabCloseRequestedEventArgs>),
+            typeof(TabControlHelper));
+
+        public static void AddTabCloseRequestedHandler(TabControl tabControl, EventHandler<TabViewTabCloseRequestedEventArgs> handler)
+        {
+            tabControl.AddHandler(TabCloseRequestedEvent, handler);
+        }
+        public static void RemoveTabCloseRequestedHandler(TabControl tabControl, EventHandler<TabViewTabCloseRequestedEventArgs> handler)
+        {
+            tabControl.RemoveHandler(TabCloseRequestedEvent, handler);
+        }
+
+        #endregion
+
+        #region AddTabButtonClickEvent
+
+        public static readonly RoutedEvent AddTabButtonClickEvent = EventManager.RegisterRoutedEvent(
+            "AddTabButtonClick",
+            RoutingStrategy.Direct,
+            typeof(RoutedEventHandler),
+            typeof(TabControlHelper));
+
+        public static void AddAddTabButtonClickHandler(TabControl tabControl, RoutedEventHandler handler)
+        {
+            tabControl.AddHandler(AddTabButtonClickEvent, handler);
+        }
 
-        public static TabControlHelperEvents GetTabControlHelperEvents(TabControl element)
+        public static void RemoveAddTabButtonClickHandler(TabControl tabControl, RoutedEventHandler handler)
         {
-            return (TabControlHelperEvents)element.GetValue(TabControlHelperEventsProperty);
+            tabControl.RemoveHandler(AddTabButtonClickEvent, handler);
         }
 
         #endregion
 
+
         #region AddTabButtonCommand
 
         /// <summary>
@@ -393,7 +420,8 @@ private static void OnLoaded(object sender, RoutedEventArgs e)
             {
                 void OnAddButtonClick(object sender, RoutedEventArgs e)
                 {
-                    GetTabControlHelperEvents(TabControl).AddTabButtonClick?.Invoke(TabControl, e);
+                    RoutedEventArgs args = new RoutedEventArgs(AddTabButtonClickEvent, TabControl);
+                    TabControl.RaiseEvent(args);
                 }
                 AddButton.Click += OnAddButtonClick;
             }
@@ -439,10 +467,11 @@ public enum TabViewCloseButtonOverlayMode
         Always = 2,
     }
 
+
     /// <summary>
     /// Provides data for a tab close event.
     /// </summary>
-    public sealed class TabViewTabCloseRequestedEventArgs
+    public class TabViewTabCloseRequestedEventArgs : RoutedEventArgs
     {
         /// <summary>
         /// Gets a value that represents the data context for the tab in which a close is being requested.
@@ -454,31 +483,11 @@ public sealed class TabViewTabCloseRequestedEventArgs
         /// </summary>
         public TabItem Tab { get; private set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the event should be canceled.
-        /// </summary>
-        public bool Cancel { get; set; }
-
-        internal TabViewTabCloseRequestedEventArgs(object item, TabItem tab)
+        internal TabViewTabCloseRequestedEventArgs(RoutedEvent routedEvent, object item, TabItem tab)
+            : base(routedEvent)
         {
             Item = item;
             Tab = tab;
         }
     }
-
-    /// <summary>
-    /// Events for TabControlHelper.
-    /// </summary>
-    public class TabControlHelperEvents
-    {
-        /// <summary>
-        /// Occurs when the add (+) tab button has been clicked.
-        /// </summary>
-        public TypedEventHandler<TabControl, object> AddTabButtonClick;
-
-        /// <summary>
-        /// Raised when the user attempts to close a Tab via clicking the x-to-close button, CTRL+F4, or mousewheel.
-        /// </summary>
-        public TypedEventHandler<TabControl, TabViewTabCloseRequestedEventArgs> TabCloseRequested;
-    }
-}
+}
\ No newline at end of file
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabItemHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabItemHelper.cs
index e2c3c358..e077ea43 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabItemHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/TabItemHelper.cs
@@ -127,25 +127,14 @@ private static void SetTabGeometry(TabItem tabItem, object value)
 
         #endregion
 
-        #region CloseButtonOverlayMode
+        #region IsAddTabButtonVisible
 
-        public static readonly DependencyProperty CloseButtonOverlayModeProperty = DependencyProperty.RegisterAttached(
-            "CloseButtonOverlayMode",
-            typeof(TabViewCloseButtonOverlayMode),
-            typeof(TabItemHelper),
-            null);
+        public static readonly DependencyProperty IsAddTabButtonVisibleProperty = DependencyProperty.RegisterAttached(
+            "IsAddTabButtonVisible",
 
-        public static TabViewCloseButtonOverlayMode GetCloseButtonOverlayMode(TabControl element)
-        {
-            return (TabViewCloseButtonOverlayMode)element.GetValue(CloseButtonOverlayModeProperty);
-        }
 
-        #endregion
 
-        #region IsAddTabButtonVisible
 
-        public static readonly DependencyProperty IsAddTabButtonVisibleProperty = DependencyProperty.RegisterAttached(
-            "IsAddTabButtonVisible",
             typeof(bool),
             typeof(TabItemHelper),
             new PropertyMetadata(false));
@@ -157,112 +146,105 @@ public static bool GetIsAddTabButtonVisible(TabItem element)
 
         #endregion
 
-        #region IsAddTabButtonVisible
+        #region CloseTabButtonCommand
 
-        public static readonly DependencyProperty CloseTabButtonCommandProperty = DependencyProperty.RegisterAttached(
+        internal static readonly DependencyProperty CloseTabButtonCommandProperty = DependencyProperty.RegisterAttached(
             "CloseTabButtonCommand",
             typeof(ICommand),
             typeof(TabItemHelper),
             null);
 
-        public static ICommand GetCloseTabButtonCommand(TabItem element)
+        internal static ICommand GetCloseTabButtonCommand(TabItem element)
         {
             return (ICommand)element.GetValue(CloseTabButtonCommandProperty);
         }
 
-        private static void SetCloseTabButtonCommand(TabItem tabItem, ICommand value)
+        internal static void SetCloseTabButtonCommand(TabItem tabItem, ICommand value)
         {
             tabItem.SetValue(CloseTabButtonCommandProperty, value);
         }
 
         #endregion
 
-        #region TabItemHelperEvents
+        #region CloseButtonOverlayMode
+
+        public static readonly DependencyProperty CloseButtonOverlayModeProperty = DependencyProperty.RegisterAttached(
+            "CloseButtonOverlayMode",
+            typeof(TabViewCloseButtonOverlayMode),
+            typeof(TabItemHelper),
+            null);
+
+        public static TabViewCloseButtonOverlayMode GetCloseButtonOverlayMode(TabControl element)
+        {
+            return (TabViewCloseButtonOverlayMode)element.GetValue(CloseButtonOverlayModeProperty);
+        }
+
+        #endregion
+
+        #region IsClosable
 
         /// <summary>
-        /// Identifies the TabItemHelperEvents dependency property.
+        /// Identifies the IsClosable dependency property that indicates whether the tab shows a close button. true if the tab shows a close button; otherwise, false. The default is true.
         /// </summary>
-        public static readonly DependencyProperty TabItemHelperEventsProperty = DependencyProperty.RegisterAttached(
-            "TabItemHelperEvents",
-            typeof(TabItemHelperEvents),
+        public static readonly DependencyProperty IsClosableProperty = DependencyProperty.RegisterAttached(
+            "IsClosable",
+            typeof(bool),
             typeof(TabItemHelper),
-            new PropertyMetadata(new TabItemHelperEvents()));
+            new PropertyMetadata(true));
+
+        public static bool GetIsClosable(TabItem element)
+        {
+            return (bool)element.GetValue(IsClosableProperty);
+        }
 
-        public static TabItemHelperEvents GetTabItemHelperEvents(TabItem element)
+        public static void SetIsClosable(TabItem element, bool value)
         {
-            return (TabItemHelperEvents)element.GetValue(TabItemHelperEventsProperty);
+            element.SetValue(IsClosableProperty, value);
         }
 
         #endregion
 
+
+        #region CloseRequestedEvent
+
+        public static readonly RoutedEvent CloseRequestedEvent = EventManager.RegisterRoutedEvent(
+            "CloseRequested",
+            RoutingStrategy.Bubble,
+            typeof(EventHandler<TabViewTabCloseRequestedEventArgs>),
+            typeof(TabItemHelper));
+
+        public static void AddCloseRequestedHandler(TabItem tabItem, EventHandler<TabViewTabCloseRequestedEventArgs> handler)
+        {
+            tabItem.AddHandler(CloseRequestedEvent, handler);
+        }
+
+        public static void RemoveCloseRequestedHandler(TabItem tabItem, EventHandler<TabViewTabCloseRequestedEventArgs> handler)
+        {
+            tabItem.RemoveHandler(CloseRequestedEvent, handler);
+        }
+
+
+        #endregion
+
+
         private static void OnLoaded(object sender, RoutedEventArgs e)
         {
             TabItem TabItem = sender as TabItem;
             UpdateTabGeometry(TabItem);
             UpdateHeaderTooltip(TabItem);
             UpdateCloseButtonTooltip(TabItem);
+            UpdateCloseButtonEvents(TabItem);
 
             TabControl TabControl = TabItem.FindAscendant<TabControl>();
 
             if (TabControl != null)
             {
-                TabItem.SetBinding(IsAddTabButtonVisibleProperty, new Binding
-                {
-                    Source = TabControl,
-                    Mode = BindingMode.OneWay,
-                    Path = new PropertyPath(TabControlHelper.IsAddTabButtonVisibleProperty)
-                });
                 TabItem.SetBinding(CloseButtonOverlayModeProperty, new Binding
                 {
                     Source = TabControl,
                     Mode = BindingMode.OneWay,
                     Path = new PropertyPath(TabControlHelper.CloseButtonOverlayModeProperty)
                 });
-
-                var CloseTabButtonCommand = new RoutedCommand()
-                {
-                    InputGestures = { new KeyGesture(Key.F4, ModifierKeys.Control) }
-                };
-
-                void ExecutedCustomCommand(object sender, ExecutedRoutedEventArgs e)
-                {
-                    var eventArgs = new TabViewTabCloseRequestedEventArgs(TabItem.Content, TabItem);
-                    TabControlHelper.GetTabControlHelperEvents(TabControl).TabCloseRequested?.Invoke(TabControl, eventArgs);
-                    if (eventArgs.Cancel)
-                    {
-                        return;
-                    }
-
-                    GetTabItemHelperEvents(TabItem).CloseRequested?.Invoke(TabItem, new TabViewTabCloseRequestedEventArgs(TabItem.Content, TabItem));
-                    if (TabControl.SelectedItem == TabItem)
-                    {
-                        TabControl.SelectedIndex--;
-                    }
-
-                    if (TabControl.ItemsSource is null)
-                    {
-                        TabControl.Items.Remove(sender);
-                    }
-                    
-                    e.Handled = true;
-                }
-
-                void CanExecuteCustomCommand(object sender, CanExecuteRoutedEventArgs e)
-                {
-                    if (TabControl != null)
-                    {
-                        e.CanExecute = true;
-                    }
-                    else
-                    {
-                        e.CanExecute = false;
-                    }
-                    e.Handled = true;
-                }
-
-                CommandBinding CloseTabButtonCommandBinding = new CommandBinding(CloseTabButtonCommand, ExecutedCustomCommand, CanExecuteCustomCommand);
-                TabItem.CommandBindings.Add(CloseTabButtonCommandBinding);
-                SetCloseTabButtonCommand(TabItem, CloseTabButtonCommand);
             }
         }
 
@@ -282,6 +264,62 @@ private static void UpdateHeaderTooltip(TabItem TabItem)
             }
         }
 
+        private static readonly RoutedCommand CloseTabButtonCommand = new RoutedCommand()
+        {
+            InputGestures = { new KeyGesture(Key.F4, ModifierKeys.Control) }
+        };
+
+        private static void UpdateCloseButtonEvents(TabItem item)
+        {
+            TabControl tabControl = item.FindAscendant<TabControl>();
+
+            void ExecutedCustomCommand(object sender, ExecutedRoutedEventArgs e)
+            {
+                var eargs = new TabViewTabCloseRequestedEventArgs(TabControlHelper.TabCloseRequestedEvent, item.Content, item);
+                tabControl.RaiseEvent(eargs);
+
+                // According to WinUI 3 behavior, the TabView's CloseRequested will be fired first,
+                // then the TabItem's CloseRequested will be fired after that.
+                // Since WinUI 3 does not have a 'routed' event for TabItem CloseRequested, we may apply
+                // the same logic here, but adopting a handled check for TabItem CloseRequested event.
+                // If this is inappropriate, feel free to propose a change.
+                if (!eargs.Handled)
+                {
+                    item.RaiseEvent(new TabViewTabCloseRequestedEventArgs(CloseRequestedEvent, item.Content, item));
+                }
+
+                e.Handled = true;
+            }
+
+            void CanExecuteCustomCommand(object sender, CanExecuteRoutedEventArgs e)
+            {
+                if (tabControl != null)
+                {
+                    e.CanExecute = true;
+                }
+                else
+                {
+                    e.CanExecute = false;
+                }
+                e.Handled = true;
+            }
+
+            CommandBinding closeTabButtonCommandBinding = new CommandBinding(CloseTabButtonCommand, ExecutedCustomCommand, CanExecuteCustomCommand);
+            item.CommandBindings.Add(closeTabButtonCommandBinding);
+            SetCloseTabButtonCommand(item, CloseTabButtonCommand);
+
+            // Cleanup previous bindings
+            foreach (var binding in item.CommandBindings)
+            {
+                if (binding is CommandBinding cmb && cmb.Command == CloseTabButtonCommand
+                    && cmb != closeTabButtonCommandBinding)
+                {
+                    item.CommandBindings.Remove(cmb);
+                    break;
+                }
+            }
+        }
+
         private static void UpdateCloseButtonTooltip(TabItem item)
         {
             if (item?.GetTemplateChild<FrameworkElement>("CloseButton") is not { } closeButton)
@@ -326,15 +364,4 @@ private static void UpdateTabGeometry(TabItem tabItem)
             catch { }
         }
     }
-
-    /// <summary>
-    /// Events for TabItemHelper.
-    /// </summary>
-    public class TabItemHelperEvents
-    {
-        /// <summary>
-        /// Raised when the user attempts to close the TabViewItem via clicking the x-to-close button, CTRL+F4, or mousewheel.
-        /// </summary>
-        public TypedEventHandler<TabItem, TabViewTabCloseRequestedEventArgs> CloseRequested;
-    }
 }
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/TabItemExtension.cs b/source/iNKORE.UI.WPF.Modern/Controls/TabItemExtension.cs
deleted file mode 100644
index 10ecaf1a..00000000
--- a/source/iNKORE.UI.WPF.Modern/Controls/TabItemExtension.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Windows.Controls;
-using iNKORE.UI.WPF.Modern.Common;
-using iNKORE.UI.WPF.Modern.Controls.Helpers;
-
-namespace iNKORE.UI.WPF.Modern.Controls;
-
-public static class TabItemExtension
-{
-    public static void RegisterTabClosingEvent(this TabControl tabControl, TypedEventHandler<TabControl, TabViewTabCloseRequestedEventArgs> handler)
-    {
-        if (tabControl.GetValue(TabControlHelper.TabControlHelperEventsProperty) is not TabControlHelperEvents eventHelper)
-        {
-            return;
-        }
-
-        eventHelper.TabCloseRequested += handler;
-    }
-
-    public static void UnregisterTabClosingEvent(this TabControl tabControl, TypedEventHandler<TabControl, TabViewTabCloseRequestedEventArgs> handler)
-    {
-        if (tabControl.GetValue(TabControlHelper.TabControlHelperEventsProperty) is not TabControlHelperEvents eventHelper)
-        {
-            return;
-        }
-
-        eventHelper.TabCloseRequested -= handler;
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/TabControl.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/TabControl.xaml
index d5a9a0c4..8adb1a73 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/TabControl.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/TabControl.xaml
@@ -282,8 +282,7 @@
                             Foreground="{DynamicResource TabViewItemHeaderForeground}"
                             RecognizesAccessKey="True"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Button
-                            x:Name="CloseButton"
+                        <Button x:Name="CloseButton"
                             Grid.Column="2"
                             Margin="{DynamicResource TabViewItemHeaderCloseMargin}"
                             Command="{TemplateBinding chelper:TabItemHelper.CloseTabButtonCommand}"
@@ -292,8 +291,7 @@
                             Style="{StaticResource TabViewCloseButtonStyle}"
                             Visibility="Collapsed">
                             <Button.InputBindings>
-                                <KeyBinding
-                                    Key="F4"
+                                <KeyBinding Key="F4"
                                     Command="{TemplateBinding chelper:TabItemHelper.CloseTabButtonCommand}"
                                     Modifiers="Ctrl" />
                             </Button.InputBindings>
@@ -358,14 +356,14 @@
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="Auto" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="Always" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
@@ -373,7 +371,7 @@
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="True" />
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="OnPointerOver" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
@@ -381,7 +379,7 @@
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsSelected" Value="True" />
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="OnPointerOver" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
@@ -520,14 +518,14 @@
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="Auto" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="Always" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
@@ -535,7 +533,7 @@
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="True" />
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="OnPointerOver" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />
@@ -543,7 +541,7 @@
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsSelected" Value="True" />
-                    <Condition Property="chelper:TabItemHelper.IsAddTabButtonVisible" Value="True" />
+                    <Condition Property="chelper:TabItemHelper.IsClosable" Value="True" />
                     <Condition Property="chelper:TabItemHelper.CloseButtonOverlayMode" Value="OnPointerOver" />
                 </MultiTrigger.Conditions>
                 <Setter TargetName="CloseButton" Property="Visibility" Value="Visible" />