diff --git a/code/Weather/Sky/SkyComponent.cpp b/code/Weather/Sky/SkyComponent.cpp
index c76d96d234..3bdc2f8575 100644
--- a/code/Weather/Sky/SkyComponent.cpp
+++ b/code/Weather/Sky/SkyComponent.cpp
@@ -51,6 +51,8 @@ const render::Handle s_handleWeather_SkyEyePosition(L"Weather_SkyEyePosition");
 const render::Handle s_handleWeather_SkyCloudTexture(L"Weather_SkyCloudTexture");
 const render::Handle s_handleWeather_SkyCloudTextureLast(L"Weather_SkyCloudTextureLast");
 const render::Handle s_handleWeather_SkyTemporalBlend(L"Weather_SkyTemporalBlend");
+const render::Handle s_handleWeather_SkyCloudAmbientTop(L"Weather_SkyCloudAmbientTop");
+const render::Handle s_handleWeather_SkyCloudAmbientBottom(L"Weather_SkyCloudAmbientBottom");
 const render::Handle s_handleWeather_InputTexture(L"Weather_InputTexture");
 const render::Handle s_handleWeather_OutputTexture(L"Weather_OutputTexture");
 
@@ -65,20 +67,14 @@ const int32_t c_indexCount = c_triangleCount * 3;
 T_IMPLEMENT_RTTI_CLASS(L"traktor.weather.SkyComponent", SkyComponent, world::IEntityComponent)
 
 SkyComponent::SkyComponent(
+	const SkyComponentData& data,
 	const resource::Proxy< render::Shader >& shader,
-	const resource::Proxy< render::ITexture >& texture,
-	float intensity,
-	bool clouds,
-	const Color4f& overHorizon,
-	const Color4f& underHorizon
+	const resource::Proxy< render::ITexture >& texture
 )
-:	m_shader(shader)
+:	m_data(data)
+,	m_shader(shader)
 ,	m_texture(texture)
 ,	m_transform(Transform::identity())
-,	m_intensity(intensity)
-,	m_clouds(clouds)
-,	m_overHorizon(overHorizon)
-,	m_underHorizon(underHorizon)
 {
 }
 
@@ -149,7 +145,7 @@ bool SkyComponent::create(resource::IResourceManager* resourceManager, render::I
 		c_vertexCount - 1
 	);
 
-	if (m_clouds)
+	if (m_data.m_clouds)
 	{
 		render::SimpleTextureCreateDesc stcd = {};
 		render::VolumeTextureCreateDesc vtcd = {};
@@ -237,7 +233,7 @@ void SkyComponent::setup(
 {
 	render::RenderGraph& renderGraph = context.getRenderGraph();
 
-	if (m_clouds)
+	if (m_data.m_clouds)
 	{
 		if (m_shaderClouds2D.changed() || m_shaderClouds3D.changed())
 		{
@@ -325,6 +321,8 @@ void SkyComponent::setup(
 				renderBlock->programParams->setFloatParameter(s_handleWeather_SkyRadius, worldRenderView.getViewFrustum().getFarZ() - 10.0f);
 				renderBlock->programParams->setVectorParameter(s_handleWeather_SkySunColor, sunColor);
 				renderBlock->programParams->setVectorParameter(s_handleWeather_SkySunDirection, sunDirection);
+				renderBlock->programParams->setVectorParameter(s_handleWeather_SkyCloudAmbientTop, m_data.m_cloudAmbientTop);
+				renderBlock->programParams->setVectorParameter(s_handleWeather_SkyCloudAmbientBottom, m_data.m_cloudAmbientBottom);
 				renderBlock->programParams->setFloatParameter(s_handleWeather_SkyTemporalBlend, (worldRenderView.getSnapshot() || m_cloudFrame == 0) ? 1.0f : 0.2f);
 				renderBlock->programParams->setFloatParameter(world::s_handleTime, worldRenderView.getTime());
 				renderBlock->programParams->endParameters(renderContext);
@@ -349,7 +347,7 @@ void SkyComponent::build(
 )
 {
 	auto perm = worldRenderPass.getPermutation(m_shader);
-	m_shader->setCombination(c_handleWeather_CloudsEnable, m_clouds, perm);
+	m_shader->setCombination(c_handleWeather_CloudsEnable, m_data.m_clouds, perm);
 	auto sp = m_shader->getProgram(perm);
 	if (!sp)
 		return;
@@ -386,15 +384,17 @@ void SkyComponent::build(
 	worldRenderPass.setProgramParameters(renderBlock->programParams);
 	renderBlock->programParams->setFloatParameter(s_handleWeather_SkyRadius, worldRenderView.getViewFrustum().getFarZ() - 10.0f);
 	renderBlock->programParams->setFloatParameter(s_handleWeather_SkyRotation, rotation);
-	renderBlock->programParams->setFloatParameter(s_handleWeather_SkyIntensity, m_intensity);
+	renderBlock->programParams->setFloatParameter(s_handleWeather_SkyIntensity, m_data.m_intensity);
 	renderBlock->programParams->setVectorParameter(s_handleWeather_SkySunDirection, sunDirection);
 	renderBlock->programParams->setVectorParameter(s_handleWeather_SkySunColor, sunColor);
-	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyOverHorizon, m_overHorizon);
-	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyUnderHorizon, m_underHorizon);
+	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyOverHorizon, m_data.m_skyOverHorizon);
+	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyUnderHorizon, m_data.m_skyUnderHorizon);
+	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyCloudAmbientTop, m_data.m_cloudAmbientTop);
+	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyCloudAmbientBottom, m_data.m_cloudAmbientBottom);
 	renderBlock->programParams->setVectorParameter(s_handleWeather_SkyEyePosition, eyePosition);
 	renderBlock->programParams->setTextureParameter(s_handleWeather_SkyTexture, m_texture);
 
-	if (m_clouds)
+	if (m_data.m_clouds)
 	{
 		renderBlock->programParams->setFloatParameter(s_handleWeather_SkyCloudBlend, m_cloudBlend);
 		renderBlock->programParams->setTextureParameter(s_handleWeather_SkyCloud2D, m_cloudTextures[0]);
diff --git a/code/Weather/Sky/SkyComponent.h b/code/Weather/Sky/SkyComponent.h
index 99b362d055..984c395910 100644
--- a/code/Weather/Sky/SkyComponent.h
+++ b/code/Weather/Sky/SkyComponent.h
@@ -11,6 +11,7 @@
 #include "Render/ITexture.h"
 #include "Render/Shader.h"
 #include "Resource/Proxy.h"
+#include "Weather/Sky/SkyComponentData.h"
 #include "World/IEntityComponent.h"
 
 // import/export mechanism.
@@ -59,12 +60,9 @@ class T_DLLCLASS SkyComponent : public world::IEntityComponent
 
 public:
 	explicit SkyComponent(
+		const SkyComponentData& data,
 		const resource::Proxy< render::Shader >& shader,
-		const resource::Proxy< render::ITexture >& texture,
-		float intensity,
-		bool clouds,
-		const Color4f& overHorizon,
-		const Color4f& underHorizon
+		const resource::Proxy< render::ITexture >& texture
 	);
 
 	virtual ~SkyComponent();
@@ -93,6 +91,7 @@ class T_DLLCLASS SkyComponent : public world::IEntityComponent
 	);
 
 private:
+	const SkyComponentData m_data;
 	Ref< const render::IVertexLayout > m_vertexLayout;
 	Ref< render::Buffer > m_vertexBuffer;
 	Ref< render::Buffer > m_indexBuffer;
@@ -106,10 +105,6 @@ class T_DLLCLASS SkyComponent : public world::IEntityComponent
 	Ref< render::ITexture > m_cloudDomeTexture[2];
 	world::Entity* m_owner = nullptr;
 	Transform m_transform;
-	float m_intensity = 1.0f;
-	bool m_clouds = true;
-	Color4f m_overHorizon = Color4f(0.2f, 0.5f, 0.85f, 0.0f);
-	Color4f m_underHorizon = Color4f(0.1f, 0.1f, 0.12f, 0.0f);
 	int32_t m_count = 0;
 	int32_t m_cloudFrame = 0;
 	float m_cloudBlend = 0.0f;
diff --git a/code/Weather/Sky/SkyComponentData.cpp b/code/Weather/Sky/SkyComponentData.cpp
index b12b2c8a68..c521ffc18c 100644
--- a/code/Weather/Sky/SkyComponentData.cpp
+++ b/code/Weather/Sky/SkyComponentData.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022-2023 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +8,7 @@
  */
 #include <cmath>
 #include "Core/Math/Const.h"
+#include "Core/Serialization/AttributeHdr.h"
 #include "Core/Serialization/AttributePrivate.h"
 #include "Core/Serialization/AttributeRange.h"
 #include "Core/Serialization/AttributeUnit.h"
@@ -29,7 +30,7 @@ const resource::Id< render::Shader > c_defaultShader(Guid(L"{4CF929EB-3A8B-C340-
 
 	}
 
-T_IMPLEMENT_RTTI_EDIT_CLASS(L"traktor.weather.SkyComponentData", 6, SkyComponentData, world::IEntityComponentData)
+T_IMPLEMENT_RTTI_EDIT_CLASS(L"traktor.weather.SkyComponentData", 7, SkyComponentData, world::IEntityComponentData)
 
 SkyComponentData::SkyComponentData()
 :	m_shader(c_defaultShader)
@@ -50,12 +51,9 @@ Ref< SkyComponent > SkyComponentData::createComponent(resource::IResourceManager
 	}
 
 	Ref< SkyComponent > skyComponent = new SkyComponent(
+		*this,
 		shader,
-		texture,
-		m_intensity,
-		m_clouds,
-		m_overHorizon,
-		m_underHorizon
+		texture
 	);
 	skyComponent->create(resourceManager, renderSystem);
 	return skyComponent;
@@ -92,13 +90,25 @@ void SkyComponentData::serialize(ISerializer& s)
 	if (s.getVersion< SkyComponentData >() >= 4)
 		s >> Member< float >(L"intensity", m_intensity, AttributeRange(0.0f) | AttributeUnit(UnitType::Percent));
 
-	if (s.getVersion< SkyComponentData >() >= 5)
-		s >> Member< bool >(L"clouds", m_clouds);
+	if (s.getVersion< SkyComponentData >() >= 7)
+	{
+		s >> Member< Color4f >(L"skyOverHorizon", m_skyOverHorizon, AttributeHdr());
+		s >> Member< Color4f >(L"skyUnderHorizon", m_skyUnderHorizon, AttributeHdr());
 
-	if (s.getVersion< SkyComponentData >() >= 6)
+		s >> Member< bool >(L"clouds", m_clouds);
+		s >> Member< Color4f >(L"cloudAmbientTop", m_cloudAmbientTop, AttributeHdr());
+		s >> Member< Color4f >(L"cloudAmbientBottom", m_cloudAmbientBottom, AttributeHdr());
+	}
+	else
 	{
-		s >> Member< Color4f >(L"overHorizon", m_overHorizon);
-		s >> Member< Color4f >(L"underHorizon", m_underHorizon);
+		if (s.getVersion< SkyComponentData >() >= 5)
+			s >> Member< bool >(L"clouds", m_clouds);
+
+		if (s.getVersion< SkyComponentData >() == 6)
+		{
+			s >> Member< Color4f >(L"overHorizon", m_skyOverHorizon);
+			s >> Member< Color4f >(L"underHorizon", m_skyUnderHorizon);
+		}
 	}
 }
 
diff --git a/code/Weather/Sky/SkyComponentData.h b/code/Weather/Sky/SkyComponentData.h
index 1c7a14d19f..2791f4be52 100644
--- a/code/Weather/Sky/SkyComponentData.h
+++ b/code/Weather/Sky/SkyComponentData.h
@@ -66,12 +66,18 @@ class T_DLLCLASS SkyComponentData : public world::IEntityComponentData
 	float getIntensity() const { return m_intensity; }
 
 private:
+	friend class SkyComponent;
+
 	resource::Id< render::Shader > m_shader;
 	resource::Id< render::ITexture > m_texture;
 	float m_intensity = 1.0f;
+
+	Color4f m_skyOverHorizon = Color4f(0.2f, 0.5f, 0.85f, 1.0f);
+	Color4f m_skyUnderHorizon = Color4f(0.1f, 0.1f, 0.12f, 1.0f);
+
 	bool m_clouds = true;
-	Color4f m_overHorizon = Color4f(0.2f, 0.5f, 0.85f, 0.0f);
-	Color4f m_underHorizon = Color4f(0.1f, 0.1f, 0.12f, 0.0f);
+	Color4f m_cloudAmbientTop = Color4f(0.99f, 0.98f, 1.18f, 1.0f);
+	Color4f m_cloudAmbientBottom = Color4f(0.23f, 0.39f, 0.51f, 1.0f);
 };
 
 }
diff --git a/data/Source/System/Weather/Sky/Modules/Sky.xdi b/data/Source/System/Weather/Sky/Modules/Sky.xdi
index 9711404f42..fecaa8acbb 100644
--- a/data/Source/System/Weather/Sky/Modules/Sky.xdi
+++ b/data/Source/System/Weather/Sky/Modules/Sky.xdi
@@ -8,17 +8,9 @@
 vec3 GetSkyColor(vec3 sunDirection, vec3 sunColor, vec3 overHorizon, vec3 underHorizon, vec3 rd)
 {
     const float sundot = clamp(dot(rd, sunDirection), 0.0f, 1.0f);
-
-	// Over horizon
 	vec3 col = overHorizon - max(rd.y, 0.01f) * max(rd.y, 0.01f) * 0.5f;
-
-	// Under horizon
     col = mix(col, underHorizon, pow(1.0f - max(rd.y, 0.0f), 6.0f));
-
-	// Add sun
 	col += sunColor * pow(max(sundot - 0.1, 0), 8.0f);
-    
-//	col += clamp((0.1 - rd.y) * 10.0f, 0.0f, 1.0f) * underHorizon;
     return col;
 }
 
@@ -149,7 +141,21 @@ float volumetricShadow(vec3 from, vec3 offset, float sundotrd, float time, vec3
     return shadow;
 }
 
-vec4 renderClouds(vec3 ro, vec3 rd, float time, vec3 sunDirection, vec3 sunColor, vec2 worldOffset, texture2D clouds2D, texture3D clouds3D, sampler cloudSampler, inout float dist)
+struct CloudConfig
+{
+	vec3 ambientTop;
+	vec3 ambientBottom;
+};
+
+CloudConfig GetDefaultCloudConfig()
+{
+	CloudConfig c;
+	c.ambientTop = CLOUDS_AMBIENT_COLOR_TOP;
+	c.ambientBottom = CLOUDS_AMBIENT_COLOR_BOTTOM;
+	return c;
+}
+
+vec4 RenderClouds(const CloudConfig config, vec3 ro, vec3 rd, float time, vec3 sunDirection, vec3 sunColor, vec2 worldOffset, texture2D clouds2D, texture3D clouds3D, sampler cloudSampler, inout float dist)
 {
     if (rd.y < 0.0f)
         return vec4(0.0f, 0.0f, 0.0f, 1.0f);
@@ -188,19 +194,20 @@ vec4 renderClouds(vec3 ro, vec3 rd, float time, vec3 sunDirection, vec3 sunColor
 
     for (int s = 0; s < CLOUD_MARCH_STEPS; s++)
 	{
-        vec3 p = ro + d * rd;
+		const vec3 p = ro + d * rd;
 
-        float norY = clamp((length(p) - (EARTH_RADIUS + CLOUDS_BOTTOM)) * (1.0f / (CLOUDS_TOP - CLOUDS_BOTTOM)), 0.0f, 1.0f);
-        float alpha = cloudMap( p, offset, rd, norY, time, clouds2D, clouds3D, cloudSampler );
+		const float norY = clamp((length(p) - (EARTH_RADIUS + CLOUDS_BOTTOM)) * (1.0f / (CLOUDS_TOP - CLOUDS_BOTTOM)), 0.0f, 1.0f);
+		const float alpha = cloudMap( p, offset, rd, norY, time, clouds2D, clouds3D, cloudSampler );
 
         if (alpha > 0.0f)
 		{
             dist = min( dist, d);
-            vec3 ambientLight = mix( CLOUDS_AMBIENT_COLOR_BOTTOM, CLOUDS_AMBIENT_COLOR_TOP, norY );
+            const vec3 ambientLight = mix(config.ambientBottom, config.ambientTop, norY);
+
+			const vec3 S = (ambientLight + sunColor * (scattering * volumetricShadow(p, offset, sundotrd, time, sunDirection, clouds2D, clouds3D, cloudSampler))) * alpha;
+			const float dTrans = exp(-alpha * dD);
+			const vec3 Sint = (S - S * dTrans) * (1. / alpha);
 
-            vec3 S = (ambientLight + sunColor * (scattering * volumetricShadow(p, offset, sundotrd, time, sunDirection, clouds2D, clouds3D, cloudSampler))) * alpha;
-            float dTrans = exp(-alpha * dD);
-            vec3 Sint = (S - S * dTrans) * (1. / alpha);
             scatteredLight += transmittance * Sint; 
             transmittance *= dTrans;
         }
diff --git a/data/Source/System/Weather/Sky/Shaders/Dome.xdi b/data/Source/System/Weather/Sky/Shaders/Dome.xdi
index 51a5be34a7..42d5c208c2 100644
--- a/data/Source/System/Weather/Sky/Shaders/Dome.xdi
+++ b/data/Source/System/Weather/Sky/Shaders/Dome.xdi
@@ -111,8 +111,8 @@ $Output = vec4(direction, 0.0f);
 			<id>{C1C98A8B-6A33-2845-8453-2D29B42A8190}</id>
 			<comment/>
 			<position>
-				<first>-114</first>
-				<second>350</second>
+				<first>16</first>
+				<second>440</second>
 			</position>
 			<name>Clouds</name>
 		</item>
@@ -120,8 +120,8 @@ $Output = vec4(direction, 0.0f);
 			<id>{1853FE71-10CD-2743-B521-886CDCD1130D}</id>
 			<comment/>
 			<position>
-				<first>-412</first>
-				<second>311</second>
+				<first>-372</first>
+				<second>392</second>
 			</position>
 			<name>Clouds</name>
 			<technique/>
@@ -166,6 +166,14 @@ $Output = vec4(direction, 0.0f);
 					<id>{70605746-81B0-A64B-8596-3F4762DB8477}</id>
 					<name>EyePosition</name>
 				</item>
+				<item>
+					<id>{BBAD05A9-383C-E749-9AA8-7D5F71419A85}</id>
+					<name>CloudAmbientTop</name>
+				</item>
+				<item>
+					<id>{60A82300-B8BB-F74A-A1E6-9410C272E74C}</id>
+					<name>CloudAmbientBottom</name>
+				</item>
 			</inputPins>
 			<outputPins>
 				<item>
@@ -181,11 +189,17 @@ $Output = vec4(direction, 0.0f);
 			</outputPins>
 			<script>
 			<![CDATA[
+
+CloudConfig config = GetDefaultCloudConfig();
+config.ambientTop = $CloudAmbientTop.xyz;
+config.ambientBottom = $CloudAmbientBottom.xyz;
+
 const vec3 ro = vec3(0.0f);
 const vec3 rd = normalize($Input.xyz);
 
 float dist = 9000.0f;
-const vec4 clr = renderClouds(
+const vec4 clr = RenderClouds(
+	config,
 	ro,
 	rd,
 	$Time.x,
@@ -198,10 +212,9 @@ const vec4 clr = renderClouds(
 	dist
 );
 
-// 6
-
 $Output = clr;
 $Distance = dist;
+
 			]]>
 			</script>
 		</item>
@@ -255,7 +268,7 @@ $Distance = dist;
 			<id>{4E704F36-056A-A347-B55D-6BC9EF584AA9}</id>
 			<comment/>
 			<position>
-				<first>-638</first>
+				<first>-622</first>
 				<second>294</second>
 			</position>
 			<name>DomePosition</name>
@@ -264,7 +277,7 @@ $Distance = dist;
 			<id>{63663B1B-721E-A540-917A-070E4CD34188}</id>
 			<comment/>
 			<position>
-				<first>-686</first>
+				<first>-670</first>
 				<second>380</second>
 			</position>
 			<parameterName>Weather_SkyCloud3D</parameterName>
@@ -275,8 +288,8 @@ $Distance = dist;
 			<id>{A408F529-302C-7B45-BB77-47EC4FC49ED3}</id>
 			<comment/>
 			<position>
-				<first>-686</first>
-				<second>338</second>
+				<first>-670</first>
+				<second>337</second>
 			</position>
 			<parameterName>Weather_SkyCloud2D</parameterName>
 			<type>Texture2D</type>
@@ -286,8 +299,8 @@ $Distance = dist;
 			<id>{09314B7E-7E00-6E46-A4CD-F46F7C4082A1}</id>
 			<comment/>
 			<position>
-				<first>-636</first>
-				<second>422</second>
+				<first>-620</first>
+				<second>423</second>
 			</position>
 			<minFilter>FtLinear</minFilter>
 			<mipFilter>FtLinear</mipFilter>
@@ -305,7 +318,7 @@ $Distance = dist;
 			<comment/>
 			<position>
 				<first>-622</first>
-				<second>464</second>
+				<second>466</second>
 			</position>
 			<parameterName>World_Time</parameterName>
 			<type>Scalar</type>
@@ -315,8 +328,8 @@ $Distance = dist;
 			<id>{5039CD4E-D8C8-3942-BE4E-201B92D2DDB4}</id>
 			<comment/>
 			<position>
-				<first>-702</first>
-				<second>506</second>
+				<first>-686</first>
+				<second>509</second>
 			</position>
 			<parameterName>Weather_SkySunDirection</parameterName>
 			<type>Vector</type>
@@ -326,8 +339,8 @@ $Distance = dist;
 			<id>{6EC4A53C-25B5-5C4C-8DB4-4E976EB2DBA5}</id>
 			<comment/>
 			<position>
-				<first>-686</first>
-				<second>548</second>
+				<first>-670</first>
+				<second>552</second>
 			</position>
 			<parameterName>Weather_SkySunColor</parameterName>
 			<type>Vector</type>
@@ -337,8 +350,8 @@ $Distance = dist;
 			<id>{B17ADA46-C381-B64E-BACC-0975857EE8A7}</id>
 			<comment/>
 			<position>
-				<first>-660</first>
-				<second>590</second>
+				<first>-644</first>
+				<second>595</second>
 			</position>
 			<value>0, 0, 0, 0</value>
 		</item>
@@ -474,6 +487,28 @@ $Output = vec4(sz.x, sz.y, 0.0f, 0.0f);
 			<type>Scalar</type>
 			<frequency>Frame</frequency>
 		</item>
+		<item type="traktor.render.Uniform" version="3,traktor.render.Node:1">
+			<id>{0971A080-14C8-0244-A654-37299B4D65E8}</id>
+			<comment/>
+			<position>
+				<first>-718</first>
+				<second>638</second>
+			</position>
+			<parameterName>Weather_SkyCloudAmbientTop</parameterName>
+			<type>Vector</type>
+			<frequency>Frame</frequency>
+		</item>
+		<item type="traktor.render.Uniform" version="3,traktor.render.Node:1">
+			<id>{9BAB07A1-09A4-734C-885B-8F7749B7AA46}</id>
+			<comment/>
+			<position>
+				<first>-734</first>
+				<second>681</second>
+			</position>
+			<parameterName>Weather_SkyCloudAmbientBottom</parameterName>
+			<type>Vector</type>
+			<frequency>Frame</frequency>
+		</item>
 	</nodes>
 	<edges>
 		<item type="traktor.render.Edge" version="1">
@@ -736,6 +771,26 @@ $Output = vec4(sz.x, sz.y, 0.0f, 0.0f);
 				<id>{5A25771B-894F-4D92-8D1E-FBF8449850E8}</id>
 			</destination>
 		</item>
+		<item type="traktor.render.Edge" version="1">
+			<source>
+				<node ref="/object/nodes/item[31]"/>
+				<id>{1E6639B6-8B58-4694-99E7-C058E3583522}</id>
+			</source>
+			<destination>
+				<node ref="/object/nodes/item[9]"/>
+				<id>{BBAD05A9-383C-E749-9AA8-7D5F71419A85}</id>
+			</destination>
+		</item>
+		<item type="traktor.render.Edge" version="1">
+			<source>
+				<node ref="/object/nodes/item[32]"/>
+				<id>{1E6639B6-8B58-4694-99E7-C058E3583522}</id>
+			</source>
+			<destination>
+				<node ref="/object/nodes/item[9]"/>
+				<id>{60A82300-B8BB-F74A-A1E6-9410C272E74C}</id>
+			</destination>
+		</item>
 	</edges>
 	<groups/>
 </object>
diff --git a/data/Source/System/Weather/Sky/Shaders/Sky.xdi b/data/Source/System/Weather/Sky/Shaders/Sky.xdi
index 8d85440aa0..d918fc0c1b 100644
--- a/data/Source/System/Weather/Sky/Shaders/Sky.xdi
+++ b/data/Source/System/Weather/Sky/Shaders/Sky.xdi
@@ -569,7 +569,6 @@ const vec3 clr = GetSkyColor(
 	rd
 );
 $Output = vec4(clr, 1.0f);
-
 			]]>
 			</script>
 		</item>
@@ -586,8 +585,8 @@ $Output = vec4(clr, 1.0f);
 			<id>{8FB6549E-5322-4FD8-8912-FD35D323CFF6}</id>
 			<comment/>
 			<position>
-				<first>-754</first>
-				<second>779</second>
+				<first>-759</first>
+				<second>746</second>
 			</position>
 			<name>WorldPosition</name>
 		</item>
@@ -595,8 +594,8 @@ $Output = vec4(clr, 1.0f);
 			<id>{3D50C5B7-186C-4798-A7E6-79FB8597A7B9}</id>
 			<comment/>
 			<position>
-				<first>-431</first>
-				<second>801</second>
+				<first>-430</first>
+				<second>800</second>
 			</position>
 			<name>Clouds</name>
 			<technique/>
@@ -641,6 +640,14 @@ $Output = vec4(clr, 1.0f);
 					<id>{70605746-81B0-A64B-8596-3F4762DB8477}</id>
 					<name>EyePosition</name>
 				</item>
+				<item>
+					<id>{5A6AB96D-1E34-304F-84D6-0E87D23435B4}</id>
+					<name>CloudAmbientTop</name>
+				</item>
+				<item>
+					<id>{FA94D259-22C0-4243-9837-74F3B1664F1F}</id>
+					<name>CloudAmbientBottom</name>
+				</item>
 			</inputPins>
 			<outputPins>
 				<item>
@@ -656,11 +663,17 @@ $Output = vec4(clr, 1.0f);
 			</outputPins>
 			<script>
 			<![CDATA[
+
+CloudConfig config = GetDefaultCloudConfig();
+config.ambientTop = $CloudAmbientTop.xyz;
+config.ambientBottom = $CloudAmbientBottom.xyz;
+
 const vec3 ro = vec3(0.0f);
 const vec3 rd = normalize($Input.xyz);
 
 float dist = 8000.0f;
-const vec4 clr = renderClouds(
+const vec4 clr = RenderClouds(
+	config,
 	ro,
 	rd,
 	$Time.x,
@@ -673,10 +686,9 @@ const vec4 clr = renderClouds(
 	dist
 );
 
-// 6
-
 $Output = clr;
 $Distance = dist;
+
 			]]>
 			</script>
 		</item>
@@ -684,8 +696,8 @@ $Distance = dist;
 			<id>{2BB29238-2675-42BB-9382-17C55B6C1380}</id>
 			<comment/>
 			<position>
-				<first>-752</first>
-				<second>896</second>
+				<first>-757</first>
+				<second>866</second>
 			</position>
 			<minFilter>FtLinear</minFilter>
 			<mipFilter>FtLinear</mipFilter>
@@ -702,8 +714,8 @@ $Distance = dist;
 			<id>{1AD17D96-8F2E-457A-AAB5-8EBCE60711EA}</id>
 			<comment/>
 			<position>
-				<first>-802</first>
-				<second>818</second>
+				<first>-807</first>
+				<second>786</second>
 			</position>
 			<parameterName>Weather_SkyCloud2D</parameterName>
 			<type>Texture2D</type>
@@ -713,8 +725,8 @@ $Distance = dist;
 			<id>{20235D86-BCB0-485E-91F7-F7E2ADE78B21}</id>
 			<comment/>
 			<position>
-				<first>-802</first>
-				<second>857</second>
+				<first>-807</first>
+				<second>826</second>
 			</position>
 			<parameterName>Weather_SkyCloud3D</parameterName>
 			<type>Texture3D</type>
@@ -741,8 +753,8 @@ $Distance = dist;
 			<id>{21D1CC08-6848-49CB-BA67-E49974F893C6}</id>
 			<comment/>
 			<position>
-				<first>-754</first>
-				<second>935</second>
+				<first>-759</first>
+				<second>906</second>
 			</position>
 			<parameterName>World_Time</parameterName>
 			<type>Scalar</type>
@@ -752,8 +764,8 @@ $Distance = dist;
 			<id>{49BB686E-3893-4F3E-AFAC-FAC0AC817383}</id>
 			<comment/>
 			<position>
-				<first>-802</first>
-				<second>662</second>
+				<first>-807</first>
+				<second>626</second>
 			</position>
 			<parameterName>Weather_SkySunColor</parameterName>
 			<type>Vector</type>
@@ -763,8 +775,8 @@ $Distance = dist;
 			<id>{CFE120E4-0277-41B4-A10C-9C932F6764B0}</id>
 			<comment/>
 			<position>
-				<first>-818</first>
-				<second>623</second>
+				<first>-823</first>
+				<second>586</second>
 			</position>
 			<parameterName>Weather_SkySunDirection</parameterName>
 			<type>Vector</type>
@@ -808,8 +820,8 @@ $Distance = dist;
 			<id>{3CC2F2B4-36BD-B54E-8E1B-D12B69ADE23F}</id>
 			<comment/>
 			<position>
-				<first>-818</first>
-				<second>974</second>
+				<first>-807</first>
+				<second>946</second>
 			</position>
 			<parameterName>Weather_SkyEyePosition</parameterName>
 			<type>Vector</type>
@@ -875,8 +887,8 @@ $Distance = dist;
 			<id>{41365992-5B09-6A4D-B23B-AC507AE2A162}</id>
 			<comment/>
 			<position>
-				<first>-133</first>
-				<second>838</second>
+				<first>-31</first>
+				<second>840</second>
 			</position>
 			<name>Clouds1</name>
 		</item>
@@ -985,8 +997,8 @@ $Output = vec4(texCoord, 0.0f, 0.0f);
 			<id>{E7530B7B-E7A2-3C4B-8072-C3B73EE99101}</id>
 			<comment/>
 			<position>
-				<first>-776</first>
-				<second>1013</second>
+				<first>-781</first>
+				<second>986</second>
 			</position>
 			<value>0, 0, 0, 0</value>
 		</item>
@@ -1143,8 +1155,8 @@ $Output = vec4(texCoord, 0.0f, 0.0f);
 			<id>{0CF0ACDC-F017-5E45-8BA8-266248431786}</id>
 			<comment/>
 			<position>
-				<first>-818</first>
-				<second>701</second>
+				<first>-823</first>
+				<second>666</second>
 			</position>
 			<parameterName>Weather_SkyOverHorizon</parameterName>
 			<type>Vector</type>
@@ -1154,13 +1166,35 @@ $Output = vec4(texCoord, 0.0f, 0.0f);
 			<id>{3F5650EA-F241-BC47-B523-B8813F1C899C}</id>
 			<comment/>
 			<position>
-				<first>-834</first>
-				<second>740</second>
+				<first>-823</first>
+				<second>706</second>
 			</position>
 			<parameterName>Weather_SkyUnderHorizon</parameterName>
 			<type>Vector</type>
 			<frequency>Frame</frequency>
 		</item>
+		<item type="traktor.render.Uniform" version="3,traktor.render.Node:1">
+			<id>{A1A5F0FA-50D4-3A4A-B6E4-B5B132ECC274}</id>
+			<comment/>
+			<position>
+				<first>-871</first>
+				<second>1066</second>
+			</position>
+			<parameterName>Weather_SkyCloudAmbientBottom</parameterName>
+			<type>Vector</type>
+			<frequency>Frame</frequency>
+		</item>
+		<item type="traktor.render.Uniform" version="3,traktor.render.Node:1">
+			<id>{A14A6472-9C96-BE4F-96A1-420BA685CC91}</id>
+			<comment/>
+			<position>
+				<first>-855</first>
+				<second>1026</second>
+			</position>
+			<parameterName>Weather_SkyCloudAmbientTop</parameterName>
+			<type>Vector</type>
+			<frequency>Frame</frequency>
+		</item>
 	</nodes>
 	<edges>
 		<item type="traktor.render.Edge" version="1">
@@ -1963,6 +1997,26 @@ $Output = vec4(texCoord, 0.0f, 0.0f);
 				<id>{AD277C19-9612-9141-AA5C-097F83F5B743}</id>
 			</destination>
 		</item>
+		<item type="traktor.render.Edge" version="1">
+			<source>
+				<node ref="/object/nodes/item[80]"/>
+				<id>{1E6639B6-8B58-4694-99E7-C058E3583522}</id>
+			</source>
+			<destination>
+				<node ref="/object/nodes/item[33]"/>
+				<id>{5A6AB96D-1E34-304F-84D6-0E87D23435B4}</id>
+			</destination>
+		</item>
+		<item type="traktor.render.Edge" version="1">
+			<source>
+				<node ref="/object/nodes/item[79]"/>
+				<id>{1E6639B6-8B58-4694-99E7-C058E3583522}</id>
+			</source>
+			<destination>
+				<node ref="/object/nodes/item[33]"/>
+				<id>{FA94D259-22C0-4243-9837-74F3B1664F1F}</id>
+			</destination>
+		</item>
 	</edges>
 	<groups/>
 </object>