Fixed some strings for coloured hits and kills
Rewrote file substitution code