Renamed texture units
Started work on the new uniforms framework