diff --git a/.gitignore b/.gitignore
index 7b14b1911ae..957b0dfbcbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ build
 desktop.ini
 */target/*
 *.class
+deploy
diff --git a/build.gradle b/build.gradle
index 318535661f4..f90ac6363bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
         classpath files('gradle/witness/gradle-witness.jar')
     }
 }
@@ -12,6 +12,7 @@ apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: 'maven'
 apply plugin: 'witness'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 group = 'network.bisq'
 version = '-SNAPSHOT'
diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh
index 8cede5c50e1..d41ba743696 100644
--- a/package/linux/32bitBuild.sh
+++ b/package/linux/32bitBuild.sh
@@ -6,9 +6,10 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.6.7
+version=0.7.0
 
 dir="/media/sf_vm_shared_ubuntu14_32bit"
+linux_user="bisq"
 
 # Note: fakeroot needs to be installed on linux
 $JAVA_HOME/bin/javapackager \
@@ -44,7 +45,7 @@ $JAVA_HOME/bin/javapackager \
 
 # sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
-cp "deploy/bundles/bisq-$version.deb" "/home/bitsquare/Desktop/Bisq-32bit-$version.deb"
+cp "deploy/bundles/bisq-$version.deb" "/home/$bisq/Desktop/Bisq-32bit-$version.deb"
 mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb"
 
 # mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.rpm"
diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh
index 7745625c204..79d57188c1f 100644
--- a/package/linux/64bitBuild.sh
+++ b/package/linux/64bitBuild.sh
@@ -6,9 +6,10 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.6.7
+version=0.7.0
 
 dir="/media/sf_vm_shared_ubuntu"
+linux_user="bisq"
 
 # Note: fakeroot needs to be installed on linux
 $JAVA_HOME/bin/javapackager \
@@ -44,7 +45,7 @@ $JAVA_HOME/bin/javapackager \
 # uncomment because the build VM does not support alien
 #sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
-cp "deploy/bundles/bisq-$version.deb" "/home/mk/Desktop/Bisq-64bit-$version.deb"
+cp "deploy/bundles/bisq-$version.deb" "/home/$linux_user/Desktop/Bisq-64bit-$version.deb"
 mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb"
 #mv "bisq-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.rpm"
 rm -r deploy/
diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile
index 24fb1f65a91..be101aeed8c 100644
--- a/package/linux/Dockerfile
+++ b/package/linux/Dockerfile
@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.6.7
+ENV version 0.7.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot
diff --git a/package/osx/Info.plist b/package/osx/Info.plist
index 0be828bf28f..da5a411f14d 100644
--- a/package/osx/Info.plist
+++ b/package/osx/Info.plist
@@ -15,7 +15,7 @@
         <key>CFBundleName</key>
         <string>Bisq</string>
         <key>CFBundleIdentifier</key>
-        <string>io.bisq.Bisq</string>
+        <string>network.bisq.CAT</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundlePackageType</key>
@@ -30,7 +30,7 @@
         <key>CFBundleVersion</key>
         <string>1</string>
         <key>NSHumanReadableCopyright</key>
-        <string>Copyright (C) 2015</string>
+        <string>Copyright (C) 2018</string>
         <key>NSHighResolutionCapable</key>
         <string>true</string>
         <key>JVMRuntime</key>
@@ -40,7 +40,7 @@
         <key>JVMAppClasspath</key>
         <string></string>
         <key>JVMMainJarName</key>
-        <string>shaded.jar</string>
+        <string>Bisq-0.7.0.jar</string>
         <key>JVMPreferencesID</key>
         <string>bisq</string>
         <key>JVMOptions</key>
diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh
index 82c3b2b1b31..e75f23e430e 100755
--- a/package/osx/create_app.sh
+++ b/package/osx/create_app.sh
@@ -1,13 +1,16 @@
 #!/bin/bash
 
-cd ../../
+cd $(dirname $0)/../../
+
 mkdir -p deploy
 
 set -e
 
-version="0.6.7"
+version="0.7.0"
+
+./gradlew shadowJar
 
-./gradlew build
+EXE_JAR=build/libs/bisq-desktop--SNAPSHOT-all.jar
 
 linux32=build/vm/vm_shared_ubuntu14_32bit
 linux64=build/vm/vm_shared_ubuntu
@@ -16,14 +19,14 @@ win64=build/vm/vm_shared_windows
 
 mkdir -p $linux32 $linux64 $win32 $win64
 
-cp build/libs/bisq-desktop.jar "deploy/Bisq-$version.jar"
+cp $EXE_JAR "deploy/Bisq-$version.jar"
 
 # copy app jar to VM shared folders
-cp build/libs/bisq-desktop.jar "$linux32/Bisq-$version.jar"
-cp build/libs/bisq-desktop.jar "$linux64/Bisq-$version.jar"
+cp $EXE_JAR "$linux32/Bisq-$version.jar"
+cp $EXE_JAR "$linux64/Bisq-$version.jar"
 # At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
-cp build/libs/bisq-desktop.jar "$win32/Bisq.jar"
-cp build/libs/bisq-desktop.jar "$win64/Bisq.jar"
+cp $EXE_JAR "$win32/Bisq.jar"
+cp $EXE_JAR "$win64/Bisq.jar"
 
 if [ -z "$JAVA_HOME" ]; then
     JAVA_HOME=$(/usr/libexec/java_home)
@@ -33,8 +36,8 @@ echo "Using JAVA_HOME: $JAVA_HOME"
 $JAVA_HOME/bin/javapackager \
     -deploy \
     -BappVersion=$version \
-    -Bmac.CFBundleIdentifier=bisq \
-    -Bmac.CFBundleName=Bisq \
+    -Bmac.CFBundleIdentifier=network.bisq \
+    -Bmac.CFBundleName=CAT \
     -Bicon=package/osx/Bisq.icns \
     -Bruntime="$JAVA_HOME/jre" \
     -native dmg \
diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh
old mode 100644
new mode 100755
index 0490607d240..18b5f8a2f34
--- a/package/osx/finalize.sh
+++ b/package/osx/finalize.sh
@@ -1,9 +1,17 @@
 #!/bin/bash
 
-version="0.6.7"
+cd ../../
 
-target_dir="/Users/dev/Documents/__bisq/_releases/$version"
-src_dir="/Users/dev/idea/exchange"
+version="0.7.0"
+
+target_dir="releases/$version"
+
+linux32=build/vm/vm_shared_ubuntu14_32bit
+linux64=build/vm/vm_shared_ubuntu
+win32=build/vm/vm_shared_windows_32bit
+win64=build/vm/vm_shared_windows
+macOS=build/vm/vm_shared_macosx
+gpg_user="christoph.atteneder@gmail.com"
 
 rm -r $target_dir
 
@@ -21,14 +29,14 @@ cp "$target_dir/../29CDFD3B.asc" "$target_dir/"
 # signing key
 cp "$target_dir/../signingkey.asc" "$target_dir/"
 
-mac="Bisq-$version.dmg"
-cp "$src_dir/deploy/$mac" "$target_dir/"
+dmg="Bisq-$version.dmg"
+cp "$macOS/$dmg" "$target_dir/"
 
 deb32="Bisq-32bit-$version.deb"
-cp "/Users/dev/vm_shared_ubuntu14_32bit/$deb32" "$target_dir/"
+cp "$linux32/$deb32" "$target_dir/"
 
 deb64="Bisq-64bit-$version.deb"
-cp "/Users/dev/vm_shared_ubuntu/$deb64" "$target_dir/"
+cp "$linux64/$deb64" "$target_dir/"
 
 #rpm32="Bisq-32bit-$version.rpm"
 #cp "/Users/dev/vm_shared_ubuntu14_32bit/$rpm32" "$target_dir/"
@@ -38,27 +46,27 @@ cp "/Users/dev/vm_shared_ubuntu/$deb64" "$target_dir/"
 
 
 exe="Bisq-$version.exe"
-win32="Bisq-32bit-$version.exe"
-cp "/Users/dev/vm_shared_windows_32bit/bundles/$exe" "$target_dir/$win32"
-win64="Bisq-64bit-$version.exe"
-cp "/Users/dev/vm_shared_windows/bundles/$exe" "$target_dir/$win64"
+exe32="Bisq-32bit-$version.exe"
+cp "$win32/bundles/$exe" "$target_dir/$exe32"
+exe64="Bisq-64bit-$version.exe"
+cp "$win64/bundles/$exe" "$target_dir/$exe64"
 #cp "/Users/dev/vm_shared_windows/bundles/$exe" "/Users/dev/vm_shared_win10/$win64"
 
 cd "$target_dir"
 
 
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $mac.asc --detach-sig --armor $mac
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $deb64.asc --detach-sig --armor $deb64
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $deb32.asc --detach-sig --armor $deb32
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $win64.asc --detach-sig --armor $win64
-gpg --digest-algo SHA256 --local-user manfred@bitsquare.io --output $win32.asc --detach-sig --armor $win32
+gpg --digest-algo SHA256 --local-user $gpg_user --output $dmg.asc --detach-sig --armor $dmg
+gpg --digest-algo SHA256 --local-user $gpg_user --output $deb64.asc --detach-sig --armor $deb64
+gpg --digest-algo SHA256 --local-user $gpg_user --output $deb32.asc --detach-sig --armor $deb32
+gpg --digest-algo SHA256 --local-user $gpg_user --output $exe64.asc --detach-sig --armor $exe64
+gpg --digest-algo SHA256 --local-user $gpg_user --output $exe32.asc --detach-sig --armor $exe32
 
-gpg --digest-algo SHA256 --verify $mac{.asc*,}
+gpg --digest-algo SHA256 --verify $dmg{.asc*,}
 gpg --digest-algo SHA256 --verify $deb64{.asc*,}
 gpg --digest-algo SHA256 --verify $deb32{.asc*,}
-gpg --digest-algo SHA256 --verify $win64{.asc*,}
-gpg --digest-algo SHA256 --verify $win32{.asc*,}
+gpg --digest-algo SHA256 --verify $exe64{.asc*,}
+gpg --digest-algo SHA256 --verify $exe32{.asc*,}
 
-cp -r $target_dir /Users/dev/vm_shared_windows_32bit/
+#cp -r $target_dir /Users/dev/vm_shared_windows_32bit/
 
-open "$target_dir"
+open "."
diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat
index 083e12bd27b..82c5557a01f 100644
--- a/package/windows/32bitBuild.bat
+++ b/package/windows/32bitBuild.bat
@@ -5,7 +5,7 @@
 :: 32 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.6.7
+SET version=0.7.0
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows_32bit
diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat
index 2ae1adf2701..e925eafb22e 100644
--- a/package/windows/64bitBuild.bat
+++ b/package/windows/64bitBuild.bat
@@ -5,7 +5,7 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.6.7
+SET version=0.7.0
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows
diff --git a/package/windows/Bisq.iss b/package/windows/Bisq.iss
index c518b2dcc51..9f09e408dff 100755
--- a/package/windows/Bisq.iss
+++ b/package/windows/Bisq.iss
@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.6.7
+AppVersion=0.7.0
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq