Add CI categories & make ImageFilter Mac-friendly
Syntax cleanup