diff --git a/CursorLang/Views/MainWindow.xaml b/CursorLang/Views/MainWindow.xaml
index 353a1ea..6fb1582 100644
--- a/CursorLang/Views/MainWindow.xaml
+++ b/CursorLang/Views/MainWindow.xaml
@@ -17,6 +17,10 @@
         <local:ColorToBrushConverter x:Key="ColorToBrush" />
         <local:ColorToHexConverter x:Key="ColorToHex" />
 
+        <DataTemplate x:Key="EnumOptionTemplate">
+            <TextBlock Text="{Binding Display}" />
+        </DataTemplate>
+
         <Style TargetType="TextBlock" x:Key="FieldLabel">
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="Margin" Value="0,0,12,0" />
@@ -57,7 +61,7 @@
                                Text="{Binding Localization[ThemeLabel]}" />
                     <ComboBox Grid.Row="1" Grid.Column="1" Margin="0,12,0,0"
                               ItemsSource="{Binding Themes}"
-                              DisplayMemberPath="Display"
+                              ItemTemplate="{StaticResource EnumOptionTemplate}"
                               SelectedValuePath="Value"
                               SelectedValue="{Binding Settings.Theme}" />
                 </Grid>
@@ -84,7 +88,7 @@
                                Text="{Binding Localization[PlacementModeLabel]}" />
                     <ComboBox Grid.Column="1" Grid.ColumnSpan="2"
                               ItemsSource="{Binding PlacementModes}"
-                              DisplayMemberPath="Display"
+                              ItemTemplate="{StaticResource EnumOptionTemplate}"
                               SelectedValuePath="Value"
                               SelectedValue="{Binding Settings.PlacementMode}" />
 
@@ -97,7 +101,7 @@
                                    ConverterParameter=AtCursor}" />
                     <ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
                               ItemsSource="{Binding AnchorSides}"
-                              DisplayMemberPath="Display"
+                              ItemTemplate="{StaticResource EnumOptionTemplate}"
                               SelectedValuePath="Value"
                               SelectedValue="{Binding Settings.CursorSide}"
                               Visibility="{Binding Settings.PlacementMode,
@@ -132,7 +136,7 @@
                                    ConverterParameter=AtCaret}" />
                     <ComboBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
                               ItemsSource="{Binding AnchorSides}"
-                              DisplayMemberPath="Display"
+                              ItemTemplate="{StaticResource EnumOptionTemplate}"
                               SelectedValuePath="Value"
                               SelectedValue="{Binding Settings.CaretSide}"
                               Visibility="{Binding Settings.PlacementMode,
@@ -167,7 +171,7 @@
                                    ConverterParameter=FixedPoint}" />
                     <ComboBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
                               ItemsSource="{Binding ScreenPositions}"
-                              DisplayMemberPath="Display"
+                              ItemTemplate="{StaticResource EnumOptionTemplate}"
                               SelectedValuePath="Value"
                               SelectedValue="{Binding Settings.ScreenPosition}"
                               Visibility="{Binding Settings.PlacementMode,