diff --git a/CHANGELIST.md b/CHANGELIST.md
index 61255452..a69d0770 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -49,6 +49,7 @@
 - Make implicit Result bidirectional
 - Rename Result to ResultEventArgs for consistency
 - Reduce accessors for DumpEnvironment
+- Better handle interface constants
 
 ### 3.1.9a (2024-05-21)
 
diff --git a/MPF.Core/Data/Constants.cs b/MPF.Core/Data/Constants.cs
deleted file mode 100644
index 7e97848b..00000000
--- a/MPF.Core/Data/Constants.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using SabreTools.RedumpLib.Data;
-
-namespace MPF.Core.Data
-{
-    /// <summary>
-    /// Constant values for UI
-    /// </summary>
-    public static class Interface
-    {
-        // Lists of known drive speed ranges
-#if NET20 || NET35 || NET40
-        public static IList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
-        public static IList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
-        public static IList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
-        public static IList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
-        public static IList<int> Unknown { get; } = new List<int> { 1 };
-#else
-        public static IReadOnlyList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
-        public static IReadOnlyList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
-        public static IReadOnlyList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
-        public static IReadOnlyList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
-        public static IReadOnlyList<int> Unknown { get; } = new List<int> { 1 };
-#endif
-
-        /// <summary>
-        /// Get list of all drive speeds for a given MediaType
-        /// </summary>
-        /// <param name="type">MediaType? that represents the current item</param>
-        /// <returns>Read-only list of drive speeds</returns>
-#if NET20 || NET35 || NET40
-        public static IList<int> GetSpeedsForMediaType(MediaType? type)
-#else
-        public static IReadOnlyList<int> GetSpeedsForMediaType(MediaType? type)
-#endif
-        {
-            return type switch
-            {
-                MediaType.CDROM
-                    or MediaType.GDROM => CD,
-                MediaType.DVD
-                    or MediaType.NintendoGameCubeGameDisc
-                    or MediaType.NintendoWiiOpticalDisc => DVD,
-                MediaType.HDDVD => HDDVD,
-                MediaType.BluRay => BD,
-                _ => Unknown,
-            };
-        }
-    }
-}
diff --git a/MPF.Core/UI/InterfaceConstants.cs b/MPF.Core/UI/InterfaceConstants.cs
new file mode 100644
index 00000000..b9cfaa9b
--- /dev/null
+++ b/MPF.Core/UI/InterfaceConstants.cs
@@ -0,0 +1,62 @@
+using System.Collections.Generic;
+using System.Linq;
+using SabreTools.RedumpLib.Data;
+
+namespace MPF.Core.UI
+{
+    /// <summary>
+    /// Constant values for UI
+    /// </summary>
+    public static class InterfaceConstants
+    {
+        /// <summary>
+        /// Set of all accepted speed values
+        /// </summary>
+        private static readonly List<int> _speedValues = [1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72];
+
+        /// <summary>
+        /// Set of accepted speeds for CD and GD media
+        /// </summary>
+        public static IList<int> CD => _speedValues.Where(s => s <= 72).ToList();
+
+        /// <summary>
+        /// Set of accepted speeds for DVD media
+        /// </summary>
+        public static IList<int> DVD => _speedValues.Where(s => s <= 24).ToList();
+
+        /// <summary>
+        /// Set of accepted speeds for HD-DVD media
+        /// </summary>
+        public static IList<int> HDDVD => _speedValues.Where(s => s <= 24).ToList();
+
+        /// <summary>
+        /// Set of accepted speeds for BD media
+        /// </summary>
+        public static IList<int> BD => _speedValues.Where(s => s <= 16).ToList();
+
+        /// <summary>
+        /// Set of accepted speeds for all other media
+        /// </summary>
+        public static IList<int> Unknown => _speedValues.Where(s => s <= 1).ToList();
+
+        /// <summary>
+        /// Get list of all drive speeds for a given MediaType
+        /// </summary>
+        /// <param name="type">MediaType? that represents the current item</param>
+        /// <returns>Read-only list of drive speeds</returns>
+        public static IList<int> GetSpeedsForMediaType(MediaType? type)
+        {
+            return type switch
+            {
+                MediaType.CDROM
+                    or MediaType.GDROM => CD,
+                MediaType.DVD
+                    or MediaType.NintendoGameCubeGameDisc
+                    or MediaType.NintendoWiiOpticalDisc => DVD,
+                MediaType.HDDVD => HDDVD,
+                MediaType.BluRay => BD,
+                _ => Unknown,
+            };
+        }
+    }
+}
diff --git a/MPF.Core/UI/ViewModels/MainViewModel.cs b/MPF.Core/UI/ViewModels/MainViewModel.cs
index 85e20ff2..7b7f18f2 100644
--- a/MPF.Core/UI/ViewModels/MainViewModel.cs
+++ b/MPF.Core/UI/ViewModels/MainViewModel.cs
@@ -1606,7 +1606,7 @@ namespace MPF.Core.UI.ViewModels
         public void SetSupportedDriveSpeed()
         {
             // Set the drive speed list that's appropriate
-            this.DriveSpeeds = (List<int>)Interface.GetSpeedsForMediaType(CurrentMediaType);
+            this.DriveSpeeds = (List<int>)InterfaceConstants.GetSpeedsForMediaType(CurrentMediaType);
             VerboseLogLn($"Supported media speeds: {string.Join(", ", this.DriveSpeeds.Select(ds => ds.ToString()).ToArray())}");
 
             // Set the selected speed
diff --git a/MPF.Test/UI/AllowedSpeedsTest.cs b/MPF.Test/UI/AllowedSpeedsTest.cs
index 799d734f..c1a196d8 100644
--- a/MPF.Test/UI/AllowedSpeedsTest.cs
+++ b/MPF.Test/UI/AllowedSpeedsTest.cs
@@ -14,7 +14,7 @@ namespace MPF.Test.Data
         [InlineData(null, 1)]
         public void GetAllowedDriveSpeedForMediaTypeTest(MediaType? mediaType, int maxExpected)
         {
-            var actual = Interface.GetSpeedsForMediaType(mediaType);
+            var actual = InterfaceConstants.GetSpeedsForMediaType(mediaType);
             Assert.Equal(maxExpected, actual[actual.Count - 1]);
         }
     }
diff --git a/MPF.UI.Core/Constants.cs b/MPF.UI.Core/Constants.cs
index 5c2627a6..f27b57a4 100644
--- a/MPF.UI.Core/Constants.cs
+++ b/MPF.UI.Core/Constants.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
-using static MPF.Core.Data.Interface;
+using static MPF.Core.UI.InterfaceConstants;
 
 namespace MPF.UI.Core
 {
@@ -11,17 +11,30 @@ namespace MPF.UI.Core
     /// </summary>
     public static class Constants
     {
-        // Create collections for UI based on known drive speeds
-        public static DoubleCollection SpeedsForCDAsCollection { get; } = GetDoubleCollectionFromIntList(CD);
-        public static DoubleCollection SpeedsForDVDAsCollection { get; } = GetDoubleCollectionFromIntList(DVD);
-        public static DoubleCollection SpeedsForHDDVDAsCollection { get; } = GetDoubleCollectionFromIntList(HDDVD);
-        public static DoubleCollection SpeedsForBDAsCollection { get; } = GetDoubleCollectionFromIntList(BD);
+        /// <summary>
+        /// Set of accepted speeds for CD and GD media
+        /// </summary>
+        public static DoubleCollection SpeedsForCDAsCollection => GetDoubleCollectionFromIntList(CD);
 
-#if NET20 || NET35 || NET40
+        /// <summary>
+        /// Set of accepted speeds for DVD media
+        /// </summary>
+        public static DoubleCollection SpeedsForDVDAsCollection => GetDoubleCollectionFromIntList(DVD);
+
+        /// <summary>
+        /// Set of accepted speeds for HD-DVD media
+        /// </summary>
+        public static DoubleCollection SpeedsForHDDVDAsCollection => GetDoubleCollectionFromIntList(HDDVD);
+
+        /// <summary>
+        /// Set of accepted speeds for BD media
+        /// </summary>
+        public static DoubleCollection SpeedsForBDAsCollection => GetDoubleCollectionFromIntList(BD);
+
+        /// <summary>
+        /// Create a DoubleCollection out of a list of integer values
+        /// </summary>
         private static DoubleCollection GetDoubleCollectionFromIntList(IList<int> list)
-#else
-        private static DoubleCollection GetDoubleCollectionFromIntList(IReadOnlyList<int> list)
-#endif
             => new(list.Select(i => Convert.ToDouble(i)).ToList());
     }
 }