Use cairo terminals where possible
Remove stale -S option