diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index 074474996..eac622bea 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -844,8 +844,6 @@ public class Sketch {
 
     // https://github.com/processing/processing4/issues/77
     boolean useNative = Preferences.getBoolean("chooser.files.native");
-    useNative = useNative && !Platform.isMacOS();
-
     if (useNative) {
       // get new name for folder
       FileDialog fd = new FileDialog(editor, PROMPT, FileDialog.SAVE);
diff --git a/app/src/processing/app/platform/DefaultPlatform.java b/app/src/processing/app/platform/DefaultPlatform.java
index 5be904d83..26711cddd 100644
--- a/app/src/processing/app/platform/DefaultPlatform.java
+++ b/app/src/processing/app/platform/DefaultPlatform.java
@@ -81,7 +81,7 @@ public class DefaultPlatform {
     String laf = Preferences.get("editor.laf");
     if (laf == null || laf.length() == 0) {  // normal situation
       boolean isMac = System.getProperty("os.name", "").startsWith("Mac OS");
-      if (isMac) {
+      if (isMac && Preferences.getBoolean("editor.allow_vaqua")) {
         UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
 
         Icon collapse = new MacTreeIcon(true);
diff --git a/build/build.xml b/build/build.xml
index 4a301de86..8bcba3d19 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -723,7 +723,7 @@
       <classpath file="../app/lib/jna-platform.jar" />
       <classpath file="../app/lib/ant.jar" />
       <classpath file="../app/lib/ant-launcher.jar" />
-      <classpath file="../app/lib/vaqua7.jar" />
+      <classpath file="../app/lib/VAqua7.jar" />
 
       <!-- plus core.jar... note that this is no longer shared -->
       <classpath file="../core/library/core.jar" />
diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt
index 843f706ef..0de02205d 100644
--- a/build/shared/lib/defaults.txt
+++ b/build/shared/lib/defaults.txt
@@ -74,6 +74,7 @@ recent.count = 10
 
 # Default to the native (AWT) file selector where possible
 chooser.files.native = true
+chooser.files.native.macosx = false # except on mac where it's broken
 
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -167,6 +168,9 @@ editor.watcher.debug = false
 # The window of time (in milliseconds) in which a change won't be counted
 editor.watcher.window = 1500
 
+# allow vaqua on mac
+editor.allow_vaqua = true
+
 # Format and search engine to use for online queries
 search.format = https://google.com/search?q=%s