Water theme update