Refactor chapters 8–12, reclaim missing pictures