Improve lighting and cleanup shaders