PS-13: Completed non text template editor