diff --git a/.travis.yml b/.travis.yml
index 07cb80df8..629d04df6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,14 @@ addons:
       - ant-optional
 jdk:
   - openjdk8
+  - openjdk13
 script:
  - "ant -buildfile build.xml clean check jar unittest"
 
 after_success:
   - ls -lh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket.jar
-  - ls -lh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket-Core.jar
   - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
   - bash upload.sh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket.jar
-  - bash upload.sh /home/travis/build/openrocket/openrocket/swing/build/jar/OpenRocket-Core.jar
 
 branches:
   except:
diff --git a/core/OpenRocket Core.iml b/core/OpenRocket Core.iml
index 046a03158..f0cdceef9 100644
--- a/core/OpenRocket Core.iml	
+++ b/core/OpenRocket Core.iml	
@@ -34,6 +34,25 @@
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="OpenRocket Test Libraries" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="aopalliance.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library name="RXTXcomm.jar">
         <CLASSES>
@@ -53,45 +72,9 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="opencsv-2.3.jar">
+      <library name="guice-4.2.1.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/opencsv-2.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="guice-3.0.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/guice-3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="guice-multibindings-3.0.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/guice-multibindings-3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="javax.inject.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/javax.inject.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="aopalliance.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/guice-4.2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -106,73 +89,39 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="lib-test" level="project" />
+    <orderEntry type="library" name="javax" level="project" />
     <orderEntry type="module-library">
-      <library name="annotation-detector-3.0.2.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/opencsv-4.3.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="hamcrest-core-1.3.0RC1.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/guava-26.0-jre.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="hamcrest-library-1.3.0RC1.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/logback-classic-1.2.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jmock-2.6.0-RC2.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="jmock-junit4-2.6.0-RC2.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="junit-dep-4.8.2.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="test-plugin.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="uispec4j-2.3-jdk16.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/logback-core-1.2.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/core/lib/annotation-detector-3.0.2.jar b/core/lib/annotation-detector-3.0.2.jar
deleted file mode 100644
index bcf3a6212..000000000
Binary files a/core/lib/annotation-detector-3.0.2.jar and /dev/null differ
diff --git a/core/lib/annotation-detector-3.0.5.jar b/core/lib/annotation-detector-3.0.5.jar
new file mode 100644
index 000000000..e335f5892
Binary files /dev/null and b/core/lib/annotation-detector-3.0.5.jar differ
diff --git a/core/lib/guava-26.0-jre.jar b/core/lib/guava-26.0-jre.jar
new file mode 100644
index 000000000..cd71a92f8
Binary files /dev/null and b/core/lib/guava-26.0-jre.jar differ
diff --git a/core/lib/guice-3.0.jar b/core/lib/guice-3.0.jar
deleted file mode 100644
index 76be5e0dd..000000000
Binary files a/core/lib/guice-3.0.jar and /dev/null differ
diff --git a/core/lib/guice-4.2.1.jar b/core/lib/guice-4.2.1.jar
new file mode 100644
index 000000000..91ed389ab
Binary files /dev/null and b/core/lib/guice-4.2.1.jar differ
diff --git a/core/lib/guice-multibindings-3.0.jar b/core/lib/guice-multibindings-3.0.jar
deleted file mode 100644
index f2ec19a2a..000000000
Binary files a/core/lib/guice-multibindings-3.0.jar and /dev/null differ
diff --git a/core/lib/istack-commons-runtime.jar b/core/lib/istack-commons-runtime.jar
new file mode 100644
index 000000000..2fe5b8262
Binary files /dev/null and b/core/lib/istack-commons-runtime.jar differ
diff --git a/core/lib/istack-commons-tools.jar b/core/lib/istack-commons-tools.jar
new file mode 100644
index 000000000..ca235c94e
Binary files /dev/null and b/core/lib/istack-commons-tools.jar differ
diff --git a/core/lib/javax.activation-api-2.3.1.jar b/core/lib/javax.activation-api-2.3.1.jar
new file mode 100644
index 000000000..986c36509
Binary files /dev/null and b/core/lib/javax.activation-api-2.3.1.jar differ
diff --git a/core/lib/javax.json-1.1.3.jar b/core/lib/javax.json-1.1.3.jar
new file mode 100644
index 000000000..69a5c96aa
Binary files /dev/null and b/core/lib/javax.json-1.1.3.jar differ
diff --git a/core/lib/javax.json-api-1.1.3.jar b/core/lib/javax.json-api-1.1.3.jar
new file mode 100644
index 000000000..a1db22ac9
Binary files /dev/null and b/core/lib/javax.json-api-1.1.3.jar differ
diff --git a/core/lib/jaxb-api.2.3.1.jar b/core/lib/jaxb-api.2.3.1.jar
new file mode 100644
index 000000000..456586547
Binary files /dev/null and b/core/lib/jaxb-api.2.3.1.jar differ
diff --git a/core/lib/jaxb-runtime.2.3.1.jar b/core/lib/jaxb-runtime.2.3.1.jar
new file mode 100644
index 000000000..0b9ef67c4
Binary files /dev/null and b/core/lib/jaxb-runtime.2.3.1.jar differ
diff --git a/core/lib/logback-classic-1.2.3.jar b/core/lib/logback-classic-1.2.3.jar
new file mode 100644
index 000000000..bed00c0a5
Binary files /dev/null and b/core/lib/logback-classic-1.2.3.jar differ
diff --git a/core/lib/logback-core-1.2.3.jar b/core/lib/logback-core-1.2.3.jar
new file mode 100644
index 000000000..487b3956a
Binary files /dev/null and b/core/lib/logback-core-1.2.3.jar differ
diff --git a/core/lib/opencsv-2.3.jar b/core/lib/opencsv-2.3.jar
deleted file mode 100644
index 32b00f927..000000000
Binary files a/core/lib/opencsv-2.3.jar and /dev/null differ
diff --git a/core/lib/opencsv-4.3.2.jar b/core/lib/opencsv-4.3.2.jar
new file mode 100644
index 000000000..3e00a6ea3
Binary files /dev/null and b/core/lib/opencsv-4.3.2.jar differ
diff --git a/core/lib/yasson-1.0.2.jar b/core/lib/yasson-1.0.2.jar
new file mode 100644
index 000000000..ed935f3aa
Binary files /dev/null and b/core/lib/yasson-1.0.2.jar differ
diff --git a/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java b/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java
index eef411558..375de7ac8 100644
--- a/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java
+++ b/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java
@@ -14,7 +14,7 @@ import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.ArrayList;
 import net.sf.openrocket.util.StringUtil;
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVReader;
 
 /**
  * Primary entry point for parsing component CSV files that are in Rocksim format.
diff --git a/lib-test/OpenRocket Test Libraries.iml b/lib-test/OpenRocket Test Libraries.iml
index b9af6028c..c32cfac6d 100644
--- a/lib-test/OpenRocket Test Libraries.iml	
+++ b/lib-test/OpenRocket Test Libraries.iml	
@@ -17,52 +17,52 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="module-library">
-      <library name="hamcrest-core-1.3.0RC1.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/hamcrest-core-1.3.0RC1.jar!/" />
+          <root url="jar://$MODULE_DIR$/hamcrest-core-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="hamcrest-library-1.3.0RC1.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/hamcrest-library-1.3.0RC1.jar!/" />
+          <root url="jar://$MODULE_DIR$/hamcrest-library-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jmock-2.6.0-RC2.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/jmock-2.6.0-RC2.jar!/" />
+          <root url="jar://$MODULE_DIR$/jmock-2.9.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jmock-junit4-2.6.0-RC2.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/jmock-junit4-2.6.0-RC2.jar!/" />
+          <root url="jar://$MODULE_DIR$/jmock-junit4-2.9.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="junit-dep-4.8.2.jar">
+      <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/junit-dep-4.8.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/junit-4.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="test-plugin.jar">
+      <library>
         <CLASSES>
           <root url="jar://$MODULE_DIR$/test-plugin.jar!/" />
         </CLASSES>
@@ -70,14 +70,5 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="uispec4j-2.3-jdk16.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/uispec4j-2.3-jdk16.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/lib-test/hamcrest-core-1.3.0RC1.jar b/lib-test/hamcrest-core-1.3.0RC1.jar
deleted file mode 100644
index 1195cb7f5..000000000
Binary files a/lib-test/hamcrest-core-1.3.0RC1.jar and /dev/null differ
diff --git a/lib-test/hamcrest-core-1.3.jar b/lib-test/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/lib-test/hamcrest-core-1.3.jar differ
diff --git a/lib-test/hamcrest-library-1.3.0RC1.jar b/lib-test/hamcrest-library-1.3.0RC1.jar
deleted file mode 100644
index 8e6568b55..000000000
Binary files a/lib-test/hamcrest-library-1.3.0RC1.jar and /dev/null differ
diff --git a/lib-test/hamcrest-library-1.3.jar b/lib-test/hamcrest-library-1.3.jar
new file mode 100644
index 000000000..9eac80d7b
Binary files /dev/null and b/lib-test/hamcrest-library-1.3.jar differ
diff --git a/lib-test/jmock-2.6.0-RC2.jar b/lib-test/jmock-2.6.0-RC2.jar
deleted file mode 100644
index a846450ff..000000000
Binary files a/lib-test/jmock-2.6.0-RC2.jar and /dev/null differ
diff --git a/lib-test/jmock-2.9.0.jar b/lib-test/jmock-2.9.0.jar
new file mode 100644
index 000000000..e01f0d713
Binary files /dev/null and b/lib-test/jmock-2.9.0.jar differ
diff --git a/lib-test/jmock-junit4-2.6.0-RC2.jar b/lib-test/jmock-junit4-2.6.0-RC2.jar
deleted file mode 100644
index 129e56136..000000000
Binary files a/lib-test/jmock-junit4-2.6.0-RC2.jar and /dev/null differ
diff --git a/lib-test/jmock-junit4-2.9.0.jar b/lib-test/jmock-junit4-2.9.0.jar
new file mode 100644
index 000000000..f0ebf280e
Binary files /dev/null and b/lib-test/jmock-junit4-2.9.0.jar differ
diff --git a/lib-test/junit-4.12.jar b/lib-test/junit-4.12.jar
new file mode 100644
index 000000000..3a7fc266c
Binary files /dev/null and b/lib-test/junit-4.12.jar differ
diff --git a/lib-test/junit-dep-4.8.2.jar b/lib-test/junit-dep-4.8.2.jar
deleted file mode 100644
index f28b4ef01..000000000
Binary files a/lib-test/junit-dep-4.8.2.jar and /dev/null differ
diff --git a/lib-test/uispec4j-2.3-jdk16.jar b/lib-test/uispec4j-2.3-jdk16.jar
deleted file mode 100644
index eb3967637..000000000
Binary files a/lib-test/uispec4j-2.3-jdk16.jar and /dev/null differ
diff --git a/swing/OpenRocket Swing.iml b/swing/OpenRocket Swing.iml
index f6a5b547b..408d6a61b 100644
--- a/swing/OpenRocket Swing.iml	
+++ b/swing/OpenRocket Swing.iml	
@@ -34,6 +34,7 @@
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="OpenRocket Core" />
     <orderEntry type="module-library">
       <library name="iText-5.0.2.jar">
         <CLASSES>
@@ -70,7 +71,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="OpenRocket Core" />
     <orderEntry type="module-library">
       <library name="slf4j-api-1.7.5.jar">
         <CLASSES>
@@ -89,24 +89,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="guice-3.0.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../core/lib/guice-3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="guice-multibindings-3.0.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../core/lib/guice-multibindings-3.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="javax.inject.jar">
         <CLASSES>
@@ -116,33 +98,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="opencsv-2.3.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../core/lib/opencsv-2.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="logback-classic-1.0.12.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/logback-classic-1.0.12.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="logback-core-1.0.12.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/logback-core-1.0.12.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="resources">
         <CLASSES>
@@ -161,15 +116,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="annotation-detector-3.0.2.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../core/lib/annotation-detector-3.0.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="miglayout-4.0-swing.jar">
         <CLASSES>
@@ -190,77 +136,43 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.0RC1.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.0RC1.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-2.6.0-RC2.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.6.0-RC2.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/junit-dep-4.8.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib-test/uispec4j-2.3-jdk16.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="jogl" level="project" />
+    <orderEntry type="library" name="lib-test" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../core/lib/guice-4.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../core/lib/guava-26.0-jre.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../core/lib/logback-classic-1.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../core/lib/logback-core-1.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/swing/build.xml b/swing/build.xml
index f31835fcc..0ffc6d2ba 100644
--- a/swing/build.xml
+++ b/swing/build.xml
@@ -92,19 +92,27 @@
 			<!-- Libraries to extract into base JAR -->
 			<zipfileset src="${core.dir}/build/jar/OpenRocket-Core.jar" />
 			<zipfileset src="${lib.dir}/miglayout-4.0-swing.jar" />
-			<zipfileset src="${core.dir}/lib/guice-3.0.jar" />
+			<zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" />
+			<zipfileset src="${core.dir}/lib/guice-4.2.1.jar" />
 			<zipfileset src="${core.dir}/lib/aopalliance.jar"/>
-			<zipfileset src="${core.dir}/lib/guice-multibindings-3.0.jar"/>
 			<zipfileset src="${lib.dir}/iText-5.0.2.jar"/>
+			<zipfileset src="${core.dir}/lib/istack-commons-runtime.jar"/>
+			<zipfileset src="${core.dir}/lib/istack-commons-tools.jar"/>
+			<zipfileset src="${core.dir}/lib/javax.activation-api-2.3.1.jar"/>
 			<zipfileset src="${core.dir}/lib/javax.inject.jar"/>
+			<zipfileset src="${core.dir}/lib/javax.json-1.1.3.jar"/>
+			<zipfileset src="${core.dir}/lib/javax.json-api-1.1.3.jar"/>
+			<zipfileset src="${core.dir}/lib/jaxb-api.2.3.1.jar"/>
+			<zipfileset src="${core.dir}/lib/jaxb-runtime.2.3.1.jar"/>
+			
 			<zipfileset src="${lib.dir}/jcommon-1.0.18.jar"/>
 			<zipfileset src="${lib.dir}/jfreechart-1.0.15.jar"/>
-			<zipfileset src="${core.dir}/lib/opencsv-2.3.jar"/>
+			<zipfileset src="${core.dir}/lib/opencsv-4.3.2.jar"/>
 			<zipfileset src="${lib.dir}/OrangeExtensions-1.2.jar"/>
-			<zipfileset src="${core.dir}/lib/annotation-detector-3.0.2.jar"/>
+			<zipfileset src="${core.dir}/lib/annotation-detector-3.0.5.jar"/>
 			<zipfileset src="${core.dir}/lib/slf4j-api-1.7.5.jar"/>
-			<zipfileset src="${lib.dir}/logback-classic-1.0.12.jar"/>
-			<zipfileset src="${lib.dir}/logback-core-1.0.12.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"/>
 									
 			
diff --git a/swing/lib/logback-classic-1.0.12.jar b/swing/lib/logback-classic-1.0.12.jar
deleted file mode 100644
index 526826c73..000000000
Binary files a/swing/lib/logback-classic-1.0.12.jar and /dev/null differ
diff --git a/swing/lib/logback-core-1.0.12.jar b/swing/lib/logback-core-1.0.12.jar
deleted file mode 100644
index 0e739cdce..000000000
Binary files a/swing/lib/logback-core-1.0.12.jar and /dev/null differ