Sync with v2 Masterlist

Also added a few missing files and corrected a few syntax errors