diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset
index 8ab005c037..7dc15495c2 100644
--- a/data/assets/examples/animation.asset
+++ b/data/assets/examples/animation.asset
@@ -28,8 +28,7 @@ local animationLoop = {
     ModelScale = 3E7,
     LightSources = {
       sun.LightSource
-    },
-    PerformShading = true
+    }
   },
   GUI = {
     Name = "Animated Model example (LoopFromStart)",
@@ -56,8 +55,7 @@ local animationLoopInf = {
     ModelScale = 3E7,
     LightSources = {
       sun.LightSource
-    },
-    PerformShading = true
+    }
   },
   GUI = {
     Name = "Animated Model example (LoopInfinitely)",
@@ -84,8 +82,7 @@ local animationOnce = {
     ModelScale = 3E7,
     LightSources = {
       sun.LightSource
-    },
-    PerformShading = true
+    }
   },
   GUI = {
     Name = "Animated Model example (Once)",
@@ -112,8 +109,7 @@ local animationBounceInf = {
     ModelScale = 3E7,
     LightSources = {
       sun.LightSource
-    },
-    PerformShading = true
+    }
   },
   GUI = {
     Name = "Animated Model example (BounceInfinitely)",
@@ -140,8 +136,7 @@ local animationBounce = {
     ModelScale = 3E7,
     LightSources = {
       sun.LightSource
-    },
-    PerformShading = true
+    }
   },
   GUI = {
     Name = "Animated Model example (BounceFromStart)",
diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset
index d8db9da578..26b77d9cc7 100644
--- a/data/assets/examples/approachevents.asset
+++ b/data/assets/examples/approachevents.asset
@@ -35,8 +35,7 @@ local obj = {
     ModelScale = 1000,
     LightSources = {
       sun.LightSource
-    },
-    PerformShading = true
+    }
   },
   InteractionSphere = 900,
   ApproachFactor = 50.0,
diff --git a/data/assets/examples/modelshader/model_fs.glsl b/data/assets/examples/modelshader/model_fs.glsl
index 0973172d93..09d448619a 100644
--- a/data/assets/examples/modelshader/model_fs.glsl
+++ b/data/assets/examples/modelshader/model_fs.glsl
@@ -47,6 +47,7 @@ uniform sampler2D texture_specular;
 
 uniform vec3 color_diffuse;
 uniform vec3 color_specular;
+uniform float opacity = 1.0;
 
 uniform int nLightSources;
 uniform vec3 lightDirectionsViewSpace[8];
@@ -63,7 +64,7 @@ Fragment getFragment() {
   frag.gPosition = vs_positionCameraSpace;
   frag.gNormal = vec4(vs_normalViewSpace, 0.0);
   frag.disableLDR2HDR = true;
-  frag.color.a = 1.0;
+  frag.color.a = opacity;
 
   if (performManualDepthTest) {
     // gl_FragCoord.x goes from 0 to resolution.x and gl_FragCoord.y goes from 0 to
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index fedc5a04c1..42285429f4 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -215,7 +215,7 @@ end
 
 asset.meta = {
   Name = "Dawn",
-  Version = "1.0",
+  Version = "2.0",
   Description = "Dawn spacecraft and trail",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
index 543245f3da..b70a62a4fa 100644
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -153,7 +153,7 @@ asset.export(VestaTrail)
 
 asset.meta = {
   Name = "Vesta",
-  Version = "1.0",
+  Version = "1.1",
   Description = "Vesta model projection and trail",
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index 5df3ea5861..b257dc2599 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -156,7 +156,7 @@ asset.export(issPosition)
 
 asset.meta = {
   Name = "ISS",
-  Version = "1.1",
+  Version = "2.0",
   Description = [[Model and Trail for ISS. Model from NASA 3D models, trail from
     Celestrak.]],
   Author = "OpenSpace Team",
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index 8b6d2eced5..0c3108274a 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -44,10 +44,10 @@ uniform bool has_color_specular;
 uniform sampler2D texture_diffuse;
 uniform sampler2D texture_normal;
 uniform sampler2D texture_specular;
-uniform float opacity = 1.0;
 
 uniform vec4 color_diffuse;
 uniform vec4 color_specular;
+uniform float opacity = 1.0;
 
 uniform int nLightSources;
 uniform vec3 lightDirectionsViewSpace[8];