Refactor attributes to make room for alpha; remove old cruft.
Keep shaders in their own file, then inline them