diff --git a/killing-floor-2.kvp b/killing-floor-2.kvp
index 6ac8d48..bbf64ea 100644
--- a/killing-floor-2.kvp
+++ b/killing-floor-2.kvp
@@ -22,7 +22,7 @@ App.ExecutableLinux=232130/Binaries/Win64/KFGameSteamServer.bin.x86_64
 App.WorkingDir=232130
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{Map}}?Game={{Game}}?Mutators="{{ServerMutators}}"?maxplayers={{$MaxUsers}} -Port={{$ApplicationPort1}} -QueryPort={{$ApplicationPort2}} -WebAdminPort={{$RemoteAdminPort}} -Multihome={{$ApplicationIPBinding}} {{$FormattedArgs}}
+App.CommandLineArgs={{Map}}?Game={{Game}}?Mutator="{{ServerMutators}}"?maxplayers={{$MaxUsers}} -Port={{$ApplicationPort1}} -QueryPort={{$ApplicationPort2}} -WebAdminPort={{$RemoteAdminPort}} -Multihome={{$ApplicationIPBinding}} {{$FormattedArgs}}
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"232090"}
 App.CommandLineParameterFormat=-{0}="{1}"
diff --git a/killing-floor-2config.json b/killing-floor-2config.json
index beb1084..61be46e 100644
--- a/killing-floor-2config.json
+++ b/killing-floor-2config.json
@@ -2,14 +2,71 @@
     {
         "DisplayName": "Starting Map",
         "Category": "Server Config",
-        "Description": "Set the server's starting map. You can found default maps at (KFGame/BrewedPC/Maps) or in the Cache folder if its from workshop",
+        "Description": "Set the server's starting map or a custome map by choose \"Custom Map\"",
         "Keywords": "Map",
         "FieldName": "Map",
-        "InputType": "text",
+        "InputType": "enum",
         "IsFlagArgument": false,
         "ParamFieldName": "Map",
         "IncludeInCommandLine": false,
-        "DefaultValue": "KF-Bioticslab"
+        "DefaultValue": "KF-Bioticslab",
+        "EnumValues": {
+            "{{CustomMap}}": "Custom Map",
+            "KF-Airship": "KF-Airship",
+            "KF-AshwoodAsylum": "KF-AshwoodAsylum",
+            "KF-BarmwichTown": "KF-BarmwichTown",
+            "KF-Biolapse": "KF-Biolapse",
+            "KF-Bioticslab": "KF-Bioticslab",
+            "KF-BlackForest": "KF-BlackForest",
+            "KF-BurningParis": "KF-BurningParis",
+            "KF-CarillonHamlet": "KF-CarillonHamlet",
+            "KF-Catacombs": "KF-Catacombs",
+            "KF-ContainmentStation": "KF-ContainmentStation",
+            "KF-Crash": "KF-Crash",
+            "KF-Desolation": "KF-Desolation",
+            "KF-DieSector": "KF-DieSector",
+            "KF-Dystopia2029": "KF-Dystopia2029",
+            "KF-Moonbase": "KF-Moonbase",
+            "KF-Elysium": "KF-Elysium",
+            "KF-EvacuationPoint": "KF-EvacuationPoint",
+            "KF-Farmhouse": "KF-Farmhouse",
+            "KF-HellmarkStation": "KF-HellmarkStation",
+            "KF-HostileGrounds": "KF-HostileGrounds",
+            "KF-InfernalRealm": "KF-InfernalRealm",
+            "KF-KrampusLair": "KF-KrampusLair",
+            "KF-Lockdown": "KF-Lockdown",
+            "KF-MonsterBall": "KF-MonsterBall",
+            "KF-Netherhold": "KF-Netherhold",
+            "KF-Nightmare": "KF-Nightmare",
+            "KF-Nuked": "KF-Nuked",
+            "KF-Outpost": "KF-Outpost",
+            "KF-PowerCore_Holdout": "KF-PowerCore_Holdout",
+            "KF-Prison": "KF-Prison",
+            "KF-Rig": "KF-Rig",
+            "KF-Sanitarium": "KF-Sanitarium",
+            "KF-Santasworkshop": "KF-Santasworkshop",
+            "KF-ShoppingSpree": "KF-ShoppingSpree",
+            "KF-Spillway": "KF-Spillway",
+            "KF-SteamFortress": "KF-SteamFortress",
+            "KF-TheDescent": "KF-TheDescent",
+            "KF-TragicKingdom": "KF-TragicKingdom",
+            "KF-VolterManor": "KF-VolterManor",
+            "KF-ZedLanding": "KF-ZedLanding"
+        }
+
+    },
+    {
+    "DisplayName": "Custom Map",
+    "Category": "Server Config",
+    "Description": "Enter the custom map name. Must select \"Custom Map\" in the Starting map dropdown.",
+    "Keywords": "Custom,Map",
+    "FieldName": "CustomMap",
+    "InputType": "text",
+    "IsFlagArgument": false,
+    "ParamFieldName": "CustomMap",
+    "IncludeInCommandLine": false,
+    "DefaultValue": "",
+    "Placeholder": "KF-Skyline"
     },
     {
         "DisplayName": "Starting Game Mode",