more changes to patch change/plugin preset support - replace regexp replacement with...