diff --git a/source/ObjectViewer/Options.cs b/source/ObjectViewer/Options.cs
index 79cbdd767..55c28d8f1 100644
--- a/source/ObjectViewer/Options.cs
+++ b/source/ObjectViewer/Options.cs
@@ -8,8 +8,6 @@
 using OpenBveApi;
 using OpenBveApi.Graphics;
 using OpenBveApi.Input;
-using OpenBveApi.Objects;
-using OpenTK.Graphics.ES11;
 using Path = OpenBveApi.Path;
 
 namespace ObjectViewer
@@ -83,19 +81,7 @@ public override void Save(string fileName)
 				Builder.AppendLine("isUseNewRenderer = " + (IsUseNewRenderer ? "true" : "false"));
 				Builder.AppendLine();
 				Builder.AppendLine("[quality]");
-				{
-					string t; switch (Interpolation)
-					{
-						case InterpolationMode.NearestNeighbor: t = "nearestNeighbor"; break;
-						case InterpolationMode.Bilinear: t = "bilinear"; break;
-						case InterpolationMode.NearestNeighborMipmapped: t = "nearestNeighborMipmapped"; break;
-						case InterpolationMode.BilinearMipmapped: t = "bilinearMipmapped"; break;
-						case InterpolationMode.TrilinearMipmapped: t = "trilinearMipmapped"; break;
-						case InterpolationMode.AnisotropicFiltering: t = "anisotropicFiltering"; break;
-						default: t = "bilinearMipmapped"; break;
-					}
-					Builder.AppendLine("interpolation = " + t);
-				}
+				Builder.AppendLine("interpolation = " + Interpolation);
 				Builder.AppendLine("anisotropicfilteringlevel = " + AnisotropicFilteringLevel.ToString(Culture));
 				Builder.AppendLine("antialiasinglevel = " + AntiAliasingLevel.ToString(Culture));
 				Builder.AppendLine("transparencyMode = " + ((int)TransparencyMode).ToString(Culture));
diff --git a/source/OpenBVE/System/Options.cs b/source/OpenBVE/System/Options.cs
index 297b1528b..8d1b5b481 100644
--- a/source/OpenBVE/System/Options.cs
+++ b/source/OpenBVE/System/Options.cs
@@ -269,29 +269,7 @@ public override void Save(string fileName)
 				Builder.AppendLine();
 				Builder.AppendLine("[interface]");
 				Builder.AppendLine("folder = " + UserInterfaceFolder);
-				{
-					string t;
-					switch (TimeTableStyle)
-					{
-						case TimeTableMode.None:
-							t = "none";
-							break;
-						case TimeTableMode.Default:
-							t = "default";
-							break;
-						case TimeTableMode.AutoGenerated:
-							t = "autogenerated";
-							break;
-						case TimeTableMode.PreferCustom:
-							t = "prefercustom";
-							break;
-						default:
-							t = "default";
-							break;
-					}
-
-					Builder.AppendLine("timetablemode = " + t);
-				}
+				Builder.AppendLine("timetablemode = " + TimeTableStyle);
 				Builder.AppendLine("kioskMode = " + (KioskMode ? "true" : "false"));
 				Builder.AppendLine("kioskModeTimer = " + KioskModeTimer);
 				Builder.AppendLine("accessibility = " + (Accessibility ? "true" : "false"));
@@ -316,35 +294,7 @@ public override void Save(string fileName)
 				Builder.AppendLine("uiscalefactor = " + UserInterfaceScaleFactor);
 				Builder.AppendLine();
 				Builder.AppendLine("[quality]");
-				{
-					string t;
-					switch (Interpolation)
-					{
-						case InterpolationMode.NearestNeighbor:
-							t = "nearestNeighbor";
-							break;
-						case InterpolationMode.Bilinear:
-							t = "bilinear";
-							break;
-						case InterpolationMode.NearestNeighborMipmapped:
-							t = "nearestNeighborMipmapped";
-							break;
-						case InterpolationMode.BilinearMipmapped:
-							t = "bilinearMipmapped";
-							break;
-						case InterpolationMode.TrilinearMipmapped:
-							t = "trilinearMipmapped";
-							break;
-						case InterpolationMode.AnisotropicFiltering:
-							t = "anisotropicFiltering";
-							break;
-						default:
-							t = "bilinearMipmapped";
-							break;
-					}
-
-					Builder.AppendLine("interpolation = " + t);
-				}
+				Builder.AppendLine("interpolation = " + Interpolation);
 				Builder.AppendLine("anisotropicFilteringLevel = " + AnisotropicFilteringLevel.ToString(Culture));
 				Builder.AppendLine("anisotropicFilteringMaximum = " + AnisotropicFilteringMaximum.ToString(Culture));
 				Builder.AppendLine("antiAliasingLevel = " + AntiAliasingLevel.ToString(Culture));
@@ -352,26 +302,7 @@ public override void Save(string fileName)
 				Builder.AppendLine("oldtransparencymode = " + (OldTransparencyMode ? "true" : "false"));
 				Builder.AppendLine("viewingDistance = " + ViewingDistance.ToString(Culture));
 				Builder.AppendLine("quadLeafSize = " + QuadTreeLeafSize.ToString(Culture));
-				{
-					string t;
-					switch (MotionBlur)
-					{
-						case MotionBlurMode.Low:
-							t = "low";
-							break;
-						case MotionBlurMode.Medium:
-							t = "medium";
-							break;
-						case MotionBlurMode.High:
-							t = "high";
-							break;
-						default:
-							t = "none";
-							break;
-					}
-
-					Builder.AppendLine("motionBlur = " + t);
-				}
+				Builder.AppendLine("motionBlur = " + MotionBlur);
 				Builder.AppendLine("fpslimit = " + FPSLimit.ToString(Culture));
 				Builder.AppendLine();
 				Builder.AppendLine("[objectOptimization]");
@@ -420,54 +351,12 @@ public override void Save(string fileName)
 				Builder.AppendLine("raildrivermph = " + (RailDriverMPH ? "true" : "false"));
 				Builder.AppendLine();
 				Builder.AppendLine("[sound]");
-				Builder.Append("model = ");
-				switch (SoundModel)
-				{
-					case SoundModels.Linear:
-						Builder.AppendLine("linear");
-						break;
-					default:
-						Builder.AppendLine("inverse");
-						break;
-				}
-
-				Builder.Append("range = ");
-				switch (SoundRange)
-				{
-					case SoundRange.Low:
-						Builder.AppendLine("low");
-						break;
-					case SoundRange.Medium:
-						Builder.AppendLine("medium");
-						break;
-					case SoundRange.High:
-						Builder.AppendLine("high");
-						break;
-					default:
-						Builder.AppendLine("low");
-						break;
-				}
-
+				Builder.Append("model = " + SoundModel);
+				Builder.Append("range = " + SoundRange);
 				Builder.AppendLine("number = " + SoundNumber.ToString(Culture));
 				Builder.AppendLine();
 				Builder.AppendLine("[packages]");
-				Builder.Append("compression = ");
-				switch (packageCompressionType)
-				{
-					case CompressionType.Zip:
-						Builder.AppendLine("zip");
-						break;
-					case CompressionType.TarGZ:
-						Builder.AppendLine("gzip");
-						break;
-					case CompressionType.BZ2:
-						Builder.AppendLine("bzip");
-						break;
-					default:
-						Builder.AppendLine("zip");
-						break;
-				}
-
+				Builder.Append("compression = " + packageCompressionType);
 				Builder.AppendLine();
 				Builder.AppendLine("[folders]");
 				Builder.AppendLine("route = " + RouteFolder);
diff --git a/source/Plugins/Formats.OpenBve/CFG/ConfigFile.cs b/source/Plugins/Formats.OpenBve/CFG/ConfigFile.cs
index 6678187be..0a1fff86d 100644
--- a/source/Plugins/Formats.OpenBve/CFG/ConfigFile.cs
+++ b/source/Plugins/Formats.OpenBve/CFG/ConfigFile.cs
@@ -591,7 +591,7 @@ public override bool GetEnumValue<T3>(T2 key, out T3 enumValue)
 		{
 			if (keyValuePairs.TryGetValue(key, out var value))
 			{
-				if (Enum.TryParse(value.Value, out enumValue))
+				if (Enum.TryParse(value.Value, true, out enumValue))
 				{
 					return true;
 				}
diff --git a/source/RouteViewer/Options.cs b/source/RouteViewer/Options.cs
index ad7ba96a5..dd5005450 100644
--- a/source/RouteViewer/Options.cs
+++ b/source/RouteViewer/Options.cs
@@ -44,19 +44,7 @@ public override void Save(string fileName)
 				Builder.AppendLine("quadleafsize = " + QuadTreeLeafSize);
 				Builder.AppendLine();
 				Builder.AppendLine("[quality]");
-				{
-					string t; switch (Interpolation)
-					{
-						case InterpolationMode.NearestNeighbor: t = "nearestNeighbor"; break;
-						case InterpolationMode.Bilinear: t = "bilinear"; break;
-						case InterpolationMode.NearestNeighborMipmapped: t = "nearestNeighborMipmapped"; break;
-						case InterpolationMode.BilinearMipmapped: t = "bilinearMipmapped"; break;
-						case InterpolationMode.TrilinearMipmapped: t = "trilinearMipmapped"; break;
-						case InterpolationMode.AnisotropicFiltering: t = "anisotropicFiltering"; break;
-						default: t = "bilinearMipmapped"; break;
-					}
-					Builder.AppendLine("interpolation = " + t);
-				}
+				Builder.AppendLine("interpolation = " + Interpolation);
 				Builder.AppendLine("anisotropicfilteringlevel = " + AnisotropicFilteringLevel.ToString(Culture));
 				Builder.AppendLine("antialiasinglevel = " + AntiAliasingLevel.ToString(Culture));
 				Builder.AppendLine("transparencyMode = " + ((int)TransparencyMode).ToString(Culture));