diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index 7e251532bd1..a7741267d09 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -1,7 +1,5 @@
 //NEVER USE THIS IT SUX	-PETETHEGOAT
 
-var/global/list/cached_icons = list()
-
 /obj/item/weapon/reagent_containers/glass/paint
 	desc = "It's a paint bucket."
 	name = "paint bucket"
@@ -10,220 +8,57 @@ var/global/list/cached_icons = list()
 	item_state = "paintcan"
 	materials = list(MAT_METAL=200)
 	w_class = 3
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(10,20,30,50,70)
+	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list(5,10,20,30,50,70)
 	volume = 70
 	flags = OPENCONTAINER
-	var/paint_type = ""
 
-	afterattack(turf/simulated/target, mob/user, proximity)
-		if(!proximity) return
-		if(istype(target) && reagents.total_volume > 5)
-			for(var/mob/O in viewers(user))
-				O.show_message("\red \The [target] has been splashed with something by [user]!", 1)
-			spawn(5)
-				reagents.reaction(target, TOUCH)
-				reagents.remove_any(5)
-		else
-			return ..()
-
-	New()
-		if(paint_type == "remover")
-			name = "paint remover bucket"
-		else if(paint_type && lentext(paint_type) > 0)
-			name = paint_type + " " + name
-		..()
-		reagents.add_reagent("paint_[paint_type]", volume)
-
-	red
-		icon_state = "paint_red"
-		paint_type = "red"
-
-	green
-		icon_state = "paint_green"
-		paint_type = "green"
-
-	blue
-		icon_state = "paint_blue"
-		paint_type = "blue"
-
-	yellow
-		icon_state = "paint_yellow"
-		paint_type = "yellow"
-
-	violet
-		icon_state = "paint_violet"
-		paint_type = "violet"
-
-	black
-		icon_state = "paint_black"
-		paint_type = "black"
-
-	white
-		icon_state = "paint_white"
-		paint_type = "white"
-
-	remover
-		paint_type = "remover"
-/*
-/obj/item/weapon/paint
-	name = "Paint Can"
-	desc = "Used to recolor floors and walls. Can not be removed by the janitor."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "paint_neutral"
-	color = "FFFFFF"
-	item_state = "paintcan"
-	w_class = 3
-
-/obj/item/weapon/paint/red
-	name = "Red paint"
-	color = "FF0000"
-	icon_state = "paint_red"
-
-/obj/item/weapon/paint/green
-	name = "Green paint"
-	color = "00FF00"
-	icon_state = "paint_green"
-
-/obj/item/weapon/paint/blue
-	name = "Blue paint"
-	color = "0000FF"
-	icon_state = "paint_blue"
-
-/obj/item/weapon/paint/yellow
-	name = "Yellow paint"
-	color = "FFFF00"
-	icon_state = "paint_yellow"
-
-/obj/item/weapon/paint/violet
-	name = "Violet paint"
-	color = "FF00FF"
-	icon_state = "paint_violet"
-
-/obj/item/weapon/paint/black
-	name = "Black paint"
-	color = "333333"
-	icon_state = "paint_black"
-
-/obj/item/weapon/paint/white
-	name = "White paint"
-	color = "FFFFFF"
-	icon_state = "paint_white"
-
-
-/obj/item/weapon/paint/anycolor
-	name = "Any color"
-	icon_state = "paint_neutral"
-
-	attack_self(mob/user as mob)
-		var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "black", "white")
-		if((user.get_active_hand() != src || user.stat || user.restrained()))
-			return
-		switch(t1)
-			if("red")
-				color = "FF0000"
-			if("blue")
-				color = "0000FF"
-			if("green")
-				color = "00FF00"
-			if("yellow")
-				color = "FFFF00"
-			if("violet")
-				color = "FF00FF"
-			if("white")
-				color = "FFFFFF"
-			if("black")
-				color = "333333"
-		icon_state = "paint_[t1]"
-		add_fingerprint(user)
+/obj/item/weapon/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity)
+	if(!proximity)
 		return
-
-
-/obj/item/weapon/paint/afterattack(turf/target, mob/user as mob, proximity)
-	if(!proximity) return
-	if(!istype(target) || istype(target, /turf/space))
-		return
-	var/ind = "[initial(target.icon)][color]"
-	if(!cached_icons[ind])
-		var/icon/overlay = new/icon(initial(target.icon))
-		overlay.Blend("#[color]",ICON_MULTIPLY)
-		overlay.SetIntensity(1.4)
-		target.icon = overlay
-		cached_icons[ind] = target.icon
+	if(istype(target) && reagents.total_volume >= 5)
+		user.visible_message("<span class='warning'>[target] has been splashed with something by [user]!</span>")
+		spawn(5)
+			reagents.reaction(target, TOUCH)
+			reagents.remove_any(5)
 	else
-		target.icon = cached_icons[ind]
-	return
+		return ..()
 
-/obj/item/weapon/paint/paint_remover
-	name = "Paint remover"
-	icon_state = "paint_neutral"
+/obj/item/weapon/reagent_containers/glass/paint/red
+	name = "red paint bucket"
+	icon_state = "paint_red"
+	list_reagents = list("paint_red" = 70)
 
-	afterattack(turf/target, mob/user as mob)
-		if(istype(target) && target.icon != initial(target.icon))
-			target.icon = initial(target.icon)
-		return
-*/
+/obj/item/weapon/reagent_containers/glass/paint/green
+	name = "green paint bucket"
+	icon_state = "paint_green"
+	list_reagents = list("paint_green" = 70)
 
-datum/reagent/paint
-	name = "Paint"
-	id = "paint_"
-	description = "Floor paint is used to color floor tiles."
-	reagent_state = 2
-	color = "#808080"
+/obj/item/weapon/reagent_containers/glass/paint/blue
+	name = "blue paint bucket"
+	icon_state = "paint_blue"
+	list_reagents = list("paint_blue" = 70)
 
-	reaction_turf(var/turf/T, var/volume)
-		if(!istype(T) || istype(T, /turf/space))
-			return
-		T.color = color
+/obj/item/weapon/reagent_containers/glass/paint/yellow
+	name = "yellow paint bucket"
+	icon_state = "paint_yellow"
+	list_reagents = list("paint_yellow" = 70)
 
-	reaction_obj(var/obj/O, var/volume)
-		..()
-		if(istype(O,/obj/item/weapon/light))
-			O.color = color
+/obj/item/weapon/reagent_containers/glass/paint/violet
+	name = "violet paint bucket"
+	icon_state = "paint_violet"
+	list_reagents = list("paint_violet" = 70)
 
-	red
-		name = "Red Paint"
-		id = "paint_red"
-		color = "#FF0000"
+/obj/item/weapon/reagent_containers/glass/paint/black
+	name = "black paint bucket"
+	icon_state = "paint_black"
+	list_reagents = list("paint_black" = 70)
 
-	green
-		name = "Green Paint"
-		color = "#00FF00"
-		id = "paint_green"
+/obj/item/weapon/reagent_containers/glass/paint/white
+	name = "white paint bucket"
+	icon_state = "paint_white"
+	list_reagents = list("paint_white" = 70)
 
-	blue
-		name = "Blue Paint"
-		color = "#0000FF"
-		id = "paint_blue"
-
-	yellow
-		name = "Yellow Paint"
-		color = "#FFFF00"
-		id = "paint_yellow"
-
-	violet
-		name = "Violet Paint"
-		color = "#FF00FF"
-		id = "paint_violet"
-
-	black
-		name = "Black Paint"
-		color = "#333333"
-		id = "paint_black"
-
-	white
-		name = "White Paint"
-		color = "#FFFFFF"
-		id = "paint_white"
-
-datum/reagent/paint_remover
-	name = "Paint Remover"
-	id = "paint_remover"
-	description = "Paint remover is used to remove floor paint from floor tiles."
-	reagent_state = 2
-	color = "#808080"
-
-	reaction_turf(var/turf/T, var/volume)
-		if(istype(T) && T.icon != initial(T.icon))
-			T.icon = initial(T.icon)
-		return
+/obj/item/weapon/reagent_containers/glass/paint/remover
+	name = "paint remover bucket"
+	list_reagents = list("paint_remover" = 70)
\ No newline at end of file
diff --git a/code/modules/reagents/oldchem/reagents/reagents_paint.dm b/code/modules/reagents/oldchem/reagents/reagents_paint.dm
new file mode 100644
index 00000000000..0ca67259126
--- /dev/null
+++ b/code/modules/reagents/oldchem/reagents/reagents_paint.dm
@@ -0,0 +1,60 @@
+/datum/reagent/paint
+	name = "Paint"
+	id = "paint_"
+	description = "Floor paint is used to color floor tiles."
+	reagent_state = LIQUID
+	color = "#808080"
+
+/datum/reagent/paint/reaction_turf(turf/T, volume)
+	if(!istype(T, /turf/space))
+		T.color = color
+
+/datum/reagent/paint/reaction_obj(obj/O, volume)
+	if(istype(O, /obj/item/weapon/light))
+		O.color = color
+
+/datum/reagent/paint/red
+	name = "Red Paint"
+	id = "paint_red"
+	color = "#FF0000"
+
+/datum/reagent/paint/green
+	name = "Green Paint"
+	id = "paint_green"
+	color = "#00FF00"
+
+/datum/reagent/paint/blue
+	name = "Blue Paint"
+	id = "paint_blue"
+	color = "#0000FF"
+
+/datum/reagent/paint/yellow
+	name = "Yellow Paint"
+	id = "paint_yellow"
+	color = "#FFFF00"
+
+/datum/reagent/paint/violet
+	name = "Violet Paint"
+	id = "paint_violet"
+	color = "#FF00FF"
+
+/datum/reagent/paint/black
+	name = "Black Paint"
+	id = "paint_black"
+	color = "#333333"
+
+/datum/reagent/paint/white
+	name = "White Paint"
+	id = "paint_white"
+	color = "#FFFFFF"
+
+/datum/reagent/paint_remover
+	name = "Paint Remover"
+	id = "paint_remover"
+	description = "Paint remover is used to remove floor paint from floor tiles."
+	reagent_state = LIQUID
+	color = "#808080"
+
+/datum/reagent/paint_remover/reaction_turf(turf/T, volume)
+	if(!istype(T, /turf/space))
+		T.color = initial(T.color)
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 4e095cdde39..6ec569dcaef 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1855,6 +1855,7 @@
 #include "code\modules\reagents\oldchem\reagents\reagents_food.dm"
 #include "code\modules\reagents\oldchem\reagents\reagents_med.dm"
 #include "code\modules\reagents\oldchem\reagents\reagents_misc.dm"
+#include "code\modules\reagents\oldchem\reagents\reagents_paint.dm"
 #include "code\modules\reagents\oldchem\reagents\reagents_toxin.dm"
 #include "code\modules\reagents\oldchem\reagents\reagents_water.dm"
 #include "code\modules\reagents\oldchem\reagents\drink\reagents_alcohol.dm"