Added "type" badges for quicker recognition (I had to refactor a lot for this... lol)