From 87a4fcac64c403c04a683fbee5b074a4c609fbba Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 30 Oct 2024 21:52:12 +0100
Subject: [PATCH] Move template and theme to core

---
 src/IconPacks.Avalonia.BoxIcons/BoxIcons.xaml |   2 +
 .../PackIconBoxIcons.cs                       |   7 +-
 .../PackIconBoxIcons.xaml                     |  36 +---
 .../IconPacks.Avalonia.Core.csproj            |   4 +
 src/IconPacks.Avalonia.Core/PackIcon.xaml     |  10 +
 .../PackIconControlBase.cs                    |   8 +-
 .../PackIconControlBase.xaml                  |  63 ++++++
 src/IconPacks.Avalonia/Icons.xaml             |   1 +
 src/IconPacks.Avalonia/PackIconControl.xaml   | 184 +-----------------
 9 files changed, 96 insertions(+), 219 deletions(-)
 create mode 100644 src/IconPacks.Avalonia.Core/PackIcon.xaml
 create mode 100644 src/IconPacks.Avalonia.Core/PackIconControlBase.xaml

diff --git a/src/IconPacks.Avalonia.BoxIcons/BoxIcons.xaml b/src/IconPacks.Avalonia.BoxIcons/BoxIcons.xaml
index fcb7289..48cd6f0 100644
--- a/src/IconPacks.Avalonia.BoxIcons/BoxIcons.xaml
+++ b/src/IconPacks.Avalonia.BoxIcons/BoxIcons.xaml
@@ -7,4 +7,6 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
+
+    <StyleInclude Source="avares://IconPacks.Avalonia.Core/PackIcon.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs
index f89da52..da8fbe7 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs
@@ -11,6 +11,11 @@ namespace IconPacks.Avalonia
     [MetaData("Boxicons", "https://boxicons.com/", "https://boxicons.com/usage/#license")]
     public class PackIconBoxIcons : PackIconControlBase
     {
+        public PackIconBoxIcons()
+        {
+            base.UpdateIconPseudoClasses(true, false, true);
+        }
+
         public static readonly StyledProperty<PackIconBoxIconsKind> KindProperty
             = AvaloniaProperty.Register<PackIconBoxIcons, PackIconBoxIconsKind>(nameof(Kind));
 
@@ -33,8 +38,6 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             {
                 UpdateData();
             }
-            
-            base.UpdateIconPseudoClasses(true, false, true);
         }
 
         protected override void SetKind<TKind>(TKind iconKind)
diff --git a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.xaml b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.xaml
index 00f0c32..33b3047 100644
--- a/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.xaml
+++ b/src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.xaml
@@ -7,39 +7,9 @@
         <iconPacks:PackIconBoxIcons Kind="RegularAtom" />
     </Design.PreviewWith>
 
-    <ControlTemplate x:Key="IconPacks.Avalonia.PackIconBoxIcons.Template" TargetType="iconPacks:PackIconBoxIcons">
-        <Grid>
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="PART_InnerGrid"
-                  Margin="{TemplateBinding BorderThickness}">
-                <Viewbox Margin="{TemplateBinding Padding}">
-                    <Path Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}}"
-                          Fill="{TemplateBinding Foreground}"
-                          Stretch="Uniform"
-                          UseLayoutRounding="False" />
-                    <Viewbox.RenderTransform>
-                        <ScaleTransform ScaleY="-1" />
-                    </Viewbox.RenderTransform>
-                </Viewbox>
-            </Grid>
-        </Grid>
-    </ControlTemplate>
-
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconBoxIcons.Theme" TargetType="iconPacks:PackIconBoxIcons">
-        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
-        <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="FlowDirection" Value="LeftToRight" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="UseLayoutRounding" Value="False" />
-        <Setter Property="Template" Value="{DynamicResource IconPacks.Avalonia.PackIconBoxIcons.Template}" />
-    </ControlTheme>
+    <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}"
diff --git a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
index 22834c3..8e8825a 100644
--- a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
+++ b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
@@ -14,6 +14,10 @@
         <RootNamespace>IconPacks.Avalonia</RootNamespace>
     </PropertyGroup>
 
+    <ItemGroup>
+        <AvaloniaResource Include="**/*.xaml" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="11.1.4" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
diff --git a/src/IconPacks.Avalonia.Core/PackIcon.xaml b/src/IconPacks.Avalonia.Core/PackIcon.xaml
new file mode 100644
index 0000000..a1042b6
--- /dev/null
+++ b/src/IconPacks.Avalonia.Core/PackIcon.xaml
@@ -0,0 +1,10 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <MergeResourceInclude Source="avares://IconPacks.Avalonia.Core/PackIconControlBase.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.cs b/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
index 3001aab..80fa4b9 100644
--- a/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
+++ b/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
@@ -27,19 +27,19 @@ public abstract class PackIconControlBase : PackIconBase
         /// </summary>
         /// <returns>":icon-data-flipped-vertically"</returns>
         public const string IconDataFlippedVerticallyPseudoClass = ":icon-data-flipped-vertically";
-        
+
         /// <summary>
         /// A string representing the pseudo-class when the icon data is drawn filled
         /// </summary>
         /// <returns>":icon-filled"</returns>
         public const string IconFilledPseudoClass = ":icon-filled";
-        
+
         /// <summary>
         /// A string representing the pseudo-class when the icon data is drawn outlined
         /// </summary>
-        /// <returns>":icon-outlided"</returns>
+        /// <returns>":icon-outlined"</returns>
         public const string IconOutlinedPseudoClass = ":icon-outlined";
-        
+
         protected PackIconControlBase()
         {
             AffectsRender<PackIconControlBase>(SpinProperty, SpinDurationProperty, OpacityProperty, SpinEasingFunctionProperty, FlipProperty, RotationAngleProperty);
diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml b/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml
new file mode 100644
index 0000000..af7bcc6
--- /dev/null
+++ b/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml
@@ -0,0 +1,63 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:iconPacks="urn:iconpacks-avalonia"
+                    xmlns:converter="clr-namespace:IconPacks.Avalonia.Converter;assembly=IconPacks.Avalonia.Core"
+                    x:ClassModifier="internal">
+
+    <ControlTemplate x:Key="IconPacks.Avalonia.PackIconControlBase.Template" TargetType="iconPacks:PackIconControlBase">
+        <Grid>
+            <Border Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}" />
+            <Grid x:Name="PART_InnerGrid"
+                  Margin="{TemplateBinding BorderThickness}">
+                <Viewbox x:Name="PART_ViewBox"
+                         Margin="{TemplateBinding Padding}">
+                    <Path x:Name="PART_IconPath"
+                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={x:Static converter:NullToUnsetValueConverter.Instance}}"
+                          Stretch="Uniform"
+                          UseLayoutRounding="False" />
+                </Viewbox>
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTheme x:Key="IconPacks.Avalonia.PackIconControlBase.Theme" TargetType="iconPacks:PackIconControlBase">
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+        <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="FlowDirection" Value="LeftToRight" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="Template" Value="{DynamicResource IconPacks.Avalonia.PackIconControlBase.Template}" />
+
+        <!-- icon is filled -->
+        <Style Selector="^:icon-filled /template/ Path#PART_IconPath">
+            <Setter Property="Fill" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+        </Style>
+
+        <!-- icon is outlined -->
+        <Style Selector="^:icon-outlined /template/ Path#PART_IconPath">
+            <Setter Property="Stroke" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+            <Setter Property="StrokeThickness" Value="2" />
+            <Setter Property="StrokeLineCap" Value="Round" />
+            <Setter Property="StrokeJoin" Value="Round" />
+            <Setter Property="Width" Value="24" />
+            <Setter Property="Height" Value="24" />
+        </Style>
+
+        <!-- flipped icon data -->
+        <Style Selector="^:icon-data-flipped-vertically /template/ Viewbox#PART_ViewBox">
+            <Setter Property="RenderTransform" Value="scale(1, -1)" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type iconPacks:PackIconControlBase}"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
+                  TargetType="iconPacks:PackIconControlBase" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia/Icons.xaml b/src/IconPacks.Avalonia/Icons.xaml
index 15bd6f4..18bb3db 100644
--- a/src/IconPacks.Avalonia/Icons.xaml
+++ b/src/IconPacks.Avalonia/Icons.xaml
@@ -8,5 +8,6 @@
         </ResourceDictionary>
     </Styles.Resources>
 
+    <StyleInclude Source="avares://IconPacks.Avalonia.Core/PackIcon.xaml"/>
     <StyleInclude Source="avares://IconPacks.Avalonia.BoxIcons/BoxIcons.xaml"/>
 </Styles>
\ No newline at end of file
diff --git a/src/IconPacks.Avalonia/PackIconControl.xaml b/src/IconPacks.Avalonia/PackIconControl.xaml
index a6e48dc..1fbb4b7 100644
--- a/src/IconPacks.Avalonia/PackIconControl.xaml
+++ b/src/IconPacks.Avalonia/PackIconControl.xaml
@@ -1,191 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:iconPacks="urn:iconpacks-avalonia"
-                    xmlns:converter="clr-namespace:IconPacks.Avalonia.Converter;assembly=IconPacks.Avalonia.Core"
                     x:ClassModifier="internal">
-    
+
     <Design.PreviewWith>
         <iconPacks:PackIconControl Kind="{x:Static iconPacks:PackIconBoxIconsKind.SolidBowlHot}" />
     </Design.PreviewWith>
-    
-    
-    <ControlTemplate x:Key="IconPacks.Avalonia.PackIconControl.Template" TargetType="iconPacks:PackIconControl">
-        <Grid>
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="PART_InnerGrid"
-                  Margin="{TemplateBinding BorderThickness}"
-                  RenderTransformOrigin="0.5 0.5">
-                <Viewbox x:Name="PART_ViewBox" 
-                         Margin="{TemplateBinding Padding}">
-                    <Path x:Name="PART_IconPath"
-                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={x:Static converter:NullToUnsetValueConverter.Instance}}"
-                          Stretch="Uniform"
-                          UseLayoutRounding="False" />
-                </Viewbox>
-            </Grid>
-        </Grid>
-        <!-- <ControlTemplate.Triggers> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconBootstrapIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconBoxIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconCodiconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconCooliconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconEvaIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconFeatherIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="Fill" Value="{x:Null}" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="Height" Value="24" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground, Mode=OneWay}" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="StrokeEndLineCap" Value="Round" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="StrokeLineJoin" Value="Round" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="StrokeStartLineCap" Value="Round" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="StrokeThickness" Value="2" /> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="Width" Value="24" /> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconFileIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconFontaudioKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconFontistoKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconForkAwesomeKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconJamIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconLucideKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconRPGAwesomeKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconTypiconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!--     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Kind, Converter={converter:DataTypeValueConverter}}" -->
-        <!--                  Value="{x:Type iconPacks:PackIconVaadinIconsKind}"> -->
-        <!--         <Setter TargetName="PART_IconPath" Property="LayoutTransform"> -->
-        <!--             <Setter.Value> -->
-        <!--                 <ScaleTransform ScaleY="-1" /> -->
-        <!--             </Setter.Value> -->
-        <!--         </Setter> -->
-        <!--     </DataTrigger> -->
-        <!-- </ControlTemplate.Triggers> -->
-    </ControlTemplate>
-
-    <ControlTheme x:Key="IconPacks.Avalonia.PackIconControl.Theme" TargetType="iconPacks:PackIconControl">
-        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
-        <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="FlowDirection" Value="LeftToRight" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="UseLayoutRounding" Value="False" />
-        <Setter Property="Template" Value="{DynamicResource IconPacks.Avalonia.PackIconControl.Template}" />
-        
-        <!-- icon is filled -->
-        <Style Selector="^:icon-filled /template/ Path#PART_IconPath">
-            <Setter Property="Fill" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
-        </Style>
 
-        <!-- icon is outlined -->
-        <Style Selector="^:icon-outlined /template/ Path#PART_IconPath">
-            <Setter Property="Stroke" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
-            <Setter Property="StrokeThickness" Value="2" />
-            <Setter Property="StrokeLineCap" Value="Round" />
-            <Setter Property="StrokeJoin"  Value="Round" />
-        </Style>
-
-        <!-- flipped icon data -->
-        <Style Selector="^:icon-data-flipped-vertically /template/ Viewbox#PART_ViewBox">
-            <Setter Property="RenderTransform" Value="scale(1, -1)" />
-        </Style>
-        
-        
-    </ControlTheme>
+    <ControlTheme x:Key="IconPacks.Avalonia.PackIconControl.Theme"
+                  BasedOn="{StaticResource IconPacks.Avalonia.PackIconControlBase.Theme}"
+                  TargetType="iconPacks:PackIconControl" />
 
     <ControlTheme x:Key="{x:Type iconPacks:PackIconControl}"
                   BasedOn="{StaticResource IconPacks.Avalonia.PackIconControl.Theme}"