diff --git a/src/components/gpu-preloader.js b/src/components/gpu-preloader.js
index 6983b99..de3d6ee 100644
--- a/src/components/gpu-preloader.js
+++ b/src/components/gpu-preloader.js
@@ -6,11 +6,12 @@ let i = 0;
  */
 AFRAME.registerComponent('gpu-preloader', {
   play: function () {
+    this.preloadMineEnvMaps();
+
     setTimeout(() => {
       this.preloadBeamMap();
       this.preloadBeatEnvMap();
       this.preloadCutParticles();
-      this.preloadMineEnvMaps();
       this.preloadMissMap();
       this.preloadWallMap();
       this.preloadWrongMap();
@@ -42,8 +43,12 @@ AFRAME.registerComponent('gpu-preloader', {
 
   preloadMineEnvMaps: function () {
     const stageColors = this.el.sceneEl.components['stage-colors'];
-    this.preloadTexture(stageColors.mineEnvMap.red);
-    this.preloadTexture(stageColors.mineEnvMap.blue);
+    this.el.sceneEl.addEventListener('mineredenvmaploaded', () => {
+      this.preloadTexture(stageColors.mineEnvMap.red);
+    });
+    this.el.sceneEl.addEventListener('mineblueenvmaploaded', () => {
+      this.preloadTexture(stageColors.mineEnvMap.blue);
+    });
   },
 
   preloadMissMap: function () {
diff --git a/src/components/stage-colors.js b/src/components/stage-colors.js
index 28ba2e4..027f346 100644
--- a/src/components/stage-colors.js
+++ b/src/components/stage-colors.js
@@ -1,3 +1,5 @@
+function $ (id) { return document.getElementById(id); };
+
 AFRAME.registerComponent('stage-colors', {
   dependencies: ['background', 'fog'],
 
@@ -11,8 +13,12 @@ AFRAME.registerComponent('stage-colors', {
     this.defaultRed = new THREE.Color(0xff0000);
     this.defaultBlue = new THREE.Color(0x0000ff);
     this.mineEnvMap = {
-      red: new THREE.TextureLoader().load('assets/img/mineenviro-red.jpg'),
-      blue: new THREE.TextureLoader().load('assets/img/mineenviro-blue.jpg')
+      red: new THREE.TextureLoader().load('assets/img/mineenviro-red.jpg', () => {
+        this.el.sceneEl.emit('mineredenvmaploaded', null, false);
+      }),
+      blue: new THREE.TextureLoader().load('assets/img/mineenviro-blue.jpg', () => {
+        this.el.sceneEl.emit('mineblueenvmaploaded', null, false);
+      })
     };
     this.mineColor = {red: new THREE.Color(0x070304), blue: new THREE.Color(0x030407)};
     this.mineEmission = {red: new THREE.Color(0x090707), blue: new THREE.Color(0x070709)};
@@ -27,23 +33,21 @@ AFRAME.registerComponent('stage-colors', {
     this.backglow = document.getElementById('backglow');
     this.auxColor = new THREE.Color();
 
-    let $ = function (id) { return document.getElementById(id); };
-
     this.targets = {};
-    [ 'fog',
-      'sky',
-      'backglow',
-      'tunnelNeon',
-      'leftStageLaser0',
-      'leftStageLaser1',
-      'leftStageLaser2',
-      'rightStageLaser0',
-      'rightStageLaser1',
-      'rightStageLaser2',
-      'floor',
-      'stageNeon'].forEach((id) => {
+    ['fog',
+     'sky',
+     'backglow',
+     'tunnelNeon',
+     'leftStageLaser0',
+     'leftStageLaser1',
+     'leftStageLaser2',
+     'rightStageLaser0',
+     'rightStageLaser1',
+     'rightStageLaser2',
+     'floor',
+     'stageNeon'].forEach(id => {
         this.targets[id] = id == 'fog' ? this.el.sceneEl : document.getElementById(id);
-      });
+     });
 
     this.colorCodes = ['off', 'blue', 'blue', 'bluefade', '', 'red', 'red', 'redfade'];
   },
@@ -67,8 +71,8 @@ AFRAME.registerComponent('stage-colors', {
   },
 
   setColor: function (target, code) {
-    var mesh = this.targets[target].getObject3D('mesh');
-    if (mesh) mesh.material.opacity = 1;
-    this.targets[target].emit('color' + this.colorCodes[code], {}, false);
+    const mesh = this.targets[target].getObject3D('mesh');
+    if (mesh) { mesh.material.opacity = 1; }
+    this.targets[target].emit('color' + this.colorCodes[code], null, false);
   }
 });