diff --git a/launcher/kitty b/kitty/launcher/kitty
similarity index 78%
rename from launcher/kitty
rename to kitty/launcher/kitty
index 01999b015..3808ffd3d 100755
--- a/launcher/kitty
+++ b/kitty/launcher/kitty
@@ -5,7 +5,7 @@
 import os
 import sys
 
-base = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+base = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.insert(0, base)
 with open(os.path.join(base, '__main__.py')) as f:
     src = f.read()
diff --git a/kitty/main.py b/kitty/main.py
index 96c04e055..d4e185344 100644
--- a/kitty/main.py
+++ b/kitty/main.py
@@ -118,7 +118,7 @@ def main():
             if os.access(os.path.join(candidate, 'kitty'), os.X_OK):
                 break
         else:
-            rpath = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'launcher')
+            rpath = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'launcher')
     if rpath and rpath not in items:
         os.environ['PATH'] += os.pathsep + rpath
 
diff --git a/setup.py b/setup.py
index 91c357256..94be8b26a 100755
--- a/setup.py
+++ b/setup.py
@@ -485,7 +485,7 @@ def package(args, for_bundle=False, sh_launcher=False):  # {{{
     for x in (libdir, os.path.join(ddir, 'share')):
         odir = os.path.join(x, 'terminfo')
         safe_makedirs(odir)
-        subprocess.check_call(['tic', '-o' + odir, 'terminfo/kitty.terminfo'])
+        subprocess.check_call(['tic', '-x', '-o' + odir, 'terminfo/kitty.terminfo'])
     shutil.copy2('__main__.py', libdir)
     shutil.copy2('logo/kitty.rgba', os.path.join(libdir, 'logo'))