diff --git a/package-lock.json b/package-lock.json
index 3cf876be93e..2644b2c600a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4786,9 +4786,9 @@
       }
     },
     "gl-axes3d": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/gl-axes3d/-/gl-axes3d-1.5.0.tgz",
-      "integrity": "sha512-3fj//B3Gzet9urefAc/TDqZO5MvOzHDep8OsC3j7mWDGL94E6n9dn/Kelh1/OsviTTZoZtgleujNUYNYY4T6bg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/gl-axes3d/-/gl-axes3d-1.5.1.tgz",
+      "integrity": "sha512-AOx3jfzN+Z2YTFZ+7OTYaRWoFgSJhYA35BHZI8Q1VnYkB1ZQpco837x3zDSioA/qjkTG1lSUs2WpsfBoBW9NFg==",
       "requires": {
         "bit-twiddle": "^1.0.2",
         "dup": "^1.0.0",
@@ -4816,9 +4816,8 @@
       }
     },
     "gl-cone3d": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/gl-cone3d/-/gl-cone3d-1.2.2.tgz",
-      "integrity": "sha512-6wdxG/YGZZYlD5QcqhCocFOzxVrZSro7L4fj60XhHZ4LuXaQrjlQJmMja2fayOzDPXKLZYOQydC9jKLEZczHLQ==",
+      "version": "git://github.com/gl-vis/gl-cone3d.git#ec71aa87233d04b543ae53854c9a1182d40fc8ac",
+      "from": "git://github.com/gl-vis/gl-cone3d.git#ec71aa87233d04b543ae53854c9a1182d40fc8ac",
       "requires": {
         "gl-shader": "^4.2.1",
         "gl-vec3": "^1.1.3",
@@ -4856,9 +4855,8 @@
       }
     },
     "gl-error3d": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/gl-error3d/-/gl-error3d-1.0.13.tgz",
-      "integrity": "sha512-KxZ7NhsYOLZTXpYpoHfebGZJPCxl5ZumlqX1NvJ+1hRxE0pt7gT6ZBMZvWCgUSt+XDtMtD6IolG6ADtRvgYCcg==",
+      "version": "git://github.com/gl-vis/gl-error3d.git#75ec29dd1dde51a697f718cdacf76e36a7bfd38c",
+      "from": "git://github.com/gl-vis/gl-error3d.git#75ec29dd1dde51a697f718cdacf76e36a7bfd38c",
       "requires": {
         "gl-buffer": "^2.1.2",
         "gl-shader": "^4.2.1",
@@ -4955,9 +4953,8 @@
       }
     },
     "gl-mesh3d": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/gl-mesh3d/-/gl-mesh3d-2.0.7.tgz",
-      "integrity": "sha512-sP4qv1c3nBRfCJmW499DldibUjm7DNVOJMiyTS33Q39dcBGPdI9u1yzpzIRi6eQ216DZasaKZrLPF6W7nEABkQ==",
+      "version": "git://github.com/gl-vis/gl-mesh3d.git#31d34ba3cec063697cc3891e141532cd80d95ba3",
+      "from": "git://github.com/gl-vis/gl-mesh3d.git#31d34ba3cec063697cc3891e141532cd80d95ba3",
       "requires": {
         "barycentric": "^1.0.1",
         "colormap": "^2.1.0",
@@ -4998,13 +4995,12 @@
       }
     },
     "gl-plot3d": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/gl-plot3d/-/gl-plot3d-2.0.0.tgz",
-      "integrity": "sha512-NnVHC+ElPdJnQ7ccxOIZoldMV7g2HpbNB2klZ1Rxz9IOVo2VUozOd4ci33JHjCvYvQjrNz8MpXUvLkJJPznqMQ==",
+      "version": "git://github.com/gl-vis/gl-plot3d.git#036b593bc62b2db79a44936785a96cace7c3cf89",
+      "from": "git://github.com/gl-vis/gl-plot3d.git#036b593bc62b2db79a44936785a96cace7c3cf89",
       "requires": {
         "3d-view": "^2.0.0",
         "a-big-triangle": "^1.0.3",
-        "gl-axes3d": "^1.5.0",
+        "gl-axes3d": "^1.5.1",
         "gl-fbo": "^2.0.5",
         "gl-mat4": "^1.2.0",
         "gl-select-static": "^2.0.4",
@@ -5042,9 +5038,8 @@
       }
     },
     "gl-scatter3d": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/gl-scatter3d/-/gl-scatter3d-1.1.6.tgz",
-      "integrity": "sha512-KwdBJMyc9d7snHAfIlJAPPFa70zNWjrxuZV6NyMCEM9WlzFCoIScMtbuPdpQZJccaFjmM+aBfyiyWBbGWYsBjw==",
+      "version": "git://github.com/gl-vis/gl-scatter3d.git#3aff92340ceef1fdb7bdea5f78d8cd44866a846f",
+      "from": "git://github.com/gl-vis/gl-scatter3d.git#3aff92340ceef1fdb7bdea5f78d8cd44866a846f",
       "requires": {
         "gl-buffer": "^2.0.6",
         "gl-mat4": "^1.0.0",
@@ -5113,9 +5108,8 @@
       }
     },
     "gl-streamtube3d": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/gl-streamtube3d/-/gl-streamtube3d-1.1.2.tgz",
-      "integrity": "sha512-+26m5VyF5tyjLetDD9FGGb1yWU5gdZqHpCwwLH/Gmm0YMWn/Y8B/a/44qn5OeqeMyG1aox7C/fhZlRXhfxX4Vw==",
+      "version": "git://github.com/gl-vis/gl-streamtube3d.git#ecdaa1dbbcd315ba06133aeccf870c98b993a8ae",
+      "from": "git://github.com/gl-vis/gl-streamtube3d.git#ecdaa1dbbcd315ba06133aeccf870c98b993a8ae",
       "requires": {
         "gl-vec3": "^1.0.0",
         "glsl-inverse": "^1.0.0",
@@ -5124,9 +5118,8 @@
       }
     },
     "gl-surface3d": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/gl-surface3d/-/gl-surface3d-1.4.1.tgz",
-      "integrity": "sha512-pJss1rw6SoCRhvvNd0x49GSDK7YusQq1JqCtUb4TPPJCCkY3TmsDdMAve7JL41ZqoVmzFdOGEBZ1wERSZWadFg==",
+      "version": "git://github.com/gl-vis/gl-surface3d.git#96e61eebac18e9b525f7f3e6b714291b5d1b4bad",
+      "from": "git://github.com/gl-vis/gl-surface3d.git#96e61eebac18e9b525f7f3e6b714291b5d1b4bad",
       "requires": {
         "binary-search-bounds": "^2.0.4",
         "bit-twiddle": "^1.0.2",
diff --git a/package.json b/package.json
index 002beabe10c..7ac55fbcd43 100644
--- a/package.json
+++ b/package.json
@@ -72,21 +72,21 @@
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.2",
     "font-atlas-sdf": "^1.3.3",
-    "gl-cone3d": "^1.2.2",
+    "gl-cone3d": "git://github.com/gl-vis/gl-cone3d.git#ec71aa87233d04b543ae53854c9a1182d40fc8ac",
     "gl-contour2d": "^1.1.5",
-    "gl-error3d": "^1.0.13",
+    "gl-error3d": "git://github.com/gl-vis/gl-error3d.git#75ec29dd1dde51a697f718cdacf76e36a7bfd38c",
     "gl-heatmap2d": "^1.0.5",
     "gl-line3d": "^1.1.10",
     "gl-mat4": "^1.2.0",
-    "gl-mesh3d": "^2.0.7",
+    "gl-mesh3d": "git://github.com/gl-vis/gl-mesh3d.git#31d34ba3cec063697cc3891e141532cd80d95ba3",
     "gl-plot2d": "^1.4.2",
-    "gl-plot3d": "^2.0.0",
+    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#036b593bc62b2db79a44936785a96cace7c3cf89",
     "gl-pointcloud2d": "^1.0.2",
-    "gl-scatter3d": "^1.1.6",
+    "gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#3aff92340ceef1fdb7bdea5f78d8cd44866a846f",
     "gl-select-box": "^1.0.3",
     "gl-spikes2d": "^1.0.2",
-    "gl-streamtube3d": "^1.1.2",
-    "gl-surface3d": "^1.4.1",
+    "gl-streamtube3d": "git://github.com/gl-vis/gl-streamtube3d.git#ecdaa1dbbcd315ba06133aeccf870c98b993a8ae",
+    "gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#96e61eebac18e9b525f7f3e6b714291b5d1b4bad",
     "gl-text": "^1.1.6",
     "glslify": "^7.0.0",
     "has-hover": "^1.0.1",
diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js
index ebea2eb3598..a8bb483ffac 100644
--- a/src/traces/scatter3d/convert.js
+++ b/src/traces/scatter3d/convert.js
@@ -343,7 +343,7 @@ proto.update = function(data) {
     this.dataPoints = options.position;
 
     lineOptions = {
-        gl: gl,
+        gl: this.scene.glplot.gl,
         position: options.position,
         color: options.lineColor,
         lineWidth: options.lineWidth || 1,
@@ -371,7 +371,7 @@ proto.update = function(data) {
     if(data.marker && data.marker.opacity) scatterOpacity *= data.marker.opacity;
 
     scatterOptions = {
-        gl: gl,
+        gl: this.scene.glplot.gl,
         position: options.position,
         color: options.scatterColor,
         size: options.scatterSize,
@@ -400,7 +400,7 @@ proto.update = function(data) {
     }
 
     textOptions = {
-        gl: gl,
+        gl: this.scene.glplot.gl,
         position: options.position,
         glyph: options.text,
         color: options.textColor,
@@ -431,7 +431,7 @@ proto.update = function(data) {
     }
 
     errorOptions = {
-        gl: gl,
+        gl: this.scene.glplot.gl,
         position: options.position,
         color: options.errorColor,
         error: options.errorBounds,
diff --git a/test/image/baselines/gl3d_annotations.png b/test/image/baselines/gl3d_annotations.png
index b2a2ab5bab2..471d26bfec7 100644
Binary files a/test/image/baselines/gl3d_annotations.png and b/test/image/baselines/gl3d_annotations.png differ
diff --git a/test/image/baselines/gl3d_annotations_orthographic.png b/test/image/baselines/gl3d_annotations_orthographic.png
index 631f1401fdd..c295f086795 100644
Binary files a/test/image/baselines/gl3d_annotations_orthographic.png and b/test/image/baselines/gl3d_annotations_orthographic.png differ
diff --git a/test/image/baselines/gl3d_autocolorscale.png b/test/image/baselines/gl3d_autocolorscale.png
index 54c28165987..33deb0c6d00 100644
Binary files a/test/image/baselines/gl3d_autocolorscale.png and b/test/image/baselines/gl3d_autocolorscale.png differ
diff --git a/test/image/baselines/gl3d_autorange-zero.png b/test/image/baselines/gl3d_autorange-zero.png
index c7ee927e779..8eb2ac521c2 100644
Binary files a/test/image/baselines/gl3d_autorange-zero.png and b/test/image/baselines/gl3d_autorange-zero.png differ
diff --git a/test/image/baselines/gl3d_axes-visible-false.png b/test/image/baselines/gl3d_axes-visible-false.png
index dab999eeddb..6e8021a40a0 100644
Binary files a/test/image/baselines/gl3d_axes-visible-false.png and b/test/image/baselines/gl3d_axes-visible-false.png differ
diff --git a/test/image/baselines/gl3d_bunny-hull.png b/test/image/baselines/gl3d_bunny-hull.png
index 1d7b9aa3e04..d667587ddc2 100644
Binary files a/test/image/baselines/gl3d_bunny-hull.png and b/test/image/baselines/gl3d_bunny-hull.png differ
diff --git a/test/image/baselines/gl3d_bunny.png b/test/image/baselines/gl3d_bunny.png
index 191ec2724c6..476c65291d3 100644
Binary files a/test/image/baselines/gl3d_bunny.png and b/test/image/baselines/gl3d_bunny.png differ
diff --git a/test/image/baselines/gl3d_chrisp-nan-1.png b/test/image/baselines/gl3d_chrisp-nan-1.png
index c15a805e8e6..745a1ad3c39 100644
Binary files a/test/image/baselines/gl3d_chrisp-nan-1.png and b/test/image/baselines/gl3d_chrisp-nan-1.png differ
diff --git a/test/image/baselines/gl3d_contour-lines.png b/test/image/baselines/gl3d_contour-lines.png
index c57477c1990..c435ec9d2de 100644
Binary files a/test/image/baselines/gl3d_contour-lines.png and b/test/image/baselines/gl3d_contour-lines.png differ
diff --git a/test/image/baselines/gl3d_contour-lines2.png b/test/image/baselines/gl3d_contour-lines2.png
index 5b08c87586c..8ce0f28c6d5 100644
Binary files a/test/image/baselines/gl3d_contour-lines2.png and b/test/image/baselines/gl3d_contour-lines2.png differ
diff --git a/test/image/baselines/gl3d_convex-hull.png b/test/image/baselines/gl3d_convex-hull.png
index 191ec2724c6..476c65291d3 100644
Binary files a/test/image/baselines/gl3d_convex-hull.png and b/test/image/baselines/gl3d_convex-hull.png differ
diff --git a/test/image/baselines/gl3d_cube.png b/test/image/baselines/gl3d_cube.png
index ac98389aad1..34a49adfa9e 100644
Binary files a/test/image/baselines/gl3d_cube.png and b/test/image/baselines/gl3d_cube.png differ
diff --git a/test/image/baselines/gl3d_cufflinks.png b/test/image/baselines/gl3d_cufflinks.png
index ff65c51d464..5d98987fe42 100644
Binary files a/test/image/baselines/gl3d_cufflinks.png and b/test/image/baselines/gl3d_cufflinks.png differ
diff --git a/test/image/baselines/gl3d_delaunay.png b/test/image/baselines/gl3d_delaunay.png
index c7937134709..244c650dd56 100644
Binary files a/test/image/baselines/gl3d_delaunay.png and b/test/image/baselines/gl3d_delaunay.png differ
diff --git a/test/image/baselines/gl3d_error_bars_log.png b/test/image/baselines/gl3d_error_bars_log.png
index b9546ffe66f..ad994cb44f8 100644
Binary files a/test/image/baselines/gl3d_error_bars_log.png and b/test/image/baselines/gl3d_error_bars_log.png differ
diff --git a/test/image/baselines/gl3d_error_bars_log_2.png b/test/image/baselines/gl3d_error_bars_log_2.png
index f03ee79bd6f..4c491937964 100644
Binary files a/test/image/baselines/gl3d_error_bars_log_2.png and b/test/image/baselines/gl3d_error_bars_log_2.png differ
diff --git a/test/image/baselines/gl3d_errorbars_sqrt.png b/test/image/baselines/gl3d_errorbars_sqrt.png
index e29095f5a41..c7ad5b5eca2 100644
Binary files a/test/image/baselines/gl3d_errorbars_sqrt.png and b/test/image/baselines/gl3d_errorbars_sqrt.png differ
diff --git a/test/image/baselines/gl3d_errorbars_xy.png b/test/image/baselines/gl3d_errorbars_xy.png
index 7b8272676f0..93ba371f43b 100644
Binary files a/test/image/baselines/gl3d_errorbars_xy.png and b/test/image/baselines/gl3d_errorbars_xy.png differ
diff --git a/test/image/baselines/gl3d_errorbars_zx.png b/test/image/baselines/gl3d_errorbars_zx.png
index cc6fa892e3d..5402d5c6792 100644
Binary files a/test/image/baselines/gl3d_errorbars_zx.png and b/test/image/baselines/gl3d_errorbars_zx.png differ
diff --git a/test/image/baselines/gl3d_errorbars_zy.png b/test/image/baselines/gl3d_errorbars_zy.png
index 8c663cdbe77..2aa5f66220c 100644
Binary files a/test/image/baselines/gl3d_errorbars_zy.png and b/test/image/baselines/gl3d_errorbars_zy.png differ
diff --git a/test/image/baselines/gl3d_formatted-text-on-multiple-lines.png b/test/image/baselines/gl3d_formatted-text-on-multiple-lines.png
index b8dc14117e4..5388352c53e 100644
Binary files a/test/image/baselines/gl3d_formatted-text-on-multiple-lines.png and b/test/image/baselines/gl3d_formatted-text-on-multiple-lines.png differ
diff --git a/test/image/baselines/gl3d_ibm-plot.png b/test/image/baselines/gl3d_ibm-plot.png
index 796d36a6ec6..172980f1686 100644
Binary files a/test/image/baselines/gl3d_ibm-plot.png and b/test/image/baselines/gl3d_ibm-plot.png differ
diff --git a/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png b/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png
index 6a694fea38e..e2c53b1e6a9 100644
Binary files a/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png and b/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png differ
diff --git a/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png b/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png
index b08d97e3743..1b36d24e74a 100644
Binary files a/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png and b/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png differ
diff --git a/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png b/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png
index a97818aa546..8dc1300728f 100644
Binary files a/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png and b/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png differ
diff --git a/test/image/baselines/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.png b/test/image/baselines/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.png
index 4ccd9c89f0e..184a2f4220c 100644
Binary files a/test/image/baselines/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.png and b/test/image/baselines/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.png differ
diff --git a/test/image/baselines/gl3d_isosurface_log-axis_slices_surface-fill.png b/test/image/baselines/gl3d_isosurface_log-axis_slices_surface-fill.png
index f8229b6a1fe..db225b3f3d3 100644
Binary files a/test/image/baselines/gl3d_isosurface_log-axis_slices_surface-fill.png and b/test/image/baselines/gl3d_isosurface_log-axis_slices_surface-fill.png differ
diff --git a/test/image/baselines/gl3d_isosurface_math.png b/test/image/baselines/gl3d_isosurface_math.png
index ad94ba75c8a..ac8027bfa51 100644
Binary files a/test/image/baselines/gl3d_isosurface_math.png and b/test/image/baselines/gl3d_isosurface_math.png differ
diff --git a/test/image/baselines/gl3d_isosurface_multiple-traces.png b/test/image/baselines/gl3d_isosurface_multiple-traces.png
index 631a578012c..b75e94f7d32 100644
Binary files a/test/image/baselines/gl3d_isosurface_multiple-traces.png and b/test/image/baselines/gl3d_isosurface_multiple-traces.png differ
diff --git a/test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png b/test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png
index 8de35780b8e..a935423baac 100644
Binary files a/test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png and b/test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png differ
diff --git a/test/image/baselines/gl3d_isosurface_thin_caps_different_dims.png b/test/image/baselines/gl3d_isosurface_thin_caps_different_dims.png
index 3ba59e1e4d3..bb1e587518e 100644
Binary files a/test/image/baselines/gl3d_isosurface_thin_caps_different_dims.png and b/test/image/baselines/gl3d_isosurface_thin_caps_different_dims.png differ
diff --git a/test/image/baselines/gl3d_isosurface_thin_slices_transparent.png b/test/image/baselines/gl3d_isosurface_thin_slices_transparent.png
index ee3a6e58c17..105fe4715a1 100644
Binary files a/test/image/baselines/gl3d_isosurface_thin_slices_transparent.png and b/test/image/baselines/gl3d_isosurface_thin_slices_transparent.png differ
diff --git a/test/image/baselines/gl3d_isosurface_transparent.png b/test/image/baselines/gl3d_isosurface_transparent.png
index 0ea4acbbf0d..7e6c14ba7f6 100644
Binary files a/test/image/baselines/gl3d_isosurface_transparent.png and b/test/image/baselines/gl3d_isosurface_transparent.png differ
diff --git a/test/image/baselines/gl3d_isosurface_uneven-scales_ranges_iso-null.png b/test/image/baselines/gl3d_isosurface_uneven-scales_ranges_iso-null.png
index 2651df833ca..3a9b1b7c8fe 100644
Binary files a/test/image/baselines/gl3d_isosurface_uneven-scales_ranges_iso-null.png and b/test/image/baselines/gl3d_isosurface_uneven-scales_ranges_iso-null.png differ
diff --git a/test/image/baselines/gl3d_isosurface_with_surface-pattern.png b/test/image/baselines/gl3d_isosurface_with_surface-pattern.png
index 4635e41e1ab..c4664e54b29 100644
Binary files a/test/image/baselines/gl3d_isosurface_with_surface-pattern.png and b/test/image/baselines/gl3d_isosurface_with_surface-pattern.png differ
diff --git a/test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png b/test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png
index 75d4a435260..efb1a5a8ce5 100644
Binary files a/test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png and b/test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png differ
diff --git a/test/image/baselines/gl3d_line-colorscale-with-markers.png b/test/image/baselines/gl3d_line-colorscale-with-markers.png
index 2a86c805a5e..2819eaad468 100644
Binary files a/test/image/baselines/gl3d_line-colorscale-with-markers.png and b/test/image/baselines/gl3d_line-colorscale-with-markers.png differ
diff --git a/test/image/baselines/gl3d_line_rectangle_render.png b/test/image/baselines/gl3d_line_rectangle_render.png
index 35a1e9c8cca..22b5448a8d9 100644
Binary files a/test/image/baselines/gl3d_line_rectangle_render.png and b/test/image/baselines/gl3d_line_rectangle_render.png differ
diff --git a/test/image/baselines/gl3d_log-axis-big.png b/test/image/baselines/gl3d_log-axis-big.png
index 5fecfae721c..bfcdf8b6509 100644
Binary files a/test/image/baselines/gl3d_log-axis-big.png and b/test/image/baselines/gl3d_log-axis-big.png differ
diff --git a/test/image/baselines/gl3d_log-axis.png b/test/image/baselines/gl3d_log-axis.png
index 523e052081c..e778a1a7c40 100644
Binary files a/test/image/baselines/gl3d_log-axis.png and b/test/image/baselines/gl3d_log-axis.png differ
diff --git a/test/image/baselines/gl3d_marker-arrays.png b/test/image/baselines/gl3d_marker-arrays.png
index a4e0f448152..9e6a3c9d43d 100644
Binary files a/test/image/baselines/gl3d_marker-arrays.png and b/test/image/baselines/gl3d_marker-arrays.png differ
diff --git a/test/image/baselines/gl3d_marker-color.png b/test/image/baselines/gl3d_marker-color.png
index 3e2d9a996f5..d5b98633768 100644
Binary files a/test/image/baselines/gl3d_marker-color.png and b/test/image/baselines/gl3d_marker-color.png differ
diff --git a/test/image/baselines/gl3d_marker_symbols.png b/test/image/baselines/gl3d_marker_symbols.png
index e80deb94182..608c650b591 100644
Binary files a/test/image/baselines/gl3d_marker_symbols.png and b/test/image/baselines/gl3d_marker_symbols.png differ
diff --git a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png
index f01bfc6c73d..e5f5e193957 100644
Binary files a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png and b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png differ
diff --git a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_orthographic.png b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_orthographic.png
index c75461399e6..1f85940362a 100644
Binary files a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_orthographic.png and b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_orthographic.png differ
diff --git a/test/image/baselines/gl3d_mesh3d_surface_lighting.png b/test/image/baselines/gl3d_mesh3d_surface_lighting.png
index e475a233d12..101cf8b273c 100644
Binary files a/test/image/baselines/gl3d_mesh3d_surface_lighting.png and b/test/image/baselines/gl3d_mesh3d_surface_lighting.png differ
diff --git a/test/image/baselines/gl3d_mirror-ticks.png b/test/image/baselines/gl3d_mirror-ticks.png
index c11372c038d..4ee844932f2 100644
Binary files a/test/image/baselines/gl3d_mirror-ticks.png and b/test/image/baselines/gl3d_mirror-ticks.png differ
diff --git a/test/image/baselines/gl3d_multi-scene.png b/test/image/baselines/gl3d_multi-scene.png
index 94c3a57e785..0e695261fc9 100644
Binary files a/test/image/baselines/gl3d_multi-scene.png and b/test/image/baselines/gl3d_multi-scene.png differ
diff --git a/test/image/baselines/gl3d_multiple-scatter3d-traces.png b/test/image/baselines/gl3d_multiple-scatter3d-traces.png
index b789252f0a1..d7805cfcdf1 100644
Binary files a/test/image/baselines/gl3d_multiple-scatter3d-traces.png and b/test/image/baselines/gl3d_multiple-scatter3d-traces.png differ
diff --git a/test/image/baselines/gl3d_nan-holes.png b/test/image/baselines/gl3d_nan-holes.png
index 5e051cb846c..919ab63e8c4 100644
Binary files a/test/image/baselines/gl3d_nan-holes.png and b/test/image/baselines/gl3d_nan-holes.png differ
diff --git a/test/image/baselines/gl3d_opacity-scaling-spikes.png b/test/image/baselines/gl3d_opacity-scaling-spikes.png
index e9267cd1ded..2b28dff4142 100644
Binary files a/test/image/baselines/gl3d_opacity-scaling-spikes.png and b/test/image/baselines/gl3d_opacity-scaling-spikes.png differ
diff --git a/test/image/baselines/gl3d_opacity-surface.png b/test/image/baselines/gl3d_opacity-surface.png
index c3a6a6a6d7f..4bce2bdc0fc 100644
Binary files a/test/image/baselines/gl3d_opacity-surface.png and b/test/image/baselines/gl3d_opacity-surface.png differ
diff --git a/test/image/baselines/gl3d_parametric_surface_data_precision.png b/test/image/baselines/gl3d_parametric_surface_data_precision.png
index 59b5d34d8db..6a548a8eb63 100644
Binary files a/test/image/baselines/gl3d_parametric_surface_data_precision.png and b/test/image/baselines/gl3d_parametric_surface_data_precision.png differ
diff --git a/test/image/baselines/gl3d_perspective_tick_distances.png b/test/image/baselines/gl3d_perspective_tick_distances.png
index 53cb757ffe9..d8f4ede27ad 100644
Binary files a/test/image/baselines/gl3d_perspective_tick_distances.png and b/test/image/baselines/gl3d_perspective_tick_distances.png differ
diff --git a/test/image/baselines/gl3d_projection-traces.png b/test/image/baselines/gl3d_projection-traces.png
index 06b75910aa9..0c9f0639d94 100644
Binary files a/test/image/baselines/gl3d_projection-traces.png and b/test/image/baselines/gl3d_projection-traces.png differ
diff --git a/test/image/baselines/gl3d_reversescale.png b/test/image/baselines/gl3d_reversescale.png
index a6add6eadfa..a99f8a96f69 100644
Binary files a/test/image/baselines/gl3d_reversescale.png and b/test/image/baselines/gl3d_reversescale.png differ
diff --git a/test/image/baselines/gl3d_ribbons.png b/test/image/baselines/gl3d_ribbons.png
index 0309f7c7ccc..27f399bef02 100644
Binary files a/test/image/baselines/gl3d_ribbons.png and b/test/image/baselines/gl3d_ribbons.png differ
diff --git a/test/image/baselines/gl3d_scatter-color-array.png b/test/image/baselines/gl3d_scatter-color-array.png
index f7b857b812c..06e51abf009 100644
Binary files a/test/image/baselines/gl3d_scatter-color-array.png and b/test/image/baselines/gl3d_scatter-color-array.png differ
diff --git a/test/image/baselines/gl3d_scatter-color-line-gradient.png b/test/image/baselines/gl3d_scatter-color-line-gradient.png
index bb3ae79f598..20bdee1db61 100644
Binary files a/test/image/baselines/gl3d_scatter-color-line-gradient.png and b/test/image/baselines/gl3d_scatter-color-line-gradient.png differ
diff --git a/test/image/baselines/gl3d_scatter-color-mono-and-palette.png b/test/image/baselines/gl3d_scatter-color-mono-and-palette.png
index dba67d4390e..7e4414122b2 100644
Binary files a/test/image/baselines/gl3d_scatter-color-mono-and-palette.png and b/test/image/baselines/gl3d_scatter-color-mono-and-palette.png differ
diff --git a/test/image/baselines/gl3d_scatter-colorscale-marker.png b/test/image/baselines/gl3d_scatter-colorscale-marker.png
index 1447f230729..840c901d9f1 100644
Binary files a/test/image/baselines/gl3d_scatter-colorscale-marker.png and b/test/image/baselines/gl3d_scatter-colorscale-marker.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-align-texts.png b/test/image/baselines/gl3d_scatter3d-align-texts.png
index 49478ca4be5..d879d503bb9 100644
Binary files a/test/image/baselines/gl3d_scatter3d-align-texts.png and b/test/image/baselines/gl3d_scatter3d-align-texts.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-blank-text.png b/test/image/baselines/gl3d_scatter3d-blank-text.png
index 163ba65518c..22668050e36 100644
Binary files a/test/image/baselines/gl3d_scatter3d-blank-text.png and b/test/image/baselines/gl3d_scatter3d-blank-text.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-colorscale-with-line.png b/test/image/baselines/gl3d_scatter3d-colorscale-with-line.png
index f1db73667d8..6f261bdf4e7 100644
Binary files a/test/image/baselines/gl3d_scatter3d-colorscale-with-line.png and b/test/image/baselines/gl3d_scatter3d-colorscale-with-line.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-colorscale.png b/test/image/baselines/gl3d_scatter3d-colorscale.png
index c899208c9be..80745f537db 100644
Binary files a/test/image/baselines/gl3d_scatter3d-colorscale.png and b/test/image/baselines/gl3d_scatter3d-colorscale.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-connectgaps.png b/test/image/baselines/gl3d_scatter3d-connectgaps.png
index 67326cf8abc..6e94021cfe5 100644
Binary files a/test/image/baselines/gl3d_scatter3d-connectgaps.png and b/test/image/baselines/gl3d_scatter3d-connectgaps.png differ
diff --git a/test/image/baselines/gl3d_scatter3d-different-align-texts.png b/test/image/baselines/gl3d_scatter3d-different-align-texts.png
index f7e9fffd97e..8eab06d71f1 100644
Binary files a/test/image/baselines/gl3d_scatter3d-different-align-texts.png and b/test/image/baselines/gl3d_scatter3d-different-align-texts.png differ
diff --git a/test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png b/test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png
index a9c7927ca86..e3096c2fbed 100644
Binary files a/test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png and b/test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png differ
diff --git a/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png b/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png
index 9d108595e6a..eda3bf756ae 100644
Binary files a/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png and b/test/image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png differ
diff --git a/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png b/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png
index a224543595a..d7e0360fd41 100644
Binary files a/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png and b/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png differ
diff --git a/test/image/baselines/gl3d_set-ranges.png b/test/image/baselines/gl3d_set-ranges.png
index 534d2b58fa7..ed360cf6b50 100644
Binary files a/test/image/baselines/gl3d_set-ranges.png and b/test/image/baselines/gl3d_set-ranges.png differ
diff --git a/test/image/baselines/gl3d_snowden.png b/test/image/baselines/gl3d_snowden.png
index b59d5fd9936..4ca2cde1384 100644
Binary files a/test/image/baselines/gl3d_snowden.png and b/test/image/baselines/gl3d_snowden.png differ
diff --git a/test/image/baselines/gl3d_snowden_altered.png b/test/image/baselines/gl3d_snowden_altered.png
index dee05f0da39..1ac16237c99 100644
Binary files a/test/image/baselines/gl3d_snowden_altered.png and b/test/image/baselines/gl3d_snowden_altered.png differ
diff --git a/test/image/baselines/gl3d_streamtube-first.png b/test/image/baselines/gl3d_streamtube-first.png
index e93248d617f..c38df68ba91 100644
Binary files a/test/image/baselines/gl3d_streamtube-first.png and b/test/image/baselines/gl3d_streamtube-first.png differ
diff --git a/test/image/baselines/gl3d_streamtube-simple.png b/test/image/baselines/gl3d_streamtube-simple.png
index c65720d31cf..e0d13199c12 100644
Binary files a/test/image/baselines/gl3d_streamtube-simple.png and b/test/image/baselines/gl3d_streamtube-simple.png differ
diff --git a/test/image/baselines/gl3d_streamtube-thin.png b/test/image/baselines/gl3d_streamtube-thin.png
index 12a384841e9..756db5f7dea 100644
Binary files a/test/image/baselines/gl3d_streamtube-thin.png and b/test/image/baselines/gl3d_streamtube-thin.png differ
diff --git a/test/image/baselines/gl3d_streamtube-wind.png b/test/image/baselines/gl3d_streamtube-wind.png
index ed802b002b1..d9bc5835545 100644
Binary files a/test/image/baselines/gl3d_streamtube-wind.png and b/test/image/baselines/gl3d_streamtube-wind.png differ
diff --git a/test/image/baselines/gl3d_streamtube_reversed_ranges.png b/test/image/baselines/gl3d_streamtube_reversed_ranges.png
index 3d2d48e379b..243b761e5e4 100644
Binary files a/test/image/baselines/gl3d_streamtube_reversed_ranges.png and b/test/image/baselines/gl3d_streamtube_reversed_ranges.png differ
diff --git a/test/image/baselines/gl3d_surface-circular-colorscale.png b/test/image/baselines/gl3d_surface-circular-colorscale.png
index 6680d2ea64c..3167a387b39 100644
Binary files a/test/image/baselines/gl3d_surface-circular-colorscale.png and b/test/image/baselines/gl3d_surface-circular-colorscale.png differ
diff --git a/test/image/baselines/gl3d_surface-lighting.png b/test/image/baselines/gl3d_surface-lighting.png
index debc99f875d..2c70efde74a 100644
Binary files a/test/image/baselines/gl3d_surface-lighting.png and b/test/image/baselines/gl3d_surface-lighting.png differ
diff --git a/test/image/baselines/gl3d_surface_after_heatmap.png b/test/image/baselines/gl3d_surface_after_heatmap.png
index e2e84ff714a..52e8f3e8e3a 100644
Binary files a/test/image/baselines/gl3d_surface_after_heatmap.png and b/test/image/baselines/gl3d_surface_after_heatmap.png differ
diff --git a/test/image/baselines/gl3d_surface_contour_precision.png b/test/image/baselines/gl3d_surface_contour_precision.png
index 16d07fb49b4..cdfc4a0368a 100644
Binary files a/test/image/baselines/gl3d_surface_contour_precision.png and b/test/image/baselines/gl3d_surface_contour_precision.png differ
diff --git a/test/image/baselines/gl3d_surface_intensity.png b/test/image/baselines/gl3d_surface_intensity.png
index 43975bc64ac..0b6e8c889f5 100644
Binary files a/test/image/baselines/gl3d_surface_intensity.png and b/test/image/baselines/gl3d_surface_intensity.png differ
diff --git a/test/image/baselines/gl3d_tetrahedra.png b/test/image/baselines/gl3d_tetrahedra.png
index 78650b4d3b5..c79582e2e1e 100644
Binary files a/test/image/baselines/gl3d_tetrahedra.png and b/test/image/baselines/gl3d_tetrahedra.png differ
diff --git a/test/image/baselines/gl3d_text-weirdness.png b/test/image/baselines/gl3d_text-weirdness.png
index b56e1c1bb90..63ffc5627ca 100644
Binary files a/test/image/baselines/gl3d_text-weirdness.png and b/test/image/baselines/gl3d_text-weirdness.png differ
diff --git a/test/image/baselines/gl3d_triangle.png b/test/image/baselines/gl3d_triangle.png
index d4d97e4eaca..2ba13615842 100644
Binary files a/test/image/baselines/gl3d_triangle.png and b/test/image/baselines/gl3d_triangle.png differ
diff --git a/test/image/baselines/gl3d_wire-surface.png b/test/image/baselines/gl3d_wire-surface.png
index f086c3f3455..ff9b2861ca8 100644
Binary files a/test/image/baselines/gl3d_wire-surface.png and b/test/image/baselines/gl3d_wire-surface.png differ
diff --git a/test/image/baselines/gl3d_world-cals.png b/test/image/baselines/gl3d_world-cals.png
index 1d7014d80e6..b4bb6521551 100644
Binary files a/test/image/baselines/gl3d_world-cals.png and b/test/image/baselines/gl3d_world-cals.png differ
diff --git a/test/image/baselines/gl3d_xy-defined-ticks.png b/test/image/baselines/gl3d_xy-defined-ticks.png
index 939ca54fdef..fc87bec0b6b 100644
Binary files a/test/image/baselines/gl3d_xy-defined-ticks.png and b/test/image/baselines/gl3d_xy-defined-ticks.png differ
diff --git a/test/image/baselines/gl3d_z-range.png b/test/image/baselines/gl3d_z-range.png
index 494d67469cf..63abaf09e39 100644
Binary files a/test/image/baselines/gl3d_z-range.png and b/test/image/baselines/gl3d_z-range.png differ
diff --git a/test/image/baselines/grid_subplot_types.png b/test/image/baselines/grid_subplot_types.png
index bcf32c5a049..f0af97cad59 100644
Binary files a/test/image/baselines/grid_subplot_types.png and b/test/image/baselines/grid_subplot_types.png differ
diff --git a/test/image/baselines/layout_metatext.png b/test/image/baselines/layout_metatext.png
index 88358b96a9f..adb7e4d0ecb 100644
Binary files a/test/image/baselines/layout_metatext.png and b/test/image/baselines/layout_metatext.png differ
diff --git a/test/image/baselines/plot_types.png b/test/image/baselines/plot_types.png
index 55c66598f52..6175237ffbc 100644
Binary files a/test/image/baselines/plot_types.png and b/test/image/baselines/plot_types.png differ
diff --git a/test/image/mocks/gl3d_formatted-text-on-multiple-lines.json b/test/image/mocks/gl3d_formatted-text-on-multiple-lines.json
index 1885729a887..d621cb20930 100644
--- a/test/image/mocks/gl3d_formatted-text-on-multiple-lines.json
+++ b/test/image/mocks/gl3d_formatted-text-on-multiple-lines.json
@@ -12,7 +12,7 @@
   ],
   "layout": {
     "title":"Now texts could be displayed in 3D on multiple lines.",
-    "width": 1200,
+    "width": 900,
     "height": 900,
     "scene":{
       "xaxis":{
diff --git a/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.json b/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.json
index 540570e3c66..75983a5ed2b 100644
--- a/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.json
+++ b/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.json
@@ -95,7 +95,7 @@
   ],
   "layout": {
     "height": 758,
-    "width": 1310,
+    "width": 1000,
     "title": "X-axis using autorange:'reversed',Y-axis using range:[30,-5] & Z-axis using range:'reversed' & type:log",
     "scene": {
       "xaxis": {
diff --git a/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json b/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json
index 2a94545217c..0afbe74739e 100644
--- a/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json
+++ b/test/image/mocks/gl3d_mesh3d_surface3d_scatter3d_orthographic.json
@@ -95,7 +95,7 @@
   ],
   "layout": {
     "height": 758,
-    "width": 1310,
+    "width": 1000,
     "title": "X-axis using autorange:'reversed',Y-axis using range:[30,-5] & Z-axis using range:'reversed' & type:log",
     "scene": {
       "xaxis": {
diff --git a/test/image/mocks/gl3d_surface-circular-colorscale.json b/test/image/mocks/gl3d_surface-circular-colorscale.json
index fa2f55068db..16868291282 100644
--- a/test/image/mocks/gl3d_surface-circular-colorscale.json
+++ b/test/image/mocks/gl3d_surface-circular-colorscale.json
@@ -1013,7 +1013,7 @@
         }
       }
     },
-    "width": 1745,
+    "width": 878,
     "height": 878
   }
 }