Add custom text objects for expand_region
Re-org mappings and add a few