diff --git a/.gitignore b/.gitignore
index d5e4595..7575b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ build/
 debian/uberwriter/DEBIAN
 debian/uberwriter/opt
 debian/uberwriter/usr
-bin/
 flatpak/*
 !flatpak/fonts-download
 !flatpak/pandoc-download
diff --git a/bin/uberwriter b/bin/uberwriter
new file mode 100755
index 0000000..69fcd8b
--- /dev/null
+++ b/bin/uberwriter
@@ -0,0 +1,59 @@
+#!/usr/bin/python3
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2012, Wolf Vollprecht <w.vollprecht@gmail.com>
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+### DO NOT EDIT THIS FILE ###
+
+import sys
+import os
+
+import pkg_resources
+
+import gettext
+import locale
+
+# Add project root directory (enable symlink and trunk execution)
+PROJECT_ROOT_DIRECTORY = os.path.abspath(
+    os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
+
+# Set the path if needed. This allows uberwriter to run without installing it :)
+python_path = []
+if os.path.abspath(__file__).startswith('/opt'):
+    gettext.bindtextdomain('uberwriter', '/opt/extras.ubuntu.com/uberwriter/share/locale')
+    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
+    for path in syspath:
+        opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/uberwriter')
+        python_path.insert(0, opt_path)
+        sys.path.insert(0, opt_path)
+    os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/uberwriter/share/", os.getenv("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/")))
+if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'uberwriter'))
+    and PROJECT_ROOT_DIRECTORY not in sys.path):
+    python_path.insert(0, PROJECT_ROOT_DIRECTORY)
+    sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
+if python_path:
+    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
+
+import uberwriter
+
+locale_dir = os.path.abspath(os.path.join(os.path.dirname(uberwriter.__file__),'../po/'))
+
+# L10n
+locale.textdomain('uberwriter')
+locale.bindtextdomain('uberwriter', locale_dir)
+gettext.textdomain('uberwriter')
+gettext.bindtextdomain('uberwriter', locale_dir)
+
+uberwriter.main()
diff --git a/data/de.wolfvollprecht.UberWriter.appdata.xml b/data/de.wolfvollprecht.UberWriter.appdata.xml
index ac95924..fa00397 100644
--- a/data/de.wolfvollprecht.UberWriter.appdata.xml
+++ b/data/de.wolfvollprecht.UberWriter.appdata.xml
@@ -28,6 +28,13 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release date="2019-04-17" version="2.2.0-beta1">
+      <description>
+        <ul>
+          <li>...</li>
+        </ul>
+      </description>
+    </release>
     <release date="2019-03-10" version="2.1.5">
       <description>
         <ul>
diff --git a/setup.py b/setup.py
index 8671284..f9d08d3 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ else:
 
 setup(
     name='uberwriter',
-    version='2.1.4',
+    version='2.2.0-beta1',
     license='GPL-3',
     author='Wolf Vollprecht',
     author_email='w.vollprecht@gmail.com',
@@ -64,7 +64,6 @@ setup(
         "uberwriter.pylocales",
         # "uberwriter.pressagio",
         "uberwriter",
-        "uberwriter",
         "po"
         # "uberwriter.plugins"
         # "uberwriter.plugins.bibtex"
@@ -75,10 +74,11 @@ setup(
         'uberwriter.pylocales' : ['locales.db'],
     },
     data_files=[
-        (app_prefix + 'bin', ['bin/uberwriter']),
+        (app_prefix + 'bin', ['uberwriter.in']),
         (app_prefix + 'share/glib-2.0/schemas', ['data/de.wolfvollprecht.UberWriter.gschema.xml']),
         (app_prefix + 'share/icons/hicolor/scalable/apps', ['data/media/de.wolfvollprecht.UberWriter.svg']),
-        (app_prefix + 'share/applications', ['de.wolfvollprecht.UberWriter.desktop']),
+        (app_prefix + 'share/icons/hicolor/symbolic/apps', ['data/media/de.wolfvollprecht.UberWriter-symbolic.svg']),
+        (app_prefix + 'share/applications', ['/data/de.wolfvollprecht.UberWriter.desktop']),
         (app_prefix + 'share/uberwriter/data/ui', extra_files_ui),
         (app_prefix + 'share/uberwriter/data/media', extra_files_media),
         (app_prefix + 'share/uberwriter/data/lua', extra_files_scripts)