Use the real shaders from the clustering animation
Perf test bugfixes