diff --git a/src/Models/ConventionalCommitType.cs b/src/Models/ConventionalCommitType.cs
index 4fb61d87..98169275 100644
--- a/src/Models/ConventionalCommitType.cs
+++ b/src/Models/ConventionalCommitType.cs
@@ -4,23 +4,29 @@ namespace SourceGit.Models
 {
     public class ConventionalCommitType
     {
+        public string Name { get; set; } = string.Empty;
         public string Type { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
 
         public static readonly List<ConventionalCommitType> Supported = new List<ConventionalCommitType>()
         {
-            new ConventionalCommitType("feat", "Adding a new feature"),
-            new ConventionalCommitType("fix", "Fixing a bug"),
-            new ConventionalCommitType("docs", "Updating documentation"),
-            new ConventionalCommitType("style", "Elements or code styles without changing the code logic"),
-            new ConventionalCommitType("test", "Adding or updating tests"),
-            new ConventionalCommitType("chore", "Making changes to the build process or auxiliary tools and libraries"),
-            new ConventionalCommitType("revert", "Undoing a previous commit"),
-            new ConventionalCommitType("refactor", "Restructuring code without changing its external behavior")
+            new ConventionalCommitType("Features", "feat", "Adding a new feature"),
+            new ConventionalCommitType("Bug Fixes", "fix", "Fixing a bug"),
+            new ConventionalCommitType("Reverts", "revert", "Undoing a previous commit"),
+            new ConventionalCommitType("Code Refactoring", "refactor", "Restructuring code without changing its external behavior"),
+            new ConventionalCommitType("Performance Improvements", "pref", "Improves performance"),
+            new ConventionalCommitType("Builds", "build", "Changes that affect the build system or external dependencies"),
+            new ConventionalCommitType("Continuous Integrations", "ci", "Changes to CI configuration files and scripts"),
+            new ConventionalCommitType("Documentations", "docs", "Updating documentation"),
+            new ConventionalCommitType("Styles", "style", "Elements or code styles without changing the code logic"),
+            new ConventionalCommitType("Tests", "test", "Adding or updating tests"),
+            new ConventionalCommitType("Chores", "chore", "Other changes that don't modify src or test files"),
+
         };
 
-        public ConventionalCommitType(string type, string description)
+        public ConventionalCommitType(string name, string type, string description)
         {
+            Name = name;
             Type = type;
             Description = description;
         }
diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml
index 58015d53..09484787 100644
--- a/src/Views/ConventionalCommitMessageBuilder.axaml
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml
@@ -48,12 +48,33 @@
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding Source={x:Static m:ConventionalCommitType.Supported}}"
-                SelectedItem="{Binding Type, Mode=TwoWay}">
+                SelectedItem="{Binding Type, Mode=TwoWay}"
+                Grid.IsSharedSizeScope="True">
+        <ComboBox.SelectionBoxItemTemplate>
+          <DataTemplate DataType="m:ConventionalCommitType">
+            <StackPanel Orientation="Horizontal">
+              <TextBlock Text="{Binding Name}" Margin="0,0,8,0"/>
+              <Border Height="16" CornerRadius="8" Padding="8,0" VerticalAlignment="Center" Background="Green">
+                <TextBlock Text="{Binding Type}" VerticalAlignment="Center" FontSize="11" Foreground="White"/>
+              </Border>              
+            </StackPanel>
+          </DataTemplate>
+        </ComboBox.SelectionBoxItemTemplate>
+        
         <ComboBox.ItemTemplate>
-          <DataTemplate x:DataType="{x:Type m:ConventionalCommitType}">
-            <Grid Height="20" ColumnDefinitions="64,Auto" VerticalAlignment="Center">
-              <TextBlock Grid.Column="0" Text="{Binding Type}"/>
-              <TextBlock Grid.Column="1" Text="{Binding Description}" Foreground="{DynamicResource Brush.FG2}"/>
+          <DataTemplate DataType="m:ConventionalCommitType">
+            <Grid Height="24">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="NameColumn"/>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="TypeColumn"/>
+                <ColumnDefinition Width="Auto" SharedSizeGroup="DescriptionColumn"/>
+              </Grid.ColumnDefinitions>
+
+              <TextBlock Grid.Column="0" Text="{Binding Name}"/>
+              <Border Grid.Column="1" Height="16" CornerRadius="8" Padding="8,0" Margin="8,0,16,0" HorizontalAlignment="Left" VerticalAlignment="Center" Background="Green">
+                <TextBlock Text="{Binding Type}" VerticalAlignment="Center" FontSize="11" Foreground="White"/>
+              </Border>
+              <TextBlock Grid.Column="2" Text="{Binding Description}" Foreground="{DynamicResource Brush.FG2}"/>
             </Grid>
           </DataTemplate>
         </ComboBox.ItemTemplate>