categorize a little, add christmas theme