diff --git a/src/components/ui/ChannelSettingsModal.tsx b/src/components/ui/ChannelSettingsModal.tsx
index 141ec54b..8241eca8 100644
--- a/src/components/ui/ChannelSettingsModal.tsx
+++ b/src/components/ui/ChannelSettingsModal.tsx
@@ -18,9 +18,15 @@ import {
 import { useMediaQuery } from "../../hooks/useMediaQuery";
 import { useModalBehavior } from "../../hooks/useModalBehavior";
 import ircClient from "../../lib/ircClient";
-import { hasOpPermission } from "../../lib/ircUtils";
+import { hasOpPermission, humanizeNamedMode } from "../../lib/ircUtils";
+import {
+  lookupNamedModeMeta,
+  NAMED_MODE_GROUP_LABELS,
+  NAMED_MODE_GROUP_ORDER,
+  type NamedModeGroup,
+} from "../../lib/namedModeRegistry";
 import useStore, { serverSupportsMetadata } from "../../store";
-import type { Channel } from "../../types";
+import type { Channel, NamedModeSpec } from "../../types";
 import AvatarUpload from "./AvatarUpload";
 import FloodSettingsModal from "./FloodSettingsModal";
 
@@ -87,6 +93,14 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
   const [isUpdatingTopic, setIsUpdatingTopic] = useState(false);
   const [isApplyingChanges, setIsApplyingChanges] = useState(false);
 
+  // Pending changes for the named-modes-aware Advanced tab. Keyed by
+  // long-form mode name (e.g. "topiclock" or "obsidianirc/floodprot").
+  // Apply diffs this against `originalModesRef` (which records the
+  // current letter-keyed state) and emits a single sendNamedMode call.
+  const [pendingNamedModes, setPendingNamedModes] = useState<
+    Record<string, { sign: "+" | "-"; param?: string }>
+  >({});
+
   // Flood settings modal state
   const [isFloodModalOpen, setIsFloodModalOpen] = useState(false);
   const [floodProfile, setFloodProfile] = useState("");
@@ -200,7 +214,8 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
     ...(userHasOpPermission && supportsMetadata
       ? [{ id: "settings" as const, name: "Settings", icon: FaCog, count: 0 }]
       : []),
-    ...(userHasOpPermission && server?.isUnrealIRCd
+    ...(userHasOpPermission &&
+    (server?.namedModes?.supported || server?.isUnrealIRCd)
       ? [{ id: "advanced" as const, name: "Advanced", icon: FaCog, count: 0 }]
       : []),
   ];
@@ -223,6 +238,7 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
     if (!isOpen) {
       hasFetchedRef.current = false;
       clearPendingTimeouts();
+      setPendingNamedModes({});
     }
   }, [isOpen, clearPendingTimeouts]);
 
@@ -987,6 +1003,24 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
     }
   };
 
+  /** Apply path for the named-modes-aware Advanced tab. Walks the
+   *  pendingNamedModes map and emits a single sendNamedMode call. */
+  const applyNamedModesAdvancedChanges = async () => {
+    if (!server || !channel) return;
+    const items: Array<{ sign: "+" | "-"; name: string; param?: string }> = [];
+    for (const [name, change] of Object.entries(pendingNamedModes)) {
+      items.push({ sign: change.sign, name, param: change.param });
+    }
+    if (!items.length) return;
+    setIsApplyingChanges(true);
+    try {
+      ircClient.sendNamedMode(serverId, channelName, items, server.namedModes);
+      setPendingNamedModes({});
+    } finally {
+      setIsApplyingChanges(false);
+    }
+  };
+
   // Cancel pending timeouts when component unmounts
   useEffect(() => {
     return () => clearPendingTimeouts();
@@ -1026,6 +1060,155 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
 
   if (!isOpen) return null;
 
+  /** Look up the live state of a named mode in the parsed mode-state
+   *  ref. Returns { set, param } where set indicates presence and
+   *  param is the current parameter (if any). */
+  const liveStateForNamedMode = (
+    spec: NamedModeSpec,
+  ): { set: boolean; param: string | null } => {
+    if (!spec.letter) return { set: false, param: null };
+    const stored = originalModesRef.current[spec.letter];
+    if (stored === undefined) return { set: false, param: null };
+    // null = present, no param. string = present with param. "__HIDDEN__"
+    // (used for +k/+L masking) counts as present without an exposable
+    // value.
+    return { set: true, param: stored };
+  };
+
+  /** What the user has chosen the mode should become, taking pending
+   *  edits into account. Returns null when there's no override. */
+  const stagedStateForNamedMode = (
+    name: string,
+  ): { sign: "+" | "-"; param?: string } | null => {
+    return pendingNamedModes[name] ?? null;
+  };
+
+  const stageNamedMode = (
+    name: string,
+    next: { sign: "+" | "-"; param?: string } | null,
+  ) => {
+    setPendingNamedModes((prev) => {
+      const out = { ...prev };
+      if (next === null) delete out[name];
+      else out[name] = next;
+      return out;
+    });
+  };
+
+  /** Render a single named-mode entry. The control type is dictated
+   *  by the spec's mode type (1=list, 2=param-both, 3=param-add-only,
+   *  4=flag, 5=prefix). We skip 1 (the dedicated Bans/Exceptions/
+   *  Invitations tabs cover those) and 5 (member-prefix modes are
+   *  set via the member context menu, not channel settings).
+   *
+   *  Returns { node, group } so the caller can bucket rows into the
+   *  section ordering from NAMED_MODE_GROUP_ORDER. Returns null when
+   *  the registry marks the mode as hidden (covered by another tab or
+   *  server-managed). */
+  const renderNamedModeRow = (
+    spec: NamedModeSpec,
+  ): { node: React.ReactNode; group: NamedModeGroup } | null => {
+    if (spec.type === 1 || spec.type === 5) return null;
+    const meta = lookupNamedModeMeta(spec.name);
+    if (meta?.hidden) return null;
+
+    const fallback = humanizeNamedMode(spec.name);
+    const label = meta?.label ?? fallback.display;
+    const description = meta?.description ?? "";
+    const group: NamedModeGroup = meta?.group ?? "properties";
+    const placeholder = meta?.paramPlaceholder;
+
+    const live = liveStateForNamedMode(spec);
+    const staged = stagedStateForNamedMode(spec.name);
+
+    const isFlag = spec.type === 4;
+    const stagedSet = staged ? staged.sign === "+" : live.set;
+    const stagedParam = staged?.param ?? live.param ?? "";
+
+    const headerRow = (
+      <div className="flex flex-col min-w-0 flex-1 gap-0.5">
+        <div className="flex items-center gap-2 min-w-0">
+          <span className="text-sm font-medium text-white truncate">
+            {label}
+          </span>
+          {fallback.vendor && (
+            <span className="text-[10px] tracking-wide px-1.5 py-0.5 rounded bg-discord-dark-400 text-discord-text-muted flex-shrink-0 lowercase">
+              {fallback.vendor}
+            </span>
+          )}
+        </div>
+        {description && (
+          <p className="text-xs text-discord-text-muted leading-snug">
+            {description}
+          </p>
+        )}
+      </div>
+    );
+
+    if (isFlag) {
+      return {
+        group,
+        node: (
+          <div
+            key={spec.name}
+            className="flex items-start justify-between p-3 bg-discord-dark-300 rounded gap-3"
+          >
+            {headerRow}
+            <input
+              type="checkbox"
+              checked={stagedSet}
+              onChange={(e) => {
+                const next = e.target.checked;
+                if (next === live.set) {
+                  stageNamedMode(spec.name, null);
+                } else {
+                  stageNamedMode(spec.name, { sign: next ? "+" : "-" });
+                }
+              }}
+              className="w-4 h-4 mt-1 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+            />
+          </div>
+        ),
+      };
+    }
+
+    // Param mode (type 2 or 3). Empty input means "unset"; non-empty
+    // means "set to this value".
+    return {
+      group,
+      node: (
+        <div
+          key={spec.name}
+          className="flex flex-col gap-2 p-3 bg-discord-dark-300 rounded"
+        >
+          {headerRow}
+          <div className="flex gap-2">
+            <input
+              type="text"
+              value={stagedParam}
+              onChange={(e) => {
+                const v = e.target.value;
+                if (v === (live.param ?? "")) {
+                  stageNamedMode(spec.name, null);
+                } else if (!v) {
+                  stageNamedMode(spec.name, { sign: "-" });
+                } else {
+                  stageNamedMode(spec.name, { sign: "+", param: v });
+                }
+              }}
+              placeholder={
+                live.set
+                  ? "(set, edit to change)"
+                  : (placeholder ?? "(not set)")
+              }
+              className="flex-1 p-2 bg-discord-dark-400 text-white rounded text-sm"
+            />
+          </div>
+        </div>
+      ),
+    };
+  };
+
   const contentBody = (
     <div className="flex-1 flex flex-col min-h-0">
       <div className="flex-1 overflow-y-auto p-6">
@@ -1455,421 +1638,460 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
         ) : (
           <>
             {/* Advanced tab content */}
-            <div className="flex-1 overflow-y-auto space-y-6">
-              {/* Flood Protection Settings */}
-              <div className="space-y-4">
-                <div className="space-y-2">
-                  <label className="text-sm font-medium text-white">
-                    Flood Protection (+f)
-                  </label>
-                  <p className="text-xs text-discord-text-muted mb-2">
-                    Configure flood protection rules to prevent spam and abuse.
-                    UnrealIRCd-specific feature.
-                  </p>
-                </div>
-
-                {/* Flood Profile Selection */}
-                <div className="space-y-2">
-                  <label className="text-xs font-medium text-discord-text-muted uppercase tracking-wide">
-                    Flood Profile (+F)
-                  </label>
-                  <select
-                    value={floodProfile}
-                    onChange={(e) => setFloodProfile(e.target.value)}
-                    className="w-full p-2 bg-discord-dark-300 text-white rounded text-sm"
-                  >
-                    <option value="">No flood profile</option>
-                    <option value="very-strict">Very Strict</option>
-                    <option value="strict">Strict</option>
-                    <option value="normal">Normal</option>
-                    <option value="relaxed">Relaxed</option>
-                    <option value="very-relaxed">Very Relaxed</option>
-                  </select>
-                </div>
-
-                {/* Flood Parameters */}
-                <div className="space-y-2">
-                  <label className="text-xs font-medium text-discord-text-muted uppercase tracking-wide">
-                    Flood Parameters
-                  </label>
-                  <div className="flex gap-2">
-                    <input
-                      type="text"
-                      value={floodParams}
-                      onChange={(e) => setFloodParams(e.target.value)}
-                      placeholder="Default"
-                      className="flex-1 p-2 bg-discord-dark-300 text-white rounded text-sm"
-                    />
-                    <button
-                      onClick={() => setIsFloodModalOpen(true)}
-                      className="px-3 py-2 bg-discord-primary hover:bg-opacity-80 text-white rounded text-sm font-medium"
-                    >
-                      Configure
-                    </button>
+            {server?.namedModes?.supported ? (
+              (() => {
+                const grouped = new Map<NamedModeGroup, React.ReactNode[]>();
+                for (const spec of server.namedModes.channelModes ?? []) {
+                  const result = renderNamedModeRow(spec);
+                  if (!result) continue;
+                  const list = grouped.get(result.group) ?? [];
+                  list.push(result.node);
+                  grouped.set(result.group, list);
+                }
+                const sections = NAMED_MODE_GROUP_ORDER.filter(
+                  (g) => (grouped.get(g)?.length ?? 0) > 0,
+                );
+                if (sections.length === 0) {
+                  return (
+                    <div className="flex-1 overflow-y-auto">
+                      <p className="text-sm text-discord-text-muted italic">
+                        No advanced modes are advertised by this server.
+                      </p>
+                    </div>
+                  );
+                }
+                return (
+                  <div className="flex-1 overflow-y-auto space-y-6">
+                    {sections.map((g) => (
+                      <div key={g} className="space-y-2">
+                        <h3 className="text-xs font-semibold uppercase tracking-wide text-discord-text-muted">
+                          {NAMED_MODE_GROUP_LABELS[g]}
+                        </h3>
+                        <div className="space-y-2">{grouped.get(g)}</div>
+                      </div>
+                    ))}
                   </div>
-                  <p className="text-xs text-discord-text-muted">
-                    Use the Configure button for detailed flood rule management,
-                    or enter parameters manually in the format: [rules]:seconds
-                  </p>
-                </div>
-              </div>
-
-              {/* Content Filtering */}
-              <div className="space-y-4">
-                <h3 className="text-sm font-medium text-white">
-                  Content Filtering
-                </h3>
-
-                {/* Block Color Codes */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
+                );
+              })()
+            ) : (
+              <div className="flex-1 overflow-y-auto space-y-6">
+                {/* Flood Protection Settings */}
+                <div className="space-y-4">
+                  <div className="space-y-2">
                     <label className="text-sm font-medium text-white">
-                      Block Color Codes (+c)
+                      Flood Protection (+f)
                     </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Block messages containing mIRC color codes
+                    <p className="text-xs text-discord-text-muted mb-2">
+                      Configure flood protection rules to prevent spam and
+                      abuse. UnrealIRCd-specific feature.
                     </p>
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={blockColorCodes}
-                    onChange={(e) => setBlockColorCodes(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* No CTCPs */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      No CTCPs (+C)
+                  {/* Flood Profile Selection */}
+                  <div className="space-y-2">
+                    <label className="text-xs font-medium text-discord-text-muted uppercase tracking-wide">
+                      Flood Profile (+F)
                     </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Block CTCP commands in the channel
-                    </p>
+                    <select
+                      value={floodProfile}
+                      onChange={(e) => setFloodProfile(e.target.value)}
+                      className="w-full p-2 bg-discord-dark-300 text-white rounded text-sm"
+                    >
+                      <option value="">No flood profile</option>
+                      <option value="very-strict">Very Strict</option>
+                      <option value="strict">Strict</option>
+                      <option value="normal">Normal</option>
+                      <option value="relaxed">Relaxed</option>
+                      <option value="very-relaxed">Very Relaxed</option>
+                    </select>
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={noCTCPs}
-                    onChange={(e) => setNoCTCPs(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* Filter Bad Words */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      Filter Bad Words (+G)
+                  {/* Flood Parameters */}
+                  <div className="space-y-2">
+                    <label className="text-xs font-medium text-discord-text-muted uppercase tracking-wide">
+                      Flood Parameters
                     </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Filter out bad words with &lt;censored&gt;
+                    <div className="flex gap-2">
+                      <input
+                        type="text"
+                        value={floodParams}
+                        onChange={(e) => setFloodParams(e.target.value)}
+                        placeholder="Default"
+                        className="flex-1 p-2 bg-discord-dark-300 text-white rounded text-sm"
+                      />
+                      <button
+                        onClick={() => setIsFloodModalOpen(true)}
+                        className="px-3 py-2 bg-discord-primary hover:bg-opacity-80 text-white rounded text-sm font-medium"
+                      >
+                        Configure
+                      </button>
+                    </div>
+                    <p className="text-xs text-discord-text-muted">
+                      Use the Configure button for detailed flood rule
+                      management, or enter parameters manually in the format:
+                      [rules]:seconds
                     </p>
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={filterBadWords}
-                    onChange={(e) => setFilterBadWords(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
                 </div>
 
-                {/* Strip Color Codes */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      Strip Color Codes (+S)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Strip mIRC color codes from messages
-                    </p>
+                {/* Content Filtering */}
+                <div className="space-y-4">
+                  <h3 className="text-sm font-medium text-white">
+                    Content Filtering
+                  </h3>
+
+                  {/* Block Color Codes */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Block Color Codes (+c)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Block messages containing mIRC color codes
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={blockColorCodes}
+                      onChange={(e) => setBlockColorCodes(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={stripColorCodes}
-                    onChange={(e) => setStripColorCodes(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
-              </div>
 
-              {/* Channel Behavior */}
-              <div className="space-y-4">
-                <h3 className="text-sm font-medium text-white">
-                  Channel Behavior
-                </h3>
+                  {/* No CTCPs */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        No CTCPs (+C)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Block CTCP commands in the channel
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={noCTCPs}
+                      onChange={(e) => setNoCTCPs(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
+                  </div>
 
-                {/* Delay Joins */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      Delay Joins (+D)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Delay showing joins until someone speaks
-                    </p>
+                  {/* Filter Bad Words */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Filter Bad Words (+G)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Filter out bad words with &lt;censored&gt;
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={filterBadWords}
+                      onChange={(e) => setFilterBadWords(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={delayJoins}
-                    onChange={(e) => setDelayJoins(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* No Knocks */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      No Knocks (+K)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      /KNOCK command is not allowed
-                    </p>
+                  {/* Strip Color Codes */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Strip Color Codes (+S)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Strip mIRC color codes from messages
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={stripColorCodes}
+                      onChange={(e) => setStripColorCodes(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={noKnocks}
-                    onChange={(e) => setNoKnocks(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
                 </div>
 
-                {/* No Nick Changes */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      No Nick Changes (+N)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Nickname changes are not permitted
-                    </p>
+                {/* Channel Behavior */}
+                <div className="space-y-4">
+                  <h3 className="text-sm font-medium text-white">
+                    Channel Behavior
+                  </h3>
+
+                  {/* Delay Joins */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Delay Joins (+D)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Delay showing joins until someone speaks
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={delayJoins}
+                      onChange={(e) => setDelayJoins(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={noNickChanges}
-                    onChange={(e) => setNoNickChanges(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* No Kicks */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      No Kicks (+Q)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Kick commands are not allowed
-                    </p>
+                  {/* No Knocks */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        No Knocks (+K)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        /KNOCK command is not allowed
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={noKnocks}
+                      onChange={(e) => setNoKnocks(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={noKicks}
-                    onChange={(e) => setNoKicks(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* No Notices */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      No Notices (+T)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      NOTICE commands are not allowed
-                    </p>
+                  {/* No Nick Changes */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        No Nick Changes (+N)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Nickname changes are not permitted
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={noNickChanges}
+                      onChange={(e) => setNoNickChanges(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={noNotices}
-                    onChange={(e) => setNoNotices(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* No Invites */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      No Invites (+V)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      /INVITE command is not allowed
-                    </p>
+                  {/* No Kicks */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        No Kicks (+Q)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Kick commands are not allowed
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={noKicks}
+                      onChange={(e) => setNoKicks(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={noInvites}
-                    onChange={(e) => setNoInvites(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
-              </div>
 
-              {/* Access Control */}
-              <div className="space-y-4">
-                <h3 className="text-sm font-medium text-white">
-                  Access Control
-                </h3>
+                  {/* No Notices */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        No Notices (+T)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        NOTICE commands are not allowed
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={noNotices}
+                      onChange={(e) => setNoNotices(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
+                  </div>
 
-                {/* Registered Nick Required */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      Registered Nick Required (+M)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Users must have a registered nickname (+r) to talk
-                    </p>
+                  {/* No Invites */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        No Invites (+V)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        /INVITE command is not allowed
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={noInvites}
+                      onChange={(e) => setNoInvites(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={registeredNickRequired}
-                    onChange={(e) =>
-                      setRegisteredNickRequired(e.target.checked)
-                    }
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
                 </div>
 
-                {/* Registered Users Only */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      Registered Users Only (+R)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Only registered users (+r) may join
-                    </p>
+                {/* Access Control */}
+                <div className="space-y-4">
+                  <h3 className="text-sm font-medium text-white">
+                    Access Control
+                  </h3>
+
+                  {/* Registered Nick Required */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Registered Nick Required (+M)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Users must have a registered nickname (+r) to talk
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={registeredNickRequired}
+                      onChange={(e) =>
+                        setRegisteredNickRequired(e.target.checked)
+                      }
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={registeredUsersOnly}
-                    onChange={(e) => setRegisteredUsersOnly(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* IRC Operator Only */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      IRC Operator Only (+O)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Only IRC operators can join (settable by IRCops)
-                    </p>
+                  {/* Registered Users Only */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Registered Users Only (+R)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Only registered users (+r) may join
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={registeredUsersOnly}
+                      onChange={(e) => setRegisteredUsersOnly(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={ircOperatorOnly}
-                    onChange={(e) => setIrcOperatorOnly(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* Secure Connection Required */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
-                    <label className="text-sm font-medium text-white">
-                      Secure Connection Required (+z)
-                    </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Only clients on secure connections (SSL/TLS) can join
-                    </p>
+                  {/* IRC Operator Only */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        IRC Operator Only (+O)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Only IRC operators can join (settable by IRCops)
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={ircOperatorOnly}
+                      onChange={(e) => setIrcOperatorOnly(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
+                  </div>
+
+                  {/* Secure Connection Required */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Secure Connection Required (+z)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Only clients on secure connections (SSL/TLS) can join
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={secureConnectionRequired}
+                      onChange={(e) =>
+                        setSecureConnectionRequired(e.target.checked)
+                      }
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={secureConnectionRequired}
-                    onChange={(e) =>
-                      setSecureConnectionRequired(e.target.checked)
-                    }
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
                 </div>
-              </div>
 
-              {/* Channel Properties */}
-              <div className="space-y-4">
-                <h3 className="text-sm font-medium text-white">
-                  Channel Properties
-                </h3>
+                {/* Channel Properties */}
+                <div className="space-y-4">
+                  <h3 className="text-sm font-medium text-white">
+                    Channel Properties
+                  </h3>
+
+                  {/* Private Channel */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Private Channel (+p)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Channel is marked as private
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={privateChannel}
+                      onChange={(e) => setPrivateChannel(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
+                  </div>
+
+                  {/* Permanent Channel */}
+                  <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
+                    <div className="flex-1">
+                      <label className="text-sm font-medium text-white">
+                        Permanent Channel (+P)
+                      </label>
+                      <p className="text-xs text-discord-text-muted mt-1">
+                        Channel won't be destroyed when empty (settable by
+                        IRCops)
+                      </p>
+                    </div>
+                    <input
+                      type="checkbox"
+                      checked={permanentChannel}
+                      onChange={(e) => setPermanentChannel(e.target.checked)}
+                      className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
+                    />
+                  </div>
 
-                {/* Private Channel */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
+                  {/* Channel History */}
+                  <div className="space-y-2">
                     <label className="text-sm font-medium text-white">
-                      Private Channel (+p)
+                      Channel History (+H)
                     </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Channel is marked as private
+                    <p className="text-xs text-discord-text-muted mb-2">
+                      Record channel history with max-lines:max-minutes. Leave
+                      empty to disable.
                     </p>
+                    <input
+                      type="text"
+                      value={channelHistory}
+                      onChange={(e) => setChannelHistory(e.target.value)}
+                      placeholder="e.g., 100:1440"
+                      className="w-full p-2 bg-discord-dark-300 text-white rounded text-sm"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={privateChannel}
-                    onChange={(e) => setPrivateChannel(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
 
-                {/* Permanent Channel */}
-                <div className="flex items-center justify-between p-3 bg-discord-dark-300 rounded">
-                  <div className="flex-1">
+                  {/* Channel Link */}
+                  <div className="space-y-2">
                     <label className="text-sm font-medium text-white">
-                      Permanent Channel (+P)
+                      Channel Link (+L)
                     </label>
-                    <p className="text-xs text-discord-text-muted mt-1">
-                      Channel won't be destroyed when empty (settable by IRCops)
+                    <p className="text-xs text-discord-text-muted mb-2">
+                      Forward users to this channel if they can't join. Leave
+                      empty to disable.
                     </p>
+                    <input
+                      type="text"
+                      value={channelLink}
+                      onChange={(e) => setChannelLink(e.target.value)}
+                      placeholder="#overflow"
+                      className="w-full p-2 bg-discord-dark-300 text-white rounded text-sm"
+                    />
                   </div>
-                  <input
-                    type="checkbox"
-                    checked={permanentChannel}
-                    onChange={(e) => setPermanentChannel(e.target.checked)}
-                    className="w-4 h-4 text-discord-primary bg-discord-dark-300 border-discord-dark-500 rounded focus:ring-discord-primary"
-                  />
-                </div>
-
-                {/* Channel History */}
-                <div className="space-y-2">
-                  <label className="text-sm font-medium text-white">
-                    Channel History (+H)
-                  </label>
-                  <p className="text-xs text-discord-text-muted mb-2">
-                    Record channel history with max-lines:max-minutes. Leave
-                    empty to disable.
-                  </p>
-                  <input
-                    type="text"
-                    value={channelHistory}
-                    onChange={(e) => setChannelHistory(e.target.value)}
-                    placeholder="e.g., 100:1440"
-                    className="w-full p-2 bg-discord-dark-300 text-white rounded text-sm"
-                  />
-                </div>
-
-                {/* Channel Link */}
-                <div className="space-y-2">
-                  <label className="text-sm font-medium text-white">
-                    Channel Link (+L)
-                  </label>
-                  <p className="text-xs text-discord-text-muted mb-2">
-                    Forward users to this channel if they can't join. Leave
-                    empty to disable.
-                  </p>
-                  <input
-                    type="text"
-                    value={channelLink}
-                    onChange={(e) => setChannelLink(e.target.value)}
-                    placeholder="#overflow"
-                    className="w-full p-2 bg-discord-dark-300 text-white rounded text-sm"
-                  />
                 </div>
               </div>
-            </div>
+            )}
           </>
         )}
       </div>
@@ -1911,7 +2133,11 @@ const ChannelSettingsModal: React.FC<ChannelSettingsModalProps> = ({
           )}
           {activeTab === "advanced" && (
             <button
-              onClick={applyAdvancedChanges}
+              onClick={
+                server?.namedModes?.supported
+                  ? applyNamedModesAdvancedChanges
+                  : applyAdvancedChanges
+              }
               disabled={isApplyingChanges}
               className="px-6 py-2 bg-discord-primary hover:bg-opacity-80 text-white rounded disabled:opacity-50 disabled:cursor-not-allowed text-sm font-medium"
             >
diff --git a/src/lib/irc/IRCClient.ts b/src/lib/irc/IRCClient.ts
index bc4443d2..2a3544a3 100644
--- a/src/lib/irc/IRCClient.ts
+++ b/src/lib/irc/IRCClient.ts
@@ -263,6 +263,49 @@ export interface EventMap {
     url: string;
     description: string;
   };
+  // IRCv3 draft/named-modes (PROP command + RPL_CHMODELIST etc.).
+  // The "registry" events (CHANMODE_LIST / UMODE_LIST) carry the
+  // server's long-form mode name table; the "mode change" event
+  // (PROP) carries an actual mode change; the rest pair with the
+  // listing forms of PROP <chan> [<listmode>].
+  NAMED_MODES_CHANMODE_LIST: BaseIRCEvent & {
+    entries: Array<{
+      type: 1 | 2 | 3 | 4 | 5;
+      name: string;
+      letter?: string;
+    }>;
+    isFinal: boolean;
+  };
+  NAMED_MODES_UMODE_LIST: BaseIRCEvent & {
+    entries: Array<{
+      type: 1 | 2 | 3 | 4 | 5;
+      name: string;
+      letter?: string;
+    }>;
+    isFinal: boolean;
+  };
+  NAMED_MODES_PROPLIST: BaseIRCEvent & {
+    channel: string;
+    items: string[];
+  };
+  NAMED_MODES_PROPLIST_END: BaseIRCEvent & { channel: string };
+  NAMED_MODES_LISTPROPLIST: BaseIRCEvent & {
+    channel: string;
+    modeName: string;
+    mask: string;
+    setter: string;
+    settime: number;
+  };
+  NAMED_MODES_LISTPROPLIST_END: BaseIRCEvent & {
+    channel: string;
+    modeName: string;
+  };
+  NAMED_MODES_PROP: EventWithTags & {
+    sender: string;
+    target: string;
+    items: Array<{ sign: "+" | "-"; name: string; param?: string }>;
+    timestamp: Date;
+  };
   TWOFA: EventWithTags & {
     subcommand: string;
     status: string;
@@ -541,6 +584,7 @@ export class IRCClient implements IRCClientContext {
     "invite-notify",
     "monitor",
     "extended-monitor",
+    "draft/named-modes",
     "labeled-response",
     "draft/read-marker",
     "obsidianirc/cmdslist",
@@ -1388,6 +1432,85 @@ export class IRCClient implements IRCClientContext {
     this.sendRaw(serverId, `METADATA ${target} SYNC`);
   }
 
+  /**
+   * IRCv3 draft/named-modes: send a mode change addressed by long-form
+   * mode names instead of single letters.
+   *
+   * When the negotiated registry exposes a letter for every requested
+   * name, we build a `MODE` line so the change works on legacy
+   * (non-cap) servers too. When the cap is negotiated AND any item
+   * has no letter equivalent (a name-only mode), we send a `PROP`
+   * line, which is the only wire form that can carry such modes.
+   *
+   * `target` is a channel name or a nick. `items` is a list of
+   * `{sign, name, param?}` triples. `registry` is the per-server
+   * NamedModes object the caller already has from the store; passing
+   * it in keeps this layer free of a store dependency.
+   */
+  sendNamedMode(
+    serverId: string,
+    target: string,
+    items: Array<{ sign: "+" | "-"; name: string; param?: string }>,
+    registry?: { supported: boolean } & {
+      channelModes: Array<{ name: string; letter?: string }>;
+      userModes: Array<{ name: string; letter?: string }>;
+    },
+  ): void {
+    if (!items.length) return;
+
+    const isChannelTarget =
+      target.startsWith("#") ||
+      target.startsWith("^") ||
+      target.startsWith("$");
+    const list = isChannelTarget
+      ? (registry?.channelModes ?? [])
+      : (registry?.userModes ?? []);
+
+    // Decide which form to send. Prefer PROP when the cap is
+    // negotiated AND any item is name-only (no letter); fall back to
+    // MODE otherwise so legacy servers / clients in mixed deployments
+    // keep working.
+    const capSupported = !!registry?.supported;
+    const anyNameOnly = items.some((it) => {
+      const spec = list.find((m) => m.name === it.name);
+      return !spec?.letter;
+    });
+
+    if (capSupported && anyNameOnly) {
+      const tail = items
+        .map((it) =>
+          it.param !== undefined
+            ? `${it.sign}${it.name}=${it.param}`
+            : `${it.sign}${it.name}`,
+        )
+        .join(" ");
+      this.sendRaw(serverId, `PROP ${target} ${tail}`);
+      return;
+    }
+
+    // Build a MODE line. Drop any items that map to no letter (only
+    // happens when the cap isn't negotiated; the user just can't
+    // reach name-only modes on a legacy server).
+    let modestring = "";
+    const params: string[] = [];
+    let lastSign: "+" | "-" | "" = "";
+    for (const it of items) {
+      const spec = list.find((m) => m.name === it.name);
+      if (!spec?.letter) continue;
+      if (it.sign !== lastSign) {
+        modestring += it.sign;
+        lastSign = it.sign;
+      }
+      modestring += spec.letter;
+      if (it.param !== undefined) params.push(it.param);
+    }
+    if (!modestring) return;
+    const cmd = params.length
+      ? `MODE ${target} ${modestring} ${params.join(" ")}`
+      : `MODE ${target} ${modestring}`;
+    this.sendRaw(serverId, cmd);
+  }
+
   // draft/authtoken: ask the server to mint a bearer token for `service`.
   // Server reply is `:server TOKEN GENERATE <service> <url> :<token>`.
   requestToken(serverId: string, service: string, scope?: string): void {
diff --git a/src/lib/irc/handlers/index.ts b/src/lib/irc/handlers/index.ts
index 14306cc6..f66661f9 100644
--- a/src/lib/irc/handlers/index.ts
+++ b/src/lib/irc/handlers/index.ts
@@ -68,6 +68,15 @@ import {
   handleMonOffline,
   handleMonOnline,
 } from "./monitoring";
+import {
+  handleProp,
+  handleRplChmodelist,
+  handleRplEndOfListProplist,
+  handleRplEndOfProplist,
+  handleRplListProplist,
+  handleRplProplist,
+  handleRplUmodelist,
+} from "./named-modes";
 import { handleMarkread } from "./readMarker";
 import {
   handleAway,
@@ -304,6 +313,21 @@ export const IRC_DISPATCH: Record<string, HandlerFn> = {
   CMDSLIST: (ctx, serverId, source, parv, mtags) =>
     handleCmdslist(ctx, serverId, source, parv, mtags),
 
+  PROP: (ctx, serverId, source, parv, mtags) =>
+    handleProp(ctx, serverId, source, parv, mtags),
+  "960": (ctx, serverId, source, parv, mtags) =>
+    handleRplEndOfProplist(ctx, serverId, source, parv, mtags),
+  "961": (ctx, serverId, source, parv, mtags) =>
+    handleRplProplist(ctx, serverId, source, parv, mtags),
+  "962": (ctx, serverId, source, parv, mtags) =>
+    handleRplEndOfListProplist(ctx, serverId, source, parv, mtags),
+  "963": (ctx, serverId, source, parv, mtags) =>
+    handleRplListProplist(ctx, serverId, source, parv, mtags),
+  "964": (ctx, serverId, source, parv, mtags) =>
+    handleRplChmodelist(ctx, serverId, source, parv, mtags),
+  "965": (ctx, serverId, source, parv, mtags) =>
+    handleRplUmodelist(ctx, serverId, source, parv, mtags),
+
   "730": (ctx, serverId, source, parv, mtags) =>
     handleMonOnline(ctx, serverId, source, parv, mtags),
   "731": (ctx, serverId, source, parv, mtags) =>
diff --git a/src/lib/irc/handlers/named-modes.ts b/src/lib/irc/handlers/named-modes.ts
new file mode 100644
index 00000000..c1dd1e13
--- /dev/null
+++ b/src/lib/irc/handlers/named-modes.ts
@@ -0,0 +1,243 @@
+// IRCv3 draft/named-modes — protocol-layer parser.
+//
+// Owns six new numerics + the PROP command:
+//
+//   964 RPL_CHMODELIST         server -> client: long-form chanmode list
+//   965 RPL_UMODELIST          server -> client: long-form usermode list
+//   961 RPL_PROPLIST           server -> client: PROP <chan> reply (mode list)
+//   960 RPL_ENDOFPROPLIST      ditto, terminator
+//   963 RPL_LISTPROPLIST       server -> client: list-mode entry
+//   962 RPL_ENDOFLISTPROPLIST  ditto, terminator
+//
+//   PROP <chan> {+|-}<name>[=<param>] ... — the cap-aware mode wire form
+//
+// Wire shape for the lists:
+//
+//   :server XXX <nick> [*] <type>:<name>[=<letter>] ...
+//     all-but-last lines carry an asterisk before the entries
+//
+// Spec: https://github.com/progval/ircv3-specifications/blob/
+//       e28f44f8d7b0964c82acd28eea1e35895daf0919/extensions/named-modes.md
+
+import type { NamedModeSpec } from "../../../types";
+import type { IRCClientContext } from "../IRCClientContext";
+import { getNickFromNuh, getTimestampFromTags } from "../utils";
+
+function parseEntries(tokens: string[]): NamedModeSpec[] {
+  const out: NamedModeSpec[] = [];
+  for (const tok of tokens) {
+    // <type>:<name>[=<letter>] -- per spec, ignore unknown types so
+    // future spec revisions don't break us
+    const colon = tok.indexOf(":");
+    if (colon <= 0) continue;
+    const typeNum = Number.parseInt(tok.slice(0, colon), 10);
+    if (typeNum < 1 || typeNum > 5) continue;
+    const rest = tok.slice(colon + 1);
+    const eq = rest.indexOf("=");
+    let name: string;
+    let letter: string | undefined;
+    if (eq === -1) {
+      name = rest;
+    } else {
+      name = rest.slice(0, eq);
+      letter = rest.slice(eq + 1) || undefined;
+    }
+    if (!name) continue;
+    out.push({ type: typeNum as 1 | 2 | 3 | 4 | 5, name, letter });
+  }
+  return out;
+}
+
+/**
+ * Pull the entries out of a 964/965 line. The first parameter is the
+ * recipient nick; if the second is a literal "*" we're in a multi-line
+ * advertisement (more lines to come). Either way, every remaining
+ * token (with the trailing `:` stripped) is a `<type>:<name>=<letter>`
+ * triple.
+ */
+function parseListAdvertisement(parv: string[]): {
+  entries: NamedModeSpec[];
+  isFinal: boolean;
+} {
+  // parv[0] = recipient nick; everything after is either separate
+  // mode-entry tokens (when the wire form put them inline) or a single
+  // trailing string with space-separated entries. The IRC parser
+  // already stripped the leading ":" from trailing args, so we just
+  // need to flatten on whitespace either way.
+  let rest = parv.slice(1);
+
+  // Optional "*" continuation marker.
+  let isFinal = true;
+  if (rest.length && rest[0] === "*") {
+    isFinal = false;
+    rest = rest.slice(1);
+  }
+
+  const flat: string[] = [];
+  for (const tok of rest) {
+    for (const part of tok.split(" ")) {
+      if (part.length) flat.push(part);
+    }
+  }
+  return { entries: parseEntries(flat), isFinal };
+}
+
+export function handleRplChmodelist(
+  ctx: IRCClientContext,
+  serverId: string,
+  _source: string,
+  parv: string[],
+  _mtags: Record<string, string> | undefined,
+): void {
+  const { entries, isFinal } = parseListAdvertisement(parv);
+  ctx.triggerEvent("NAMED_MODES_CHANMODE_LIST", {
+    serverId,
+    entries,
+    isFinal,
+  });
+}
+
+export function handleRplUmodelist(
+  ctx: IRCClientContext,
+  serverId: string,
+  _source: string,
+  parv: string[],
+  _mtags: Record<string, string> | undefined,
+): void {
+  const { entries, isFinal } = parseListAdvertisement(parv);
+  ctx.triggerEvent("NAMED_MODES_UMODE_LIST", {
+    serverId,
+    entries,
+    isFinal,
+  });
+}
+
+/** PROP <chan> -- mode-state list reply (961). Emits one event per
+ *  line; the store collects them until ENDOFPROPLIST 960 fires. */
+export function handleRplProplist(
+  ctx: IRCClientContext,
+  serverId: string,
+  _source: string,
+  parv: string[],
+  _mtags: Record<string, string> | undefined,
+): void {
+  // parv: <nick> <chan> [<modename>[=<param>] ...]
+  const channel = parv[1];
+  const items = parv.slice(2).map((s) => (s.startsWith(":") ? s.slice(1) : s));
+  // The trailing param can carry multiple space-separated entries.
+  const flat: string[] = [];
+  for (const item of items) {
+    for (const t of item.split(" ")) {
+      if (t.length) flat.push(t);
+    }
+  }
+  ctx.triggerEvent("NAMED_MODES_PROPLIST", {
+    serverId,
+    channel,
+    items: flat,
+  });
+}
+
+export function handleRplEndOfProplist(
+  ctx: IRCClientContext,
+  serverId: string,
+  _source: string,
+  parv: string[],
+  _mtags: Record<string, string> | undefined,
+): void {
+  const channel = parv[1];
+  ctx.triggerEvent("NAMED_MODES_PROPLIST_END", { serverId, channel });
+}
+
+/** PROP <chan> <listmode> entry (963). */
+export function handleRplListProplist(
+  ctx: IRCClientContext,
+  serverId: string,
+  _source: string,
+  parv: string[],
+  _mtags: Record<string, string> | undefined,
+): void {
+  // <nick> <chan> <modename> <mask> [<setter> <settime>]
+  const channel = parv[1];
+  const modeName = parv[2];
+  const mask = parv[3];
+  const setter = parv[4];
+  const settimeRaw = parv[5];
+  const settime = settimeRaw
+    ? Number.parseInt(settimeRaw.replace(/^:/, ""), 10) || 0
+    : 0;
+  ctx.triggerEvent("NAMED_MODES_LISTPROPLIST", {
+    serverId,
+    channel,
+    modeName,
+    mask,
+    setter: setter ? setter.replace(/^:/, "") : "",
+    settime,
+  });
+}
+
+export function handleRplEndOfListProplist(
+  ctx: IRCClientContext,
+  serverId: string,
+  _source: string,
+  parv: string[],
+  _mtags: Record<string, string> | undefined,
+): void {
+  const channel = parv[1];
+  const modeName = parv[2];
+  ctx.triggerEvent("NAMED_MODES_LISTPROPLIST_END", {
+    serverId,
+    channel,
+    modeName,
+  });
+}
+
+/**
+ * Parse a server-pushed PROP command. Wire form mirrors the client
+ * side: `:src PROP <target> {+|-}<name>[=<param>] ...`
+ *
+ * Emits NAMED_MODES_PROP for any subscriber that wants the rich form,
+ * AND a synthesised MODE event so existing UI paths keep working.
+ */
+export function handleProp(
+  ctx: IRCClientContext,
+  serverId: string,
+  source: string,
+  parv: string[],
+  mtags: Record<string, string> | undefined,
+): void {
+  const sender = getNickFromNuh(source);
+  const target = parv[0];
+  // Remaining args are the mode change items; the trailing one may
+  // start with `:` (IRC trailing-arg form) and may pack multiple
+  // space-separated entries.
+  const tail: string[] = [];
+  for (let i = 1; i < parv.length; i++) {
+    const piece =
+      i === parv.length - 1 && parv[i].startsWith(":")
+        ? parv[i].slice(1)
+        : parv[i];
+    for (const t of piece.split(" ")) {
+      if (t.length) tail.push(t);
+    }
+  }
+
+  const items: Array<{ sign: "+" | "-"; name: string; param?: string }> =
+    tail.map((tok) => {
+      const sign: "+" | "-" = tok[0] === "-" ? "-" : "+";
+      const body = tok[0] === "+" || tok[0] === "-" ? tok.slice(1) : tok;
+      const eq = body.indexOf("=");
+      const name = eq === -1 ? body : body.slice(0, eq);
+      const param = eq === -1 ? undefined : body.slice(eq + 1);
+      return { sign, name, param };
+    });
+
+  ctx.triggerEvent("NAMED_MODES_PROP", {
+    serverId,
+    mtags,
+    sender,
+    target,
+    items,
+    timestamp: getTimestampFromTags(mtags),
+  });
+}
diff --git a/src/lib/ircUtils.tsx b/src/lib/ircUtils.tsx
index 63bd2949..f6ddf8fa 100644
--- a/src/lib/ircUtils.tsx
+++ b/src/lib/ircUtils.tsx
@@ -14,6 +14,41 @@ import("highlight.js").then((m) => {
   hljsModule = m.default;
 });
 
+/** Split an IRCv3 named-modes mode name into its vendor prefix and a
+ * human-readable display label.
+ *
+ * Examples:
+ *   "op"                            -> { vendor: undefined, display: "Op" }
+ *   "topiclock"                     -> { vendor: undefined, display: "Topiclock" }
+ *   "obsidianirc/this-mode-lol"     -> { vendor: "obsidianirc",
+ *                                        display: "This Mode Lol" }
+ *   "example.org/history"           -> { vendor: "example.org",
+ *                                        display: "History" }
+ *
+ * The display string title-cases each hyphen/underscore-separated word.
+ * The vendor (if any) is always lower-cased so the UI badge is uniform.
+ */
+export function humanizeNamedMode(name: string): {
+  vendor?: string;
+  display: string;
+} {
+  const slash = name.indexOf("/");
+  let vendor: string | undefined;
+  let raw: string;
+  if (slash === -1) {
+    raw = name;
+  } else {
+    vendor = name.slice(0, slash).toLowerCase();
+    raw = name.slice(slash + 1);
+  }
+  const display = raw
+    .split(/[-_]/)
+    .filter(Boolean)
+    .map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase())
+    .join(" ");
+  return { vendor, display: display || raw };
+}
+
 export function parseNamesResponse(namesResponse: string): User[] {
   const users: User[] = [];
   for (const name of namesResponse.split(" ")) {
diff --git a/src/lib/namedModeRegistry.ts b/src/lib/namedModeRegistry.ts
new file mode 100644
index 00000000..abdfcf88
--- /dev/null
+++ b/src/lib/namedModeRegistry.ts
@@ -0,0 +1,266 @@
+// Curated metadata for IRCv3 draft/named-modes channel-mode names.
+//
+// The server's RPL_CHMODELIST advertises a long-form name for every
+// chanmode; we map the ones we know about onto a proper UI label, a
+// description, and (for param modes) a placeholder so the Advanced
+// tab in ChannelSettingsModal can render a useful row.
+//
+// Anything not in this table falls back to humanizeNamedMode() in
+// ircUtils.tsx (auto-derived label, no description, generic input).
+//
+// Sources for copy:
+//   - tooltips from the legacy hardcoded Advanced tab
+//   - UnrealIRCd docs:
+//       https://www.unrealircd.org/docs/Channel_Modes
+//       https://www.unrealircd.org/docs/Channel_anti-flood_settings
+//   - draft/named-modes spec table for the unprefixed standard names
+
+export type NamedModeGroup =
+  | "filtering" // color/CTCP/bad-words/strip etc.
+  | "behavior" // delay-joins, nokick, no-knocks, ...
+  | "access" // regonly, operonly, secureonly, ...
+  | "properties" // permanent, private, history, link, ...
+  | "flood"; // floodprot, floodprot-profile
+
+export interface NamedModeMeta {
+  /** Label shown to the user. Curated, not auto-derived. */
+  label: string;
+  /** One-line description, plain text. */
+  description: string;
+  /** Section the row should live under in the UI. */
+  group: NamedModeGroup;
+  /** For param modes: placeholder shown in the input. */
+  paramPlaceholder?: string;
+  /** Hide from the Advanced tab. Used for:
+   *   - modes covered by other tabs (ban / op / limit / etc.)
+   *   - server-managed auto-set modes the user can't usefully toggle
+   *     (issecure, isregistered, delayjoin-rejoinhide) */
+  hidden?: boolean;
+}
+
+/** Metadata keyed by the IRCv3 named-modes name (vendor prefix
+ *  included for non-spec modes). */
+export const NAMED_MODE_META: Record<string, NamedModeMeta> = {
+  // ---- Spec-table standard chanmodes covered by other tabs ----
+  ban: { label: "Ban", description: "", group: "access", hidden: true },
+  banex: {
+    label: "Ban Exception",
+    description: "",
+    group: "access",
+    hidden: true,
+  },
+  invex: {
+    label: "Invite Exception",
+    description: "",
+    group: "access",
+    hidden: true,
+  },
+  op: { label: "Op", description: "", group: "access", hidden: true },
+  voice: { label: "Voice", description: "", group: "access", hidden: true },
+  halfop: { label: "Halfop", description: "", group: "access", hidden: true },
+  owner: { label: "Owner", description: "", group: "access", hidden: true },
+  admin: { label: "Admin", description: "", group: "access", hidden: true },
+  inviteonly: {
+    label: "Invite-Only",
+    description: "",
+    group: "access",
+    hidden: true,
+  },
+  key: { label: "Key", description: "", group: "access", hidden: true },
+  limit: {
+    label: "User Limit",
+    description: "",
+    group: "properties",
+    hidden: true,
+  },
+  moderated: {
+    label: "Moderated",
+    description: "",
+    group: "properties",
+    hidden: true,
+  },
+  noextmsg: {
+    label: "No External Messages",
+    description: "",
+    group: "behavior",
+    hidden: true,
+  },
+  secret: {
+    label: "Secret",
+    description: "",
+    group: "properties",
+    hidden: true,
+  },
+  topiclock: {
+    label: "Protected Topic",
+    description: "",
+    group: "properties",
+    hidden: true,
+  },
+
+  // ---- Spec-table modes shown in Advanced ----
+  private: {
+    label: "Private Channel",
+    description: "Channel is marked as private.",
+    group: "properties",
+  },
+  permanent: {
+    label: "Permanent Channel",
+    description:
+      "Channel persists when empty (settable by IRC operators only).",
+    group: "properties",
+  },
+  regonly: {
+    label: "Registered Users Only",
+    description: "Only logged-in (registered) users may join.",
+    group: "access",
+  },
+  secureonly: {
+    label: "Secure Connection Required",
+    description: "Only clients connected with TLS/SSL may join.",
+    group: "access",
+  },
+  noctcp: {
+    label: "Block CTCPs",
+    description:
+      "Drop CTCP messages other than ACTION (/me) sent to the channel.",
+    group: "filtering",
+  },
+
+  // ---- ObsidianIRC / UnrealIRCd-family chanmodes ----
+  "obsidianirc/floodprot": {
+    label: "Flood Protection",
+    description:
+      "Per-channel anti-flood rules. Format: [N1c1[#action[Ntime]],...]:seconds. Use the Configure button on the legacy view if you're not sure.",
+    paramPlaceholder: "[10j#R30,5m]:30",
+    group: "flood",
+  },
+  "obsidianirc/floodprot-profile": {
+    label: "Flood Profile",
+    description:
+      "Built-in flood profile. Use one of: very-strict, strict, normal, relaxed, very-relaxed.",
+    paramPlaceholder: "normal",
+    group: "flood",
+  },
+  "obsidianirc/nocolor": {
+    label: "Block Color Codes",
+    description: "Reject messages that contain mIRC color codes.",
+    group: "filtering",
+  },
+  "obsidianirc/stripcolor": {
+    label: "Strip Color Codes",
+    description:
+      "Silently strip color codes from messages instead of dropping them.",
+    group: "filtering",
+  },
+  "obsidianirc/censor": {
+    label: "Filter Bad Words",
+    description:
+      "Replace configured bad words with <censored> in messages sent to the channel.",
+    group: "filtering",
+  },
+
+  "obsidianirc/delayjoin": {
+    label: "Delay Joins",
+    description:
+      "Hide joins until the user speaks. Useful in busy channels to suppress noise.",
+    group: "behavior",
+  },
+  "obsidianirc/noknock": {
+    label: "No Knocks",
+    description: "/KNOCK is not accepted on this channel.",
+    group: "behavior",
+  },
+  "obsidianirc/nonickchange": {
+    label: "No Nick Changes",
+    description: "Members may not change their nickname while in the channel.",
+    group: "behavior",
+  },
+  "obsidianirc/nokick": {
+    label: "No Kicks",
+    description: "/KICK is disabled in the channel.",
+    group: "behavior",
+  },
+  "obsidianirc/nonotice": {
+    label: "No Notices",
+    description: "/NOTICE to the channel is rejected.",
+    group: "behavior",
+  },
+  "obsidianirc/noinvite": {
+    label: "No Invites",
+    description: "/INVITE is not accepted for this channel.",
+    group: "behavior",
+  },
+
+  "obsidianirc/regonlyspeak": {
+    label: "Registered Nicks Speak Only",
+    description:
+      "Only users on a registered nickname can send to the channel. Unregistered users can still join.",
+    group: "access",
+  },
+  "obsidianirc/operonly": {
+    label: "IRC Operator Only",
+    description:
+      "Only IRC operators may join (settable by IRC operators only).",
+    group: "access",
+  },
+
+  "obsidianirc/history": {
+    label: "Channel History",
+    description:
+      "Record channel history. Format: max-lines:max-time (e.g. 100:1d for 100 lines or 1 day).",
+    paramPlaceholder: "100:1d",
+    group: "properties",
+  },
+  "obsidianirc/link": {
+    label: "Channel Link",
+    description:
+      "Forward users to this channel if they can't join (e.g. due to ban/limit/key).",
+    paramPlaceholder: "#overflow",
+    group: "properties",
+  },
+
+  // ---- Auto-managed modes hidden from the UI ----
+  "obsidianirc/issecure": {
+    label: "Channel Is Secure",
+    description: "",
+    group: "access",
+    hidden: true, // server sets/clears automatically based on members
+  },
+  "obsidianirc/isregistered": {
+    label: "Channel Is Registered",
+    description: "",
+    group: "properties",
+    hidden: true, // services-managed
+  },
+  "obsidianirc/delayjoin-rejoinhide": {
+    label: "Delayjoin (auto-managed)",
+    description: "",
+    group: "behavior",
+    hidden: true, // auto-set/cleared by +D logic
+  },
+};
+
+/** Look up a curated entry. Returns undefined for unknown names —
+ *  callers should fall back to humanizeNamedMode for the label and
+ *  show no description. */
+export function lookupNamedModeMeta(name: string): NamedModeMeta | undefined {
+  return NAMED_MODE_META[name];
+}
+
+/** Stable sort order for sections in the Advanced tab. */
+export const NAMED_MODE_GROUP_ORDER: NamedModeGroup[] = [
+  "flood",
+  "filtering",
+  "behavior",
+  "access",
+  "properties",
+];
+
+export const NAMED_MODE_GROUP_LABELS: Record<NamedModeGroup, string> = {
+  flood: "Flood Protection",
+  filtering: "Content Filtering",
+  behavior: "Channel Behavior",
+  access: "Access Control",
+  properties: "Channel Properties",
+};
diff --git a/src/store/handlers/channels.ts b/src/store/handlers/channels.ts
index 52075aa1..24992a07 100644
--- a/src/store/handlers/channels.ts
+++ b/src/store/handlers/channels.ts
@@ -209,10 +209,16 @@ export function registerChannelHandlers(store: StoreApi<AppState>): void {
   });
 
   ircClient.on("RPL_YOURHOST", ({ serverId, serverName, version }) => {
-    // Check if the server is running UnrealIRCd
-    const isUnrealIRCd = version.includes("UnrealIRCd");
+    // The `isUnrealIRCd` flag gates UI surfaces that lean on the
+    // UnrealIRCd module-driven chanmode set (the "Advanced" tab in
+    // ChannelSettingsModal, etc.). ObbyIRCd is a downstream fork that
+    // advertises its own name in 002 but inherits that chanmode set,
+    // so it satisfies the same UI gate. Any features ObbyIRCd adds on
+    // top (e.g. named-modes) are detected separately through their
+    // own caps and shouldn't be conflated with UnrealIRCd parity.
+    const isUnrealIRCd =
+      version.includes("UnrealIRCd") || version.includes("ObbyIRCd");
 
-    // Update the server with the UnrealIRCd information
     store.setState((state) => ({
       servers: state.servers.map((server) =>
         server.id === serverId ? { ...server, isUnrealIRCd } : server,
diff --git a/src/store/handlers/index.ts b/src/store/handlers/index.ts
index 72ff7d98..59ef34d5 100644
--- a/src/store/handlers/index.ts
+++ b/src/store/handlers/index.ts
@@ -6,6 +6,7 @@ import { registerChannelHandlers } from "./channels";
 import { registerConnectionHandlers } from "./connection";
 import { registerMessageHandlers } from "./messages";
 import { registerMetadataHandlers } from "./metadata";
+import { registerNamedModesHandlers } from "./named-modes";
 import { registerReadMarkerHandlers } from "./readMarker";
 import { registerTicTacToeHandlers } from "./tictactoe";
 import { registerUserHandlers } from "./users";
@@ -20,6 +21,7 @@ export function registerAllHandlers(store: StoreApi<AppState>): void {
   registerMetadataHandlers(store);
   registerBatchHandlers(store);
   registerAuthHandlers(store);
+  registerNamedModesHandlers(store);
   registerReadMarkerHandlers(store);
   registerTicTacToeHandlers(store);
 }
diff --git a/src/store/handlers/named-modes.ts b/src/store/handlers/named-modes.ts
new file mode 100644
index 00000000..c4d81d26
--- /dev/null
+++ b/src/store/handlers/named-modes.ts
@@ -0,0 +1,206 @@
+// Store-side wiring for IRCv3 draft/named-modes.
+//
+// Maintains the per-server `namedModes` registry from RPL_CHMODELIST /
+// RPL_UMODELIST and handles incoming PROP changes by translating them
+// into the existing chanmode/usermode store paths so the rest of the
+// app keeps working without knowing about PROP.
+
+import type { StoreApi } from "zustand";
+import ircClient from "../../lib/ircClient";
+import type { NamedModeSpec, Server } from "../../types";
+import type { AppState } from "../index";
+
+function applyChannelEntries(
+  state: AppState,
+  serverId: string,
+  entries: NamedModeSpec[],
+  isFinal: boolean,
+): Pick<AppState, "servers"> {
+  const servers = state.servers.map((s: Server) => {
+    if (s.id !== serverId) return s;
+    const prev = s.namedModes ?? {
+      supported: true,
+      channelModes: [],
+      userModes: [],
+    };
+    return {
+      ...s,
+      namedModes: {
+        supported: true,
+        channelModes: mergeEntries(prev.channelModes, entries, isFinal),
+        userModes: prev.userModes,
+      },
+    };
+  });
+  return { servers };
+}
+
+function applyUserEntries(
+  state: AppState,
+  serverId: string,
+  entries: NamedModeSpec[],
+  isFinal: boolean,
+): Pick<AppState, "servers"> {
+  const servers = state.servers.map((s: Server) => {
+    if (s.id !== serverId) return s;
+    const prev = s.namedModes ?? {
+      supported: true,
+      channelModes: [],
+      userModes: [],
+    };
+    return {
+      ...s,
+      namedModes: {
+        supported: true,
+        channelModes: prev.channelModes,
+        userModes: mergeEntries(prev.userModes, entries, isFinal),
+      },
+    };
+  });
+  return { servers };
+}
+
+/** Append the current line's entries to the running list. The first
+ *  line clears any stale registry; the final line caps the burst. */
+function mergeEntries(
+  prev: NamedModeSpec[],
+  incoming: NamedModeSpec[],
+  isFinal: boolean,
+): NamedModeSpec[] {
+  // The protocol burst comes as `[*] ... [*] ... :final`. Each line is
+  // independent; we just concatenate. Callers can rely on isFinal to
+  // know when to read the registry.
+  // Dedup by name in case the server (or a future re-advertise) sends
+  // overlapping entries.
+  const merged: NamedModeSpec[] = [...prev];
+  for (const entry of incoming) {
+    const idx = merged.findIndex((e) => e.name === entry.name);
+    if (idx === -1) merged.push(entry);
+    else merged[idx] = entry;
+  }
+  // isFinal could trigger downstream effects (e.g. "registry ready")
+  // -- left as a boolean for now since callers can derive from the
+  // store directly.
+  void isFinal;
+  return merged;
+}
+
+export function registerNamedModesHandlers(store: StoreApi<AppState>): void {
+  ircClient.on(
+    "NAMED_MODES_CHANMODE_LIST",
+    ({ serverId, entries, isFinal }) => {
+      store.setState((state) =>
+        applyChannelEntries(state, serverId, entries, isFinal),
+      );
+    },
+  );
+
+  ircClient.on("NAMED_MODES_UMODE_LIST", ({ serverId, entries, isFinal }) => {
+    store.setState((state) =>
+      applyUserEntries(state, serverId, entries, isFinal),
+    );
+  });
+
+  // Server-pushed PROP changes are the cap-aware equivalent of MODE.
+  // We synthesise a MODE event from the registry-resolved letter so
+  // every existing chanmode/usermode handler keeps working without
+  // having to learn about PROP. Name-only modes (no letter) have no
+  // MODE equivalent and are dropped here; UI surfaces that want them
+  // can subscribe to NAMED_MODES_PROP directly.
+  ircClient.on("NAMED_MODES_PROP", (event) => {
+    const state = store.getState();
+    const server = state.servers.find((s) => s.id === event.serverId);
+    if (!server?.namedModes?.supported) return;
+
+    // Channel target uses CHANTYPES heuristic (#^$ is what the
+    // ircd advertises today; covers any future prefix automatically
+    // because this branch's named-modes spec routes both via the
+    // same wire form). Anything else is a user target.
+    const isChannel =
+      event.target.startsWith("#") ||
+      event.target.startsWith("^") ||
+      event.target.startsWith("$");
+    const registry = isChannel
+      ? server.namedModes.channelModes
+      : server.namedModes.userModes;
+
+    let modestring = "";
+    const modeargs: string[] = [];
+    let lastSign: "+" | "-" | "" = "";
+
+    for (const item of event.items) {
+      const spec = registry.find((m) => m.name === item.name);
+      if (!spec?.letter) {
+        // Name-only mode -- no legacy-letter representation. The
+        // NAMED_MODES_PROP event still fired for richer subscribers;
+        // we just can't fan it through MODE.
+        continue;
+      }
+      if (item.sign !== lastSign) {
+        modestring += item.sign;
+        lastSign = item.sign;
+      }
+      modestring += spec.letter;
+      if (item.param !== undefined) modeargs.push(item.param);
+    }
+
+    if (!modestring) return;
+
+    ircClient.triggerEvent("MODE", {
+      serverId: event.serverId,
+      mtags: event.mtags,
+      sender: event.sender,
+      target: event.target,
+      modestring,
+      modeargs,
+    });
+  });
+
+  // PROP-list responses (961/960): bridge to the same RPL_CHANNELMODEIS
+  // path so the existing channel-modes display picks them up. We build
+  // a single +<modestring> + args from the items the server returned.
+  // Keyed by serverId+channel so concurrent PROP <chan> queries don't
+  // intermix.
+  type PropBuf = { items: string[] };
+  const propBufs = new Map<string, PropBuf>();
+  const bufKey = (serverId: string, channel: string) =>
+    `${serverId}\x00${channel}`;
+
+  ircClient.on("NAMED_MODES_PROPLIST", ({ serverId, channel, items }) => {
+    const key = bufKey(serverId, channel);
+    const buf = propBufs.get(key) ?? { items: [] };
+    for (const it of items) buf.items.push(it);
+    propBufs.set(key, buf);
+  });
+
+  ircClient.on("NAMED_MODES_PROPLIST_END", ({ serverId, channel }) => {
+    const key = bufKey(serverId, channel);
+    const buf = propBufs.get(key);
+    propBufs.delete(key);
+    if (!buf) return;
+
+    const state = store.getState();
+    const server = state.servers.find((s) => s.id === serverId);
+    if (!server?.namedModes?.supported) return;
+
+    let modestring = "+";
+    const modeargs: string[] = [];
+    for (const raw of buf.items) {
+      const eq = raw.indexOf("=");
+      const name = eq === -1 ? raw : raw.slice(0, eq);
+      const param = eq === -1 ? undefined : raw.slice(eq + 1);
+      const spec = server.namedModes.channelModes.find((m) => m.name === name);
+      if (!spec?.letter) continue;
+      modestring += spec.letter;
+      if (param !== undefined) modeargs.push(param);
+    }
+    if (modestring === "+") return;
+
+    ircClient.triggerEvent("RPL_CHANNELMODEIS", {
+      serverId,
+      channelName: channel,
+      modestring,
+      modeargs,
+    });
+  });
+}
diff --git a/src/types/index.ts b/src/types/index.ts
index da530e35..6ad59edd 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -54,6 +54,11 @@ export interface Server {
   authTokenService?: string;
   isUnrealIRCd?: boolean; // Whether this server is running UnrealIRCd
   elist?: string; // ELIST ISUPPORT value for extended LIST capabilities
+  // IRCv3 draft/named-modes: server-advertised long-form mode names.
+  // Populated from RPL_CHMODELIST (964) / RPL_UMODELIST (965) at
+  // connect time; consumed by the mode-rendering paths so MODE +o /
+  // PROP +op stay interchangeable in the UI.
+  namedModes?: NamedModes;
   // draft/EMOJI ISUPPORT: URL to the network-wide pack document.
   emojiPackUrl?: string;
   // draft/persistence state (populated from PERSISTENCE STATUS replies).
@@ -70,6 +75,22 @@ export interface Server {
   cmdsAvailable?: string[];
 }
 
+export interface NamedModeSpec {
+  /** Spec type: 1=list, 2=param-set+unset, 3=param-set, 4=flag, 5=prefix. */
+  type: 1 | 2 | 3 | 4 | 5;
+  /** IRCv3 long-form name, e.g. "op", "topiclock", "obsidianirc/floodprot". */
+  name: string;
+  /** Legacy MODE letter (omitted for name-only modes). */
+  letter?: string;
+}
+
+export interface NamedModes {
+  /** Capability negotiated with server; if false, registry is empty. */
+  supported: boolean;
+  channelModes: NamedModeSpec[];
+  userModes: NamedModeSpec[];
+}
+
 export interface ServerConfig {
   id: string;
   name?: string;
diff --git a/tests/protocol/named-modes.test.ts b/tests/protocol/named-modes.test.ts
new file mode 100644
index 00000000..71c8a2eb
--- /dev/null
+++ b/tests/protocol/named-modes.test.ts
@@ -0,0 +1,259 @@
+import { describe, expect, test, vi } from "vitest";
+import {
+  handleProp,
+  handleRplChmodelist,
+  handleRplProplist,
+  handleRplUmodelist,
+} from "../../src/lib/irc/handlers/named-modes";
+import type { IRCClientContext } from "../../src/lib/irc/IRCClientContext";
+import ircClient from "../../src/lib/ircClient";
+
+function makeCtx() {
+  const events: Array<{ name: string; payload: unknown }> = [];
+  const ctx = {
+    triggerEvent: vi.fn((name: string, payload: unknown) => {
+      events.push({ name, payload });
+    }),
+    activeBatches: new Map(),
+  } as unknown as IRCClientContext;
+  return { ctx, events };
+}
+
+describe("named-modes protocol handlers", () => {
+  test("RPL_CHMODELIST parses single-line burst", () => {
+    const { ctx, events } = makeCtx();
+    // Realistic parv: IRCClient already strips the leading `:` from
+    // the trailing parameter, so the parser just sees the entries.
+    handleRplChmodelist(
+      ctx,
+      "srv1",
+      "obby.t3ks.com",
+      ["myself", "5:op=o", "5:voice=v", "1:ban=b", "4:topiclock=t"],
+      undefined,
+    );
+    expect(events).toHaveLength(1);
+    const ev = events[0].payload as {
+      isFinal: boolean;
+      entries: Array<{ type: number; name: string; letter?: string }>;
+    };
+    expect(ev.isFinal).toBe(true);
+    expect(ev.entries).toEqual([
+      { type: 5, name: "op", letter: "o" },
+      { type: 5, name: "voice", letter: "v" },
+      { type: 1, name: "ban", letter: "b" },
+      { type: 4, name: "topiclock", letter: "t" },
+    ]);
+  });
+
+  test("RPL_CHMODELIST handles continuation marker (asterisk)", () => {
+    const { ctx, events } = makeCtx();
+    handleRplChmodelist(
+      ctx,
+      "srv1",
+      "obby.t3ks.com",
+      ["myself", "*", "5:op=o 4:topiclock=t"],
+      undefined,
+    );
+    const ev = events[0].payload as { isFinal: boolean };
+    expect(ev.isFinal).toBe(false);
+  });
+
+  test("RPL_CHMODELIST drops malformed and unknown-type entries", () => {
+    const { ctx, events } = makeCtx();
+    handleRplChmodelist(
+      ctx,
+      "srv1",
+      "obby.t3ks.com",
+      ["myself", "5:op=o", "garbage", "9:future=z", "4:noctcp=C"],
+      undefined,
+    );
+    const ev = events[0].payload as {
+      entries: Array<{ name: string }>;
+    };
+    expect(ev.entries.map((e) => e.name)).toEqual(["op", "noctcp"]);
+  });
+
+  test("RPL_UMODELIST parses name-only entries (no letter)", () => {
+    const { ctx, events } = makeCtx();
+    handleRplUmodelist(
+      ctx,
+      "srv1",
+      "obby.t3ks.com",
+      ["myself", "4:invisible=i 4:obsidianirc/futureflag"],
+      undefined,
+    );
+    const ev = events[0].payload as {
+      entries: Array<{ name: string; letter?: string }>;
+    };
+    expect(ev.entries).toEqual([
+      { type: 4, name: "invisible", letter: "i" },
+      { type: 4, name: "obsidianirc/futureflag", letter: undefined },
+    ]);
+  });
+
+  test("PROP parses sign + name + optional param items", () => {
+    const { ctx, events } = makeCtx();
+    handleProp(
+      ctx,
+      "srv1",
+      "alice!~a@host",
+      ["#egypt", "+key=pyramids", "-topiclock", "+ban=*!*@spam.example"],
+      undefined,
+    );
+    const ev = events[0].payload as {
+      target: string;
+      sender: string;
+      items: Array<{ sign: string; name: string; param?: string }>;
+    };
+    expect(ev.target).toBe("#egypt");
+    expect(ev.sender).toBe("alice");
+    expect(ev.items).toEqual([
+      { sign: "+", name: "key", param: "pyramids" },
+      { sign: "-", name: "topiclock", param: undefined },
+      { sign: "+", name: "ban", param: "*!*@spam.example" },
+    ]);
+  });
+
+  test("PROP defaults to + when item has no explicit sign", () => {
+    const { ctx, events } = makeCtx();
+    handleProp(
+      ctx,
+      "srv1",
+      "alice!~a@host",
+      ["#chan", "key=pyramids"],
+      undefined,
+    );
+    const ev = events[0].payload as {
+      items: Array<{ sign: string; name: string }>;
+    };
+    expect(ev.items[0].sign).toBe("+");
+  });
+
+  test("RPL_PROPLIST flattens space-packed trailing items", () => {
+    const { ctx, events } = makeCtx();
+    handleRplProplist(
+      ctx,
+      "srv1",
+      "obby.t3ks.com",
+      ["myself", "#egypt", "topiclock", "noextmsg", "limit=5"],
+      undefined,
+    );
+    const ev = events[0].payload as { channel: string; items: string[] };
+    expect(ev.channel).toBe("#egypt");
+    expect(ev.items).toEqual(["topiclock", "noextmsg", "limit=5"]);
+  });
+});
+
+// sendNamedMode is on the IRCClient class proper. We test it by
+// constructing a stub that captures sendRaw output, since hand-rolling
+// the full IRCClient lifecycle inside a unit test is overkill and
+// brittle. The decision logic (PROP vs MODE, name->letter mapping,
+// drop-when-no-letter) is what matters.
+describe("sendNamedMode outbound translation", () => {
+  type Item = { sign: "+" | "-"; name: string; param?: string };
+  type Registry = {
+    supported: boolean;
+    channelModes: Array<{ name: string; letter?: string }>;
+    userModes: Array<{ name: string; letter?: string }>;
+  };
+
+  // Spy on sendRaw on the singleton ircClient so the real method runs
+  // through its real `this`, exercising the shared codepath. Each
+  // call resets the spy so tests are independent.
+  function callSendNamedMode(
+    target: string,
+    items: Item[],
+    registry?: Registry,
+  ): string | null {
+    let captured: string | null = null;
+    const spy = vi
+      .spyOn(ircClient, "sendRaw")
+      .mockImplementation((_serverId: string, cmd: string) => {
+        captured = cmd;
+      });
+    ircClient.sendNamedMode("srv1", target, items, registry);
+    spy.mockRestore();
+    return captured;
+  }
+
+  const fullRegistry: Registry = {
+    supported: true,
+    channelModes: [
+      { name: "op", letter: "o" },
+      { name: "voice", letter: "v" },
+      { name: "topiclock", letter: "t" },
+      { name: "ban", letter: "b" },
+      { name: "obsidianirc/futureflag" }, // name-only
+    ],
+    userModes: [
+      { name: "invisible", letter: "i" },
+      { name: "wallops", letter: "w" },
+    ],
+  };
+
+  test("emits MODE when every requested mode has a letter", () => {
+    const out = callSendNamedMode(
+      "#chan",
+      [
+        { sign: "+", name: "op", param: "alice" },
+        { sign: "-", name: "topiclock" },
+      ],
+      fullRegistry,
+    );
+    expect(out).toBe("MODE #chan +o-t alice");
+  });
+
+  test("emits PROP when the cap is on and a name-only mode is requested", () => {
+    const out = callSendNamedMode(
+      "#chan",
+      [
+        { sign: "+", name: "obsidianirc/futureflag" },
+        { sign: "+", name: "op", param: "bob" },
+      ],
+      fullRegistry,
+    );
+    expect(out).toBe("PROP #chan +obsidianirc/futureflag +op=bob");
+  });
+
+  test("drops name-only items when cap is unsupported and falls back to MODE", () => {
+    const out = callSendNamedMode(
+      "#chan",
+      [
+        { sign: "+", name: "obsidianirc/futureflag" },
+        { sign: "+", name: "op", param: "bob" },
+      ],
+      { ...fullRegistry, supported: false },
+    );
+    expect(out).toBe("MODE #chan +o bob");
+  });
+
+  test("returns null (no send) when nothing is resolvable", () => {
+    const out = callSendNamedMode(
+      "#chan",
+      [{ sign: "+", name: "obsidianirc/futureflag" }],
+      { ...fullRegistry, supported: false },
+    );
+    expect(out).toBeNull();
+  });
+
+  test("user target uses userModes registry", () => {
+    const out = callSendNamedMode(
+      "alice",
+      [{ sign: "+", name: "invisible" }],
+      fullRegistry,
+    );
+    expect(out).toBe("MODE alice +i");
+  });
+
+  test("collapses repeated signs ('+', '+') into a single sign group", () => {
+    const out = callSendNamedMode(
+      "#chan",
+      [
+        { sign: "+", name: "op", param: "alice" },
+        { sign: "+", name: "voice", param: "bob" },
+      ],
+      fullRegistry,
+    );
+    expect(out).toBe("MODE #chan +ov alice bob");
+  });
+});