diff --git a/install4j/22.xx/openrocket-22.xx.install4j b/install4j/22.xx/openrocket-22.xx.install4j
index 8c7493d74..580a9f04e 100644
--- a/install4j/22.xx/openrocket-22.xx.install4j
+++ b/install4j/22.xx/openrocket-22.xx.install4j
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="9.0.6" transformSequenceNumber="9">
-  <directoryPresets config="install4j/22.xx" />
-  <application name="OpenRocket 22.xx" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.xx" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11.0" javaMaxVersion="11.0" jdkMode="jdk" jdkName="JDK 11.0">
-    <jreBundles jdkProviderId="AdoptOpenJDK" release="11/jdk-11.0.6+10" />
+  <directoryPresets config="../../core/resources-src/pix/icon" />
+  <application name="OpenRocket 22.02.beta.01" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.01" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11.0" javaMaxVersion="13.0" jdkMode="jdk" jdkName="JDK 11.0">
+    <jreBundles jdkProviderId="Liberica" release="11/11.0.14.1+1">
+      <modules>
+        <defaultModules set="jre" />
+        <module name="java.scripting" />
+      </modules>
+    </jreBundles>
   </application>
   <files preserveSymlinks="false">
     <mountPoints>
@@ -13,8 +18,10 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="OpenRocket 22.xx" id="59" icnsFile="OpenRocket.icns">
-      <executable name="OpenRocket" iconSet="true" executableDir="." executableMode="gui" />
+    <launcher name="OpenRocket 22.02.beta.01" id="59" icnsFile="OpenRocket.icns">
+      <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources-src/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
+        <versionInfo legalCopyright="Copyright 2007-2022 Sampo Niskanen and Others" />
+      </executable>
       <splashScreen show="true" bitmapFile="../../core/resources/pix/splashscreen.png" />
       <java mainClass="net.sf.openrocket.startup.OpenRocket">
         <classPath>
@@ -22,13 +29,101 @@
         </classPath>
       </java>
       <iconImageFiles>
+        <file path="../../core/resources-src/pix/icon/icon-016-4bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-016-8bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-016.png" />
+        <file path="../../core/resources-src/pix/icon/icon-032-4bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-032-8bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-032.png" />
         <file path="../../core/resources-src/pix/icon/icon-048.png" />
+        <file path="../../core/resources-src/pix/icon/icon-048-4bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-048-8bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-064-4bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-064-8bit.png" />
+        <file path="../../core/resources-src/pix/icon/icon-064.png" />
+        <file path="../../core/resources-src/pix/icon/icon-256-1.png" />
+        <file path="../../core/resources-src/pix/icon/icon-256.png" />
       </iconImageFiles>
     </launcher>
   </launchers>
   <installerGui>
     <applications>
-      <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication">
+      <application id="installer" beanClass="com.install4j.runtime.beans.applications.InstallerApplication" customIcnsFile="./OpenRocket.icns" customIcoFile="../../core/resources-src/pix/icon/icon-windows.ico">
+        <serializedBean>
+          <property name="customIconImageFiles">
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-016-4bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-016-8bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-016.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-032-4bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-032-8bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-032.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-048-4bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-048-8bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-048.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-064-4bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-064-8bit.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-064.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-256-1.png</string>
+              </object>
+            </add>
+            <add>
+              <object class="com.install4j.api.beans.ExternalFile">
+                <string>../../core/resources-src/pix/icon/icon-256.png</string>
+              </object>
+            </add>
+          </property>
+          <property name="useCustomIcon" type="boolean" value="true" />
+        </serializedBean>
         <startup>
           <screen id="1" beanClass="com.install4j.runtime.beans.screens.StartupScreen" rollbackBarrierExitCode="0">
             <actions>
@@ -132,15 +227,103 @@ return console.askOkCancel(message, true);
                   <propertyName>selectionChangedScript</propertyName>
                 </externalParametrizationPropertyNames>
               </formComponent>
+              <formComponent name="Add a desktop link" id="196" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
+                <serializedBean>
+                  <property name="checkboxText" type="string">${i18n:CreateDesktopIcon}</property>
+                  <property name="initiallySelected" type="boolean" value="true" />
+                  <property name="variableName" type="string">createDesktopLinkAction</property>
+                </serializedBean>
+              </formComponent>
+              <formComponent name="Add an executable to the dock" id="198" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
+                <serializedBean>
+                  <property name="checkboxText" type="string">${i18n:AddToDock}</property>
+                  <property name="initiallySelected" type="boolean" value="true" />
+                  <property name="variableName" type="string">addToDockAction</property>
+                </serializedBean>
+                <visibilityScript>Util.isMacOS()</visibilityScript>
+              </formComponent>
             </formComponents>
           </screen>
           <screen id="164" beanClass="com.install4j.runtime.beans.screens.FileAssociationsScreen" rollbackBarrierExitCode="0">
             <actions>
-              <action id="167" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+              <action id="202" beanClass="com.install4j.runtime.beans.actions.desktop.AddToDockAction" actionElevationType="none" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="description" type="string">OpenRocket Rocket Files</property>
+                  <property name="executable">
+                    <object class="java.io.File">
+                      <string>OpenRocket</string>
+                    </object>
+                  </property>
+                </serializedBean>
+                <condition>context.getBooleanVariable("addToDockAction")</condition>
+              </action>
+              <action id="205" beanClass="com.install4j.runtime.beans.actions.desktop.CreateStartMenuEntryAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+                <serializedBean>
+                  <property name="categories" type="string">Education;Science</property>
+                  <property name="entryName" type="string">OpenRocket</property>
+                  <property name="file">
+                    <object class="java.io.File">
+                      <string>OpenRocket</string>
+                    </object>
+                  </property>
+                  <property name="icon">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>../../core/resources-src/pix/icon/icon-windows.ico</string>
+                    </object>
+                  </property>
+                  <property name="unixIconFile">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>../../core/resources-src/pix/icon/icon-048.png</string>
+                    </object>
+                  </property>
+                </serializedBean>
+                <condition>!context.getBooleanVariable("sys.programGroupDisabled")</condition>
+              </action>
+              <action id="199" beanClass="com.install4j.runtime.beans.actions.desktop.CreateDesktopLinkAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+                <serializedBean>
+                  <property name="description" type="string">OpenRocket Model Rocket Simulator</property>
+                  <property name="file">
+                    <object class="java.io.File">
+                      <string>OpenRocket</string>
+                    </object>
+                  </property>
+                  <property name="macSingleBundleTarget" type="boolean" value="false" />
+                  <property name="name" type="string">${compiler:sys.fullName}</property>
+                  <property name="unixIconFile">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>../../core/resources-src/pix/icon/icon-064.png</string>
+                    </object>
+                  </property>
+                  <property name="winIconFile">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>../../core/resources-src/pix/icon/icon-windows.ico</string>
+                    </object>
+                  </property>
+                </serializedBean>
+                <condition>context.getBooleanVariable("createDesktopLinkAction")</condition>
+              </action>
+              <action id="206" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+                <serializedBean>
+                  <property name="description" type="string">OpenRocket Design</property>
                   <property name="extension" type="string">ork</property>
                   <property name="launcherId" type="string">59</property>
+                  <property name="macIconFile">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>./OpenRocket.icns</string>
+                    </object>
+                  </property>
+                  <property name="macRole" type="enum" class="com.install4j.runtime.beans.actions.desktop.MacAssociationRole" value="EDITOR" />
+                  <property name="unix" type="boolean" value="true" />
+                  <property name="unixIconFile">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>../../core/resources-src/pix/icon/icon-064.png</string>
+                    </object>
+                  </property>
+                  <property name="unixMimeType" type="string">application/x-openrocket</property>
+                  <property name="windowsIconFile">
+                    <object class="com.install4j.api.beans.ExternalFile">
+                      <string>../../core/resources-src/pix/icon/icon-windows.ico</string>
+                    </object>
+                  </property>
                 </serializedBean>
               </action>
             </actions>
@@ -153,12 +336,28 @@ return console.askOkCancel(message, true);
               <formComponent id="166" beanClass="com.install4j.runtime.beans.formcomponents.FileAssociationsComponent" useExternalParametrization="true" externalParametrizationName="File Associations" externalParametrizationMode="include">
                 <serializedBean>
                   <property name="fillVertical" type="boolean" value="true" />
+                  <property name="showSelectionButtons" type="boolean" value="true" />
                 </serializedBean>
                 <externalParametrizationPropertyNames>
-                  <propertyName>showSelectionButtons</propertyName>
                   <propertyName>selectionButtonPosition</propertyName>
+                  <propertyName>showSelectionButtons</propertyName>
                 </externalParametrizationPropertyNames>
               </formComponent>
+              <formComponent name="Add a desktop link" id="200" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
+                <serializedBean>
+                  <property name="checkboxText" type="string">${i18n:CreateDesktopIcon}</property>
+                  <property name="initiallySelected" type="boolean" value="true" />
+                  <property name="variableName" type="string">createDesktopLinkAction</property>
+                </serializedBean>
+              </formComponent>
+              <formComponent name="Add an executable to the dock" id="203" beanClass="com.install4j.runtime.beans.formcomponents.CheckboxComponent">
+                <serializedBean>
+                  <property name="checkboxText" type="string">${i18n:AddToDock}</property>
+                  <property name="initiallySelected" type="boolean" value="true" />
+                  <property name="variableName" type="string">addToDockAction</property>
+                </serializedBean>
+                <visibilityScript>Util.isMacOS()</visibilityScript>
+              </formComponent>
             </formComponents>
           </screen>
           <screen id="15" beanClass="com.install4j.runtime.beans.screens.InstallationScreen" rollbackBarrier="true" rollbackBarrierExitCode="0">
@@ -498,11 +697,14 @@ return console.askYesNo(message, true);
         </modules>
       </jreBundle>
     </windows>
-    <macos name="macOS Single Bundle" id="159" launcherId="59">
-      <jreBundle includedJre="macos-amd64-11.0.6" />
-    </macos>
-    <unixInstaller name="Unix Installer" id="168">
-      <jreBundle jdkProviderId="AdoptOpenJDK" release="11/jdk-11.0.14.1+1" usePack200="false" overrideJdkRelease="true" />
-    </unixInstaller>
+    <unixInstaller name="Unix Installer" id="168" />
+    <macosArchive name="macOS Single Bundle Archive" id="213" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" launcherId="59" />
+    <macosArchive name="macOS Single Bundle Archive (2)" id="214" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}-universal" architecture="universal" launcherId="59" />
+    <macos name="macOS Single Bundle" id="224" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}-installer" launcherId="59" />
   </mediaSets>
+  <buildIds buildAll="false">
+    <mediaSet refId="60" />
+    <mediaSet refId="168" />
+    <mediaSet refId="224" />
+  </buildIds>
 </install4j>