PluginSource Improvements *Merge*

Removed the shader stuff we are not adding those just quite yet, and
Stupido still has them in beta anyway. Please merge when ready.