Revert vscmp, didn't make a difference in the tests anyway
Address some complaints about touch button opacity