From a817ce037d9c01ae9b4c60c3224a18581a6a0a8f Mon Sep 17 00:00:00 2001
From: dbaker50 <dallinbaker9@gmail.com>
Date: Thu, 25 Jul 2024 14:30:15 -0600
Subject: [PATCH] Changes to confinement symbology.

---
 RaveBusinessLogic/V2/Confinement.xml          |   2 +-
 .../qgis/Confinement/confinement_dgo.qml      | 486 ++++++----
 .../qgis/Confinement/confinement_igo.qml      | 902 +++++++++---------
 .../qgis/Confinement/confinement_ratio.qml    | 160 ++--
 .../qgis/Confinement/constriction_ratio.qml   | 422 ++------
 .../web/Confinement/confinement_dgo.json      |  43 +-
 .../web/Confinement/confinement_igo.json      |  47 +-
 .../web/Confinement/confinement_margins.json  |  21 +-
 .../web/Confinement/confinement_ratio.json    |   8 +-
 .../web/Confinement/confinement_raw.json      |   3 +-
 .../web/Confinement/constriction_ratio.json   |  51 +-
 Symbology/web/Confinement/flowlines.json      |  18 -
 12 files changed, 1036 insertions(+), 1127 deletions(-)
 delete mode 100644 Symbology/web/Confinement/flowlines.json

diff --git a/RaveBusinessLogic/V2/Confinement.xml b/RaveBusinessLogic/V2/Confinement.xml
index cd4ebdd7..6bd29ad7 100644
--- a/RaveBusinessLogic/V2/Confinement.xml
+++ b/RaveBusinessLogic/V2/Confinement.xml
@@ -51,7 +51,7 @@
         <Children collapsed="true">
           <Node xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='Flowlines']" type="line" symbology="flowlines" />
           <Node xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" symbology="flowlines" />
-          <Node label="Channel Area" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='channel_area']" type="polygon" id="channel_area" symbology="channel_area" transparency="60"/>
+          <Node label="Channel Area" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='channel_area']" type="polygon" id="channel_area" symbology="ChannelArea" transparency="60"/>
           <Node label="Valley Bottom Polygon" xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='ConfiningPolygon']" type="polygon" id="confining_poly" symbology="confining_poly" transparency="60"/>
           <Node label="Valley Bottom Polygon" xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='confining_polygon']" type="polygon" id="confining_poly" symbology="confining_poly" transparency="60"/>
           <Node label="Inputs Geopackage (SQLite Database)" xpath="Inputs/Geopackage" type="file" /> 
diff --git a/Symbology/qgis/Confinement/confinement_dgo.qml b/Symbology/qgis/Confinement/confinement_dgo.qml
index e654ec16..d3b89c24 100644
--- a/Symbology/qgis/Confinement/confinement_dgo.qml
+++ b/Symbology/qgis/Confinement/confinement_dgo.qml
@@ -1,18 +1,18 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis maxScale="0" symbologyReferenceScale="-1" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" readOnly="0" version="3.32.3-Lima" minScale="100000000" styleCategories="AllStyleCategories" simplifyLocal="1" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingTol="1">
+<qgis maxScale="0" minScale="100000000" simplifyDrawingHints="1" simplifyDrawingTol="1" version="3.32.3-Lima" simplifyAlgorithm="0" labelsEnabled="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" readOnly="0" symbologyReferenceScale="-1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
     <Private>0</Private>
   </flags>
-  <temporal endField="" mode="0" accumulate="0" startField="" durationField="" durationUnit="min" enabled="0" startExpression="" limitMode="0" endExpression="" fixedDuration="0">
+  <temporal startExpression="" limitMode="0" startField="" endField="" durationUnit="min" fixedDuration="0" enabled="0" endExpression="" durationField="" mode="0" accumulate="0">
     <fixedRange>
       <start></start>
       <end></end>
     </fixedRange>
   </temporal>
-  <elevation zscale="1" type="IndividualFeatures" binding="Centroid" extrusionEnabled="0" zoffset="0" symbology="Line" respectLayerSymbol="1" clamping="Terrain" extrusion="0" showMarkerSymbolInSurfacePlots="0">
+  <elevation showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" extrusionEnabled="0" zoffset="0" symbology="Line" zscale="1" respectLayerSymbol="1" extrusion="0" clamping="Terrain" binding="Centroid">
     <data-defined-properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -21,7 +21,7 @@
       </Option>
     </data-defined-properties>
     <profileLineSymbol>
-      <symbol type="line" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -29,7 +29,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{39839182-2f4a-486b-bfe7-2e341fb70956}" pass="0" locked="0" enabled="1" class="SimpleLine">
+        <layer class="SimpleLine" enabled="1" id="{39839182-2f4a-486b-bfe7-2e341fb70956}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -70,7 +70,7 @@
       </symbol>
     </profileLineSymbol>
     <profileFillSymbol>
-      <symbol type="fill" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="fill" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -78,7 +78,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{03036c6d-6633-49f3-9e6d-9375eb0a46e7}" pass="0" locked="0" enabled="1" class="SimpleFill">
+        <layer class="SimpleFill" enabled="1" id="{03036c6d-6633-49f3-9e6d-9375eb0a46e7}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
             <Option type="QString" name="color" value="152,125,183,255"/>
@@ -103,7 +103,7 @@
       </symbol>
     </profileFillSymbol>
     <profileMarkerSymbol>
-      <symbol type="marker" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="marker" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -111,7 +111,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{eaae6bb8-6ed2-48f6-aefa-5dc07cbda3ba}" pass="0" locked="0" enabled="1" class="SimpleMarker">
+        <layer class="SimpleMarker" enabled="1" id="{eaae6bb8-6ed2-48f6-aefa-5dc07cbda3ba}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="angle" value="0"/>
             <Option type="QString" name="cap_style" value="square"/>
@@ -144,9 +144,15 @@
       </symbol>
     </profileMarkerSymbol>
   </elevation>
-  <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
+  <renderer-v2 type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor" attr="confinement_ratio" referencescale="-1">
+    <ranges>
+      <range upper="0.100000000000000" label="0 - 0.1" render="true" lower="0.000000000000000" symbol="0"/>
+      <range upper="0.500000000000000" label="0.1 - 0.5" render="true" lower="0.100000000000000" symbol="1"/>
+      <range upper="0.850000000000000" label="0.5 - 0.85" render="true" lower="0.500000000000000" symbol="2"/>
+      <range upper="1.000000000000000" label="0.85 - 1" render="true" lower="0.850000000000000" symbol="3"/>
+    </ranges>
     <symbols>
-      <symbol type="fill" frame_rate="10" name="0" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="fill" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -154,17 +160,110 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{0f9a0de3-56a7-43f5-bb24-b9dc80bfc491}" pass="0" locked="0" enabled="1" class="SimpleFill">
+        <layer class="SimpleFill" enabled="1" id="{0f9a0de3-56a7-43f5-bb24-b9dc80bfc491}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="color" value="231,113,72,0"/>
+            <Option type="QString" name="color" value="104,171,4,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="fill" name="1" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleFill" enabled="1" id="{0f9a0de3-56a7-43f5-bb24-b9dc80bfc491}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="198,208,0,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="fill" name="2" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleFill" enabled="1" id="{0f9a0de3-56a7-43f5-bb24-b9dc80bfc491}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="244,171,0,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="fill" name="3" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleFill" enabled="1" id="{0f9a0de3-56a7-43f5-bb24-b9dc80bfc491}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="219,7,6,255"/>
             <Option type="QString" name="joinstyle" value="bevel"/>
             <Option type="QString" name="offset" value="0,0"/>
             <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
             <Option type="QString" name="offset_unit" value="MM"/>
             <Option type="QString" name="outline_color" value="35,35,35,255"/>
             <Option type="QString" name="outline_style" value="solid"/>
-            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width" value="0"/>
             <Option type="QString" name="outline_width_unit" value="MM"/>
             <Option type="QString" name="style" value="solid"/>
           </Option>
@@ -178,6 +277,58 @@
         </layer>
       </symbol>
     </symbols>
+    <source-symbol>
+      <symbol type="fill" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleFill" enabled="1" id="{0f9a0de3-56a7-43f5-bb24-b9dc80bfc491}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="231,113,72,0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+    </source-symbol>
+    <colorramp type="gradient" name="[source]">
+      <Option type="Map">
+        <Option type="QString" name="color1" value="26,150,65,255"/>
+        <Option type="QString" name="color2" value="215,25,28,255"/>
+        <Option type="QString" name="direction" value="cw"/>
+        <Option type="QString" name="discrete" value="0"/>
+        <Option type="QString" name="rampType" value="gradient"/>
+        <Option type="QString" name="spec" value="rgb"/>
+        <Option type="QString" name="stops" value="0.25;166,217,106,255;rgb;cw:0.5;255,255,192,255;rgb;cw:0.75;253,174,97,255;rgb;cw"/>
+      </Option>
+    </colorramp>
+    <classificationMethod id="EqualInterval">
+      <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+      <labelFormat format="%1 - %2" trimtrailingzeroes="1" labelprecision="2"/>
+      <parameters>
+        <Option/>
+      </parameters>
+      <extraInformation/>
+    </classificationMethod>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -193,6 +344,9 @@
       <Option type="int" name="QFieldSync/tracking_erroneous_distance_safeguard_maximum_meters" value="1"/>
       <Option type="int" name="QFieldSync/tracking_measurement_type" value="0"/>
       <Option type="int" name="QFieldSync/tracking_time_requirement_interval_seconds" value="30"/>
+      <Option type="List" name="dualview/previewExpressions">
+        <Option type="QString" value="&quot;fid&quot;"/>
+      </Option>
       <Option type="int" name="embeddedWidgets/count" value="0"/>
       <Option name="variableNames"/>
       <Option name="variableValues"/>
@@ -200,13 +354,13 @@
   </customproperties>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
-  <layerOpacity>1</layerOpacity>
+  <layerOpacity>0.755</layerOpacity>
   <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-    <DiagramCategory spacingUnit="MM" showAxis="1" minScaleDenominator="0" sizeType="MM" backgroundAlpha="255" penColor="#000000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" penWidth="0" sizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" spacing="5" rotationOffset="270" barWidth="5" diagramOrientation="Up" lineSizeType="MM" labelPlacementMethod="XHeight" scaleDependency="Area" direction="0" enabled="0" width="15" minimumSize="0">
-      <fontProperties bold="0" italic="0" underline="0" description="MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0" strikethrough="0" style=""/>
-      <attribute color="#000000" colorOpacity="1" label="" field=""/>
+    <DiagramCategory direction="0" enabled="0" lineSizeType="MM" maxScaleDenominator="1e+08" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" penWidth="0" spacingUnit="MM" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" scaleDependency="Area" scaleBasedVisibility="0" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" minimumSize="0" minScaleDenominator="0" opacity="1" height="15" spacing="5" backgroundColor="#ffffff" penAlpha="255" barWidth="5" showAxis="1">
+      <fontProperties italic="0" strikethrough="0" underline="0" bold="0" description="MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0" style=""/>
+      <attribute label="" colorOpacity="1" color="#000000" field=""/>
       <axisSymbol>
-        <symbol type="line" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+        <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -214,7 +368,7 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer id="{eff35f7f-7ec2-4b9f-a1b7-09d3d9865d24}" pass="0" locked="0" enabled="1" class="SimpleLine">
+          <layer class="SimpleLine" enabled="1" id="{eff35f7f-7ec2-4b9f-a1b7-09d3d9865d24}" locked="0" pass="0">
             <Option type="Map">
               <Option type="QString" name="align_dash_pattern" value="0"/>
               <Option type="QString" name="capstyle" value="square"/>
@@ -256,7 +410,7 @@
       </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings linePlacementFlags="18" zIndex="0" showAll="1" obstacle="0" dist="0" placement="1" priority="0">
+  <DiagramLayerSettings placement="1" dist="0" showAll="1" linePlacementFlags="18" obstacle="0" zIndex="0" priority="0">
     <properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -299,84 +453,49 @@
         </config>
       </editWidget>
     </field>
-    <field name="FCode" configurationFlags="None">
-      <editWidget type="Range">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="low_lying_floodplain_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="low_lying_floodplain_prop" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="active_channel_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="active_channel_prop" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="elevated_floodplain_area" configurationFlags="None">
+    <field name="centerline_length" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="elevated_floodplain_prop" configurationFlags="None">
+    <field name="segment_area" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="floodplain_area" configurationFlags="None">
+    <field name="confinement_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="floodplain_prop" configurationFlags="None">
+    <field name="constriction_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="centerline_length" configurationFlags="None">
+    <field name="approx_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="segment_area" configurationFlags="None">
+    <field name="confin_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="integrated_width" configurationFlags="None">
+    <field name="constr_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -385,112 +504,82 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias name="" field="fid" index="0"/>
-    <alias name="" field="level_path" index="1"/>
-    <alias name="" field="seg_distance" index="2"/>
-    <alias name="" field="FCode" index="3"/>
-    <alias name="" field="low_lying_floodplain_area" index="4"/>
-    <alias name="" field="low_lying_floodplain_prop" index="5"/>
-    <alias name="" field="active_channel_area" index="6"/>
-    <alias name="" field="active_channel_prop" index="7"/>
-    <alias name="" field="elevated_floodplain_area" index="8"/>
-    <alias name="" field="elevated_floodplain_prop" index="9"/>
-    <alias name="" field="floodplain_area" index="10"/>
-    <alias name="" field="floodplain_prop" index="11"/>
-    <alias name="" field="centerline_length" index="12"/>
-    <alias name="" field="segment_area" index="13"/>
-    <alias name="" field="integrated_width" index="14"/>
+    <alias name="" index="0" field="fid"/>
+    <alias name="" index="1" field="level_path"/>
+    <alias name="" index="2" field="seg_distance"/>
+    <alias name="" index="3" field="centerline_length"/>
+    <alias name="" index="4" field="segment_area"/>
+    <alias name="" index="5" field="confinement_ratio"/>
+    <alias name="" index="6" field="constriction_ratio"/>
+    <alias name="" index="7" field="approx_leng"/>
+    <alias name="" index="8" field="confin_leng"/>
+    <alias name="" index="9" field="constr_leng"/>
   </aliases>
   <splitPolicies>
     <policy policy="Duplicate" field="fid"/>
     <policy policy="Duplicate" field="level_path"/>
     <policy policy="Duplicate" field="seg_distance"/>
-    <policy policy="Duplicate" field="FCode"/>
-    <policy policy="Duplicate" field="low_lying_floodplain_area"/>
-    <policy policy="Duplicate" field="low_lying_floodplain_prop"/>
-    <policy policy="Duplicate" field="active_channel_area"/>
-    <policy policy="Duplicate" field="active_channel_prop"/>
-    <policy policy="Duplicate" field="elevated_floodplain_area"/>
-    <policy policy="Duplicate" field="elevated_floodplain_prop"/>
-    <policy policy="Duplicate" field="floodplain_area"/>
-    <policy policy="Duplicate" field="floodplain_prop"/>
     <policy policy="Duplicate" field="centerline_length"/>
     <policy policy="Duplicate" field="segment_area"/>
-    <policy policy="Duplicate" field="integrated_width"/>
+    <policy policy="Duplicate" field="confinement_ratio"/>
+    <policy policy="Duplicate" field="constriction_ratio"/>
+    <policy policy="Duplicate" field="approx_leng"/>
+    <policy policy="Duplicate" field="confin_leng"/>
+    <policy policy="Duplicate" field="constr_leng"/>
   </splitPolicies>
   <defaults>
-    <default applyOnUpdate="0" expression="" field="fid"/>
-    <default applyOnUpdate="0" expression="" field="level_path"/>
-    <default applyOnUpdate="0" expression="" field="seg_distance"/>
-    <default applyOnUpdate="0" expression="" field="FCode"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_floodplain_area"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_floodplain_prop"/>
-    <default applyOnUpdate="0" expression="" field="active_channel_area"/>
-    <default applyOnUpdate="0" expression="" field="active_channel_prop"/>
-    <default applyOnUpdate="0" expression="" field="elevated_floodplain_area"/>
-    <default applyOnUpdate="0" expression="" field="elevated_floodplain_prop"/>
-    <default applyOnUpdate="0" expression="" field="floodplain_area"/>
-    <default applyOnUpdate="0" expression="" field="floodplain_prop"/>
-    <default applyOnUpdate="0" expression="" field="centerline_length"/>
-    <default applyOnUpdate="0" expression="" field="segment_area"/>
-    <default applyOnUpdate="0" expression="" field="integrated_width"/>
+    <default expression="" applyOnUpdate="0" field="fid"/>
+    <default expression="" applyOnUpdate="0" field="level_path"/>
+    <default expression="" applyOnUpdate="0" field="seg_distance"/>
+    <default expression="" applyOnUpdate="0" field="centerline_length"/>
+    <default expression="" applyOnUpdate="0" field="segment_area"/>
+    <default expression="" applyOnUpdate="0" field="confinement_ratio"/>
+    <default expression="" applyOnUpdate="0" field="constriction_ratio"/>
+    <default expression="" applyOnUpdate="0" field="approx_leng"/>
+    <default expression="" applyOnUpdate="0" field="confin_leng"/>
+    <default expression="" applyOnUpdate="0" field="constr_leng"/>
   </defaults>
   <constraints>
-    <constraint exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1" field="fid"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="level_path"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="seg_distance"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="FCode"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_floodplain_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_floodplain_prop"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="active_channel_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="active_channel_prop"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_floodplain_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_floodplain_prop"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="floodplain_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="floodplain_prop"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="centerline_length"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="segment_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="integrated_width"/>
+    <constraint notnull_strength="1" constraints="3" exp_strength="0" unique_strength="1" field="fid"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="level_path"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="seg_distance"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="centerline_length"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="segment_area"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confinement_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constriction_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="approx_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confin_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constr_leng"/>
   </constraints>
   <constraintExpressions>
-    <constraint field="fid" desc="" exp=""/>
-    <constraint field="level_path" desc="" exp=""/>
-    <constraint field="seg_distance" desc="" exp=""/>
-    <constraint field="FCode" desc="" exp=""/>
-    <constraint field="low_lying_floodplain_area" desc="" exp=""/>
-    <constraint field="low_lying_floodplain_prop" desc="" exp=""/>
-    <constraint field="active_channel_area" desc="" exp=""/>
-    <constraint field="active_channel_prop" desc="" exp=""/>
-    <constraint field="elevated_floodplain_area" desc="" exp=""/>
-    <constraint field="elevated_floodplain_prop" desc="" exp=""/>
-    <constraint field="floodplain_area" desc="" exp=""/>
-    <constraint field="floodplain_prop" desc="" exp=""/>
-    <constraint field="centerline_length" desc="" exp=""/>
-    <constraint field="segment_area" desc="" exp=""/>
-    <constraint field="integrated_width" desc="" exp=""/>
+    <constraint desc="" field="fid" exp=""/>
+    <constraint desc="" field="level_path" exp=""/>
+    <constraint desc="" field="seg_distance" exp=""/>
+    <constraint desc="" field="centerline_length" exp=""/>
+    <constraint desc="" field="segment_area" exp=""/>
+    <constraint desc="" field="confinement_ratio" exp=""/>
+    <constraint desc="" field="constriction_ratio" exp=""/>
+    <constraint desc="" field="approx_leng" exp=""/>
+    <constraint desc="" field="confin_leng" exp=""/>
+    <constraint desc="" field="constr_leng" exp=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
     <columns>
-      <column type="field" width="-1" name="fid" hidden="0"/>
-      <column type="field" width="-1" name="seg_distance" hidden="0"/>
-      <column type="field" width="-1" name="active_channel_area" hidden="0"/>
-      <column type="field" width="-1" name="active_channel_prop" hidden="0"/>
-      <column type="field" width="-1" name="floodplain_area" hidden="0"/>
-      <column type="field" width="-1" name="floodplain_prop" hidden="0"/>
-      <column type="field" width="-1" name="centerline_length" hidden="0"/>
-      <column type="field" width="-1" name="segment_area" hidden="0"/>
-      <column type="field" width="-1" name="level_path" hidden="0"/>
-      <column type="field" width="-1" name="FCode" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_floodplain_area" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_floodplain_prop" hidden="0"/>
-      <column type="field" width="-1" name="elevated_floodplain_area" hidden="0"/>
-      <column type="field" width="-1" name="elevated_floodplain_prop" hidden="0"/>
-      <column type="field" width="-1" name="integrated_width" hidden="0"/>
-      <column type="actions" width="-1" hidden="1"/>
+      <column type="field" name="fid" hidden="0" width="-1"/>
+      <column type="field" name="seg_distance" hidden="0" width="-1"/>
+      <column type="field" name="centerline_length" hidden="0" width="-1"/>
+      <column type="field" name="segment_area" hidden="0" width="-1"/>
+      <column type="field" name="level_path" hidden="0" width="-1"/>
+      <column type="field" name="confinement_ratio" hidden="0" width="-1"/>
+      <column type="field" name="constriction_ratio" hidden="0" width="-1"/>
+      <column type="field" name="approx_leng" hidden="0" width="-1"/>
+      <column type="field" name="confin_leng" hidden="0" width="-1"/>
+      <column type="field" name="constr_leng" hidden="0" width="-1"/>
+      <column type="actions" hidden="1" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -522,48 +611,58 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field name="FCode" editable="1"/>
-    <field name="LevelPathI" editable="1"/>
-    <field name="active_channel_area" editable="1"/>
-    <field name="active_channel_prop" editable="1"/>
-    <field name="active_floodplain_area" editable="1"/>
-    <field name="active_floodplain_prop" editable="1"/>
-    <field name="centerline_length" editable="1"/>
-    <field name="elevated_floodplain_area" editable="1"/>
-    <field name="elevated_floodplain_prop" editable="1"/>
-    <field name="fid" editable="1"/>
-    <field name="floodplain_area" editable="1"/>
-    <field name="floodplain_prop" editable="1"/>
-    <field name="inactive_floodplain_area" editable="1"/>
-    <field name="inactive_floodplain_prop" editable="1"/>
-    <field name="integrated_width" editable="1"/>
-    <field name="level_path" editable="1"/>
-    <field name="low_lying_floodplain_area" editable="1"/>
-    <field name="low_lying_floodplain_prop" editable="1"/>
-    <field name="seg_distance" editable="1"/>
-    <field name="segment_area" editable="1"/>
+    <field editable="1" name="FCode"/>
+    <field editable="1" name="LevelPathI"/>
+    <field editable="1" name="active_channel_area"/>
+    <field editable="1" name="active_channel_prop"/>
+    <field editable="1" name="active_floodplain_area"/>
+    <field editable="1" name="active_floodplain_prop"/>
+    <field editable="1" name="approx_leng"/>
+    <field editable="1" name="centerline_length"/>
+    <field editable="1" name="confin_leng"/>
+    <field editable="1" name="confinement_ratio"/>
+    <field editable="1" name="constr_leng"/>
+    <field editable="1" name="constriction_ratio"/>
+    <field editable="1" name="elevated_floodplain_area"/>
+    <field editable="1" name="elevated_floodplain_prop"/>
+    <field editable="1" name="fid"/>
+    <field editable="1" name="floodplain_area"/>
+    <field editable="1" name="floodplain_prop"/>
+    <field editable="1" name="inactive_floodplain_area"/>
+    <field editable="1" name="inactive_floodplain_prop"/>
+    <field editable="1" name="integrated_width"/>
+    <field editable="1" name="level_path"/>
+    <field editable="1" name="low_lying_floodplain_area"/>
+    <field editable="1" name="low_lying_floodplain_prop"/>
+    <field editable="1" name="seg_distance"/>
+    <field editable="1" name="segment_area"/>
   </editable>
   <labelOnTop>
-    <field labelOnTop="0" name="FCode"/>
-    <field labelOnTop="0" name="LevelPathI"/>
-    <field labelOnTop="0" name="active_channel_area"/>
-    <field labelOnTop="0" name="active_channel_prop"/>
-    <field labelOnTop="0" name="active_floodplain_area"/>
-    <field labelOnTop="0" name="active_floodplain_prop"/>
-    <field labelOnTop="0" name="centerline_length"/>
-    <field labelOnTop="0" name="elevated_floodplain_area"/>
-    <field labelOnTop="0" name="elevated_floodplain_prop"/>
-    <field labelOnTop="0" name="fid"/>
-    <field labelOnTop="0" name="floodplain_area"/>
-    <field labelOnTop="0" name="floodplain_prop"/>
-    <field labelOnTop="0" name="inactive_floodplain_area"/>
-    <field labelOnTop="0" name="inactive_floodplain_prop"/>
-    <field labelOnTop="0" name="integrated_width"/>
-    <field labelOnTop="0" name="level_path"/>
-    <field labelOnTop="0" name="low_lying_floodplain_area"/>
-    <field labelOnTop="0" name="low_lying_floodplain_prop"/>
-    <field labelOnTop="0" name="seg_distance"/>
-    <field labelOnTop="0" name="segment_area"/>
+    <field name="FCode" labelOnTop="0"/>
+    <field name="LevelPathI" labelOnTop="0"/>
+    <field name="active_channel_area" labelOnTop="0"/>
+    <field name="active_channel_prop" labelOnTop="0"/>
+    <field name="active_floodplain_area" labelOnTop="0"/>
+    <field name="active_floodplain_prop" labelOnTop="0"/>
+    <field name="approx_leng" labelOnTop="0"/>
+    <field name="centerline_length" labelOnTop="0"/>
+    <field name="confin_leng" labelOnTop="0"/>
+    <field name="confinement_ratio" labelOnTop="0"/>
+    <field name="constr_leng" labelOnTop="0"/>
+    <field name="constriction_ratio" labelOnTop="0"/>
+    <field name="elevated_floodplain_area" labelOnTop="0"/>
+    <field name="elevated_floodplain_prop" labelOnTop="0"/>
+    <field name="fid" labelOnTop="0"/>
+    <field name="floodplain_area" labelOnTop="0"/>
+    <field name="floodplain_prop" labelOnTop="0"/>
+    <field name="inactive_floodplain_area" labelOnTop="0"/>
+    <field name="inactive_floodplain_prop" labelOnTop="0"/>
+    <field name="integrated_width" labelOnTop="0"/>
+    <field name="level_path" labelOnTop="0"/>
+    <field name="low_lying_floodplain_area" labelOnTop="0"/>
+    <field name="low_lying_floodplain_prop" labelOnTop="0"/>
+    <field name="seg_distance" labelOnTop="0"/>
+    <field name="segment_area" labelOnTop="0"/>
   </labelOnTop>
   <reuseLastValue>
     <field name="FCode" reuseLastValue="0"/>
@@ -572,7 +671,12 @@ def my_form_open(dialog, layer, feature):
     <field name="active_channel_prop" reuseLastValue="0"/>
     <field name="active_floodplain_area" reuseLastValue="0"/>
     <field name="active_floodplain_prop" reuseLastValue="0"/>
+    <field name="approx_leng" reuseLastValue="0"/>
     <field name="centerline_length" reuseLastValue="0"/>
+    <field name="confin_leng" reuseLastValue="0"/>
+    <field name="confinement_ratio" reuseLastValue="0"/>
+    <field name="constr_leng" reuseLastValue="0"/>
+    <field name="constriction_ratio" reuseLastValue="0"/>
     <field name="elevated_floodplain_area" reuseLastValue="0"/>
     <field name="elevated_floodplain_prop" reuseLastValue="0"/>
     <field name="fid" reuseLastValue="0"/>
diff --git a/Symbology/qgis/Confinement/confinement_igo.qml b/Symbology/qgis/Confinement/confinement_igo.qml
index 48b320a3..8641810d 100644
--- a/Symbology/qgis/Confinement/confinement_igo.qml
+++ b/Symbology/qgis/Confinement/confinement_igo.qml
@@ -1,18 +1,18 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis maxScale="0" symbologyReferenceScale="-1" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" readOnly="0" version="3.32.3-Lima" minScale="100000000" styleCategories="AllStyleCategories" simplifyLocal="1" simplifyMaxScale="1" simplifyAlgorithm="0" simplifyDrawingTol="1">
+<qgis maxScale="0" minScale="100000000" simplifyDrawingHints="0" simplifyDrawingTol="1" version="3.32.3-Lima" simplifyAlgorithm="0" labelsEnabled="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" readOnly="0" symbologyReferenceScale="-1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
     <Private>0</Private>
   </flags>
-  <temporal endField="" mode="0" accumulate="0" startField="" durationField="" durationUnit="min" enabled="0" startExpression="" limitMode="0" endExpression="" fixedDuration="0">
+  <temporal startExpression="" limitMode="0" startField="" endField="" durationUnit="min" fixedDuration="0" enabled="0" endExpression="" durationField="" mode="0" accumulate="0">
     <fixedRange>
       <start></start>
       <end></end>
     </fixedRange>
   </temporal>
-  <elevation zscale="1" type="IndividualFeatures" binding="Centroid" extrusionEnabled="0" zoffset="0" symbology="Line" respectLayerSymbol="1" clamping="Terrain" extrusion="0" showMarkerSymbolInSurfacePlots="0">
+  <elevation showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" extrusionEnabled="0" zoffset="0" symbology="Line" zscale="1" respectLayerSymbol="1" extrusion="0" clamping="Terrain" binding="Centroid">
     <data-defined-properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -21,7 +21,7 @@
       </Option>
     </data-defined-properties>
     <profileLineSymbol>
-      <symbol type="line" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -29,7 +29,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{8471321d-9a9f-4e12-b287-84527c96f9df}" pass="0" locked="0" enabled="1" class="SimpleLine">
+        <layer class="SimpleLine" enabled="1" id="{8471321d-9a9f-4e12-b287-84527c96f9df}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -70,7 +70,7 @@
       </symbol>
     </profileLineSymbol>
     <profileFillSymbol>
-      <symbol type="fill" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="fill" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -78,7 +78,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{aac404e8-d237-46c2-912a-8a9eb2bd12e0}" pass="0" locked="0" enabled="1" class="SimpleFill">
+        <layer class="SimpleFill" enabled="1" id="{aac404e8-d237-46c2-912a-8a9eb2bd12e0}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
             <Option type="QString" name="color" value="255,158,23,255"/>
@@ -103,7 +103,7 @@
       </symbol>
     </profileFillSymbol>
     <profileMarkerSymbol>
-      <symbol type="marker" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="marker" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -111,7 +111,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{2ca2df62-ae50-4dfe-93f8-e688f6b08232}" pass="0" locked="0" enabled="1" class="SimpleMarker">
+        <layer class="SimpleMarker" enabled="1" id="{2ca2df62-ae50-4dfe-93f8-e688f6b08232}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="angle" value="0"/>
             <Option type="QString" name="cap_style" value="square"/>
@@ -144,9 +144,15 @@
       </symbol>
     </profileMarkerSymbol>
   </elevation>
-  <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
+  <renderer-v2 type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor" attr="confinement_ratio" referencescale="-1">
+    <ranges>
+      <range upper="0.100000000000000" label="0 - 0.1" render="true" lower="0.000000000000000" symbol="0"/>
+      <range upper="0.500000000000000" label="0.1 - 0.5" render="true" lower="0.100000000000000" symbol="1"/>
+      <range upper="0.850000000000000" label="0.5 - 0.85" render="true" lower="0.500000000000000" symbol="2"/>
+      <range upper="1.000000000000000" label="0.85 - 1" render="true" lower="0.850000000000000" symbol="3"/>
+    </ranges>
     <symbols>
-      <symbol type="marker" frame_rate="10" name="0" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+      <symbol type="marker" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -154,7 +160,253 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer id="{7b44f004-4fe2-4089-9de7-3f9190a33746}" pass="0" locked="0" enabled="1" class="SimpleMarker">
+        <layer class="SimpleMarker" enabled="1" id="{7b44f004-4fe2-4089-9de7-3f9190a33746}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="104,171,4,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="Point"/>
+            <Option type="QString" name="outline_color" value="0,0,0,0"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.4"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="Point"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="4"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="Point"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="var('map_scale')"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="Map" name="curve">
+                        <Option type="QString" name="x" value="0,0.15277777777777779,0.44907407407407407,0.70833333333333337,1"/>
+                        <Option type="QString" name="y" value="0,0.26373626373626374,0.59340659340659341,0.8351648351648352,1"/>
+                      </Option>
+                      <Option type="double" name="exponent" value="0.57"/>
+                      <Option type="double" name="maxSize" value="1"/>
+                      <Option type="double" name="maxValue" value="100000"/>
+                      <Option type="double" name="minSize" value="10"/>
+                      <Option type="double" name="minValue" value="1"/>
+                      <Option type="double" name="nullSize" value="0"/>
+                      <Option type="int" name="scaleType" value="2"/>
+                    </Option>
+                    <Option type="int" name="t" value="1"/>
+                  </Option>
+                  <Option type="int" name="type" value="3"/>
+                </Option>
+              </Option>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="marker" name="1" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleMarker" enabled="1" id="{7b44f004-4fe2-4089-9de7-3f9190a33746}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="198,208,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="Point"/>
+            <Option type="QString" name="outline_color" value="0,0,0,0"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.4"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="Point"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="4"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="Point"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="var('map_scale')"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="Map" name="curve">
+                        <Option type="QString" name="x" value="0,0.15277777777777779,0.44907407407407407,0.70833333333333337,1"/>
+                        <Option type="QString" name="y" value="0,0.26373626373626374,0.59340659340659341,0.8351648351648352,1"/>
+                      </Option>
+                      <Option type="double" name="exponent" value="0.57"/>
+                      <Option type="double" name="maxSize" value="1"/>
+                      <Option type="double" name="maxValue" value="100000"/>
+                      <Option type="double" name="minSize" value="10"/>
+                      <Option type="double" name="minValue" value="1"/>
+                      <Option type="double" name="nullSize" value="0"/>
+                      <Option type="int" name="scaleType" value="2"/>
+                    </Option>
+                    <Option type="int" name="t" value="1"/>
+                  </Option>
+                  <Option type="int" name="type" value="3"/>
+                </Option>
+              </Option>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="marker" name="2" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleMarker" enabled="1" id="{7b44f004-4fe2-4089-9de7-3f9190a33746}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="244,171,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="Point"/>
+            <Option type="QString" name="outline_color" value="0,0,0,0"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.4"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="Point"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="4"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="Point"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="var('map_scale')"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="Map" name="curve">
+                        <Option type="QString" name="x" value="0,0.15277777777777779,0.44907407407407407,0.70833333333333337,1"/>
+                        <Option type="QString" name="y" value="0,0.26373626373626374,0.59340659340659341,0.8351648351648352,1"/>
+                      </Option>
+                      <Option type="double" name="exponent" value="0.57"/>
+                      <Option type="double" name="maxSize" value="1"/>
+                      <Option type="double" name="maxValue" value="100000"/>
+                      <Option type="double" name="minSize" value="10"/>
+                      <Option type="double" name="minValue" value="1"/>
+                      <Option type="double" name="nullSize" value="0"/>
+                      <Option type="int" name="scaleType" value="2"/>
+                    </Option>
+                    <Option type="int" name="t" value="1"/>
+                  </Option>
+                  <Option type="int" name="type" value="3"/>
+                </Option>
+              </Option>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="marker" name="3" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleMarker" enabled="1" id="{7b44f004-4fe2-4089-9de7-3f9190a33746}" locked="0" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="219,7,6,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="Point"/>
+            <Option type="QString" name="outline_color" value="0,0,0,0"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.4"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="Point"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="4"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="Point"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="size">
+                  <Option type="bool" name="active" value="true"/>
+                  <Option type="QString" name="expression" value="var('map_scale')"/>
+                  <Option type="Map" name="transformer">
+                    <Option type="Map" name="d">
+                      <Option type="Map" name="curve">
+                        <Option type="QString" name="x" value="0,0.15277777777777779,0.44907407407407407,0.70833333333333337,1"/>
+                        <Option type="QString" name="y" value="0,0.26373626373626374,0.59340659340659341,0.8351648351648352,1"/>
+                      </Option>
+                      <Option type="double" name="exponent" value="0.57"/>
+                      <Option type="double" name="maxSize" value="1"/>
+                      <Option type="double" name="maxValue" value="100000"/>
+                      <Option type="double" name="minSize" value="10"/>
+                      <Option type="double" name="minValue" value="1"/>
+                      <Option type="double" name="nullSize" value="0"/>
+                      <Option type="int" name="scaleType" value="2"/>
+                    </Option>
+                    <Option type="int" name="t" value="1"/>
+                  </Option>
+                  <Option type="int" name="type" value="3"/>
+                </Option>
+              </Option>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+    </symbols>
+    <source-symbol>
+      <symbol type="marker" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleMarker" enabled="1" id="{7b44f004-4fe2-4089-9de7-3f9190a33746}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="angle" value="0"/>
             <Option type="QString" name="cap_style" value="square"/>
@@ -207,7 +459,26 @@
           </data_defined_properties>
         </layer>
       </symbol>
-    </symbols>
+    </source-symbol>
+    <colorramp type="gradient" name="[source]">
+      <Option type="Map">
+        <Option type="QString" name="color1" value="26,150,65,255"/>
+        <Option type="QString" name="color2" value="215,25,28,255"/>
+        <Option type="QString" name="direction" value="cw"/>
+        <Option type="QString" name="discrete" value="0"/>
+        <Option type="QString" name="rampType" value="gradient"/>
+        <Option type="QString" name="spec" value="rgb"/>
+        <Option type="QString" name="stops" value="0.25;166,217,106,255;rgb;cw:0.5;255,255,192,255;rgb;cw:0.75;253,174,97,255;rgb;cw"/>
+      </Option>
+    </colorramp>
+    <classificationMethod id="EqualInterval">
+      <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+      <labelFormat format="%1 - %2" trimtrailingzeroes="1" labelprecision="2"/>
+      <parameters>
+        <Option/>
+      </parameters>
+      <extraInformation/>
+    </classificationMethod>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -232,11 +503,11 @@
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
   <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-    <DiagramCategory spacingUnit="MM" showAxis="1" minScaleDenominator="0" sizeType="MM" backgroundAlpha="255" penColor="#000000" backgroundColor="#ffffff" maxScaleDenominator="1e+08" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" penWidth="0" sizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" spacing="5" rotationOffset="270" barWidth="5" diagramOrientation="Up" lineSizeType="MM" labelPlacementMethod="XHeight" scaleDependency="Area" direction="0" enabled="0" width="15" minimumSize="0">
-      <fontProperties bold="0" italic="0" underline="0" description="MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0" strikethrough="0" style=""/>
-      <attribute color="#000000" colorOpacity="1" label="" field=""/>
+    <DiagramCategory direction="0" enabled="0" lineSizeType="MM" maxScaleDenominator="1e+08" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" penWidth="0" spacingUnit="MM" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" scaleDependency="Area" scaleBasedVisibility="0" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" minimumSize="0" minScaleDenominator="0" opacity="1" height="15" spacing="5" backgroundColor="#ffffff" penAlpha="255" barWidth="5" showAxis="1">
+      <fontProperties italic="0" strikethrough="0" underline="0" bold="0" description="MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0" style=""/>
+      <attribute label="" colorOpacity="1" color="#000000" field=""/>
       <axisSymbol>
-        <symbol type="line" frame_rate="10" name="" alpha="1" is_animated="0" clip_to_extent="1" force_rhr="0">
+        <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -244,7 +515,7 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer id="{7e7e9be4-0644-48d4-bb8b-9e274a0a9f10}" pass="0" locked="0" enabled="1" class="SimpleLine">
+          <layer class="SimpleLine" enabled="1" id="{7e7e9be4-0644-48d4-bb8b-9e274a0a9f10}" locked="0" pass="0">
             <Option type="Map">
               <Option type="QString" name="align_dash_pattern" value="0"/>
               <Option type="QString" name="capstyle" value="square"/>
@@ -286,7 +557,7 @@
       </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings linePlacementFlags="18" zIndex="0" showAll="1" obstacle="0" dist="0" placement="0" priority="0">
+  <DiagramLayerSettings placement="0" dist="0" showAll="1" linePlacementFlags="18" obstacle="0" zIndex="0" priority="0">
     <properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -330,161 +601,35 @@
         </config>
       </editWidget>
     </field>
-    <field name="FCode" configurationFlags="None">
-      <editWidget type="Range">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="window_size" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="centerline_length" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="window_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="integrated_width" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="low_lying_floodplain_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="low_lying_floodplain_proportion" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="low_lying_floodplain_itgr_width" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="active_channel_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="active_channel_proportion" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="active_channel_itgr_width" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="elevated_floodplain_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="elevated_floodplain_proportion" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="elevated_floodplain_itgr_width" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="floodplain_area" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="floodplain_proportion" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="floodplain_itgr_width" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="vb_acreage_per_mile" configurationFlags="None">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="vb_hectares_per_km" configurationFlags="None">
+    <field name="confinement_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="low_lying_acreage_per_mile" configurationFlags="None">
+    <field name="constriction_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="low_lying_hectares_per_km" configurationFlags="None">
+    <field name="approx_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="elevated_acreage_per_mile" configurationFlags="None">
+    <field name="confin_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="elevated_hectares_per_km" configurationFlags="None">
+    <field name="constr_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -493,184 +638,76 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias name="" field="fid" index="0"/>
-    <alias name="" field="level_path" index="1"/>
-    <alias name="" field="seg_distance" index="2"/>
-    <alias name="" field="stream_size" index="3"/>
-    <alias name="" field="FCode" index="4"/>
-    <alias name="" field="window_size" index="5"/>
-    <alias name="" field="centerline_length" index="6"/>
-    <alias name="" field="window_area" index="7"/>
-    <alias name="" field="integrated_width" index="8"/>
-    <alias name="" field="low_lying_floodplain_area" index="9"/>
-    <alias name="" field="low_lying_floodplain_proportion" index="10"/>
-    <alias name="" field="low_lying_floodplain_itgr_width" index="11"/>
-    <alias name="" field="active_channel_area" index="12"/>
-    <alias name="" field="active_channel_proportion" index="13"/>
-    <alias name="" field="active_channel_itgr_width" index="14"/>
-    <alias name="" field="elevated_floodplain_area" index="15"/>
-    <alias name="" field="elevated_floodplain_proportion" index="16"/>
-    <alias name="" field="elevated_floodplain_itgr_width" index="17"/>
-    <alias name="" field="floodplain_area" index="18"/>
-    <alias name="" field="floodplain_proportion" index="19"/>
-    <alias name="" field="floodplain_itgr_width" index="20"/>
-    <alias name="" field="vb_acreage_per_mile" index="21"/>
-    <alias name="" field="vb_hectares_per_km" index="22"/>
-    <alias name="" field="low_lying_acreage_per_mile" index="23"/>
-    <alias name="" field="low_lying_hectares_per_km" index="24"/>
-    <alias name="" field="elevated_acreage_per_mile" index="25"/>
-    <alias name="" field="elevated_hectares_per_km" index="26"/>
+    <alias name="" index="0" field="fid"/>
+    <alias name="" index="1" field="level_path"/>
+    <alias name="" index="2" field="seg_distance"/>
+    <alias name="" index="3" field="stream_size"/>
+    <alias name="" index="4" field="confinement_ratio"/>
+    <alias name="" index="5" field="constriction_ratio"/>
+    <alias name="" index="6" field="approx_leng"/>
+    <alias name="" index="7" field="confin_leng"/>
+    <alias name="" index="8" field="constr_leng"/>
   </aliases>
   <splitPolicies>
     <policy policy="Duplicate" field="fid"/>
     <policy policy="Duplicate" field="level_path"/>
     <policy policy="Duplicate" field="seg_distance"/>
     <policy policy="Duplicate" field="stream_size"/>
-    <policy policy="Duplicate" field="FCode"/>
-    <policy policy="Duplicate" field="window_size"/>
-    <policy policy="Duplicate" field="centerline_length"/>
-    <policy policy="Duplicate" field="window_area"/>
-    <policy policy="Duplicate" field="integrated_width"/>
-    <policy policy="Duplicate" field="low_lying_floodplain_area"/>
-    <policy policy="Duplicate" field="low_lying_floodplain_proportion"/>
-    <policy policy="Duplicate" field="low_lying_floodplain_itgr_width"/>
-    <policy policy="Duplicate" field="active_channel_area"/>
-    <policy policy="Duplicate" field="active_channel_proportion"/>
-    <policy policy="Duplicate" field="active_channel_itgr_width"/>
-    <policy policy="Duplicate" field="elevated_floodplain_area"/>
-    <policy policy="Duplicate" field="elevated_floodplain_proportion"/>
-    <policy policy="Duplicate" field="elevated_floodplain_itgr_width"/>
-    <policy policy="Duplicate" field="floodplain_area"/>
-    <policy policy="Duplicate" field="floodplain_proportion"/>
-    <policy policy="Duplicate" field="floodplain_itgr_width"/>
-    <policy policy="Duplicate" field="vb_acreage_per_mile"/>
-    <policy policy="Duplicate" field="vb_hectares_per_km"/>
-    <policy policy="Duplicate" field="low_lying_acreage_per_mile"/>
-    <policy policy="Duplicate" field="low_lying_hectares_per_km"/>
-    <policy policy="Duplicate" field="elevated_acreage_per_mile"/>
-    <policy policy="Duplicate" field="elevated_hectares_per_km"/>
+    <policy policy="Duplicate" field="confinement_ratio"/>
+    <policy policy="Duplicate" field="constriction_ratio"/>
+    <policy policy="Duplicate" field="approx_leng"/>
+    <policy policy="Duplicate" field="confin_leng"/>
+    <policy policy="Duplicate" field="constr_leng"/>
   </splitPolicies>
   <defaults>
-    <default applyOnUpdate="0" expression="" field="fid"/>
-    <default applyOnUpdate="0" expression="" field="level_path"/>
-    <default applyOnUpdate="0" expression="" field="seg_distance"/>
-    <default applyOnUpdate="0" expression="" field="stream_size"/>
-    <default applyOnUpdate="0" expression="" field="FCode"/>
-    <default applyOnUpdate="0" expression="" field="window_size"/>
-    <default applyOnUpdate="0" expression="" field="centerline_length"/>
-    <default applyOnUpdate="0" expression="" field="window_area"/>
-    <default applyOnUpdate="0" expression="" field="integrated_width"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_floodplain_area"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_floodplain_proportion"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_floodplain_itgr_width"/>
-    <default applyOnUpdate="0" expression="" field="active_channel_area"/>
-    <default applyOnUpdate="0" expression="" field="active_channel_proportion"/>
-    <default applyOnUpdate="0" expression="" field="active_channel_itgr_width"/>
-    <default applyOnUpdate="0" expression="" field="elevated_floodplain_area"/>
-    <default applyOnUpdate="0" expression="" field="elevated_floodplain_proportion"/>
-    <default applyOnUpdate="0" expression="" field="elevated_floodplain_itgr_width"/>
-    <default applyOnUpdate="0" expression="" field="floodplain_area"/>
-    <default applyOnUpdate="0" expression="" field="floodplain_proportion"/>
-    <default applyOnUpdate="0" expression="" field="floodplain_itgr_width"/>
-    <default applyOnUpdate="0" expression="" field="vb_acreage_per_mile"/>
-    <default applyOnUpdate="0" expression="" field="vb_hectares_per_km"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_acreage_per_mile"/>
-    <default applyOnUpdate="0" expression="" field="low_lying_hectares_per_km"/>
-    <default applyOnUpdate="0" expression="" field="elevated_acreage_per_mile"/>
-    <default applyOnUpdate="0" expression="" field="elevated_hectares_per_km"/>
+    <default expression="" applyOnUpdate="0" field="fid"/>
+    <default expression="" applyOnUpdate="0" field="level_path"/>
+    <default expression="" applyOnUpdate="0" field="seg_distance"/>
+    <default expression="" applyOnUpdate="0" field="stream_size"/>
+    <default expression="" applyOnUpdate="0" field="confinement_ratio"/>
+    <default expression="" applyOnUpdate="0" field="constriction_ratio"/>
+    <default expression="" applyOnUpdate="0" field="approx_leng"/>
+    <default expression="" applyOnUpdate="0" field="confin_leng"/>
+    <default expression="" applyOnUpdate="0" field="constr_leng"/>
   </defaults>
   <constraints>
-    <constraint exp_strength="0" constraints="3" unique_strength="1" notnull_strength="1" field="fid"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="level_path"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="seg_distance"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="stream_size"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="FCode"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="window_size"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="centerline_length"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="window_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="integrated_width"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_floodplain_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_floodplain_proportion"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_floodplain_itgr_width"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="active_channel_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="active_channel_proportion"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="active_channel_itgr_width"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_floodplain_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_floodplain_proportion"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_floodplain_itgr_width"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="floodplain_area"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="floodplain_proportion"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="floodplain_itgr_width"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="vb_acreage_per_mile"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="vb_hectares_per_km"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_acreage_per_mile"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="low_lying_hectares_per_km"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_acreage_per_mile"/>
-    <constraint exp_strength="0" constraints="0" unique_strength="0" notnull_strength="0" field="elevated_hectares_per_km"/>
+    <constraint notnull_strength="1" constraints="3" exp_strength="0" unique_strength="1" field="fid"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="level_path"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="seg_distance"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="stream_size"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confinement_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constriction_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="approx_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confin_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constr_leng"/>
   </constraints>
   <constraintExpressions>
-    <constraint field="fid" desc="" exp=""/>
-    <constraint field="level_path" desc="" exp=""/>
-    <constraint field="seg_distance" desc="" exp=""/>
-    <constraint field="stream_size" desc="" exp=""/>
-    <constraint field="FCode" desc="" exp=""/>
-    <constraint field="window_size" desc="" exp=""/>
-    <constraint field="centerline_length" desc="" exp=""/>
-    <constraint field="window_area" desc="" exp=""/>
-    <constraint field="integrated_width" desc="" exp=""/>
-    <constraint field="low_lying_floodplain_area" desc="" exp=""/>
-    <constraint field="low_lying_floodplain_proportion" desc="" exp=""/>
-    <constraint field="low_lying_floodplain_itgr_width" desc="" exp=""/>
-    <constraint field="active_channel_area" desc="" exp=""/>
-    <constraint field="active_channel_proportion" desc="" exp=""/>
-    <constraint field="active_channel_itgr_width" desc="" exp=""/>
-    <constraint field="elevated_floodplain_area" desc="" exp=""/>
-    <constraint field="elevated_floodplain_proportion" desc="" exp=""/>
-    <constraint field="elevated_floodplain_itgr_width" desc="" exp=""/>
-    <constraint field="floodplain_area" desc="" exp=""/>
-    <constraint field="floodplain_proportion" desc="" exp=""/>
-    <constraint field="floodplain_itgr_width" desc="" exp=""/>
-    <constraint field="vb_acreage_per_mile" desc="" exp=""/>
-    <constraint field="vb_hectares_per_km" desc="" exp=""/>
-    <constraint field="low_lying_acreage_per_mile" desc="" exp=""/>
-    <constraint field="low_lying_hectares_per_km" desc="" exp=""/>
-    <constraint field="elevated_acreage_per_mile" desc="" exp=""/>
-    <constraint field="elevated_hectares_per_km" desc="" exp=""/>
+    <constraint desc="" field="fid" exp=""/>
+    <constraint desc="" field="level_path" exp=""/>
+    <constraint desc="" field="seg_distance" exp=""/>
+    <constraint desc="" field="stream_size" exp=""/>
+    <constraint desc="" field="confinement_ratio" exp=""/>
+    <constraint desc="" field="constriction_ratio" exp=""/>
+    <constraint desc="" field="approx_leng" exp=""/>
+    <constraint desc="" field="confin_leng" exp=""/>
+    <constraint desc="" field="constr_leng" exp=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
     <columns>
-      <column type="field" width="-1" name="fid" hidden="0"/>
-      <column type="field" width="-1" name="seg_distance" hidden="0"/>
-      <column type="field" width="-1" name="stream_size" hidden="0"/>
-      <column type="field" width="-1" name="level_path" hidden="0"/>
-      <column type="field" width="-1" name="FCode" hidden="0"/>
-      <column type="field" width="-1" name="window_size" hidden="0"/>
-      <column type="field" width="-1" name="centerline_length" hidden="0"/>
-      <column type="field" width="-1" name="window_area" hidden="0"/>
-      <column type="field" width="-1" name="integrated_width" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_floodplain_area" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_floodplain_proportion" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_floodplain_itgr_width" hidden="0"/>
-      <column type="field" width="-1" name="active_channel_area" hidden="0"/>
-      <column type="field" width="-1" name="active_channel_proportion" hidden="0"/>
-      <column type="field" width="-1" name="active_channel_itgr_width" hidden="0"/>
-      <column type="field" width="-1" name="elevated_floodplain_area" hidden="0"/>
-      <column type="field" width="-1" name="elevated_floodplain_proportion" hidden="0"/>
-      <column type="field" width="-1" name="elevated_floodplain_itgr_width" hidden="0"/>
-      <column type="field" width="-1" name="floodplain_area" hidden="0"/>
-      <column type="field" width="-1" name="floodplain_proportion" hidden="0"/>
-      <column type="field" width="-1" name="floodplain_itgr_width" hidden="0"/>
-      <column type="field" width="-1" name="vb_acreage_per_mile" hidden="0"/>
-      <column type="field" width="-1" name="vb_hectares_per_km" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_acreage_per_mile" hidden="0"/>
-      <column type="field" width="-1" name="low_lying_hectares_per_km" hidden="0"/>
-      <column type="field" width="-1" name="elevated_acreage_per_mile" hidden="0"/>
-      <column type="field" width="-1" name="elevated_hectares_per_km" hidden="0"/>
-      <column type="actions" width="-1" hidden="1"/>
+      <column type="field" name="fid" hidden="0" width="-1"/>
+      <column type="field" name="seg_distance" hidden="0" width="-1"/>
+      <column type="field" name="stream_size" hidden="0" width="-1"/>
+      <column type="field" name="level_path" hidden="0" width="-1"/>
+      <column type="field" name="confinement_ratio" hidden="0" width="-1"/>
+      <column type="field" name="constriction_ratio" hidden="0" width="-1"/>
+      <column type="field" name="approx_leng" hidden="0" width="-1"/>
+      <column type="field" name="confin_leng" hidden="0" width="-1"/>
+      <column type="field" name="constr_leng" hidden="0" width="-1"/>
+      <column type="actions" hidden="1" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -702,122 +739,132 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field name="Canal_dens" editable="1"/>
-    <field name="Canal_len" editable="1"/>
-    <field name="DivPts_ct" editable="1"/>
-    <field name="DivPts_dens" editable="1"/>
-    <field name="FCode" editable="1"/>
-    <field name="LUI" editable="1"/>
-    <field name="LevelPathI" editable="1"/>
-    <field name="Rail_dens" editable="1"/>
-    <field name="Rail_len" editable="1"/>
-    <field name="RoadX_ct" editable="1"/>
-    <field name="RoadX_dens" editable="1"/>
-    <field name="Road_dens" editable="1"/>
-    <field name="Road_len" editable="1"/>
-    <field name="active_acreage_per_mile" editable="1"/>
-    <field name="active_channel_area" editable="1"/>
-    <field name="active_channel_area_cl_len" editable="1"/>
-    <field name="active_channel_area_prop" editable="1"/>
-    <field name="active_channel_itgr_width" editable="1"/>
-    <field name="active_channel_proportion" editable="1"/>
-    <field name="active_floodplain_area" editable="1"/>
-    <field name="active_floodplain_area_cl_len" editable="1"/>
-    <field name="active_floodplain_area_prop" editable="1"/>
-    <field name="active_floodplain_itgr_width" editable="1"/>
-    <field name="active_floodplain_proportion" editable="1"/>
-    <field name="active_hectares_per_km" editable="1"/>
-    <field name="centerline_length" editable="1"/>
-    <field name="elevated_acreage_per_mile" editable="1"/>
-    <field name="elevated_floodplain_area" editable="1"/>
-    <field name="elevated_floodplain_itgr_width" editable="1"/>
-    <field name="elevated_floodplain_proportion" editable="1"/>
-    <field name="elevated_hectares_per_km" editable="1"/>
-    <field name="fid" editable="1"/>
-    <field name="floodplain_area" editable="1"/>
-    <field name="floodplain_area_cl_len" editable="1"/>
-    <field name="floodplain_area_prop" editable="1"/>
-    <field name="floodplain_itgr_width" editable="1"/>
-    <field name="floodplain_proportion" editable="1"/>
-    <field name="inactive_acreage_per_mile" editable="1"/>
-    <field name="inactive_floodplain_area" editable="1"/>
-    <field name="inactive_floodplain_area_cl_len" editable="1"/>
-    <field name="inactive_floodplain_area_prop" editable="1"/>
-    <field name="inactive_floodplain_itgr_width" editable="1"/>
-    <field name="inactive_floodplain_proportion" editable="1"/>
-    <field name="inactive_hectares_per_km" editable="1"/>
-    <field name="integrated_width" editable="1"/>
-    <field name="level_path" editable="1"/>
-    <field name="low_lying_acreage_per_mile" editable="1"/>
-    <field name="low_lying_floodplain_area" editable="1"/>
-    <field name="low_lying_floodplain_itgr_width" editable="1"/>
-    <field name="low_lying_floodplain_proportion" editable="1"/>
-    <field name="low_lying_hectares_per_km" editable="1"/>
-    <field name="seg_distance" editable="1"/>
-    <field name="stream_size" editable="1"/>
-    <field name="vb_acreage_per_mile" editable="1"/>
-    <field name="vb_hectares_per_km" editable="1"/>
-    <field name="window_area" editable="1"/>
-    <field name="window_size" editable="1"/>
+    <field editable="1" name="Canal_dens"/>
+    <field editable="1" name="Canal_len"/>
+    <field editable="1" name="DivPts_ct"/>
+    <field editable="1" name="DivPts_dens"/>
+    <field editable="1" name="FCode"/>
+    <field editable="1" name="LUI"/>
+    <field editable="1" name="LevelPathI"/>
+    <field editable="1" name="Rail_dens"/>
+    <field editable="1" name="Rail_len"/>
+    <field editable="1" name="RoadX_ct"/>
+    <field editable="1" name="RoadX_dens"/>
+    <field editable="1" name="Road_dens"/>
+    <field editable="1" name="Road_len"/>
+    <field editable="1" name="active_acreage_per_mile"/>
+    <field editable="1" name="active_channel_area"/>
+    <field editable="1" name="active_channel_area_cl_len"/>
+    <field editable="1" name="active_channel_area_prop"/>
+    <field editable="1" name="active_channel_itgr_width"/>
+    <field editable="1" name="active_channel_proportion"/>
+    <field editable="1" name="active_floodplain_area"/>
+    <field editable="1" name="active_floodplain_area_cl_len"/>
+    <field editable="1" name="active_floodplain_area_prop"/>
+    <field editable="1" name="active_floodplain_itgr_width"/>
+    <field editable="1" name="active_floodplain_proportion"/>
+    <field editable="1" name="active_hectares_per_km"/>
+    <field editable="1" name="approx_leng"/>
+    <field editable="1" name="centerline_length"/>
+    <field editable="1" name="confin_leng"/>
+    <field editable="1" name="confinement_ratio"/>
+    <field editable="1" name="constr_leng"/>
+    <field editable="1" name="constriction_ratio"/>
+    <field editable="1" name="elevated_acreage_per_mile"/>
+    <field editable="1" name="elevated_floodplain_area"/>
+    <field editable="1" name="elevated_floodplain_itgr_width"/>
+    <field editable="1" name="elevated_floodplain_proportion"/>
+    <field editable="1" name="elevated_hectares_per_km"/>
+    <field editable="1" name="fid"/>
+    <field editable="1" name="floodplain_area"/>
+    <field editable="1" name="floodplain_area_cl_len"/>
+    <field editable="1" name="floodplain_area_prop"/>
+    <field editable="1" name="floodplain_itgr_width"/>
+    <field editable="1" name="floodplain_proportion"/>
+    <field editable="1" name="inactive_acreage_per_mile"/>
+    <field editable="1" name="inactive_floodplain_area"/>
+    <field editable="1" name="inactive_floodplain_area_cl_len"/>
+    <field editable="1" name="inactive_floodplain_area_prop"/>
+    <field editable="1" name="inactive_floodplain_itgr_width"/>
+    <field editable="1" name="inactive_floodplain_proportion"/>
+    <field editable="1" name="inactive_hectares_per_km"/>
+    <field editable="1" name="integrated_width"/>
+    <field editable="1" name="level_path"/>
+    <field editable="1" name="low_lying_acreage_per_mile"/>
+    <field editable="1" name="low_lying_floodplain_area"/>
+    <field editable="1" name="low_lying_floodplain_itgr_width"/>
+    <field editable="1" name="low_lying_floodplain_proportion"/>
+    <field editable="1" name="low_lying_hectares_per_km"/>
+    <field editable="1" name="seg_distance"/>
+    <field editable="1" name="stream_size"/>
+    <field editable="1" name="vb_acreage_per_mile"/>
+    <field editable="1" name="vb_hectares_per_km"/>
+    <field editable="1" name="window_area"/>
+    <field editable="1" name="window_size"/>
   </editable>
   <labelOnTop>
-    <field labelOnTop="0" name="Canal_dens"/>
-    <field labelOnTop="0" name="Canal_len"/>
-    <field labelOnTop="0" name="DivPts_ct"/>
-    <field labelOnTop="0" name="DivPts_dens"/>
-    <field labelOnTop="0" name="FCode"/>
-    <field labelOnTop="0" name="LUI"/>
-    <field labelOnTop="0" name="LevelPathI"/>
-    <field labelOnTop="0" name="Rail_dens"/>
-    <field labelOnTop="0" name="Rail_len"/>
-    <field labelOnTop="0" name="RoadX_ct"/>
-    <field labelOnTop="0" name="RoadX_dens"/>
-    <field labelOnTop="0" name="Road_dens"/>
-    <field labelOnTop="0" name="Road_len"/>
-    <field labelOnTop="0" name="active_acreage_per_mile"/>
-    <field labelOnTop="0" name="active_channel_area"/>
-    <field labelOnTop="0" name="active_channel_area_cl_len"/>
-    <field labelOnTop="0" name="active_channel_area_prop"/>
-    <field labelOnTop="0" name="active_channel_itgr_width"/>
-    <field labelOnTop="0" name="active_channel_proportion"/>
-    <field labelOnTop="0" name="active_floodplain_area"/>
-    <field labelOnTop="0" name="active_floodplain_area_cl_len"/>
-    <field labelOnTop="0" name="active_floodplain_area_prop"/>
-    <field labelOnTop="0" name="active_floodplain_itgr_width"/>
-    <field labelOnTop="0" name="active_floodplain_proportion"/>
-    <field labelOnTop="0" name="active_hectares_per_km"/>
-    <field labelOnTop="0" name="centerline_length"/>
-    <field labelOnTop="0" name="elevated_acreage_per_mile"/>
-    <field labelOnTop="0" name="elevated_floodplain_area"/>
-    <field labelOnTop="0" name="elevated_floodplain_itgr_width"/>
-    <field labelOnTop="0" name="elevated_floodplain_proportion"/>
-    <field labelOnTop="0" name="elevated_hectares_per_km"/>
-    <field labelOnTop="0" name="fid"/>
-    <field labelOnTop="0" name="floodplain_area"/>
-    <field labelOnTop="0" name="floodplain_area_cl_len"/>
-    <field labelOnTop="0" name="floodplain_area_prop"/>
-    <field labelOnTop="0" name="floodplain_itgr_width"/>
-    <field labelOnTop="0" name="floodplain_proportion"/>
-    <field labelOnTop="0" name="inactive_acreage_per_mile"/>
-    <field labelOnTop="0" name="inactive_floodplain_area"/>
-    <field labelOnTop="0" name="inactive_floodplain_area_cl_len"/>
-    <field labelOnTop="0" name="inactive_floodplain_area_prop"/>
-    <field labelOnTop="0" name="inactive_floodplain_itgr_width"/>
-    <field labelOnTop="0" name="inactive_floodplain_proportion"/>
-    <field labelOnTop="0" name="inactive_hectares_per_km"/>
-    <field labelOnTop="0" name="integrated_width"/>
-    <field labelOnTop="0" name="level_path"/>
-    <field labelOnTop="0" name="low_lying_acreage_per_mile"/>
-    <field labelOnTop="0" name="low_lying_floodplain_area"/>
-    <field labelOnTop="0" name="low_lying_floodplain_itgr_width"/>
-    <field labelOnTop="0" name="low_lying_floodplain_proportion"/>
-    <field labelOnTop="0" name="low_lying_hectares_per_km"/>
-    <field labelOnTop="0" name="seg_distance"/>
-    <field labelOnTop="0" name="stream_size"/>
-    <field labelOnTop="0" name="vb_acreage_per_mile"/>
-    <field labelOnTop="0" name="vb_hectares_per_km"/>
-    <field labelOnTop="0" name="window_area"/>
-    <field labelOnTop="0" name="window_size"/>
+    <field name="Canal_dens" labelOnTop="0"/>
+    <field name="Canal_len" labelOnTop="0"/>
+    <field name="DivPts_ct" labelOnTop="0"/>
+    <field name="DivPts_dens" labelOnTop="0"/>
+    <field name="FCode" labelOnTop="0"/>
+    <field name="LUI" labelOnTop="0"/>
+    <field name="LevelPathI" labelOnTop="0"/>
+    <field name="Rail_dens" labelOnTop="0"/>
+    <field name="Rail_len" labelOnTop="0"/>
+    <field name="RoadX_ct" labelOnTop="0"/>
+    <field name="RoadX_dens" labelOnTop="0"/>
+    <field name="Road_dens" labelOnTop="0"/>
+    <field name="Road_len" labelOnTop="0"/>
+    <field name="active_acreage_per_mile" labelOnTop="0"/>
+    <field name="active_channel_area" labelOnTop="0"/>
+    <field name="active_channel_area_cl_len" labelOnTop="0"/>
+    <field name="active_channel_area_prop" labelOnTop="0"/>
+    <field name="active_channel_itgr_width" labelOnTop="0"/>
+    <field name="active_channel_proportion" labelOnTop="0"/>
+    <field name="active_floodplain_area" labelOnTop="0"/>
+    <field name="active_floodplain_area_cl_len" labelOnTop="0"/>
+    <field name="active_floodplain_area_prop" labelOnTop="0"/>
+    <field name="active_floodplain_itgr_width" labelOnTop="0"/>
+    <field name="active_floodplain_proportion" labelOnTop="0"/>
+    <field name="active_hectares_per_km" labelOnTop="0"/>
+    <field name="approx_leng" labelOnTop="0"/>
+    <field name="centerline_length" labelOnTop="0"/>
+    <field name="confin_leng" labelOnTop="0"/>
+    <field name="confinement_ratio" labelOnTop="0"/>
+    <field name="constr_leng" labelOnTop="0"/>
+    <field name="constriction_ratio" labelOnTop="0"/>
+    <field name="elevated_acreage_per_mile" labelOnTop="0"/>
+    <field name="elevated_floodplain_area" labelOnTop="0"/>
+    <field name="elevated_floodplain_itgr_width" labelOnTop="0"/>
+    <field name="elevated_floodplain_proportion" labelOnTop="0"/>
+    <field name="elevated_hectares_per_km" labelOnTop="0"/>
+    <field name="fid" labelOnTop="0"/>
+    <field name="floodplain_area" labelOnTop="0"/>
+    <field name="floodplain_area_cl_len" labelOnTop="0"/>
+    <field name="floodplain_area_prop" labelOnTop="0"/>
+    <field name="floodplain_itgr_width" labelOnTop="0"/>
+    <field name="floodplain_proportion" labelOnTop="0"/>
+    <field name="inactive_acreage_per_mile" labelOnTop="0"/>
+    <field name="inactive_floodplain_area" labelOnTop="0"/>
+    <field name="inactive_floodplain_area_cl_len" labelOnTop="0"/>
+    <field name="inactive_floodplain_area_prop" labelOnTop="0"/>
+    <field name="inactive_floodplain_itgr_width" labelOnTop="0"/>
+    <field name="inactive_floodplain_proportion" labelOnTop="0"/>
+    <field name="inactive_hectares_per_km" labelOnTop="0"/>
+    <field name="integrated_width" labelOnTop="0"/>
+    <field name="level_path" labelOnTop="0"/>
+    <field name="low_lying_acreage_per_mile" labelOnTop="0"/>
+    <field name="low_lying_floodplain_area" labelOnTop="0"/>
+    <field name="low_lying_floodplain_itgr_width" labelOnTop="0"/>
+    <field name="low_lying_floodplain_proportion" labelOnTop="0"/>
+    <field name="low_lying_hectares_per_km" labelOnTop="0"/>
+    <field name="seg_distance" labelOnTop="0"/>
+    <field name="stream_size" labelOnTop="0"/>
+    <field name="vb_acreage_per_mile" labelOnTop="0"/>
+    <field name="vb_hectares_per_km" labelOnTop="0"/>
+    <field name="window_area" labelOnTop="0"/>
+    <field name="window_size" labelOnTop="0"/>
   </labelOnTop>
   <reuseLastValue>
     <field name="Canal_dens" reuseLastValue="0"/>
@@ -836,7 +883,12 @@ def my_form_open(dialog, layer, feature):
     <field name="active_channel_area" reuseLastValue="0"/>
     <field name="active_channel_itgr_width" reuseLastValue="0"/>
     <field name="active_channel_proportion" reuseLastValue="0"/>
+    <field name="approx_leng" reuseLastValue="0"/>
     <field name="centerline_length" reuseLastValue="0"/>
+    <field name="confin_leng" reuseLastValue="0"/>
+    <field name="confinement_ratio" reuseLastValue="0"/>
+    <field name="constr_leng" reuseLastValue="0"/>
+    <field name="constriction_ratio" reuseLastValue="0"/>
     <field name="elevated_acreage_per_mile" reuseLastValue="0"/>
     <field name="elevated_floodplain_area" reuseLastValue="0"/>
     <field name="elevated_floodplain_itgr_width" reuseLastValue="0"/>
diff --git a/Symbology/qgis/Confinement/confinement_ratio.qml b/Symbology/qgis/Confinement/confinement_ratio.qml
index 97364fee..d3c70c13 100644
--- a/Symbology/qgis/Confinement/confinement_ratio.qml
+++ b/Symbology/qgis/Confinement/confinement_ratio.qml
@@ -1,18 +1,18 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis minScale="100000000" labelsEnabled="0" simplifyMaxScale="1" simplifyLocal="1" symbologyReferenceScale="-1" readOnly="0" maxScale="0" version="3.32.3-Lima" styleCategories="AllStyleCategories" simplifyDrawingTol="1" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0">
+<qgis maxScale="0" minScale="100000000" simplifyDrawingHints="1" simplifyDrawingTol="1" version="3.32.3-Lima" simplifyAlgorithm="0" labelsEnabled="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" readOnly="0" symbologyReferenceScale="-1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
     <Private>0</Private>
   </flags>
-  <temporal limitMode="0" accumulate="0" enabled="0" startField="" fixedDuration="0" startExpression="" endExpression="" durationField="" endField="" durationUnit="min" mode="0">
+  <temporal startExpression="" limitMode="0" startField="" endField="" durationUnit="min" fixedDuration="0" enabled="0" endExpression="" durationField="" mode="0" accumulate="0">
     <fixedRange>
       <start></start>
       <end></end>
     </fixedRange>
   </temporal>
-  <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zoffset="0" clamping="Terrain" zscale="1" type="IndividualFeatures" symbology="Line" binding="Centroid" extrusionEnabled="0" extrusion="0">
+  <elevation showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" extrusionEnabled="0" zoffset="0" symbology="Line" zscale="1" respectLayerSymbol="1" extrusion="0" clamping="Terrain" binding="Centroid">
     <data-defined-properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -21,7 +21,7 @@
       </Option>
     </data-defined-properties>
     <profileLineSymbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -29,7 +29,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{5c8b58b5-e999-4d50-8163-f8a97ef74a7a}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{5c8b58b5-e999-4d50-8163-f8a97ef74a7a}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -70,7 +70,7 @@
       </symbol>
     </profileLineSymbol>
     <profileFillSymbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="fill" name="" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="fill" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -78,7 +78,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleFill" id="{1c8d4fc7-fdd9-445b-ae33-71858b8522a3}" locked="0">
+        <layer class="SimpleFill" enabled="1" id="{1c8d4fc7-fdd9-445b-ae33-71858b8522a3}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
             <Option type="QString" name="color" value="255,158,23,255"/>
@@ -103,7 +103,7 @@
       </symbol>
     </profileFillSymbol>
     <profileMarkerSymbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="marker" name="" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="marker" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -111,7 +111,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleMarker" id="{862c2137-3e9b-4b78-8fd6-03680b749d8f}" locked="0">
+        <layer class="SimpleMarker" enabled="1" id="{862c2137-3e9b-4b78-8fd6-03680b749d8f}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="angle" value="0"/>
             <Option type="QString" name="cap_style" value="square"/>
@@ -144,15 +144,15 @@
       </symbol>
     </profileMarkerSymbol>
   </elevation>
-  <renderer-v2 symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" referencescale="-1" attr="confinement_ratio" forceraster="0">
+  <renderer-v2 type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor" attr="confinement_ratio" referencescale="-1">
     <ranges>
-      <range upper="0.100000000000000" lower="0.000000000000000" symbol="0" label="0.1" render="true"/>
-      <range upper="0.500000000000000" lower="0.100000000000000" symbol="1" label="0.5" render="true"/>
-      <range upper="0.850000000000000" lower="0.500000000000000" symbol="2" label="0.85" render="true"/>
-      <range upper="2.000000000000000" lower="0.850000000000000" symbol="3" label="1.0" render="true"/>
+      <range upper="0.100000000000000" label="0 - 0.1" render="true" lower="0.000000000000000" symbol="0"/>
+      <range upper="0.500000000000000" label="0.1 - 0.5" render="true" lower="0.100000000000000" symbol="1"/>
+      <range upper="0.850000000000000" label="0.5 - 0.85" render="true" lower="0.500000000000000" symbol="2"/>
+      <range upper="2.000000000000000" label="0.85 - 1.0" render="true" lower="0.850000000000000" symbol="3"/>
     </ranges>
     <symbols>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="0" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -160,7 +160,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -199,7 +199,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="1" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="1" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -207,7 +207,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -246,7 +246,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="2" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="2" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -254,7 +254,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -293,7 +293,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="3" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="3" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -301,7 +301,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -342,7 +342,7 @@
       </symbol>
     </symbols>
     <source-symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="0" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -350,7 +350,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{604fa39e-a215-4f18-842d-fe2fe9bbeb28}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -390,12 +390,9 @@
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <classificationMethod id="Pretty">
-      <symmetricMode astride="0" enabled="0" symmetrypoint="0"/>
-      <labelFormat labelprecision="2" format="%1 - %2" trimtrailingzeroes="1"/>
+      <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+      <labelFormat format="%1 - %2" trimtrailingzeroes="0" labelprecision="2"/>
       <parameters>
         <Option/>
       </parameters>
@@ -424,11 +421,12 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory spacingUnitScale="3x:0,0,0,0,0,0" scaleDependency="Area" penAlpha="255" sizeType="MM" maxScaleDenominator="1e+08" opacity="1" backgroundColor="#ffffff" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" width="15" labelPlacementMethod="XHeight" rotationOffset="270" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penWidth="0" lineSizeType="MM" spacing="5" direction="0" enabled="0" diagramOrientation="Up" showAxis="1" height="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" barWidth="5">
-      <fontProperties strikethrough="0" bold="0" italic="0" style="" underline="0" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory direction="0" enabled="0" lineSizeType="MM" maxScaleDenominator="1e+08" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" penWidth="0" spacingUnit="MM" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" scaleDependency="Area" scaleBasedVisibility="0" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" minimumSize="0" minScaleDenominator="0" opacity="1" height="15" spacing="5" backgroundColor="#ffffff" penAlpha="255" barWidth="5" showAxis="1">
+      <fontProperties italic="0" strikethrough="0" underline="0" bold="0" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
+      <attribute label="" colorOpacity="1" color="#000000" field=""/>
       <axisSymbol>
-        <symbol force_rhr="0" clip_to_extent="1" type="line" name="" alpha="1" frame_rate="10" is_animated="0">
+        <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -436,7 +434,7 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" pass="0" class="SimpleLine" id="{40c8a776-0d1d-46a2-aa83-54683d9e1141}" locked="0">
+          <layer class="SimpleLine" enabled="1" id="{40c8a776-0d1d-46a2-aa83-54683d9e1141}" locked="0" pass="0">
             <Option type="Map">
               <Option type="QString" name="align_dash_pattern" value="0"/>
               <Option type="QString" name="capstyle" value="square"/>
@@ -478,7 +476,7 @@
       </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings placement="2" showAll="1" linePlacementFlags="18" priority="0" dist="0" obstacle="0" zIndex="0">
+  <DiagramLayerSettings placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0" zIndex="0" priority="0">
     <properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -491,52 +489,52 @@
     <activeChecks/>
     <checkConfiguration/>
   </geometryOptions>
-  <legend showLabelLegend="0" type="default-vector"/>
+  <legend type="default-vector" showLabelLegend="0"/>
   <referencedLayers/>
   <fieldConfiguration>
-    <field configurationFlags="None" name="fid">
+    <field name="fid" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="level_path">
+    <field name="level_path" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="confinement_ratio">
+    <field name="confinement_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="constriction_ratio">
+    <field name="constriction_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="approx_leng">
+    <field name="approx_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="confin_leng">
+    <field name="confin_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="constr_leng">
+    <field name="constr_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -572,37 +570,37 @@
     <default expression="" applyOnUpdate="0" field="constr_leng"/>
   </defaults>
   <constraints>
-    <constraint notnull_strength="1" unique_strength="1" exp_strength="0" constraints="3" field="fid"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="level_path"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="confinement_ratio"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="constriction_ratio"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="approx_leng"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="confin_leng"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="constr_leng"/>
+    <constraint notnull_strength="1" constraints="3" exp_strength="0" unique_strength="1" field="fid"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="level_path"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confinement_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constriction_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="approx_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confin_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constr_leng"/>
   </constraints>
   <constraintExpressions>
-    <constraint exp="" field="fid" desc=""/>
-    <constraint exp="" field="level_path" desc=""/>
-    <constraint exp="" field="confinement_ratio" desc=""/>
-    <constraint exp="" field="constriction_ratio" desc=""/>
-    <constraint exp="" field="approx_leng" desc=""/>
-    <constraint exp="" field="confin_leng" desc=""/>
-    <constraint exp="" field="constr_leng" desc=""/>
+    <constraint desc="" field="fid" exp=""/>
+    <constraint desc="" field="level_path" exp=""/>
+    <constraint desc="" field="confinement_ratio" exp=""/>
+    <constraint desc="" field="constriction_ratio" exp=""/>
+    <constraint desc="" field="approx_leng" exp=""/>
+    <constraint desc="" field="confin_leng" exp=""/>
+    <constraint desc="" field="constr_leng" exp=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
   </attributeactions>
-  <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
     <columns>
-      <column hidden="0" type="field" width="-1" name="fid"/>
-      <column hidden="0" type="field" width="-1" name="level_path"/>
-      <column hidden="0" type="field" width="-1" name="confinement_ratio"/>
-      <column hidden="0" type="field" width="-1" name="constriction_ratio"/>
-      <column hidden="0" type="field" width="-1" name="approx_leng"/>
-      <column hidden="0" type="field" width="-1" name="confin_leng"/>
-      <column hidden="0" type="field" width="-1" name="constr_leng"/>
-      <column hidden="1" type="actions" width="-1"/>
+      <column type="field" name="fid" hidden="0" width="-1"/>
+      <column type="field" name="level_path" hidden="0" width="-1"/>
+      <column type="field" name="confinement_ratio" hidden="0" width="-1"/>
+      <column type="field" name="constriction_ratio" hidden="0" width="-1"/>
+      <column type="field" name="approx_leng" hidden="0" width="-1"/>
+      <column type="field" name="confin_leng" hidden="0" width="-1"/>
+      <column type="field" name="constr_leng" hidden="0" width="-1"/>
+      <column type="actions" hidden="1" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -634,13 +632,13 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field name="approx_leng" editable="1"/>
-    <field name="confin_leng" editable="1"/>
-    <field name="confinement_ratio" editable="1"/>
-    <field name="constr_leng" editable="1"/>
-    <field name="constriction_ratio" editable="1"/>
-    <field name="fid" editable="1"/>
-    <field name="level_path" editable="1"/>
+    <field editable="1" name="approx_leng"/>
+    <field editable="1" name="confin_leng"/>
+    <field editable="1" name="confinement_ratio"/>
+    <field editable="1" name="constr_leng"/>
+    <field editable="1" name="constriction_ratio"/>
+    <field editable="1" name="fid"/>
+    <field editable="1" name="level_path"/>
   </editable>
   <labelOnTop>
     <field name="approx_leng" labelOnTop="0"/>
@@ -652,13 +650,13 @@ def my_form_open(dialog, layer, feature):
     <field name="level_path" labelOnTop="0"/>
   </labelOnTop>
   <reuseLastValue>
-    <field reuseLastValue="0" name="approx_leng"/>
-    <field reuseLastValue="0" name="confin_leng"/>
-    <field reuseLastValue="0" name="confinement_ratio"/>
-    <field reuseLastValue="0" name="constr_leng"/>
-    <field reuseLastValue="0" name="constriction_ratio"/>
-    <field reuseLastValue="0" name="fid"/>
-    <field reuseLastValue="0" name="level_path"/>
+    <field name="approx_leng" reuseLastValue="0"/>
+    <field name="confin_leng" reuseLastValue="0"/>
+    <field name="confinement_ratio" reuseLastValue="0"/>
+    <field name="constr_leng" reuseLastValue="0"/>
+    <field name="constriction_ratio" reuseLastValue="0"/>
+    <field name="fid" reuseLastValue="0"/>
+    <field name="level_path" reuseLastValue="0"/>
   </reuseLastValue>
   <dataDefinedFieldProperties/>
   <widgets/>
diff --git a/Symbology/qgis/Confinement/constriction_ratio.qml b/Symbology/qgis/Confinement/constriction_ratio.qml
index 1782268c..43f6dc40 100644
--- a/Symbology/qgis/Confinement/constriction_ratio.qml
+++ b/Symbology/qgis/Confinement/constriction_ratio.qml
@@ -1,18 +1,18 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis minScale="100000000" labelsEnabled="0" simplifyMaxScale="1" simplifyLocal="1" symbologyReferenceScale="-1" readOnly="0" maxScale="0" version="3.32.3-Lima" styleCategories="AllStyleCategories" simplifyDrawingTol="1" simplifyAlgorithm="0" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0">
+<qgis maxScale="0" minScale="100000000" simplifyDrawingHints="1" simplifyDrawingTol="1" version="3.32.3-Lima" simplifyAlgorithm="0" labelsEnabled="0" simplifyLocal="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" readOnly="0" symbologyReferenceScale="-1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
     <Private>0</Private>
   </flags>
-  <temporal limitMode="0" accumulate="0" enabled="0" startField="" fixedDuration="0" startExpression="" endExpression="" durationField="" endField="" durationUnit="min" mode="0">
+  <temporal startExpression="" limitMode="0" startField="" endField="" durationUnit="min" fixedDuration="0" enabled="0" endExpression="" durationField="" mode="0" accumulate="0">
     <fixedRange>
       <start></start>
       <end></end>
     </fixedRange>
   </temporal>
-  <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zoffset="0" clamping="Terrain" zscale="1" type="IndividualFeatures" symbology="Line" binding="Centroid" extrusionEnabled="0" extrusion="0">
+  <elevation showMarkerSymbolInSurfacePlots="0" type="IndividualFeatures" extrusionEnabled="0" zoffset="0" symbology="Line" zscale="1" respectLayerSymbol="1" extrusion="0" clamping="Terrain" binding="Centroid">
     <data-defined-properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -21,7 +21,7 @@
       </Option>
     </data-defined-properties>
     <profileLineSymbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -29,7 +29,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{b1d66149-2dfc-4fa0-8844-f921861bafbe}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{b1d66149-2dfc-4fa0-8844-f921861bafbe}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -70,7 +70,7 @@
       </symbol>
     </profileLineSymbol>
     <profileFillSymbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="fill" name="" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="fill" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -78,7 +78,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleFill" id="{1dbf954f-9f8c-45ac-890a-2403e353c40e}" locked="0">
+        <layer class="SimpleFill" enabled="1" id="{1dbf954f-9f8c-45ac-890a-2403e353c40e}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
             <Option type="QString" name="color" value="255,158,23,255"/>
@@ -103,7 +103,7 @@
       </symbol>
     </profileFillSymbol>
     <profileMarkerSymbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="marker" name="" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="marker" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -111,7 +111,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleMarker" id="{83af7e76-d001-43ca-89df-15c87f48d658}" locked="0">
+        <layer class="SimpleMarker" enabled="1" id="{83af7e76-d001-43ca-89df-15c87f48d658}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="angle" value="0"/>
             <Option type="QString" name="cap_style" value="square"/>
@@ -144,21 +144,16 @@
       </symbol>
     </profileMarkerSymbol>
   </elevation>
-  <renderer-v2 symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor" type="graduatedSymbol" referencescale="-1" attr="constriction_ratio" forceraster="0">
+  <renderer-v2 type="graduatedSymbol" forceraster="0" symbollevels="0" enableorderby="0" graduatedMethod="GraduatedColor" attr="constriction_ratio" referencescale="-1">
     <ranges>
-      <range upper="0.100000000000000" lower="0.000000000000000" symbol="0" label="0" render="true"/>
-      <range upper="0.200000000000000" lower="0.100000000000000" symbol="1" label="" render="true"/>
-      <range upper="0.300000000000000" lower="0.200000000000000" symbol="2" label="" render="true"/>
-      <range upper="0.400000000000000" lower="0.300000000000000" symbol="3" label="" render="true"/>
-      <range upper="0.500000000000000" lower="0.400000000000000" symbol="4" label="" render="true"/>
-      <range upper="0.600000000000000" lower="0.500000000000000" symbol="5" label="" render="true"/>
-      <range upper="0.700000000000000" lower="0.600000000000000" symbol="6" label="" render="true"/>
-      <range upper="0.800000000000000" lower="0.700000000000000" symbol="7" label="" render="true"/>
-      <range upper="0.900000000000000" lower="0.800000000000000" symbol="8" label="" render="true"/>
-      <range upper="1.000000000000000" lower="0.900000000000000" symbol="9" label="1" render="true"/>
+      <range upper="0.200000000000000" label="0 - 0.2" render="true" lower="0.000000000000000" symbol="0"/>
+      <range upper="0.400000000000000" label="0.2 - 0.4" render="true" lower="0.200000000000000" symbol="1"/>
+      <range upper="0.600000000000000" label="0.4 - 0.6" render="true" lower="0.400000000000000" symbol="2"/>
+      <range upper="0.800000000000000" label="0.6 - 0.8" render="true" lower="0.600000000000000" symbol="3"/>
+      <range upper="1.000000000000000" label="0.8 - 1" render="true" lower="0.800000000000000" symbol="4"/>
     </ranges>
     <symbols>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="0" alpha="0" frame_rate="10" is_animated="0">
+      <symbol type="line" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -166,7 +161,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -205,7 +200,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="1" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="1" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -213,7 +208,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -225,7 +220,7 @@
             <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
             <Option type="QString" name="draw_inside_polygon" value="0"/>
             <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,227,227,255"/>
+            <Option type="QString" name="line_color" value="255,191,191,255"/>
             <Option type="QString" name="line_style" value="solid"/>
             <Option type="QString" name="line_width" value="0.26"/>
             <Option type="QString" name="line_width_unit" value="MM"/>
@@ -252,7 +247,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="2" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="2" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -260,7 +255,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -272,7 +267,7 @@
             <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
             <Option type="QString" name="draw_inside_polygon" value="0"/>
             <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,198,198,255"/>
+            <Option type="QString" name="line_color" value="255,128,128,255"/>
             <Option type="QString" name="line_style" value="solid"/>
             <Option type="QString" name="line_width" value="0.26"/>
             <Option type="QString" name="line_width_unit" value="MM"/>
@@ -299,7 +294,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="3" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="3" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -307,7 +302,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -319,7 +314,7 @@
             <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
             <Option type="QString" name="draw_inside_polygon" value="0"/>
             <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,170,170,255"/>
+            <Option type="QString" name="line_color" value="255,64,64,255"/>
             <Option type="QString" name="line_style" value="solid"/>
             <Option type="QString" name="line_width" value="0.26"/>
             <Option type="QString" name="line_width_unit" value="MM"/>
@@ -346,7 +341,7 @@
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="4" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="4" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -354,242 +349,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
-          <Option type="Map">
-            <Option type="QString" name="align_dash_pattern" value="0"/>
-            <Option type="QString" name="capstyle" value="square"/>
-            <Option type="QString" name="customdash" value="5;2"/>
-            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="customdash_unit" value="MM"/>
-            <Option type="QString" name="dash_pattern_offset" value="0"/>
-            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-            <Option type="QString" name="draw_inside_polygon" value="0"/>
-            <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,142,142,255"/>
-            <Option type="QString" name="line_style" value="solid"/>
-            <Option type="QString" name="line_width" value="0.26"/>
-            <Option type="QString" name="line_width_unit" value="MM"/>
-            <Option type="QString" name="offset" value="0"/>
-            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="offset_unit" value="MM"/>
-            <Option type="QString" name="ring_filter" value="0"/>
-            <Option type="QString" name="trim_distance_end" value="0"/>
-            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-            <Option type="QString" name="trim_distance_start" value="0"/>
-            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-            <Option type="QString" name="use_custom_dash" value="0"/>
-            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-          </Option>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="5" alpha="1" frame_rate="10" is_animated="0">
-        <data_defined_properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
-          <Option type="Map">
-            <Option type="QString" name="align_dash_pattern" value="0"/>
-            <Option type="QString" name="capstyle" value="square"/>
-            <Option type="QString" name="customdash" value="5;2"/>
-            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="customdash_unit" value="MM"/>
-            <Option type="QString" name="dash_pattern_offset" value="0"/>
-            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-            <Option type="QString" name="draw_inside_polygon" value="0"/>
-            <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,113,113,255"/>
-            <Option type="QString" name="line_style" value="solid"/>
-            <Option type="QString" name="line_width" value="0.26"/>
-            <Option type="QString" name="line_width_unit" value="MM"/>
-            <Option type="QString" name="offset" value="0"/>
-            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="offset_unit" value="MM"/>
-            <Option type="QString" name="ring_filter" value="0"/>
-            <Option type="QString" name="trim_distance_end" value="0"/>
-            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-            <Option type="QString" name="trim_distance_start" value="0"/>
-            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-            <Option type="QString" name="use_custom_dash" value="0"/>
-            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-          </Option>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="6" alpha="1" frame_rate="10" is_animated="0">
-        <data_defined_properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
-          <Option type="Map">
-            <Option type="QString" name="align_dash_pattern" value="0"/>
-            <Option type="QString" name="capstyle" value="square"/>
-            <Option type="QString" name="customdash" value="5;2"/>
-            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="customdash_unit" value="MM"/>
-            <Option type="QString" name="dash_pattern_offset" value="0"/>
-            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-            <Option type="QString" name="draw_inside_polygon" value="0"/>
-            <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,85,85,255"/>
-            <Option type="QString" name="line_style" value="solid"/>
-            <Option type="QString" name="line_width" value="0.26"/>
-            <Option type="QString" name="line_width_unit" value="MM"/>
-            <Option type="QString" name="offset" value="0"/>
-            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="offset_unit" value="MM"/>
-            <Option type="QString" name="ring_filter" value="0"/>
-            <Option type="QString" name="trim_distance_end" value="0"/>
-            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-            <Option type="QString" name="trim_distance_start" value="0"/>
-            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-            <Option type="QString" name="use_custom_dash" value="0"/>
-            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-          </Option>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="7" alpha="1" frame_rate="10" is_animated="0">
-        <data_defined_properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
-          <Option type="Map">
-            <Option type="QString" name="align_dash_pattern" value="0"/>
-            <Option type="QString" name="capstyle" value="square"/>
-            <Option type="QString" name="customdash" value="5;2"/>
-            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="customdash_unit" value="MM"/>
-            <Option type="QString" name="dash_pattern_offset" value="0"/>
-            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-            <Option type="QString" name="draw_inside_polygon" value="0"/>
-            <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,57,57,255"/>
-            <Option type="QString" name="line_style" value="solid"/>
-            <Option type="QString" name="line_width" value="0.26"/>
-            <Option type="QString" name="line_width_unit" value="MM"/>
-            <Option type="QString" name="offset" value="0"/>
-            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="offset_unit" value="MM"/>
-            <Option type="QString" name="ring_filter" value="0"/>
-            <Option type="QString" name="trim_distance_end" value="0"/>
-            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-            <Option type="QString" name="trim_distance_start" value="0"/>
-            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-            <Option type="QString" name="use_custom_dash" value="0"/>
-            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-          </Option>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="8" alpha="1" frame_rate="10" is_animated="0">
-        <data_defined_properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
-          <Option type="Map">
-            <Option type="QString" name="align_dash_pattern" value="0"/>
-            <Option type="QString" name="capstyle" value="square"/>
-            <Option type="QString" name="customdash" value="5;2"/>
-            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="customdash_unit" value="MM"/>
-            <Option type="QString" name="dash_pattern_offset" value="0"/>
-            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-            <Option type="QString" name="draw_inside_polygon" value="0"/>
-            <Option type="QString" name="joinstyle" value="bevel"/>
-            <Option type="QString" name="line_color" value="255,28,28,255"/>
-            <Option type="QString" name="line_style" value="solid"/>
-            <Option type="QString" name="line_width" value="0.26"/>
-            <Option type="QString" name="line_width_unit" value="MM"/>
-            <Option type="QString" name="offset" value="0"/>
-            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="offset_unit" value="MM"/>
-            <Option type="QString" name="ring_filter" value="0"/>
-            <Option type="QString" name="trim_distance_end" value="0"/>
-            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-            <Option type="QString" name="trim_distance_start" value="0"/>
-            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-            <Option type="QString" name="use_custom_dash" value="0"/>
-            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-          </Option>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-      </symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="9" alpha="1" frame_rate="10" is_animated="0">
-        <data_defined_properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -630,7 +390,7 @@
       </symbol>
     </symbols>
     <source-symbol>
-      <symbol force_rhr="0" clip_to_extent="1" type="line" name="0" alpha="1" frame_rate="10" is_animated="0">
+      <symbol type="line" name="0" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
         <data_defined_properties>
           <Option type="Map">
             <Option type="QString" name="name" value=""/>
@@ -638,7 +398,7 @@
             <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer enabled="1" pass="0" class="SimpleLine" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0">
+        <layer class="SimpleLine" enabled="1" id="{11f7824d-fa03-449b-aebd-bc9e5707b341}" locked="0" pass="0">
           <Option type="Map">
             <Option type="QString" name="align_dash_pattern" value="0"/>
             <Option type="QString" name="capstyle" value="square"/>
@@ -689,8 +449,8 @@
       </Option>
     </colorramp>
     <classificationMethod id="EqualInterval">
-      <symmetricMode astride="0" enabled="0" symmetrypoint="0"/>
-      <labelFormat labelprecision="2" format="%1 - %2" trimtrailingzeroes="1"/>
+      <symmetricMode enabled="0" symmetrypoint="0" astride="0"/>
+      <labelFormat format="%1 - %2" trimtrailingzeroes="1" labelprecision="2"/>
       <parameters>
         <Option/>
       </parameters>
@@ -719,12 +479,12 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory spacingUnitScale="3x:0,0,0,0,0,0" scaleDependency="Area" penAlpha="255" sizeType="MM" maxScaleDenominator="1e+08" opacity="1" backgroundColor="#ffffff" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" width="15" labelPlacementMethod="XHeight" rotationOffset="270" minScaleDenominator="0" penColor="#000000" backgroundAlpha="255" penWidth="0" lineSizeType="MM" spacing="5" direction="0" enabled="0" diagramOrientation="Up" showAxis="1" height="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" barWidth="5">
-      <fontProperties strikethrough="0" bold="0" italic="0" style="" underline="0" description="MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0"/>
-      <attribute color="#000000" label="" field="" colorOpacity="1"/>
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory direction="0" enabled="0" lineSizeType="MM" maxScaleDenominator="1e+08" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" penWidth="0" spacingUnit="MM" sizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" scaleDependency="Area" scaleBasedVisibility="0" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" rotationOffset="270" width="15" minimumSize="0" minScaleDenominator="0" opacity="1" height="15" spacing="5" backgroundColor="#ffffff" penAlpha="255" barWidth="5" showAxis="1">
+      <fontProperties italic="0" strikethrough="0" underline="0" bold="0" description="MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0" style=""/>
+      <attribute label="" colorOpacity="1" color="#000000" field=""/>
       <axisSymbol>
-        <symbol force_rhr="0" clip_to_extent="1" type="line" name="" alpha="1" frame_rate="10" is_animated="0">
+        <symbol type="line" name="" force_rhr="0" frame_rate="10" clip_to_extent="1" alpha="1" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
               <Option type="QString" name="name" value=""/>
@@ -732,7 +492,7 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" pass="0" class="SimpleLine" id="{796a94c1-4ce4-431a-b719-d559ad214091}" locked="0">
+          <layer class="SimpleLine" enabled="1" id="{796a94c1-4ce4-431a-b719-d559ad214091}" locked="0" pass="0">
             <Option type="Map">
               <Option type="QString" name="align_dash_pattern" value="0"/>
               <Option type="QString" name="capstyle" value="square"/>
@@ -774,7 +534,7 @@
       </axisSymbol>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings placement="2" showAll="1" linePlacementFlags="18" priority="0" dist="0" obstacle="0" zIndex="0">
+  <DiagramLayerSettings placement="2" dist="0" showAll="1" linePlacementFlags="18" obstacle="0" zIndex="0" priority="0">
     <properties>
       <Option type="Map">
         <Option type="QString" name="name" value=""/>
@@ -787,52 +547,52 @@
     <activeChecks/>
     <checkConfiguration/>
   </geometryOptions>
-  <legend showLabelLegend="0" type="default-vector"/>
+  <legend type="default-vector" showLabelLegend="0"/>
   <referencedLayers/>
   <fieldConfiguration>
-    <field configurationFlags="None" name="fid">
+    <field name="fid" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="level_path">
+    <field name="level_path" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="confinement_ratio">
+    <field name="confinement_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="constriction_ratio">
+    <field name="constriction_ratio" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="approx_leng">
+    <field name="approx_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="confin_leng">
+    <field name="confin_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field configurationFlags="None" name="constr_leng">
+    <field name="constr_leng" configurationFlags="None">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -868,37 +628,37 @@
     <default expression="" applyOnUpdate="0" field="constr_leng"/>
   </defaults>
   <constraints>
-    <constraint notnull_strength="1" unique_strength="1" exp_strength="0" constraints="3" field="fid"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="level_path"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="confinement_ratio"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="constriction_ratio"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="approx_leng"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="confin_leng"/>
-    <constraint notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0" field="constr_leng"/>
+    <constraint notnull_strength="1" constraints="3" exp_strength="0" unique_strength="1" field="fid"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="level_path"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confinement_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constriction_ratio"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="approx_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="confin_leng"/>
+    <constraint notnull_strength="0" constraints="0" exp_strength="0" unique_strength="0" field="constr_leng"/>
   </constraints>
   <constraintExpressions>
-    <constraint exp="" field="fid" desc=""/>
-    <constraint exp="" field="level_path" desc=""/>
-    <constraint exp="" field="confinement_ratio" desc=""/>
-    <constraint exp="" field="constriction_ratio" desc=""/>
-    <constraint exp="" field="approx_leng" desc=""/>
-    <constraint exp="" field="confin_leng" desc=""/>
-    <constraint exp="" field="constr_leng" desc=""/>
+    <constraint desc="" field="fid" exp=""/>
+    <constraint desc="" field="level_path" exp=""/>
+    <constraint desc="" field="confinement_ratio" exp=""/>
+    <constraint desc="" field="constriction_ratio" exp=""/>
+    <constraint desc="" field="approx_leng" exp=""/>
+    <constraint desc="" field="confin_leng" exp=""/>
+    <constraint desc="" field="constr_leng" exp=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
   </attributeactions>
-  <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+  <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
     <columns>
-      <column hidden="0" type="field" width="-1" name="fid"/>
-      <column hidden="0" type="field" width="-1" name="level_path"/>
-      <column hidden="0" type="field" width="-1" name="confinement_ratio"/>
-      <column hidden="0" type="field" width="-1" name="constriction_ratio"/>
-      <column hidden="0" type="field" width="-1" name="approx_leng"/>
-      <column hidden="0" type="field" width="-1" name="confin_leng"/>
-      <column hidden="0" type="field" width="-1" name="constr_leng"/>
-      <column hidden="1" type="actions" width="-1"/>
+      <column type="field" name="fid" hidden="0" width="-1"/>
+      <column type="field" name="level_path" hidden="0" width="-1"/>
+      <column type="field" name="confinement_ratio" hidden="0" width="-1"/>
+      <column type="field" name="constriction_ratio" hidden="0" width="-1"/>
+      <column type="field" name="approx_leng" hidden="0" width="-1"/>
+      <column type="field" name="confin_leng" hidden="0" width="-1"/>
+      <column type="field" name="constr_leng" hidden="0" width="-1"/>
+      <column type="actions" hidden="1" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -930,19 +690,19 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field name="ApproxLeng" editable="1"/>
-    <field name="ConfinLeng" editable="1"/>
-    <field name="Confinement_Ratio" editable="1"/>
-    <field name="ConstrLeng" editable="1"/>
-    <field name="Constriction_Ratio" editable="1"/>
-    <field name="NHDPlusID" editable="1"/>
-    <field name="approx_leng" editable="1"/>
-    <field name="confin_leng" editable="1"/>
-    <field name="confinement_ratio" editable="1"/>
-    <field name="constr_leng" editable="1"/>
-    <field name="constriction_ratio" editable="1"/>
-    <field name="fid" editable="1"/>
-    <field name="level_path" editable="1"/>
+    <field editable="1" name="ApproxLeng"/>
+    <field editable="1" name="ConfinLeng"/>
+    <field editable="1" name="Confinement_Ratio"/>
+    <field editable="1" name="ConstrLeng"/>
+    <field editable="1" name="Constriction_Ratio"/>
+    <field editable="1" name="NHDPlusID"/>
+    <field editable="1" name="approx_leng"/>
+    <field editable="1" name="confin_leng"/>
+    <field editable="1" name="confinement_ratio"/>
+    <field editable="1" name="constr_leng"/>
+    <field editable="1" name="constriction_ratio"/>
+    <field editable="1" name="fid"/>
+    <field editable="1" name="level_path"/>
   </editable>
   <labelOnTop>
     <field name="ApproxLeng" labelOnTop="0"/>
@@ -960,13 +720,13 @@ def my_form_open(dialog, layer, feature):
     <field name="level_path" labelOnTop="0"/>
   </labelOnTop>
   <reuseLastValue>
-    <field reuseLastValue="0" name="approx_leng"/>
-    <field reuseLastValue="0" name="confin_leng"/>
-    <field reuseLastValue="0" name="confinement_ratio"/>
-    <field reuseLastValue="0" name="constr_leng"/>
-    <field reuseLastValue="0" name="constriction_ratio"/>
-    <field reuseLastValue="0" name="fid"/>
-    <field reuseLastValue="0" name="level_path"/>
+    <field name="approx_leng" reuseLastValue="0"/>
+    <field name="confin_leng" reuseLastValue="0"/>
+    <field name="confinement_ratio" reuseLastValue="0"/>
+    <field name="constr_leng" reuseLastValue="0"/>
+    <field name="constriction_ratio" reuseLastValue="0"/>
+    <field name="fid" reuseLastValue="0"/>
+    <field name="level_path" reuseLastValue="0"/>
   </reuseLastValue>
   <dataDefinedFieldProperties/>
   <widgets/>
diff --git a/Symbology/web/Confinement/confinement_dgo.json b/Symbology/web/Confinement/confinement_dgo.json
index 1275f5be..3ccd016f 100644
--- a/Symbology/web/Confinement/confinement_dgo.json
+++ b/Symbology/web/Confinement/confinement_dgo.json
@@ -1,16 +1,43 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(0, 100%, 1%)", "Discrete Geographic Objects (DGOs)"]
+    ["hsl(84, 95%, 34%)", "0 - 0.1"],
+    ["hsl(63, 100%, 41%)", "0.1 - 0.5"],
+    ["hsl(42, 100%, 48%)", "0.5 - 0.85"],
+    ["hsl(0, 95%, 44%)", "0.85 - 1.0"]
   ],
   "layerStyles": [
     {
-        "id": "dgo-ajx9vb",
-        "type": "line",
-        "source": "composite",
-        "source-layer": "dgo-ajx9vb",
-        "layout": {},
-        "paint": {"line-color": "hsl(0, 100%, 1%)"}
-    }
+      "id": "sample-dgo-ccfyjo",
+      "type": "fill",
+      "source": "composite",
+      "source-layer": "sample_dgo-ccfyjo",
+      "layout": {},
+      "paint": {
+          "fill-color": [
+              "interpolate",
+              ["linear"],
+              ["get", "confinemen"],
+              0,
+              "hsl(84, 95%, 34%)",
+              0.1,
+              "hsl(84, 95%, 34%)",
+              0.10001,
+              "hsl(63, 100%, 41%)",
+              0.5,
+              "hsl(63, 100%, 41%)",
+              0.50001,
+              "hsl(42, 100%, 48%)",
+              0.85,
+              "hsl(42, 100%, 48%)",
+              0.85001,
+              "hsl(0, 95%, 44%)",
+              1,
+              "hsl(0, 95%, 44%)"
+          ],
+          "fill-outline-color": "rgb(0, 0, 0)",
+          "fill-opacity": 0.75
+      }
+  }
   ]
 }
\ No newline at end of file
diff --git a/Symbology/web/Confinement/confinement_igo.json b/Symbology/web/Confinement/confinement_igo.json
index 9b166bd6..bf71e533 100644
--- a/Symbology/web/Confinement/confinement_igo.json
+++ b/Symbology/web/Confinement/confinement_igo.json
@@ -1,20 +1,43 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(57, 76%, 49%)", "Integrated Geographic Objects (IGOs)"]
+    ["hsl(84, 95%, 34%)", "0 - 0.1"],
+    ["hsl(63, 100%, 41%)", "0.1 - 0.5"],
+    ["hsl(42, 100%, 48%)", "0.5 - 0.85"],
+    ["hsl(0, 95%, 44%)", "0.85 - 1.0"]
   ],
   "layerStyles": [
     {
-        "id": "igo-dcto49",
-        "type": "circle",
-        "source": "composite",
-        "source-layer": "igo-dcto49",
-        "layout": {},
-        "paint": {
-            "circle-radius": 4,
-            "circle-color": "hsl(57, 76%, 49%)",
-            "circle-stroke-width": 0.4
-        }
-    }
+      "id": "sample-igo-1hlhoh",
+      "type": "circle",
+      "source": "composite",
+      "source-layer": "sample_igo-1hlhoh",
+      "layout": {},
+      "paint": {
+          "circle-radius": 4,
+          "circle-color": [
+              "interpolate",
+              ["linear"],
+              ["get", "confinement_ratio"],
+              0,
+              "hsl(84, 95%, 34%)",
+              0.1,
+              "hsl(84, 95%, 34%)",
+              0.10001,
+              "hsl(63, 100%, 41%)",
+              0.5,
+              "hsl(63, 100%, 41%)",
+              0.50001,
+              "hsl(42, 100%, 48%)",
+              0.85,
+              "hsl(42, 100%, 48%)",
+              0.85001,
+              "hsl(0, 95%, 44%)",
+              1,
+              "hsl(0, 95%, 44%)"
+          ],
+          "circle-stroke-color": "hsla(0, 0%, 0%, 0)"
+      }
+  }
   ]
 }
\ No newline at end of file
diff --git a/Symbology/web/Confinement/confinement_margins.json b/Symbology/web/Confinement/confinement_margins.json
index 9c522e15..6d818a5b 100644
--- a/Symbology/web/Confinement/confinement_margins.json
+++ b/Symbology/web/Confinement/confinement_margins.json
@@ -1,29 +1,16 @@
 {
     "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
     "legend": [
-        ["hsl(116, 57%, 39%)", "0.1"],
-        ["hsl(108, 87%, 59%)", "0.5"],
-        ["hsl(29, 100%, 50%)", "0.85"],
-        ["hsl(8, 100%, 50%)", "1.0"]
+        ["hsl(325, 73%, 58%)", "Confining Margins"]
     ],
     "layerStyles": [
         {
-            "id": "confinement-ratio-3oldrq",
+            "id": "sample-confining-margin-42524p",
             "type": "line",
             "source": "composite",
-            "source-layer": "confinement_ratio-3oldrq",
+            "source-layer": "sample_confining_margin-42524p",
             "layout": {},
-            "paint": {
-                "line-color": [
-                    "step",
-                    ["get", "Confinement_Ratio"],
-                    "hsl(116, 57%, 39%)", 0.1,
-                    "hsl(108, 87%, 59%)", 0.5,
-                    "hsl(29, 100%, 50%)", 0.85,
-                    "hsl(8, 100%, 50%)", 1.0,
-                    "hsl(8, 100%, 50%)"
-                ]
-            }
+            "paint": {"line-color": "hsl(325, 73%, 58%)", "line-width": 0.75}
         }
     ]
 }
diff --git a/Symbology/web/Confinement/confinement_ratio.json b/Symbology/web/Confinement/confinement_ratio.json
index 432be3ce..9e29ae6d 100644
--- a/Symbology/web/Confinement/confinement_ratio.json
+++ b/Symbology/web/Confinement/confinement_ratio.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(84, 95%, 34%)", "0.1"],
-    ["hsl(63, 100%, 41%)", "0.5"],
-    ["hsl(42, 100%, 48%)", "0.85"],
-    ["hsl(0, 95%, 44%)", "1.0"]
+    ["hsl(84, 95%, 34%)", "0 - 0.1"],
+    ["hsl(63, 100%, 41%)", "0.1 - 0.5"],
+    ["hsl(42, 100%, 48%)", "0.5 - 0.85"],
+    ["hsl(0, 95%, 44%)", "0.85 - 1.0"]
   ],
   "layerStyles": [
     {
diff --git a/Symbology/web/Confinement/confinement_raw.json b/Symbology/web/Confinement/confinement_raw.json
index f1dcf001..6d3e73ad 100644
--- a/Symbology/web/Confinement/confinement_raw.json
+++ b/Symbology/web/Confinement/confinement_raw.json
@@ -24,7 +24,8 @@
               ["Left"],
               "hsl(235, 87%, 56%)",
               ["Both"],
-              "hsl(8, 100%, 50%)"
+              "hsl(8, 100%, 50%)",
+              "#000000"
           ]
       }
   }
diff --git a/Symbology/web/Confinement/constriction_ratio.json b/Symbology/web/Confinement/constriction_ratio.json
index 0ed8fc9a..c2f35951 100644
--- a/Symbology/web/Confinement/constriction_ratio.json
+++ b/Symbology/web/Confinement/constriction_ratio.json
@@ -1,16 +1,11 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsla(0, 0%, 100%, 0)", "0"],
-    ["hsl(0, 100%, 95%)", ""],
-    ["hsl(0, 100%, 89%)", ""],
-    ["hsl(0, 100%, 83%)", ""],
-    ["hsl(0, 100%, 78%)", ""],
-    ["hsl(0, 100%, 72%)", ""],
-    ["hsl(0, 100%, 67%)", ""],
-    ["hsl(0, 100%, 61%)", ""],
-    ["hsl(0, 100%, 55%)", ""],
-    ["hsl(0, 100%, 50%)", "1"]
+    ["hsla(0, 0%, 100%, 0)", "0 - 0.2"],
+    ["hsl(0, 100%, 87%)", "0.2 - 0.4"],
+    ["hsl(0, 100%, 75%)", "0.4 - 0.6"],
+    ["hsl(0, 100%, 63%)", "0.6 - 0.8"],
+    ["hsl(0, 100%, 50%)", "0.8 - 0.1"]
   ],
   "layerStyles": [
     {
@@ -25,42 +20,22 @@
               ["linear"],
               ["get", "constriction_ratio"],
               0,
-              "hsla(0, 0%, 100%, 0)",
-              0.1,
-              "hsla(0, 0%, 100%, 0)",
-              0.10001,
-              "hsl(0, 100%, 95%)",
+              "hsl(0, 0%, 100%)",
               0.2,
-              "hsl(0, 100%, 95%)",
+              "hsl(0, 0%, 100%)",
               0.20001,
-              "hsl(0, 100%, 89%)",
-              0.3,
-              "hsl(0, 100%, 89%)",
-              0.30001,
-              "hsl(0, 100%, 83%)",
+              "hsl(0, 100%, 87%)",
               0.4,
-              "hsl(0, 100%, 83%)",
+              "hsl(0, 100%, 87%)",
               0.40001,
-              "hsl(0, 100%, 78%)",
-              0.5,
-              "hsl(0, 100%, 78%)",
-              0.50001,
-              "hsl(0, 100%, 72%)",
+              "hsl(0, 100%, 75%)",
               0.6,
-              "hsl(0, 100%, 72%)",
+              "hsl(0, 100%, 75%)",
               0.60001,
-              "hsl(0, 100%, 67%)",
-              0.7,
-              "hsl(0, 100%, 67%)",
-              0.70001,
-              "hsl(0, 100%, 61%)",
+              "hsl(0, 100%, 63%)",
               0.8,
-              "hsl(0, 100%, 61%)",
+              "hsl(0, 100%, 63%)",
               0.80001,
-              "hsl(0, 100%, 55%)",
-              0.9,
-              "hsl(0, 100%, 55%)",
-              0.90001,
               "hsl(0, 100%, 50%)",
               1.0,
               "hsl(0, 100%, 50%)"
diff --git a/Symbology/web/Confinement/flowlines.json b/Symbology/web/Confinement/flowlines.json
deleted file mode 100644
index 685230a8..00000000
--- a/Symbology/web/Confinement/flowlines.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
-  "legend": [
-    [ "hsl(209, 88%, 48%)", "Flowlines"]
-  ],
-  "layerStyles": [
-    {
-      "id": "flowlines-cwdhi5",
-      "type": "line",
-      "source": "composite",
-      "source-layer": "flowlines-cwdhi5",
-      "layout": {},
-      "paint": {
-        "line-color": "hsl(209, 88%, 48%)"
-      }
-    }
-  ]
-}
\ No newline at end of file