diff --git a/Elwig/App.xaml b/Elwig/App.xaml
index f380f9d..2e32df6 100644
--- a/Elwig/App.xaml
+++ b/Elwig/App.xaml
@@ -41,6 +41,14 @@
             </StackPanel>
         </DataTemplate>
 
+        <DataTemplate x:Key="AreaCommitmentTypeTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding WineVar.Name}" Foreground="{Binding WineVar.Color}"/>
+                <TextBlock Text="{Binding WineAttr.Name}" Margin="5,0,0,0"/>
+                <TextBlock Text="{Binding Discriminator}" Margin="5,0,0,0"/>
+            </StackPanel>
+        </DataTemplate>
+
         <DataTemplate x:Key="ModifierTemplate">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}" MinWidth="250" Margin="0,0,10,0"/>
diff --git a/Elwig/Windows/AreaComAdminWindow.xaml b/Elwig/Windows/AreaComAdminWindow.xaml
index ca57ce7..9970170 100644
--- a/Elwig/Windows/AreaComAdminWindow.xaml
+++ b/Elwig/Windows/AreaComAdminWindow.xaml
@@ -210,7 +210,7 @@
 
                     <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <ComboBox x:Name="AreaComTypeInput" SelectedItem="{Binding AreaComType, Mode=TwoWay}" ItemsSource="{Binding AreaComTypeSource, Mode=TwoWay}"
-                              DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
+                              ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" TextSearch.TextPath="DisplayName"
                               HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1" Grid.ColumnSpan="3"/>
                     <Button x:Name="AreaComTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
                             Click="AreaComTypeDetailsButton_Click"
diff --git a/Elwig/Windows/BaseDataWindow.xaml b/Elwig/Windows/BaseDataWindow.xaml
index 28623c7..54d2d89 100644
--- a/Elwig/Windows/BaseDataWindow.xaml
+++ b/Elwig/Windows/BaseDataWindow.xaml
@@ -336,7 +336,7 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30" Foreground="{Binding WineVar.Color}"/>
                                     <TextBlock Text="{Binding WineAttr.Name}" Width="70"/>
                                     <TextBlock Text="{Binding Discriminator}"/>
                                 </StackPanel>