diff --git a/build-aux/flatpak/de.wolfvollprecht.UberWriter.json b/build-aux/flatpak/de.wolfvollprecht.UberWriter.json
index 4df5190..a0276fc 100644
--- a/build-aux/flatpak/de.wolfvollprecht.UberWriter.json
+++ b/build-aux/flatpak/de.wolfvollprecht.UberWriter.json
@@ -10,11 +10,8 @@
         "--share=ipc",
         "--share=network",
         "--filesystem=host",
-        "--env=IN_FLATPAK=1",
-        "--filesystem=xdg-run/dconf",
-        "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf",
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+        "--env=PATH=/app/bin:/usr/bin:/app/extensions/TexLive/2019/bin/x86_64-linux/",
+        "--metadata=X-DConf=migrate-path=/de/wolfvollprecht/UberWriter/"
     ],
     "add-extensions": {
         "de.wolfvollprecht.UberWriter.Plugin": {
@@ -26,49 +23,34 @@
     }
     },
     "modules": [{
-        "name":"enchant",
-        "config-opts":[
-          "--disable-static",
-          "--with-myspell-dir=/usr/share/hunspell"
-        ],
-        "cleanup":[
-          "/bin"
-        ],
-        "sources":[{
-            "type":"archive",
-            "url":"https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz",
-            "sha256":"bef0d9c0fef2e4e8746956b68e4d6c6641f6b85bd2908d91731efb68eba9e3f5"
-        }]
+      "name":"gspell",
+      "sources":[{
+          "type":"archive",
+          "url":"https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz",
+          "sha256":"819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5"
+      }]
     },
     {
-        "name":"gspell",
-        "sources":[{
-            "type":"archive",
-            "url":"https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz",
-            "sha256":"819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5"
-        }]
-    },
-    {
-		"name": "pandoc",
-		"only-arches": [
-		  "x86_64"
-		],
-		"buildsystem": "simple",
-		"build-commands": [
-			"cp bin/pandoc /app/bin/pandoc",
-			"cp bin/pandoc-citeproc /app/bin/pandoc-citeproc"
-		],
-		"sources": [{
-		    "type": "archive",
-		    "url": "https://github.com/jgm/pandoc/releases/download/2.2/pandoc-2.2-linux.tar.gz",
-		    "sha256": "06ecd882e42ef9b7390b1c82e1e71b3ea48679181289b9b810a8797825bed8ed"
-		}]
+      "name": "pandoc",
+      "only-arches": [
+        "x86_64"
+      ],
+      "buildsystem": "simple",
+      "build-commands": [
+        "cp bin/pandoc /app/bin/pandoc",
+        "cp bin/pandoc-citeproc /app/bin/pandoc-citeproc"
+      ],
+      "sources": [{
+          "type": "archive",
+          "url": "https://github.com/jgm/pandoc/releases/download/2.2/pandoc-2.2-linux.tar.gz",
+          "sha256": "06ecd882e42ef9b7390b1c82e1e71b3ea48679181289b9b810a8797825bed8ed"
+      }]
     },
     {
 		"name": "pipdeps",
      	"buildsystem": "simple",
       	"build-commands": [
-			"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} pyenchant regex pypandoc"
+			"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} regex pypandoc"
 		],
       	"sources": [{
 			"type": "file",
@@ -113,9 +95,8 @@
         "name": "uberwriter",
         "buildsystem": "meson",
         "sources": [{
-            "type" : "git",
-            "url" : "../../",
-            "branch" : "bilelmoussaoui-meson"
+            "type" : "dir",
+            "path" : "../../"
         }],
 		"post-install": [
 			"install -d /app/extensions"
diff --git a/build-aux/flatpak/flatpak_texlive.json b/build-aux/flatpak/flatpak_texlive.json
index a403cb8..9476a89 100644
--- a/build-aux/flatpak/flatpak_texlive.json
+++ b/build-aux/flatpak/flatpak_texlive.json
@@ -2,7 +2,7 @@
     "id": "de.wolfvollprecht.UberWriter.Plugin.TexLive",
     "runtime": "de.wolfvollprecht.UberWriter",
     "branch": "stable",
-    "sdk": "org.gnome.Sdk//3.32",
+    "sdk": "org.gnome.Sdk//3.34",
     "build-extension": true,
     "separate-locales": false,
     "appstream-compose": false,
@@ -13,7 +13,7 @@
         "cflags": "-O2 -g",
         "cxxflags": "-O2 -g",
         "env": {
-          "PATH": "/app/extensions/TexLive/bin:/app/extensions/TexLive/2018/bin/x86_64-linux:/app/bin:/usr/bin"
+          "PATH": "/app/extensions/TexLive/bin:/app/extensions/TexLive/2019/bin/x86_64-linux:/app/bin:/usr/bin"
         }
     },
     "cleanup": ["/bin/wget"],
diff --git a/build-aux/flatpak/flatpak_texlive_flathub.json b/build-aux/flatpak/flatpak_texlive_flathub.json
index a0a6823..9030280 100644
--- a/build-aux/flatpak/flatpak_texlive_flathub.json
+++ b/build-aux/flatpak/flatpak_texlive_flathub.json
@@ -2,7 +2,7 @@
     "id": "de.wolfvollprecht.UberWriter.Plugin.TexLive",
     "runtime": "de.wolfvollprecht.UberWriter",
     "branch": "stable",
-    "sdk": "org.gnome.Sdk//3.32",
+    "sdk": "org.gnome.Sdk//3.34",
     "build-extension": true,
     "separate-locales": false,
     "appstream-compose": false,
@@ -13,7 +13,7 @@
         "cflags": "-O2 -g",
         "cxxflags": "-O2 -g",
         "env": {
-          "PATH": "/app/extensions/TexLive/bin:/app/extensions/TexLive/2018/bin/x86_64-linux:/app/bin:/usr/bin"
+          "PATH": "/app/extensions/TexLive/bin:/app/extensions/TexLive/2019/bin/x86_64-linux:/app/bin:/usr/bin"
         }
     },
     "cleanup": ["/bin/wget"],
@@ -55,7 +55,7 @@
 				{
 					"type":"file",
 					"url": "http://mirrors.ctan.org/systems/texlive/Images/texlive.iso",
-					"sha512": "7b7f0dd0eab3bfffe52c5cd1139c7f75d029b9ff4c4ce0e57e06834705522f4ec0c02cd99a80b053c6619abda51c20a60f8e91e91781bdc2b9b60fc2e5708adb"
+					"sha512": "a00a943ce4438fe2aecf8b1e05f9055135ef03c56b6782a49205bac9023d77c781f3cab50f2f9555ac116bb0d97d6570afffe7c60b8745325b9941f82af7ef83 "
 				},
 				{
 			                "type": "file",