Bugfix, shader refactor - more ints, less floats