diff --git a/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/OpenSilverApplication.MauiHybrid.csproj b/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/OpenSilverApplication.MauiHybrid.csproj
index b5b47a1..7c00878 100644
--- a/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/OpenSilverApplication.MauiHybrid.csproj
+++ b/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/OpenSilverApplication.MauiHybrid.csproj
@@ -8,7 +8,7 @@
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$WindowsTarget$</TargetFrameworks>
         <!--#endif-->
         <!--#if(mauiPlatformsBasic == '' && windowsTarget != '')-->
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$WindowsTarget$</TargetFrameworks>
+        <TargetFrameworks>$WindowsTarget$</TargetFrameworks>
         <!--#endif-->
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
         <!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
@@ -29,10 +29,10 @@
         <Nullable>enable</Nullable>
 
         <!-- Display name -->
-        <ApplicationTitle>OpenSilverApplication.MauiHybrid</ApplicationTitle>
+        <ApplicationTitle>OpenSilverApplication</ApplicationTitle>
 
         <!-- App Identifier -->
-        <ApplicationId>com.companyname.opensilverapplication.mauihybrid</ApplicationId>
+        <ApplicationId>com.companyname.opensilverapplication</ApplicationId>
 
         <!-- Versions -->
         <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
diff --git a/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/wwwroot/index.html b/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/wwwroot/index.html
index bf11f7a..f76fea1 100644
--- a/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/wwwroot/index.html
+++ b/src/OpenSilver.CLI/CommonProjectTemplates/OpenSilverApplication.MauiHybrid/wwwroot/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
-    <title>OpenSilverApplication.MauiHybrid</title>
+    <title>OpenSilverApplication</title>
     <base href="/" />
     <link rel="icon" href="data:,">
 </head>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
index 5af4c33..91ebe6d 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
@@ -5,45 +5,47 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow"
         WindowStartupLocation="CenterScreen"
-        ResizeMode="NoResize"
         mc:Ignorable="d"
-        Title="OpenSilver Configuration" Height="600" Width="660" Icon="Icon.ico">
+        SizeToContent="WidthAndHeight"
+        ResizeMode="NoResize"
+        Title="OpenSilver Configuration" Icon="Icon.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
-            <RowDefinition Height="auto" />
-            <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="50" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition Width="10*"/>
-            <ColumnDefinition/>
+            <ColumnDefinition Width="50"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="50"/>
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Column="1" Grid.Row="1" x:Name="chooseThemesCollection" >
+        <Grid Grid.Row="1" Grid.Column="1" x:Name="chooseThemesCollection">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
-            <TextBlock  Text="Choose a theme:"  FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,20" />
-            <local:ThemeCollectionView   SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Row="1"   />
+            <TextBlock Text="Choose a theme:" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,20" />
+            <local:ThemeCollectionView SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Row="1" />
         </Grid>
 
-        <Grid  Grid.Row="2" Grid.Column="1"  x:Name="DotNetVersionPanel">
+        <Grid Grid.Row="2" Grid.Column="1" x:Name="DotNetVersionPanel">
             <Grid.RowDefinitions>
-                <RowDefinition Height="auto" />
-                <RowDefinition Height="auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*"/>
                 <ColumnDefinition Width="3*"/>
             </Grid.ColumnDefinitions>
-            <TextBlock  Text="Choose a version of .NET:" Grid.ColumnSpan="2" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,32" />
-            <StackPanel Grid.Row="1" HorizontalAlignment="Stretch" >
-                <ComboBox x:Name="DotNetVersionComboBox" >
+            <TextBlock Text="Choose a version of .NET:" Grid.ColumnSpan="2" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,20,0,32" />
+            <StackPanel Grid.Row="1" HorizontalAlignment="Stretch">
+                <ComboBox x:Name="DotNetVersionComboBox">
                     <ComboBoxItem>.NET 7</ComboBoxItem>
                     <ComboBoxItem>.NET 8</ComboBoxItem>
                     <ComboBoxItem IsSelected="True">.NET 9</ComboBoxItem>
@@ -52,32 +54,46 @@
 
             <Border Background="#EEEEEE" Grid.Row="1" Grid.Column="1" Margin="10,-4,0,0" Padding="10" CornerRadius="10">
                 <StackPanel >
-                    <TextBlock Text="Notes:"
-                       TextWrapping="Wrap" Foreground="Gray"/>
-                    <TextBlock Text="* .NET 8 requires Visual Studio 2022 v17.8 or newer"
-                       TextWrapping="Wrap" Foreground="Gray"/>
-                    <TextBlock Text="* .NET 9 requires Visual Studio 2022 v17.12 or newer"
-                       TextWrapping="Wrap" Foreground="Gray"/>
+                    <TextBlock Text="Notes:" TextWrapping="Wrap" Foreground="Gray"/>
+                    <TextBlock Text="* .NET 8 requires Visual Studio 2022 v17.8 or newer" TextWrapping="Wrap" Foreground="Gray"/>
+                    <TextBlock Text="* .NET 9 requires Visual Studio 2022 v17.12 or newer" TextWrapping="Wrap" Foreground="Gray"/>
                 </StackPanel>
             </Border>
-
         </Grid>
 
+        <Grid Grid.Row="3" Grid.Column="1" x:Name="MauiHybridLauncherPanel">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <TextBlock Text="MAUI Hybrid:" Grid.ColumnSpan="2" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,20,0,10" />
+            <StackPanel Grid.Row="1" HorizontalAlignment="Stretch">
+                <TextBlock Text="By default, the OpenSilver application runs in the browser." TextWrapping="Wrap" />
+                <TextBlock Text="However, you can also choose to run it on additional platforms:" TextWrapping="Wrap" Margin="0,0,0,10" />
+                <TextBlock Text="Select platforms:" FontWeight="DemiBold" Margin="0,0,0,10"/>
+                <StackPanel Orientation="Horizontal">
+                    <CheckBox x:Name="MacCheckbox" Content="Mac" Margin="0,0,10,0"/>
+                    <CheckBox x:Name="WindowsCheckbox" Content="Windows" Margin="0,0,10,0"/>
+                    <CheckBox x:Name="IosCheckbox" Content="iOS" Margin="0,0,10,0"/>
+                    <CheckBox x:Name="AndroidCheckbox" Content="Android" Margin="0,0,10,0"/>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
 
-        <Grid Margin="20" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom">
+        <Grid Grid.Row="4" Grid.Column="1" Margin="20,20,20,0" HorizontalAlignment="Right">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition Width="24" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
-            <Button Grid.Column="0" 
-                    Background="#FFFFFF"
-                    Foreground="#5A5A5A"
-                    FontWeight="SemiBold"
-                    HorizontalAlignment="Center" 
-                    VerticalAlignment="Center"
-                    IsCancel="True">
+            <Button Grid.Column="0"
+                Background="#FFFFFF"
+                Foreground="#5A5A5A"
+                FontWeight="SemiBold"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                IsCancel="True">
                 <Button.Resources>
                     <Style TargetType="{x:Type Border}">
                         <Setter Property="CornerRadius" Value="3"/>
@@ -86,17 +102,15 @@
                 <TextBlock Margin="5" Text="Back"/>
             </Button>
 
-            <Button
-                   x:Name="continueBtn"
-                    Grid.Column="2" 
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center" 
-                    Click="ButtonContinue_Click" 
-                    Background="#1157FA"
-                    Foreground="#FFFFFF"
-                    FontWeight="SemiBold"
-                    IsEnabled="False"
-                    >
+            <Button Grid.Column="2"
+                x:Name="continueBtn"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Click="ButtonContinue_Click"
+                Background="#1157FA"
+                Foreground="#FFFFFF"
+                FontWeight="SemiBold"
+                IsEnabled="False">
                 <Button.Resources>
                     <Style TargetType="{x:Type Border}">
                         <Setter Property="CornerRadius" Value="3"/>
@@ -106,10 +120,5 @@
                 <TextBlock Margin="5" Text="Continue"/>
             </Button>
         </Grid>
-
-
-
-
-
     </Grid>
 </Window>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
index 12f3534..232aa28 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
@@ -1,8 +1,7 @@
 ﻿using OpenSilver.TemplateWizards.AppCustomizationWindow.Models;
+using OpenSilver.TemplateWizards.Shared;
 using System;
-using System.Collections.Generic;
 using System.Windows;
-using System.Windows.Controls;
 
 namespace OpenSilver.TemplateWizards.AppCustomizationWindow
 {
@@ -11,15 +10,7 @@ namespace OpenSilver.TemplateWizards.AppCustomizationWindow
     /// </summary>
     public partial class AppConfigurationWindow : Window
     {
-        public IDictionary<ThemeSelectionEnum, string> Themes { get; set; } = new Dictionary<ThemeSelectionEnum, string>();
-        public string SelectedTheme { get; set; }
-        public OpenSilverBuildType OpenSilverBuildType
-        {
-            get
-            {
-                return OpenSilverBuildType.Stable;
-            }
-        }
+        public string SelectedTheme { get; private set; }
 
         public DotNetVersion DotNetVersion
         {
@@ -39,57 +30,52 @@ public DotNetVersion DotNetVersion
             }
         }
 
-
-        public AppConfigurationWindow(string openSilverType, bool isBusiness = false)
+        public MauiHybridPlatform MauiHybridPlatform
         {
-
-            InitilizeThemes();
-            InitializeComponent();
-            if (openSilverType == "Library")
+            get
             {
-                DotNetVersionPanel.Visibility = Visibility.Collapsed;
+                MauiHybridPlatform platforms = MauiHybridPlatform.None;
+
+                if (IosCheckbox.IsChecked == true)
+                {
+                    platforms |= MauiHybridPlatform.iOS;
+                }
+                if (AndroidCheckbox.IsChecked == true)
+                {
+                    platforms |= MauiHybridPlatform.Android;
+                }
+                if (WindowsCheckbox.IsChecked == true)
+                {
+                    platforms |= MauiHybridPlatform.Windows;
+                }
+                if (MacCheckbox.IsChecked == true)
+                {
+                    platforms |= MauiHybridPlatform.Mac;
+                }
+
+                return platforms;
             }
+        }
+
+        public AppConfigurationWindow(bool isBusiness = false)
+        {
+            InitializeComponent();
 
             //Modern theme is deactivated for now, for Business Application projects
             if (isBusiness)
             {
                 chooseThemesCollection.Visibility = Visibility.Collapsed;
-                SelectedTheme = Themes[ThemeSelectionEnum.Classic];
+                SelectedTheme = ThemeOptions.Classic;
                 continueBtn.IsEnabled = true;
-                this.Height = 300;
             }
         }
 
-        private void InitilizeThemes()
-        {
-            Themes.Add(ThemeSelectionEnum.Dark, "Dark");
-            Themes.Add(ThemeSelectionEnum.Light, "Light");
-            Themes.Add(ThemeSelectionEnum.Classic, "Classic");
-        }
-
         private void ButtonContinue_Click(object sender, RoutedEventArgs e)
         {
             DialogResult = true;
             Close();
         }
 
-        private void OnThemSelected(object sender, RoutedEventArgs e)
-        {
-
-            if (sender is RadioButton selectedRadio)
-            {
-                try
-                {
-                    SelectedTheme = Themes[(ThemeSelectionEnum)selectedRadio.Tag];
-                }
-                catch
-                {
-                    throw new InvalidOperationException("Error retrieving selected theme option");
-                }
-            }
-
-        }
-
         private void ThemeCollectionView_SelectionChanged(object sender, EventArgs e)
         {
             SelectedTheme = (sender as ThemeOptions).Name;
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
index fba3b48..3778102 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
@@ -1,10 +1,13 @@
 ﻿using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 
 namespace OpenSilver.TemplateWizards.AppCustomizationWindow.Models
 {
     public class ThemeOptions
     {
+        public const string Classic = "Classic";
+        public const string Dark = "Dark";
+        public const string Light = "Light";
+
         public string ThumbnailUri { get; set; }
         public string Name { get; set; }
         public string Title { get; set; }
@@ -12,10 +15,12 @@ public class ThemeOptions
 
         public static IEnumerable<ThemeOptions> GeThemes()
         {
-            var themes = new List<ThemeOptions>();
-            themes.Add(new ThemeOptions { Name="Light",Title = "Modern - Light", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/light_theme.png", BackgroundColor = "#FFFFFF" });
-            themes.Add(new ThemeOptions { Name="Dark",Title = "Modern - Dark", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/dark_theme.png", BackgroundColor = "#111111" });
-            themes.Add(new ThemeOptions { Name="Classic",Title = "Classic - Silverlight", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/classic_theme.png", BackgroundColor = "#FFFFFF" });
+            var themes = new List<ThemeOptions>
+            {
+                new ThemeOptions { Name = Light, Title = "Modern - Light", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/light_theme.png", BackgroundColor = "#FFFFFF" },
+                new ThemeOptions { Name = Dark, Title = "Modern - Dark", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/dark_theme.png", BackgroundColor = "#111111" },
+                new ThemeOptions { Name = Classic, Title = "Classic - Silverlight", ThumbnailUri = "/OpenSilver.TemplateWizards;component/Assets/Images/classic_theme.png", BackgroundColor = "#FFFFFF" }
+            };
             return themes;
         }
     }
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/OpenSilverBuildType.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/OpenSilverBuildType.cs
deleted file mode 100644
index cf71f5f..0000000
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/OpenSilverBuildType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-﻿namespace OpenSilver.TemplateWizards.AppCustomizationWindow
-{
-    public enum OpenSilverBuildType
-    {
-        Stable,
-    }
-}
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
index 38daad8..91fb6f5 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
@@ -9,12 +9,11 @@
 
     <UserControl.Resources>
         <Style x:Key="ListBox_Style" TargetType="ListBox">
-            <Setter Property="Width" Value="330" />
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background" Value="{x:Null}" />
-            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="VerticalAlignment" Value="Stretch" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
             <Setter Property="ItemsPanel">
@@ -34,7 +33,7 @@
                         <Setter Property="Background" Value="#55FFFFFF" />
                         <Setter Property="BorderThickness" Value="2"/>
                         <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-                        <Setter Property="Margin" Value="10,0,10,60" />
+                        <Setter Property="Margin" Value="10,0,10,0" />
                         <Setter Property="Cursor" Value="Hand" />
                         <Setter Property="Template">
                             <Setter.Value>
@@ -60,8 +59,8 @@
                                                     <Storyboard>
                                                         <DoubleAnimation Storyboard.TargetName="selectionIndicator" Storyboard.TargetProperty="Opacity" Duration="0" To=".75"/>
                                                         <ObjectAnimationUsingKeyFrames
-                                                        Storyboard.TargetName="themeTitle" 
-                                                        Storyboard.TargetProperty="Foreground">
+                                                            Storyboard.TargetName="themeTitle"
+                                                            Storyboard.TargetProperty="Foreground">
                                                             <DiscreteObjectKeyFrame KeyTime="0" >
                                                                 <DiscreteObjectKeyFrame.Value>
                                                                     <SolidColorBrush Color="#FFFFFF" />
@@ -106,14 +105,13 @@
                                                    SnapsToDevicePixels="True"
                                                    Stretch="Uniform"
                                                    Margin="0"
-                                                   ToolTip="{Binding Description}"
-                                               />
+                                                   ToolTip="{Binding Description}"/>
 
-                                            <Border x:Name="selectedBorder" 
-                                                    Visibility="Collapsed" 
-                                                    BorderThickness="0" 
-                                                    CornerRadius="14" 
-                                                    Grid.Row="2"  
+                                            <Border x:Name="selectedBorder"
+                                                    Visibility="Collapsed"
+                                                    BorderThickness="0"
+                                                    CornerRadius="14"
+                                                    Grid.Row="2"
                                                     Background="#1157FA"
                                                     HorizontalAlignment="Stretch"
                                                     VerticalAlignment="Stretch" >
@@ -125,14 +123,12 @@
                                                        HorizontalAlignment="Center"
                                                        Grid.Row="2"
                                                        Margin="8"
-                                                       VerticalAlignment="Bottom" 
+                                                       VerticalAlignment="Bottom"
                                                        TextWrapping="Wrap"
                                                        FontSize="16"
                                                        FontFamily="Fantasy"/>
                                             <Border x:Name="selectionIndicator" Width="146" Height="146" Opacity="0" IsHitTestVisible="False" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="10" BorderBrush="#FF1F7FD9" />
-
                                         </Grid>
-
                                     </Grid>
                                 </ControlTemplate>
                             </Setter.Value>
@@ -144,7 +140,7 @@
     </UserControl.Resources>
 
     <Grid x:Name="mainGrid">
-        <ListBox x:Name="themeList" Style="{StaticResource ListBox_Style}"  HorizontalAlignment="Center"  HorizontalContentAlignment="Center"  Width="{Binding ElementName=mainGrid,Path=ActualWidth}"  Background="Transparent">
+        <ListBox x:Name="themeList" Style="{StaticResource ListBox_Style}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Background="Transparent">
         </ListBox>
     </Grid>
 </UserControl>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
index 3bf4426..780fc73 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
@@ -1,18 +1,6 @@
 ﻿using OpenSilver.TemplateWizards.AppCustomizationWindow.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace OpenSilver.TemplateWizards.AppCustomizationWindow
 {
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeSelectionEnum.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeSelectionEnum.cs
deleted file mode 100644
index 7bd0fd2..0000000
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeSelectionEnum.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-﻿namespace OpenSilver.TemplateWizards.AppCustomizationWindow
-{
-    public enum ThemeSelectionEnum
-    {
-        Dark,
-        Light,
-        Classic,
-    }
-}
\ No newline at end of file
diff --git a/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj b/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
index 05c814d..87ec492 100644
--- a/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
+++ b/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
@@ -48,15 +48,19 @@
     <Compile Include="AppCustomizationWindow\AppConfigurationWindow.xaml.cs">
       <DependentUpon>AppConfigurationWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="AppCustomizationWindow\DotNetVersion.cs" />
+    <Compile Include="Shared\DotNetVersion.cs" />
     <Compile Include="AppCustomizationWindow\Models\ThemeOption.cs" />
-    <Compile Include="AppCustomizationWindow\OpenSilverBuildType.cs" />
     <Compile Include="AppCustomizationWindow\ThemeCollectionView.xaml.cs">
       <DependentUpon>ThemeCollectionView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="AppCustomizationWindow\ThemeSelectionEnum.cs" />
-    <Compile Include="AppCustomizationWizard.cs" />
+    <Compile Include="Wizards\AppCustomizationWizard.cs" />
+    <Compile Include="Wizards\ClassLibraryProjectTemplateWizard.cs" />
+    <Compile Include="Shared\GlobalWizardDataStore.cs" />
+    <Compile Include="Wizards\MauiHybridProjectTemplateWizard.cs" />
+    <Compile Include="Shared\GlobalConstants.cs" />
+    <Compile Include="Shared\MauiHybridPlatform.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Shared\WizardKeys.cs" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="AppCustomizationWindow\AppConfigurationWindow.xaml">
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/DotNetVersion.cs b/src/OpenSilver.TemplateWizards/Shared/DotNetVersion.cs
similarity index 58%
rename from src/OpenSilver.TemplateWizards/AppCustomizationWindow/DotNetVersion.cs
rename to src/OpenSilver.TemplateWizards/Shared/DotNetVersion.cs
index d80c69d..d51e5a1 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/DotNetVersion.cs
+++ b/src/OpenSilver.TemplateWizards/Shared/DotNetVersion.cs
@@ -1,4 +1,4 @@
-﻿namespace OpenSilver.TemplateWizards.AppCustomizationWindow
+﻿namespace OpenSilver.TemplateWizards.Shared
 {
     public enum DotNetVersion
     {
diff --git a/src/OpenSilver.TemplateWizards/Shared/GlobalConstants.cs b/src/OpenSilver.TemplateWizards/Shared/GlobalConstants.cs
new file mode 100644
index 0000000..f3c6230
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/Shared/GlobalConstants.cs
@@ -0,0 +1,21 @@
+﻿
+namespace OpenSilver.TemplateWizards.Shared
+{
+    /// <summary>
+    /// Contains global constants used across the VSIX project.
+    /// </summary>
+    public static class GlobalConstants
+    {
+        public const string OpenSilverMauiHybridPackageVersion = "3.2.0-preview-2025-01-23-143554-64fb2e70";
+
+        public const string OpenSilverPackageVersion = "3.1.2";
+
+        public const string OpenSilverSimulatorPackageVersion = "3.1.2";
+
+        public const string OpenSilverWebAssemblyPackageVersion = "3.1.2";
+
+        public const string OpenRia46PackageVersion = "3.1.0";
+
+        public const string OpenSilverThemeModernPackageVersion = "3.1.*";
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/Shared/GlobalWizardDataStore.cs b/src/OpenSilver.TemplateWizards/Shared/GlobalWizardDataStore.cs
new file mode 100644
index 0000000..4329e80
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/Shared/GlobalWizardDataStore.cs
@@ -0,0 +1,16 @@
+﻿using System;
+using System.Collections.Concurrent;
+
+namespace OpenSilver.TemplateWizards.Shared
+{
+    public static class GlobalWizardDataStore
+    {
+        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<string, object>> _dataBySolution
+            = new ConcurrentDictionary<string, ConcurrentDictionary<string, object>>(StringComparer.OrdinalIgnoreCase);
+
+        public static ConcurrentDictionary<string, object> GetSharedData(string key)
+        {
+            return _dataBySolution.GetOrAdd(key, _ => new ConcurrentDictionary<string, object>());
+        }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/Shared/MauiHybridPlatform.cs b/src/OpenSilver.TemplateWizards/Shared/MauiHybridPlatform.cs
new file mode 100644
index 0000000..1ca3055
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/Shared/MauiHybridPlatform.cs
@@ -0,0 +1,18 @@
+﻿
+using System;
+
+namespace OpenSilver.TemplateWizards.Shared
+{
+    /// <summary>
+    /// Represents the platforms supported by the MAUI Hybrid application.
+    /// </summary>
+    [Flags]
+    public enum MauiHybridPlatform
+    {
+        None = 0,
+        iOS = 1,
+        Android = 2,
+        Windows = 4,
+        Mac = 8
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/Shared/WizardKeys.cs b/src/OpenSilver.TemplateWizards/Shared/WizardKeys.cs
new file mode 100644
index 0000000..76f1d01
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/Shared/WizardKeys.cs
@@ -0,0 +1,12 @@
+﻿
+namespace OpenSilver.TemplateWizards.Shared
+{
+    /// <summary>
+    /// Keys used in the GlobalWizardDataStore.
+    /// </summary>
+    public static class WizardKeys
+    {
+        public const string MauiTargets = "MauiTargets";
+        public const string NetTarget = "NetTarget";
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWizard.cs b/src/OpenSilver.TemplateWizards/Wizards/AppCustomizationWizard.cs
similarity index 67%
rename from src/OpenSilver.TemplateWizards/AppCustomizationWizard.cs
rename to src/OpenSilver.TemplateWizards/Wizards/AppCustomizationWizard.cs
index be77825..1213ee8 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWizard.cs
+++ b/src/OpenSilver.TemplateWizards/Wizards/AppCustomizationWizard.cs
@@ -1,6 +1,9 @@
 ﻿using EnvDTE;
+using EnvDTE80;
 using Microsoft.VisualStudio.TemplateWizard;
 using OpenSilver.TemplateWizards.AppCustomizationWindow;
+using OpenSilver.TemplateWizards.AppCustomizationWindow.Models;
+using OpenSilver.TemplateWizards.Shared;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -8,7 +11,7 @@
 using System.Windows;
 using System.Xml.Linq;
 
-namespace OpenSilver.TemplateWizards
+namespace OpenSilver.TemplateWizards.Wizards
 {
     class AppCustomizationWizard : IWizard
     {
@@ -76,6 +79,12 @@ class AppCustomizationWizard : IWizard
             script.setAttribute('src', 'modern/loading-animation.js?date=' + new Date().toISOString());
             document.head.appendChild(script);";
 
+        private Dictionary<string, string> _replacementsDictionary;
+        private DTE _dte;
+
+        private MauiHybridPlatform _mauiHybridPlatform;
+        private DotNetVersion _dotNetVersion;
+
         private static string GetVsixFullPath(string filename)
         {
             var vsixDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -126,7 +135,7 @@ public void ProjectFinishedGenerating(Project project)
 
         private string GetAppXamlTheme(string selectedTheme)
         {
-            if (selectedTheme == "Classic")
+            if (selectedTheme == ThemeOptions.Classic)
             {
                 return "";
             }
@@ -141,12 +150,12 @@ private string GetThemesNugetPackageLine(string version)
 
         private string GetLoadingColors(string selectedTheme)
         {
-            if (selectedTheme == "Light")
+            if (selectedTheme == ThemeOptions.Light)
             {
                 return ModernLightStyles;
             }
 
-            if (selectedTheme == "Dark")
+            if (selectedTheme == ThemeOptions.Dark)
             {
                 return ModernDarkStyles;
             }
@@ -156,7 +165,7 @@ private string GetLoadingColors(string selectedTheme)
 
         private string GetLoadingIndicatorCss(string selectedTheme)
         {
-            if (selectedTheme == "Classic")
+            if (selectedTheme == ThemeOptions.Classic)
             {
                 return "loading-indicator.css";
             }
@@ -166,7 +175,7 @@ private string GetLoadingIndicatorCss(string selectedTheme)
 
         private string GetLoadingIndicatorJs(string selectedTheme)
         {
-            if (selectedTheme == "Classic")
+            if (selectedTheme == ThemeOptions.Classic)
             {
                 return "";
             }
@@ -176,7 +185,7 @@ private string GetLoadingIndicatorJs(string selectedTheme)
 
         private string GetLoadingIndicatorHtml(string selectedTheme)
         {
-            if (selectedTheme == "Classic")
+            if (selectedTheme == ThemeOptions.Classic)
             {
                 return ClassicLoadingAnimation;
             }
@@ -191,57 +200,88 @@ public void ProjectItemFinishedGenerating(ProjectItem projectItem)
 
         public void RunFinished()
         {
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+
+            if (_mauiHybridPlatform == MauiHybridPlatform.None)
+            {
+                return;
+            }
+
+            try
+            {
+                var projectName = _replacementsDictionary["$safeprojectname$"];
+                var destinationDirectory = _replacementsDictionary["$destinationdirectory$"];
+
+                var templateName = "OpenSilverMauiHybridTemplate";
+                var solution = (Solution2)_dte.Solution;
+
+                var mauiHybridProjectName = projectName + ".MauiHybrid";
+                var mauiHybridDestinationDirectory = Path.Combine(destinationDirectory, mauiHybridProjectName);
+
+                var sharedDataStore = GlobalWizardDataStore.GetSharedData(mauiHybridDestinationDirectory);
+                sharedDataStore[WizardKeys.MauiTargets] = _mauiHybridPlatform;
+                sharedDataStore[WizardKeys.NetTarget] = _dotNetVersion;
+
+                var prjTemplate = solution.GetProjectTemplate(templateName, "CSharp");
+                solution.AddFromTemplate(prjTemplate, mauiHybridDestinationDirectory, mauiHybridProjectName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"{ex}");
+            }
         }
 
         public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary,
             WizardRunKind runKind, object[] customParams)
         {
-            XElement openSilverInfo = XElement.Parse(replacementsDictionary["$wizarddata$"]);
-
-            XNamespace defaultNamespace = openSilverInfo.GetDefaultNamespace();
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
 
-            string openSilverType = openSilverInfo.Element(defaultNamespace + "Type").Value;
-            bool isBusiness = openSilverInfo.Element(defaultNamespace + "IsBusiness")?.Value.Equals("true", StringComparison.OrdinalIgnoreCase) ?? false;
+            _replacementsDictionary = replacementsDictionary;
+            _dte = automationObject as DTE;
 
+            var isBusiness = false;
+            var wizardData = replacementsDictionary["$wizarddata$"];
+            if (!string.IsNullOrWhiteSpace(wizardData))
+            {
+                XElement openSilverInfo = XElement.Parse(wizardData);
+                XNamespace defaultNamespace = openSilverInfo.GetDefaultNamespace();
+                isBusiness = openSilverInfo.Element(defaultNamespace + "IsBusiness")?.Value.Equals("true", StringComparison.OrdinalIgnoreCase) ?? false;
+            }
 
-            AppConfigurationWindow window = new AppConfigurationWindow(openSilverType, isBusiness);
+            AppConfigurationWindow window = new AppConfigurationWindow(isBusiness);
 
-            // In the case of a class Library, the user has no other choices to make so we do not show the app configuration window.
-            if (openSilverType != "Library")
+            bool? result = window.ShowDialog();
+            if (!result.HasValue || !result.Value)
             {
-                bool? result = window.ShowDialog();
-                if (!result.HasValue || !result.Value)
-                {
-                    throw new WizardBackoutException("OpenSilver project creation was cancelled by user");
-                }
+                throw new WizardBackoutException("OpenSilver project creation was cancelled by user");
             }
 
-            if (openSilverType == "Application")
+            switch (window.DotNetVersion)
             {
-                switch (window.DotNetVersion)
-                {
-                    case DotNetVersion.Net7:
-                        replacementsDictionary.Add("$targetframework$", "net7.0");
-                        replacementsDictionary.Add("$blazorpackagesversion$", "7.0.0");
-                        break;
-                    case DotNetVersion.Net8:
-                        replacementsDictionary.Add("$targetframework$", "net8.0");
-                        replacementsDictionary.Add("$blazorpackagesversion$", "8.0.11");
-                        break;
-                    case DotNetVersion.Net9:
-                        replacementsDictionary.Add("$targetframework$", "net9.0");
-                        replacementsDictionary.Add("$blazorpackagesversion$", "9.0.0");
-                        break;
-                }
-
-                CopyNugetConfig(replacementsDictionary);
+                case DotNetVersion.Net7:
+                    replacementsDictionary.Add("$targetframework$", "net7.0");
+                    replacementsDictionary.Add("$blazorpackagesversion$", "7.0.0");
+                    break;
+                case DotNetVersion.Net8:
+                    replacementsDictionary.Add("$targetframework$", "net8.0");
+                    replacementsDictionary.Add("$blazorpackagesversion$", "8.0.11");
+                    break;
+                case DotNetVersion.Net9:
+                    replacementsDictionary.Add("$targetframework$", "net9.0");
+                    replacementsDictionary.Add("$blazorpackagesversion$", "9.0.0");
+                    break;
             }
 
-            replacementsDictionary.Add("$opensilverpackageversion$", "3.1.2");
-            replacementsDictionary.Add("$opensilversimulatorpackageversion$", "3.1.2");
-            replacementsDictionary.Add("$opensilverwebassemblypackageversion$", "3.1.2");
-            replacementsDictionary.Add("$openria46packageversion$", "3.1.0");
-            replacementsDictionary.Add("$opensilverthememodern$", "3.1.*");
+            CopyNugetConfig(replacementsDictionary);
+
+            _mauiHybridPlatform = window.MauiHybridPlatform;
+            _dotNetVersion = window.DotNetVersion;
+
+            replacementsDictionary.Add("$opensilverpackageversion$", GlobalConstants.OpenSilverPackageVersion);
+            replacementsDictionary.Add("$opensilversimulatorpackageversion$", GlobalConstants.OpenSilverSimulatorPackageVersion);
+            replacementsDictionary.Add("$opensilverwebassemblypackageversion$", GlobalConstants.OpenSilverWebAssemblyPackageVersion);
+            replacementsDictionary.Add("$openria46packageversion$", GlobalConstants.OpenRia46PackageVersion);
+            replacementsDictionary.Add("$opensilverthememodern$", GlobalConstants.OpenSilverThemeModernPackageVersion);
 
             replacementsDictionary.Add("$pageforeground$", IsClassic(window) ? "Black" : "{DynamicResource Theme_TextBrush}");
             replacementsDictionary.Add("$gridbackground$", IsClassic(window) ? "White" : "{DynamicResource Theme_BackgroundBrush}");
@@ -256,7 +296,7 @@ public void RunStarted(object automationObject, Dictionary<string, string> repla
 
         private bool IsClassic(AppConfigurationWindow window)
         {
-            return window.SelectedTheme == "Classic";
+            return window.SelectedTheme == ThemeOptions.Classic;
         }
 
         public bool ShouldAddProjectItem(string filePath)
diff --git a/src/OpenSilver.TemplateWizards/Wizards/ClassLibraryProjectTemplateWizard.cs b/src/OpenSilver.TemplateWizards/Wizards/ClassLibraryProjectTemplateWizard.cs
new file mode 100644
index 0000000..84f6f29
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/Wizards/ClassLibraryProjectTemplateWizard.cs
@@ -0,0 +1,39 @@
+﻿using EnvDTE;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.TemplateWizard;
+using OpenSilver.TemplateWizards.Shared;
+using System.Collections.Generic;
+
+namespace OpenSilver.TemplateWizards.Wizards
+{
+    class ClassLibraryProjectTemplateWizard : IWizard
+    {
+        public void BeforeOpeningFile(ProjectItem projectItem)
+        {
+        }
+
+        public void ProjectFinishedGenerating(Project project)
+        {
+        }
+
+        public void ProjectItemFinishedGenerating(ProjectItem projectItem)
+        {
+        }
+
+        public void RunFinished()
+        {
+        }
+
+        public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            replacementsDictionary.Add("$opensilverpackageversion$", GlobalConstants.OpenSilverPackageVersion);
+        }
+
+        public bool ShouldAddProjectItem(string filePath)
+        {
+            return true;
+        }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/Wizards/MauiHybridProjectTemplateWizard.cs b/src/OpenSilver.TemplateWizards/Wizards/MauiHybridProjectTemplateWizard.cs
new file mode 100644
index 0000000..a473b65
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/Wizards/MauiHybridProjectTemplateWizard.cs
@@ -0,0 +1,172 @@
+﻿using EnvDTE;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.TemplateWizard;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using EnvDTE80;
+using OpenSilver.TemplateWizards.Shared;
+using OpenSilver.TemplateWizards.AppCustomizationWindow;
+
+namespace OpenSilver.TemplateWizards.Wizards
+{
+    class MauiHybridProjectTemplateWizard : IWizard
+    {
+        private static IEnumerable<Project> GetProjects(Project project)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            // If this is a solution folder, it can contain other projects
+            if (project.Kind == ProjectKinds.vsProjectKindSolutionFolder)
+            {
+                foreach (ProjectItem projectItem in project.ProjectItems)
+                {
+                    var subProject = projectItem.SubProject;
+                    if (subProject != null)
+                    {
+                        foreach (var nested in GetProjects(subProject))
+                        {
+                            yield return nested;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                yield return project;
+            }
+        }
+
+        private static IEnumerable<Project> GetAllProjects(Solution2 solution)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            foreach (Project topLevelProject in solution.Projects)
+            {
+                foreach (Project p in GetProjects(topLevelProject))
+                {
+                    yield return p;
+                }
+            }
+        }
+
+        public void BeforeOpeningFile(ProjectItem projectItem)
+        {
+        }
+
+        public void ProjectFinishedGenerating(Project project)
+        {
+        }
+
+        public void ProjectItemFinishedGenerating(ProjectItem projectItem)
+        {
+        }
+
+        public void RunFinished()
+        {
+        }
+
+        public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            var rootProjectName = replacementsDictionary["$safeprojectname$"].TrimSuffix(".MauiHybrid");
+
+            var _dte = automationObject as DTE;
+            var solution = (Solution2)_dte.Solution;
+            var allProjects = GetAllProjects(solution);
+
+            var rootProject = allProjects.FirstOrDefault(p => p.Name == rootProjectName);
+            var rootProjectExtension = System.IO.Path.GetExtension(rootProject?.FullName ?? "stub.csproj");
+
+            replacementsDictionary.Add("$opensilvermauihybridpackageversion$", GlobalConstants.OpenSilverMauiHybridPackageVersion);
+            replacementsDictionary.Add("$appidentifier$", "com.companyname." + rootProjectName.ToLowerInvariant());
+            replacementsDictionary.Add("$rootprojectname$", rootProjectName);
+            replacementsDictionary.Add("$rootprojectextension$", rootProjectExtension);
+
+            var sharedDataStore = GlobalWizardDataStore.GetSharedData(replacementsDictionary["$destinationdirectory$"]);
+            var mhp = (MauiHybridPlatform)sharedDataStore[WizardKeys.MauiTargets];
+            var netTarget = (DotNetVersion)sharedDataStore[WizardKeys.NetTarget];
+
+            replacementsDictionary.Add("$mauiplatformsbasic$", GetMauiPlatformsBasic(netTarget, mhp));
+            replacementsDictionary.Add("$windowsTarget$", GetWindowsTarget(netTarget, mhp));
+            replacementsDictionary.Add("$mauitargets$", mhp.ToString());
+        }
+
+        private string GetWindowsTarget(DotNetVersion netTarget, MauiHybridPlatform mhp)
+        {
+            if ((mhp & MauiHybridPlatform.Windows) != MauiHybridPlatform.Windows)
+            {
+                return "";
+            }
+
+            if (mhp == MauiHybridPlatform.Windows)
+            {
+                //Only windows
+                //return $"{Environment.NewLine}        <TargetFrameworks Condition=\"$([MSBuild]::IsOSPlatform('windows'))\">{GetNetTarget(netTarget)}-windows10.0.19041.0</TargetFrameworks>";
+                return $"{Environment.NewLine}        <TargetFrameworks>{GetNetTarget(netTarget)}-windows10.0.19041.0</TargetFrameworks>";
+            }
+            else
+            {
+                return $"{Environment.NewLine}        <TargetFrameworks Condition=\"$([MSBuild]::IsOSPlatform('windows'))\">$(TargetFrameworks);{GetNetTarget(netTarget)}-windows10.0.19041.0</TargetFrameworks>";
+            }
+        }
+
+        private string GetNetTarget(DotNetVersion netTarget)
+        {
+            if (netTarget == DotNetVersion.Net7)
+            {
+                return "net7.0";
+            }
+
+            if (netTarget == DotNetVersion.Net8)
+            {
+                return "net8.0";
+            }
+
+            if (netTarget == DotNetVersion.Net9)
+            {
+                return "net9.0";
+            }
+
+            return "";
+        }
+        private string GetMauiPlatformsBasic(DotNetVersion netTarget, MauiHybridPlatform mhp)
+        {
+            if (mhp == MauiHybridPlatform.None || mhp == MauiHybridPlatform.Windows)
+            {
+                return "";
+            }
+
+            var netVersion = GetNetTarget(netTarget);
+            var targets = new List<string>();
+
+            if ((mhp & MauiHybridPlatform.Android) == MauiHybridPlatform.Android)
+            {
+                targets.Add($"{netVersion}-android");
+            }
+
+            if ((mhp & MauiHybridPlatform.iOS) == MauiHybridPlatform.iOS)
+            {
+                targets.Add($"{netVersion}-ios");
+            }
+
+            if ((mhp & MauiHybridPlatform.Mac) == MauiHybridPlatform.Mac)
+            {
+                targets.Add($"{netVersion}-maccatalyst");
+            }
+
+            if (targets.Count == 0)
+            {
+                return "";
+            }
+
+            return $"{Environment.NewLine}        <TargetFrameworks>{string.Join(";", targets)}</TargetFrameworks>";
+        }
+
+        public bool ShouldAddProjectItem(string filePath)
+        {
+            return true;
+        }
+    }
+}
diff --git a/src/OpenSilver.VSIX/OpenSilver.VSIX.csproj b/src/OpenSilver.VSIX/OpenSilver.VSIX.csproj
index 36b81a8..5f9e4f1 100644
--- a/src/OpenSilver.VSIX/OpenSilver.VSIX.csproj
+++ b/src/OpenSilver.VSIX/OpenSilver.VSIX.csproj
@@ -206,6 +206,13 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
     </ProjectReference>
+    <ProjectReference Include="..\OpenSilverMauiHybridTemplate\OpenSilverMauiHybridTemplate.csproj">
+      <Project>{F7380B38-5D00-4527-B0D2-4DF1826881F9}</Project>
+      <Name>OpenSilverMauiHybridTemplate</Name>
+      <VSIXSubPath>ProjectTemplates</VSIXSubPath>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+    </ProjectReference>
     <ProjectReference Include="..\OpenSilverVBApplicationTemplate\OpenSilverVBApplicationTemplate.csproj">
       <Project>{229629ac-c4e0-4848-9cfa-31064c9d83a3}</Project>
       <Name>OpenSilverVBApplicationTemplate</Name>
diff --git a/src/OpenSilver.VSIX/source.extension.vsixmanifest b/src/OpenSilver.VSIX/source.extension.vsixmanifest
index 43d5850..783e616 100644
--- a/src/OpenSilver.VSIX/source.extension.vsixmanifest
+++ b/src/OpenSilver.VSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="OpenSilver.64201874-6ead-4828-b5af-31a76285b73d" Version="3.1.0.5" Language="en-US" Publisher="Userware" />
+        <Identity Id="OpenSilver.64201874-6ead-4828-b5af-31a76285b73d" Version="3.1.0.6" Language="en-US" Publisher="Userware" />
         <DisplayName>OpenSilver</DisplayName>
         <Description xml:space="preserve">Project templates and XAML Designer for creating OpenSilver applications. OpenSilver is an open-source reimplementation of Silverlight that runs on current browsers via WebAssembly.</Description>
         <Icon>Logo_32x32.png</Icon>
@@ -64,5 +64,6 @@
         <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="File" Path="ItemTemplates" d:TargetPath="ItemTemplates\CSharp\Open Ria Services\DomainServiceClass.zip" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="ItemTemplates\Assemblies\OpenRiaServices.VisualStudio.DomainServices.Tools.14.0.dll" AssemblyName="OpenRiaServices.VisualStudio.DomainServices.Tools.14.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2e0b7ccb1ae5b4c8" />
         <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="File" Path="ItemTemplates" d:TargetPath="ItemTemplates\VisualBasic\Web\1033\DomainServiceClass.zip" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="OpenSilverMauiHybridTemplate" d:TargetPath="|OpenSilverMauiHybridTemplate;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     </Assets>
 </PackageManifest>
diff --git a/src/OpenSilverApplicationTemplate/OpenSilverApplication.vstemplate b/src/OpenSilverApplicationTemplate/OpenSilverApplication.vstemplate
index 834b750..883b51b 100644
--- a/src/OpenSilverApplicationTemplate/OpenSilverApplication.vstemplate
+++ b/src/OpenSilverApplicationTemplate/OpenSilverApplication.vstemplate
@@ -30,13 +30,8 @@
   </TemplateContent>
   <WizardExtension>
     <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-    <FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
+    <FullClassName>OpenSilver.TemplateWizards.Wizards.AppCustomizationWizard</FullClassName>
   </WizardExtension>
   <WizardData>
-    <OpenSilverInfo>
-      <Api>Silverlight</Api>
-      <Type>Application</Type>
-      <LanguageCode>cs</LanguageCode>
-    </OpenSilverInfo>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/OpenSilverBusinessApplicationTemplate/root.vstemplate b/src/OpenSilverBusinessApplicationTemplate/root.vstemplate
index dbfe386..d663bc3 100644
--- a/src/OpenSilverBusinessApplicationTemplate/root.vstemplate
+++ b/src/OpenSilverBusinessApplicationTemplate/root.vstemplate
@@ -25,13 +25,10 @@
   </TemplateContent>
   <WizardExtension>
     <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-    <FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
+    <FullClassName>OpenSilver.TemplateWizards.Wizards.AppCustomizationWizard</FullClassName>
   </WizardExtension>
   <WizardData>
     <OpenSilverInfo>
-      <Api>Silverlight</Api>
-      <Type>Application</Type>
-      <LanguageCode>cs</LanguageCode>
       <IsBusiness>true</IsBusiness>
     </OpenSilverInfo>
   </WizardData>
diff --git a/src/OpenSilverBusinessVBApplicationTemplate/root.vstemplate b/src/OpenSilverBusinessVBApplicationTemplate/root.vstemplate
index c29e661..9c31207 100644
--- a/src/OpenSilverBusinessVBApplicationTemplate/root.vstemplate
+++ b/src/OpenSilverBusinessVBApplicationTemplate/root.vstemplate
@@ -25,13 +25,10 @@
   </TemplateContent>
   <WizardExtension>
     <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-    <FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
+    <FullClassName>OpenSilver.TemplateWizards.Wizards.AppCustomizationWizard</FullClassName>
   </WizardExtension>
   <WizardData>
     <OpenSilverInfo>
-      <Api>Silverlight</Api>
-      <Type>Application</Type>
-      <LanguageCode>vb</LanguageCode>
       <IsBusiness>true</IsBusiness>
     </OpenSilverInfo>
   </WizardData>
diff --git a/src/OpenSilverClassLibraryTemplate/OpenSilverClassLibrary.vstemplate b/src/OpenSilverClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
index 87e2dec..0e92c64 100644
--- a/src/OpenSilverClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
+++ b/src/OpenSilverClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
@@ -21,14 +21,10 @@
             <ProjectItem ReplaceParameters="true" TargetFileName="Class1.cs">Class1.cs</ProjectItem>
         </Project>
     </TemplateContent>
-	<WizardExtension>
-		<Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-		<FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
-	</WizardExtension>
-	<WizardData>
-		<OpenSilverInfo>
-			<Api>Silverlight</Api>
-			<Type>Library</Type>
-		</OpenSilverInfo>
-	</WizardData>
+    <WizardExtension>
+        <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <FullClassName>OpenSilver.TemplateWizards.Wizards.ClassLibraryProjectTemplateWizard</FullClassName>
+    </WizardExtension>
+    <WizardData>
+    </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/OpenSilverFSApplicationTemplate/OpenSilverApplication.vstemplate b/src/OpenSilverFSApplicationTemplate/OpenSilverApplication.vstemplate
index da2b0c7..2b59ae0 100644
--- a/src/OpenSilverFSApplicationTemplate/OpenSilverApplication.vstemplate
+++ b/src/OpenSilverFSApplicationTemplate/OpenSilverApplication.vstemplate
@@ -30,13 +30,8 @@
   </TemplateContent>
   <WizardExtension>
     <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-    <FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
+    <FullClassName>OpenSilver.TemplateWizards.Wizards.AppCustomizationWizard</FullClassName>
   </WizardExtension>
   <WizardData>
-    <OpenSilverInfo>
-      <Api>Silverlight</Api>
-      <Type>Application</Type>
-      <LanguageCode>fs</LanguageCode>
-    </OpenSilverInfo>
   </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/OpenSilverFSClassLibraryTemplate/OpenSilverClassLibrary.vstemplate b/src/OpenSilverFSClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
index cd19551..c21fb92 100644
--- a/src/OpenSilverFSClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
+++ b/src/OpenSilverFSClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
@@ -21,14 +21,10 @@
             <ProjectItem ReplaceParameters="true" TargetFileName="Class1.fs">Class1.fs</ProjectItem>
         </Project>
     </TemplateContent>
-	<WizardExtension>
-		<Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-		<FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
-	</WizardExtension>
-	<WizardData>
-		<OpenSilverInfo>
-			<Api>Silverlight</Api>
-			<Type>Library</Type>
-		</OpenSilverInfo>
-	</WizardData>
+    <WizardExtension>
+        <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <FullClassName>OpenSilver.TemplateWizards.Wizards.ClassLibraryProjectTemplateWizard</FullClassName>
+    </WizardExtension>
+    <WizardData>
+    </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/App.xaml b/src/OpenSilverMauiHybridTemplate/App.xaml
new file mode 100644
index 0000000..717b109
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/App.xaml
@@ -0,0 +1,17 @@
+﻿<?xml version="1.0" encoding="UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:$safeprojectname$"
+             x:Class="$safeprojectname$.App">
+    <Application.Resources>
+        <ResourceDictionary>
+
+        <!--
+            For information about styling .NET MAUI pages
+            please refer to the documentation:
+            https://go.microsoft.com/fwlink/?linkid=2282329
+        -->
+
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/src/OpenSilverMauiHybridTemplate/App.xaml.cs b/src/OpenSilverMauiHybridTemplate/App.xaml.cs
new file mode 100644
index 0000000..931eb4e
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/App.xaml.cs
@@ -0,0 +1,14 @@
+﻿namespace $safeprojectname$;
+
+public partial class App : Application
+{
+    public App()
+    {
+        InitializeComponent();
+    }
+
+    protected override Window CreateWindow(IActivationState? activationState)
+    {
+        return new Window(new MainPage()) { Title = "$safeprojectname$" };
+    }
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Components/Index.cs b/src/OpenSilverMauiHybridTemplate/Components/Index.cs
new file mode 100644
index 0000000..7893ab3
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Components/Index.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Components;
+using OpenSilver.MauiHybrid.Runner;
+
+namespace $safeprojectname$.Components
+{
+    [Route("/")]
+    public class Index : ComponentBase
+    {
+        [Inject]
+        private IMauiHybridRunner? Runner { get; set; }
+
+        protected async override Task OnInitializedAsync()
+        {
+            await base.OnInitializedAsync();
+
+            ArgumentNullException.ThrowIfNull(Runner);
+            await Runner.RunApplicationAsync<$rootprojectname$.App >();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Components/Routes.razor b/src/OpenSilverMauiHybridTemplate/Components/Routes.razor
new file mode 100644
index 0000000..c5ad85a
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Components/Routes.razor
@@ -0,0 +1,5 @@
+<Router AppAssembly="@typeof(MauiProgram).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" />
+    </Found>
+</Router>
diff --git a/src/OpenSilverMauiHybridTemplate/Components/_Imports.razor b/src/OpenSilverMauiHybridTemplate/Components/_Imports.razor
new file mode 100644
index 0000000..a456ccb
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Components/_Imports.razor
@@ -0,0 +1,7 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/MainPage.xaml b/src/OpenSilverMauiHybridTemplate/MainPage.xaml
new file mode 100644
index 0000000..c50b553
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/MainPage.xaml
@@ -0,0 +1,13 @@
+﻿<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:$safeprojectname$"
+             x:Class="$safeprojectname$.MainPage">
+
+    <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
+        <BlazorWebView.RootComponents>
+            <RootComponent Selector="#app" ComponentType="{x:Type local:Components.Routes}" />
+        </BlazorWebView.RootComponents>
+    </BlazorWebView>
+
+</ContentPage>
diff --git a/src/OpenSilverMauiHybridTemplate/MainPage.xaml.cs b/src/OpenSilverMauiHybridTemplate/MainPage.xaml.cs
new file mode 100644
index 0000000..034ad01
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/MainPage.xaml.cs
@@ -0,0 +1,9 @@
+﻿namespace $safeprojectname$;
+
+public partial class MainPage : ContentPage
+{
+    public MainPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/OpenSilverMauiHybridTemplate/MauiProgram.cs b/src/OpenSilverMauiHybridTemplate/MauiProgram.cs
new file mode 100644
index 0000000..dd36e6e
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/MauiProgram.cs
@@ -0,0 +1,34 @@
+﻿using Microsoft.AspNetCore.Components.WebView.Maui;
+using Microsoft.Extensions.Logging;
+using OpenSilver.MauiHybrid.Runner;
+
+namespace $safeprojectname$;
+
+public static class MauiProgram
+{
+    public static MauiApp CreateMauiApp()
+    {
+        var builder = MauiApp.CreateBuilder();
+        builder
+            .UseMauiApp<App>()
+            .ConfigureFonts(fonts =>
+            {
+                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+            })
+            .ConfigureMauiHandlers(conf =>
+            {
+#if ANDROID
+                conf.AddHandler<BlazorWebView, AndroidWebViewHandler>();
+#endif
+            });
+
+        builder.Services.AddScoped<IMauiHybridRunner, MauiHybridRunner>();
+        builder.Services.AddMauiBlazorWebView();
+#if DEBUG
+        builder.Services.AddBlazorWebViewDeveloperTools();
+        builder.Logging.AddDebug();
+#endif
+
+        return builder.Build();
+    }
+}
diff --git a/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.csproj b/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.csproj
new file mode 100644
index 0000000..3797806
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.csproj
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{F7380B38-5D00-4527-B0D2-4DF1826881F9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenSilverMauiHybridTemplate</RootNamespace>
+    <AssemblyName>OpenSilverMauiHybridTemplate</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CreateVsixContainer>false</CreateVsixContainer>
+    <DeployExtension>false</DeployExtension>
+    <DeployVSTemplates>false</DeployVSTemplates>
+    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Components\Index.cs" />
+    <None Include="Platforms\Android\AndroidWebViewHandler.cs" />
+    <None Include="Platforms\Android\MainActivity.cs" />
+    <None Include="Platforms\Android\MainApplication.cs" />
+    <None Include="Platforms\iOS\AppDelegate.cs" />
+    <None Include="Platforms\iOS\Program.cs" />
+    <None Include="Platforms\MacCatalyst\AppDelegate.cs" />
+    <None Include="Platforms\MacCatalyst\Program.cs" />
+    <None Include="Platforms\Windows\App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </None>
+    <None Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </None>
+    <None Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </None>
+    <None Include="MauiProgram.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="Resources\Fonts\OpenSans-Regular.ttf" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Components\Routes.razor" />
+    <None Include="Components\_Imports.razor" />
+    <None Include="Platforms\iOS\Info.plist" />
+    <None Include="Platforms\iOS\Resources\PrivacyInfo.xcprivacy" />
+    <None Include="Platforms\MacCatalyst\Entitlements.plist" />
+    <None Include="Platforms\MacCatalyst\Info.plist" />
+    <None Include="Platforms\Windows\app.manifest" />
+    <None Include="Platforms\Windows\Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Properties\launchSettings.json" />
+    <None Include="ProjectTemplate.csproj" />
+    <None Include="OpenSilverMauiHybridTemplate.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <VSTemplate Include="OpenSilverMauiHybridTemplate.vstemplate" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Platforms\Android\AndroidManifest.xml" />
+    <None Include="Platforms\Android\Resources\values\colors.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Platforms\Windows\App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AppIcon\appicon.svg" />
+    <None Include="Resources\AppIcon\appiconfg.svg" />
+    <None Include="Resources\Raw\AboutAssets.txt" />
+    <None Include="Resources\Splash\splash.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="wwwroot\index.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\Images\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="MainPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.ico b/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.ico
new file mode 100644
index 0000000..aae70d3
Binary files /dev/null and b/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.ico differ
diff --git a/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.vstemplate b/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.vstemplate
new file mode 100644
index 0000000..d201c77
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/OpenSilverMauiHybridTemplate.vstemplate
@@ -0,0 +1,94 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010">
+  <TemplateData>
+    <Name>OpenSilverMauiHybridTemplate</Name>
+    <Description>OpenSilverMauiHybridTemplate</Description>
+    <Icon>OpenSilverMauiHybridTemplate.ico</Icon>
+    <ProjectType>CSharp</ProjectType>
+    <LanguageTag>csharp</LanguageTag>
+    <RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <SortOrder>1000</SortOrder>
+    <TemplateID>a426d95d-532e-426d-842f-60c2649dacc4</TemplateID>
+    <CreateNewFolder>true</CreateNewFolder>
+    <DefaultName>OpenSilverMauiHybridTemplate</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+    <CreateInPlace>true</CreateInPlace>
+    <Hidden>true</Hidden>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="ProjectTemplate.csproj" ReplaceParameters="true">
+      <Folder Name="Components" TargetFolderName="Components">
+        <ProjectItem ReplaceParameters="false" TargetFileName="_Imports.razor">_Imports.razor</ProjectItem>
+        <ProjectItem ReplaceParameters="true" TargetFileName="Index.cs">Index.cs</ProjectItem>
+        <ProjectItem ReplaceParameters="false" TargetFileName="Routes.razor">Routes.razor</ProjectItem>
+      </Folder>
+      <Folder Name="Platforms" TargetFolderName="Platforms">
+        <Folder Name="Android" TargetFolderName="Android">
+          <Folder Name="Resources" TargetFolderName="Resources">
+            <Folder Name="values" TargetFolderName="values">
+              <ProjectItem ReplaceParameters="false" TargetFileName="colors.xml">colors.xml</ProjectItem>
+            </Folder>
+          </Folder>
+          <ProjectItem ReplaceParameters="false" TargetFileName="AndroidManifest.xml">AndroidManifest.xml</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="AndroidWebViewHandler.cs">AndroidWebViewHandler.cs</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="MainActivity.cs">MainActivity.cs</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="MainApplication.cs">MainApplication.cs</ProjectItem>
+        </Folder>
+        <Folder Name="iOS" TargetFolderName="iOS">
+          <Folder Name="Resources" TargetFolderName="Resources">
+            <ProjectItem ReplaceParameters="false" TargetFileName="PrivacyInfo.xcprivacy">PrivacyInfo.xcprivacy</ProjectItem>
+          </Folder>
+          <ProjectItem ReplaceParameters="true" TargetFileName="AppDelegate.cs">AppDelegate.cs</ProjectItem>
+          <ProjectItem ReplaceParameters="false" TargetFileName="Info.plist">Info.plist</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="Program.cs">Program.cs</ProjectItem>
+        </Folder>
+        <Folder Name="MacCatalyst" TargetFolderName="MacCatalyst">
+          <ProjectItem ReplaceParameters="true" TargetFileName="AppDelegate.cs">AppDelegate.cs</ProjectItem>
+          <ProjectItem ReplaceParameters="false" TargetFileName="Entitlements.plist">Entitlements.plist</ProjectItem>
+          <ProjectItem ReplaceParameters="false" TargetFileName="Info.plist">Info.plist</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="Program.cs">Program.cs</ProjectItem>
+        </Folder>
+        <Folder Name="Windows" TargetFolderName="Windows">
+          <ProjectItem ReplaceParameters="true" TargetFileName="app.manifest">app.manifest</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml">App.xaml</ProjectItem>
+          <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml.cs">App.xaml.cs</ProjectItem>
+          <ProjectItem ReplaceParameters="false" TargetFileName="Package.appxmanifest">Package.appxmanifest</ProjectItem>
+        </Folder>
+      </Folder>
+      <Folder Name="Properties" TargetFolderName="Properties">
+        <ProjectItem ReplaceParameters="false" TargetFileName="launchSettings.json">launchSettings.json</ProjectItem>
+      </Folder>
+      <Folder Name="Resources" TargetFolderName="Resources">
+        <Folder Name="AppIcon" TargetFolderName="AppIcon">
+          <ProjectItem ReplaceParameters="false" TargetFileName="appicon.svg">appicon.svg</ProjectItem>
+          <ProjectItem ReplaceParameters="false" TargetFileName="appiconfg.svg">appiconfg.svg</ProjectItem>
+        </Folder>
+        <Folder Name="Fonts" TargetFolderName="Fonts">
+          <ProjectItem ReplaceParameters="false" TargetFileName="OpenSans-Regular.ttf">OpenSans-Regular.ttf</ProjectItem>
+        </Folder>
+        <Folder Name="Raw" TargetFolderName="Raw">
+          <ProjectItem ReplaceParameters="false" TargetFileName="AboutAssets.txt">AboutAssets.txt</ProjectItem>
+        </Folder>
+        <Folder Name="Splash" TargetFolderName="Splash">
+          <ProjectItem ReplaceParameters="false" TargetFileName="splash.svg">splash.svg</ProjectItem>
+        </Folder>
+        <Folder Name="Images" TargetFolderName="Images">
+        </Folder>
+      </Folder>
+      <Folder Name="wwwroot" TargetFolderName="wwwroot">
+        <ProjectItem ReplaceParameters="true" TargetFileName="index.html">index.html</ProjectItem>
+      </Folder>
+      <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml">App.xaml</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="App.xaml.cs">App.xaml.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="MainPage.xaml">MainPage.xaml</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="MainPage.xaml.cs">MainPage.xaml.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="MauiProgram.cs">MauiProgram.cs</ProjectItem>
+    </Project>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>OpenSilver.TemplateWizards.Wizards.MauiHybridProjectTemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+  </WizardData>
+</VSTemplate>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Android/AndroidManifest.xml b/src/OpenSilverMauiHybridTemplate/Platforms/Android/AndroidManifest.xml
new file mode 100644
index 0000000..dbf9e7e
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Android/AndroidManifest.xml
@@ -0,0 +1,6 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Android/AndroidWebViewHandler.cs b/src/OpenSilverMauiHybridTemplate/Platforms/Android/AndroidWebViewHandler.cs
new file mode 100644
index 0000000..5e210ba
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Android/AndroidWebViewHandler.cs
@@ -0,0 +1,13 @@
+﻿using Microsoft.AspNetCore.Components.WebView.Maui;
+
+namespace $safeprojectname$;
+
+public class AndroidWebViewHandler : BlazorWebViewHandler
+{
+    protected override void ConnectHandler(global::Android.Webkit.WebView webView)
+    {
+        webView.Settings.SetSupportMultipleWindows(false);
+
+        base.ConnectHandler(webView);
+    }
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Android/MainActivity.cs b/src/OpenSilverMauiHybridTemplate/Platforms/Android/MainActivity.cs
new file mode 100644
index 0000000..ac9d3ba
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Android/MainActivity.cs
@@ -0,0 +1,10 @@
+﻿using Android.App;
+using Android.Content.PM;
+using Android.OS;
+
+namespace $safeprojectname$;
+
+[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+public class MainActivity : MauiAppCompatActivity
+{
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Android/MainApplication.cs b/src/OpenSilverMauiHybridTemplate/Platforms/Android/MainApplication.cs
new file mode 100644
index 0000000..8002a10
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Android/MainApplication.cs
@@ -0,0 +1,15 @@
+﻿using Android.App;
+using Android.Runtime;
+
+namespace $safeprojectname$;
+
+[Application]
+public class MainApplication : MauiApplication
+{
+    public MainApplication(IntPtr handle, JniHandleOwnership ownership)
+        : base(handle, ownership)
+    {
+    }
+
+    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Android/Resources/values/colors.xml b/src/OpenSilverMauiHybridTemplate/Platforms/Android/Resources/values/colors.xml
new file mode 100644
index 0000000..c04d749
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Android/Resources/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#512BD4</color>
+    <color name="colorPrimaryDark">#2B0B98</color>
+    <color name="colorAccent">#2B0B98</color>
+</resources>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/AppDelegate.cs b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/AppDelegate.cs
new file mode 100644
index 0000000..288cae8
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/AppDelegate.cs
@@ -0,0 +1,9 @@
+﻿using Foundation;
+
+namespace $safeprojectname$;
+
+[Register("AppDelegate")]
+public class AppDelegate : MauiUIApplicationDelegate
+{
+    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Entitlements.plist b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Entitlements.plist
new file mode 100644
index 0000000..de4adc9
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Entitlements.plist
@@ -0,0 +1,14 @@
+﻿<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
+    <dict>
+        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
+        <key>com.apple.security.network.client</key>
+        <true/>
+    </dict>
+</plist>
+
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Info.plist b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Info.plist
new file mode 100644
index 0000000..7b1e6e6
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Info.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <!-- The Mac App Store requires you specify if the app uses encryption. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
+    <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
+    <!-- Please indicate <true/> or <false/> here. -->
+
+    <!-- Specify the category for your app here. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
+    <!-- <key>LSApplicationCategoryType</key> -->
+    <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
+    <key>UIDeviceFamily</key>
+    <array>
+        <integer>2</integer>
+    </array>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+        <string>arm64</string>
+    </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>XSAppIconAssets</key>
+    <string>Assets.xcassets/appicon.appiconset</string>
+</dict>
+</plist>
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Program.cs b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Program.cs
new file mode 100644
index 0000000..cb9be52
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/MacCatalyst/Program.cs
@@ -0,0 +1,15 @@
+﻿using ObjCRuntime;
+using UIKit;
+
+namespace $safeprojectname$;
+
+public class Program
+{
+    // This is the main entry point of the application.
+    static void Main(string[] args)
+    {
+        // if you want to use a different Application Delegate class from "AppDelegate"
+        // you can specify it here.
+        UIApplication.Main(args, null, typeof(AppDelegate));
+    }
+}
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Windows/App.xaml b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/App.xaml
new file mode 100644
index 0000000..fc3e13d
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/App.xaml
@@ -0,0 +1,8 @@
+﻿<maui:MauiWinUIApplication
+    x:Class="$safeprojectname$.WinUI.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:maui="using:Microsoft.Maui"
+    xmlns:local="using:$safeprojectname$.WinUI">
+
+</maui:MauiWinUIApplication>
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Windows/App.xaml.cs b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/App.xaml.cs
new file mode 100644
index 0000000..fde7e8a
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/App.xaml.cs
@@ -0,0 +1,24 @@
+﻿using Microsoft.UI.Xaml;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace $safeprojectname$.WinUI;
+
+/// <summary>
+/// Provides application-specific behavior to supplement the default Application class.
+/// </summary>
+public partial class App : MauiWinUIApplication
+{
+    /// <summary>
+    /// Initializes the singleton application object.  This is the first line of authored code
+    /// executed, and as such is the logical equivalent of main() or WinMain().
+    /// </summary>
+    public App()
+    {
+        this.InitializeComponent();
+    }
+
+    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
+
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Windows/Package.appxmanifest b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/Package.appxmanifest
new file mode 100644
index 0000000..90b4b6e
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/Package.appxmanifest
@@ -0,0 +1,46 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="EDF4232E-06FF-468A-B13B-A6E2CBD43F98" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>$placeholder$</DisplayName>
+    <PublisherDisplayName>User Name</PublisherDisplayName>
+    <Logo>$placeholder$.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="$placeholder$"
+        Description="$placeholder$"
+        Square150x150Logo="$placeholder$.png"
+        Square44x44Logo="$placeholder$.png"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Square71x71Logo="$placeholder$.png" Wide310x150Logo="$placeholder$.png" Square310x310Logo="$placeholder$.png" />
+        <uap:SplashScreen Image="$placeholder$.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+
+</Package>
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/Windows/app.manifest b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/app.manifest
new file mode 100644
index 0000000..b63d54a
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/Windows/app.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="$safeprojectname$.WinUI.app"/>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- The combination of below two tags have the following effect:
+           1) Per-Monitor for >= Windows 10 Anniversary Update
+           2) System < Windows 10 Anniversary Update
+      -->
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/iOS/AppDelegate.cs b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/AppDelegate.cs
new file mode 100644
index 0000000..288cae8
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/AppDelegate.cs
@@ -0,0 +1,9 @@
+﻿using Foundation;
+
+namespace $safeprojectname$;
+
+[Register("AppDelegate")]
+public class AppDelegate : MauiUIApplicationDelegate
+{
+    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Info.plist b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Info.plist
new file mode 100644
index 0000000..ecb7f71
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Info.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>UIDeviceFamily</key>
+    <array>
+        <integer>1</integer>
+        <integer>2</integer>
+    </array>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+        <string>arm64</string>
+    </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>XSAppIconAssets</key>
+    <string>Assets.xcassets/appicon.appiconset</string>
+</dict>
+</plist>
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Program.cs b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Program.cs
new file mode 100644
index 0000000..286b783
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Program.cs
@@ -0,0 +1,15 @@
+﻿using ObjCRuntime;
+using UIKit;
+
+namespace $safeprojectname$;
+
+public class Program
+{
+    // This is the main entry point of the application.
+    static void Main(string[] args)
+    {
+        // if you want to use a different Application Delegate class from "AppDelegate"
+        // you can specify it here.
+        UIApplication.Main(args, null, typeof(AppDelegate));
+    }
+}
diff --git a/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000..24ab3b4
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is the minimum required version of the Apple Privacy Manifest for .NET MAUI apps.
+The contents below are needed because of APIs that are used in the .NET framework and .NET MAUI SDK.
+
+You are responsible for adding extra entries as needed for your application.
+
+More information: https://aka.ms/maui-privacy-manifest
+-->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSPrivacyAccessedAPITypes</key>
+    <array>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>C617.1</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>35F9.1</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>E174.1</string>
+            </array>
+        </dict>
+        <!--
+            The entry below is only needed when you're using the Preferences API in your app.
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>CA92.1</string>
+            </array>
+        </dict> -->
+    </array>
+</dict>
+</plist>
diff --git a/src/OpenSilverMauiHybridTemplate/ProjectTemplate.csproj b/src/OpenSilverMauiHybridTemplate/ProjectTemplate.csproj
new file mode 100644
index 0000000..80ed5eb
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/ProjectTemplate.csproj
@@ -0,0 +1,80 @@
+﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <PropertyGroup>$mauiplatformsbasic$$windowsTarget$
+        <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
+        <!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
+
+        <!-- Note for MacCatalyst:
+            The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
+            When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifier>.
+            The Mac App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
+            either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
+        <!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->
+
+        <OutputType>Exe</OutputType>
+        <RootNamespace>$safeprojectname$</RootNamespace>
+        <UseMaui>true</UseMaui>
+        <SingleProject>true</SingleProject>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <EnableDefaultCssItems>false</EnableDefaultCssItems>
+        <Nullable>enable</Nullable>
+
+        <!-- Display name -->
+        <ApplicationTitle>$rootprojectname$</ApplicationTitle>
+
+        <!-- App Identifier -->
+        <ApplicationId>$appidentifier$</ApplicationId>
+
+        <!-- Versions -->
+        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+        <ApplicationVersion>1</ApplicationVersion>
+
+        <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+        <WindowsPackageType>None</WindowsPackageType>
+
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+        <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <!-- App Icon -->
+        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+
+        <!-- Splash Screen -->
+        <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+
+        <!-- Images -->
+        <MauiImage Include="Resources\Images\*" />
+
+        <!-- Custom Fonts -->
+        <MauiFont Include="Resources\Fonts\*" />
+
+        <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+        <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <AndroidResource Remove="Components\Pages\**" />
+      <Compile Remove="Components\Pages\**" />
+      <Content Remove="Components\Pages\**" />
+      <EmbeddedResource Remove="Components\Pages\**" />
+      <MauiXaml Remove="Components\Pages\**" />
+      <None Remove="Components\Pages\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+        <PackageReference Include="OpenSilver.MauiHybrid" Version="$opensilvermauihybridpackageversion$" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\$rootprojectname$\$rootprojectname$$rootprojectextension$" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/OpenSilverMauiHybridTemplate/Properties/AssemblyInfo.cs b/src/OpenSilverMauiHybridTemplate/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..99e5fc1
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+﻿using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSilverMauiHybridTemplate")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Userware")]
+[assembly: AssemblyProduct("OpenSilverMauiHybridTemplate")]
+[assembly: AssemblyCopyright("Copyright © Userware 2025")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f7380b38-5d00-4527-b0d2-4df1826881f9")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/OpenSilverMauiHybridTemplate/Properties/launchSettings.json b/src/OpenSilverMauiHybridTemplate/Properties/launchSettings.json
new file mode 100644
index 0000000..4f85793
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Windows Machine": {
+      "commandName": "Project",
+      "nativeDebugging": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Resources/AppIcon/appicon.svg b/src/OpenSilverMauiHybridTemplate/Resources/AppIcon/appicon.svg
new file mode 100644
index 0000000..2d846c2
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Resources/AppIcon/appicon.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <rect x="0" y="0" width="456" height="456" fill="#FFFFFF" />
+</svg>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Resources/AppIcon/appiconfg.svg b/src/OpenSilverMauiHybridTemplate/Resources/AppIcon/appiconfg.svg
new file mode 100644
index 0000000..d214073
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Resources/AppIcon/appiconfg.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" width="456" height="456" fill="none" viewBox="0 0 515 467"><path fill="url(#a)" d="M111.564 374.837c105 86 220.001 51.5 258.501 18-34.4 20.4-58.501 17.64-71.001 14-19-5.533-34.521-23.966-50.5-45-39.5-52-77.999-102-101.999-129s-74.0005-75.5-90.5003-5c-14.4085 61.564 24.9998 122.019 55.4993 147Z"/><path fill="url(#b)" d="M438.5 306.807c-90.793 170.546-228.844 118.852-281 97 43.286 9.496 77.616-9.823 89.5-18.001 18.064-12.429 33.608-31.959 42-60 20.5-68.5 19.808-112 35-151.5 7.5-19.5 12.687-33.637 29-48.5 22.5-20.5 68.179-20.705 89 16.5 30.5 54.5 18.5 119.001-3.5 164.501Z"/><path fill="url(#c)" d="M403.414 91.4861c-105-85.99999-220-51.5-258.5-18 34.4-20.4001 58.5-17.64 71-13.9999 19 5.533 34.522 23.9653 50.5 44.9998 39.5 52 78 102 102 129s74 75.5 90.5 5c14.408-61.564-25-122.019-55.5-146.9999Z"/><path fill="url(#d)" d="M76.4786 159.516C167.271-11.0301 305.322 40.6641 357.479 62.5162c-43.287-9.4965-77.616 9.8227-89.5 18.0002-18.065 12.4297-33.609 31.9586-42 59.9996-20.5 68.5-19.808 112-35 151.5-7.5 19.5-12.688 33.638-29 48.5-22.5 20.5-68.1791 20.705-89.0004-16.5-30.5-54.5-18.5-119 3.5-164.5Z"/><defs><linearGradient id="a" x1="67" x2="404" y1="205.806" y2="412.806" gradientUnits="userSpaceOnUse"><stop stop-color="#23A2DB"/><stop offset=".541667" stop-color="#23A2DB" stop-opacity=".1"/><stop offset="1" stop-color="#23A2DB" stop-opacity=".4"/></linearGradient><linearGradient id="b" x1="426.883" x2="144.343" y1="113.431" y2="448.425" gradientUnits="userSpaceOnUse"><stop stop-color="#23A2DB"/><stop offset=".614583" stop-color="#23A2DB" stop-opacity=".1"/><stop offset="1" stop-color="#23A2DB" stop-opacity=".4"/></linearGradient><linearGradient id="c" x1="447.979" x2="110.979" y1="260.516" y2="53.5164" gradientUnits="userSpaceOnUse"><stop stop-color="#23A2DB"/><stop offset=".541667" stop-color="#23A2DB" stop-opacity=".1"/><stop offset="1" stop-color="#23A2DB" stop-opacity=".4"/></linearGradient><linearGradient id="d" x1="88.096" x2="370.636" y1="352.892" y2="17.8977" gradientUnits="userSpaceOnUse"><stop stop-color="#23A2DB"/><stop offset=".614583" stop-color="#23A2DB" stop-opacity=".1"/><stop offset="1" stop-color="#23A2DB" stop-opacity=".4"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/Resources/Fonts/OpenSans-Regular.ttf b/src/OpenSilverMauiHybridTemplate/Resources/Fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..68fcd94
Binary files /dev/null and b/src/OpenSilverMauiHybridTemplate/Resources/Fonts/OpenSans-Regular.ttf differ
diff --git a/src/OpenSilverMauiHybridTemplate/Resources/Raw/AboutAssets.txt b/src/OpenSilverMauiHybridTemplate/Resources/Raw/AboutAssets.txt
new file mode 100644
index 0000000..6de1c15
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Resources/Raw/AboutAssets.txt
@@ -0,0 +1,15 @@
+﻿Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories). Deployment of the asset to your application
+is automatically handled by the following `MauiAsset` Build Action within your `.csproj`.
+
+    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+
+These files will be deployed with your package and will be accessible using Essentials:
+
+    async Task LoadMauiAsset()
+    {
+        using var stream = await FileSystem.OpenAppPackageFileAsync("AboutAssets.txt");
+        using var reader = new StreamReader(stream);
+
+        var contents = reader.ReadToEnd();
+    }
diff --git a/src/OpenSilverMauiHybridTemplate/Resources/Splash/splash.svg b/src/OpenSilverMauiHybridTemplate/Resources/Splash/splash.svg
new file mode 100644
index 0000000..21dfb25
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/Resources/Splash/splash.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+    <path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+    <path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+    <path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
+</svg>
\ No newline at end of file
diff --git a/src/OpenSilverMauiHybridTemplate/wwwroot/index.html b/src/OpenSilverMauiHybridTemplate/wwwroot/index.html
new file mode 100644
index 0000000..5443f71
--- /dev/null
+++ b/src/OpenSilverMauiHybridTemplate/wwwroot/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
+    <title>$rootprojectname$</title>
+    <base href="/" />
+    <link rel="icon" href="data:,">
+</head>
+
+<body>
+    <div id="app">
+    </div>
+    <div id="opensilver-root" style="position: relative; width: 100%; height: 100%; overflow-x: hidden; overflow-y: hidden">
+    </div>
+
+    <script src="libs/mauihybrid.js"></script>
+    <script src="_framework/blazor.webview.js" autostart="false"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/OpenSilverVBApplicationTemplate/OpenSilverApplication.vstemplate b/src/OpenSilverVBApplicationTemplate/OpenSilverApplication.vstemplate
index 750a924..563b14a 100644
--- a/src/OpenSilverVBApplicationTemplate/OpenSilverApplication.vstemplate
+++ b/src/OpenSilverVBApplicationTemplate/OpenSilverApplication.vstemplate
@@ -30,13 +30,8 @@
     </TemplateContent>
     <WizardExtension>
         <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-        <FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
+        <FullClassName>OpenSilver.TemplateWizards.Wizards.AppCustomizationWizard</FullClassName>
     </WizardExtension>
     <WizardData>
-        <OpenSilverInfo>
-            <Api>Silverlight</Api>
-            <Type>Application</Type>
-            <LanguageCode>vb</LanguageCode>
-        </OpenSilverInfo>
     </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/OpenSilverVBClassLibraryTemplate/OpenSilverClassLibrary.vstemplate b/src/OpenSilverVBClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
index fb21b1d..b808c07 100644
--- a/src/OpenSilverVBClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
+++ b/src/OpenSilverVBClassLibraryTemplate/OpenSilverClassLibrary.vstemplate
@@ -21,14 +21,10 @@
             <ProjectItem ReplaceParameters="true" TargetFileName="Class1.vb">Class1.vb</ProjectItem>
         </Project>
     </TemplateContent>
-	<WizardExtension>
-		<Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
-		<FullClassName>OpenSilver.TemplateWizards.AppCustomizationWizard</FullClassName>
-	</WizardExtension>
-	<WizardData>
-		<OpenSilverInfo>
-			<Api>Silverlight</Api>
-			<Type>Library</Type>
-		</OpenSilverInfo>
-	</WizardData>
+    <WizardExtension>
+        <Assembly>OpenSilver.TemplateWizards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <FullClassName>OpenSilver.TemplateWizards.Wizards.ClassLibraryProjectTemplateWizard</FullClassName>
+    </WizardExtension>
+    <WizardData>
+    </WizardData>
 </VSTemplate>
\ No newline at end of file
diff --git a/src/VSExtension.OpenSilver.sln b/src/VSExtension.OpenSilver.sln
index 623a78e..71f7d58 100644
--- a/src/VSExtension.OpenSilver.sln
+++ b/src/VSExtension.OpenSilver.sln
@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilverFSClassLibraryTem
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilverFSApplicationTemplate", "OpenSilverFSApplicationTemplate\OpenSilverFSApplicationTemplate.csproj", "{80832FE2-EB71-4443-B582-61CF0132E241}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilverMauiHybridTemplate", "OpenSilverMauiHybridTemplate\OpenSilverMauiHybridTemplate.csproj", "{F7380B38-5D00-4527-B0D2-4DF1826881F9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -167,6 +169,18 @@ Global
 		{80832FE2-EB71-4443-B582-61CF0132E241}.Release|arm64.Build.0 = Release|arm64
 		{80832FE2-EB71-4443-B582-61CF0132E241}.Release|x86.ActiveCfg = Release|x86
 		{80832FE2-EB71-4443-B582-61CF0132E241}.Release|x86.Build.0 = Release|x86
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Debug|arm64.ActiveCfg = Debug|arm64
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Debug|arm64.Build.0 = Debug|arm64
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Debug|x86.ActiveCfg = Debug|x86
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Debug|x86.Build.0 = Debug|x86
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Release|arm64.ActiveCfg = Release|arm64
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Release|arm64.Build.0 = Release|arm64
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Release|x86.ActiveCfg = Release|x86
+		{F7380B38-5D00-4527-B0D2-4DF1826881F9}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
