More figures redone in TikZ