diff --git a/fgd/point/info/info_overlay.fgd b/fgd/point/info/info_overlay.fgd
index b78cc5b3c..0d350e30a 100644
--- a/fgd/point/info/info_overlay.fgd
+++ b/fgd/point/info/info_overlay.fgd
@@ -24,6 +24,18 @@
 		]
 	tint(color255) : "Tint Color" : "255 255 255 255" : "Applies a color tint using multiply mix mode. Color will be put as $color shader parameter. Alpha will be put as $alpha shader parameter, so make sure the overlay's material allows the use of those parameters."
 
+	colorvar(integer) : "Color Var" : : "If set, override the $color tint by the specified color var."
+	colorvar[P2CE](choices) : "Paint Tinting" : : "If enabled, override the $color tint by the color of the specified paint type." = 
+		[
+		"": "Disabled"
+		"paint_bounce": "Repulsion Gel"
+		"paint_reflect": "Reflection Gel"
+		"paint_speed": "Propulsion Gel"
+		"paint_portal": "Conversion Gel"
+		"paint_erase": "Cleansing Gel"
+		"paint_stick": "Adhesion Gel"
+		]
+
 	startu(float) : "U Start" : 0.0 : "A value between 0-1, defining the starting X axis position in the overlay material."
 	endu(float) : "U End" : 1.0 : "A value between 0-1, defining the ending X axis position in the overlay material."
 	startv(float) : "V Start" : 0.0 : "A value between 0-1, defining the starting Y axis position in the overlay material."
diff --git a/fgd/point/prop/prop_static.fgd b/fgd/point/prop/prop_static.fgd
index 63e7119e4..84f91c60d 100644
--- a/fgd/point/prop/prop_static.fgd
+++ b/fgd/point/prop/prop_static.fgd
@@ -33,6 +33,18 @@
 	renderamt(integer) : "Alpha" : 255 : "Alpha of the fade, where 0 = fully transparent and 255 = fully opaque."
 	rendercolor(color255) : "Color (R G B)" : "255 255 255"
 
+	colorvar(integer) : "Color Var" : : "If set, override the tint by the specified color var."
+	colorvar[P2CE](choices) : "Paint Tinting" : : "If enabled, override the tint by the color of the specified paint type." = 
+		[
+		"": "Disabled"
+		"paint_bounce": "Repulsion Gel"
+		"paint_reflect": "Reflection Gel"
+		"paint_speed": "Propulsion Gel"
+		"paint_portal": "Conversion Gel"
+		"paint_erase": "Cleansing Gel"
+		"paint_stick": "Adhesion Gel"
+		]
+
 	uniformscale(float) : "Uniform Scale Override" : 1 : "Resize the static prop uniformly."
 	scale(vector) : "Scale Override" : "1 1 1" : "Resize the static prop."