[xmas]

We tweaked these a bunch this afternoon, please keep letting us know any feedback though!

(and I think we got most of the changes you saw, but I'll double check in the morning)