Refactor jack-o-lantern breaking
Refactor; make an addon and move some patches there