diff --git a/build.gradle b/build.gradle
index a247e5c18..f94acf1c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,9 +126,11 @@ project.ext {
             // Disable this for now as it requires Windows 10+
             // '-XX:+UseZGC',
             "-Dvisualvm.display.name=XPipe",
-            "-Dapple.awt.application.appearance=system",
             "-Djavafx.preloader=io.xpipe.app.core.AppPreloader"
     ]
+    if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
+        jvmRunArgs += ["-Dapple.awt.application.appearance=system"]
+    }
     useBundledJavaFx = fullVersion
     useBundledJna = fullVersion
     announce = System.getenv('SKIP_ANNOUNCEMENT') == null || !Boolean.parseBoolean(System.getenv('SKIP_ANNOUNCEMENT'))
diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle
index 255405378..b4dd6a47e 100644
--- a/dist/jpackage.gradle
+++ b/dist/jpackage.gradle
@@ -53,9 +53,14 @@ jlink {
             // '--strip-debug',
             '--no-header-files',
             '--no-man-pages',
-            // '--strip-native-commands'
+            '--include-locales', "${String.join(",", languages)}",
+            '--compress', 'zip-9'
     ]
 
+    if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
+        options += ['--strip-native-debug-symbols']
+    }
+
     if (useBundledJavaFx) {
         addExtraModulePath(layout.projectDirectory.dir("javafx/${platformName}/${arch}").toString())
     }