diff --git a/templates/csharp/app-mvvm/.template.config/template.json b/templates/csharp/app-mvvm/.template.config/template.json
index 8a3a75cd..aadfc4f3 100644
--- a/templates/csharp/app-mvvm/.template.config/template.json
+++ b/templates/csharp/app-mvvm/.template.config/template.json
@@ -96,6 +96,27 @@
       "binding": "HostIdentifier"
     }
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(AvaloniaStableChosen)",
+          "exclude": [
+            "App.v11.axaml"
+          ]
+        },
+        {
+          "condition": "(!AvaloniaStableChosen)",
+          "exclude": [
+            "App.axaml"
+          ]
+        }
+      ],
+      "rename": {
+        "App.v11.axaml": "App.axaml"
+      }
+    }
+  ],
   "primaryOutputs": [
     { "path": "AvaloniaAppTemplate.csproj" },
     {
diff --git a/templates/csharp/app-mvvm/App.axaml b/templates/csharp/app-mvvm/App.axaml
index fe7acdf9..938d2f29 100644
--- a/templates/csharp/app-mvvm/App.axaml
+++ b/templates/csharp/app-mvvm/App.axaml
@@ -1,18 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             //#if (AvaloniaStableChosen)
              x:Class="AvaloniaAppTemplate.App">
-             //#else
-             x:Class="AvaloniaAppTemplate.App"
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
-             //#endif
 
     <Application.Styles>
-        //#if (AvaloniaStableChosen)
         <FluentTheme Mode="Light"/>
-        //#else
-        <FluentTheme />
-        //#endif
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/templates/csharp/app-mvvm/App.v11.axaml b/templates/csharp/app-mvvm/App.v11.axaml
new file mode 100644
index 00000000..b0de06e2
--- /dev/null
+++ b/templates/csharp/app-mvvm/App.v11.axaml
@@ -0,0 +1,10 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="AvaloniaAppTemplate.App"
+             RequestedThemeVariant="Default">
+             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
+
+    <Application.Styles>
+        <FluentTheme />
+    </Application.Styles>
+</Application>
\ No newline at end of file
diff --git a/templates/csharp/app/.template.config/template.json b/templates/csharp/app/.template.config/template.json
index 4ed87a7c..2ba37a29 100644
--- a/templates/csharp/app/.template.config/template.json
+++ b/templates/csharp/app/.template.config/template.json
@@ -72,6 +72,27 @@
       "binding": "HostIdentifier"
     }
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(AvaloniaStableChosen)",
+          "exclude": [
+            "App.v11.axaml"
+          ]
+        },
+        {
+          "condition": "(!AvaloniaStableChosen)",
+          "exclude": [
+            "App.axaml"
+          ]
+        }
+      ],
+      "rename": {
+        "App.v11.axaml": "App.axaml"
+      }
+    }
+  ],
   "primaryOutputs": [
     { "path": "AvaloniaAppTemplate.csproj" },
     {
diff --git a/templates/csharp/app/App.axaml b/templates/csharp/app/App.axaml
index fe7acdf9..938d2f29 100644
--- a/templates/csharp/app/App.axaml
+++ b/templates/csharp/app/App.axaml
@@ -1,18 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             //#if (AvaloniaStableChosen)
              x:Class="AvaloniaAppTemplate.App">
-             //#else
-             x:Class="AvaloniaAppTemplate.App"
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
-             //#endif
 
     <Application.Styles>
-        //#if (AvaloniaStableChosen)
         <FluentTheme Mode="Light"/>
-        //#else
-        <FluentTheme />
-        //#endif
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/templates/csharp/app/App.v11.axaml b/templates/csharp/app/App.v11.axaml
new file mode 100644
index 00000000..b0de06e2
--- /dev/null
+++ b/templates/csharp/app/App.v11.axaml
@@ -0,0 +1,10 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="AvaloniaAppTemplate.App"
+             RequestedThemeVariant="Default">
+             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
+
+    <Application.Styles>
+        <FluentTheme />
+    </Application.Styles>
+</Application>
\ No newline at end of file
diff --git a/templates/fsharp/app-mvvm/.template.config/template.json b/templates/fsharp/app-mvvm/.template.config/template.json
index 9bc0230d..4364d274 100644
--- a/templates/fsharp/app-mvvm/.template.config/template.json
+++ b/templates/fsharp/app-mvvm/.template.config/template.json
@@ -96,6 +96,27 @@
       "binding": "HostIdentifier"
     }
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(AvaloniaStableChosen)",
+          "exclude": [
+            "App.v11.axaml"
+          ]
+        },
+        {
+          "condition": "(!AvaloniaStableChosen)",
+          "exclude": [
+            "App.axaml"
+          ]
+        }
+      ],
+      "rename": {
+        "App.v11.axaml": "App.axaml"
+      }
+    }
+  ],
   "primaryOutputs": [
     { "path": "AvaloniaAppTemplate.fsproj" },
     {
diff --git a/templates/fsharp/app-mvvm/App.axaml b/templates/fsharp/app-mvvm/App.axaml
index fe7acdf9..938d2f29 100644
--- a/templates/fsharp/app-mvvm/App.axaml
+++ b/templates/fsharp/app-mvvm/App.axaml
@@ -1,18 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             //#if (AvaloniaStableChosen)
              x:Class="AvaloniaAppTemplate.App">
-             //#else
-             x:Class="AvaloniaAppTemplate.App"
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
-             //#endif
 
     <Application.Styles>
-        //#if (AvaloniaStableChosen)
         <FluentTheme Mode="Light"/>
-        //#else
-        <FluentTheme />
-        //#endif
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/templates/fsharp/app-mvvm/App.v11.axaml b/templates/fsharp/app-mvvm/App.v11.axaml
new file mode 100644
index 00000000..b0de06e2
--- /dev/null
+++ b/templates/fsharp/app-mvvm/App.v11.axaml
@@ -0,0 +1,10 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="AvaloniaAppTemplate.App"
+             RequestedThemeVariant="Default">
+             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
+
+    <Application.Styles>
+        <FluentTheme />
+    </Application.Styles>
+</Application>
\ No newline at end of file
diff --git a/templates/fsharp/app/.template.config/template.json b/templates/fsharp/app/.template.config/template.json
index b084ad52..b55ba6d8 100644
--- a/templates/fsharp/app/.template.config/template.json
+++ b/templates/fsharp/app/.template.config/template.json
@@ -72,6 +72,27 @@
       "binding": "HostIdentifier"
     }
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(AvaloniaStableChosen)",
+          "exclude": [
+            "App.v11.axaml"
+          ]
+        },
+        {
+          "condition": "(!AvaloniaStableChosen)",
+          "exclude": [
+            "App.axaml"
+          ]
+        }
+      ],
+      "rename": {
+        "App.v11.axaml": "App.axaml"
+      }
+    }
+  ],
   "primaryOutputs": [
     { "path": "AvaloniaAppTemplate.fsproj" },
     {
diff --git a/templates/fsharp/app/App.axaml b/templates/fsharp/app/App.axaml
index fe7acdf9..938d2f29 100644
--- a/templates/fsharp/app/App.axaml
+++ b/templates/fsharp/app/App.axaml
@@ -1,18 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             //#if (AvaloniaStableChosen)
              x:Class="AvaloniaAppTemplate.App">
-             //#else
-             x:Class="AvaloniaAppTemplate.App"
-             RequestedThemeVariant="Default">
-             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
-             //#endif
 
     <Application.Styles>
-        //#if (AvaloniaStableChosen)
         <FluentTheme Mode="Light"/>
-        //#else
-        <FluentTheme />
-        //#endif
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/templates/fsharp/app/App.v11.axaml b/templates/fsharp/app/App.v11.axaml
new file mode 100644
index 00000000..b0de06e2
--- /dev/null
+++ b/templates/fsharp/app/App.v11.axaml
@@ -0,0 +1,10 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="AvaloniaAppTemplate.App"
+             RequestedThemeVariant="Default">
+             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
+
+    <Application.Styles>
+        <FluentTheme />
+    </Application.Styles>
+</Application>
\ No newline at end of file