Index: DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r6362 -r6640
--- DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 6362)
+++ DamClients/DamUI/trunk/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 6640)
@@ -10,93 +10,96 @@
         <Folder Include="Properties"/>
     </ItemGroup>
     <ItemGroup>
-        <Reference Include="Deltares.Geometry.Forms">
-            <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Geometry.Forms.dll</HintPath>
+        <Reference Include="DevExpress.Charts.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Charts.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geotechnics.Forms">
-            <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Geotechnics.Forms.dll</HintPath>
+        <Reference Include="DevExpress.CodeParser.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.CodeParser.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Standard">
-            <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+        <Reference Include="DevExpress.Data.Desktop.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.Desktop.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Standard.Forms">
-            <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Standard.Forms.dll</HintPath>
+        <Reference Include="DevExpress.Data.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Standard.Forms.DExpress">
-            <HintPath>..\..\..\lib\DSL-FormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
+        <Reference Include="DevExpress.Drawing.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Drawing.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Charts.v24.1.Core">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Charts.v24.1.Core.dll</HintPath>
+        <Reference Include="DevExpress.Images.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Images.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Data.Desktop.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.Desktop.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Pdf.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Pdf.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Data.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Pdf.v24.2.Drawing">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Pdf.v24.2.Drawing.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Drawing.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Drawing.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.PivotGrid.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.PivotGrid.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Images.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Images.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Printing.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Printing.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Printing.v24.1.Core">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Printing.v24.1.Core.dll</HintPath>
+        <Reference Include="DevExpress.RichEdit.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.RichEdit.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.RichEdit.v24.1.Core">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.RichEdit.v24.1.Core.dll</HintPath>
+        <Reference Include="DevExpress.Sparkline.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Sparkline.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Utils.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Utils.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Utils.v24.1.UI">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.1.UI.dll</HintPath>
+        <Reference Include="DevExpress.Utils.v24.2.UI">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.2.UI.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraBars.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraBars.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Xpo.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Xpo.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraCharts.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraBars.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraBars.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraCharts.v24.1.UI">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.1.UI.dll</HintPath>
+        <Reference Include="DevExpress.XtraCharts.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraCharts.v24.1.Wizard">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.1.Wizard.dll</HintPath>
+        <Reference Include="DevExpress.XtraCharts.v24.2.UI">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.2.UI.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraEditors.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraEditors.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraCharts.v24.2.Wizard">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.2.Wizard.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraGauges.v24.1.Core">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v24.1.Core.dll</HintPath>
+        <Reference Include="DevExpress.XtraEditors.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraEditors.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraGauges.v24.1.Win">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v24.1.Win.dll</HintPath>
+        <Reference Include="DevExpress.XtraGauges.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraGrid.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGrid.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraGauges.v24.2.Win">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v24.2.Win.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraLayout.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraLayout.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraGrid.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGrid.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraNavBar.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraNavBar.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraLayout.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraLayout.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraPrinting.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraPrinting.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraNavBar.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraNavBar.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraReports.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraReports.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraPrinting.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraPrinting.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraRichEdit.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraRichEdit.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraReports.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraReports.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraTreeList.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraTreeList.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraRichEdit.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraRichEdit.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraVerticalGrid.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraVerticalGrid.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.XtraTreeList.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraTreeList.v24.2.dll</HintPath>
         </Reference>
+        <Reference Include="DevExpress.XtraVerticalGrid.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraVerticalGrid.v24.2.dll</HintPath>
+        </Reference>
     </ItemGroup>
     <ItemGroup>
         <None Include="..\..\..\lib\Authorization\x86\dauth.dll">
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u -r6436 -r6640
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 6640)
@@ -4,11 +4,8 @@
         <Folder Include="Properties"/>
     </ItemGroup>
     <ItemGroup>
-        <Reference Include="Deltares.Standard">
-            <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
-        </Reference>
-    </ItemGroup>
-    <ItemGroup>
+        <PackageReference Include="Deltares.Standard" Version="25.3.0.3078" />
+        <PackageReference Include="Deltares.Standard.Maps" Version="25.3.0.3084" />
         <PackageReference Include="NetTopologySuite" Version="2.5.0"/>
         <PackageReference Include="NetTopologySuite.IO.Esri.ShapeFile" Version="1.0.0"/>
     </ItemGroup>
Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r6436 -r6640
--- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 6640)
@@ -26,24 +26,6 @@
         <Reference Include="Deltares.Geo.Common.Standard">
             <HintPath>..\..\..\lib\DamEngine\Deltares.Geo.Common.Standard.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geographic">
-            <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry">
-            <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry.Forms">
-            <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Geometry.Forms.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics">
-            <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics.Forms">
-            <HintPath>..\..\..\lib\DSL-FormsGeo\Deltares.Geotechnics.Forms.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics.IO">
-            <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.MacroStability.CSharpWrapper">
             <HintPath>..\..\..\lib\DamEngine\Deltares.MacroStability.CSharpWrapper.dll</HintPath>
         </Reference>
@@ -73,48 +55,96 @@
         <Reference Include="Deltares.WTIPiping">
             <HintPath>..\..\..\lib\DamEngine\Deltares.WTIPiping.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Charts.v24.1.Core">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Charts.v24.1.Core.dll</HintPath>
+        <Reference Include="DevExpress.Charts.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Charts.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Data.Desktop.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.Desktop.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.CodeParser.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.CodeParser.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Data.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Data.Desktop.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.Desktop.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Printing.v24.1.Core">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Printing.v24.1.Core.dll</HintPath>
+        <Reference Include="DevExpress.Data.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Data.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.Utils.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Drawing.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Drawing.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraBars.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraBars.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Images.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Images.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraCharts.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Pdf.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Pdf.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraCharts.v24.1.UI">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.1.UI.dll</HintPath>
+        <Reference Include="DevExpress.Pdf.v24.2.Drawing">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Pdf.v24.2.Drawing.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraCharts.v24.1.Wizard">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.1.Wizard.dll</HintPath>
+        <Reference Include="DevExpress.PivotGrid.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.PivotGrid.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraEditors.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraEditors.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Printing.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Printing.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraGrid.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGrid.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.RichEdit.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.RichEdit.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraPrinting.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraPrinting.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Sparkline.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Sparkline.v24.2.Core.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraReports.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraReports.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Utils.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.2.dll</HintPath>
         </Reference>
-        <Reference Include="DevExpress.XtraTreeList.v24.1">
-            <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraTreeList.v24.1.dll</HintPath>
+        <Reference Include="DevExpress.Utils.v24.2.UI">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Utils.v24.2.UI.dll</HintPath>
         </Reference>
+        <Reference Include="DevExpress.Xpo.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.Xpo.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraBars.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraBars.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraCharts.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraCharts.v24.2.UI">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.2.UI.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraCharts.v24.2.Wizard">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraCharts.v24.2.Wizard.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraEditors.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraEditors.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraGauges.v24.2.Core">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v24.2.Core.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraGauges.v24.2.Win">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGauges.v24.2.Win.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraGrid.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraGrid.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraLayout.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraLayout.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraNavBar.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraNavBar.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraPrinting.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraPrinting.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraReports.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraReports.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraRichEdit.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraRichEdit.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraTreeList.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraTreeList.v24.2.dll</HintPath>
+        </Reference>
+        <Reference Include="DevExpress.XtraVerticalGrid.v24.2">
+          <HintPath>..\..\..\lib\DevExpress\DevExpress.XtraVerticalGrid.v24.2.dll</HintPath>
+        </Reference>
         <Reference Include="DGeoSuite.Common">
             <HintPath>..\..\..\lib\DamEngine\DGeoSuite.Common.dll</HintPath>
         </Reference>
@@ -154,6 +184,8 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="BruTile" Version="5.0.6"/>
+        <PackageReference Include="Deltares.Geotechnics.Forms" Version="25.3.0.3085" />
+        <PackageReference Include="Deltares.Standard.Forms.Maps" Version="25.3.0.3084" />
         <PackageReference Include="GeoAPI" Version="1.7.5"/>
         <PackageReference Include="GeoAPI.CoordinateSystems" Version="1.7.5"/>
         <PackageReference Include="SmartThreadPool.dll" Version="2.3.0"/>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/Deltares.Dam.StixFileReader.csproj
===================================================================
diff -u -r6580 -r6640
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/Deltares.Dam.StixFileReader.csproj	(.../Deltares.Dam.StixFileReader.csproj)	(revision 6580)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader/Deltares.Dam.StixFileReader.csproj	(.../Deltares.Dam.StixFileReader.csproj)	(revision 6640)
@@ -6,20 +6,7 @@
         </AssemblyAttribute>
     </ItemGroup>
     <ItemGroup>
-        <Reference Include="Deltares.Geometry">
-            <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics">
-            <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Mathematics">
-            <HintPath>..\..\..\lib\DSL-Core\Deltares.Mathematics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard">
-            <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
-        </Reference>
-    </ItemGroup>
-    <ItemGroup>
         <PackageReference Include="Components.Persistence.Stability.Version2" Version="2025.1.0" />
+        <PackageReference Include="Deltares.Geotechnics" Version="25.3.0.3081" />
     </ItemGroup>
 </Project>
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r6436 -r6640
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 6640)
@@ -28,24 +28,6 @@
         <Reference Include="DGeoSuite.Components.Persistence">
             <HintPath>..\..\..\lib\DamEngine\DGeoSuite.Components.Persistence.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Geographic">
-            <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geometry">
-            <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics">
-            <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Geotechnics.IO">
-            <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Mathematics">
-            <HintPath>..\..\..\lib\DSL-Core\Deltares.Mathematics.dll</HintPath>
-        </Reference>
-        <Reference Include="Deltares.Standard">
-            <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
-        </Reference>
         <Reference Include="DotSpatial.Data">
             <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Data.dll</HintPath>
         </Reference>
@@ -79,10 +61,11 @@
         <ProjectReference Include="..\Deltares.Maps\Deltares.Maps.csproj"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="LumenWorksCsvReader" Version="4.0.0"/>
+        <PackageReference Include="Deltares.Geotechnics" Version="25.3.0.3081" />
+        <PackageReference Include="Deltares.Geotechnics.IO" Version="25.3.0.3082" />
         <PackageReference Include="System.Data.OleDb" Version="8.0.1"/>
-        <PackageReference Include="System.Drawing.Common" Version="8.0.10"/>
-        <PackageReference Include="System.Resources.Extensions" Version="8.0.0"/>
+        <PackageReference Include="System.Drawing.Common" Version="9.0.9" />
+        <PackageReference Include="System.Resources.Extensions" Version="9.0.9" />
         <PackageReference Include="log4net" Version="2.0.15"/>
     </ItemGroup>
 </Project>
Index: DamClients/DamUI/trunk/lib/DSL-FormsStandard/Deltares.Probabilistic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsStandard/Deltares.Standard.Forms.DExpress.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsStandard/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsStandard/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsStandard/Deltares.Standard.Forms.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Geographic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Geometry.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Probabilistic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Geotechnics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geo/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Core/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Core/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/FirebirdSql.Data.FirebirdClient.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/DGSGEF.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Gef2.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/icuuc30.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/ib_util.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Fisheye: Tag 6640 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/lib/DSL-GeoIO/GefBoreNL.dat'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/icuin30.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.IO.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Fisheye: Tag 6640 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/lib/DSL-GeoIO/GefBoreUK.dat'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Soilbase.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/icudt30.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geographic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/x86/SQLite.Interop.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geometry.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/fbembed.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/System.Data.SQLite.dll
===================================================================
diff -u -r3028 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Probabilistic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/firebird.msg
===================================================================
diff -u -r4825 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geographic/Deltares.Geographic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geographic/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Geographic/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Standard.Forms.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Geographic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Standard.Forms.Maps.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Standard.Maps.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Standard.Forms.DExpress.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/nl/DotSpatial.Projections.Forms.resources.dll
===================================================================
diff -u -r4834 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/en-US/DotSpatial.Symbology.Forms.resources.dll
===================================================================
diff -u -r4834 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsMap/Deltares.Probabilistic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Probabilistic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geotechnics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geographic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geotechnics.Forms.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Standard.Forms.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Standard.Forms.DExpress.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geometry.Forms.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-FormsGeo/Deltares.Geometry.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Probabilistic/Deltares.Probabilistic.Calculation.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Probabilistic/Deltares.Mathematics.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Probabilistic/Deltares.Probabilistic.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ
Index: DamClients/DamUI/trunk/lib/DSL-Probabilistic/Deltares.Standard.dll
===================================================================
diff -u -r6445 -r6640
Binary files differ