[lives/f25] (6 commits) ...Reintroduce <toons.cpp> patch