Add 2D derivatives and change all norms to orthonormalized