introduced units proto-regex; tidied <term>, media and color extensions