diff --git a/bitcoin-qt_wrapper.sh b/bitcoin-qt_wrapper.sh
new file mode 100644
index 0000000..d6af713
--- /dev/null
+++ b/bitcoin-qt_wrapper.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+exec bitcoin-qt -datadir=$XDG_DATA_HOME "$@"
diff --git a/org.bitcoincore.bitcoin-qt.appdata.xml b/org.bitcoincore.bitcoin-qt.appdata.xml
index 4c5825e..87d8b03 100644
--- a/org.bitcoincore.bitcoin-qt.appdata.xml
+++ b/org.bitcoincore.bitcoin-qt.appdata.xml
@@ -41,7 +41,8 @@
   </screenshots>
 
   <releases>
-    <release version="0.18.0" date="2019-05-18" />
+    <release version="0.18.1" date="2019-08-09"/>
+    <release version="0.18.0" date="2019-05-18"/>
   </releases>
 
   <content_rating type="oars-1.1" />
diff --git a/org.bitcoincore.bitcoin-qt.desktop b/org.bitcoincore.bitcoin-qt.desktop
index e1c7c15..e3a3fa5 100755
--- a/org.bitcoincore.bitcoin-qt.desktop
+++ b/org.bitcoincore.bitcoin-qt.desktop
@@ -1,9 +1,13 @@
 [Desktop Entry]
-Type=Application
 Name=Bitcoin Core
-Icon=org.bitcoincore.bitcoin-qt
 Comment=Connect to the Bitcoin P2P Network
 Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
 Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
 Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
-Exec=bitcoin-qt %f
+Exec=bitcoin-qt_wrapper.sh %u
+Terminal=false
+Type=Application
+Icon=org.bitcoincore.bitcoin-qt
+MimeType=x-scheme-handler/bitcoin;
+Categories=Office;Finance;P2P;Network;Qt;
+StartupWMClass=Bitcoin-qt
diff --git a/org.bitcoincore.bitcoin-qt.json b/org.bitcoincore.bitcoin-qt.json
index 078820f..c02cfe6 100644
--- a/org.bitcoincore.bitcoin-qt.json
+++ b/org.bitcoincore.bitcoin-qt.json
@@ -3,15 +3,13 @@
     "runtime": "org.freedesktop.Platform",
     "sdk": "org.freedesktop.Sdk",
     "runtime-version": "18.08",
-    "command": "bitcoin-qt",
+    "command": "bitcoin-qt_wrapper.sh",
     "finish-args": [
 	/* Wayland and Xorg support */
 	"--socket=x11",
 	"--socket=wayland",
 	/* Sound */
 	"--socket=pulseaudio",
-	/* Persistent storage */
-	"--persist=.bitcoin",
 	/* OpenGL access. */
 	"--device=dri",
 	/* IPC access. */
@@ -36,26 +34,26 @@
 		{
 		    "type": "archive",
 		    "only-arches": ["x86_64"],
-		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.0/bitcoin-0.18.0-x86_64-linux-gnu.tar.gz",
-		    "sha256": "5146ac5310133fbb01439666131588006543ab5364435b748ddfc95a8cb8d63f"
+		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1-x86_64-linux-gnu.tar.gz",
+		    "sha256": "600d1db5e751fa85903e935a01a74f5cc57e1e7473c15fd3e17ed21e202cfe5a"
 		},
 		{
 		    "type": "archive",
 		    "only-arches": ["i386"],
-		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.0/bitcoin-0.18.0-i686-pc-linux-gnu.tar.gz",
-		    "sha256": "36ce9ffb375f6ee280df5a86e61038e3c475ab9dee34f6f89ea82b65a264183b"
+		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1-i686-pc-linux-gnu.tar.gz",
+		    "sha256": "989e847b3e95fc9fedc0b109cae1b4fa43348f2f712e187a118461876af9bd16"
 		},
 		{
 		    "type": "archive",
 		    "only-arches": ["arm"],
-		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.0/bitcoin-0.18.0-arm-linux-gnueabihf.tar.gz",
-		    "sha256": "3d7eb57290b2f14c495a24ecbab8100b35861f0c81bc10d86e5c0a8ec8284b27"
+		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1-arm-linux-gnueabihf.tar.gz",
+		    "sha256": "cc7d483e4b20c5dabd4dcaf304965214cf4934bcc029ca99cbc9af00d3771a1f"
 		},
 		{
 		    "type": "archive",
 		    "only-arches": ["aarch64"],
-		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.0/bitcoin-0.18.0-aarch64-linux-gnu.tar.gz",
-		    "sha256": "bfc3b8fddbb7ab9b532c9866859fc507ec959bdb82954966f54c8ebf8c7bb53b"
+		    "url": "https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1-aarch64-linux-gnu.tar.gz",
+		    "sha256": "88f343af72803b851c7da13874cc5525026b0b55e63e1b5e1298390c4688adc6"
 		}
 
 	    ]
@@ -66,7 +64,9 @@
 	    "build-commands": [
 		"install -Dp -m 644 org.bitcoincore.bitcoin-qt.desktop /app/share/applications/org.bitcoincore.bitcoin-qt.desktop",
 		"install -Dp -m 644 org.bitcoincore.bitcoin-qt.svg /app/share/icons/hicolor/scalable/apps/org.bitcoincore.bitcoin-qt.svg",
-		"install -Dp -m 644 org.bitcoincore.bitcoin-qt.appdata.xml /app/share/metainfo/org.bitcoincore.bitcoin-qt.appdata.xml"
+		"install -Dp -m 644 org.bitcoincore.bitcoin-qt.appdata.xml /app/share/metainfo/org.bitcoincore.bitcoin-qt.appdata.xml",
+		"install -Dp -m 744 bitcoin-qt_wrapper.sh /app/bin/bitcoin-qt_wrapper.sh"
+
 	    ],
 	    "sources": [
 		{
@@ -80,7 +80,12 @@
 		{
 		    "type": "file",
 		    "path": "org.bitcoincore.bitcoin-qt.svg"
+		},
+		{
+		    "type": "file",
+		    "path": "bitcoin-qt_wrapper.sh"
 		}
+
 	    ]
 	}
     ]