Added more items and tweaked warmth values to reflect new calculations