Fixed _property_ predicates, preparing gulp scripts