Tea - water or no?

I wouldn't and don't count anything except pure water, as mentioned above. Green tea and such is obviously better than soda, but if it's anything except pure water, your body still has to work to filter everything else out, so you don't get the full benefits.

Counting some is not bad, but my personal opinion is that it's best to try to get the full 8 glasses of pure water.