Fix a few oversights
Rewrite VAT config and use LibElvUIPlugin