diff --git a/.gitignore b/.gitignore
index aed45034c..aae3fccce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@
 **/.idea/vcs.xml
 **/.idea/jsLibraryMappings.xml
 **/.idea/copilot
+**/.idea/shelf
 
 # Sensitive or high-churn files:
 **/.idea/dataSources.ids
diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml
deleted file mode 100644
index 2e910eef8..000000000
--- a/.idea/runConfigurations/All_tests.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="PARAMETERS" value="" />
-    <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
deleted file mode 100644
index 45da998b1..000000000
--- a/.idea/runConfigurations/Openrocket_UI_Jar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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="17" />
-    <method v="2">
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="openrocket:jar" />
-      </option>
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/SwingStartup.xml b/.idea/runConfigurations/SwingStartup.xml
new file mode 100644
index 000000000..73705a124
--- /dev/null
+++ b/.idea/runConfigurations/SwingStartup.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SwingStartup" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="info.openrocket.swing.startup.SwingStartup" />
+    <module name="info.openrocket.swing.main" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="info.openrocket.swing.startup.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/openrocket_jar.xml b/.idea/runConfigurations/openrocket_jar.xml
new file mode 100644
index 000000000..32fd63118
--- /dev/null
+++ b/.idea/runConfigurations/openrocket_jar.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="openrocket-jar" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+          <option value="check" />
+          <option value="build" />
+          <option value="dist" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/openrocket_test.xml b/.idea/runConfigurations/openrocket_test.xml
new file mode 100644
index 000000000..f7c291211
--- /dev/null
+++ b/.idea/runConfigurations/openrocket_test.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="openrocket-test" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+          <option value="check" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file