Set some more brick material colours for better lighting
Fixed incorrect setting/unsetting of uniforms