diff --git a/.idea/artifacts/openrocket_jar.xml b/.idea/artifacts/openrocket_jar.xml
index a16c14544..75e659839 100644
--- a/.idea/artifacts/openrocket_jar.xml
+++ b/.idea/artifacts/openrocket_jar.xml
@@ -12,7 +12,7 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/miglayout-4.0-swing.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/iText-5.0.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/rsyntaxtextarea-2.5.6.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/rsyntaxtextarea-3.2.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.inject.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jfreechart-1.0.15.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/aopalliance.jar" path-in-jar="/" />
@@ -35,8 +35,8 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guava-26.0-jre.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/opencsv-4.3.2.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/slf4j-api-1.7.30.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-classic-1.2.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-core-1.2.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-classic-1.2.11.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-core-1.2.11.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-runtime.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-tools.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.activation-api-2.3.1.jar" path-in-jar="/" />
@@ -45,7 +45,6 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-api.2.3.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-runtime.2.3.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/script-api-1.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/yasson-1.0.2.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
diff --git a/core/.classpath b/core/.classpath
index 9862a59dd..acc55d845 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -16,19 +16,19 @@
 	<classpathentry kind="lib" path="resources"/>
 	<classpathentry kind="lib" path="lib/javax.inject.jar"/>
 	<classpathentry kind="lib" path="lib/aopalliance.jar"/>
-	<classpathentry kind="lib" path="lib/commonmark-0.18.1.jar"/>
+	<classpathentry kind="lib" path="lib/commonmark-0.19.0.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
 	<classpathentry kind="lib" path="lib/annotation-detector-3.0.5.jar"/>
 	<classpathentry kind="lib" path="lib/guice-4.2.3-no_aop.jar"/>
-	<classpathentry kind="lib" path="lib/logback-classic-1.2.3.jar"/>
-	<classpathentry kind="lib" path="lib/logback-core-1.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/logback-classic-1.2.11.jar"/>
+	<classpathentry kind="lib" path="lib/logback-core-1.2.11.jar"/>
 	<classpathentry kind="lib" path="lib/opencsv-4.3.2.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.9.0.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.9.0.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.12.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.12.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.13.2.jar"/>
 	<classpathentry kind="lib" path="lib/jaxb-api.2.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/jaxb-runtime.2.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/guava-26.0-jre.jar"/>
diff --git a/core/OpenRocket Core.iml b/core/OpenRocket Core.iml
index 85932bd22..8a5fd8008 100644
--- a/core/OpenRocket Core.iml	
+++ b/core/OpenRocket Core.iml	
@@ -10,11 +10,11 @@
     <libelement value="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
     <libelement value="jar://$MODULE_DIR$/lib/slf4j-api-1.7.5.jar!/" />
     <libelement value="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
     <libelement value="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
     <libelement value="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
     <src_description expected_position="0">
@@ -38,7 +38,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -47,7 +47,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -56,7 +56,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -65,16 +65,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -89,10 +80,10 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -218,7 +209,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.11.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -227,7 +218,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/logback-core-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/logback-core-1.2.11.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -262,9 +253,18 @@
     </orderEntry>
     <orderEntry type="module-library">
       <library name="commonmark" type="repository">
-        <properties maven-id="org.commonmark:commonmark:0.18.1" />
+        <properties maven-id="org.commonmark:commonmark:0.19.0" />
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/commonmark-0.18.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/commonmark-0.19.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/core/build.xml b/core/build.xml
index cab35e15b..c10acd2d6 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -53,6 +53,8 @@
 	
 	<!-- BUILD -->
 	<target name="build">
+		<echo>Java/JVM version: ${ant.java.version}</echo>
+		<echo>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"/>
@@ -87,10 +89,14 @@
 	<!--  Unit tests  -->
 	<target name="unittest" description="Execute unit tests" depends="build">
 		<echo>Building unit tests</echo>
+		<echo>Java/JVM version: ${ant.java.version}</echo>
+		<echo>Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${build-test.dir}"/>
 		<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath" includeantruntime="false"/>
 		
 		<echo>Running unit tests</echo>
+		<echo>Java/JVM version: ${ant.java.version}</echo>
+		<echo>Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${tmp.dir}/rawtestoutput"/>
 		<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure" dir="${basedir}">
 			<classpath>
diff --git a/core/lib/commonmark-0.18.1.jar b/core/lib/commonmark-0.19.0.jar
similarity index 60%
rename from core/lib/commonmark-0.18.1.jar
rename to core/lib/commonmark-0.19.0.jar
index d4e3b2cb8..7f251a7f7 100644
Binary files a/core/lib/commonmark-0.18.1.jar and b/core/lib/commonmark-0.19.0.jar differ
diff --git a/core/lib/logback-classic-1.2.11.jar b/core/lib/logback-classic-1.2.11.jar
new file mode 100644
index 000000000..b70c0e6ae
Binary files /dev/null and b/core/lib/logback-classic-1.2.11.jar differ
diff --git a/core/lib/logback-classic-1.2.3.jar b/core/lib/logback-classic-1.2.3.jar
deleted file mode 100644
index bed00c0a5..000000000
Binary files a/core/lib/logback-classic-1.2.3.jar and /dev/null differ
diff --git a/core/lib/logback-core-1.2.11.jar b/core/lib/logback-core-1.2.11.jar
new file mode 100644
index 000000000..e3038da22
Binary files /dev/null and b/core/lib/logback-core-1.2.11.jar differ
diff --git a/core/lib/logback-core-1.2.3.jar b/core/lib/logback-core-1.2.3.jar
deleted file mode 100644
index 487b3956a..000000000
Binary files a/core/lib/logback-core-1.2.3.jar and /dev/null differ
diff --git a/core/lib/yasson-1.0.2.jar b/core/lib/yasson-1.0.2.jar
deleted file mode 100644
index ed935f3aa..000000000
Binary files a/core/lib/yasson-1.0.2.jar and /dev/null differ
diff --git a/lib-test/.classpath b/lib-test/.classpath
index 0572d13e5..687bdbd79 100644
--- a/lib-test/.classpath
+++ b/lib-test/.classpath
@@ -6,10 +6,10 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="test-plugin.jar"/>
-	<classpathentry kind="lib" path="hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="hamcrest-library-1.3.jar"/>
-	<classpathentry kind="lib" path="jmock-2.9.0.jar"/>
-	<classpathentry kind="lib" path="jmock-junit4-2.9.0.jar"/>
-	<classpathentry kind="lib" path="junit-4.12.jar"/>
+	<classpathentry kind="lib" path="hamcrest-core-2.2.jar"/>
+	<classpathentry kind="lib" path="hamcrest-2.2.jar"/>
+	<classpathentry kind="lib" path="jmock-2.12.0.jar"/>
+	<classpathentry kind="lib" path="jmock-junit4-2.12.0.jar"/>
+	<classpathentry kind="lib" path="junit-4.13.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib-test/OpenRocket Test Libraries.iml b/lib-test/OpenRocket Test Libraries.iml
index 59af4bbc8..413cbe161 100644
--- a/lib-test/OpenRocket Test Libraries.iml	
+++ b/lib-test/OpenRocket Test Libraries.iml	
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/hamcrest-core-1.3.0RC1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/hamcrest-library-1.3.0RC1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/jmock-2.6.0-RC2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/jmock-junit4-2.6.0-RC2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/junit-dep-4.8.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/hamcrest-core-2.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/hamcrest-2.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/jmock-2.12.0.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/jmock-junit4-2.12.0.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/junit-4.13.2.jar!/" />
     <libelement value="jar://$MODULE_DIR$/test-plugin.jar!/" />
     <libelement value="jar://$MODULE_DIR$/uispec4j-2.3-jdk16.jar!/" />
     <src_description expected_position="0" />
@@ -19,7 +19,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/hamcrest-core-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -28,7 +28,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/hamcrest-library-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/hamcrest-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -37,7 +37,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/jmock-2.9.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/jmock-2.12.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -46,7 +46,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/jmock-junit4-2.9.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/jmock-junit4-2.12.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -55,7 +55,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/junit-4.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/junit-jupiter-api-5.8.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/lib-test/hamcrest-2.2.jar b/lib-test/hamcrest-2.2.jar
new file mode 100644
index 000000000..71065788d
Binary files /dev/null and b/lib-test/hamcrest-2.2.jar differ
diff --git a/lib-test/hamcrest-core-1.3.jar b/lib-test/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16e3..000000000
Binary files a/lib-test/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib-test/hamcrest-core-2.2.jar b/lib-test/hamcrest-core-2.2.jar
new file mode 100644
index 000000000..3068f1dd8
Binary files /dev/null and b/lib-test/hamcrest-core-2.2.jar differ
diff --git a/lib-test/hamcrest-library-1.3.jar b/lib-test/hamcrest-library-1.3.jar
deleted file mode 100644
index 9eac80d7b..000000000
Binary files a/lib-test/hamcrest-library-1.3.jar and /dev/null differ
diff --git a/lib-test/jmock-2.12.0.jar b/lib-test/jmock-2.12.0.jar
new file mode 100644
index 000000000..3e0192e03
Binary files /dev/null and b/lib-test/jmock-2.12.0.jar differ
diff --git a/lib-test/jmock-2.9.0.jar b/lib-test/jmock-2.9.0.jar
deleted file mode 100644
index e01f0d713..000000000
Binary files a/lib-test/jmock-2.9.0.jar and /dev/null differ
diff --git a/lib-test/jmock-junit4-2.12.0.jar b/lib-test/jmock-junit4-2.12.0.jar
new file mode 100644
index 000000000..c69cd2a3a
Binary files /dev/null and b/lib-test/jmock-junit4-2.12.0.jar differ
diff --git a/lib-test/jmock-junit4-2.9.0.jar b/lib-test/jmock-junit4-2.9.0.jar
deleted file mode 100644
index f0ebf280e..000000000
Binary files a/lib-test/jmock-junit4-2.9.0.jar and /dev/null differ
diff --git a/lib-test/junit-4.12.jar b/lib-test/junit-4.12.jar
deleted file mode 100644
index 3a7fc266c..000000000
Binary files a/lib-test/junit-4.12.jar and /dev/null differ
diff --git a/lib-test/junit-4.13.2.jar b/lib-test/junit-4.13.2.jar
new file mode 100644
index 000000000..6da55d8b8
Binary files /dev/null and b/lib-test/junit-4.13.2.jar differ
diff --git a/swing/.classpath b/swing/.classpath
index a7ca47f8a..0a33deaf2 100644
--- a/swing/.classpath
+++ b/swing/.classpath
@@ -15,23 +15,23 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenRocket Core"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/slf4j-api-1.7.30.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/aopalliance.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Core/lib/commonmark-0.18.1.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Core/lib/commonmark-0.19.0.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/javax.inject.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/resources"/>
 	<classpathentry kind="lib" path="resources"/>
 	<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar" sourcepath="reference/miglayout-4.0-sources.jar"/>
-	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.2.0.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.5.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/guice-4.2.3-no_aop.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.3.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.3.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.11.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.11.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/opencsv-4.3.2.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.9.0.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.9.0.jar"/>
-	<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.12.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.12.0.jar"/>
+	<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-4.13.2.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-api.2.3.1.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/jaxb-runtime.2.3.1.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Core/lib/guava-26.0-jre.jar"/>
diff --git a/swing/OpenRocket Swing.iml b/swing/OpenRocket Swing.iml
index de173f02a..a4dcbfdb1 100644
--- a/swing/OpenRocket Swing.iml	
+++ b/swing/OpenRocket Swing.iml	
@@ -19,7 +19,7 @@
     <libelement value="file://$MODULE_DIR$/resources" />
     <libelement value="jar://$MODULE_DIR$/../core/lib/annotation-detector-3.0.2.jar!/" />
     <libelement value="jar://$MODULE_DIR$/lib/miglayout-4.0-swing.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea-2.5.6.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea-3.2.0.jar!/" />
     <src_description expected_position="0">
       <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
     </src_description>
@@ -38,7 +38,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -47,7 +47,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -56,7 +56,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -65,16 +65,7 @@
     <orderEntry type="module-library" scope="TEST">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.12.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -89,10 +80,10 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="iText-5.0.2.jar">
+    <orderEntry type="module-library" scope="TEST">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/iText-5.0.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib-test/junit-4.13.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -164,9 +155,9 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="rsyntaxtextarea-2.5.6.jar">
+      <library name="rsyntaxtextarea-3.2.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea-2.5.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea-3.2.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -184,7 +175,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../core/lib/logback-classic-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../core/lib/logback-classic-1.2.11.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -193,7 +184,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../core/lib/logback-core-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../core/lib/logback-core-1.2.11.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -245,5 +236,14 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="iText-5.0.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/iText-5.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/swing/build.xml b/swing/build.xml
index 18fd76bc3..dada6c98c 100644
--- a/swing/build.xml
+++ b/swing/build.xml
@@ -70,6 +70,8 @@
 	
 	<!-- BUILD -->
 	<target name="build">
+		<echo>Java/JVM version: ${ant.java.version}</echo>
+		<echo>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"/>
@@ -96,7 +98,7 @@
 			<zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" />
 			<zipfileset src="${core.dir}/lib/guice-4.2.3-no_aop.jar" />
 			<zipfileset src="${core.dir}/lib/aopalliance.jar"/>
-			<zipfileset src="${core.dir}/lib/commonmark-0.18.1.jar"/>
+			<zipfileset src="${core.dir}/lib/commonmark-0.19.0.jar"/>
 			<zipfileset src="${core.dir}/lib/script-api-1.0.jar"/>
 			<zipfileset src="${lib.dir}/iText-5.0.2.jar"/>
 			<zipfileset src="${core.dir}/lib/istack-commons-runtime.jar"/>
@@ -112,9 +114,9 @@
 			<zipfileset src="${core.dir}/lib/opencsv-4.3.2.jar"/>
 			<zipfileset src="${core.dir}/lib/annotation-detector-3.0.5.jar"/>
 			<zipfileset src="${core.dir}/lib/slf4j-api-1.7.30.jar"/>
-			<zipfileset src="${core.dir}/lib/logback-classic-1.2.3.jar"/>
-			<zipfileset src="${core.dir}/lib/logback-core-1.2.3.jar"/>
-			<zipfileset src="${lib.dir}/rsyntaxtextarea-2.5.6.jar"/>
+			<zipfileset src="${core.dir}/lib/logback-classic-1.2.11.jar"/>
+			<zipfileset src="${core.dir}/lib/logback-core-1.2.11.jar"/>
+			<zipfileset src="${lib.dir}/rsyntaxtextarea-3.2.0.jar"/>
 
 			<!-- JOGL libraries need to be jar-in-jar -->
 			<zipfileset dir="${lib.dir}/jogl" prefix="lib">
@@ -311,10 +313,14 @@ ${nonascii}</fail>
 	<!--  Unit tests  -->
 	<target name="unittest" description="Execute unit tests" depends="build">
 		<echo>Building unit tests</echo>
+		<echo>Java/JVM version: ${ant.java.version}</echo>
+		<echo>Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${build-test.dir}"/>
 		<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/>
 		
 		<echo>Running unit tests</echo>
+		<echo>Java/JVM version: ${ant.java.version}</echo>
+		<echo>Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${tmp.dir}/rawtestoutput"/>
 		<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
 			<classpath>
diff --git a/swing/lib/rsyntaxtextarea-2.5.6.jar b/swing/lib/rsyntaxtextarea-2.5.6.jar
deleted file mode 100644
index b60def66e..000000000
Binary files a/swing/lib/rsyntaxtextarea-2.5.6.jar and /dev/null differ
diff --git a/swing/lib/rsyntaxtextarea-3.2.0.jar b/swing/lib/rsyntaxtextarea-3.2.0.jar
new file mode 100644
index 000000000..fce14e0e3
Binary files /dev/null and b/swing/lib/rsyntaxtextarea-3.2.0.jar differ
diff --git a/swing/resources-src/datafiles/components b/swing/resources-src/datafiles/components
index 860757167..52e1e2c08 160000
--- a/swing/resources-src/datafiles/components
+++ b/swing/resources-src/datafiles/components
@@ -1 +1 @@
-Subproject commit 860757167c4835a7bb960a4cbb52b06f3309791c
+Subproject commit 52e1e2c0800ebf62fd0e9cecd69aaaed6cddf80e
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
index 022b61a73..cebbdf4cf 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -71,7 +71,6 @@ public class AboutDialog extends JDialog {
 		"Simple Logging Facade for Java" + href("http://www.slf4j.org", true, true) + "<br>" +
 		"Java library for parsing and rendering CommonMark" + href("https://github.com/commonmark/commonmark-java", true, true) + "<br>" +
 		"RSyntaxTextArea" + href("http://bobbylight.github.io/RSyntaxTextArea", true, true) + "<br>" +
-		"yasson" + href("https://eclipse-ee4j.github.io/yasson", true, true) + "<br>" +
 		"<br>" +
 		"<b>OpenRocket gratefully acknowledges our use of the following databases:</b><br>" +
 		"<br>" +