diff --git a/data/effects/lut.effect b/data/effects/lut.effect
index 1231b6c4..c03add1a 100644
--- a/data/effects/lut.effect
+++ b/data/effects/lut.effect
@@ -36,7 +36,7 @@ float4 generate_lut2(float2 uv, uint4 params0) {
 	);
 };
 
-float3 sample_lut(float3 color, uint bit_depth, texture2D lut_texture) {
+float3 sample_lut(float3 color, uint bit_depth, texture2d lut_texture) {
 	uint size = pow(2, bit_depth);
 	uint z_size = pow(2, bit_depth / 2);
 	uint container_size = pow(2, bit_depth + (bit_depth / 2));
@@ -82,7 +82,7 @@ float3 sample_lut(float3 color, uint bit_depth, texture2D lut_texture) {
 	return lerp(c_lo, c_hi, frac(color.z));
 };
 
-float3 sample_lut2(float3 color, texture2D lut_texture, int4 params0, float4 params1) {
+float3 sample_lut2(float3 color, texture2d lut_texture, int4 params0, float4 params1) {
 	uint size = params0.r;
 	uint z_size = params0.g;
 	uint container_size = params0.b;
diff --git a/data/effects/shared.effect b/data/effects/shared.effect
index afc8d6a3..6c718e6f 100644
--- a/data/effects/shared.effect
+++ b/data/effects/shared.effect
@@ -50,6 +50,7 @@ struct VertexData {
 	float4 pos : POSITION;
 	float2 uv  : TEXCOORD0;
 };
+
 struct VertexColorData {
 	float4 pos : POSITION;
 	float4 clr : COLOR;
@@ -63,6 +64,7 @@ VertexData DefaultVertexShader(VertexData vtx) {
 	vtx.pos = mul(float4(vtx.pos.xyz, 1.0), ViewProj);
 	return vtx;
 };
+
 VertexColorData ColorVertexShader(VertexColorData vtx) {
 	vtx.pos = mul(float4(vtx.pos.xyz, 1.0), ViewProj);
 	return vtx;
diff --git a/data/effects/standard.effect b/data/effects/standard.effect
index d56a6982..45aad9aa 100644
--- a/data/effects/standard.effect
+++ b/data/effects/standard.effect
@@ -1,9 +1,10 @@
 #include "shared.effect"
 
-uniform texture2D InputA<
+uniform texture2d InputA<
 	bool automatic = true;
 >;
-uniform texture2D InputB<
+
+uniform texture2d InputB<
 	bool automatic = true;
 >;
 
diff --git a/data/effects/transform.effect b/data/effects/transform.effect
index 85c01608..6dd10542 100644
--- a/data/effects/transform.effect
+++ b/data/effects/transform.effect
@@ -1,6 +1,6 @@
 #include "shared.effect"
 
-uniform texture2D InputA<
+uniform texture2d InputA<
 	bool automatic = true;
 >;
 
@@ -58,7 +58,7 @@ uniform float2 CornerBR<
 // - CornerBL: Corner "D"
 // - CornerBR: Corner "C"
 
-float2 cross2d(in float2 a, in float2 b) {
+float cross2d(in float2 a, in float2 b) {
 	return (a.x * b.y) - (a.y * b.x);
 };
 
diff --git a/data/effects/virtual-greenscreen.effect b/data/effects/virtual-greenscreen.effect
index 182b951c..694f9ba6 100644
--- a/data/effects/virtual-greenscreen.effect
+++ b/data/effects/virtual-greenscreen.effect
@@ -1,9 +1,9 @@
 #include "shared.effect"
 
-uniform texture2D InputA<
+uniform texture2d InputA<
 	bool automatic = true;
 >;
-uniform texture2D InputB<
+uniform texture2d InputB<
 	bool automatic = true;
 >;
 uniform float Threshold<