Removed weird macros from res
Some fixes to Shader/Program classes