diff --git a/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj b/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj
index 270551d9..f18ab0cf 100644
--- a/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj
+++ b/templates/csharp/app-mvvm/AvaloniaAppTemplate.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
@@ -22,11 +22,11 @@
     <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
-	<!--#if (ReactiveUIToolkitChosen) -->
-	<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-	<!--#else-->
+    <!--#if (ReactiveUIToolkitChosen) -->
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+    <!--#else-->
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
-	<!--#endif -->
-	<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+    <!--#endif -->
+    <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
 </Project>
diff --git a/templates/csharp/app-mvvm/app.manifest b/templates/csharp/app-mvvm/app.manifest
index dfdb7d3e..e0ce8d0e 100644
--- a/templates/csharp/app-mvvm/app.manifest
+++ b/templates/csharp/app-mvvm/app.manifest
@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
-	   For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
diff --git a/templates/csharp/app/app.manifest b/templates/csharp/app/app.manifest
index dfdb7d3e..e0ce8d0e 100644
--- a/templates/csharp/app/app.manifest
+++ b/templates/csharp/app/app.manifest
@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
-	   For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
diff --git a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
index e917d1e5..69ca7a1f 100644
--- a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
-	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/templates/csharp/xplat/AvaloniaTest.Desktop/app.manifest b/templates/csharp/xplat/AvaloniaTest.Desktop/app.manifest
index dfdb7d3e..e0ce8d0e 100644
--- a/templates/csharp/xplat/AvaloniaTest.Desktop/app.manifest
+++ b/templates/csharp/xplat/AvaloniaTest.Desktop/app.manifest
@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
-	   For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
diff --git a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
index d719e3d0..55d41f04 100644
--- a/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
+++ b/templates/csharp/xplat/AvaloniaTest.Web/AvaloniaTest.Web.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<TargetFramework>net7.0</TargetFramework>
-	<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-	<WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
-	<OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <WasmExtraFilesToDeploy Include="AppBundle\**" />
   </ItemGroup>
-	
+
   <ItemGroup>
     <PackageReference Include="Avalonia.Web" Version="$(AvaloniaVersion)" />
   </ItemGroup>
diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
index 9ea7e691..bab1d6d5 100644
--- a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
+++ b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
diff --git a/templates/csharp/xplat/Directory.Build.props b/templates/csharp/xplat/Directory.Build.props
index 6618107d..6da774b9 100644
--- a/templates/csharp/xplat/Directory.Build.props
+++ b/templates/csharp/xplat/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-	<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
     <AvaloniaVersion>11.0.0-preview4</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/templates/fsharp/app-mvvm/app.manifest b/templates/fsharp/app-mvvm/app.manifest
index dfdb7d3e..e0ce8d0e 100644
--- a/templates/fsharp/app-mvvm/app.manifest
+++ b/templates/fsharp/app-mvvm/app.manifest
@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
-	   For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
diff --git a/templates/fsharp/app/AvaloniaAppTemplate.fsproj b/templates/fsharp/app/AvaloniaAppTemplate.fsproj
index b93a472a..c0791d0e 100644
--- a/templates/fsharp/app/AvaloniaAppTemplate.fsproj
+++ b/templates/fsharp/app/AvaloniaAppTemplate.fsproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <TrimmerRootDescriptor Include="Roots.xml" />
   </ItemGroup>
-	
+
   <ItemGroup>
 <!--#if (AvaloniaStableChosen) -->
     <PackageReference Include="Avalonia" Version="0.10.18" />
diff --git a/templates/fsharp/app/app.manifest b/templates/fsharp/app/app.manifest
index dfdb7d3e..e0ce8d0e 100644
--- a/templates/fsharp/app/app.manifest
+++ b/templates/fsharp/app/app.manifest
@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
-	   For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
diff --git a/templates/fsharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.fsproj b/templates/fsharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.fsproj
index daa82e61..7dfb3304 100644
--- a/templates/fsharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.fsproj
+++ b/templates/fsharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/templates/fsharp/xplat/AvaloniaTest.Desktop/app.manifest b/templates/fsharp/xplat/AvaloniaTest.Desktop/app.manifest
index dfdb7d3e..e0ce8d0e 100644
--- a/templates/fsharp/xplat/AvaloniaTest.Desktop/app.manifest
+++ b/templates/fsharp/xplat/AvaloniaTest.Desktop/app.manifest
@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embeded controls.
-	   For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="AvaloniaTest.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
diff --git a/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj b/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj
index 91786d26..4fef6db5 100644
--- a/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj
+++ b/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<TargetFramework>net7.0</TargetFramework>
-	<Nullable>enable</Nullable>
-	<LangVersion>latest</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
-  <ItemGroup>    
+  <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
 
   <ItemGroup>
-	<Compile Include="ViewModels\ViewModelBase.fs" />
-	<Compile Include="ViewModels\MainViewModel.fs" />
-	<Compile Include="Views\MainWindow.axaml.fs" />
-	<Compile Include="Views\MainView.axaml.fs" />
-	<Compile Include="ViewLocator.fs" />
-	<Compile Include="App.axaml.fs" />
+    <Compile Include="ViewModels\ViewModelBase.fs" />
+    <Compile Include="ViewModels\MainViewModel.fs" />
+    <Compile Include="Views\MainWindow.axaml.fs" />
+    <Compile Include="Views\MainView.axaml.fs" />
+    <Compile Include="ViewLocator.fs" />
+    <Compile Include="App.axaml.fs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -23,11 +23,11 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-	<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-	<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-	<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
 </Project>
diff --git a/tests/build-test.ps1 b/tests/build-test.ps1
index b6604bd8..83dbd828 100644
--- a/tests/build-test.ps1
+++ b/tests/build-test.ps1
@@ -49,9 +49,9 @@ function Test-Template {
         $item = $doc.CreateElement('Compile')
         $item.SetAttribute('Include', 'NewUserControl.axaml.fs')
         $doc.Project.ItemGroup[0].PrependChild($item)
-		$item = $doc.CreateElement('Compile')
+        $item = $doc.CreateElement('Compile')
         $item.SetAttribute('Include', 'NewWindow.axaml.fs')
-		$doc.Project.ItemGroup[0].PrependChild($item)
+        $doc.Project.ItemGroup[0].PrependChild($item)
         $doc.Save($fsprojPath)
     }