diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
index cb3b6a7..4e36534 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml
@@ -7,49 +7,77 @@
         WindowStartupLocation="CenterScreen"
         ResizeMode="NoResize"
         mc:Ignorable="d"
-        Title="OpenSilver Configuration" Height="300" Width="350" Icon="Icon.ico">
+        Title="OpenSilver Configuration" Height="600" Width="660" Icon="Icon.ico">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="2*" />
+            <RowDefinition Height="50" />
+            <RowDefinition Height="auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
 
-        <StackPanel Width="200" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center">
-            <StackPanel Margin="10" x:Name="DotNetVersionStackPanel">
-                <TextBlock Margin="5" Text=".NET Version:"/>
-                <ComboBox x:Name="DotNetVersionComboBox">
+        <Grid Grid.Column="1" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <TextBlock  Text="Choose a theme:"  FontSize="20" FontFamily="Inria Sans" FontWeight="DemiBold" Margin="-20" />
+            <local:ThemeCollectionView   SelectionChanged="ThemeCollectionView_SelectionChanged" Grid.Row="1"   />
+        </Grid>
+
+        <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,0,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>
                 </ComboBox>
             </StackPanel>
-        </StackPanel>
-
-        <WrapPanel Orientation="Horizontal" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center">
-            <RadioButton  Content="Modern Theme - Light" Margin="10,2"  Tag="{x:Static local:ThemeSelectionEnum.Light}" GroupName="Theme" Checked="OnThemSelected" IsChecked="True" />
-            <RadioButton  Content="Modern Theme - Dark"  Margin="10,2" Tag="{x:Static local:ThemeSelectionEnum.Dark}" GroupName="Theme" Checked="OnThemSelected" />
-            <RadioButton  Content="Classic Silverlight Theme" Tag="{x:Static local:ThemeSelectionEnum.Classic}" Margin="10,2" GroupName="Theme" Checked="OnThemSelected" />
-        </WrapPanel>
 
-        <StackPanel Grid.Row="2" Margin="10,0">
-            <TextBlock Text="Notes:"
+            <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"
+                    <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"
+                    <TextBlock Text="* .NET 9 requires Visual Studio 2022 v17.12 or newer"
                        TextWrapping="Wrap" Foreground="Gray"/>
-        </StackPanel>
-        
+                </StackPanel>
+            </Border>
+
+        </Grid>
 
-        <Grid Margin="20" Grid.Row="3">
+
+        <Grid Margin="20" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
+                <ColumnDefinition Width="24" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
-            <Button Grid.Column="0" 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"/>
@@ -58,14 +86,30 @@
                 <TextBlock Margin="5" Text="Back"/>
             </Button>
 
-            <Button Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Click="ButtonContinue_Click">
+            <Button
+                   x:Name="continueBtn"
+                    Grid.Column="2" 
+                    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>
+
+
+
+
+
     </Grid>
 </Window>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
index 7d51dfa..279a4f4 100644
--- a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/AppConfigurationWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using OpenSilver.TemplateWizards.AppCustomizationWindow.Models;
+using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
@@ -45,7 +46,7 @@ public AppConfigurationWindow(string openSilverType)
             InitializeComponent();
             if (openSilverType == "Library")
             {
-                DotNetVersionStackPanel.Visibility = Visibility.Collapsed;
+                DotNetVersionPanel.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -78,5 +79,11 @@ private void OnThemSelected(object sender, RoutedEventArgs e)
             }
 
         }
+
+        private void ThemeCollectionView_SelectionChanged(object sender, EventArgs e)
+        {
+            SelectedTheme= (sender as ThemeOptions).Name;
+            continueBtn.IsEnabled = true;
+        }
     }
 }
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
new file mode 100644
index 0000000..fba3b48
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/Models/ThemeOption.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace OpenSilver.TemplateWizards.AppCustomizationWindow.Models
+{
+    public class ThemeOptions
+    {
+        public string ThumbnailUri { get; set; }
+        public string Name { get; set; }
+        public string Title { get; set; }
+        public string BackgroundColor { get; set; }
+
+        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" });
+            return themes;
+        }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
new file mode 100644
index 0000000..1730f68
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml
@@ -0,0 +1,145 @@
+<UserControl x:Class="OpenSilver.TemplateWizards.AppCustomizationWindow.ThemeCollectionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             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"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+
+    <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="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="ItemsPanel">
+                <Setter.Value>
+                    <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </Setter.Value>
+            </Setter>
+
+            <Setter Property="ItemContainerStyle">
+                <Setter.Value>
+                    <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="2"/>
+                        <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+                        <Setter Property="Margin" Value="10,0,10,60" />
+                        <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" Duration="0" To=".35"/>
+                                                    </Storyboard>
+                                                </VisualState>
+                                                <VisualState x:Name="Disabled">
+                                                    <Storyboard>
+                                                        <DoubleAnimation Storyboard.TargetName="themeTitle" Storyboard.TargetProperty="Opacity" Duration="0" To=".55" />
+                                                    </Storyboard>
+                                                </VisualState>
+                                            </VisualStateGroup>
+                                            <VisualStateGroup x:Name="SelectionStates">
+                                                <VisualState x:Name="Unselected" />
+                                                <VisualState x:Name="Selected">
+                                                    <Storyboard>
+                                                        <DoubleAnimation Storyboard.TargetName="selectionIndicator" Storyboard.TargetProperty="Opacity" Duration="0" To=".75"/>
+                                                        <ObjectAnimationUsingKeyFrames
+                                                        Storyboard.TargetName="themeTitle" 
+                                                        Storyboard.TargetProperty="Foreground">
+                                                            <DiscreteObjectKeyFrame KeyTime="0" >
+                                                                <DiscreteObjectKeyFrame.Value>
+                                                                    <SolidColorBrush Color="#FFFFFF" />
+                                                                </DiscreteObjectKeyFrame.Value>
+                                                            </DiscreteObjectKeyFrame>
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                            </VisualStateGroup>
+                                            <VisualStateGroup x:Name="FocusStates">
+                                                <VisualState x:Name="Focused">
+                                                    <Storyboard>
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="selectedBorder" Storyboard.TargetProperty="Visibility" Duration="0">
+                                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                                <DiscreteObjectKeyFrame.Value>
+                                                                    <Visibility>Visible</Visibility>
+                                                                </DiscreteObjectKeyFrame.Value>
+                                                            </DiscreteObjectKeyFrame>
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </VisualState>
+                                                <VisualState x:Name="Unfocused"/>
+                                            </VisualStateGroup>
+                                        </VisualStateManager.VisualStateGroups>
+
+                                        <Border x:Name="mouseOverIndicator" Opacity="0" Background="White" IsHitTestVisible="False" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="10" BorderBrush="Transparent"/>
+                                        <Grid >
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition />
+                                                <RowDefinition Height="8"/>
+                                                <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"/>
+
+                                            <Image Source="{Binding ThumbnailUri}"
+                                                   Width="134"
+                                                   Height="134"
+                                                   Stretch="Uniform"
+                                                   Margin="0"
+                                                   ToolTip="{Binding Description}"
+                                               />
+
+                                            <Border x:Name="selectedBorder" 
+                                                    Visibility="Collapsed" 
+                                                    BorderThickness="0" 
+                                                    CornerRadius="14" 
+                                                    Grid.Row="2"  
+                                                    Background="#1157FA"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch" >
+                                            </Border>
+
+                                            <TextBlock x:Name="themeTitle" Text="{Binding Title}"
+                                                       Foreground="#FF626262"
+                                                       FontWeight="SemiBold"
+                                                       HorizontalAlignment="Center"
+                                                       Grid.Row="2"
+                                                       Margin="8"
+                                                       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>
+                        </Setter>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </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>
+    </Grid>
+</UserControl>
diff --git a/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
new file mode 100644
index 0000000..3bf4426
--- /dev/null
+++ b/src/OpenSilver.TemplateWizards/AppCustomizationWindow/ThemeCollectionView.xaml.cs
@@ -0,0 +1,38 @@
+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
+{
+    /// <summary>
+    /// Interaction logic for ThemeCollectionView.xaml
+    /// </summary>
+    public partial class ThemeCollectionView : UserControl
+    {
+        public event EventHandler SelectionChanged;
+        public ThemeCollectionView()
+        {
+            InitializeComponent();
+            themeList.ItemsSource = ThemeOptions.GeThemes();
+            themeList.SelectionChanged += ThemeList_SelectionChanged;
+        }
+
+        private void ThemeList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            
+            SelectionChanged?.Invoke(themeList.SelectedItem, e);
+        }
+    }
+}
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/classic_theme.png b/src/OpenSilver.TemplateWizards/Assets/Images/classic_theme.png
new file mode 100644
index 0000000..ee5f2ac
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/classic_theme.png differ
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/dark_theme.png b/src/OpenSilver.TemplateWizards/Assets/Images/dark_theme.png
new file mode 100644
index 0000000..3ff1f03
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/dark_theme.png differ
diff --git a/src/OpenSilver.TemplateWizards/Assets/Images/light_theme.png b/src/OpenSilver.TemplateWizards/Assets/Images/light_theme.png
new file mode 100644
index 0000000..62bfa68
Binary files /dev/null and b/src/OpenSilver.TemplateWizards/Assets/Images/light_theme.png differ
diff --git a/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj b/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
index c538b9d..05c814d 100644
--- a/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
+++ b/src/OpenSilver.TemplateWizards/OpenSilver.TemplateWizards.csproj
@@ -49,7 +49,11 @@
       <DependentUpon>AppConfigurationWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="AppCustomizationWindow\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="Properties\AssemblyInfo.cs" />
@@ -59,6 +63,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="AppCustomizationWindow\ThemeCollectionView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="AppCustomizationWindow\Icon.ico" />
@@ -67,5 +75,11 @@
     <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" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file