From 43b4664536884648a9310fd3d7371822c98508dc Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 14 Nov 2023 17:27:40 +0100
Subject: [PATCH 1/5] feat: modernize TemplateControl template

---
 .../NewTemplatedControl.axaml                 | 36 ++++++++++++++----
 .../NewTemplatedControl.axaml.cs              |  2 +
 .../NewTemplatedControl.axaml                 | 37 +++++++++++++++----
 .../NewTemplatedControl.axaml.fs              |  2 +
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
index 9634f151..fe6c4b69 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,16 +1,38 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
   <Design.PreviewWith>
-    <controls:NewTemplatedControl />
+    
+    <StackPanel Width="400" MinHeight="400">
+       <ThemeVariantScope RequestedThemeVariant="Default">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Light">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Dark">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+    </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="controls|NewTemplatedControl">
-    <!-- Set Defaults -->
+  <ResourceDictionary.ThemeDictionaries>
+      <ResourceDictionary x:Key="Default">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Light">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Dark">
+        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
+      </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+
+  <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" />
+        <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
index cba31245..bbc9fe4a 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
@@ -4,4 +4,6 @@ namespace AvaloniaAppTemplate.Namespace;
 
 public class NewTemplatedControl : TemplatedControl
 {
+    protected override Type StyleKeyOverride => 
+        typeof(Avalonia.Labs.Controls.ContentDialog);
 }
\ No newline at end of file
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
index 9634f151..89c35615 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,16 +1,37 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
-  <Design.PreviewWith>
-    <controls:NewTemplatedControl />
+  <Design.PreviewWith>    
+    <StackPanel Width="400" MinHeight="400">
+       <ThemeVariantScope RequestedThemeVariant="Default">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Light">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Dark">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+    </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="controls|NewTemplatedControl">
-    <!-- Set Defaults -->
+  <ResourceDictionary.ThemeDictionaries>
+      <ResourceDictionary x:Key="Default">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Light">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Dark">
+        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
+      </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+
+  <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" />
+        <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
index 0fb74e09..1f67d247 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
@@ -4,3 +4,5 @@ open Avalonia.Controls.Primitives
 
 type NewTemplatedControl () = 
     inherit TemplatedControl ()
+        override StyleKeyOverride
+            with get() = typedefof<NewTemplatedControl>

From c53b1d045312c889d3e2734e6db403d619bda0a6 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 16 Nov 2023 12:39:04 +0100
Subject: [PATCH 2/5] fix: Address review

---
 .../NewTemplatedControl.axaml                 | 36 +++++++++----------
 .../NewTemplatedControl.axaml.cs              |  2 --
 .../NewTemplatedControl.axaml                 | 31 ++++++++--------
 .../NewTemplatedControl.axaml.fs              |  2 --
 4 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
index fe6c4b69..3fb38fe0 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,33 +1,31 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
-  <Design.PreviewWith>
-    
-    <StackPanel Width="400" MinHeight="400">
+  <Design.PreviewWith>    
+    <StackPanel Width="400" Spacing="10">      
        <ThemeVariantScope RequestedThemeVariant="Default">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Light">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Dark">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
     </StackPanel>
   </Design.PreviewWith>
 
-  <ResourceDictionary.ThemeDictionaries>
-      <ResourceDictionary x:Key="Default">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Light">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Dark">
-        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
-      </ResourceDictionary>
-  </ResourceDictionary.ThemeDictionaries>
-
+ <!--
+   If you want support Theme variant see 
+   https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+ -->
+  
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
@@ -35,4 +33,4 @@
       </ControlTemplate>
     </Setter>
   </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
index bbc9fe4a..cba31245 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
@@ -4,6 +4,4 @@ namespace AvaloniaAppTemplate.Namespace;
 
 public class NewTemplatedControl : TemplatedControl
 {
-    protected override Type StyleKeyOverride => 
-        typeof(Avalonia.Labs.Controls.ContentDialog);
 }
\ No newline at end of file
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
index 89c35615..b4c684cb 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -2,31 +2,30 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
   <Design.PreviewWith>    
-    <StackPanel Width="400" MinHeight="400">
+    <StackPanel Width="400" Spacing="10">      
        <ThemeVariantScope RequestedThemeVariant="Default">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Light">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Dark">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
     </StackPanel>
   </Design.PreviewWith>
 
-  <ResourceDictionary.ThemeDictionaries>
-      <ResourceDictionary x:Key="Default">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Light">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Dark">
-        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
-      </ResourceDictionary>
-  </ResourceDictionary.ThemeDictionaries>
-
+ <!--
+   If you want support Theme variant see 
+   https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+ -->
+  
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
index 1f67d247..0fb74e09 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
@@ -4,5 +4,3 @@ open Avalonia.Controls.Primitives
 
 type NewTemplatedControl () = 
     inherit TemplatedControl ()
-        override StyleKeyOverride
-            with get() = typedefof<NewTemplatedControl>

From b71f1d10e95525476748282aa55064dffb806bb5 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 30 Nov 2023 09:26:55 +0100
Subject: [PATCH 3/5] fix: Address review

---
 .../NewTemplatedControl.axaml                 | 38 +++++++------------
 .../NewTemplatedControl.axaml                 | 36 +++++++-----------
 2 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
index 3fb38fe0..3aff9b93 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,36 +1,26 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
-  <Design.PreviewWith>    
+
+  <!--
+    If you want support Theme variant see 
+    Docs:   https://docs.avaloniaui.net/docs/basics/user-interface/styling/control-themes
+           https://docs.avaloniaui.net/docs/guides/styles-and-resources/how-to-use-theme-variants
+    Sample: https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+  -->
+  <Design.PreviewWith>
     <StackPanel Width="400" Spacing="10">      
-       <ThemeVariantScope RequestedThemeVariant="Default">
-          <StackPanel Background="{DynamicResource SystemRegionBrush}">
-            <controls:NewTemplatedControl />
-          </StackPanel>
-       </ThemeVariantScope>
-       <ThemeVariantScope RequestedThemeVariant="Light">
-          <StackPanel Background="{DynamicResource SystemRegionBrush}">
-            <controls:NewTemplatedControl />
-          </StackPanel>
-       </ThemeVariantScope>
-       <ThemeVariantScope RequestedThemeVariant="Dark">
-          <StackPanel Background="{DynamicResource SystemRegionBrush}">
-            <controls:NewTemplatedControl />
-          </StackPanel>
-       </ThemeVariantScope>
+        <StackPanel Background="{DynamicResource SystemRegionBrush}">
+          <controls:NewTemplatedControl />
+        </StackPanel>
     </StackPanel>
   </Design.PreviewWith>
-
- <!--
-   If you want support Theme variant see 
-   https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
- -->
-  
+ 
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
+        <TextBlock Text="Templated Control" Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
   </ControlTheme>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
index b4c684cb..3aff9b93 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,35 +1,25 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
-  <Design.PreviewWith>    
+
+  <!--
+    If you want support Theme variant see 
+    Docs:   https://docs.avaloniaui.net/docs/basics/user-interface/styling/control-themes
+           https://docs.avaloniaui.net/docs/guides/styles-and-resources/how-to-use-theme-variants
+    Sample: https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+  -->
+  <Design.PreviewWith>
     <StackPanel Width="400" Spacing="10">      
-       <ThemeVariantScope RequestedThemeVariant="Default">
-          <StackPanel Background="{DynamicResource SystemRegionBrush}">
-            <controls:NewTemplatedControl />
-          </StackPanel>
-       </ThemeVariantScope>
-       <ThemeVariantScope RequestedThemeVariant="Light">
-          <StackPanel Background="{DynamicResource SystemRegionBrush}">
-            <controls:NewTemplatedControl />
-          </StackPanel>
-       </ThemeVariantScope>
-       <ThemeVariantScope RequestedThemeVariant="Dark">
-          <StackPanel Background="{DynamicResource SystemRegionBrush}">
-            <controls:NewTemplatedControl />
-          </StackPanel>
-       </ThemeVariantScope>
+        <StackPanel Background="{DynamicResource SystemRegionBrush}">
+          <controls:NewTemplatedControl />
+        </StackPanel>
     </StackPanel>
   </Design.PreviewWith>
-
- <!--
-   If you want support Theme variant see 
-   https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
- -->
-  
+ 
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
+        <TextBlock Text="Templated Control" Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
   </ControlTheme>

From e2028a4904e6b9b80e7d2984b64bf11af1c5041a Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Thu, 30 Nov 2023 10:52:50 +0100
Subject: [PATCH 4/5] fix: Address review

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 .../csharp/templatedcontrol/NewTemplatedControl.axaml  | 10 ++++++----
 .../fsharp/templatedcontrol/NewTemplatedControl.axaml  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
index 3aff9b93..bc9135b0 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -3,11 +3,13 @@
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
 
   <!--
-    If you want support Theme variant see 
-    Docs:   https://docs.avaloniaui.net/docs/basics/user-interface/styling/control-themes
-           https://docs.avaloniaui.net/docs/guides/styles-and-resources/how-to-use-theme-variants
-    Sample: https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+    Additional resources 
+    Using Control Themes:
+         https://docs.avaloniaui.net/docs/basics/user-interface/styling/control-themes
+    Using Theme Variants:
+         https://docs.avaloniaui.net/docs/guides/styles-and-resources/how-to-use-theme-variants
   -->
+  
   <Design.PreviewWith>
     <StackPanel Width="400" Spacing="10">      
         <StackPanel Background="{DynamicResource SystemRegionBrush}">
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
index 3aff9b93..bc9135b0 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -3,11 +3,13 @@
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
 
   <!--
-    If you want support Theme variant see 
-    Docs:   https://docs.avaloniaui.net/docs/basics/user-interface/styling/control-themes
-           https://docs.avaloniaui.net/docs/guides/styles-and-resources/how-to-use-theme-variants
-    Sample: https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+    Additional resources 
+    Using Control Themes:
+         https://docs.avaloniaui.net/docs/basics/user-interface/styling/control-themes
+    Using Theme Variants:
+         https://docs.avaloniaui.net/docs/guides/styles-and-resources/how-to-use-theme-variants
   -->
+  
   <Design.PreviewWith>
     <StackPanel Width="400" Spacing="10">      
         <StackPanel Background="{DynamicResource SystemRegionBrush}">

From 792e13491a9323499a113bc02e9eaa8c10564bcf Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Wed, 13 Dec 2023 12:51:23 +0100
Subject: [PATCH 5/5] fix: Address review

---
 templates/csharp/templatedcontrol/NewTemplatedControl.axaml | 2 +-
 templates/fsharp/templatedcontrol/NewTemplatedControl.axaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
index bc9135b0..cc95995d 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -21,7 +21,7 @@
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" Foreground="{TemplateBinding Foreground}" />
+        <TextBlock Text="Templated Control" />
       </ControlTemplate>
     </Setter>
   </ControlTheme>
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
index bc9135b0..cc95995d 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -21,7 +21,7 @@
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" Foreground="{TemplateBinding Foreground}" />
+        <TextBlock Text="Templated Control" />
       </ControlTemplate>
     </Setter>
   </ControlTheme>