Rename shaders for vim code highlight
Merge branch 'develop'