What should I drink while at work?

I gave up Mountain Dew a while ago and for the most part switched to water. I’m already feeling better, but sometimes I want to drink something with a little more flavor. I love milk, but that doesn’t store well in an office and I can’t leave my desk to refill, and I’m not a fan of tea or coffee. Is there anything you’d recommend I try?