highlighting persistence

fix #21, fix #22