diff --git a/Common/KNARZhelper/DatabaseObjectTypes/TypeDescription.cs b/Common/KNARZhelper/DatabaseObjectTypes/TypeDescription.cs
index c21de4fb5..a56043300 100644
--- a/Common/KNARZhelper/DatabaseObjectTypes/TypeDescription.cs
+++ b/Common/KNARZhelper/DatabaseObjectTypes/TypeDescription.cs
@@ -12,8 +12,8 @@ internal class TypeDescription : BaseStringType
 
         public override void EmptyFieldInGame(Game game) => API.Instance.MainView.UIDispatcher.Invoke(() => game.Description = default);
 
-        public override bool FieldInGameIsEmpty(Game game) => !game.Description.Trim().Any();
+        public override bool FieldInGameIsEmpty(Game game) => !game?.Description?.Trim().Any() ?? true;
 
-        public override bool GameContainsValue(Game game, string value) => game.Description.RegExIsMatch(value);
+        public override bool GameContainsValue(Game game, string value) => value != null && (game?.Description?.RegExIsMatch(value) ?? false);
     }
 }
\ No newline at end of file
diff --git a/Generic/MetadataUtilities/Views/SettingsView.xaml b/Generic/MetadataUtilities/Views/SettingsView.xaml
index 8139e6f0f..cc050be79 100644
--- a/Generic/MetadataUtilities/Views/SettingsView.xaml
+++ b/Generic/MetadataUtilities/Views/SettingsView.xaml
@@ -305,11 +305,11 @@
                 <DockPanel DockPanel.Dock="Bottom" Margin="0,10,0,0" LastChildFill="False">
                     <Button Content="&#xec3e;" DockPanel.Dock="Left" FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCAddNewItem}"
                             Command="{Binding AddPrefixCommand}" />
-                    <Button Content="&#xec53;" DockPanel.Dock="Left" FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCRemoveTitle}" Margin="10,0,0,0"
-                            Command="{Binding RemovePrefixCommand}"
+                    <Button Content="&#xec53;" DockPanel.Dock="Left" FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCRemoveTitle}"
+                            Command="{Binding RemovePrefixCommand}" Margin="10,0,0,0"
                             CommandParameter="{Binding SelectedItems, ElementName=LvPrefixes}" />
                     <Button Content="&#xEFEE;" DockPanel.Dock="Left" FontFamily="{DynamicResource FontIcoFont}" 
-                            Command="{Binding SortPrefixesCommand}" />
+                            Command="{Binding SortPrefixesCommand}" Margin="10,0,0,0" />
                     <Button Content="&#xEFCA;" DockPanel.Dock="Right" FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCMenuHelpTitle}"
                             Command="{Binding HelpPrefixesCommand}" Margin="10,0,0,0" />
                 </DockPanel>
diff --git a/Manifest/HerrKnarz_MetadataUtilities.yaml b/Manifest/HerrKnarz_MetadataUtilities.yaml
index 4d55b4338..501e0d735 100644
--- a/Manifest/HerrKnarz_MetadataUtilities.yaml
+++ b/Manifest/HerrKnarz_MetadataUtilities.yaml
@@ -1,5 +1,14 @@
 AddonId: MetadataUtilities_485ab5f0-bfb1-4c17-93cc-20d8338673be
 Packages:
+  - Version: 1.3.1
+    RequiredApiVersion: 6.11.0
+    ReleaseDate: 2024-10-08
+    PackageUrl: https://github.com/HerrKnarz/Playnite-Extensions/releases/download/2024-10-08/MetadataUtilities_485ab5f0-bfb1-4c17-93cc-20d8338673be_1_3_1.pext
+    Changelog:
+      - Added option to sort prefixes for display in the theme controls.
+      - Made custom controls styleable to make them work with most themes.
+      - Fixed disappearing controls when switching between grid and details view.
+      - Fixed possible null exception in conditional actions using the description field as a condition.
   - Version: 1.3.0
     RequiredApiVersion: 6.11.0
     ReleaseDate: 2024-10-04