diff --git a/web/src/components/ProductDetail.tsx b/web/src/components/ProductDetail.tsx
index 8a09670..f83cbaa 100644
--- a/web/src/components/ProductDetail.tsx
+++ b/web/src/components/ProductDetail.tsx
@@ -61,7 +61,9 @@ export function ProductDetail({
     ["Strain", item.name],
     ["Brand", helpers.brandName(data, item.brandId)],
     ["Shop", helpers.shopName(data, item.shopId)],
-    ["Total cannabinoids", `${item.totalCannabinoids.toFixed(1)}%`],
+    ...(cfg?.showCannabinoidPct !== false
+      ? [["Total cannabinoids", `${item.totalCannabinoids.toFixed(1)}%`] as [string, React.ReactNode]]
+      : []),
     ["Purchase date", fmt.date(item.purchaseDate)],
     ["Bin", isCheckedOut ? "In your custody" : bin ? bin.name : <span style={{ color: "var(--ink-3)" }}>—</span>],
     ["Audit cadence", `Every ${cfg?.cadenceDays ?? "—"} days · ${cfg?.auditMode ?? "—"}`],
@@ -203,37 +205,44 @@ export function ProductDetail({
             </div>
           )}
 
-          <div
-            style={{
-              display: "grid",
-              gridTemplateColumns: "repeat(4, 1fr)",
-              gap: 1,
-              marginTop: 32,
-              background: "var(--line)",
-              border: "1px solid var(--line)",
-              borderRadius: "var(--r-md)",
-              overflow: "hidden",
-            }}
-          >
-            {(
+          {(() => {
+            const statCards: [string, React.ReactNode][] = [
+              ["Price", fmt.money(item.price)],
               [
-                ["Price", fmt.money(item.price)],
-                [
-                  item.kind === "discrete" ? "Unit weight" : "Size",
-                  item.kind === "discrete"
-                    ? `${item.unitWeight} g`
-                    : `${item.weight} ${cfg?.unit ?? "g"}`,
-                ],
-                ["THC", `${item.thc.toFixed(1)}%`],
-                ["CBD", `${item.cbd.toFixed(1)}%`],
-              ] as [string, React.ReactNode][]
-            ).map(([l, v], i) => (
-              <div key={i} style={{ padding: "18px 16px", background: "var(--surface)" }}>
-                <div className="smallcaps" style={{ color: "var(--ink-3)" }}>{l}</div>
-                <div className="serif" style={{ fontSize: 26, marginTop: 4, fontWeight: 500 }}>{v}</div>
+                item.kind === "discrete" ? "Unit weight" : "Size",
+                item.kind === "discrete"
+                  ? `${item.unitWeight} ${cfg?.weightUnit ?? "g"}`
+                  : `${item.weight} ${cfg?.unit ?? "g"}`,
+              ],
+              ...(cfg?.showCannabinoidPct !== false
+                ? [
+                    ["THC", `${item.thc.toFixed(1)}%`] as [string, React.ReactNode],
+                    ["CBD", `${item.cbd.toFixed(1)}%`] as [string, React.ReactNode],
+                  ]
+                : []),
+            ];
+            return (
+              <div
+                style={{
+                  display: "grid",
+                  gridTemplateColumns: `repeat(${statCards.length}, 1fr)`,
+                  gap: 1,
+                  marginTop: 32,
+                  background: "var(--line)",
+                  border: "1px solid var(--line)",
+                  borderRadius: "var(--r-md)",
+                  overflow: "hidden",
+                }}
+              >
+                {statCards.map(([l, v], i) => (
+                  <div key={i} style={{ padding: "18px 16px", background: "var(--surface)" }}>
+                    <div className="smallcaps" style={{ color: "var(--ink-3)" }}>{l}</div>
+                    <div className="serif" style={{ fontSize: 26, marginTop: 4, fontWeight: 500 }}>{v}</div>
+                  </div>
+                ))}
               </div>
-            ))}
-          </div>
+            );
+          })()}
 
           {(isActive || isCheckedOut) && (
             <div style={{ marginTop: 20 }}>
diff --git a/web/src/components/modals/AddInventoryFlow.tsx b/web/src/components/modals/AddInventoryFlow.tsx
index c1c617c..017859d 100644
--- a/web/src/components/modals/AddInventoryFlow.tsx
+++ b/web/src/components/modals/AddInventoryFlow.tsx
@@ -365,9 +365,9 @@ function InstanceDetailsStep({
     weight: last?.weight ?? (isDiscrete ? 0 : 3.5),
     unitWeight: last?.unitWeight ?? (isDiscrete ? 0.7 : 0),
     price: initialPrice,
-    thc: last?.thc ?? 22,
-    cbd: last?.cbd ?? 0.4,
-    totalCannabinoids: last?.totalCannabinoids ?? 26,
+    thc: last?.thc ?? (cfg?.showCannabinoidPct !== false ? 22 : 0),
+    cbd: last?.cbd ?? (cfg?.showCannabinoidPct !== false ? 0.4 : 0),
+    totalCannabinoids: last?.totalCannabinoids ?? (cfg?.showCannabinoidPct !== false ? 26 : 0),
     purchaseDate: TODAY_STR,
   });
   const [newShopName, setNewShopName] = useState("");
@@ -572,7 +572,7 @@ function InstanceDetailsStep({
           }}
         >
           {isDiscrete ? (
-            <Field label="Unit weight (g)" span={2} hint="Weight of one unit — for grams stats">
+            <Field label={`Unit weight (${cfg?.weightUnit ?? "g"})`} span={2} hint="Weight of one unit — for grams stats">
               <Input
                 type="number"
                 step="0.1"
@@ -616,38 +616,42 @@ function InstanceDetailsStep({
           </div>
         )}
 
-        <div
-          className="smallcaps"
-          style={{ color: "var(--ink-3)", margin: "28px 0 16px" }}
-        >
-          Cannabinoid profile
-        </div>
-        <div style={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", gap: 16 }}>
-          <Field label="THC %">
-            <Input
-              type="number"
-              step="0.1"
-              value={form.thc}
-              onChange={(e) => update("thc", +e.target.value)}
-            />
-          </Field>
-          <Field label="CBD %">
-            <Input
-              type="number"
-              step="0.1"
-              value={form.cbd}
-              onChange={(e) => update("cbd", +e.target.value)}
-            />
-          </Field>
-          <Field label="Total cannabinoids %">
-            <Input
-              type="number"
-              step="0.1"
-              value={form.totalCannabinoids}
-              onChange={(e) => update("totalCannabinoids", +e.target.value)}
-            />
-          </Field>
-        </div>
+        {cfg?.showCannabinoidPct !== false && (
+          <>
+            <div
+              className="smallcaps"
+              style={{ color: "var(--ink-3)", margin: "28px 0 16px" }}
+            >
+              Cannabinoid profile
+            </div>
+            <div style={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", gap: 16 }}>
+              <Field label="THC %">
+                <Input
+                  type="number"
+                  step="0.1"
+                  value={form.thc}
+                  onChange={(e) => update("thc", +e.target.value)}
+                />
+              </Field>
+              <Field label="CBD %">
+                <Input
+                  type="number"
+                  step="0.1"
+                  value={form.cbd}
+                  onChange={(e) => update("cbd", +e.target.value)}
+                />
+              </Field>
+              <Field label="Total cannabinoids %">
+                <Input
+                  type="number"
+                  step="0.1"
+                  value={form.totalCannabinoids}
+                  onChange={(e) => update("totalCannabinoids", +e.target.value)}
+                />
+              </Field>
+            </div>
+          </>
+        )}
 
         {error && (
           <div style={{ marginTop: 14, fontSize: 12, color: "var(--terracotta)" }}>{error}</div>
diff --git a/web/src/components/modals/EditInventoryFlow.tsx b/web/src/components/modals/EditInventoryFlow.tsx
index 83bcdde..0f92490 100644
--- a/web/src/components/modals/EditInventoryFlow.tsx
+++ b/web/src/components/modals/EditInventoryFlow.tsx
@@ -191,7 +191,7 @@ export function EditInventoryFlow({
             }}
           >
             {isDiscrete ? (
-              <Field label="Unit weight (g)" span={2} hint="Weight of one unit — for grams stats">
+              <Field label={`Unit weight (${cfg?.weightUnit ?? "g"})`} span={2} hint="Weight of one unit — for grams stats">
                 <Input
                   type="number"
                   step="0.1"
@@ -235,38 +235,42 @@ export function EditInventoryFlow({
             </div>
           )}
 
-          <div
-            className="smallcaps"
-            style={{ color: "var(--ink-3)", margin: "28px 0 16px" }}
-          >
-            Cannabinoid profile
-          </div>
-          <div style={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", gap: 16 }}>
-            <Field label="THC %">
-              <Input
-                type="number"
-                step="0.1"
-                value={form.thc}
-                onChange={(e) => update("thc", +e.target.value)}
-              />
-            </Field>
-            <Field label="CBD %">
-              <Input
-                type="number"
-                step="0.1"
-                value={form.cbd}
-                onChange={(e) => update("cbd", +e.target.value)}
-              />
-            </Field>
-            <Field label="Total cannabinoids %">
-              <Input
-                type="number"
-                step="0.1"
-                value={form.totalCannabinoids}
-                onChange={(e) => update("totalCannabinoids", +e.target.value)}
-              />
-            </Field>
-          </div>
+          {cfg?.showCannabinoidPct !== false && (
+            <>
+              <div
+                className="smallcaps"
+                style={{ color: "var(--ink-3)", margin: "28px 0 16px" }}
+              >
+                Cannabinoid profile
+              </div>
+              <div style={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", gap: 16 }}>
+                <Field label="THC %">
+                  <Input
+                    type="number"
+                    step="0.1"
+                    value={form.thc}
+                    onChange={(e) => update("thc", +e.target.value)}
+                  />
+                </Field>
+                <Field label="CBD %">
+                  <Input
+                    type="number"
+                    step="0.1"
+                    value={form.cbd}
+                    onChange={(e) => update("cbd", +e.target.value)}
+                  />
+                </Field>
+                <Field label="Total cannabinoids %">
+                  <Input
+                    type="number"
+                    step="0.1"
+                    value={form.totalCannabinoids}
+                    onChange={(e) => update("totalCannabinoids", +e.target.value)}
+                  />
+                </Field>
+              </div>
+            </>
+          )}
 
           {item.audits.length > 0 && (
             <div
diff --git a/web/src/types.ts b/web/src/types.ts
index c2724dc..f1e742e 100644
--- a/web/src/types.ts
+++ b/web/src/types.ts
@@ -98,6 +98,8 @@ export interface TypeConfig {
   cadenceDays: number;
   unit: string;
   weighable: boolean;
+  weightUnit: string;
+  showCannabinoidPct: boolean;
 }
 
 export interface Bootstrap {
@@ -112,12 +114,12 @@ export interface Bootstrap {
 
 // Type config lives client-side — static, not user data.
 export const TYPES: TypeConfig[] = [
-  { id: "Flower",      kind: "bulk",     auditMode: "weigh",    cadenceDays: 14, unit: "g",  weighable: true  },
-  { id: "Concentrate", kind: "bulk",     auditMode: "estimate", cadenceDays: 21, unit: "g",  weighable: true  },
-  { id: "Tincture",    kind: "bulk",     auditMode: "estimate", cadenceDays: 30, unit: "ml", weighable: false },
-  { id: "Pre-roll",    kind: "discrete", auditMode: "presence", cadenceDays: 30, unit: "ct", weighable: false },
-  { id: "Edible",      kind: "discrete", auditMode: "presence", cadenceDays: 60, unit: "ct", weighable: false },
-  { id: "Vaporizer",   kind: "discrete", auditMode: "presence", cadenceDays: 30, unit: "ct", weighable: false },
+  { id: "Flower",      kind: "bulk",     auditMode: "weigh",    cadenceDays: 14, unit: "g",  weighable: true,  weightUnit: "g",  showCannabinoidPct: true  },
+  { id: "Concentrate", kind: "bulk",     auditMode: "estimate", cadenceDays: 21, unit: "g",  weighable: true,  weightUnit: "g",  showCannabinoidPct: true  },
+  { id: "Tincture",    kind: "bulk",     auditMode: "estimate", cadenceDays: 30, unit: "ml", weighable: false, weightUnit: "ml", showCannabinoidPct: true  },
+  { id: "Pre-roll",    kind: "discrete", auditMode: "presence", cadenceDays: 30, unit: "ct", weighable: false, weightUnit: "g",  showCannabinoidPct: true  },
+  { id: "Edible",      kind: "discrete", auditMode: "presence", cadenceDays: 60, unit: "ct", weighable: false, weightUnit: "mg", showCannabinoidPct: false },
+  { id: "Vaporizer",   kind: "discrete", auditMode: "presence", cadenceDays: 30, unit: "ct", weighable: false, weightUnit: "g",  showCannabinoidPct: true  },
 ];
 
 // User-supplied 6-digit asset ids are printed on a roll of physical tags.