diff --git a/in/config_files/segmentation.gin b/in/config_files/segmentation.gin
index ab71063..68dbfb8 100644
--- a/in/config_files/segmentation.gin
+++ b/in/config_files/segmentation.gin
@@ -1,18 +1,23 @@
-# Open-vocabulary segmentation parameters
-# 12 cross-view invariant classes for geo-localization
-# See docs/segmentation_class_analysis.md for full rationale
+# Unified 17-class open-vocabulary segmentation (shared across all datasets)
+# See scripts/seg_classes.py for canonical source, docs/segmentation_class_analysis.md for rationale
 SegConfig.prompts = [
-    'background',              # 0  — unclassified
-    'building',                # 1  — buildings, rooftops
-    'road',                    # 2  — roads, asphalt
-    'vegetation',              # 3  — trees, bushes, forest canopy
-    'water',                   # 4  — rivers, canals, sea, lakes
-    'sand and gravel ground',  # 5  — soil, gravel, sand, dust, bare earth
-    'rocky terrain',           # 6  — rock, stone, lava, canyon walls
-    'farmland',                # 7  — agricultural terraces, fields
-    'railway',                 # 8  — railway tracks, rails
-    'parking lot',             # 9  — parking areas
-    'sidewalk',                # 10 — sidewalks, pedestrian zones, embankments
+    'background',                   # 0  — unclassified
+    'building',                     # 1  — buildings, rooftops
+    'road',                         # 2  — roads, asphalt
+    'vegetation',                   # 3  — trees, bushes, forest canopy
+    'water',                        # 4  — rivers, canals, sea, lakes
+    'sand and gravel ground',       # 5  — soil, gravel, sand, dust, bare earth
+    'rocky terrain',                # 6  — rock, stone, lava, canyon walls
+    'farmland',                     # 7  — agricultural terraces, fields
+    'railway',                      # 8  — railway tracks, rails
+    'parking lot',                  # 9  — parking areas
+    'sidewalk',                     # 10 — sidewalks, pedestrian zones
+    'bare soil and plowed field',   # 11 — plowed fields, construction sites
+    'roof and rooftop',             # 12 — rooftops, solar panels
+    'sports field and playground',  # 13 — courts, pitches
+    'muddy ground and wetland',     # 14 — wet soil, marshes, levee banks
+    'embankment and levee',         # 15 — earthen dams, canal walls
+    'swimming pool',                # 16 — pools (GTA-UAV suburbs)
 ]
 SegConfig.threshold = 0.15
 SegConfig.default_resolution = 1008