diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index a66c135..4dc161d 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -6,7 +6,9 @@
   <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/assets/Model/OBJ/skysphere.obj" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/assets/Model/OBJ/skysphere.obj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/shadermanagerclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/shadermanagerclass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -165,6 +167,7 @@
       <workItem from="1746113092234" duration="1477000" />
       <workItem from="1746117455914" duration="5976000" />
       <workItem from="1746126812110" duration="180000" />
+      <workItem from="1746188920194" duration="1870000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini
index 30c04b2..b79fd41 100644
--- a/enginecustom/imgui.ini
+++ b/enginecustom/imgui.ini
@@ -17,7 +17,7 @@ DockId=0x00000009,1
 
 [Window][Terrain]
 Pos=8,27
-Size=250,974
+Size=250,826
 Collapsed=0
 DockId=0x00000007,0
 
diff --git a/enginecustom/src/inc/shader/shadermanagerclass.h b/enginecustom/src/inc/shader/shadermanagerclass.h
index c708301..06c6864 100644
--- a/enginecustom/src/inc/shader/shadermanagerclass.h
+++ b/enginecustom/src/inc/shader/shadermanagerclass.h
@@ -46,19 +46,6 @@ public:
     bool RenderCelShadingShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
 	bool RenderSunlightShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
 	bool RenderSkyboxShader(ID3D11DeviceContext*, int, XMMATRIX, XMMATRIX, XMMATRIX, ID3D11ShaderResourceView*, XMFLOAT4, XMFLOAT4, XMFLOAT3, float);
-	// 	ID3D11DeviceContext* deviceContext,
-	// 	int indexCount,
-	// 	XMMATRIX worldMatrix,
-	// 	XMMATRIX viewMatrix,
-	// 	XMMATRIX projectionMatrix,
-	// 	ID3D11ShaderResourceView* front,
-	// 	ID3D11ShaderResourceView* back,
-	// 	ID3D11ShaderResourceView* left,
-	// 	ID3D11ShaderResourceView* right,
-	// 	ID3D11ShaderResourceView* top,
-	// 	ID3D11ShaderResourceView* bottom,
-	// 	XMFLOAT4 sunDiffuseColor
-	// 	);
 	
 private:
     TextureShaderClass* m_TextureShader;
diff --git a/enginecustom/src/src/system/applicationclass.cpp b/enginecustom/src/src/system/applicationclass.cpp
index c8d870a..c87f20e 100644
--- a/enginecustom/src/src/system/applicationclass.cpp
+++ b/enginecustom/src/src/system/applicationclass.cpp
@@ -1920,6 +1920,7 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 					return false;
 				}
 				break;
+				
 			case ShaderType::TEXTURE:
 				result = m_ShaderManager->RenderTextureShader(
 					m_Direct3D->GetDeviceContext(),
@@ -1968,20 +1969,6 @@ bool ApplicationClass::RenderPass(const std::vector<std::reference_wrapper<std::
 					m_SunLight->GetDirection(),
 					m_SunLight->GetIntensity()
 					);
-				
-					// m_Direct3D->GetDeviceContext(),
-					// object->GetIndexCount(),
-					// worldMatrix,
-					// view,
-					// projection,
-					// object->GetTexture(0), // Front
-					// object->GetTexture(1), // Back
-					// object->GetTexture(2), // Left
-					// object->GetTexture(3), // Right
-					// object->GetTexture(4), // Top
-					// object->GetTexture(5),	// Bottom
-					// m_SunLight->GetDiffuseColor() // Sunlight color to tint the skybox
-					// );
 				if (!result)
 				{
 					Logger::Get().Log("Could not render the object model using the skybox shader", __FILE__, __LINE__, Logger::LogLevel::Error);