diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index c709f5a8..9eca86b0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM snapcore/snapcraft
 
 RUN apt-get -qq update
 RUN apt-get install -qq sudo
@@ -6,23 +6,16 @@ RUN apt-get install -qq sudo
 RUN sudo apt-get -qq update
 RUN sudo apt-get -qq install software-properties-common
 RUN sudo apt-get -qq install python-software-properties
-#RUN sudo apt-add-repository -y ppa:beineri/opt-qt57-xenial
-#RUN sudo apt-get -qq update
-#RUN sudo apt-get -qq install qt573d qt57charts-no-lgpl qt57datavis-no-lgpl qt57declarative qt57svg
+RUN sudo apt-add-repository -y ppa:beineri/opt-qt57-xenial
+RUN sudo apt-get -qq update
+RUN sudo apt-get -qq install qt573d qt57charts-no-lgpl qt57datavis-no-lgpl qt57declarative qt57svg
 
 # install packages needed by configure
-#RUN sudo apt-get -qq install patch git build-essential curl
+RUN sudo apt-get -qq install patch git build-essential curl
 
 # needed by build
-#RUN sudo apt-get -qq install mesa-common-dev\
-#    libgl1-mesa-dev\
-#    libboost-dev\
-#    libarmadillo-dev\
-#    catch
-
-# needed by deploy
-RUN sudo apt-get -qq install snapcraft
-
-WORKDIR /app
-
-ADD . /app/
+RUN sudo apt-get -qq install mesa-common-dev\
+    libgl1-mesa-dev\
+    libboost-dev\
+    libarmadillo-dev\
+    catch
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
deleted file mode 100644
index 19eb7fb5..00000000
--- a/.snapcraft/snapcraft.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: neuronify
-version: 0.93
-summary: Neuronify
-description: |
-    Education neural network app
-confinement: strict
-
-apps:
-    neuronify:
-        command: neuronify
-        plugs: ['unity7', 'x11', 'opengl']
-
-parts:
-    qml:
-        plugin: qt57
-
-    move:
-        plugin: copy
-        files:
-            neuronify: neuronify
-            lib: lib
-            qml: qml
-            plugins: plugins
-
-    dep:
-        plugin: nil
-        stage-packages:
-            - libc-bin
-            - libxkbcommon0
-            - ttf-ubuntu-font-family
-            - dmz-cursor-theme
-            - light-themes
-            - shared-mime-info
-            - libgdk-pixbuf2.0-0
-            - libx11-xcb1
-            - libgl1-mesa-dev
-            - libegl1-mesa
-            - libxrender-dev
-            - libgpg-error0
-            - libgcrypt20
-            - liblzma5
-            - libselinux1
-            - libpcre3
-            - zlib1g
-            - libexpat1
-            - libc6
-            - libgcc1
-            - libgcc-5-dev
-            - libstdc++6
-            - libxi6
-            - libuuid1
diff --git a/.travis.yml b/.travis.yml
index 88582126..3caca43f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,19 +26,10 @@ matrix:
     dist: trusty
     sudo: required
     services: docker
-    before_install:
-    - sudo apt-add-repository -y ppa:beineri/opt-qt57-trusty
-    - sudo apt-get -qq update
-    - sudo apt-get -qq install qt573d qt57charts-no-lgpl qt57datavis-no-lgpl qt57declarative qt57svg
-    - export PATH=/opt/qt57/bin:$PATH
     before_deploy:
-    - cp neuronify .snapcraft/
-    - cp -r /opt/qt57/lib .snapcraft/
-    - cp -r /opt/qt57/qml .snapcraft/
-    - cp -r /opt/qt57/plugins .snapcraft/
-    - docker run -v $(pwd):/app snapcore/snapcraft bash -c "cd /app/.snapcraft && snapcraft"
-    - sudo chown -R $USER:$USER .snapcraft
-    - ls -l .snapcraft
+    - docker run -v $(pwd):/app snapcore/snapcraft bash -c "cd /app/ && snapcraft"
+    - sudo chown -R $USER:$USER neuronify*.snap
+    - ls -l .
     deploy:
       skip_cleanup: true
       provider: releases
diff --git a/appveyor.yml b/appveyor.yml
index 8471744e..b1a45f75 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ build_script:
   - windeployqt.exe -quick -quickwidgets -multimediaquick -multimedia -opengl -quickparticles -quickwidgets -qmldir . release
 artifacts:
   - path: release
-    name: windows-release
+    name: neuronify-windows
     type: zip
 deploy:
   description: 'Automated Windows build'
diff --git a/snapcraft.yaml b/snapcraft.yaml
new file mode 100644
index 00000000..f20d676e
--- /dev/null
+++ b/snapcraft.yaml
@@ -0,0 +1,45 @@
+name: neuronify
+version: 0.94
+summary: Neuronify is a neural network simulator
+description: The simulator is built using the integrate-and-fire model.
+
+build-packages:
+  - cmake
+  - gettext
+  - intltool
+  - ubuntu-touch-sounds
+  - suru-icon-theme
+  - qml-module-qttest
+  - qml-module-qtsysteminfo
+  - qml-module-qt-labs-settings
+  - qtdeclarative5-u1db1.0
+  - qtdeclarative5-qtmultimedia-plugin
+  - qtdeclarative5-qtpositioning-plugin
+  - qtdeclarative5-ubuntu-content1
+  - qt5-default
+  - qtbase5-dev
+  - qtdeclarative5-dev
+  - qtdeclarative5-dev-tools
+  - qtdeclarative5-folderlistmodel-plugin
+  - qtdeclarative5-ubuntu-ui-toolkit-plugin
+  - xvfb
+
+apps:
+    neuronify:
+        command: bin/neuronify.sh
+        plugs: [unity7, opengl]
+
+parts:
+    neuronify-launcher:
+        plugin: copy
+        files: {neuronify.sh: bin/neuronify.sh}
+        source: .
+    neuronify:
+        plugin: qmake
+        projectfile: neuronify.pro
+        source: .
+        stage-packages:
+            - ubuntu-sdk-libs
+            - qtubuntu-desktop
+            - qml-module-qtsysteminfo
+- xkb-data