fixed conditions based on type, fixed graph colors
Merge branch 'vdev' into develop