From e8a8008c59fd813235e638b6b2445eae53b92b65 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Tue, 26 Nov 2024 23:07:41 +0100
Subject: [PATCH] refactor: remove unnecessary control themes

---
 .../PackIconBootstrapIcons.axaml                            | 6 +-----
 src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml      | 6 +-----
 .../PackIconCircumIcons.axaml                               | 6 +-----
 src/IconPacks.Avalonia.Codicons/PackIconCodicons.axaml      | 6 +-----
 src/IconPacks.Avalonia.Coolicons/PackIconCoolicons.axaml    | 6 +-----
 src/IconPacks.Avalonia.Entypo/PackIconEntypo.axaml          | 6 +-----
 src/IconPacks.Avalonia.EvaIcons/PackIconEvaIcons.axaml      | 6 +-----
 .../PackIconFeatherIcons.axaml                              | 6 +-----
 src/IconPacks.Avalonia.FileIcons/PackIconFileIcons.axaml    | 6 +-----
 .../PackIconFontAwesome.axaml                               | 6 +-----
 src/IconPacks.Avalonia.Fontaudio/PackIconFontaudio.axaml    | 6 +-----
 src/IconPacks.Avalonia.Fontisto/PackIconFontisto.axaml      | 6 +-----
 .../PackIconForkAwesome.axaml                               | 6 +-----
 src/IconPacks.Avalonia.GameIcons/PackIconGameIcons.axaml    | 6 +-----
 src/IconPacks.Avalonia.Ionicons/PackIconIonicons.axaml      | 6 +-----
 src/IconPacks.Avalonia.JamIcons/PackIconJamIcons.axaml      | 6 +-----
 src/IconPacks.Avalonia.Lucide/PackIconLucide.axaml          | 6 +-----
 src/IconPacks.Avalonia.Material/PackIconMaterial.axaml      | 6 +-----
 .../PackIconMaterialDesign.axaml                            | 6 +-----
 .../PackIconMaterialLight.axaml                             | 6 +-----
 .../PackIconMemoryIcons.axaml                               | 6 +-----
 src/IconPacks.Avalonia.Microns/PackIconMicrons.axaml        | 6 +-----
 src/IconPacks.Avalonia.Modern/PackIconModern.axaml          | 6 +-----
 src/IconPacks.Avalonia.Octicons/PackIconOcticons.axaml      | 6 +-----
 .../PackIconPhosphorIcons.axaml                             | 6 +-----
 src/IconPacks.Avalonia.PicolIcons/PackIconPicolIcons.axaml  | 6 +-----
 .../PackIconPixelartIcons.axaml                             | 6 +-----
 src/IconPacks.Avalonia.RPGAwesome/PackIconRPGAwesome.axaml  | 6 +-----
 src/IconPacks.Avalonia.RadixIcons/PackIconRadixIcons.axaml  | 6 +-----
 src/IconPacks.Avalonia.RemixIcon/PackIconRemixIcon.axaml    | 6 +-----
 .../PackIconSimpleIcons.axaml                               | 6 +-----
 src/IconPacks.Avalonia.Typicons/PackIconTypicons.axaml      | 6 +-----
 src/IconPacks.Avalonia.Unicons/PackIconUnicons.axaml        | 6 +-----
 .../PackIconVaadinIcons.axaml                               | 6 +-----
 .../PackIconWeatherIcons.axaml                              | 6 +-----
 src/IconPacks.Avalonia.Zondicons/PackIconZondicons.axaml    | 6 +-----
 36 files changed, 36 insertions(+), 180 deletions(-)

diff --git a/src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIcons.axaml b/src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIcons.axaml
index a1fee79..542c269 100644
--- a/src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIcons.axaml
+++ b/src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconBootstrapIcons Kind="_0Circle" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconBootstrapIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconBootstrapIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconBootstrapIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconBootstrapIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconBootstrapIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml
index a58aa25..3f06280 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconBoxIcons Kind="Logos_500px" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconBoxIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconBoxIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconBoxIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconBoxIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconBoxIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.CircumIcons/PackIconCircumIcons.axaml b/src/IconPacks.Avalonia.CircumIcons/PackIconCircumIcons.axaml
index 9ad41fa..b7c96a1 100644
--- a/src/IconPacks.Avalonia.CircumIcons/PackIconCircumIcons.axaml
+++ b/src/IconPacks.Avalonia.CircumIcons/PackIconCircumIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconCircumIcons Kind="AirportSign1" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconCircumIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconCircumIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconCircumIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconCircumIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconCircumIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Codicons/PackIconCodicons.axaml b/src/IconPacks.Avalonia.Codicons/PackIconCodicons.axaml
index 9b0e584..b0f4019 100644
--- a/src/IconPacks.Avalonia.Codicons/PackIconCodicons.axaml
+++ b/src/IconPacks.Avalonia.Codicons/PackIconCodicons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconCodicons Kind="Account" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconCodicons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconCodicons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconCodicons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconCodicons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconCodicons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Coolicons/PackIconCoolicons.axaml b/src/IconPacks.Avalonia.Coolicons/PackIconCoolicons.axaml
index 6d1c73d..1b758b4 100644
--- a/src/IconPacks.Avalonia.Coolicons/PackIconCoolicons.axaml
+++ b/src/IconPacks.Avalonia.Coolicons/PackIconCoolicons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconCoolicons Kind="AddColumn" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconCoolicons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconCoolicons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconCoolicons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconCoolicons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconCoolicons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Entypo/PackIconEntypo.axaml b/src/IconPacks.Avalonia.Entypo/PackIconEntypo.axaml
index 25afe4c..d2b04f2 100644
--- a/src/IconPacks.Avalonia.Entypo/PackIconEntypo.axaml
+++ b/src/IconPacks.Avalonia.Entypo/PackIconEntypo.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconEntypo Kind="_500px" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconEntypo.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconEntypo" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconEntypo}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconEntypo.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconEntypo" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.EvaIcons/PackIconEvaIcons.axaml b/src/IconPacks.Avalonia.EvaIcons/PackIconEvaIcons.axaml
index 7be5b85..869307c 100644
--- a/src/IconPacks.Avalonia.EvaIcons/PackIconEvaIcons.axaml
+++ b/src/IconPacks.Avalonia.EvaIcons/PackIconEvaIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconEvaIcons Kind="Activity" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconEvaIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconEvaIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconEvaIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconEvaIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconEvaIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.FeatherIcons/PackIconFeatherIcons.axaml b/src/IconPacks.Avalonia.FeatherIcons/PackIconFeatherIcons.axaml
index defe54d..ada0c37 100644
--- a/src/IconPacks.Avalonia.FeatherIcons/PackIconFeatherIcons.axaml
+++ b/src/IconPacks.Avalonia.FeatherIcons/PackIconFeatherIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconFeatherIcons Kind="Activity" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconFeatherIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconFeatherIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconFeatherIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconFeatherIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconFeatherIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.FileIcons/PackIconFileIcons.axaml b/src/IconPacks.Avalonia.FileIcons/PackIconFileIcons.axaml
index c903b1f..2463572 100644
--- a/src/IconPacks.Avalonia.FileIcons/PackIconFileIcons.axaml
+++ b/src/IconPacks.Avalonia.FileIcons/PackIconFileIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconFileIcons Kind="_1c" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconFileIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconFileIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconFileIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconFileIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconFileIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.FontAwesome/PackIconFontAwesome.axaml b/src/IconPacks.Avalonia.FontAwesome/PackIconFontAwesome.axaml
index b6aae81..f0bb231 100644
--- a/src/IconPacks.Avalonia.FontAwesome/PackIconFontAwesome.axaml
+++ b/src/IconPacks.Avalonia.FontAwesome/PackIconFontAwesome.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconFontAwesome Kind="_0Solid" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconFontAwesome.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconFontAwesome" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconFontAwesome}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconFontAwesome.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconFontAwesome" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Fontaudio/PackIconFontaudio.axaml b/src/IconPacks.Avalonia.Fontaudio/PackIconFontaudio.axaml
index 51fb6e5..aca47f2 100644
--- a/src/IconPacks.Avalonia.Fontaudio/PackIconFontaudio.axaml
+++ b/src/IconPacks.Avalonia.Fontaudio/PackIconFontaudio.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconFontaudio Kind="Adr" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconFontaudio.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconFontaudio" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconFontaudio}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconFontaudio.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconFontaudio" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Fontisto/PackIconFontisto.axaml b/src/IconPacks.Avalonia.Fontisto/PackIconFontisto.axaml
index 8a6339d..b1d0f4b 100644
--- a/src/IconPacks.Avalonia.Fontisto/PackIconFontisto.axaml
+++ b/src/IconPacks.Avalonia.Fontisto/PackIconFontisto.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconFontisto Kind="_500px" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconFontisto.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconFontisto" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconFontisto}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconFontisto.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconFontisto" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.ForkAwesome/PackIconForkAwesome.axaml b/src/IconPacks.Avalonia.ForkAwesome/PackIconForkAwesome.axaml
index a4e3590..1647b88 100644
--- a/src/IconPacks.Avalonia.ForkAwesome/PackIconForkAwesome.axaml
+++ b/src/IconPacks.Avalonia.ForkAwesome/PackIconForkAwesome.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconForkAwesome Kind="_500px" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconForkAwesome.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconForkAwesome" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconForkAwesome}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconForkAwesome.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconForkAwesome" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.GameIcons/PackIconGameIcons.axaml b/src/IconPacks.Avalonia.GameIcons/PackIconGameIcons.axaml
index 945bdf8..95baadf 100644
--- a/src/IconPacks.Avalonia.GameIcons/PackIconGameIcons.axaml
+++ b/src/IconPacks.Avalonia.GameIcons/PackIconGameIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconGameIcons Kind="_3dGlasses" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconGameIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconGameIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconGameIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconGameIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconGameIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Ionicons/PackIconIonicons.axaml b/src/IconPacks.Avalonia.Ionicons/PackIconIonicons.axaml
index c0c6d1c..fc05d24 100644
--- a/src/IconPacks.Avalonia.Ionicons/PackIconIonicons.axaml
+++ b/src/IconPacks.Avalonia.Ionicons/PackIconIonicons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconIonicons Kind="AddCircleOutlineiOS" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconIonicons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconIonicons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconIonicons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconIonicons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconIonicons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.JamIcons/PackIconJamIcons.axaml b/src/IconPacks.Avalonia.JamIcons/PackIconJamIcons.axaml
index 66d96e1..7560131 100644
--- a/src/IconPacks.Avalonia.JamIcons/PackIconJamIcons.axaml
+++ b/src/IconPacks.Avalonia.JamIcons/PackIconJamIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconJamIcons Kind="_500px" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconJamIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconJamIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconJamIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconJamIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconJamIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Lucide/PackIconLucide.axaml b/src/IconPacks.Avalonia.Lucide/PackIconLucide.axaml
index fa5183f..ef75fe8 100644
--- a/src/IconPacks.Avalonia.Lucide/PackIconLucide.axaml
+++ b/src/IconPacks.Avalonia.Lucide/PackIconLucide.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconLucide Kind="AArrowDown" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconLucide.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconLucide" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconLucide}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconLucide.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconLucide" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Material/PackIconMaterial.axaml b/src/IconPacks.Avalonia.Material/PackIconMaterial.axaml
index 9cc859d..e40c383 100644
--- a/src/IconPacks.Avalonia.Material/PackIconMaterial.axaml
+++ b/src/IconPacks.Avalonia.Material/PackIconMaterial.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconMaterial Kind="Abacus" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconMaterial.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconMaterial" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconMaterial}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconMaterial.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconMaterial" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.MaterialDesign/PackIconMaterialDesign.axaml b/src/IconPacks.Avalonia.MaterialDesign/PackIconMaterialDesign.axaml
index c3d8933..89de887 100644
--- a/src/IconPacks.Avalonia.MaterialDesign/PackIconMaterialDesign.axaml
+++ b/src/IconPacks.Avalonia.MaterialDesign/PackIconMaterialDesign.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconMaterialDesign Kind="_10k" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconMaterialDesign.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconMaterialDesign" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconMaterialDesign}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconMaterialDesign.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconMaterialDesign" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.MaterialLight/PackIconMaterialLight.axaml b/src/IconPacks.Avalonia.MaterialLight/PackIconMaterialLight.axaml
index 7d8f5c5..242f354 100644
--- a/src/IconPacks.Avalonia.MaterialLight/PackIconMaterialLight.axaml
+++ b/src/IconPacks.Avalonia.MaterialLight/PackIconMaterialLight.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconMaterialLight Kind="Account" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconMaterialLight.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconMaterialLight" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconMaterialLight}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconMaterialLight.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconMaterialLight" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.MemoryIcons/PackIconMemoryIcons.axaml b/src/IconPacks.Avalonia.MemoryIcons/PackIconMemoryIcons.axaml
index 36e6ef4..89279f6 100644
--- a/src/IconPacks.Avalonia.MemoryIcons/PackIconMemoryIcons.axaml
+++ b/src/IconPacks.Avalonia.MemoryIcons/PackIconMemoryIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconMemoryIcons Kind="MemoryAccount" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconMemoryIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconMemoryIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconMemoryIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconMemoryIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconMemoryIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Microns/PackIconMicrons.axaml b/src/IconPacks.Avalonia.Microns/PackIconMicrons.axaml
index b8e27f8..d689868 100644
--- a/src/IconPacks.Avalonia.Microns/PackIconMicrons.axaml
+++ b/src/IconPacks.Avalonia.Microns/PackIconMicrons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconMicrons Kind="Above" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconMicrons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconMicrons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconMicrons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconMicrons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconMicrons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Modern/PackIconModern.axaml b/src/IconPacks.Avalonia.Modern/PackIconModern.axaml
index 847ca38..8a683dd 100644
--- a/src/IconPacks.Avalonia.Modern/PackIconModern.axaml
+++ b/src/IconPacks.Avalonia.Modern/PackIconModern.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconModern Kind="_3d3ds" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconModern.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconModern" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconModern}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconModern.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconModern" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Octicons/PackIconOcticons.axaml b/src/IconPacks.Avalonia.Octicons/PackIconOcticons.axaml
index c0dfe9c..f30b525 100644
--- a/src/IconPacks.Avalonia.Octicons/PackIconOcticons.axaml
+++ b/src/IconPacks.Avalonia.Octicons/PackIconOcticons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconOcticons Kind="Accessibility" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconOcticons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconOcticons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconOcticons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconOcticons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconOcticons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.PhosphorIcons/PackIconPhosphorIcons.axaml b/src/IconPacks.Avalonia.PhosphorIcons/PackIconPhosphorIcons.axaml
index 853d142..e3ed5c3 100644
--- a/src/IconPacks.Avalonia.PhosphorIcons/PackIconPhosphorIcons.axaml
+++ b/src/IconPacks.Avalonia.PhosphorIcons/PackIconPhosphorIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconPhosphorIcons Kind="Acorn" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconPhosphorIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconPhosphorIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconPhosphorIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconPhosphorIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconPhosphorIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.PicolIcons/PackIconPicolIcons.axaml b/src/IconPacks.Avalonia.PicolIcons/PackIconPicolIcons.axaml
index 9104384..ba9b049 100644
--- a/src/IconPacks.Avalonia.PicolIcons/PackIconPicolIcons.axaml
+++ b/src/IconPacks.Avalonia.PicolIcons/PackIconPicolIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconPicolIcons Kind="Accept" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconPicolIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconPicolIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconPicolIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconPicolIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconPicolIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.PixelartIcons/PackIconPixelartIcons.axaml b/src/IconPacks.Avalonia.PixelartIcons/PackIconPixelartIcons.axaml
index 4bcfdcd..988b46c 100644
--- a/src/IconPacks.Avalonia.PixelartIcons/PackIconPixelartIcons.axaml
+++ b/src/IconPacks.Avalonia.PixelartIcons/PackIconPixelartIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconPixelartIcons Kind="_4g" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconPixelartIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconPixelartIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconPixelartIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconPixelartIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconPixelartIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.RPGAwesome/PackIconRPGAwesome.axaml b/src/IconPacks.Avalonia.RPGAwesome/PackIconRPGAwesome.axaml
index eecc3af..68233ad 100644
--- a/src/IconPacks.Avalonia.RPGAwesome/PackIconRPGAwesome.axaml
+++ b/src/IconPacks.Avalonia.RPGAwesome/PackIconRPGAwesome.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconRPGAwesome Kind="Acid" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconRPGAwesome.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconRPGAwesome" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconRPGAwesome}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconRPGAwesome.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconRPGAwesome" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.RadixIcons/PackIconRadixIcons.axaml b/src/IconPacks.Avalonia.RadixIcons/PackIconRadixIcons.axaml
index 79a9dae..15cacf6 100644
--- a/src/IconPacks.Avalonia.RadixIcons/PackIconRadixIcons.axaml
+++ b/src/IconPacks.Avalonia.RadixIcons/PackIconRadixIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconRadixIcons Kind="Accessibility" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconRadixIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconRadixIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconRadixIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconRadixIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconRadixIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.RemixIcon/PackIconRemixIcon.axaml b/src/IconPacks.Avalonia.RemixIcon/PackIconRemixIcon.axaml
index 2f2ebf3..637d14b 100644
--- a/src/IconPacks.Avalonia.RemixIcon/PackIconRemixIcon.axaml
+++ b/src/IconPacks.Avalonia.RemixIcon/PackIconRemixIcon.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconRemixIcon Kind="_24HoursFill" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconRemixIcon.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconRemixIcon" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconRemixIcon}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconRemixIcon.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconRemixIcon" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.SimpleIcons/PackIconSimpleIcons.axaml b/src/IconPacks.Avalonia.SimpleIcons/PackIconSimpleIcons.axaml
index ccd1036..a164886 100644
--- a/src/IconPacks.Avalonia.SimpleIcons/PackIconSimpleIcons.axaml
+++ b/src/IconPacks.Avalonia.SimpleIcons/PackIconSimpleIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconSimpleIcons Kind="_1001Tracklists" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconSimpleIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconSimpleIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconSimpleIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconSimpleIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconSimpleIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Typicons/PackIconTypicons.axaml b/src/IconPacks.Avalonia.Typicons/PackIconTypicons.axaml
index 100e6a3..30bc696 100644
--- a/src/IconPacks.Avalonia.Typicons/PackIconTypicons.axaml
+++ b/src/IconPacks.Avalonia.Typicons/PackIconTypicons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconTypicons Kind="AdjustBrightness" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconTypicons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconTypicons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconTypicons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconTypicons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconTypicons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Unicons/PackIconUnicons.axaml b/src/IconPacks.Avalonia.Unicons/PackIconUnicons.axaml
index 1ad1bf8..33b7d6c 100644
--- a/src/IconPacks.Avalonia.Unicons/PackIconUnicons.axaml
+++ b/src/IconPacks.Avalonia.Unicons/PackIconUnicons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconUnicons Kind="_0PlusLine" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconUnicons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconUnicons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconUnicons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconUnicons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconUnicons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.VaadinIcons/PackIconVaadinIcons.axaml b/src/IconPacks.Avalonia.VaadinIcons/PackIconVaadinIcons.axaml
index 5cdc6c7..5a842b4 100644
--- a/src/IconPacks.Avalonia.VaadinIcons/PackIconVaadinIcons.axaml
+++ b/src/IconPacks.Avalonia.VaadinIcons/PackIconVaadinIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconVaadinIcons Kind="Abacus" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconVaadinIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconVaadinIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconVaadinIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconVaadinIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconVaadinIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.WeatherIcons/PackIconWeatherIcons.axaml b/src/IconPacks.Avalonia.WeatherIcons/PackIconWeatherIcons.axaml
index debdd76..3baedde 100644
--- a/src/IconPacks.Avalonia.WeatherIcons/PackIconWeatherIcons.axaml
+++ b/src/IconPacks.Avalonia.WeatherIcons/PackIconWeatherIcons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconWeatherIcons Kind="Alien" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconWeatherIcons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconWeatherIcons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconWeatherIcons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconWeatherIcons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconWeatherIcons" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Zondicons/PackIconZondicons.axaml b/src/IconPacks.Avalonia.Zondicons/PackIconZondicons.axaml
index ab29b8c..26abd27 100644
--- a/src/IconPacks.Avalonia.Zondicons/PackIconZondicons.axaml
+++ b/src/IconPacks.Avalonia.Zondicons/PackIconZondicons.axaml
@@ -7,12 +7,8 @@
         <iconPacks:PackIconZondicons Kind="AddOutline" />
     </Design.PreviewWith>
 
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconZondicons.Theme"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
-                  TargetType="iconPacks:PackIconZondicons" />
-
     <ControlTheme x:Key="{x:Type iconPacks:PackIconZondicons}"
-                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconZondicons.Theme}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
                   TargetType="iconPacks:PackIconZondicons" />
 
 </ResourceDictionary>
\ No newline at end of file