patches for envision

chore: remove withclones macro and use glib::clone instead master