diff --git a/oomox_gui/multi_export.py b/oomox_gui/multi_export.py
index 57ba1ac3..bf4435a6 100644
--- a/oomox_gui/multi_export.py
+++ b/oomox_gui/multi_export.py
@@ -174,8 +174,11 @@ def __init__(  # pylint: disable=too-many-locals
             config_name="multi_export",
             force_reload=True,
         )
-        for plugin_name, plugin_config in self.config.config.items():
-            self.add_export_target(plugin_name, plugin_config)
+        for _idx, data in self.config.config.items():
+            plugin_name = data.get("name")
+            plugin_config = data.get("config")
+            if plugin_name and plugin_config:
+                self.add_export_target(plugin_name, plugin_config)
 
     def _on_remove_export_target(self, export: ExportWrapper) -> None:
         self.added_plugins.remove(export)
@@ -212,7 +215,10 @@ def _on_add_export_target(self, action: Gio.SimpleAction, _param: "Any" = None)
 
     def _on_export_all(self, _button: Gtk.Button) -> None:
         self.config.config = {}
-        for export in self.added_plugins:
+        for idx, export in enumerate(self.added_plugins):
             export.export_dialog.do_export()
-            self.config.config[export.name] = export.export_dialog.export_config.config
+            self.config.config[str(idx)] = {
+                "name": export.name,
+                "config": export.export_dialog.export_config.config,
+            }
         self.config.save()
diff --git a/plugins/base16 b/plugins/base16
index 3532bfa5..ae45a42d 160000
--- a/plugins/base16
+++ b/plugins/base16
@@ -1 +1 @@
-Subproject commit 3532bfa5466a8009f1d5bcbd4a3bf8d6d1033243
+Subproject commit ae45a42d0b18a012e0605e1f961f07e08f520a8b