merge in local changes
add props for tilda and pithos