Add x:ClassModifier="internal"

src/AtomUI.Controls.DataGrid/Themes/DataGridCellTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridCell}" TargetType="atom:DataGridCell">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridColumnGroupHeaderTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridColumnGroupHeader}" TargetType="atom:DataGridColumnGroupHeader">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridColumnHeaderTheme.axaml

@@ -4,6 +4,7 @@
               xmlns:converters="using:AtomUI.Controls.Converters"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.DataGridColumnHeaderTheme"
+              x:ClassModifier="internal"
               xmlns:atom="https://atomui.net">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:DataGridColumnHeader">

src/AtomUI.Controls.DataGrid/Themes/DataGridFilterIndicatorTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal"
     xmlns:themes="using:AtomUI.Controls.Themes">
     <ControlTheme x:Key="{x:Type atom:DataGridFilterIndicator}" TargetType="atom:DataGridFilterIndicator">
         <ControlTheme.BasedOn>

src/AtomUI.Controls.DataGrid/Themes/DataGridHeaderViewItemTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridHeaderViewItem}" TargetType="atom:DataGridHeaderViewItem">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridOperationButtons.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:dataGridLocalization="clr-namespace:AtomUI.Controls.DataGridLocalization"
+    x:ClassModifier="internal"
+    xmlns:dataGridLocalization="using:AtomUI.Controls.DataGridLocalization"
     xmlns:localization="clr-namespace:AtomUI.Controls.Localization;assembly=AtomUI.Controls">
     <ControlTheme x:Key="{x:Type atom:DataGridOperationButtons}"
                   TargetType="atom:DataGridOperationButtons">

src/AtomUI.Controls.DataGrid/Themes/DataGridRowExpander.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridRowExpander}" TargetType="atom:DataGridRowExpander">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridRowGroupHeaderTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridRowGroupHeader}" TargetType="atom:DataGridRowGroupHeader">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridRowHeaderTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridRowHeader}" TargetType="atom:DataGridRowHeader">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridRowReorderHandle.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridRowReorderHandle}" TargetType="atom:DataGridRowReorderHandle">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridRowTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridRow}" TargetType="atom:DataGridRow">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridSortIndicatorTheme.axaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridSortIndicator}" TargetType="atom:DataGridSortIndicator">
         <Setter Property="Template">

src/AtomUI.Controls.DataGrid/Themes/DataGridTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <converters:DataGridHeaderCornerRadiusConverter x:Key="DataGridHeaderCornerRadiusConverter" />
     <converters:DataGridUniformBorderThicknessToScalarConverter x:Key="DataGridUniformBorderThicknessToScalarConverter" />

src/AtomUI.Controls.DataGrid/Themes/DataGridTopLeftColumnHeaderTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:DataGridTopLeftColumnHeader}" TargetType="atom:DataGridTopLeftColumnHeader">
         <ControlTheme.BasedOn>

src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterMenuItemTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal"
     xmlns:themes="using:AtomUI.Controls.Themes">
     <ControlTheme x:Key="{x:Type atom:DataGridFilterMenuItem}" TargetType="atom:DataGridFilterMenuItem">
         <ControlTheme.BasedOn>

src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterTreeItemTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal"
     xmlns:themes="using:AtomUI.Controls.Themes">
     <ControlTheme x:Key="{x:Type atom:DataGridFilterTreeItem}" TargetType="atom:DataGridFilterTreeItem">
         <ControlTheme.BasedOn>

src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridMenuFilterFlyoutPresenterTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal"
     xmlns:themes="using:AtomUI.Controls.Themes"
     xmlns:localization="clr-namespace:AtomUI.Controls.Localization;assembly=AtomUI.Controls">
     <ControlTheme x:Key="{x:Type atom:DataGridMenuFilterFlyoutPresenter}"

src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridTreeFilterFlyoutPresenterTheme.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal"
     xmlns:themes="using:AtomUI.Controls.Themes"
     xmlns:localization="clr-namespace:AtomUI.Controls.Localization;assembly=AtomUI.Controls">
     <ControlTheme x:Key="{x:Type atom:DataGridTreeFilterFlyoutPresenter}"

src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml

@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.AddOnDecoratedBoxTheme"
-              TargetType="atom:AddOnDecoratedBox">
+              TargetType="atom:AddOnDecoratedBox"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:AddOnDecoratedBox">
             <Grid

src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxThemes.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <themes:AddOnDecoratedBoxTheme x:Key="{x:Type atom:AddOnDecoratedBox}" TargetType="atom:AddOnDecoratedBox"/>
     <themes:AddOnDecoratedInnerBoxTheme x:Key="{x:Type atom:AddOnDecoratedInnerBox}" TargetType="atom:AddOnDecoratedInnerBox"/>
 </ResourceDictionary>

src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedInnerBoxTheme.axaml

@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.AddOnDecoratedInnerBoxTheme"
-              TargetType="atom:AddOnDecoratedInnerBox">
+              TargetType="atom:AddOnDecoratedInnerBox"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:AddOnDecoratedInnerBox">
             <Panel>

src/AtomUI.Controls/AdornerLayer/Themes/AdornerLayer.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
         <Setter Property="DefaultFocusAdorner">
             <FocusAdornerTemplate>

src/AtomUI.Controls/Alert/Themes/AlertTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:Alert}" TargetType="atom:Alert">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxThemes.axaml

@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <themes:ArrowDecoratedBoxTheme x:Key="{x:Type atom:ArrowDecoratedBox}" TargetType="atom:ArrowDecoratedBox"/>
 </ResourceDictionary>

src/AtomUI.Controls/Avatar/Themes/AvatarTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:Avatar}" TargetType="atom:Avatar">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Badge/Themes/BadgeThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="CountBadgeAdornerTheme.axaml" />
         <ResourceInclude Source="DotBadgeAdornerTheme.axaml" />

src/AtomUI.Controls/Badge/Themes/CountBadgeAdornerTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:CountBadgeAdorner}" TargetType="atom:CountBadgeAdorner">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Badge/Themes/DotBadgeAdornerTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:DotBadgeAdorner}" TargetType="atom:DotBadgeAdorner">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Badge/Themes/RibbonBadgeAdorner.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:RibbonBadgeAdorner}" TargetType="atom:RibbonBadgeAdorner">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerDecoratedBoxTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ButtonSpinnerDecoratedBox}" TargetType="atom:ButtonSpinnerDecoratedBox">
         <ControlTheme.BasedOn>
             <themes:AddOnDecoratedBoxTheme TargetType="atom:ButtonSpinnerDecoratedBox" />

src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerHandle.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ButtonSpinnerHandle}" TargetType="atom:ButtonSpinnerHandle">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerInnerBoxTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ButtonSpinnerInnerBox}" TargetType="atom:ButtonSpinnerInnerBox">
         <ControlTheme.BasedOn>
             <themes:AddOnDecoratedInnerBoxTheme TargetType="atom:ButtonSpinnerInnerBox" />

src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ButtonSpinner}" TargetType="atom:ButtonSpinner">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="ButtonSpinnerDecoratedBoxTheme.axaml"/>
         <ResourceInclude Source="ButtonSpinnerInnerBoxTheme.axaml"/>

src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml

@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.BaseButtonTheme"
-              TargetType="atom:Button">
+              TargetType="atom:Button"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:Button">
             <Border Name="{x:Static atom:ButtonThemeConstants.FramePart}"

src/AtomUI.Controls/Buttons/Themes/Button/ButtonTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <themes:DefaultButtonTheme x:Key="{x:Static atom:DefaultButtonTheme.ID}" TargetType="atom:Button"/>
     <themes:PrimaryButtonTheme x:Key="{x:Static atom:PrimaryButtonTheme.ID}" TargetType="atom:Button"/>
     <themes:LinkButtonTheme x:Key="{x:Static atom:LinkButtonTheme.ID}" TargetType="atom:Button"/>

src/AtomUI.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.DefaultButtonTheme"
-              TargetType="{x:Type atom:Button}">
+              TargetType="{x:Type atom:Button}"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:BaseButtonTheme TargetType="{x:Type atom:Button}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.LinkButtonTheme"
-              TargetType="{x:Type atom:Button}">
+              TargetType="{x:Type atom:Button}"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:BaseButtonTheme TargetType="{x:Type atom:Button}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.PrimaryButtonTheme"
-              TargetType="{x:Type atom:Button}">
+              TargetType="{x:Type atom:Button}"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:BaseButtonTheme TargetType="{x:Type atom:Button}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/Button/TextButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.TextButtonTheme"
-              TargetType="{x:Type atom:Button}">
+              TargetType="{x:Type atom:Button}"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:BaseButtonTheme TargetType="{x:Type atom:Button}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/ButtonThemes.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:atom="https://atomui.net"
-                    xmlns:themes="using:AtomUI.Controls.Themes">
+                    xmlns:themes="using:AtomUI.Controls.Themes"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="Button/ButtonTheme.axaml"/>
         <ResourceInclude Source="DropdownButton/DropdownButtonThemes.axaml"/>

src/AtomUI.Controls/Buttons/Themes/DropdownButton/DefaultDropdownButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               TargetType="{x:Type atom:DropdownButton}"
-              x:Class="AtomUI.Controls.Themes.DefaultDropdownButtonTheme">
+              x:Class="AtomUI.Controls.Themes.DefaultDropdownButtonTheme"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:DefaultButtonTheme TargetType="{x:Type atom:DropdownButton}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/DropdownButton/DropdownButtonThemes.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <themes:DefaultDropdownButtonTheme x:Key="{x:Static atom:DefaultDropdownButtonTheme.ID}" TargetType="atom:DropdownButton"/>
     <themes:PrimaryDropdownButtonTheme x:Key="{x:Static atom:PrimaryDropdownButtonTheme.ID}" TargetType="atom:DropdownButton"/>
     <themes:LinkDropdownButtonTheme x:Key="{x:Static atom:LinkDropdownButtonTheme.ID}" TargetType="atom:DropdownButton"/>

src/AtomUI.Controls/Buttons/Themes/DropdownButton/LinkDropdownButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               TargetType="{x:Type atom:DropdownButton}"
-              x:Class="AtomUI.Controls.Themes.LinkDropdownButtonTheme">
+              x:Class="AtomUI.Controls.Themes.LinkDropdownButtonTheme"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:LinkButtonTheme TargetType="{x:Type atom:DropdownButton}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/DropdownButton/PrimaryDropdownButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               TargetType="{x:Type atom:DropdownButton}"
-              x:Class="AtomUI.Controls.Themes.PrimaryDropdownButtonTheme">
+              x:Class="AtomUI.Controls.Themes.PrimaryDropdownButtonTheme"
+              x:ClassModifier="internal">
       <ControlTheme.BasedOn>
         <themes:PrimaryButtonTheme TargetType="{x:Type atom:DropdownButton}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Buttons/Themes/DropdownButton/TextDropdownButtonTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               TargetType="{x:Type atom:DropdownButton}"
-              x:Class="AtomUI.Controls.Themes.TextDropdownButtonTheme">
+              x:Class="AtomUI.Controls.Themes.TextDropdownButtonTheme"
+              x:ClassModifier="internal">
 
     <ControlTheme.BasedOn>
         <themes:TextButtonTheme TargetType="{x:Type atom:DropdownButton}" />

src/AtomUI.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:HyperLinkButton}" TargetType="atom:HyperLinkButton">
 
         <Setter Property="Template">

src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.axaml

@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.IconButtonTheme"
-              TargetType="atom:IconButton">
+              TargetType="atom:IconButton"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:IconButton">
             <Border

src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.cs

@@ -2,6 +2,6 @@ using Avalonia.Styling;
 
 namespace AtomUI.Controls.Themes;
 
-public class IconButtonTheme : ControlTheme
+internal class IconButtonTheme : ControlTheme
 {
 }

src/AtomUI.Controls/Buttons/Themes/SplitButtonTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:SplitButton}" TargetType="atom:SplitButton">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Buttons/Themes/ToggleIconButtonTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ToggleIconButton}" TargetType="atom:ToggleIconButton">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Calendar/Themes/BaseCalendarButtonTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center"/>
     <ControlTheme x:Key="{x:Type atom:BaseCalendarButton}" TargetType="atom:BaseCalendarButton">
         <Setter Property="Template">

src/AtomUI.Controls/Calendar/Themes/BaseCalendarDayButtonTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center" HorizontalAlignment="Center"/>
     <ControlTheme x:Key="{x:Type atom:BaseCalendarDayButton}" TargetType="atom:BaseCalendarDayButton">
         <Setter Property="Template">

src/AtomUI.Controls/Calendar/Themes/CalendarItemTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:DoubleToGridLengthConverter x:Key="DoubleToGridLengthConverter" />
     <ControlTheme x:Key="{x:Type atom:CalendarItem}" TargetType="atom:CalendarItem">
         <Setter Property="Template">

src/AtomUI.Controls/Calendar/Themes/CalendarTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:Calendar}" TargetType="atom:Calendar">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Calendar/Themes/CalendarThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="BaseCalendarButtonTheme.axaml"/>
         <ResourceInclude Source="BaseCalendarDayButtonTheme.axaml"/>

src/AtomUI.Controls/Calendar/Themes/HeadTextButtonTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:HeadTextButton}" TargetType="atom:HeadTextButton">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/CheckBox/Themes/CheckBoxIndicator.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:CheckBoxIndicator}" TargetType="atom:CheckBoxIndicator">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="clr-namespace:AtomUI.Controls.Converters">
+    xmlns:converters="clr-namespace:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:CheckBoxIndicatorStateConverter x:Key="CheckBoxIndicatorStateConverter"/>
     <ControlTheme x:Key="{x:Type atom:CheckBox}" TargetType="atom:CheckBox">
         <Setter Property="Template">

src/AtomUI.Controls/CheckBox/Themes/CheckBoxThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="CheckBoxTheme.axaml"/>
         <ResourceInclude Source="CheckBoxIndicator.axaml"/>

src/AtomUI.Controls/Chrome/Themes/ChromeThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="TitleBar.axaml"/>
         <ResourceInclude Source="CaptionButton.axaml"/>

src/AtomUI.Controls/Collapse/Themes/CollapseItemTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center" />
     <ControlTheme x:Key="{x:Type atom:CollapseItem}" TargetType="atom:CollapseItem">
         <Setter Property="Template">

src/AtomUI.Controls/Collapse/Themes/CollapseItemThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="CollapseItemTheme.axaml"/>
         <ResourceInclude Source="CollapseTheme.axaml"/>

src/AtomUI.Controls/Collapse/Themes/CollapseTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:Collapse}" TargetType="atom:Collapse">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ComboBox/Themes/ComboBoxHandle.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ComboBoxHandle}" TargetType="atom:ComboBoxHandle">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ComboBox/Themes/ComboBoxItemTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter"
                                            VerticalAlignment="Center" />
     <ControlTheme x:Key="{x:Type atom:ComboBoxItem}" TargetType="atom:ComboBoxItem">

src/AtomUI.Controls/ComboBox/Themes/ComboBoxSpinnerInnerBoxTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ComboBoxSpinnerInnerBox}" TargetType="atom:ComboBoxSpinnerInnerBox">
         <ControlTheme.BasedOn>
             <themes:AddOnDecoratedInnerBoxTheme TargetType="atom:ComboBoxSpinnerInnerBox" />

src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:ComboBox}" TargetType="atom:ComboBox">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/ComboBox/Themes/ComboBoxThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="ComboBoxItemTheme.axaml"/>
         <ResourceInclude Source="ComboBoxSpinnerInnerBoxTheme.axaml"/>

src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarButtonTheme.axaml

@@ -3,7 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
     xmlns:calendarView="using:AtomUI.Controls.CalendarView"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center" />
     <ControlTheme x:Key="{x:Type calendarView:CalendarButton}" 
                   TargetType="calendarView:CalendarButton">

src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarDayButtonTheme.axaml

@@ -3,7 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
     xmlns:calendarView="clr-namespace:AtomUI.Controls.CalendarView"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center" HorizontalAlignment="Center"/>
     <ControlTheme x:Key="{x:Type calendarView:CalendarDayButton}" TargetType="calendarView:CalendarDayButton">
         <Setter Property="Template">

src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarItemTheme.axaml

@@ -4,7 +4,8 @@
     xmlns:atom="https://atomui.net"
     xmlns:calendarView="clr-namespace:AtomUI.Controls.CalendarView"
     x:Class="AtomUI.Controls.Themes.CalendarItemTheme"
-    TargetType="calendarView:CalendarItem">
+    TargetType="calendarView:CalendarItem"
+    x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="calendarView:CalendarItem">
             <Border

src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarTheme.axaml

@@ -4,7 +4,8 @@
     xmlns:atom="https://atomui.net"
     xmlns:calendarView="clr-namespace:AtomUI.Controls.CalendarView"
     x:Class="AtomUI.Controls.Themes.CalendarTheme"
-    TargetType="calendarView:Calendar">
+    TargetType="calendarView:Calendar"
+    x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="calendarView:Calendar">
             <Border Name="{x:Static atom:DatePickerCalendarThemeConstants.FramePart}"

src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthCalendarItemTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:calendarView="clr-namespace:AtomUI.Controls.CalendarView"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type calendarView:DualMonthCalendarItem}" TargetType="calendarView:DualMonthCalendarItem">
         <ControlTheme.BasedOn>
             <atom:CalendarItemTheme TargetType="calendarView:DualMonthCalendarItem" />

src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthRangeCalendarTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:calendarView="using:AtomUI.Controls.CalendarView">
+    xmlns:calendarView="using:AtomUI.Controls.CalendarView"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type calendarView:DualMonthRangeCalendar}" TargetType="calendarView:DualMonthRangeCalendar">
         <ControlTheme.BasedOn>
             <atom:CalendarItemTheme TargetType="calendarView:DualMonthRangeCalendar" />

src/AtomUI.Controls/DatePicker/Themes/CalendarView/RangeCalendarTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:calendarView="using:AtomUI.Controls.CalendarView">
+    xmlns:calendarView="using:AtomUI.Controls.CalendarView"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type calendarView:RangeCalendar}" TargetType="calendarView:RangeCalendar">
         <ControlTheme.BasedOn>
             <atom:CalendarTheme TargetType="calendarView:RangeCalendar" />

src/AtomUI.Controls/DatePicker/Themes/DatePickerFlyoutPresenterTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Themes"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:DatePickerFlyoutPresenter}" TargetType="atom:DatePickerFlyoutPresenter">
         <ControlTheme.BasedOn>
             <themes:ArrowDecoratedBoxTheme TargetType="atom:DatePickerFlyoutPresenter" />

src/AtomUI.Controls/DatePicker/Themes/DatePickerPresenterTheme.axaml

@@ -5,7 +5,8 @@
               xmlns:datePickerLang="using:AtomUI.Controls.DatePickerLang"
               xmlns:localization="clr-namespace:AtomUI.Controls.Localization"
               x:Class="AtomUI.Controls.Themes.DatePickerPresenterTheme"
-              TargetType="atom:DatePickerPresenter">
+              TargetType="atom:DatePickerPresenter"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:DatePickerPresenter">
             <DockPanel Name="{x:Static atom:DatePickerPresenterThemeConstants.MainLayoutPart}"

src/AtomUI.Controls/DatePicker/Themes/DatePickerTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Primitives.Themes"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:DatePicker}" TargetType="atom:DatePicker">
         <ControlTheme.BasedOn>
             <themes:InfoPickerInputTheme TargetType="atom:DatePicker" />

src/AtomUI.Controls/DatePicker/Themes/DatePickerThemes.axaml

@@ -2,7 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:atom="https://atomui.net"
                     xmlns:themes="using:AtomUI.Controls.Themes"
-                    xmlns:calendarview="using:AtomUI.Controls.CalendarView">
+                    xmlns:calendarview="using:AtomUI.Controls.CalendarView"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="CalendarView/CalendarButtonTheme.axaml"/>
         <ResourceInclude Source="CalendarView/CalendarDayButtonTheme.axaml"/>

src/AtomUI.Controls/DatePicker/Themes/DualMonthRangeDatePickerPresenterTheme.axaml

@@ -5,7 +5,8 @@
     xmlns:atom="https://atomui.net"
     xmlns:calendarview="using:AtomUI.Controls.CalendarView"
     xmlns:datePickerLang="using:AtomUI.Controls.DatePickerLang"
-    xmlns:localization="clr-namespace:AtomUI.Controls.Localization">
+    xmlns:localization="clr-namespace:AtomUI.Controls.Localization"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:DualMonthRangeDatePickerPresenter}"
                   TargetType="atom:DualMonthRangeDatePickerPresenter">
         <ControlTheme.BasedOn>

src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerFlyoutPresenterTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Themes"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:RangeDatePickerFlyoutPresenter}" TargetType="atom:RangeDatePickerFlyoutPresenter">
         <ControlTheme.BasedOn>
             <themes:ArrowDecoratedBoxTheme TargetType="atom:RangeDatePickerFlyoutPresenter" />

src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Primitives.Themes"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:RangeDatePicker}" TargetType="atom:RangeDatePicker">
         <ControlTheme.BasedOn>
             <themes:RangeInfoPickerInputTheme TargetType="atom:RangeDatePicker" />

src/AtomUI.Controls/DatePicker/Themes/TimedRangeDatePickerPresenterTheme.axaml

@@ -5,7 +5,8 @@
     xmlns:themes="using:AtomUI.Controls.Themes"
     xmlns:calendarview="using:AtomUI.Controls.CalendarView"
     xmlns:datePickerLang="using:AtomUI.Controls.DatePickerLang"
-    xmlns:localization="clr-namespace:AtomUI.Controls.Localization">
+    xmlns:localization="clr-namespace:AtomUI.Controls.Localization"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:TimedRangeDatePickerPresenter}"
                   TargetType="atom:TimedRangeDatePickerPresenter">
         <ControlTheme.BasedOn>

src/AtomUI.Controls/Drawer/Themes/DrawerContainerTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:DrawerContainer}" TargetType="atom:DrawerContainer">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Drawer/Themes/DrawerInfoContainerTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:DrawerInfoContainer}" TargetType="atom:DrawerInfoContainer">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Drawer/Themes/DrawerThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="DrawerInfoContainerTheme.axaml"/>
         <ResourceInclude Source="DrawerContainerTheme.axaml"/>

src/AtomUI.Controls/Embedding/Themes/EmbeddableControlRootTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type EmbeddableControlRoot}" TargetType="EmbeddableControlRoot">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/EmptyIndicator/Themes/EmptyIndicatorTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:EmptyIndicator}" TargetType="atom:EmptyIndicator">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Expander/Themes/ExpanderTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:converters="using:AtomUI.Controls.Converters">
+    xmlns:converters="using:AtomUI.Controls.Converters"
+    x:ClassModifier="internal">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center" />
     <ControlTheme x:Key="{x:Type atom:Expander}" TargetType="atom:Expander">
         <Setter Property="Template">

src/AtomUI.Controls/Flyouts/Themes/FlyoutThemes.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:themes="using:AtomUI.Controls.Themes"
-                    xmlns:atom="https://atomui.net">
+                    xmlns:atom="https://atomui.net"
+                    x:ClassModifier="internal">
     <themes:MenuFlyoutPresenterTheme x:Key="{x:Type atom:MenuFlyoutPresenter}" TargetType="atom:MenuFlyoutPresenter"/>
     <themes:TreeViewFlyoutPresenterTheme x:Key="{x:Type atom:TreeViewFlyoutPresenter}" TargetType="atom:TreeViewFlyoutPresenter"/>
 </ResourceDictionary>

src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml

@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.MenuFlyoutPresenterTheme"
-              TargetType="atom:MenuFlyoutPresenter">
+              TargetType="atom:MenuFlyoutPresenter"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:MenuFlyoutPresenter">
             <atom:ArrowDecoratedBox Name="{x:Static atom:MenuFlyoutThemeConstants.ArrowDecoratorPart}"

src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.cs

@@ -2,6 +2,6 @@ using Avalonia.Styling;
 
 namespace AtomUI.Controls.Themes;
 
-public class MenuFlyoutPresenterTheme : ControlTheme
+internal class MenuFlyoutPresenterTheme : ControlTheme
 {
 }

src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.axaml

@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.TreeViewFlyoutPresenterTheme"
-              TargetType="atom:TreeViewFlyoutPresenter">
+              TargetType="atom:TreeViewFlyoutPresenter"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate>
             <atom:ArrowDecoratedBox Name="{x:Static atom:TreeViewFlyoutThemeConstants.ArrowDecoratorPart}"

src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.cs

@@ -2,6 +2,6 @@ using Avalonia.Styling;
 
 namespace AtomUI.Controls.Themes;
 
-public class TreeViewFlyoutPresenterTheme : ControlTheme
+internal class TreeViewFlyoutPresenterTheme : ControlTheme
 {
 }

src/AtomUI.Controls/GroupBox/Themes/GroupBoxTheme.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:GroupBox}" TargetType="atom:GroupBox">
         <Setter Property="Template">
             <ControlTemplate>

src/AtomUI.Controls/Input/Themes/InputThemes.axaml

@@ -1,7 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:atom="https://atomui.net"
-                    xmlns:themes="using:AtomUI.Controls.Themes">
+                    xmlns:themes="using:AtomUI.Controls.Themes"
+                    x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="SearchEditDecoratedBoxTheme.axaml" />
         <ResourceInclude Source="SearchEditTheme.axaml" />

src/AtomUI.Controls/Input/Themes/LineEditTheme.axaml

@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               TargetType="atom:LineEdit"
-              x:Class="AtomUI.Controls.Themes.LineEditTheme">
+              x:Class="AtomUI.Controls.Themes.LineEditTheme"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:TextBoxTheme TargetType="{x:Type atom:LineEdit}" />
     </ControlTheme.BasedOn>

src/AtomUI.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:themes="using:AtomUI.Controls.Themes">
+    xmlns:themes="using:AtomUI.Controls.Themes"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:SearchEditDecoratedBox}" TargetType="atom:SearchEditDecoratedBox">
         <ControlTheme.BasedOn>
             <themes:AddOnDecoratedBoxTheme TargetType="atom:SearchEditDecoratedBox" />

src/AtomUI.Controls/Input/Themes/SearchEditTheme.axaml

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Themes"
-    xmlns:atom="https://atomui.net">
+    xmlns:atom="https://atomui.net"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:SearchEdit}" TargetType="atom:SearchEdit">
         <ControlTheme.BasedOn>
             <themes:LineEditTheme TargetType="{x:Type atom:SearchEdit}" />