diff --git a/DX11Starter.vcxproj b/DX11Starter.vcxproj
index 553218b..e45d3ec 100644
--- a/DX11Starter.vcxproj
+++ b/DX11Starter.vcxproj
@@ -217,6 +217,10 @@
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
     </FxCompile>
     <FxCompile Include="VertexShader.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
diff --git a/Game.cpp b/Game.cpp
index d5516e3..022ea2a 100644
--- a/Game.cpp
+++ b/Game.cpp
@@ -178,48 +178,48 @@ void Game::LoadTextures()
 
 	materials[1]->PushSampler("BasicSampler", sampler);
 	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[1]->SetNormalIntensity(2.5f);
 
 	materials[2]->PushSampler("BasicSampler", sampler);
 	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 
 	materials[3]->PushSampler("BasicSampler", sampler);
 	materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 
 	materials[4]->PushSampler("BasicSampler", sampler);
 	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[4]->SetNormalIntensity(0.5f);
 
 	materials[5]->PushSampler("BasicSampler", sampler);
 	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[5]->SetNormalIntensity(3.5f);
 
 	materials[6]->PushSampler("BasicSampler", sampler);
 	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 
 	materials[7]->PushSampler("BasicSampler", sampler);
 	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[7]->SetNormalIntensity(3.5f);
 
 	materials[8]->PushSampler("BasicSampler", sampler);
@@ -248,16 +248,16 @@ void Game::LoadTextures()
 	materials[10]->SetEmitAmount(XMFLOAT3(0.05f, 0.1f, 0.01f));
 
 	materials[11]->PushSampler("BasicSampler", sampler);
-	materials[11]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
 	materials[11]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
 	materials[11]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
+	materials[11]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
 	materials[11]->SetEmitAmount(XMFLOAT3(0.05f, 0.1f, 0.01f));
 
 	materials[12]->PushSampler("BasicSampler", sampler);
 	materials[12]->LoadTexture(L"Assets/Textures/Transparent/fence_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
-	materials[12]->LoadTexture(L"Assets/Textures/Transparent/fence_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
-	materials[12]->LoadTexture(L"Assets/Textures/Transparent/fence_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
 	materials[12]->LoadTexture(L"Assets/Textures/Transparent/fence_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+	materials[12]->LoadTexture(L"Assets/Textures/Transparent/fence_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
+	materials[12]->LoadTexture(L"Assets/Textures/Transparent/fence_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
 	materials[12]->SetCutoff(0.95f);
 
 	materials[13]->PushSampler("BasicSampler", sampler);
diff --git a/Material.cpp b/Material.cpp
index 1d5c8f7..d424711 100644
--- a/Material.cpp
+++ b/Material.cpp
@@ -231,6 +231,7 @@ void Material::PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11Shade
 {
 	textures.insert({ _name, _texture });
 }
+
 void Material::SwapTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _newTexture)
 {
 	textures[_name] = _newTexture;
diff --git a/SimplePixelPBR.hlsl b/SimplePixelPBR.hlsl
index 3d3db42..8838752 100644
--- a/SimplePixelPBR.hlsl
+++ b/SimplePixelPBR.hlsl
@@ -24,7 +24,7 @@ Texture2D Normal : register(t1);
 Texture2D Roughness : register(t2);
 Texture2D Metalness : register(t3);
 TextureCube Reflection : register(t4);
-SamplerState Sampler : register(s0);
+SamplerState BasicSampler : register(s0);
 
 float4 main(VertexToPixel input) : SV_TARGET
 {
@@ -34,14 +34,14 @@ float4 main(VertexToPixel input) : SV_TARGET
 	input.uv = input.uv * scale + offset;
 
 	// gets albedo with gamma correction
-	float4 albedo = pow(Albedo.Sample(Sampler, input.uv), 2.2f);
+	float4 albedo = pow(Albedo.Sample(BasicSampler, input.uv), 2.2f);
 
 	// gets normal map
-	float3 normal = getNormal(Sampler, Normal, input.uv, input.normal, input.tangent, normalIntensity);
+	float3 normal = getNormal(BasicSampler, Normal, input.uv, input.normal, input.tangent, normalIntensity);
 
 	// get pbr values
-	float roughness = Roughness.Sample(Sampler, input.uv).r;
-	float metalness = Metalness.Sample(Sampler, input.uv).r;
+	float roughness = Roughness.Sample(BasicSampler, input.uv).r;
+	float metalness = Metalness.Sample(BasicSampler, input.uv).r;
 	float3 specular = lerp(F0_NON_METAL.rrr, albedo.rgb, metalness);
 
 	// pre-calculate view
diff --git a/SimplePixelShader.hlsl b/SimplePixelShader.hlsl
index dcb4a8c..fd4e688 100644
--- a/SimplePixelShader.hlsl
+++ b/SimplePixelShader.hlsl
@@ -33,9 +33,9 @@ cbuffer ExternalData : register(b0)
 }
 
 Texture2D Albedo : register(t0);
-Texture2D Specular : register(t1);
-Texture2D Emissive : register(t2);
-Texture2D Normal : register(t3);
+Texture2D Normal : register(t1);
+Texture2D Specular : register(t2);
+Texture2D Emissive : register(t3);
 TextureCube Reflection : register(t4);
 SamplerState BasicSampler : register(s0);
 
diff --git a/ToonShader.hlsl b/ToonShader.hlsl
index 81a463e..6768616 100644
--- a/ToonShader.hlsl
+++ b/ToonShader.hlsl
@@ -40,11 +40,12 @@ cbuffer ExternalData : register(b0)
 }
 
 Texture2D Albedo : register(t0);
-Texture2D Specular : register(t1);
-Texture2D Normal : register(t2);
+Texture2D Normal : register(t1);
+Texture2D Specular : register(t2);
 Texture2D Emissive : register(t3);
-Texture2D RampDiffuse : register(t4);
-Texture2D RampSpecular : register(t5);
+TextureCube Reflection : register(t4);
+Texture2D RampDiffuse : register(t5);
+Texture2D RampSpecular : register(t6);
 SamplerState BasicSampler : register(s0);
 SamplerState ClampSampler : register(s1);