Branch/add shaders

@eric79 Please review.