advanced i18n + added graphs to water_basic