diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
index a1ede6a..1191008 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
@@ -4,122 +4,110 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow"
+        xmlns:models="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow.Models"
         WindowStartupLocation="CenterScreen"
         mc:Ignorable="d"
+        Background="#F1F1F1"
         SizeToContent="WidthAndHeight"
         ResizeMode="NoResize"
-        Title="OpenSilver Configuration" Icon="Icon.ico">
-    <Grid>
+        Title="OpenSilver Configuration"
+        Icon="Icon.ico">
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/OpenSilver.TemplateWizards;component/AppCustomizationWindow/Styles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Grid Margin="50,30,20,20">
         <Grid.RowDefinitions>
-            <RowDefinition Height="50" />
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="50" />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="50"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="50"/>
-        </Grid.ColumnDefinitions>
 
-        <Grid Grid.Row="1" Grid.Column="1" x:Name="chooseThemesCollection">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Text="Choose a theme:" FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20,0,0,20" />
-            <local:ThemeCollectionView x:Name="themeList" SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Row="1" />
-        </Grid>
+            <TextBlock x:Name="chooseThemeLabel" Text="Choose Theme:" FontSize="18" FontFamily="Inria Sans" FontWeight="DemiBold" VerticalAlignment="Center"/>
+            <local:ThemeCollectionView x:Name="themeList" SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Column="1" Margin="0,0,0,60"/>
 
-        <Grid Grid.Row="2" Grid.Column="1" x:Name="DotNetVersionPanel">
-            <Grid.RowDefinitions>
-                <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,20,0,32" />
-            <StackPanel Grid.Row="1" HorizontalAlignment="Stretch">
-                <ComboBox x:Name="DotNetVersionComboBox">
-                    <ComboBoxItem>.NET 7 (Out of support)</ComboBoxItem>
-                    <ComboBoxItem>.NET 8 (Long Term Support)</ComboBoxItem>
-                    <ComboBoxItem IsSelected="True">.NET 9 (Standard Term Support)</ComboBoxItem>
+            <TextBlock Grid.Row="1" Text="Choose Version of .NET:" FontSize="18" FontFamily="Inria Sans" FontWeight="DemiBold" VerticalAlignment="Center" Margin="0,0,0,60"/>
+            <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Margin="0,0,0,60">
+                <ComboBox x:Name="DotNetVersionComboBox" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="0" Margin="20,0"
+                          FontSize="22" Foreground="#1157FA" FontWeight="SemiBold" SelectedIndex="2" SelectedValuePath="Version" Cursor="Hand">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate DataType="models:DotNetOption">
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="{Binding Title}"/>
+                                <TextBlock Text="{Binding SupportDescription}" FontSize="11" Foreground="Gray"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                    <models:DotNetOption Title=".NET 7" SupportDescription="Out of support" Version="Net7"/>
+                    <models:DotNetOption Title=".NET 8" SupportDescription="Long Term Support" Version="Net8" Notes="* .NET 8 requires Visual Studio 2022 v17.8 or newer"/>
+                    <models:DotNetOption Title=".NET 9" SupportDescription="Standard Term Support" Version="Net9" Notes="* .NET 9 requires Visual Studio 2022 v17.12 or newer"/>
                 </ComboBox>
+                <TextBlock Grid.Row="1" Text="{Binding SelectedItem.Notes, ElementName=DotNetVersionComboBox}" 
+                           TextWrapping="Wrap" Foreground="Gray" VerticalAlignment="Center"/>
             </StackPanel>
 
-            <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"/>
-                </StackPanel>
-            </Border>
+            <TextBlock Grid.Row="2" Text="Choose Target Platforms:" FontSize="18" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="0,25,20,0"/>
+            <local:PlatformsView x:Name="platformList" Grid.Row="2" Grid.Column="1" d:SelectedIndex="1"/>
         </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"/>
-                <CheckBox Content="Browser (Required)" IsChecked="True" IsEnabled="False" />
-                <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>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,60,0,0" HorizontalAlignment="Right">
+            <StackPanel.Resources>
+                <Style TargetType="Button">
+                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="FontSize" Value="18"/>
+                    <Setter Property="FontWeight" Value="SemiBold"/>
+                    <Setter Property="Cursor" Value="Hand"/>
+                    <Setter Property="Padding" Value="20,10"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="Button">
+                                <Border x:Name="ButtonBorder" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="5" Padding="{TemplateBinding Padding}">
+                                    <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </Border>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="ButtonBorder" Property="Opacity" Value="0.8"/>
+                                    </Trigger>
 
-        <Grid Grid.Row="4" Grid.Column="1" Margin="20,20,20,0" HorizontalAlignment="Right">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="24" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter TargetName="ButtonBorder" Property="Opacity" Value="0.4"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </StackPanel.Resources>
 
-            <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"/>
-                    </Style>
-                </Button.Resources>
-                <TextBlock Margin="5" Text="Back"/>
-            </Button>
+            <Button Content="Back"
+                    Margin="0,0,17,0"
+                    Background="Transparent"
+                    Foreground="#5A5A5A"
+                    IsCancel="True"/>
 
-            <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"/>
-                    </Style>
-                </Button.Resources>
-
-                <TextBlock Margin="5" Text="Continue"/>
-            </Button>
-        </Grid>
+            <Button Content="Continue"
+                    x:Name="continueBtn"
+                    Click="ButtonContinue_Click"
+                    Background="#1157FA"
+                    Foreground="#FFFFFF"
+                    IsEnabled="False"
+                    d:IsEnabled="True"/>
+        </StackPanel>
     </Grid>
 </Window>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
index e59b92a..0460992 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
@@ -2,6 +2,7 @@
 using OpenSilver.TemplateWizards.AppCustomizationWindow.Models;
 using OpenSilver.TemplateWizards.Shared;
 using System;
+using System.Linq;
 using System.Windows;
 
 namespace OpenSilver.TemplateWizards.AppCustomizationWindow
@@ -13,23 +14,7 @@ public partial class AppConfigurationWindow : Window
     {
         public ThemeOptions SelectedTheme { get; private set; }
 
-        public DotNetVersion DotNetVersion
-        {
-            get
-            {
-                switch (DotNetVersionComboBox.SelectedIndex)
-                {
-                    case 0:
-                        return DotNetVersion.Net7;
-                    case 1:
-                        return DotNetVersion.Net8;
-                    case 2:
-                        return DotNetVersion.Net9;
-                    default:
-                        throw new InvalidOperationException("Error retrieving selected .NET version");
-                }
-            }
-        }
+        public DotNetVersion DotNetVersion => (DotNetVersion)DotNetVersionComboBox.SelectedValue;
 
         public MauiHybridPlatform MauiHybridPlatform
         {
@@ -37,21 +22,25 @@ public MauiHybridPlatform MauiHybridPlatform
             {
                 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)
+                foreach (var platform in platformList.SelectedItems.OfType<TargetPlatform>())
                 {
-                    platforms |= MauiHybridPlatform.Mac;
+                    switch (platform.Title.ToLower())
+                    {
+                        case "ios":
+                            platforms |= MauiHybridPlatform.iOS;
+                            break;
+                        case "android":
+                            platforms |= MauiHybridPlatform.Android;
+                            break;
+                        case "windows":
+                            platforms |= MauiHybridPlatform.Windows;
+                            break;
+                        case "macos":
+                            platforms |= MauiHybridPlatform.Mac;
+                            break;
+                        default:
+                            break;
+                    }
                 }
 
                 return platforms;
@@ -65,7 +54,8 @@ public AppConfigurationWindow(bool isBusiness = false)
             if (isBusiness)
             {
                 //Modern theme is deactivated for now, for Business Application projects
-                chooseThemesCollection.Visibility = Visibility.Collapsed;
+                chooseThemeLabel.Visibility = Visibility.Collapsed;
+                themeList.Visibility = Visibility.Collapsed;
                 themeList.Select(ThemeOptions.Classic);
             }
             else
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/DotNetOption.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/DotNetOption.cs
new file mode 100644
index 0000000..31c6f85
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/DotNetOption.cs
@@ -0,0 +1,12 @@
+using OpenSilver.TemplateWizards.Shared;
+
+namespace OpenSilver.TemplateWizards.AppCustomizationWindow.Models
+{
+    public class DotNetOption
+    {
+        public string Title { get; set; }
+        public string SupportDescription { get; set; }
+        public string Notes { get; set; }
+        public DotNetVersion Version { get; set; }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/TargetPlatform.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/TargetPlatform.cs
new file mode 100644
index 0000000..9b89826
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/TargetPlatform.cs
@@ -0,0 +1,11 @@
+namespace OpenSilver.TemplateWizards.AppCustomizationWindow.Models
+{
+    public class TargetPlatform
+    {
+        public string Title { get; set; }
+        public string Framework { get; set; }
+        public string ThumbnailUri { get; set; }
+        public double Opacity { get; set; } = 0.6;
+        public bool IsAlwaysSelected { get; set; }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
index b13199a..eb76205 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
@@ -5,15 +5,15 @@ namespace OpenSilver.TemplateWizards.AppCustomizationWindow.Models
     public class ThemeOptions
     {
         public static ThemeOptions Light { get; } =
-            new ThemeOptions(nameof(Light), "Modern - Light", "/OpenSilver.TemplateWizards;component/Assets/Images/light_theme.png", "#FFFFFF");
+            new ThemeOptions(nameof(Light), "Modern Light Theme", "/OpenSilver.TemplateWizards;component/Assets/Images/light_theme.png", "#FFFFFF");
 
         public static ThemeOptions Dark { get; } =
-            new ThemeOptions(nameof(Dark), "Modern - Dark", "/OpenSilver.TemplateWizards;component/Assets/Images/dark_theme.png", "#111111");
+            new ThemeOptions(nameof(Dark), "Modern Dark Theme", "/OpenSilver.TemplateWizards;component/Assets/Images/dark_theme.png", "#111111");
 
         public static ThemeOptions Classic { get; } =
-            new ThemeOptions(nameof(Classic), "Classic - Silverlight", "/OpenSilver.TemplateWizards;component/Assets/Images/classic_theme.png", "#FFFFFF");
+            new ThemeOptions(nameof(Classic), "Classic Silverlight Theme", "/OpenSilver.TemplateWizards;component/Assets/Images/classic_theme.png", "#FFFFFF");
 
-        public static IEnumerable<ThemeOptions> GetThemes() => new ThemeOptions[] { Light, Dark, Classic };
+        public static IEnumerable<ThemeOptions> Themes { get; } = new ThemeOptions[] { Light, Dark, Classic };
 
         private ThemeOptions(string name, string title, string thumbnailUri, string backgroundColor)
         {
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/PlatformsView.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/PlatformsView.xaml
new file mode 100644
index 0000000..d01e0d6
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/PlatformsView.xaml
@@ -0,0 +1,194 @@
+<ListBox x:Class="OpenSilver.TemplateWizards.AppCustomizationWindow.PlatformsView"
+         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+         xmlns:models="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow.Models"
+         d:DesignHeight="150"
+         d:DesignWidth="700"
+         d:SelectedIndex="1"
+         Background="Transparent"
+         BorderThickness="0"
+         SelectionMode="Multiple"
+         mc:Ignorable="d">
+
+    <ListBox.ItemsPanel>
+        <ItemsPanelTemplate>
+            <WrapPanel Orientation="Horizontal"/>
+        </ItemsPanelTemplate>
+    </ListBox.ItemsPanel>
+
+    <ListBox.ItemContainerStyle>
+        <Style TargetType="ListBoxItem">
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+            <Setter Property="Background" Value="#55FFFFFF"/>
+            <Setter Property="BorderThickness" Value="3"/>
+            <Setter Property="KeyboardNavigation.TabNavigation" Value="Local"/>
+            <Setter Property="Margin" Value="10,0"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <Grid>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Normal"/>
+                                    <VisualState x:Name="MouseOver">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="mouseOverIndicator"
+                                                             Storyboard.TargetProperty="Opacity"
+                                                             To=".35"
+                                                             Duration="0"/>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Disabled"/>
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="SelectionStates">
+                                    <VisualState x:Name="Unselected"/>
+                                    <VisualState x:Name="Selected">
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="selectionIndicator"
+                                                             Storyboard.TargetProperty="Opacity"
+                                                             To=".75"
+                                                             Duration="0"/>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="title" Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <SolidColorBrush Color="#FFFFFF"/>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="selectedBorder"
+                                                                           Storyboard.TargetProperty="Visibility"
+                                                                           Duration="0">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Visible</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="FocusStates">
+                                    <VisualState x:Name="Focused"/>
+                                    <VisualState x:Name="Unfocused"/>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+
+                            <Border x:Name="mouseOverIndicator"
+                                    Background="White"
+                                    BorderBrush="Transparent"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="10"
+                                    IsHitTestVisible="False"
+                                    Opacity="0"/>
+                            <Grid Background="Transparent">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition Height="15"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <Border x:Name="FocusVisualElement"
+                                        Width="70"
+                                        Height="70"
+                                        Background="White"
+                                        BorderBrush="#D1D1D1"
+                                        BorderThickness="1"
+                                        CornerRadius="10"
+                                        IsHitTestVisible="False"
+                                        Visibility="Visible">
+                                    <Border.Effect>
+                                        <DropShadowEffect BlurRadius="20"
+                                                          Direction="270"
+                                                          Opacity="0.15"
+                                                          ShadowDepth="4"
+                                                          Color="#000000"/>
+                                    </Border.Effect>
+                                </Border>
+
+                                <Image Width="60"
+                                       Height="60"
+                                       Margin="0"
+                                       Opacity="{Binding Opacity}"
+                                       SnapsToDevicePixels="True"
+                                       Source="{Binding ThumbnailUri}"
+                                       Stretch="Uniform"/>
+
+                                <Border x:Name="selectedBorder"
+                                        Grid.Row="2"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        Background="#1157FA"
+                                        BorderThickness="0"
+                                        CornerRadius="14"
+                                        Visibility="Collapsed"/>
+
+                                <TextBlock x:Name="title"
+                                           Grid.Row="2"
+                                           Margin="0,5"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Bottom"
+                                           FontFamily="Fantasy"
+                                           FontSize="13"
+                                           FontWeight="DemiBold"
+                                           Foreground="#535353"
+                                           Text="{Binding Title}"
+                                           TextAlignment="Center"
+                                           TextWrapping="Wrap"/>
+                                <Border x:Name="selectionIndicator"
+                                        Width="70"
+                                        Height="70"
+                                        BorderBrush="#1157FA"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="10"
+                                        IsHitTestVisible="False"
+                                        Opacity="0"/>
+
+                                <TextBlock Grid.Row="3"
+                                           Margin="0,5,0,0"
+                                           HorizontalAlignment="Center"
+                                           FontSize="11"
+                                           Foreground="#858585"
+                                           Text="{Binding Framework}"/>
+                            </Grid>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <DataTrigger Binding="{Binding IsAlwaysSelected}" Value="True">
+                                <Setter Property="IsSelected" Value="True"/>
+                                <Setter Property="IsEnabled" Value="False"/>
+                                <Setter Property="Cursor" Value="Arrow"/>
+                                <Setter TargetName="selectedBorder" Property="Background" Value="#535353"/>
+                                <Setter TargetName="selectionIndicator" Property="BorderBrush" Value="#535353"/>
+                            </DataTrigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </ListBox.ItemContainerStyle>
+
+    <models:TargetPlatform Title="Web"
+                           Framework="WebAssembly"
+                           IsAlwaysSelected="True"
+                           Opacity="1"
+                           ThumbnailUri="/OpenSilver.TemplateWizards;component/Assets/Images/platform_web.png"/>
+    <models:TargetPlatform Title="iOS"
+                           Framework="MAUI Hybrid"
+                           ThumbnailUri="/OpenSilver.TemplateWizards;component/Assets/Images/platform_apple.png"/>
+    <models:TargetPlatform Title="Android"
+                           Framework="MAUI Hybrid"
+                           ThumbnailUri="/OpenSilver.TemplateWizards;component/Assets/Images/platform_android.png"/>
+    <models:TargetPlatform Title="Windows"
+                           Framework="MAUI Hybrid"
+                           ThumbnailUri="/OpenSilver.TemplateWizards;component/Assets/Images/platform_windows.png"/>
+    <models:TargetPlatform Title="macOS"
+                           Framework="MAUI Hybrid"
+                           ThumbnailUri="/OpenSilver.TemplateWizards;component/Assets/Images/platform_apple.png"/>
+    <!--<models:TargetPlatform Title="Linux"
+                           Framework="Photino"
+                           ThumbnailUri="/OpenSilver.TemplateWizards;component/Assets/Images/platform_linux.png"/>-->
+</ListBox>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/PlatformsView.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/PlatformsView.xaml.cs
new file mode 100644
index 0000000..fd35221
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/PlatformsView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace OpenSilver.TemplateWizards.AppCustomizationWindow
+{
+    /// <summary>
+    /// Interaction logic for PlatformsView.xaml
+    /// </summary>
+    public partial class PlatformsView : ListBox
+    {
+        public PlatformsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Styles.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Styles.xaml
new file mode 100644
index 0000000..d5e3e2f
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Styles.xaml
@@ -0,0 +1,213 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow">
+
+    <Color x:Key="DisabledForegroundColor">#FF888888</Color>
+    <Color x:Key="SelectedBackgroundColor">#FFC5CBF9</Color>
+    <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color>
+    <Color x:Key="ControlLightColor">White</Color>
+    <Color x:Key="BorderMediumColor">#FF888888</Color>
+
+    <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Grid Background="Transparent">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="20"/>
+            </Grid.ColumnDefinitions>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal"/>
+                    <VisualState x:Name="MouseOver">
+                        <Storyboard>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
+                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0.7"/>
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Pressed"/>
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledForegroundColor}"/>
+                            </ColorAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="CheckStates">
+                    <VisualState x:Name="Checked"/>
+                    <VisualState x:Name="Unchecked"/>
+                    <VisualState x:Name="Indeterminate"/>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border x:Name="Border"
+                    Grid.ColumnSpan="2"
+                    BorderThickness="1"
+                    CornerRadius="2"/>
+            <Border Grid.Column="0"
+                    Margin="1"
+                    Background="Transparent"
+                    CornerRadius="2,0,0,2"/>
+            <Path x:Name="Arrow"
+                  Grid.Column="1"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Data="M1,1 L8,8 L15,1"
+                  Stroke="#535353"
+                  StrokeThickness="2"/>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}">
+        <Border x:Name="PART_ContentHost"
+                Background="{TemplateBinding Background}"
+                Focusable="False"/>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type ComboBox}">
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="MouseOver"/>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="PART_EditableTextBox" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledForegroundColor}"/>
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="EditStates">
+                                <VisualState x:Name="Editable">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_EditableTextBox" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentSite" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Hidden}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Uneditable"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Grid.Column="2"
+                                      ClickMode="Press"
+                                      Focusable="false"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Template="{StaticResource ComboBoxToggleButton}"/>
+                        <ContentPresenter x:Name="ContentSite"
+                                          Margin="3,3,23,3"
+                                          HorizontalAlignment="Left"
+                                          VerticalAlignment="Stretch"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          IsHitTestVisible="False"/>
+                        <TextBox x:Name="PART_EditableTextBox"
+                                 Margin="3,3,23,3"
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Bottom"
+                                 Background="Transparent"
+                                 Focusable="True"
+                                 IsReadOnly="{TemplateBinding IsReadOnly}"
+                                 Style="{x:Null}"
+                                 Template="{StaticResource ComboBoxTextBox}"
+                                 Visibility="Hidden"/>
+                        <Popup x:Name="Popup"
+                               AllowsTransparency="True"
+                               Focusable="False"
+                               IsOpen="{TemplateBinding IsDropDownOpen}"
+                               Placement="Bottom"
+                               PopupAnimation="Slide">
+                            <Grid x:Name="DropDown"
+                                  MinWidth="{TemplateBinding ActualWidth}"
+                                  MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                  SnapsToDevicePixels="True">
+                                <Border x:Name="DropDownBorder" BorderThickness="1">
+                                    <Border.BorderBrush>
+                                        <SolidColorBrush Color="{DynamicResource BorderMediumColor}"/>
+                                    </Border.BorderBrush>
+                                    <Border.Background>
+                                        <SolidColorBrush Color="{DynamicResource ControlLightColor}"/>
+                                    </Border.Background>
+                                </Border>
+                                <ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/>
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                        </Trigger>
+                        <Trigger SourceName="Popup" Property="AllowsTransparency" Value="true">
+                            <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="4"/>
+                            <Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
+        <Setter Property="SnapsToDevicePixels" Value="true"/>
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border x:Name="Border"
+                            Padding="2"
+                            Background="Transparent"
+                            SnapsToDevicePixels="true">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="0.7"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselected"/>
+                                <VisualState x:Name="Selected">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource SelectedBackgroundColor}"/>
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="SelectedUnfocused">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource SelectedUnfocusedColor}"/>
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
index 9629871..c79f194 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow"
+             xmlns:models="clr-namespace:OpenSilver.TemplateWizards.AppCustomizationWindow.Models"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 
@@ -31,9 +31,9 @@
                         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                         <Setter Property="VerticalContentAlignment" Value="Stretch" />
                         <Setter Property="Background" Value="#55FFFFFF" />
-                        <Setter Property="BorderThickness" Value="2"/>
+                        <Setter Property="BorderThickness" Value="3"/>
                         <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-                        <Setter Property="Margin" Value="10,0,10,0" />
+                        <Setter Property="Margin" Value="18,0" />
                         <Setter Property="Cursor" Value="Hand" />
                         <Setter Property="Template">
                             <Setter.Value>
@@ -84,10 +84,10 @@
                                         </VisualStateManager.VisualStateGroups>
 
                                         <Border x:Name="mouseOverIndicator" Opacity="0" Background="White" IsHitTestVisible="False" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="10" BorderBrush="Transparent"/>
-                                        <Grid >
+                                        <Grid Background="Transparent">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition />
-                                                <RowDefinition Height="8"/>
+                                                <RowDefinition Height="15"/>
                                                 <RowDefinition Height="auto"/>
                                             </Grid.RowDefinitions>
                                             <Border x:Name="FocusVisualElement" Visibility="Visible" Background="{Binding BackgroundColor}"  Width="134" Height="134" IsHitTestVisible="False" BorderThickness="1" CornerRadius="10" BorderBrush="#D1D1D1">
@@ -107,24 +107,28 @@
                                             <Border x:Name="selectedBorder"
                                                     Visibility="Collapsed"
                                                     BorderThickness="0"
-                                                    CornerRadius="14"
+                                                    CornerRadius="10"
+                                                    Margin="10,3"
                                                     Grid.Row="2"
                                                     Background="#1157FA"
                                                     HorizontalAlignment="Stretch"
                                                     VerticalAlignment="Stretch" >
                                             </Border>
 
-                                            <TextBlock x:Name="themeTitle" Text="{Binding Title}"
-                                                       Foreground="#FF626262"
-                                                       FontWeight="SemiBold"
+                                            <TextBlock x:Name="themeTitle" 
+                                                       Text="{Binding Title}"
+                                                       Foreground="#535353"
+                                                       FontWeight="DemiBold"
+                                                       FontSize="13"
                                                        HorizontalAlignment="Center"
+                                                       TextAlignment="Center"
                                                        Grid.Row="2"
                                                        Margin="8"
                                                        VerticalAlignment="Bottom"
-                                                       TextWrapping="Wrap"
-                                                       FontSize="16"
+                                                       TextWrapping="Wrap"                                                       
+                                                       Width="120"
                                                        FontFamily="Fantasy"/>
-                                            <Border x:Name="selectionIndicator" Width="146" Height="146" Opacity="0" IsHitTestVisible="False" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="10" BorderBrush="#FF1F7FD9" />
+                                            <Border x:Name="selectionIndicator" Width="134" Height="134" Opacity="0" IsHitTestVisible="False" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="10" BorderBrush="#1157FA" />
                                         </Grid>
                                     </Grid>
                                 </ControlTemplate>
@@ -137,7 +141,7 @@
     </UserControl.Resources>
 
     <Grid x:Name="mainGrid">
-        <ListBox x:Name="themeList" Style="{StaticResource ListBox_Style}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Background="Transparent">
-        </ListBox>
+        <ListBox x:Name="themeList" ItemsSource="{x:Static models:ThemeOptions.Themes}" Style="{StaticResource ListBox_Style}" d:SelectedIndex="0"
+                 HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Background="Transparent"/>
     </Grid>
 </UserControl>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
index 73b14f2..7e2467f 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
@@ -12,7 +12,6 @@ public partial class ThemeCollectionView : UserControl
         public ThemeCollectionView()
         {
             InitializeComponent();
-            themeList.ItemsSource = ThemeOptions.GetThemes();
             themeList.SelectionChanged += ThemeList_SelectionChanged;
         }
 
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/platform_android.png b/src/OpenSilver.TemplateWizards/Assets/Images/platform_android.png
new file mode 100644
index 0000000..a46226c
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/platform_android.png differ
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/platform_apple.png b/src/OpenSilver.TemplateWizards/Assets/Images/platform_apple.png
new file mode 100644
index 0000000..20a9b37
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/platform_apple.png differ
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/platform_linux.png b/src/OpenSilver.TemplateWizards/Assets/Images/platform_linux.png
new file mode 100644
index 0000000..3a69cb6
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/platform_linux.png differ
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/platform_web.png b/src/OpenSilver.TemplateWizards/Assets/Images/platform_web.png
new file mode 100644
index 0000000..19ed1f4
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/platform_web.png differ
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/platform_windows.png b/src/OpenSilver.TemplateWizards/Assets/Images/platform_windows.png
new file mode 100644
index 0000000..b97763f
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/platform_windows.png differ
diff --git a/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj b/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
index 87ec492..f13a8a3 100644
--- a/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
+++ b/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
@@ -48,6 +48,11 @@
     <Compile Include="AppCustomizationWindow\AppConfigurationWindow.xaml.cs">
       <DependentUpon>AppConfigurationWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="AppCustomizationWindow\Models\DotNetOption.cs" />
+    <Compile Include="AppCustomizationWindow\Models\TargetPlatform.cs" />
+    <Compile Include="AppCustomizationWindow\PlatformsView.xaml.cs">
+      <DependentUpon>PlatformsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Shared\DotNetVersion.cs" />
     <Compile Include="AppCustomizationWindow\Models\ThemeOption.cs" />
     <Compile Include="AppCustomizationWindow\ThemeCollectionView.xaml.cs">
@@ -67,6 +72,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="AppCustomizationWindow\PlatformsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="AppCustomizationWindow\Styles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="AppCustomizationWindow\ThemeCollectionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -79,11 +92,15 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.7.37357" />
     <PackageReference Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.5.33428.366" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Resource Include="Assets\Images\classic_theme.png" />
     <Resource Include="Assets\Images\dark_theme.png" />
     <Resource Include="Assets\Images\light_theme.png" />
+    <Resource Include="Assets\Images\platform_android.png" />
+    <Resource Include="Assets\Images\platform_apple.png" />
+    <Resource Include="Assets\Images\platform_linux.png" />
+    <Resource Include="Assets\Images\platform_web.png" />
+    <Resource Include="Assets\Images\platform_windows.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/TestWizard/App.xaml b/src/TestWizard/App.xaml
new file mode 100644
index 0000000..4f64504
--- /dev/null
+++ b/src/TestWizard/App.xaml
@@ -0,0 +1,3 @@
+<Application x:Class="TestWizard.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"/>
diff --git a/src/TestWizard/App.xaml.cs b/src/TestWizard/App.xaml.cs
new file mode 100644
index 0000000..bab914f
--- /dev/null
+++ b/src/TestWizard/App.xaml.cs
@@ -0,0 +1,25 @@
+using OpenSilver.TemplateWizards.AppCustomizationWindow;
+using System.Windows;
+
+namespace TestWizard;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App : Application
+{
+    public App()
+    {
+        MainWindow = new Window();
+
+        var configurationWindow = new AppConfigurationWindow();
+        _ = configurationWindow.ShowDialog();
+
+        var theme = configurationWindow.SelectedTheme;
+        var dotNetVersion = configurationWindow.DotNetVersion;
+        var mauiHybridPlatform = configurationWindow.MauiHybridPlatform;
+
+        MainWindow.Close();
+    }
+}
+
diff --git a/src/TestWizard/AssemblyInfo.cs b/src/TestWizard/AssemblyInfo.cs
new file mode 100644
index 0000000..a8dc727
--- /dev/null
+++ b/src/TestWizard/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
+                                                //(used if a resource is not found in the page,
+                                                // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
+                                                //(used if a resource is not found in the page,
+                                                // app, or any theme specific resource dictionaries)
+)]
diff --git a/src/TestWizard/TestWizard.csproj b/src/TestWizard/TestWizard.csproj
new file mode 100644
index 0000000..0856efa
--- /dev/null
+++ b/src/TestWizard/TestWizard.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenSilver.TemplateWizards\OpenSilver.TemplateWizards.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/VSExtension.OpenSilver.sln b/src/VSExtension.OpenSilver.sln
index 71f7d58..9521791 100644
--- a/src/VSExtension.OpenSilver.sln
+++ b/src/VSExtension.OpenSilver.sln
@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilverFSApplicationTemp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilverMauiHybridTemplate", "OpenSilverMauiHybridTemplate\OpenSilverMauiHybridTemplate.csproj", "{F7380B38-5D00-4527-B0D2-4DF1826881F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWizard", "TestWizard\TestWizard.csproj", "{DAC7670D-DD11-43CE-A120-231D896EB506}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -181,6 +183,18 @@ Global
 		{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
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Debug|arm64.Build.0 = Debug|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Debug|x86.Build.0 = Debug|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Release|arm64.ActiveCfg = Release|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Release|arm64.Build.0 = Release|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Release|x86.ActiveCfg = Release|Any CPU
+		{DAC7670D-DD11-43CE-A120-231D896EB506}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE