diff --git a/.idea/artifacts/openrocket_jar.xml b/.idea/artifacts/openrocket_jar.xml
index 9bbc47070..019f1369a 100644
--- a/.idea/artifacts/openrocket_jar.xml
+++ b/.idea/artifacts/openrocket_jar.xml
@@ -34,6 +34,17 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib-extra/RXTXcomm.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guice-multibindings-3.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/OrangeExtensions-1.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-linux-amd64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-linux-i586.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-macosx-universal.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-amd64.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-i586.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/swing/OpenRocket Swing.iml b/swing/OpenRocket Swing.iml
index 52132d387..f6a5b547b 100644
--- a/swing/OpenRocket Swing.iml	
+++ b/swing/OpenRocket Swing.iml	
@@ -34,15 +34,6 @@
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="module-library">
-      <library name="jogl-all.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jogl/jogl-all.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="iText-5.0.2.jar">
         <CLASSES>
@@ -79,15 +70,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="gluegen-rt.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jogl/gluegen-rt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="OpenRocket Core" />
     <orderEntry type="module-library">
       <library name="slf4j-api-1.7.5.jar">
@@ -279,5 +261,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="jogl" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar
index f0d035cc8..a2466f418 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-i586.jar b/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar
index d9f789ec3..914a259d0 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar and b/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index 130731720..15df5e820 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 6c5b925b2..517fb84c7 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
index 814c3b99d..1c393b784 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar and b/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar differ
diff --git a/swing/lib/jogl/gluegen-rt.jar b/swing/lib/jogl/gluegen-rt.jar
index c20455ec7..742fdb26b 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
new file mode 100644
index 000000000..046c87759
Binary files /dev/null and b/swing/lib/jogl/gluegen.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 9bbc12c09..e57b8c7c0 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-i586.jar b/swing/lib/jogl/jogl-all-natives-linux-i586.jar
index f3e92cd63..88a27ce73 100644
Binary files a/swing/lib/jogl/jogl-all-natives-linux-i586.jar and b/swing/lib/jogl/jogl-all-natives-linux-i586.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar
index 35f72f55a..c65ea9953 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 314434879..9577bf1d0 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
index f49d9ce19..4439f1dcc 100644
Binary files a/swing/lib/jogl/jogl-all-natives-windows-i586.jar and b/swing/lib/jogl/jogl-all-natives-windows-i586.jar differ
diff --git a/swing/lib/jogl/jogl-all.jar b/swing/lib/jogl/jogl-all.jar
index 1d048da6b..f73174f9e 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/figure3d/FigureRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java
index 2a3adc9c8..65df4d52f 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java
@@ -2,11 +2,11 @@ package net.sf.openrocket.gui.figure3d;
 
 import java.util.HashMap;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GL2ES1;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
 
 import net.sf.openrocket.gui.figure3d.geometry.Geometry;
 import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
index f842e4ba1..9f2ba1543 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
@@ -1,11 +1,11 @@
 package net.sf.openrocket.gui.figure3d;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GL2ES1;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
 
 import net.sf.openrocket.appearance.Appearance;
 import net.sf.openrocket.appearance.Decal;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
index 8b01b734e..54c5a8d37 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
@@ -16,18 +16,18 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.glu.GLU;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
index d4f6f54ea..cd31b9260 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
@@ -8,11 +8,11 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2GL3;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GL2GL3;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/TextureCache.java b/swing/src/net/sf/openrocket/gui/figure3d/TextureCache.java
index 20cb98ebe..aa8e8276d 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/TextureCache.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/TextureCache.java
@@ -5,9 +5,9 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLProfile;
 
 import net.sf.openrocket.appearance.Decal;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java
index a0f44b54d..b725988b6 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java
@@ -1,11 +1,11 @@
 package net.sf.openrocket.gui.figure3d.geometry;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUquadric;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUquadric;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java
index a274beb0d..c12788132 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java
@@ -3,8 +3,8 @@ package net.sf.openrocket.gui.figure3d.geometry;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
 
 import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
index 1f3f7557e..3dca72e65 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
@@ -1,13 +1,13 @@
 package net.sf.openrocket.gui.figure3d.geometry;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUtessellator;
-import javax.media.opengl.glu.GLUtessellatorCallback;
-import javax.media.opengl.glu.GLUtessellatorCallbackAdapter;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUtessellator;
+import com.jogamp.opengl.glu.GLUtessellatorCallback;
+import com.jogamp.opengl.glu.GLUtessellatorCallbackAdapter;
 
 import net.sf.openrocket.rocketcomponent.EllipticalFinSet;
 import net.sf.openrocket.rocketcomponent.FinSet;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java
index 2946f7704..4c4b9df62 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java
@@ -6,7 +6,7 @@ import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.util.Transformation;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 
 /*
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java
index 073212f88..58a3c1d93 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java
@@ -114,8 +114,8 @@
  */
 package net.sf.openrocket.gui.figure3d.geometry;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 import net.sf.openrocket.rocketcomponent.MassObject;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java
index eb5c4056d..fc154bf14 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java
@@ -114,7 +114,7 @@
  */
 package net.sf.openrocket.gui.figure3d.geometry;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import net.sf.openrocket.rocketcomponent.Transition;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
index 7e92db8b4..78cf58dc0 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
@@ -14,18 +14,18 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.GLRunnable;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.GLRunnable;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.glu.GLU;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -266,7 +266,7 @@ public class PhotoPanel extends JPanel implements GLEventListener {
 			BufferedImage i = (new AWTGLReadBufferUtil(
 					GLProfile.get(GLProfile.GL2), false))
 					.readPixelsToBufferedImage(drawable.getGL(), 0, 0,
-							drawable.getWidth(), drawable.getHeight(), true);
+							drawable.getSurfaceWidth(), drawable.getSurfaceHeight(), true);
 			final Vector<ImageCallback> cbs = new Vector<PhotoPanel.ImageCallback>(
 					imageCallbacks);
 			imageCallbacks.clear();
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/exhaust/FlameRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/exhaust/FlameRenderer.java
index c58385a04..80fdb10b8 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/exhaust/FlameRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/exhaust/FlameRenderer.java
@@ -120,12 +120,12 @@ import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.util.Random;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.fixedfunc.GLLightingFunc;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.fixedfunc.GLLightingFunc;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.glu.GLU;
 
 import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.util.Color;
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/Sky.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/Sky.java
index 0048972f4..eb5f38d01 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/Sky.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/Sky.java
@@ -1,6 +1,6 @@
 package net.sf.openrocket.gui.figure3d.photo.sky;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import net.sf.openrocket.gui.figure3d.TextureCache;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBox.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBox.java
index 8dab0031f..999f992c3 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBox.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBox.java
@@ -5,8 +5,8 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
 
 import net.sf.openrocket.gui.figure3d.TextureCache;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBoxCross.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBoxCross.java
index 3989e405b..31f912077 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBoxCross.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBoxCross.java
@@ -5,9 +5,9 @@ import java.io.IOException;
 import java.net.URL;
 
 import javax.imageio.ImageIO;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLProfile;
 
 import net.sf.openrocket.gui.figure3d.TextureCache;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyPhoto.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyPhoto.java
index d28e5edff..2b440032f 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyPhoto.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyPhoto.java
@@ -2,9 +2,9 @@ package net.sf.openrocket.gui.figure3d.photo.sky;
 
 import java.net.URL;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.fixedfunc.GLMatrixFunc;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
 
 import net.sf.openrocket.gui.figure3d.TextureCache;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkySphere.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkySphere.java
index 0155298e2..d6e497aef 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkySphere.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkySphere.java
@@ -2,10 +2,10 @@ package net.sf.openrocket.gui.figure3d.photo.sky;
 
 import java.net.URL;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.glu.GLU;
-import javax.media.opengl.glu.GLUquadric;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.glu.GLU;
+import com.jogamp.opengl.glu.GLUquadric;
 
 import net.sf.openrocket.gui.figure3d.TextureCache;
 
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/builtin/Lake.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/builtin/Lake.java
index 3df87679e..21ab15ad0 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/builtin/Lake.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/sky/builtin/Lake.java
@@ -1,6 +1,6 @@
 package net.sf.openrocket.gui.figure3d.photo.sky.builtin;
 
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
 
 import net.sf.openrocket.gui.figure3d.TextureCache;
 import net.sf.openrocket.gui.figure3d.photo.sky.Sky.Credit;