UPDATE - v.1.2.0 for Nocturnal (built-in OptionTree)