Changed all filters to use new color type names