[lives/f24] (7 commits) ...Reintroduce <toons.cpp> patch