Correct color computation for tensors, account for user matrix
Multiple tabs and some bug corrections for diffusion