diff --git a/.idea/dictionaries/akira.xml b/.idea/dictionaries/akira.xml
new file mode 100644
index 0000000..3558170
--- /dev/null
+++ b/.idea/dictionaries/akira.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="akira">
+    <words>
+      <w>revpipycontrol</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/revpipycontrol/revpipycontrol.py b/revpipycontrol/revpipycontrol.py
index 6d0d3c7..2e9f4c4 100755
--- a/revpipycontrol/revpipycontrol.py
+++ b/revpipycontrol/revpipycontrol.py
@@ -115,6 +115,7 @@ class RevPiPyControl(tkinter.Frame):
 
         menu1 = tkinter.Menu(self.mbar, tearoff=False)
         menu1.add_command(label=_("Connections..."), command=self.plclist)
+        menu1.add_command(label=_("Search RevPi..."), command=self.plc_search)
         menu1.add_separator()
         menu1.add_command(label=_("Exit"), command=self.master.destroy)
         self.mbar.add_cascade(label=_("Main"), menu=menu1)
@@ -251,6 +252,9 @@ class RevPiPyControl(tkinter.Frame):
         self.dict_conn = revpiplclist.get_connections()
         self._fillconnbar()
 
+    def plc_search(self):
+        """Search Rev Pi with avahi."""
+
     def plcdebug(self):
         u"""Baut den Debugframe und packt ihn.
         @return None"""
@@ -259,10 +263,10 @@ class RevPiPyControl(tkinter.Frame):
         if "psstart" not in self.xmlfuncs:
             tkmsg.showwarning(
                 _("Warning"),
-                _("There is no piCtory configuration on your Revlution Pi! \n\n"
-                    "Create a piCtory configuraiton. \n\nIf you already have, "
-                    "make sure RevPiPyload is at least version 0.5.3 and "
-                    "python3-revpimodio2 is installed at least version 2.5.0."
+                _("The watch mode ist not supported in version {0} "
+                    "of RevPiPyLoad on your RevPi! You need at least version "
+                    "0.5.3! Maybe the python3-revpimodio2 module is not "
+                    "installed on your RevPi at least version 2.0.0."
                     "").format(self.cli.version()),
                 parent=self.master
             )
diff --git a/setup.py b/setup.py
index 277ee30..19075f5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ __copyright__ = "Copyright (C) 2018 Sven Sager"
 __license__ = "LGPLv3"
 
 import distutils.command.install_egg_info
-from sys import platform
+from distutils.core import setup
 from glob import glob
 
 
@@ -18,79 +18,42 @@ class MyEggInfo(distutils.command.install_egg_info.install_egg_info):
         pass
 
 
-globsetup = {
-    "version": "0.8.0",
+setup(
+    version="0.8.0a",
+    python_requires="~=3.4",
+    requires=["tkinter", "zeroconf"],
 
-    "author": "Sven Sager",
-    "author_email": "akira@narux.de",
-    "maintainer": "Sven Sager",
-    "maintainer_email": "akira@revpimodio.org",
-    "url": "https://revpimodio.org/revpipyplc/",
-    "license": "LGPLv3",
+    scripts=["data/revpipycontrol"],
+    data_files=[
+        ("share/applications", ["data/revpipycontrol.desktop"]),
+        ("share/icons/hicolor/32x32/apps", ["data/revpipycontrol.png"]),
+        ("share/revpipycontrol", glob("revpipycontrol/*.*")),
+        ("share/revpipycontrol/shared", glob("revpipycontrol/shared/*.*")),
+        (
+            "share/revpipycontrol/locale/de/LC_MESSAGES",
+            glob("revpipycontrol/locale/de/LC_MESSAGES/*.mo")
+        ),
+    ],
 
-    "name": "revpipycontrol",
-
-    "description": "PLC Loader für Python-Projekte auf den RevolutionPi",
-    "long_description": ""
+    # Additional meta-data
+    name="revpipycontrol",
+    author="Sven Sager",
+    author_email="akira@narux.de",
+    maintainer="Sven Sager",
+    maintainer_email="akira@revpimodio.org",
+    url="https://revpimodio.org/revpipyplc/",
+    description="GUI for Revolution Pi to upload programs and do IO-Checks",
+    long_description=""
     "Dieses Programm startet beim Systemstart ein angegebenes Python PLC\n"
     "Programm. Es überwacht das Programm und startet es im Fehlerfall neu.\n"
     "Bei Abstruz kann das gesamte /dev/piControl0 auf 0x00 gesettz werden.\n"
     "Außerdem stellt es einen XML-RPC Server bereit, über den die Software\n"
     "auf den RevPi geladen werden kann. Das Prozessabbild kann über ein Tool\n"
     "zur Laufzeit überwacht werden.",
-
-    "install_requires": ["tkinter"],
-
-    "classifiers": [
-        "License :: OSI Approved :: "
-        "GNU Lesser General Public License v3 (LGPLv3)",
+    classifiers=[
+        "License :: OSI Approved :: GNU Lesser General Public License v3 (GPLv3)",
         "Operating System :: POSIX :: Linux",
     ],
-    "cmdclass": {"install_egg_info": MyEggInfo},
-}
-
-if platform == "win32":
-    import sys
-    from cx_Freeze import setup, Executable
-
-    sys.path.append("revpipycontrol")
-
-    exe = Executable(
-        script="revpipycontrol/revpipycontrol.py",
-        base="Win32GUI",
-        compress=False,
-        copyDependentFiles=True,
-        appendScriptToExe=True,
-        appendScriptToLibrary=False,
-        icon="data/revpipycontrol.ico"
-    )
-
-    setup(
-        options={"build_exe": {
-            "include_files": [
-                "revpipycontrol/revpipycontrol.png",
-                "revpipycontrol/locale"
-            ]
-        }},
-        executables=[exe],
-
-        **globsetup
-    )
-else:
-    from setuptools import setup
-    setup(
-        scripts=["data/revpipycontrol"],
-
-        data_files=[
-            ("share/applications", ["data/revpipycontrol.desktop"]),
-            ("share/icons/hicolor/32x32/apps", ["data/revpipycontrol.png"]),
-            ("share/revpipycontrol", glob("revpipycontrol/*.*")),
-            ("share/revpipycontrol/shared", glob("revpipycontrol/shared/*.*")),
-            (
-                "share/revpipycontrol/locale/de/LC_MESSAGES",
-                glob("revpipycontrol/locale/de/LC_MESSAGES/*.mo")
-            ),
-        ],
-
-        **globsetup
-    )
+    license="LGPLv3",
+    cmdclass={"install_egg_info": MyEggInfo},
+)