diff --git a/setup.py b/setup.py
index f1b202b..1292d52 100644
--- a/setup.py
+++ b/setup.py
@@ -20,14 +20,13 @@ setup(
         "zeroconf"
     ],
     entry_points={
-        'console_scripts': [
-            'revpicommander = revpicommander.revpicommander:main',
-        ],
         'gui_scripts': [
-            'RevPiCommander = revpicommander.revpicommander:main',
+            'revpicommander-gui = revpicommander.revpicommander:main',
         ],
     },
 
+    platforms=["all"],
+
     url="https://revpimodio.org/revpipyplc/",
     license="GPLv3",
     author="Sven Sager",
@@ -40,6 +39,7 @@ setup(
                      "of RevPiPyLoad and do IO checks on your local machine. Developing your\n"
                      "control program is very easy with the developer, upload and debug it\n"
                      "over the network.",
+    keywords=["revpi", "revolution pi", "revpimodio", "plc"],
     classifiers=[
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],
diff --git a/src/revpicommander/helper.py b/src/revpicommander/helper.py
index eb7519b..ce7a02e 100644
--- a/src/revpicommander/helper.py
+++ b/src/revpicommander/helper.py
@@ -58,7 +58,7 @@ class RevPiSettings:
         self.port = 55123
         self.timeout = 5
 
-        self.ssh_use_tunnel = False
+        self.ssh_use_tunnel = True
         self.ssh_port = 22
         self.ssh_user = "pi"
 
@@ -92,7 +92,7 @@ class RevPiSettings:
         self.port = self._settings.value("port", 55123, type=int)
         self.timeout = self._settings.value("timeout", 5, type=int)
 
-        self.ssh_use_tunnel = self._settings.value("ssh_use_tunnel", False, type=bool)
+        self.ssh_use_tunnel = self._settings.value("ssh_use_tunnel", True, type=bool)
         self.ssh_port = self._settings.value("ssh_port", 22, type=int)
         self.ssh_user = self._settings.value("ssh_user", "pi", type=str)