Added colors for types in table and filter box, need to do in detailed view
Merge branch 'typecoloursfix' into develop