Minor changes
Added initial version of a custom shader handling class + minor changes
Resolved conflicts