Tidy, plug organ / sawtooth plugins back in