2 files changed, 7 insertions, 2 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index 5b04f3c..e6d4096 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -32,6 +32,7 @@ import com.google.common.collect.Lists;
 import net.fabricmc.mappingio.MappingReader;
 import net.fabricmc.mappingio.MappingWriter;
 import net.fabricmc.mappingio.tree.MemoryMappingTree;
+import net.fabricmc.mappingio.tree.VisitOrder;
 
 import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProfile;
@@ -232,7 +233,7 @@ public class GuiController implements ClientPacketHandler {
 
                                 progress.init(1, I18n.translate("progress.mappings.writing"));
                                 MappingWriter writer = MappingWriter.create(path, format.getMappingIoCounterpart());
-                                mappingTree.accept(writer);
+                                mappingTree.accept(writer, VisitOrder.createByName());
                                 writer.close();
                                 progress.step(1, I18n.translate("progress.done"));
                         } else if (saveAll) {
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 3692eb3..ca3067c 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -406,6 +406,7 @@ public class MenuBar {
         private static void prepareOpenMappingsMenu(JMenu openMappingsMenu, Gui gui) {
                 List<MappingFormat> readableMappingIoFormats = Arrays.asList(
                                 MappingFormat.ENIGMA_DIRECTORY,
+                                MappingFormat.ENIGMA_FILE,
                                 MappingFormat.TINY_FILE,
                                 MappingFormat.TINY_V2,
                                 MappingFormat.SRG_FILE,
@@ -448,7 +449,10 @@ public class MenuBar {
         private static void prepareSaveMappingsAsMenu(JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) {
                 List<MappingFormat> writableMappingIoFormats = Arrays.asList(
                                 MappingFormat.ENIGMA_DIRECTORY,
-                                MappingFormat.TINY_V2);
+                                MappingFormat.ENIGMA_FILE,
+                                MappingFormat.TINY_FILE,
+                                MappingFormat.TINY_V2,
+                                MappingFormat.PROGUARD);
 
                 // Enigma's own writers
                 for (MappingFormat format : MappingFormat.values()) {