diff --git a/owrx/command.py b/owrx/command.py
index 68b5f1b..0559b72 100644
--- a/owrx/command.py
+++ b/owrx/command.py
@@ -57,7 +57,7 @@ class Flag(CommandMapping):
 class Option(CommandMapping):
     def __init__(self, option):
         self.option = option
-        self.spacer = "=" if option.startswith("--") else " "
+        self.spacer = " "
 
     def map(self, value):
         if value is not None:
diff --git a/owrx/source/connector.py b/owrx/source/connector.py
index c683f01..58c535d 100644
--- a/owrx/source/connector.py
+++ b/owrx/source/connector.py
@@ -23,15 +23,15 @@ class ConnectorSource(SdrSource):
             .getCommandMapper()
             .setMappings(
                 {
-                    "samp_rate": Option("--samplerate"),
-                    "tuner_freq": Option("--frequency"),
-                    "port": Option("--port"),
-                    "controlPort": Option("--control"),
-                    "device": Option("--device"),
-                    "iqswap": Flag("--iqswap"),
-                    "rtltcp_compat": Option("--rtltcp"),
-                    "ppm": Option("--ppm"),
-                    "rf_gain": Option("--gain"),
+                    "samp_rate": Option("-s"),
+                    "tuner_freq": Option("-f"),
+                    "port": Option("-p"),
+                    "controlPort": Option("-c"),
+                    "device": Option("-d"),
+                    "iqswap": Flag("-i"),
+                    "rtltcp_compat": Option("-r"),
+                    "ppm": Option("-P"),
+                    "rf_gain": Option("-g"),
                 }
             )
         )
diff --git a/owrx/source/rtl_sdr.py b/owrx/source/rtl_sdr.py
index e287e97..cb9e954 100644
--- a/owrx/source/rtl_sdr.py
+++ b/owrx/source/rtl_sdr.py
@@ -11,7 +11,7 @@ class RtlSdrSource(ConnectorSource):
             super()
             .getCommandMapper()
             .setBase("rtl_connector")
-            .setMappings({"bias_tee": Flag("--biastee"), "direct_sampling": Option("--directsampling")})
+            .setMappings({"bias_tee": Flag("-b"), "direct_sampling": Option("-e")})
         )
 
 
diff --git a/owrx/source/rtl_tcp.py b/owrx/source/rtl_tcp.py
index ff4bb08..6c3f7d2 100644
--- a/owrx/source/rtl_tcp.py
+++ b/owrx/source/rtl_tcp.py
@@ -13,8 +13,8 @@ class RtlTcpSource(ConnectorSource):
             .setBase("rtl_tcp_connector")
             .setMappings(
                 {
-                    "bias_tee": Flag("--biastee"),
-                    "direct_sampling": Option("--directsampling"),
+                    "bias_tee": Flag("-b"),
+                    "direct_sampling": Option("-e"),
                     "remote": Argument(),
                 }
             )
diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py
index b2a1bac..745343c 100644
--- a/owrx/source/soapy.py
+++ b/owrx/source/soapy.py
@@ -15,8 +15,8 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
             .setBase("soapy_connector")
             .setMappings(
                 {
-                    "antenna": Option("--antenna"),
-                    "soapy_settings": Option("--settings"),
+                    "antenna": Option("-a"),
+                    "soapy_settings": Option("-t"),
                 }
             )
         )