new shaders
application
Merge with master