Merge "Check resource type, not directory for colors"