Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.fp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.fp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.fp
@@ -0,0 +1,15 @@
+!!ARBfp1.0
+
+TEMP tex_color;
+TEX tex_color, fragment.texcoord[0], texture[0], 2D;
+
+PARAM add_color = program.local[1];
+
+TEMP color;
+MOV color, add_color;
+MAD color.rgb, color, tex_color.a, tex_color;
+MOV color.a, tex_color.a;
+
+MOV result.color, color;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.vp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.vp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.vp
@@ -0,0 +1,16 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+DP4 position.z, transform[2], vertex.position;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+MOV result.texcoord[0], vertex.texcoord[0];
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_add.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/gui_add.vp">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <uniform name="transform" loc="0" type="mat4"/>
+    </vertex>
+
+    <fragment file="arb/gui_add.fp">
+        <uniform name="tex" loc="0" type="sampler2D"/>
+        <uniform name="color" loc="1" type="vec4"/>
+    </fragment>
+
+</program>
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.fp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.fp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.fp
@@ -0,0 +1,5 @@
+!!ARBfp1.0
+
+TEX result.color, fragment.texcoord[0], texture[0], 2D;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.vp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.vp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.vp
@@ -0,0 +1,16 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+DP4 position.z, transform[2], vertex.position;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+MOV result.texcoord[0], vertex.texcoord[0];
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_basic.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/gui_basic.vp">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <uniform name="transform" loc="0" type="mat4"/>
+    </vertex>
+
+    <fragment file="arb/gui_basic.fp">
+        <uniform name="tex" loc="0" type="sampler2D"/>
+    </fragment>
+
+</program>
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.fp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.fp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.fp
@@ -0,0 +1,18 @@
+!!ARBfp1.0
+
+TEMP tex_color;
+TEX tex_color, fragment.texcoord[0], texture[0], 2D;
+
+TEMP grayscale;
+MOV grayscale.r, 0.3;
+MOV grayscale.g, 0.59;
+MOV grayscale.b, 0.11;
+MOV grayscale.a, 0.0;
+
+TEMP color;
+DP3 color.rgb, tex_color, grayscale;
+MOV color.a, tex_color.a;
+
+MOV result.color, color;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.vp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.vp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.vp
@@ -0,0 +1,16 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+DP4 position.z, transform[2], vertex.position;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+MOV result.texcoord[0], vertex.texcoord[0];
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_grayscale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/gui_grayscale.vp">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <uniform name="transform" loc="0" type="mat4"/>
+    </vertex>
+
+    <fragment file="arb/gui_grayscale.fp">
+        <uniform name="tex" loc="0" type="sampler2D"/>
+    </fragment>
+
+</program>
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.fp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.fp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.fp
@@ -0,0 +1,7 @@
+!!ARBfp1.0
+
+PARAM color = program.local[0];
+
+MOV result.color, color;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.vp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.vp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.vp
@@ -0,0 +1,14 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+DP4 position.z, transform[2], vertex.position;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/gui_solid.vp">
+        <uniform name="transform" loc="0" type="mat4"/>
+        <stream name="pos"/>
+    </vertex>
+
+    <fragment file="arb/gui_solid.fp">
+        <uniform name="color" loc="0" type="vec4"/>
+    </fragment>
+
+</program>
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.fp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.fp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.fp
@@ -0,0 +1,14 @@
+!!ARBfp1.0
+
+TEMP tex_color;
+TEX tex_color, fragment.texcoord[0], texture[0], 2D;
+
+PARAM add_color = program.local[1];
+
+TEMP color;
+MOV color, add_color;
+MUL color.a, color.a, tex_color.a;
+
+MOV result.color, color;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.vp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.vp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.vp
@@ -0,0 +1,16 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+DP4 position.z, transform[2], vertex.position;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+MOV result.texcoord[0], vertex.texcoord[0];
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_solid_mask.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/gui_solid_mask.vp">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <uniform name="transform" loc="0" type="mat4"/>
+    </vertex>
+
+    <fragment file="arb/gui_solid_mask.fp">
+        <uniform name="tex" loc="0" type="sampler2D"/>
+        <uniform name="color" loc="1" type="vec4"/>
+    </fragment>
+
+</program>
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.fp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.fp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.fp
@@ -0,0 +1,15 @@
+!!ARBfp1.0
+
+TEMP tex_color;
+TEX tex_color, fragment.texcoord[0], texture[0], 2D;
+
+PARAM add_color = program.local[1];
+PARAM mul_color = program.local[2];
+
+TEMP color;
+ADD color, tex_color, add_color;
+MUL color, color, mul_color;
+
+MOV result.color, color;
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.vp
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.vp
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.vp
@@ -0,0 +1,16 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+DP4 position.z, transform[2], vertex.position;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+MOV result.texcoord[0], vertex.texcoord[0];
+
+END
Index: ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/arb/gui_text.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/gui_text.vp">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <uniform name="transform" loc="0" type="mat4"/>
+    </vertex>
+
+    <fragment file="arb/gui_text.fp">
+        <uniform name="tex" loc="0" type="sampler2D"/>
+        <uniform name="colorAdd" loc="1" type="vec4"/>
+        <uniform name="colorMul" loc="2" type="vec4"/>
+    </fragment>
+
+</program>
Index: ps/trunk/binaries/data/mods/mod/shaders/effects/gui_add.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/effects/gui_add.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/effects/gui_add.xml
@@ -2,6 +2,11 @@
 <effect>
 
     <technique>
+        <require shaders="arb"/>
+        <pass shader="arb/gui_add"/>
+    </technique>
+
+    <technique>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_add"/>
     </technique>
Index: ps/trunk/binaries/data/mods/mod/shaders/effects/gui_basic.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/effects/gui_basic.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/effects/gui_basic.xml
@@ -2,6 +2,11 @@
 <effect>
 
     <technique>
+        <require shaders="arb"/>
+        <pass shader="arb/gui_basic"/>
+    </technique>
+
+    <technique>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_basic"/>
     </technique>
Index: ps/trunk/binaries/data/mods/mod/shaders/effects/gui_grayscale.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/effects/gui_grayscale.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/effects/gui_grayscale.xml
@@ -2,6 +2,11 @@
 <effect>
 
     <technique>
+        <require shaders="arb"/>
+        <pass shader="arb/gui_grayscale"/>
+    </technique>
+
+    <technique>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_grayscale"/>
     </technique>
Index: ps/trunk/binaries/data/mods/mod/shaders/effects/gui_solid.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/effects/gui_solid.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/effects/gui_solid.xml
@@ -2,6 +2,11 @@
 <effect>
 
     <technique>
+        <require shaders="arb"/>
+        <pass shader="arb/gui_solid"/>
+    </technique>
+
+    <technique>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_solid"/>
     </technique>
Index: ps/trunk/binaries/data/mods/mod/shaders/effects/gui_solid_mask.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/effects/gui_solid_mask.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/effects/gui_solid_mask.xml
@@ -2,6 +2,11 @@
 <effect>
 
     <technique>
+        <require shaders="arb"/>
+        <pass shader="arb/gui_solid_mask"/>
+    </technique>
+
+    <technique>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_solid"/>
     </technique>
Index: ps/trunk/binaries/data/mods/mod/shaders/effects/gui_text.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/effects/gui_text.xml
+++ ps/trunk/binaries/data/mods/mod/shaders/effects/gui_text.xml
@@ -2,6 +2,13 @@
 <effect>
 
     <technique>
+        <require shaders="arb"/>
+        <pass shader="arb/gui_text">
+            <blend src="src_alpha" dst="one_minus_src_alpha"/>
+        </pass>
+    </technique>
+
+    <technique>
         <require shaders="fixed"/>
         <pass shader="fixed:gui_text">
             <blend src="src_alpha" dst="one_minus_src_alpha"/>
Index: ps/trunk/binaries/data/mods/mod/shaders/glsl/gui_grayscale.fs
===================================================================
--- ps/trunk/binaries/data/mods/mod/shaders/glsl/gui_grayscale.fs
+++ ps/trunk/binaries/data/mods/mod/shaders/glsl/gui_grayscale.fs
@@ -1,7 +1,6 @@
 #version 110
 
 uniform sampler2D tex;
-uniform vec4 color;
 
 varying vec2 v_tex;