Thanks! I applied the diffs, no errors and a cursory check seems to indicate that the diffs took, but skittles seem to be way off for the most part. It's likely I messed up on some step or missed one of the steps, so just to confirm, with what you posted above, things should be working pretty much correctly, is that right?

Merry Christmas! We need to set up some sort of Paypal or something to donate for all the great help you guys are providing for all of us that just can't let go.