diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridCellTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridCellTheme.axaml
index a1d11c096..6d7d6b9fc 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridCellTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridColumnGroupHeaderTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridColumnGroupHeaderTheme.axaml
index 5571fabf6..3bbd34a22 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridColumnGroupHeaderTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridColumnHeaderTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridColumnHeaderTheme.axaml
index 0f03c23c3..50647a095 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridColumnHeaderTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridFilterIndicatorTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridFilterIndicatorTheme.axaml
index d68db750e..bc9794c34 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridFilterIndicatorTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridHeaderViewItemTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridHeaderViewItemTheme.axaml
index 7fd2dbc63..3b2169000 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridHeaderViewItemTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridOperationButtons.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridOperationButtons.axaml
index a97c9d9af..550523fa7 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridOperationButtons.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowExpander.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridRowExpander.axaml
index c36f87d68..559bce8b7 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowExpander.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowGroupHeaderTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridRowGroupHeaderTheme.axaml
index a479cd383..e24efa636 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowGroupHeaderTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowHeaderTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridRowHeaderTheme.axaml
index b8888005d..f9d7f6bf8 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowHeaderTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowReorderHandle.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridRowReorderHandle.axaml
index 22a92a7f4..d72f0f889 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowReorderHandle.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridRowTheme.axaml
index fff37051a..39e07d6ec 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridRowTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridSortIndicatorTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridSortIndicatorTheme.axaml
index ff03cd8cd..d450c601d 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridSortIndicatorTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridTheme.axaml
index 0a0324f15..a17264ba9 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls.DataGrid/Themes/DataGridTopLeftColumnHeaderTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/DataGridTopLeftColumnHeaderTheme.axaml
index 5e4c0c6e3..7d659b083 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/DataGridTopLeftColumnHeaderTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterMenuItemTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterMenuItemTheme.axaml
index ded50246f..912398688 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterMenuItemTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterTreeItemTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterTreeItemTheme.axaml
index 91fec97a2..916b6b070 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridFilterTreeItemTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridMenuFilterFlyoutPresenterTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridMenuFilterFlyoutPresenterTheme.axaml
index 19427ee69..46d4218e4 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridMenuFilterFlyoutPresenterTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridTreeFilterFlyoutPresenterTheme.axaml b/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridTreeFilterFlyoutPresenterTheme.axaml
index 5c5575e14..2a8633555 100644
--- a/src/AtomUI.Controls.DataGrid/Themes/Filters/DataGridTreeFilterFlyoutPresenterTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml b/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml
index 49437b064..1da7f928d 100644
--- a/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxTheme.axaml
+++ b/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
diff --git a/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxThemes.axaml b/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxThemes.axaml
index ec132eba6..0b39d4c2f 100644
--- a/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedBoxThemes.axaml
+++ b/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>
\ No newline at end of file
diff --git a/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedInnerBoxTheme.axaml b/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedInnerBoxTheme.axaml
index 661901534..f35d1665c 100644
--- a/src/AtomUI.Controls/AddOnDecoratedBox/Themes/AddOnDecoratedInnerBoxTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/AdornerLayer/Themes/AdornerLayer.axaml b/src/AtomUI.Controls/AdornerLayer/Themes/AdornerLayer.axaml
index 684cbe425..ad07193cb 100644
--- a/src/AtomUI.Controls/AdornerLayer/Themes/AdornerLayer.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Alert/Themes/AlertTheme.axaml b/src/AtomUI.Controls/Alert/Themes/AlertTheme.axaml
index 1931d8c44..01526db55 100644
--- a/src/AtomUI.Controls/Alert/Themes/AlertTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxThemes.axaml b/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxThemes.axaml
index 329ce5d30..91ea17ea5 100644
--- a/src/AtomUI.Controls/ArrowDecoratedBox/Themes/ArrowDecoratedBoxThemes.axaml
+++ b/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>
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Avatar/Themes/AvatarTheme.axaml b/src/AtomUI.Controls/Avatar/Themes/AvatarTheme.axaml
index 2931c3912..8f77ab496 100644
--- a/src/AtomUI.Controls/Avatar/Themes/AvatarTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Badge/Themes/BadgeThemes.axaml b/src/AtomUI.Controls/Badge/Themes/BadgeThemes.axaml
index 0fadbb2f9..aea8aacc6 100644
--- a/src/AtomUI.Controls/Badge/Themes/BadgeThemes.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/Badge/Themes/CountBadgeAdornerTheme.axaml b/src/AtomUI.Controls/Badge/Themes/CountBadgeAdornerTheme.axaml
index be8572779..7851819a0 100644
--- a/src/AtomUI.Controls/Badge/Themes/CountBadgeAdornerTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Badge/Themes/DotBadgeAdornerTheme.axaml b/src/AtomUI.Controls/Badge/Themes/DotBadgeAdornerTheme.axaml
index a25ebcd26..225812a52 100644
--- a/src/AtomUI.Controls/Badge/Themes/DotBadgeAdornerTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Badge/Themes/RibbonBadgeAdorner.axaml b/src/AtomUI.Controls/Badge/Themes/RibbonBadgeAdorner.axaml
index fce3e8b97..facd1b1d2 100644
--- a/src/AtomUI.Controls/Badge/Themes/RibbonBadgeAdorner.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerDecoratedBoxTheme.axaml b/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerDecoratedBoxTheme.axaml
index 9fdd74d87..968f3685f 100644
--- a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerDecoratedBoxTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerHandle.axaml b/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerHandle.axaml
index 6a1354145..472ac9fe3 100644
--- a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerHandle.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerInnerBoxTheme.axaml b/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerInnerBoxTheme.axaml
index cc9e8351c..ccb064db1 100644
--- a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerInnerBoxTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml b/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml
index efaafa31b..96b6d1e57 100644
--- a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerThemes.axaml b/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerThemes.axaml
index 1989cf0e1..79cd54569 100644
--- a/src/AtomUI.Controls/ButtonSpinner/Themes/ButtonSpinnerThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
index ebef2a69b..2b633a6c5 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/BaseButtonTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/ButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/ButtonTheme.axaml
index d29c3c2c3..683ee5948 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/ButtonTheme.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml
index c2fe71130..264c53127 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/DefaultButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml
index 4f1d8b6bd..75fac67f8 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/LinkButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml
index d55630b95..8e5ce8015 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/PrimaryButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/Button/TextButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/Button/TextButtonTheme.axaml
index cbe68294a..6703d7a64 100644
--- a/src/AtomUI.Controls/Buttons/Themes/Button/TextButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/ButtonThemes.axaml b/src/AtomUI.Controls/Buttons/Themes/ButtonThemes.axaml
index 447d7ec09..6e619d5c9 100644
--- a/src/AtomUI.Controls/Buttons/Themes/ButtonThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/DefaultDropdownButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/DropdownButton/DefaultDropdownButtonTheme.axaml
index 46ee20ac0..7e832e8f8 100644
--- a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/DefaultDropdownButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/DropdownButtonThemes.axaml b/src/AtomUI.Controls/Buttons/Themes/DropdownButton/DropdownButtonThemes.axaml
index 0d4ca57ab..96205e175 100644
--- a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/DropdownButtonThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/LinkDropdownButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/DropdownButton/LinkDropdownButtonTheme.axaml
index 74f8f7523..25df193fb 100644
--- a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/LinkDropdownButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/PrimaryDropdownButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/DropdownButton/PrimaryDropdownButtonTheme.axaml
index 6ed7e5344..e5a761926 100644
--- a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/PrimaryDropdownButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/TextDropdownButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/DropdownButton/TextDropdownButtonTheme.axaml
index a87260231..6404ffc0a 100644
--- a/src/AtomUI.Controls/Buttons/Themes/DropdownButton/TextDropdownButtonTheme.axaml
+++ b/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}" />
diff --git a/src/AtomUI.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml
index 644b2ac3a..59456f0bb 100644
--- a/src/AtomUI.Controls/Buttons/Themes/HyperLinkButtonTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.axaml
index 965e53083..9d246f96f 100644
--- a/src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.axaml
+++ b/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
diff --git a/src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.cs b/src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.cs
index df857f1d7..3fcbd38ae 100644
--- a/src/AtomUI.Controls/Buttons/Themes/IconButtonTheme.cs
+++ b/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
 {
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Buttons/Themes/SplitButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/SplitButtonTheme.axaml
index 3835cbde1..164166f3c 100644
--- a/src/AtomUI.Controls/Buttons/Themes/SplitButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Buttons/Themes/ToggleIconButtonTheme.axaml b/src/AtomUI.Controls/Buttons/Themes/ToggleIconButtonTheme.axaml
index d84c812ee..aea8eaf56 100644
--- a/src/AtomUI.Controls/Buttons/Themes/ToggleIconButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Calendar/Themes/BaseCalendarButtonTheme.axaml b/src/AtomUI.Controls/Calendar/Themes/BaseCalendarButtonTheme.axaml
index 6054f9548..2c980e80b 100644
--- a/src/AtomUI.Controls/Calendar/Themes/BaseCalendarButtonTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/Calendar/Themes/BaseCalendarDayButtonTheme.axaml b/src/AtomUI.Controls/Calendar/Themes/BaseCalendarDayButtonTheme.axaml
index 6b8f8edd7..a422236fe 100644
--- a/src/AtomUI.Controls/Calendar/Themes/BaseCalendarDayButtonTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/Calendar/Themes/CalendarItemTheme.axaml b/src/AtomUI.Controls/Calendar/Themes/CalendarItemTheme.axaml
index 943abbaa2..881db2524 100644
--- a/src/AtomUI.Controls/Calendar/Themes/CalendarItemTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/Calendar/Themes/CalendarTheme.axaml b/src/AtomUI.Controls/Calendar/Themes/CalendarTheme.axaml
index 700d1afa9..09eb60d36 100644
--- a/src/AtomUI.Controls/Calendar/Themes/CalendarTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Calendar/Themes/CalendarThemes.axaml b/src/AtomUI.Controls/Calendar/Themes/CalendarThemes.axaml
index fab8ee34e..479767c61 100644
--- a/src/AtomUI.Controls/Calendar/Themes/CalendarThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Calendar/Themes/HeadTextButtonTheme.axaml b/src/AtomUI.Controls/Calendar/Themes/HeadTextButtonTheme.axaml
index ae1c99456..e829684aa 100644
--- a/src/AtomUI.Controls/Calendar/Themes/HeadTextButtonTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxIndicator.axaml b/src/AtomUI.Controls/CheckBox/Themes/CheckBoxIndicator.axaml
index 7e314729c..021f7cf47 100644
--- a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxIndicator.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml b/src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml
index ef8aff8b5..030b328ff 100644
--- a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxThemes.axaml b/src/AtomUI.Controls/CheckBox/Themes/CheckBoxThemes.axaml
index e224d415e..690ea92a0 100644
--- a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Chrome/Themes/ChromeThemes.axaml b/src/AtomUI.Controls/Chrome/Themes/ChromeThemes.axaml
index f30872193..1b9c01a1f 100644
--- a/src/AtomUI.Controls/Chrome/Themes/ChromeThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Collapse/Themes/CollapseItemTheme.axaml b/src/AtomUI.Controls/Collapse/Themes/CollapseItemTheme.axaml
index 5e7ab638c..b997387a3 100644
--- a/src/AtomUI.Controls/Collapse/Themes/CollapseItemTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/Collapse/Themes/CollapseItemThemes.axaml b/src/AtomUI.Controls/Collapse/Themes/CollapseItemThemes.axaml
index 48b4b0923..fcb5d2949 100644
--- a/src/AtomUI.Controls/Collapse/Themes/CollapseItemThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Collapse/Themes/CollapseTheme.axaml b/src/AtomUI.Controls/Collapse/Themes/CollapseTheme.axaml
index 212d54adc..2def5a582 100644
--- a/src/AtomUI.Controls/Collapse/Themes/CollapseTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxHandle.axaml b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxHandle.axaml
index 4600d4af2..bb537782d 100644
--- a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxHandle.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxItemTheme.axaml b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxItemTheme.axaml
index b8fd4e972..2b04adbfc 100644
--- a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxItemTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxSpinnerInnerBoxTheme.axaml b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxSpinnerInnerBoxTheme.axaml
index 0e535b570..60be04c3e 100644
--- a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxSpinnerInnerBoxTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml
index 64f71dea7..8ab93f920 100644
--- a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxThemes.axaml b/src/AtomUI.Controls/ComboBox/Themes/ComboBoxThemes.axaml
index 0eb20f3a5..a83724fd7 100644
--- a/src/AtomUI.Controls/ComboBox/Themes/ComboBoxThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarButtonTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarButtonTheme.axaml
index ac94cdbbe..4ee015d44 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarButtonTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarDayButtonTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarDayButtonTheme.axaml
index 8b6d060f7..1296fc4f3 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarDayButtonTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarItemTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarItemTheme.axaml
index a2bec7b90..5108a37fa 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarItemTheme.axaml
+++ b/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
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarTheme.axaml
index 1279e954a..8b4c96cc5 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/CalendarTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthCalendarItemTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthCalendarItemTheme.axaml
index 59d220da4..ad69c7474 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthCalendarItemTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthRangeCalendarTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthRangeCalendarTheme.axaml
index 424c9da13..c67198636 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/DualMonthRangeCalendarTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/RangeCalendarTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/CalendarView/RangeCalendarTheme.axaml
index e4bca5cc9..c4422850d 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/CalendarView/RangeCalendarTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/DatePickerFlyoutPresenterTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/DatePickerFlyoutPresenterTheme.axaml
index 99060a8c1..dc252b1bf 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/DatePickerFlyoutPresenterTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/DatePickerPresenterTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/DatePickerPresenterTheme.axaml
index e8b059ddf..98ddd1ece 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/DatePickerPresenterTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls/DatePicker/Themes/DatePickerTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/DatePickerTheme.axaml
index e5770040f..faa24a75c 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/DatePickerTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/DatePickerThemes.axaml b/src/AtomUI.Controls/DatePicker/Themes/DatePickerThemes.axaml
index fedaa85e1..e4904d170 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/DatePickerThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/DatePicker/Themes/DualMonthRangeDatePickerPresenterTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/DualMonthRangeDatePickerPresenterTheme.axaml
index 3dba70d1f..63cdc055c 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/DualMonthRangeDatePickerPresenterTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerFlyoutPresenterTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerFlyoutPresenterTheme.axaml
index 57f678353..dd1edcbf6 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerFlyoutPresenterTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerTheme.axaml
index 3bd386123..d4f4cbf95 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/RangeDatePickerTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/DatePicker/Themes/TimedRangeDatePickerPresenterTheme.axaml b/src/AtomUI.Controls/DatePicker/Themes/TimedRangeDatePickerPresenterTheme.axaml
index 6d8bab2fb..815379de0 100644
--- a/src/AtomUI.Controls/DatePicker/Themes/TimedRangeDatePickerPresenterTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Drawer/Themes/DrawerContainerTheme.axaml b/src/AtomUI.Controls/Drawer/Themes/DrawerContainerTheme.axaml
index 75a9aa088..8913ece3b 100644
--- a/src/AtomUI.Controls/Drawer/Themes/DrawerContainerTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Drawer/Themes/DrawerInfoContainerTheme.axaml b/src/AtomUI.Controls/Drawer/Themes/DrawerInfoContainerTheme.axaml
index 8dce7ee4e..10a3d86da 100644
--- a/src/AtomUI.Controls/Drawer/Themes/DrawerInfoContainerTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Drawer/Themes/DrawerThemes.axaml b/src/AtomUI.Controls/Drawer/Themes/DrawerThemes.axaml
index 64fc9ccf5..3b8e722b7 100644
--- a/src/AtomUI.Controls/Drawer/Themes/DrawerThemes.axaml
+++ b/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"/>
diff --git a/src/AtomUI.Controls/Embedding/Themes/EmbeddableControlRootTheme.axaml b/src/AtomUI.Controls/Embedding/Themes/EmbeddableControlRootTheme.axaml
index 9c987b53e..78ff684a9 100644
--- a/src/AtomUI.Controls/Embedding/Themes/EmbeddableControlRootTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/EmptyIndicator/Themes/EmptyIndicatorTheme.axaml b/src/AtomUI.Controls/EmptyIndicator/Themes/EmptyIndicatorTheme.axaml
index 489f28ebe..2c77d8c0d 100644
--- a/src/AtomUI.Controls/EmptyIndicator/Themes/EmptyIndicatorTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Expander/Themes/ExpanderTheme.axaml b/src/AtomUI.Controls/Expander/Themes/ExpanderTheme.axaml
index b3139307e..1a9c20f9d 100644
--- a/src/AtomUI.Controls/Expander/Themes/ExpanderTheme.axaml
+++ b/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">
diff --git a/src/AtomUI.Controls/Flyouts/Themes/FlyoutThemes.axaml b/src/AtomUI.Controls/Flyouts/Themes/FlyoutThemes.axaml
index ee4bf0717..6ad15bf07 100644
--- a/src/AtomUI.Controls/Flyouts/Themes/FlyoutThemes.axaml
+++ b/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>
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml b/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml
index b4a5ce5ef..46945f57a 100644
--- a/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.cs b/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.cs
index 6e18e9cdf..4eabb1c61 100644
--- a/src/AtomUI.Controls/Flyouts/Themes/MenuFlyoutPresenterTheme.cs
+++ b/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
 {
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.axaml b/src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.axaml
index 6882e5814..f61102828 100644
--- a/src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.axaml
+++ b/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}"
diff --git a/src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.cs b/src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.cs
index bcadf2825..9cb0f0d94 100644
--- a/src/AtomUI.Controls/Flyouts/Themes/TreeViewFlyoutPresenterTheme.cs
+++ b/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
 {
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/GroupBox/Themes/GroupBoxTheme.axaml b/src/AtomUI.Controls/GroupBox/Themes/GroupBoxTheme.axaml
index a6bd9b7fe..1b2e230e9 100644
--- a/src/AtomUI.Controls/GroupBox/Themes/GroupBoxTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Input/Themes/InputThemes.axaml b/src/AtomUI.Controls/Input/Themes/InputThemes.axaml
index 1ea36b2f6..e8548f41a 100644
--- a/src/AtomUI.Controls/Input/Themes/InputThemes.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/Input/Themes/LineEditTheme.axaml b/src/AtomUI.Controls/Input/Themes/LineEditTheme.axaml
index 5614c59f1..bd02a8850 100644
--- a/src/AtomUI.Controls/Input/Themes/LineEditTheme.axaml
+++ b/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>
diff --git a/src/AtomUI.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml b/src/AtomUI.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml
index c05ff96d7..e0004a8ae 100644
--- a/src/AtomUI.Controls/Input/Themes/SearchEditDecoratedBoxTheme.axaml
+++ b/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" />
diff --git a/src/AtomUI.Controls/Input/Themes/SearchEditTheme.axaml b/src/AtomUI.Controls/Input/Themes/SearchEditTheme.axaml
index c6e856175..d9bbcc466 100644
--- a/src/AtomUI.Controls/Input/Themes/SearchEditTheme.axaml
+++ b/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}" />
diff --git a/src/AtomUI.Controls/Input/Themes/TextBoxInnerBoxTheme.axaml b/src/AtomUI.Controls/Input/Themes/TextBoxInnerBoxTheme.axaml
index 20578f6ef..927a3afd1 100644
--- a/src/AtomUI.Controls/Input/Themes/TextBoxInnerBoxTheme.axaml
+++ b/src/AtomUI.Controls/Input/Themes/TextBoxInnerBoxTheme.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:TextBoxInnerBox}" TargetType="atom:TextBoxInnerBox">
         <ControlTheme.BasedOn>
             <themes:AddOnDecoratedInnerBoxTheme TargetType="atom:TextBoxInnerBox" />
diff --git a/src/AtomUI.Controls/Input/Themes/TextBoxTheme.axaml b/src/AtomUI.Controls/Input/Themes/TextBoxTheme.axaml
index 43098a7bf..004320e80 100644
--- a/src/AtomUI.Controls/Input/Themes/TextBoxTheme.axaml
+++ b/src/AtomUI.Controls/Input/Themes/TextBoxTheme.axaml
@@ -2,7 +2,8 @@
               xmlns="https://github.com/avaloniaui"
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
-              x:Class="AtomUI.Controls.Themes.TextBoxTheme">
+              x:Class="AtomUI.Controls.Themes.TextBoxTheme"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:TextBox">
             <atom:TextBoxInnerBox
diff --git a/src/AtomUI.Controls/ItemsControl/Themes/ItemsControlTheme.axaml b/src/AtomUI.Controls/ItemsControl/Themes/ItemsControlTheme.axaml
index 87accacbd..0ac713c34 100644
--- a/src/AtomUI.Controls/ItemsControl/Themes/ItemsControlTheme.axaml
+++ b/src/AtomUI.Controls/ItemsControl/Themes/ItemsControlTheme.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 ItemsControl}" TargetType="ItemsControl">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/ListBox/Themes/ListBoxItemTheme.axaml b/src/AtomUI.Controls/ListBox/Themes/ListBoxItemTheme.axaml
index 7c543cf90..a9ea3dcc5 100644
--- a/src/AtomUI.Controls/ListBox/Themes/ListBoxItemTheme.axaml
+++ b/src/AtomUI.Controls/ListBox/Themes/ListBoxItemTheme.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"/>
     <ControlTheme x:Key="{x:Type atom:ListBoxItem}" TargetType="atom:ListBoxItem">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/ListBox/Themes/ListBoxTheme.axaml b/src/AtomUI.Controls/ListBox/Themes/ListBoxTheme.axaml
index 0024c54de..ace0cff80 100644
--- a/src/AtomUI.Controls/ListBox/Themes/ListBoxTheme.axaml
+++ b/src/AtomUI.Controls/ListBox/Themes/ListBoxTheme.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:ListBox}" TargetType="atom:ListBox">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/ListBox/Themes/ListBoxThemes.axaml b/src/AtomUI.Controls/ListBox/Themes/ListBoxThemes.axaml
index c4581ea78..f2478458b 100644
--- a/src/AtomUI.Controls/ListBox/Themes/ListBoxThemes.axaml
+++ b/src/AtomUI.Controls/ListBox/Themes/ListBoxThemes.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="ListBoxItemTheme.axaml" />
         <ResourceInclude Source="ListBoxTheme.axaml" />
diff --git a/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorAdornerTheme.axaml b/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorAdornerTheme.axaml
index 8f96d62b9..42bdaba6f 100644
--- a/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorAdornerTheme.axaml
+++ b/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorAdornerTheme.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:LoadingIndicatorAdorner}" TargetType="atom:LoadingIndicatorAdorner">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorTheme.axaml b/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorTheme.axaml
index 91d3326cf..07b271c69 100644
--- a/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorTheme.axaml
+++ b/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorTheme.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:LoadingIndicator}" TargetType="atom:LoadingIndicator">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorThemes.axaml b/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorThemes.axaml
index bf420cf43..a77243f84 100644
--- a/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorThemes.axaml
+++ b/src/AtomUI.Controls/Loading/Themes/LoadingIndicatorThemes.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="LoadingIndicatorAdornerTheme.axaml"/>
         <ResourceInclude Source="LoadingIndicatorTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Menu/Themes/ContextMenuTheme.axaml b/src/AtomUI.Controls/Menu/Themes/ContextMenuTheme.axaml
index cab125c6e..e5bcb965c 100644
--- a/src/AtomUI.Controls/Menu/Themes/ContextMenuTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/ContextMenuTheme.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:ContextMenu}" TargetType="atom:ContextMenu">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.axaml b/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.axaml
index b654589bc..de07de0c6 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.axaml
@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.MenuItemTheme"
-              TargetType="atom:MenuItem">
+              TargetType="atom:MenuItem"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:MenuItem">
             <Panel>
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.cs b/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.cs
index 1d7b61ac3..a3636f57b 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.cs
+++ b/src/AtomUI.Controls/Menu/Themes/MenuItemTheme.cs
@@ -6,7 +6,7 @@ using Avalonia.Styling;
 
 namespace AtomUI.Controls.Themes;
 
-public class MenuItemTheme : ControlTheme
+internal class MenuItemTheme : ControlTheme
 {
     public static readonly StringToTextBlockConverter StringToTextBlockConverter = new ()
     {
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuScrollViewerTheme.axaml b/src/AtomUI.Controls/Menu/Themes/MenuScrollViewerTheme.axaml
index 73234a32f..8c3a7a8e8 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuScrollViewerTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/MenuScrollViewerTheme.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:MenuScrollViewer}" TargetType="atom:MenuScrollViewer">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuSeparatorTheme.axaml b/src/AtomUI.Controls/Menu/Themes/MenuSeparatorTheme.axaml
index 48832b505..ac0dc16d3 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuSeparatorTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/MenuSeparatorTheme.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:MenuSeparator}" TargetType="atom:MenuSeparator">
         <Setter Property="MinHeight" Value="{DynamicResource {x:Static atom:MenuTokenKey.SeparatorItemHeight}}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBorder}}"/>
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml b/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml
index 35826c3b7..89ebb4975 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/MenuTheme.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:Menu}" TargetType="atom:Menu">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Menu/Themes/MenuThemes.axaml b/src/AtomUI.Controls/Menu/Themes/MenuThemes.axaml
index aca55b183..668081e38 100644
--- a/src/AtomUI.Controls/Menu/Themes/MenuThemes.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/MenuThemes.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">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="ContextMenuTheme.axaml"/>
         <ResourceInclude Source="MenuScrollViewerTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Menu/Themes/TopLevelMenuItemTheme.axaml b/src/AtomUI.Controls/Menu/Themes/TopLevelMenuItemTheme.axaml
index d47319f0c..1ed2f90da 100644
--- a/src/AtomUI.Controls/Menu/Themes/TopLevelMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/Menu/Themes/TopLevelMenuItemTheme.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="TopLevelMenuItemTheme" TargetType="atom:MenuItem">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Message/Themes/MessageCardTheme.axaml b/src/AtomUI.Controls/Message/Themes/MessageCardTheme.axaml
index 0d49e900a..38633c328 100644
--- a/src/AtomUI.Controls/Message/Themes/MessageCardTheme.axaml
+++ b/src/AtomUI.Controls/Message/Themes/MessageCardTheme.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:MessageCard}" TargetType="atom:MessageCard">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Message/Themes/MessageThemes.axaml b/src/AtomUI.Controls/Message/Themes/MessageThemes.axaml
index a3f559905..af6d557fd 100644
--- a/src/AtomUI.Controls/Message/Themes/MessageThemes.axaml
+++ b/src/AtomUI.Controls/Message/Themes/MessageThemes.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="MessageCardTheme.axaml"/>
         <ResourceInclude Source="WindowMessageManagerTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Message/Themes/WindowMessageManagerTheme.axaml b/src/AtomUI.Controls/Message/Themes/WindowMessageManagerTheme.axaml
index 89fed4de6..76debc6f0 100644
--- a/src/AtomUI.Controls/Message/Themes/WindowMessageManagerTheme.axaml
+++ b/src/AtomUI.Controls/Message/Themes/WindowMessageManagerTheme.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:WindowMessageManager}" TargetType="atom:WindowMessageManager">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/NavMenu/Themes/BaseNavMenuItemTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/BaseNavMenuItemTheme.axaml
index e8501166b..8404f788a 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/BaseNavMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/BaseNavMenuItemTheme.axaml
@@ -3,7 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
     TargetType="atom:NavMenuItem"
-    x:Class="AtomUI.Controls.Themes.BaseNavMenuItemTheme">
+    x:Class="AtomUI.Controls.Themes.BaseNavMenuItemTheme"
+    x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:NavMenuItem">
             <Panel>
diff --git a/src/AtomUI.Controls/NavMenu/Themes/HorizontalNavMenuTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/HorizontalNavMenuTheme.axaml
index aa2f74588..3a14fba3d 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/HorizontalNavMenuTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/HorizontalNavMenuTheme.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:Static atom:NavMenuThemeConstants.HorizontalNavMenuThemeId}" TargetType="atom:NavMenu">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/NavMenu/Themes/InlineNavMenuItemTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/InlineNavMenuItemTheme.axaml
index 11fd143bb..51e64f91d 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/InlineNavMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/InlineNavMenuItemTheme.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">
     <atom:MarginMultiplierConverter x:Key="MarginMultiplierConverter" Left="True" />
     <ControlTheme x:Key="{x:Static atom:NavMenuThemeConstants.InlineNavMenuItemThemeId}" TargetType="atom:NavMenuItem">
         <ControlTheme.BasedOn>
diff --git a/src/AtomUI.Controls/NavMenu/Themes/NavMenuItemTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/NavMenuItemTheme.axaml
index 056941e79..aff8c84f9 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/NavMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/NavMenuItemTheme.axaml
@@ -4,7 +4,8 @@
     xmlns:atom="https://atomui.net"
     xmlns:themes="using:AtomUI.Controls.Themes"
     x:Class="AtomUI.Controls.Themes.NavMenuItemTheme"
-    TargetType="atom:NavMenuItem">
+    TargetType="atom:NavMenuItem"
+    x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:BaseNavMenuItemTheme TargetType="atom:NavMenuItem" />
     </ControlTheme.BasedOn>
diff --git a/src/AtomUI.Controls/NavMenu/Themes/NavMenuTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/NavMenuTheme.axaml
index 423cbf8d3..c4c9646e1 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/NavMenuTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/NavMenuTheme.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:NavMenu}" TargetType="atom:NavMenu">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/NavMenu/Themes/NavMenuThemes.axaml b/src/AtomUI.Controls/NavMenu/Themes/NavMenuThemes.axaml
index 458f92191..b6ad1c33c 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/NavMenuThemes.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/NavMenuThemes.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="InlineNavMenuItemTheme.axaml" />
         <ResourceInclude Source="TopLevelHorizontalNavMenuItemTheme.axaml" />
diff --git a/src/AtomUI.Controls/NavMenu/Themes/TopLevelHorizontalNavMenuItemTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/TopLevelHorizontalNavMenuItemTheme.axaml
index 39c67f148..182cff4eb 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/TopLevelHorizontalNavMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/TopLevelHorizontalNavMenuItemTheme.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:Static atom:NavMenuThemeConstants.TopLevelHorizontalNavMenuItemThemeId}"
                   TargetType="atom:NavMenuItem">
diff --git a/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuItemTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuItemTheme.axaml
index fb3501cd6..d41b83cf7 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuItemTheme.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:Static atom:NavMenuThemeConstants.VerticalNavMenuItemThemeId}" TargetType="atom:NavMenuItem">
         <ControlTheme.BasedOn>
             <themes:NavMenuItemTheme TargetType="atom:NavMenuItem" />
diff --git a/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuTheme.axaml b/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuTheme.axaml
index b07d10e3e..82e283987 100644
--- a/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuTheme.axaml
+++ b/src/AtomUI.Controls/NavMenu/Themes/VerticalNavMenuTheme.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:Static atom:NavMenuThemeConstants.VerticalNavMenuThemeId}" TargetType="atom:NavMenu">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Notifications/Themes/NotificationCardTheme.axaml b/src/AtomUI.Controls/Notifications/Themes/NotificationCardTheme.axaml
index b8cd59de9..6d3432193 100644
--- a/src/AtomUI.Controls/Notifications/Themes/NotificationCardTheme.axaml
+++ b/src/AtomUI.Controls/Notifications/Themes/NotificationCardTheme.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:StringToSelectableTextBlockConverter x:Key="StringToSelectableTextBlockConverter" />
     <atom:NotificationProgressBarVisibleConverter x:Key="NotificationProgressBarVisibleConverter" />
     <ControlTheme x:Key="{x:Type atom:NotificationCard}" TargetType="atom:NotificationCard">
diff --git a/src/AtomUI.Controls/Notifications/Themes/NotificationsThemes.axaml b/src/AtomUI.Controls/Notifications/Themes/NotificationsThemes.axaml
index caae2e593..a36ca73be 100644
--- a/src/AtomUI.Controls/Notifications/Themes/NotificationsThemes.axaml
+++ b/src/AtomUI.Controls/Notifications/Themes/NotificationsThemes.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="NotificationCardTheme.axaml"/>
         <ResourceInclude Source="WindowNotificationManagerTheme.axaml"/>
diff --git a/src/AtomUI.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml b/src/AtomUI.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml
index 9c5b9e702..7420e5389 100644
--- a/src/AtomUI.Controls/NumericUpDown/Themes/NumericUpDownTheme.axaml
+++ b/src/AtomUI.Controls/NumericUpDown/Themes/NumericUpDownTheme.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:NumericUpDown}" TargetType="atom:NumericUpDown">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxThemes.axaml b/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxThemes.axaml
index bab3b3dad..ce04dcab8 100644
--- a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxThemes.axaml
+++ b/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonBoxThemes.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="OptionButtonGroupTheme.axaml" />
         <ResourceInclude Source="OptionButtonTheme.axaml" />
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonGroupTheme.axaml b/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonGroupTheme.axaml
index fd64e5887..06354b5c3 100644
--- a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonGroupTheme.axaml
+++ b/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonGroupTheme.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:OptionButtonGroup}" TargetType="atom:OptionButtonGroup">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonTheme.axaml b/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonTheme.axaml
index 2bf2b4243..ae776bb51 100644
--- a/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonTheme.axaml
+++ b/src/AtomUI.Controls/OptionButtonBox/Themes/OptionButtonTheme.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:OptionButton}" TargetType="atom:OptionButton">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Pagination/Themes/PaginationNavItemTheme.axaml b/src/AtomUI.Controls/Pagination/Themes/PaginationNavItemTheme.axaml
index d4f49968d..b0be3f195 100644
--- a/src/AtomUI.Controls/Pagination/Themes/PaginationNavItemTheme.axaml
+++ b/src/AtomUI.Controls/Pagination/Themes/PaginationNavItemTheme.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:PaginationNavItem}" TargetType="atom:PaginationNavItem">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/Pagination/Themes/PaginationNavTheme.axaml b/src/AtomUI.Controls/Pagination/Themes/PaginationNavTheme.axaml
index ff7319ad6..56264a822 100644
--- a/src/AtomUI.Controls/Pagination/Themes/PaginationNavTheme.axaml
+++ b/src/AtomUI.Controls/Pagination/Themes/PaginationNavTheme.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:PaginationNav}" TargetType="atom:PaginationNav">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Pagination/Themes/PaginationTheme.axaml b/src/AtomUI.Controls/Pagination/Themes/PaginationTheme.axaml
index 1c68af34c..c6ca5a11a 100644
--- a/src/AtomUI.Controls/Pagination/Themes/PaginationTheme.axaml
+++ b/src/AtomUI.Controls/Pagination/Themes/PaginationTheme.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:Pagination}" TargetType="atom:Pagination">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/Pagination/Themes/PaginationThemes.axaml b/src/AtomUI.Controls/Pagination/Themes/PaginationThemes.axaml
index 5af3a486d..c49031bff 100644
--- a/src/AtomUI.Controls/Pagination/Themes/PaginationThemes.axaml
+++ b/src/AtomUI.Controls/Pagination/Themes/PaginationThemes.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="PaginationNavItemTheme.axaml"/>
         <ResourceInclude Source="PaginationNavTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Pagination/Themes/QuickJumperBarTheme.axaml b/src/AtomUI.Controls/Pagination/Themes/QuickJumperBarTheme.axaml
index 9d99f6864..5a187a441 100644
--- a/src/AtomUI.Controls/Pagination/Themes/QuickJumperBarTheme.axaml
+++ b/src/AtomUI.Controls/Pagination/Themes/QuickJumperBarTheme.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:QuickJumperBar}" TargetType="atom:QuickJumperBar">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/Pagination/Themes/SimplePaginationTheme.axaml b/src/AtomUI.Controls/Pagination/Themes/SimplePaginationTheme.axaml
index 1f6cdc684..bfdb3bd6e 100644
--- a/src/AtomUI.Controls/Pagination/Themes/SimplePaginationTheme.axaml
+++ b/src/AtomUI.Controls/Pagination/Themes/SimplePaginationTheme.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:SimplePagination}" TargetType="atom:SimplePagination">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Popup/Themes/OverlayPopupHostTheme.axaml b/src/AtomUI.Controls/Popup/Themes/OverlayPopupHostTheme.axaml
index ad60e5b7e..1c1d5cf14 100644
--- a/src/AtomUI.Controls/Popup/Themes/OverlayPopupHostTheme.axaml
+++ b/src/AtomUI.Controls/Popup/Themes/OverlayPopupHostTheme.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 OverlayPopupHost}" TargetType="OverlayPopupHost">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Popup/Themes/PopupBuddyLayer.axaml b/src/AtomUI.Controls/Popup/Themes/PopupBuddyLayer.axaml
index 3b4e191e1..0cdfdffad 100644
--- a/src/AtomUI.Controls/Popup/Themes/PopupBuddyLayer.axaml
+++ b/src/AtomUI.Controls/Popup/Themes/PopupBuddyLayer.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:PopupBuddyLayer}" TargetType="atom:PopupBuddyLayer">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Popup/Themes/PopupRoot.axaml b/src/AtomUI.Controls/Popup/Themes/PopupRoot.axaml
index cc4a03eca..c958feec7 100644
--- a/src/AtomUI.Controls/Popup/Themes/PopupRoot.axaml
+++ b/src/AtomUI.Controls/Popup/Themes/PopupRoot.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 PopupRoot}" TargetType="PopupRoot">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Popup/Themes/PopupThemes.axaml b/src/AtomUI.Controls/Popup/Themes/PopupThemes.axaml
index b14141aeb..c9b423194 100644
--- a/src/AtomUI.Controls/Popup/Themes/PopupThemes.axaml
+++ b/src/AtomUI.Controls/Popup/Themes/PopupThemes.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="OverlayPopupHostTheme.axaml"/>
         <ResourceInclude Source="PopupBuddyLayer.axaml"/>
diff --git a/src/AtomUI.Controls/PopupConfirm/Themes/PopupConfirmContainerTheme.axaml b/src/AtomUI.Controls/PopupConfirm/Themes/PopupConfirmContainerTheme.axaml
index 41c158724..c21d1a7c0 100644
--- a/src/AtomUI.Controls/PopupConfirm/Themes/PopupConfirmContainerTheme.axaml
+++ b/src/AtomUI.Controls/PopupConfirm/Themes/PopupConfirmContainerTheme.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:PopupConfirmContainer}" TargetType="atom:PopupConfirmContainer">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/AbstractCircleProgressTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/AbstractCircleProgressTheme.axaml
index 14f6049e2..513aab3e5 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/AbstractCircleProgressTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/AbstractCircleProgressTheme.axaml
@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.AbstractCircleProgressTheme"
-              TargetType="atom:AbstractCircleProgress">
+              TargetType="atom:AbstractCircleProgress"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:AbstractProgressBarTheme TargetType="atom:AbstractCircleProgress" />
     </ControlTheme.BasedOn>
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/AbstractLineProgressTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/AbstractLineProgressTheme.axaml
index 460a003ce..9e9f447cc 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/AbstractLineProgressTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/AbstractLineProgressTheme.axaml
@@ -3,7 +3,8 @@
               xmlns:atom="https://atomui.net"
               xmlns:themes="using:AtomUI.Controls.Themes"
               x:Class="AtomUI.Controls.Themes.AbstractLineProgressTheme"
-              TargetType="atom:AbstractLineProgress">
+              TargetType="atom:AbstractLineProgress"
+              x:ClassModifier="internal">
     <ControlTheme.BasedOn>
         <themes:AbstractProgressBarTheme TargetType="atom:AbstractLineProgress"/>
     </ControlTheme.BasedOn>
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml
index 1a106a651..7439ec447 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/AbstractProgressBarTheme.axaml
@@ -3,7 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
     x:Class="AtomUI.Controls.Themes.AbstractProgressBarTheme"
-    TargetType="atom:AbstractProgressBar">
+    TargetType="atom:AbstractProgressBar"
+    x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:AbstractProgressBar">
             <Canvas>
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/CircleProgressTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/CircleProgressTheme.axaml
index 75bb0725a..9fdd91ea2 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/CircleProgressTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/CircleProgressTheme.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:CircleProgress}" TargetType="atom:CircleProgress">
         <ControlTheme.BasedOn>
             <themes:AbstractCircleProgressTheme TargetType="atom:CircleProgress" />
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/DashboardProgressTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/DashboardProgressTheme.axaml
index bb2297f10..6dbf76a6d 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/DashboardProgressTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/DashboardProgressTheme.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:DashboardProgress}" TargetType="atom:DashboardProgress">
         <ControlTheme.BasedOn>
             <themes:AbstractCircleProgressTheme TargetType="atom:DashboardProgress" />
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarTheme.axaml
index d082a01b5..7e83e0057 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarTheme.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:ProgressBar}" TargetType="atom:ProgressBar">
         <ControlTheme.BasedOn>
             <themes:AbstractLineProgressTheme TargetType="atom:ProgressBar" />
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarThemes.axaml b/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarThemes.axaml
index f48960617..63bee48e1 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarThemes.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/ProgressBarThemes.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="CircleProgressTheme.axaml"/>
         <ResourceInclude Source="DashboardProgressTheme.axaml"/>
diff --git a/src/AtomUI.Controls/ProgressBar/Themes/StepsProgressBarTheme.axaml b/src/AtomUI.Controls/ProgressBar/Themes/StepsProgressBarTheme.axaml
index 4840dc867..9c8c8d325 100644
--- a/src/AtomUI.Controls/ProgressBar/Themes/StepsProgressBarTheme.axaml
+++ b/src/AtomUI.Controls/ProgressBar/Themes/StepsProgressBarTheme.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:StepsProgressBar}" TargetType="atom:StepsProgressBar">
         <ControlTheme.BasedOn>
             <themes:AbstractLineProgressTheme TargetType="atom:StepsProgressBar" />
diff --git a/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml b/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml
index f7382294b..17e7136b3 100644
--- a/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml
+++ b/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.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:RadioButton}" TargetType="atom:RadioButton">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarRepeatButtonTheme.axaml b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarRepeatButtonTheme.axaml
index 13ef439a2..8a8c80635 100644
--- a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarRepeatButtonTheme.axaml
+++ b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarRepeatButtonTheme.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:ScrollBarRepeatButton}" TargetType="atom:ScrollBarRepeatButton">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarTheme.axaml b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarTheme.axaml
index cce6f75d7..9e386f920 100644
--- a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarTheme.axaml
+++ b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarTheme.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 ScrollBar}" TargetType="ScrollBar">
         <Style Selector="^:vertical">
             <Setter Property="Template">
diff --git a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThemes.axaml b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThemes.axaml
index f96e8e0d3..890f43da0 100644
--- a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThemes.axaml
+++ b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThemes.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="ScrollBarTheme.axaml"/>
         <ResourceInclude Source="ScrollBarRepeatButtonTheme.axaml"/>
diff --git a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThumbTheme.axaml b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThumbTheme.axaml
index 09a4e4911..2602ef757 100644
--- a/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThumbTheme.axaml
+++ b/src/AtomUI.Controls/ScrollBar/Themes/ScrollBarThumbTheme.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:ScrollBarThumb}" TargetType="atom:ScrollBarThumb">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/ScrollBar/Themes/ScrollViewerTheme.axaml b/src/AtomUI.Controls/ScrollBar/Themes/ScrollViewerTheme.axaml
index 72d24625c..c84b28c29 100644
--- a/src/AtomUI.Controls/ScrollBar/Themes/ScrollViewerTheme.axaml
+++ b/src/AtomUI.Controls/ScrollBar/Themes/ScrollViewerTheme.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 ScrollViewer}" TargetType="ScrollViewer">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Segmented/Themes/SegmentedItemTheme.axaml b/src/AtomUI.Controls/Segmented/Themes/SegmentedItemTheme.axaml
index e7dff0fe5..86f8b2af2 100644
--- a/src/AtomUI.Controls/Segmented/Themes/SegmentedItemTheme.axaml
+++ b/src/AtomUI.Controls/Segmented/Themes/SegmentedItemTheme.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:SegmentedItem}" TargetType="atom:SegmentedItem">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/Segmented/Themes/SegmentedTheme.axaml b/src/AtomUI.Controls/Segmented/Themes/SegmentedTheme.axaml
index 2da494146..915c90bf2 100644
--- a/src/AtomUI.Controls/Segmented/Themes/SegmentedTheme.axaml
+++ b/src/AtomUI.Controls/Segmented/Themes/SegmentedTheme.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:Segmented}" TargetType="atom:Segmented">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Segmented/Themes/SegmentedThemes.axaml b/src/AtomUI.Controls/Segmented/Themes/SegmentedThemes.axaml
index efd17bd01..91ca1c676 100644
--- a/src/AtomUI.Controls/Segmented/Themes/SegmentedThemes.axaml
+++ b/src/AtomUI.Controls/Segmented/Themes/SegmentedThemes.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="SegmentedTheme.axaml"/>
         <ResourceInclude Source="SegmentedItemTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Separator/Themes/SeparatorTheme.axaml b/src/AtomUI.Controls/Separator/Themes/SeparatorTheme.axaml
index 9a8091f7f..c897fad33 100644
--- a/src/AtomUI.Controls/Separator/Themes/SeparatorTheme.axaml
+++ b/src/AtomUI.Controls/Separator/Themes/SeparatorTheme.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:Separator}" TargetType="atom:Separator">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Slider/Themes/SliderTheme.axaml b/src/AtomUI.Controls/Slider/Themes/SliderTheme.axaml
index 9f97eecd6..324487979 100644
--- a/src/AtomUI.Controls/Slider/Themes/SliderTheme.axaml
+++ b/src/AtomUI.Controls/Slider/Themes/SliderTheme.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:Slider}" TargetType="atom:Slider">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Slider/Themes/SliderThemes.axaml b/src/AtomUI.Controls/Slider/Themes/SliderThemes.axaml
index 304202ffb..9e62bc65c 100644
--- a/src/AtomUI.Controls/Slider/Themes/SliderThemes.axaml
+++ b/src/AtomUI.Controls/Slider/Themes/SliderThemes.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="SliderTheme.axaml"/>
         <ResourceInclude Source="SliderThumbTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Slider/Themes/SliderThumbTheme.axaml b/src/AtomUI.Controls/Slider/Themes/SliderThumbTheme.axaml
index 62ae990a6..7e0344e05 100644
--- a/src/AtomUI.Controls/Slider/Themes/SliderThumbTheme.axaml
+++ b/src/AtomUI.Controls/Slider/Themes/SliderThumbTheme.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:SliderThumb}" TargetType="atom:SliderThumb">
 
         <Setter Property="Focusable" Value="True" />
diff --git a/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml b/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml
index cbf116837..8c53b0a86 100644
--- a/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.axaml
+++ b/src/AtomUI.Controls/Switch/Themes/ToggleSwitchTheme.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:ToggleSwitch}" TargetType="atom:ToggleSwitch">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/TabControl/Themes/BaseOverflowMenuItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/BaseOverflowMenuItemTheme.axaml
index cf5bbe3f7..7d6582b43 100644
--- a/src/AtomUI.Controls/TabControl/Themes/BaseOverflowMenuItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/BaseOverflowMenuItemTheme.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:BaseOverflowMenuItem}" TargetType="atom:BaseOverflowMenuItem">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/TabControl/Themes/BaseTabControlTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/BaseTabControlTheme.axaml
index 07f5e7de9..f6448c2fa 100644
--- a/src/AtomUI.Controls/TabControl/Themes/BaseTabControlTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/BaseTabControlTheme.axaml
@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.BaseTabControlTheme"
-              TargetType="atom:BaseTabControl">
+              TargetType="atom:BaseTabControl"
+              x:ClassModifier="internal">
     
     <Style Selector="^:is(atom|BaseTabControl)">
         <Setter Property="BorderBrush" Value="{DynamicResource {x:Static atom:SharedTokenKey.ColorBorderSecondary}}" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/BaseTabItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/BaseTabItemTheme.axaml
index 3b9d22a97..7040001d6 100644
--- a/src/AtomUI.Controls/TabControl/Themes/BaseTabItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/BaseTabItemTheme.axaml
@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.BaseTabItemTheme"
-              TargetType="atom:TabItem">
+              TargetType="atom:TabItem"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:TabItem">
             <Border Name="{x:Static atom:TabItemThemeConstants.FramePart}">
diff --git a/src/AtomUI.Controls/TabControl/Themes/BaseTabScrollViewerTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/BaseTabScrollViewerTheme.axaml
index 87981e0e1..d9147be0d 100644
--- a/src/AtomUI.Controls/TabControl/Themes/BaseTabScrollViewerTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/BaseTabScrollViewerTheme.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:BaseTabScrollViewer}" TargetType="atom:BaseTabScrollViewer">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/TabControl/Themes/CardTabControlTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/CardTabControlTheme.axaml
index 6d7c98389..e3ea6b6a7 100644
--- a/src/AtomUI.Controls/TabControl/Themes/CardTabControlTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/CardTabControlTheme.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:CardTabControl}" TargetType="atom:CardTabControl">
         <ControlTheme.BasedOn>
             <themes:BaseTabControlTheme TargetType="atom:CardTabControl" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/CardTabItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/CardTabItemTheme.axaml
index 121704b66..c51266724 100644
--- a/src/AtomUI.Controls/TabControl/Themes/CardTabItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/CardTabItemTheme.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:Static atom:TabItemThemeConstants.CardTabItemThemeId}" TargetType="atom:TabItem">
         <ControlTheme.BasedOn>
             <themes:BaseTabItemTheme TargetType="atom:TabItem" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabControlTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabControlTheme.axaml
index 8fe9d9477..76ca89c7a 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabControlTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabControlTheme.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:TabControl}" TargetType="atom:TabControl">
         <ControlTheme.BasedOn>
             <themes:BaseTabControlTheme TargetType="atom:TabControl" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabControlThemes.axaml b/src/AtomUI.Controls/TabControl/Themes/TabControlThemes.axaml
index 7c6413e74..087bd92cf 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabControlThemes.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabControlThemes.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="TabStrip/TabStripTheme.axaml"/>
         <ResourceInclude Source="TabStrip/TabStripItemTheme.axaml"/>
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabItemTheme.axaml
index 72227eb11..d9eae99e3 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabItemTheme.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:Static atom:TabItemThemeConstants.TabItemThemeId}" TargetType="atom:TabItem">
         <ControlTheme.BasedOn>
             <themes:BaseTabItemTheme TargetType="atom:TabItem" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripItemTheme.axaml
index 592e7f372..fb45a6bb3 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripItemTheme.axaml
@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.BaseTabStripItemTheme"
-              TargetType="atom:TabStripItem">
+              TargetType="atom:TabStripItem"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:TabStripItem">
             <Border Name="{x:Static atom:TabStripItemThemeConstants.DecoratorPart}">
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripTheme.axaml
index 5292f6dcf..41ca265cc 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabStrip/BaseTabStripTheme.axaml
@@ -2,7 +2,8 @@
               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:atom="https://atomui.net"
               x:Class="AtomUI.Controls.Themes.BaseTabStripTheme"
-              TargetType="atom:BaseTabStrip">
+              TargetType="atom:BaseTabStrip"
+              x:ClassModifier="internal">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:BaseTabStrip">
             <Border Name="{x:Static atom:TabStripThemeConstants.FramePart}"/>
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripItemTheme.axaml
index 0a3e02a6c..dc29b8c7a 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripItemTheme.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:Static atom:TabStripThemeConstants.CardTabStripItemThemeId}" TargetType="atom:TabStripItem">
         <ControlTheme.BasedOn>
             <themes:BaseTabStripItemTheme TargetType="atom:TabStripItem" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripTheme.axaml
index 8d19844e1..a78fc65f3 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabStrip/CardTabStripTheme.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:CardTabStrip}" TargetType="atom:CardTabStrip">
         <ControlTheme.BasedOn>
             <themes:BaseTabStripTheme TargetType="atom:CardTabStrip" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripItemTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripItemTheme.axaml
index bbc665631..722b1cc87 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripItemTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripItemTheme.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:Static atom:TabStripThemeConstants.TabStripItemThemeId}" TargetType="atom:TabStripItem">
         <ControlTheme.BasedOn>
             <themes:BaseTabStripItemTheme TargetType="atom:TabStripItem" />
diff --git a/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripTheme.axaml b/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripTheme.axaml
index 860f16d96..27d3eac5b 100644
--- a/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripTheme.axaml
+++ b/src/AtomUI.Controls/TabControl/Themes/TabStrip/TabStripTheme.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:TabStrip}" TargetType="atom:TabStrip">
         <ControlTheme.BasedOn>
             <themes:BaseTabStripTheme TargetType="atom:TabStrip" />
diff --git a/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml b/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml
index e0a45e137..0e3a4f3e0 100644
--- a/src/AtomUI.Controls/Tag/Themes/TagTheme.axaml
+++ b/src/AtomUI.Controls/Tag/Themes/TagTheme.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:Tag}" TargetType="atom:Tag">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/TextBlock/Themes/HyperLinkTextBlockTheme.axaml b/src/AtomUI.Controls/TextBlock/Themes/HyperLinkTextBlockTheme.axaml
index 6e4beefd8..7afd31896 100644
--- a/src/AtomUI.Controls/TextBlock/Themes/HyperLinkTextBlockTheme.axaml
+++ b/src/AtomUI.Controls/TextBlock/Themes/HyperLinkTextBlockTheme.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:HyperLinkTextBlock}" TargetType="atom:HyperLinkTextBlock">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/TimePicker/Themes/RangeTimePickerTheme.axaml b/src/AtomUI.Controls/TimePicker/Themes/RangeTimePickerTheme.axaml
index dfca10b89..3a52ca302 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/RangeTimePickerTheme.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/RangeTimePickerTheme.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:RangeTimePicker}" TargetType="atom:RangeTimePicker">
         <ControlTheme.BasedOn>
             <themes:RangeInfoPickerInputTheme TargetType="atom:RangeTimePicker" />
diff --git a/src/AtomUI.Controls/TimePicker/Themes/TimePickerFlyoutPresenterTheme.axaml b/src/AtomUI.Controls/TimePicker/Themes/TimePickerFlyoutPresenterTheme.axaml
index 481125fdc..3ae69dd2a 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/TimePickerFlyoutPresenterTheme.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/TimePickerFlyoutPresenterTheme.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:TimePickerFlyoutPresenter}" TargetType="atom:TimePickerFlyoutPresenter">
         <ControlTheme.BasedOn>
             <themes:ArrowDecoratedBoxTheme TargetType="atom:TimePickerFlyoutPresenter" />
diff --git a/src/AtomUI.Controls/TimePicker/Themes/TimePickerPresenterTheme.axaml b/src/AtomUI.Controls/TimePicker/Themes/TimePickerPresenterTheme.axaml
index c49bc16d8..e576c71af 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/TimePickerPresenterTheme.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/TimePickerPresenterTheme.axaml
@@ -2,8 +2,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atom="https://atomui.net"
-    xmlns:timePickerLang="clr-namespace:AtomUI.Controls.TimePickerLang"
-    xmlns:localization="clr-namespace:AtomUI.Controls.Localization">
+    xmlns:timePickerLang="using:AtomUI.Controls.TimePickerLang"
+    xmlns:localization="using:AtomUI.Controls.Localization"
+    x:ClassModifier="internal">
     <ControlTheme x:Key="{x:Type atom:TimePickerPresenter}" TargetType="atom:TimePickerPresenter">
         <Setter Property="Template">
             <ControlTemplate TargetType="atom:TimePickerPresenter">
diff --git a/src/AtomUI.Controls/TimePicker/Themes/TimePickerTheme.axaml b/src/AtomUI.Controls/TimePicker/Themes/TimePickerTheme.axaml
index f546ebacf..794bbc265 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/TimePickerTheme.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/TimePickerTheme.axaml
@@ -2,6 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:themes="using:AtomUI.Controls.Primitives.Themes"
+    x:ClassModifier="internal"
     xmlns:atom="https://atomui.net">
     <ControlTheme x:Key="{x:Type atom:TimePicker}" TargetType="atom:TimePicker">
         <ControlTheme.BasedOn>
diff --git a/src/AtomUI.Controls/TimePicker/Themes/TimePickerThemes.axaml b/src/AtomUI.Controls/TimePicker/Themes/TimePickerThemes.axaml
index 8f70c7ae8..8230dce45 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/TimePickerThemes.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/TimePickerThemes.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="TimePickerTheme.axaml"/>
         <ResourceInclude Source="RangeTimePickerTheme.axaml"/>
diff --git a/src/AtomUI.Controls/TimePicker/Themes/TimeViewCell.axaml b/src/AtomUI.Controls/TimePicker/Themes/TimeViewCell.axaml
index fb1affa6d..4be1be881 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/TimeViewCell.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/TimeViewCell.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"/>
     <ControlTheme x:Key="{x:Type atom:TimeViewCell}" TargetType="atom:TimeViewCell">
         <Setter Property="Template">
diff --git a/src/AtomUI.Controls/TimePicker/Themes/TimeViewTheme.axaml b/src/AtomUI.Controls/TimePicker/Themes/TimeViewTheme.axaml
index 7eed3b4cc..a48271c33 100644
--- a/src/AtomUI.Controls/TimePicker/Themes/TimeViewTheme.axaml
+++ b/src/AtomUI.Controls/TimePicker/Themes/TimeViewTheme.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:TimeView}" TargetType="atom:TimeView">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Timeline/Themes/TimelineItemTheme.axaml b/src/AtomUI.Controls/Timeline/Themes/TimelineItemTheme.axaml
index bfc6f7eed..4b63c0dfa 100644
--- a/src/AtomUI.Controls/Timeline/Themes/TimelineItemTheme.axaml
+++ b/src/AtomUI.Controls/Timeline/Themes/TimelineItemTheme.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:TimelineItem}" TargetType="atom:TimelineItem">
diff --git a/src/AtomUI.Controls/Timeline/Themes/TimelineTheme.axaml b/src/AtomUI.Controls/Timeline/Themes/TimelineTheme.axaml
index 010aa91ae..5f7494691 100644
--- a/src/AtomUI.Controls/Timeline/Themes/TimelineTheme.axaml
+++ b/src/AtomUI.Controls/Timeline/Themes/TimelineTheme.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:Timeline}" TargetType="atom:Timeline">
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/AtomUI.Controls/Timeline/Themes/TimelineThemes.axaml b/src/AtomUI.Controls/Timeline/Themes/TimelineThemes.axaml
index e9583d381..f7b8a5590 100644
--- a/src/AtomUI.Controls/Timeline/Themes/TimelineThemes.axaml
+++ b/src/AtomUI.Controls/Timeline/Themes/TimelineThemes.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="TimelineItemTheme.axaml"/>
         <ResourceInclude Source="TimelineTheme.axaml"/>
diff --git a/src/AtomUI.Controls/Tooltip/Themes/ToolTipTheme.axaml b/src/AtomUI.Controls/Tooltip/Themes/ToolTipTheme.axaml
index 7089ddd01..e867c7df8 100644
--- a/src/AtomUI.Controls/Tooltip/Themes/ToolTipTheme.axaml
+++ b/src/AtomUI.Controls/Tooltip/Themes/ToolTipTheme.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:converters="using:AtomUI.Controls.Converters">
     <converters:StringToTextBlockConverter x:Key="StringToTextBlockConverter" VerticalAlignment="Center" HorizontalAlignment="Center" />
     <ControlTheme x:Key="{x:Type atom:ToolTip}" TargetType="atom:ToolTip">
diff --git a/src/AtomUI.Controls/TreeView/Themes/NodeSwitcherButtonTheme.axaml b/src/AtomUI.Controls/TreeView/Themes/NodeSwitcherButtonTheme.axaml
index a521ad35f..b566f8ab8 100644
--- a/src/AtomUI.Controls/TreeView/Themes/NodeSwitcherButtonTheme.axaml
+++ b/src/AtomUI.Controls/TreeView/Themes/NodeSwitcherButtonTheme.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:converters="using:AtomUI.Controls.Converters">
     <converters:NodeSwitcherIconModeConverter x:Key="NodeSwitcherIconModeConverter" />
     <!--
diff --git a/src/AtomUI.Controls/TreeView/Themes/TreeViewItemTheme.axaml b/src/AtomUI.Controls/TreeView/Themes/TreeViewItemTheme.axaml
index 20ea4253a..5e9e56926 100644
--- a/src/AtomUI.Controls/TreeView/Themes/TreeViewItemTheme.axaml
+++ b/src/AtomUI.Controls/TreeView/Themes/TreeViewItemTheme.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"
               x:Class="AtomUI.Controls.Themes.TreeViewItemTheme">
     <Setter Property="Template">
         <ControlTemplate TargetType="atom:TreeViewItem">
diff --git a/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.axaml b/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.axaml
index e0d9ba607..d359faa3c 100644
--- a/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.axaml
+++ b/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.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"
               x:Class="AtomUI.Controls.Themes.TreeViewTheme">
     <Setter Property="Template">
         <ControlTemplate>
diff --git a/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.cs b/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.cs
index 4dfad51db..63631418a 100644
--- a/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.cs
+++ b/src/AtomUI.Controls/TreeView/Themes/TreeViewTheme.cs
@@ -2,6 +2,6 @@ using Avalonia.Styling;
 
 namespace AtomUI.Controls.Themes;
 
-public class TreeViewTheme : ControlTheme
+internal class TreeViewTheme : ControlTheme
 {
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/TreeView/Themes/TreeViewThemes.axaml b/src/AtomUI.Controls/TreeView/Themes/TreeViewThemes.axaml
index b5717f922..779131f08 100644
--- a/src/AtomUI.Controls/TreeView/Themes/TreeViewThemes.axaml
+++ b/src/AtomUI.Controls/TreeView/Themes/TreeViewThemes.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary 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">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="NodeSwitcherButtonTheme.axaml" />
diff --git a/src/AtomUI.Controls/Window/Themes/WindowThemes.axaml b/src/AtomUI.Controls/Window/Themes/WindowThemes.axaml
index 7a6593754..900a59e10 100644
--- a/src/AtomUI.Controls/Window/Themes/WindowThemes.axaml
+++ b/src/AtomUI.Controls/Window/Themes/WindowThemes.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="WindowTheme.axaml"/>
         <ResourceInclude Source="WindowResizerTheme.axaml"/>