add type abbrevs + refine types for `mode:surrogate-text%`