Add 30.water; move combined rules to lang_def mode