diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index fcd5623..981f475 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -315,7 +315,10 @@ namespace Bloxstrap
 
             _launchCommandLine = _launchCommandLine.Replace("LAUNCHTIMEPLACEHOLDER", DateTimeOffset.Now.ToUnixTimeMilliseconds().ToString());
 
-            _launchCommandLine += " -channel ";
+            if (_launchCommandLine.StartsWith("roblox-player:1"))
+                _launchCommandLine += "+channel:";
+            else
+                _launchCommandLine += " -channel ";
 
             if (App.Settings.Prop.Channel.ToLowerInvariant() == RobloxDeployment.DefaultChannel.ToLowerInvariant())
                 _launchCommandLine += "production";
diff --git a/Bloxstrap/ProtocolHandler.cs b/Bloxstrap/ProtocolHandler.cs
index 44ff873..a7f9335 100644
--- a/Bloxstrap/ProtocolHandler.cs
+++ b/Bloxstrap/ProtocolHandler.cs
@@ -7,46 +7,19 @@ namespace Bloxstrap
 {
     static class ProtocolHandler
     {
-        // map uri keys to command line args
-        private static readonly IReadOnlyDictionary<string, string> UriKeyArgMap = new Dictionary<string, string>()
-        {
-            // excluding roblox-player and launchtime
-            { "launchmode", "--" },
-            { "gameinfo", "-t " },
-            { "placelauncherurl", "-j "},
-            { "launchtime", "--launchtime=" },
-            { "browsertrackerid", "-b " },
-            { "robloxLocale", "--rloc " },
-            { "gameLocale", "--gloc " },
-            { "channel", "-channel " }
-        };
-
         public static string ParseUri(string protocol)
         {
-            string[] keyvalPair;
-            string key;
-            string val;
+            var args = new Dictionary<string, string>();
             bool channelArgPresent = false;
 
-            StringBuilder commandLine = new();
-
             foreach (var parameter in protocol.Split('+'))
             {
                 if (!parameter.Contains(':'))
                     continue;
 
-                keyvalPair = parameter.Split(':');
-                key = keyvalPair[0];
-                val = keyvalPair[1];
-
-                if (!UriKeyArgMap.ContainsKey(key) || string.IsNullOrEmpty(val))
-                    continue;
-
-                if (key == "launchmode" && val == "play")
-                    val = "app";
-
-                if (key == "placelauncherurl")
-                    val = HttpUtility.UrlDecode(val);
+                var kv = parameter.Split(':');
+                string key = kv[0];
+                string val = kv[1];
 
                 // we'll set this before launching because for some reason roblox just refuses to launch if its like a few minutes old so ???
                 if (key == "launchtime")
@@ -61,13 +34,14 @@ namespace Bloxstrap
                     continue;
                 }
 
-                commandLine.Append(UriKeyArgMap[key] + val + " ");
+                args.Add(key, val);
             }
 
             if (!channelArgPresent)
                 EnrollChannel(RobloxDeployment.DefaultChannel);
 
-            return commandLine.ToString();
+            var pairs = args.Select(x => x.Key + ":" + x.Value).ToArray();
+            return String.Join("+", pairs);
         }
 
         public static void ChangeChannel(string channel)