diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index b144e01..38e13c0 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -5,12 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/shader-error.txt" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/shader-error.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.ps" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.ps" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.vs" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.vs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/SkyboxShaderClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/SkyboxShaderClass.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/SkyboxShaderClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/SkyboxShaderClass.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -167,7 +165,7 @@
       <workItem from="1746106963725" duration="5888000" />
       <workItem from="1746112904421" duration="75000" />
       <workItem from="1746113092234" duration="1477000" />
-      <workItem from="1746117455914" duration="4400000" />
+      <workItem from="1746117455914" duration="4814000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
diff --git a/enginecustom/src/hlsl/skybox.ps b/enginecustom/src/hlsl/skybox.ps
index 04e7d83..12d771c 100644
--- a/enginecustom/src/hlsl/skybox.ps
+++ b/enginecustom/src/hlsl/skybox.ps
@@ -3,7 +3,7 @@
 /////////////
 Texture2D shaderTexture : register(t0);
 SamplerState SampleType : register(s0);
-cbuffer SunLightBuffer
+cbuffer SkyboxBuffer
 {
     float4 ambientColor;
     float4 diffuseColor;
@@ -11,7 +11,7 @@ cbuffer SunLightBuffer
     float intensity;
 };
 
-cbuffer SunLightColorBuffer
+cbuffer SkyboxColorBuffer
 {
     float4 sunColor;
 };
diff --git a/enginecustom/src/hlsl/skybox.vs b/enginecustom/src/hlsl/skybox.vs
index 3325ac1..d3f4e1c 100644
--- a/enginecustom/src/hlsl/skybox.vs
+++ b/enginecustom/src/hlsl/skybox.vs
@@ -14,7 +14,7 @@ cbuffer CameraBuffer
     float padding;
 };
 
-cbuffer SunLightBuffer
+cbuffer SkyboxBuffer
 {
     float4 ambientColor;
     float4 diffuseColor;
diff --git a/enginecustom/src/inc/shader/SkyboxShaderClass.h b/enginecustom/src/inc/shader/SkyboxShaderClass.h
index f6bb526..a5293ac 100644
--- a/enginecustom/src/inc/shader/SkyboxShaderClass.h
+++ b/enginecustom/src/inc/shader/SkyboxShaderClass.h
@@ -25,7 +25,7 @@ class SkyboxShaderClass
         float padding;
     };
 
-    struct SunLightBufferType
+    struct SkyboxBufferType
     {
         XMFLOAT4 diffuseColor;
         XMFLOAT4 ambientColor;
@@ -33,7 +33,7 @@ class SkyboxShaderClass
         float intensity;
     };
 
-    struct SunLightColorBufferType
+    struct SkyboxColorBufferType
     {
         XMFLOAT4 sunColor;
     };
diff --git a/enginecustom/src/src/shader/SkyboxShaderClass.cpp b/enginecustom/src/src/shader/SkyboxShaderClass.cpp
index 453bd03..34a1fc8 100644
--- a/enginecustom/src/src/shader/SkyboxShaderClass.cpp
+++ b/enginecustom/src/src/shader/SkyboxShaderClass.cpp
@@ -244,7 +244,7 @@ bool SkyboxShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
 
     // Setup the description of the dynamic sunlight constant buffer that is in the pixel shader.
     sunlightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    sunlightBufferDesc.ByteWidth = sizeof(SunLightBufferType);
+    sunlightBufferDesc.ByteWidth = sizeof(SkyboxBufferType);
     sunlightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
     sunlightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
     sunlightBufferDesc.MiscFlags = 0;
@@ -380,7 +380,7 @@ bool SkyboxShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
     D3D11_MAPPED_SUBRESOURCE mappedResource;
     MatrixBufferType* dataPtr;
     CameraBufferType* dataPtr2;
-    SunLightBufferType* dataPtr3;
+    SkyboxBufferType* dataPtr3;
     unsigned int bufferNumber;
 
     // Transpose the matrices to prepare them for the shader.
@@ -420,7 +420,7 @@ bool SkyboxShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
     }
 
     // Get a pointer to the data in the constant buffer.
-    dataPtr3 = (SunLightBufferType*)mappedResource.pData;
+    dataPtr3 = (SkyboxBufferType*)mappedResource.pData;
 
     // Copy the lighting variables into the constant buffer.
     dataPtr3->ambientColor = ambientColor;