diff --git a/data/com.abunchtell.WriteAsDesktop.appdata.xml.in b/data/com.abunchtell.WriteAsDesktop.appdata.xml.in
index 7107478..d9a0081 100644
--- a/data/com.abunchtell.WriteAsDesktop.appdata.xml.in
+++ b/data/com.abunchtell.WriteAsDesktop.appdata.xml.in
@@ -1,114 +1,114 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <component type="desktop-application">
   <id>@app_id@</id>
   <project_license>GPL-3.0+</project_license>
   <metadata_license>CC0</metadata_license>
   <name>Write.as</name>
   <summary>Publish a thought in seconds</summary>
 
   <description>
     <p>Write.as is a simple writing tool and publishing platform. There's no sign up — just open the app, write something, and publish.</p>
     <p>Published posts get a secret, unique link on Write.as that you can share with anyone, or keep to yourself. In either case, you remain private because we don't collect personal information about you.</p>
     <ul>
       <li>Simple, distraction-free editor built for your words</li>
       <li>Instantly launches to a blank page or your last draft</li>
       <li>Writing automatically saves as you type</li>
       <li>Work on a single local draft, then publish or save as another file when you're finished</li>
       <li>Choose from three different fonts: serif, sans-serif, or monospace</li>
       <li>Dark mode on platforms that support it</li>
       <li>Publish to Write.as and share your post (<a href="https://write.as/l23z7d6yb0dd5v4c.md">example</a>)</li>
       <li>Manage published posts with the built-in command-line interface</li>
     </ul>
   </description>
 
   <developer_name>Write.as</developer_name>
   <url type="homepage">https://write.as/</url>
   <url type="help">https://write.as/contact</url>
   <url type="bugtracker">https://github.com/writeas/writeas-gtk/issues</url>
   <update_contact>hello@write.as</update_contact>
 
   <provides>
-    <binary>@app_id@</binary>
+    <binary>@exec@</binary>
   </provides>
 
   <screenshots>
     <screenshot type="default">
       <caption>The Write.as editor.</caption>
       <image type="source">https://write.as/img/screens/gtk/serif.png</image>
     </screenshot>
     <screenshot>
       <caption>The Write.as editor in dark mode.</caption>
       <image type="source">https://write.as/img/screens/gtk/serif-dark.png</image>
     </screenshot>
     <screenshot>
       <image type="source">https://write.as/img/screens/gtk/sans.png</image>
     </screenshot>
     <screenshot>
       <image type="source">https://write.as/img/screens/gtk/monospace.png</image>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
     <content_attribute id="violence-cartoon">none</content_attribute>
     <content_attribute id="violence-fantasy">none</content_attribute>
     <content_attribute id="violence-realistic">none</content_attribute>
     <content_attribute id="violence-bloodshed">none</content_attribute>
     <content_attribute id="violence-sexual">none</content_attribute>
     <content_attribute id="violence-desecration">none</content_attribute>
     <content_attribute id="violence-slavery">none</content_attribute>
     <content_attribute id="violence-worship">none</content_attribute>
     <content_attribute id="drugs-alcohol">none</content_attribute>
     <content_attribute id="drugs-narcotics">none</content_attribute>
     <content_attribute id="drugs-tobacco">none</content_attribute>
     <content_attribute id="sex-nudity">none</content_attribute>
     <content_attribute id="sex-themes">none</content_attribute>
     <content_attribute id="sex-homosexuality">none</content_attribute>
     <content_attribute id="sex-prostitution">none</content_attribute>
     <content_attribute id="sex-adultery">none</content_attribute>
     <content_attribute id="sex-appearance">none</content_attribute>
     <content_attribute id="language-profanity">none</content_attribute>
     <content_attribute id="language-humor">none</content_attribute>
     <content_attribute id="language-discrimination">none</content_attribute>
     <content_attribute id="social-chat">none</content_attribute>
     <content_attribute id="social-info">moderate</content_attribute>
     <content_attribute id="social-audio">none</content_attribute>
     <content_attribute id="social-location">none</content_attribute>
     <content_attribute id="social-contacts">none</content_attribute>
     <content_attribute id="money-purchasing">none</content_attribute>
     <content_attribute id="money-gambling">none</content_attribute>
   </content_rating>
   <releases>
     <release version="1.0.2" date="2018-12-20">
       <description>
          <p>This update fixes a few minor visual issues.</p>
          <ul>
            <li>Fix black bar that appears in the editor on elementary OS</li>
            <li>Fix currently-selected font not reflected in menu when app first loads</li>
          </ul>
       </description>
     </release>
     <release version="1.0.1" date="2018-12-14">
       <description>
          <p>GTK updates and fixes.</p>
          <ul>
            <li>Fix fonts, padding, cursor color</li>
            <li>Increase the default font size</li>
          </ul>
       </description>
     </release>
     <release version="1.0.0" date="2018-10-01">
       <description>
          <p>Initial release</p>
          <ul>
            <li>Auto-saving single draft</li>
            <li>Dark mode on platforms that support it</li>
            <li>Choose between three fonts</li>
            <li>Save draft as another file</li>
            <li>Publish anonymously to Write.as</li>
          </ul>
       </description>
     </release>
   </releases>
   <custom>
     <value key="x-appcenter-suggested-price">25</value>
   </custom>
 </component>
diff --git a/data/com.abunchtell.WriteAsDesktop.desktop.in b/data/com.abunchtell.WriteAsDesktop.desktop.in
index 0ec22b5..0ec54e7 100644
--- a/data/com.abunchtell.WriteAsDesktop.desktop.in
+++ b/data/com.abunchtell.WriteAsDesktop.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
 Name=Write.as
 Comment=Publish a thought in seconds.
-Exec=@app_id@
+Exec=@exec@
 Icon=@app_id@
 Terminal=false
 MimeType=
 Categories=GTK;Office;Publishing;
 Keywords=blog;text;editor;publish;
 StartupNotify=true
 
diff --git a/data/meson.build b/data/meson.build
index be9fec1..82d7659 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,24 +1,25 @@
 icon_sizes = ['16', '24', '32', '48', '64', '128']
 
 foreach i : icon_sizes
     install_data(
         join_paths('icons', i, 'com.abunchtell.WriteAsDesktop.png'),
         install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'),
         rename: '@0@.png'.format(app_id)
     )
 endforeach
 
 data_conf = configuration_data()
 data_conf.set('app_id', app_id)
+data_conf.set('exec', executable)
 configure_file(
   input: 'com.abunchtell.WriteAsDesktop.desktop.in',
   output: '@0@.desktop'.format(app_id),
   configuration: data_conf,
   install_dir: join_paths(get_option('datadir'), 'applications')
 )
 configure_file(
   input: 'com.abunchtell.WriteAsDesktop.appdata.xml.in',
   output: '@0@.appdata.xml'.format(app_id),
   configuration: data_conf,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
diff --git a/meson.build b/meson.build
index 6fd8d7c..c424f86 100644
--- a/meson.build
+++ b/meson.build
@@ -1,29 +1,32 @@
 project('writeas-gtk', ['vala', 'c'],
     version: '1.0.2',
     license: 'GPL',
     meson_version: '>=0.48.0')
 
 i18n = import('i18n')
 
 build_platform = get_option('platform')
 if build_platform == 'elementary'
   app_id = 'com.github.writeas.writeas-gtk'
+  executable = 'com.github.writeas.writeas-gtk'
 else
   app_id = 'com.abunchtell.WriteAsDesktop'
+  executable = 'writeas-gtk'
 endif
 
+
 conf = configuration_data()
 conf.set_quoted('GETTEXT_PACKAGE', app_id)
 conf.set_quoted('APP_ID', app_id)
 conf.set_quoted('BUILD_PLATFORM', build_platform)
 config_h = configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')
 
 cli_build_script = find_program('meson/build-cli.sh')
 
 subdir('data')
 subdir('src')
 subdir('fonts/lora')
 
 meson.add_install_script('meson/post_install.py')
 
diff --git a/src/meson.build b/src/meson.build
index 0be3d9b..48de256 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,35 +1,29 @@
-if build_platform == 'elementary'
-  executable = 'com.github.writeas.writeas-gtk'
-else
-  executable = 'writeas-gtk'
-endif
-
 if get_option('auto_build_cli')
   gb = find_program('gb')
 
   cli_target = custom_target('build-cli',
       build_by_default: true,
       output: 'writeas',
       install: true,
       install_dir: get_option('bindir'),
       console: true,
       command: [
         cli_build_script,
         '@SOURCE_ROOT@',
         '@OUTPUT@',
         meson.build_root()
       ]
   )
 endif
 
 executable(executable,
     'application.vala',
     'window.vala',
     'Granite/Accels.vala',
     'Granite/ModeSwitch.vala',
 
     c_args: ['-include', 'config.h'],
     link_args: '-lm',
     dependencies: [dependency('gtk+-3.0'), dependency('gtksourceview-3.0')],
     install: true
 )