some new shader template logic
merged
fixed stuff
Merge demojs13