diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7d4afc44..9b27f3adf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Ant build
         run: ant -noinput -buildfile build.xml clean check jar unittest
diff --git a/.idea/ant.xml b/.idea/ant.xml
index a2a476982..7586e0172 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/build.xml">
+      <customJdkName value="17" />
+    </buildFile>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cb1ab9355..1c55f8bdd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml
index 26cc40265..2e910eef8 100644
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.idea/runConfigurations/All_tests.xml
@@ -1,25 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method>
-      <option name="Make" enabled="false" />
-    </method>
+    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+    <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Openrocket_UI_Jar.xml b/.idea/runConfigurations/Openrocket_UI_Jar.xml
index 2219ccf09..45da998b1 100644
--- a/.idea/runConfigurations/Openrocket_UI_Jar.xml
+++ b/.idea/runConfigurations/Openrocket_UI_Jar.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Openrocket UI Jar" type="JarApplication">
     <option name="JAR_PATH" value="$PROJECT_DIR$/build/jar/OpenRocket.jar" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
         <artifact name="openrocket:jar" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..0fa52f5fc
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AnalysisUIOptions">
+    <option name="ANALYZE_INJECTED_CODE" value="false" />
+  </component>
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="openrocket:jar" />
+    </artifacts-to-build>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/core/resources/l10n/messages.properties" root0="SKIP_INSPECTION" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="RunManager" selected="Application.SwingStartup">
+    <configuration name="jar" type="AntRunConfiguration">
+      <antsettings antfile="file://$PROJECT_DIR$/build.xml" target="jar">
+        <property name="source" value="17" />
+        <property name="target" value="17" />
+      </antsettings>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="SwingStartup" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="ALTERNATIVE_JRE_PATH" value="17" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+      <option name="MAIN_CLASS_NAME" value="net.sf.openrocket.startup.SwingStartup" />
+      <module name="OpenRocket Swing" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="net.sf.openrocket.startup.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <list>
+      <item itemvalue="Ant Target.jar" />
+      <item itemvalue="Application.SwingStartup" />
+      <item itemvalue="JAR Application.Openrocket UI Jar" />
+      <item itemvalue="JUnit.All tests" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.SwingStartup" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+    <changelist id="2ecf826f-1227-4870-b9d4-17215cf24a1b" name="Changes" comment="Fix transition config layout" />
+    <created>1625095153807</created>
+    <option name="number" value="Default" />
+    <option name="presentableId" value="Default" />
+    <updated>1625095153807</updated>
+  </component>
+</project>
\ No newline at end of file
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 595f63187..d42f20b2f 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -13,6 +13,15 @@ Release Notes
 
 </div>
 
+<div id="23.xx">
+
+OpenRocket 23.xx
+------------------------
+
+Here, the release notes for the next release will be documented.
+
+</div>
+
 <div id="22.02">
 
 OpenRocket 22.02 (2023-02-08)
diff --git a/core/build.xml b/core/build.xml
index ffa0250b8..0b2306bed 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -59,7 +59,7 @@
 		<echo level="info">Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${classes.dir}"/>
 		<echo level="info">Compiling main classes</echo>
-		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.8" target="1.8"/>
+		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="17" target="17"/>
 	</target>
 	
 	<!-- Executable Eclipse-Jar-In-Jar style JAR -->
diff --git a/core/resources/build.properties b/core/resources/build.properties
index d2cc23036..121feabaa 100644
--- a/core/resources/build.properties
+++ b/core/resources/build.properties
@@ -1,6 +1,6 @@
 
 # The OpenRocket build version
-build.version=22.02
+build.version=23.xx
 
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java
index 0c582cd0d..d7ef82824 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java
@@ -60,6 +60,14 @@ public class StageSeparationConfiguration implements FlightConfigurableParameter
 				return (mount == ignition);
 			}
 		},
+		//// Launch
+		LAUNCH(trans.get("Stage.SeparationEvent.LAUNCH")) {
+			@Override
+			public boolean isSeparationEvent(FlightEvent e, AxialStage stage) {
+				return e.getType() == FlightEvent.Type.LAUNCH;
+			}
+		},
+		//// Never
 		NEVER(trans.get("Stage.SeparationEvent.NEVER")) {
 			@Override
 			public boolean isSeparationEvent(FlightEvent e, AxialStage stage) {
diff --git a/install4j/22.02/.gitignore b/install4j/23.xx/.gitignore
similarity index 86%
rename from install4j/22.02/.gitignore
rename to install4j/23.xx/.gitignore
index e5a57839b..60eadae4b 100644
--- a/install4j/22.02/.gitignore
+++ b/install4j/23.xx/.gitignore
@@ -20,4 +20,3 @@ media/
 .DS_Store
 
 code_signing/
-openrocket-22.xx.install4j~
diff --git a/install4j/22.02/macOS_resources/DS_Store b/install4j/23.xx/macOS_resources/DS_Store
similarity index 100%
rename from install4j/22.02/macOS_resources/DS_Store
rename to install4j/23.xx/macOS_resources/DS_Store
diff --git a/install4j/22.02/macOS_resources/macOS_installer_background.png b/install4j/23.xx/macOS_resources/macOS_installer_background.png
similarity index 100%
rename from install4j/22.02/macOS_resources/macOS_installer_background.png
rename to install4j/23.xx/macOS_resources/macOS_installer_background.png
diff --git a/install4j/22.02/macOS_resources/macOS_installer_background.psd b/install4j/23.xx/macOS_resources/macOS_installer_background.psd
similarity index 100%
rename from install4j/22.02/macOS_resources/macOS_installer_background.psd
rename to install4j/23.xx/macOS_resources/macOS_installer_background.psd
diff --git a/install4j/22.02/openrocket-22.02.install4j b/install4j/23.xx/openrocket-23.xx.install4j
similarity index 99%
rename from install4j/22.02/openrocket-22.02.install4j
rename to install4j/23.xx/openrocket-23.xx.install4j
index f3b51e829..10a55f19a 100644
--- a/install4j/22.02/openrocket-22.02.install4j
+++ b/install4j/23.xx/openrocket-23.xx.install4j
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources/pix/icon" />
-  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="23.xx" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 11.0">
     <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
-    <jreBundles jdkProviderId="Liberica" release="11/11.0.17+7">
+    <jreBundles jdkProviderId="Liberica" release="17/17.0.7+7">
       <modules>
         <defaultModules set="jre" />
         <module name="java.scripting" />
@@ -19,7 +19,7 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="OpenRocket 22.02" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
+    <launcher name="OpenRocket 23.xx" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
       <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
         <versionInfo include="true" fileDescription="A model rocket flight-trajectory simulator." legalCopyright="Copyright 2007-2023 Sampo Niskanen and Others" internalName="${compiler:sys.shortName} ${compiler:sys.version}" />
       </executable>
diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-aarch64.jar b/swing/lib/jogl/gluegen-rt-natives-linux-aarch64.jar
index 82671c461..7ae0b699d 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-aarch64.jar and b/swing/lib/jogl/gluegen-rt-natives-linux-aarch64.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar
index 4a44e284c..599866fee 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar and b/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar b/swing/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar
index debf9f887..fefb8515e 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar and b/swing/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar b/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar
deleted file mode 100644
index 0e71f1359..000000000
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar and /dev/null differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index 33e73ee5b..ca3fcae95 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar and b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar
index ce89c6f00..0101c6ca9 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar and b/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar b/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar
deleted file mode 100644
index 287412be1..000000000
Binary files a/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar and /dev/null differ
diff --git a/swing/lib/jogl/gluegen-rt.jar b/swing/lib/jogl/gluegen-rt.jar
index d92fbcc59..49c0099c6 100644
Binary files a/swing/lib/jogl/gluegen-rt.jar and b/swing/lib/jogl/gluegen-rt.jar differ
diff --git a/swing/lib/jogl/gluegen.jar b/swing/lib/jogl/gluegen.jar
index b4b743045..54baa8538 100644
Binary files a/swing/lib/jogl/gluegen.jar and b/swing/lib/jogl/gluegen.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-linux-aarch64.jar b/swing/lib/jogl/jogl-all-natives-linux-aarch64.jar
index a0deef3ad..d5f3adf96 100644
Binary files a/swing/lib/jogl/jogl-all-natives-linux-aarch64.jar and b/swing/lib/jogl/jogl-all-natives-linux-aarch64.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-linux-amd64.jar b/swing/lib/jogl/jogl-all-natives-linux-amd64.jar
index 388bcb0a4..e79f8eb07 100644
Binary files a/swing/lib/jogl/jogl-all-natives-linux-amd64.jar and b/swing/lib/jogl/jogl-all-natives-linux-amd64.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-linux-armv6hf.jar b/swing/lib/jogl/jogl-all-natives-linux-armv6hf.jar
index db9c07c8d..8333debef 100644
Binary files a/swing/lib/jogl/jogl-all-natives-linux-armv6hf.jar and b/swing/lib/jogl/jogl-all-natives-linux-armv6hf.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-linux-i586.jar b/swing/lib/jogl/jogl-all-natives-linux-i586.jar
deleted file mode 100644
index cde6472d9..000000000
Binary files a/swing/lib/jogl/jogl-all-natives-linux-i586.jar and /dev/null differ
diff --git a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar
index 1798a558e..b111e2df7 100644
Binary files a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar and b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-windows-amd64.jar b/swing/lib/jogl/jogl-all-natives-windows-amd64.jar
index 82c8f3ed0..e05aecfd0 100644
Binary files a/swing/lib/jogl/jogl-all-natives-windows-amd64.jar and b/swing/lib/jogl/jogl-all-natives-windows-amd64.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-windows-i586.jar b/swing/lib/jogl/jogl-all-natives-windows-i586.jar
deleted file mode 100644
index e500fe9c8..000000000
Binary files a/swing/lib/jogl/jogl-all-natives-windows-i586.jar and /dev/null differ
diff --git a/swing/lib/jogl/jogl-all.jar b/swing/lib/jogl/jogl-all.jar
index 0aba718c0..8011e7f08 100644
Binary files a/swing/lib/jogl/jogl-all.jar and b/swing/lib/jogl/jogl-all.jar differ
diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index a5530fc0d..d114b64f8 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -1259,7 +1259,11 @@ public class BasicFrame extends JFrame {
 	 */
 	public static BasicFrame open(File file, Window parent) {
 		OpenFileWorker worker = new OpenFileWorker(file);
-		return open(worker, file.getName(), parent, false);
+		BasicFrame frame = open(worker, file.getName(), parent, false);
+		if (frame != null) {
+			MRUDesignFile.getInstance().addFile(file.getAbsolutePath());
+		}
+		return frame;
 	}
 
 
diff --git a/swing/src/net/sf/openrocket/startup/OSXSetup.java b/swing/src/net/sf/openrocket/startup/OSXSetup.java
index 5c62a2bd5..d2c14140e 100644
--- a/swing/src/net/sf/openrocket/startup/OSXSetup.java
+++ b/swing/src/net/sf/openrocket/startup/OSXSetup.java
@@ -6,8 +6,10 @@ import java.awt.desktop.OpenFilesHandler;
 import java.awt.desktop.PreferencesHandler;
 import java.awt.desktop.QuitHandler;
 import java.awt.desktop.AppReopenedListener;
+import java.io.File;
 
 import net.sf.openrocket.communication.UpdateInfoRetriever;
+import net.sf.openrocket.gui.main.MRUDesignFile;
 import net.sf.openrocket.gui.util.DummyFrameMenuOSX;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,8 +42,9 @@ final class OSXSetup {
 	 * The handler for file associations
 	 */
 	public static final OpenFilesHandler OPEN_FILE_HANDLER = (e) -> {
-		log.info("Opening file from association: " + e.getFiles().get(0));
-		BasicFrame.open(e.getFiles().get(0), BasicFrame.lastFrameInstance);
+		File associateFile = e.getFiles().get(0);
+		log.info("Opening file from association: " + associateFile);
+		BasicFrame.open(associateFile, BasicFrame.lastFrameInstance);
 	};
 	
 	/**