More shader clean-up (closes #125)