diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh
index a94664f1..efd50186 100755
--- a/installer/snappy/filebot.sh
+++ b/installer/snappy/filebot.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
-
-export LC_ALL="en.utf-8"
+export LANG="C.UTF-8"
 
 export PATH="$SNAP/bin:$SNAP/usr/bin"
 export LD_LIBRARY_PATH="$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu"
@@ -23,42 +22,33 @@ export LD_LIBRARY_PATH="$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH"
 export GDK_PIXBUF_MODULEDIR="$SNAP/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0"
 export GDK_PIXBUF_MODULE_FILE="$SNAP/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 
-export LIBGL_DRIVERS_PATH="$SNAP/usr/lib/x86_64-linux-gnu/dri"
+export GTK_PATH="$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0"
 
-export APP_ROOT="$SNAP/filebot"
-
-export APP_DATA="$SNAP_USER_DATA/data"
-export APP_CACHE="$SNAP_USER_DATA/cache"
-
-export FONTCONFIG_FILE="$SNAP/fonts.conf"		# causes startup lag the first time the font cache is initialized
-export LIBGL_DEBUG=verbose
-export G_MESSAGES_DEBUG=all
-
-export GTK_MODULES="gail:atk-bridge:unity-gtk-module"
-export GTK2_MODULES="overlay-scrollbar"
 export GTK_MODULES=""
 export GTK2_MODULES=""
 
-export GTK_PATH="$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0"
-
 # export GIO_MODULE_DIR="$SNAP/usr/lib/x86_64-linux-gnu/gio/modules"
 # export LD_LIBRARY_PATH="$GIO_MODULE_DIR:$LD_LIBRARY_PATH"
 
 export GTK2_RC_FILES="$SNAP/usr/share/themes/Ambiance/gtk-2.0/gtkrc"
 export GTK_THEME="$SNAP/usr/share/themes/Ambiance/gtk-3.0/gtk.css"
 
-# Not good, needed for fontconfig
+export ORIGIN="$SNAP/usr/lib/x86_64-linux-gnu"
 export XDG_DATA_HOME="$SNAP/usr/share"
 export GSETTINGS_SCHEMA_DIR="$SNAP/usr/share/glib-2.0/schemas"
 
-# Font Config
+export LIBGL_DRIVERS_PATH="$SNAP/usr/lib/x86_64-linux-gnu/dri"
+
 export FONTCONFIG_PATH="$SNAP/etc/fonts/config.d"
 export FONTCONFIG_FILE="$SNAP/etc/fonts/fonts.conf"
 
-export ORIGIN="$SNAP/usr/lib/x86_64-linux-gnu"
-
-# export JAVA_OPTS="-Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel $JAVA_OPTS"
+# export JAVA_TOOL_OPTIONS="-javaagent:$SNAP/usr/share/java/jayatanaag.jar"
 # export JAVA_OPTS="-Dsun.java2d.opengl=True $JAVA_OPTS"
 # export JAVA_OPTS="-Dsun.java2d.xrender=True $JAVA_OPTS"
 
-java -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" "-Dnet.filebot.AcoustID.fpcalc=$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"
+export APP_ROOT="$SNAP/filebot"
+export APP_DATA="$SNAP_USER_DATA/data"
+export APP_CACHE="$SNAP_USER_DATA/cache"
+export APP_PREFS="$SNAP_USER_DATA/prefs"
+
+java -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"
diff --git a/installer/snappy/snapcraft.yaml b/installer/snappy/snapcraft.yaml
index 67a9a132..fa74e779 100644
--- a/installer/snappy/snapcraft.yaml
+++ b/installer/snappy/snapcraft.yaml
@@ -29,28 +29,36 @@ parts:
     plugin: copy
     files:
       oracle-java: oracle-java
-  ubuntu:
-    plugin: copy
-    files:
-      /usr/share/locale: usr/share/locale
-      /usr/share/fonts: usr/share/fonts
+#  ubuntu:
+#    plugin: copy
+#    files:
+#      /usr/share/locale: usr/share/locale
+#      /usr/share/fonts: usr/share/fonts
   packages:
     plugin: nil
     stage-packages:
     - libgl1-mesa-dri
     - fontconfig
-#    - gtk2-engines-murrine
-#    - light-themes
-#    - libcanberra-gtk-module
-#    - jayatana
-#    - gvfs
-#    - dconf
-#    - proxy
+    - gtk2-engines-murrine
+    - light-themes
+    - libcanberra-gtk-module
+    - jayatana
+    - gvfs
+    - unity-gtk2-module
+    - overlay-scrollbar-gtk2
 #    - libmediainfo0v5
 #    - libchromaprint-tools
+#  locale:
+#    plugin: nil
+#    stage-packages:
+#    - language-pack-en-base
+#    - locales
+#    - glibc
+#    - libc-bin
   loaders:
     plugin: copy
     files:
       loaders.cache: usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
     stage-packages:
     - libgdk-pixbuf2.0-0
+    - librsvg2-common