diff --git a/hypnonema.db b/hypnonema.db
index 1e5565b6a..a2e65974b 100644
Binary files a/hypnonema.db and b/hypnonema.db differ
diff --git a/resources/RealisticVehicleFailure/client.lua b/resources/RealisticVehicleFailure/client.lua
index 478f46e00..945beb064 100644
--- a/resources/RealisticVehicleFailure/client.lua
+++ b/resources/RealisticVehicleFailure/client.lua
@@ -179,7 +179,8 @@ AddEventHandler('iens:repair', function()
 			healthEngineLast=1000.0
 			healthPetrolTankLast=1000.0
 			SetVehicleEngineOn(vehicle, true, false )
-			notification("~g~The mechanic repaired your car!")
+			exports['EGRP-Notifications']:CaptionIcon("Vehicle System", "Mechanic has repaired your vehicle!", "top", 3000, "dark", "", true, "mdi-wrench")
+			--notification("~g~The mechanic repaired your car!")
 			return
 		end
 		if GetVehicleEngineHealth(vehicle) < cfg.cascadingFailureThreshold + 5 then
@@ -191,19 +192,23 @@ AddEventHandler('iens:repair', function()
 				healthPetrolTankLast=750.0
 					SetVehicleEngineOn(vehicle, true, false )
 				SetVehicleOilLevel(vehicle,(GetVehicleOilLevel(vehicle)/3)-0.5)
-				notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!")
+				exports['EGRP-Notifications']:CaptionIcon("Vehicle System", ""..repairCfg.fixMessages[fixMessagePos]..", now get to a mechanic!", "top", 3000, "dark", "", true, "mdi-wrench")
+				--notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!")
 				fixMessagePos = fixMessagePos + 1
 				if fixMessagePos > repairCfg.fixMessageCount then fixMessagePos = 1 end
 			else
-				notification("~r~Your vehicle was too badly damaged. Unable to repair!")
+				exports['EGRP-Notifications']:Negative("System", "Vehicle too badly damaged, unable to repair!", "top", 3000, true)
+				--notification("~r~Your vehicle was too badly damaged. Unable to repair!")
 			end
 		else
-			notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] )
+			exports['EGRP-Notifications']:Warning("System", ""..repairCfg.noFixMessages[noFixMessagePos].."!", "top", 3000, true)
+			--notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] )
 			noFixMessagePos = noFixMessagePos + 1
 			if noFixMessagePos > repairCfg.noFixMessageCount then noFixMessagePos = 1 end
 		end
 	else
-		notification("~y~You must be in a vehicle to be able to repair it")
+		exports['EGRP-Notifications']:Negative("System", "You must be in a vehicle to repair it!", "top", 3000, true)
+		--notification("~y~You must be in a vehicle to be able to repair it")
 	end
 end)
 
@@ -219,7 +224,8 @@ AddEventHandler('iens:fix', function()
 			healthEngineLast=1000.0
 			healthPetrolTankLast=1000.0
 			SetVehicleEngineOn(vehicle, true, false )
-			notification("~g~The mechanic repaired your car!")
+			exports['EGRP-Notifications']:CaptionIcon("Vehicle System", "Mechanic has repaired your vehicle!", "top", 3000, "dark", "", true, "mdi-wrench")
+			--notification("~g~The mechanic repaired your car!")
 			return
 		end
 		if GetVehicleEngineHealth(vehicle) < cfg.cascadingFailureThreshold + 5 then
@@ -231,19 +237,23 @@ AddEventHandler('iens:fix', function()
 				healthPetrolTankLast=750.0
 					SetVehicleEngineOn(vehicle, true, false )
 				SetVehicleOilLevel(vehicle,(GetVehicleOilLevel(vehicle)/3)-0.5)
-				notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!")
+				exports['EGRP-Notifications']:CaptionIcon("Vehicle System", ""..repairCfg.fixMessages[fixMessagePos]..", now get to a mechanic!", "top", 3000, "dark", "", true, "mdi-wrench")
+				--notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!")
 				fixMessagePos = fixMessagePos + 1
 				if fixMessagePos > repairCfg.fixMessageCount then fixMessagePos = 1 end
 			else
-				notification("~r~Your vehicle was too badly damaged. Unable to repair!")
+				exports['EGRP-Notifications']:Negative("System", "Vehicle too badly damaged, unable to repair!", "top", 3000, true)
+				--notification("~r~Your vehicle was too badly damaged. Unable to repair!")
 			end
 		else
-			notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] )
+			exports['EGRP-Notifications']:Warning("System", ""..repairCfg.noFixMessages[noFixMessagePos].."!", "top", 3000, true)
+			--notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] )
 			noFixMessagePos = noFixMessagePos + 1
 			if noFixMessagePos > repairCfg.noFixMessageCount then noFixMessagePos = 1 end
 		end
 	else
-		notification("~y~You must be in a vehicle to be able to repair it")
+		exports['EGRP-Notifications']:Negative("System", "You must be in a vehicle to repair it!", "top", 3000, true)
+		--notification("~y~You must be in a vehicle to be able to repair it")
 	end
 end)