diff --git a/pos-module-common-styling/app/views/pages/api/users/search.json.liquid b/pos-module-common-styling/app/views/pages/api/users/search.json.liquid
new file mode 100644
index 00000000..010b9325
--- /dev/null
+++ b/pos-module-common-styling/app/views/pages/api/users/search.json.liquid
@@ -0,0 +1,38 @@
+{
+    "total_entries": 3,
+    "results": [
+        {
+            "name": "JJ Bragg",
+            "id": "6",
+            "avatar": {
+                "photo_width": 200,
+                "photo_height": 200,
+                "photo": {
+                    "url": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/a86672a06357f944ad9e0c9b5def8828.jpg",
+                    "versions": {
+                        "m": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/m_a86672a06357f944ad9e0c9b5def8828.jpg",
+                        "lg": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/lg_a86672a06357f944ad9e0c9b5def8828.jpg",
+                        "sm": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/sm_a86672a06357f944ad9e0c9b5def8828.jpg",
+                        "xl": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/xl_a86672a06357f944ad9e0c9b5def8828.jpg",
+                        "m_avif": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/m_avif_a86672a06357f944ad9e0c9b5def8828.avif",
+                        "lg_avif": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/lg_avif_a86672a06357f944ad9e0c9b5def8828.avif",
+                        "sm_avif": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/sm_avif_a86672a06357f944ad9e0c9b5def8828.avif",
+                        "xl_avif": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/xl_avif_a86672a06357f944ad9e0c9b5def8828.avif",
+                        "uncropped": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/uncropped_a86672a06357f944ad9e0c9b5def8828.jpg",
+                        "uncropped_avif": "https://uploads.prod01.oregon.platform-os.com/instances/2268/property_uploads/modules/community/photo/photo/b7dd4f75-7032-4ab3-9ca5-a52add9a9aea/uncropped_avif_a86672a06357f944ad9e0c9b5def8828.avif"
+                    }
+                }
+            }
+        },
+        {
+            "name": "John Kowalski",
+            "id": "1",
+            "avatar": {}
+        },
+        {
+            "name": "Jane Doe",
+            "id": "3",
+            "avatar": {}
+        }
+    ]
+}
\ No newline at end of file
diff --git a/pos-module-common-styling/modules/common-styling/public/assets/js/pos-markdown.js b/pos-module-common-styling/modules/common-styling/public/assets/js/pos-markdown.js
index bfa6ae09..8310a476 100644
--- a/pos-module-common-styling/modules/common-styling/public/assets/js/pos-markdown.js
+++ b/pos-module-common-styling/modules/common-styling/public/assets/js/pos-markdown.js
@@ -30,6 +30,24 @@ window.pos.modules.markdown = function(settings){
   module.settings.errorsContainer = module.settings.container.querySelector('.pos-form-errors');
   // class name that hides error on the list (string)
   module.settings.errorDisabledClass = 'pos-markdown-error-disabled';
+  
+  // @mention object (object)
+  module.mention = {};
+  // @mention settings (object)
+  module.settings.mention = {};
+  // instance of the popover with @mentions (object)
+  module.settings.mention.popover = pos.modules.active[`${module.settings.id}-mention-popover`];
+  // list with @mention results (dom node)
+  module.settings.mention.results = module.settings.container.querySelector(`#${module.settings.id}-mention-popover`);
+  // url of the api to fetch mention results (string)
+  module.settings.mention.url = module.settings.mention.popover?.settings.container.dataset.url || null;
+  // active @mention state { query, line, atCh } or null
+  module.settings.mention.state = null;
+  // template for @mention result (dom node)
+  module.settings.mention.template = module.settings.mention.popover?.settings.container.querySelector('template');
+  // async function(query) => [{ id, name }] — function to fetch mention results, returns array of objects with id, name and avatar
+  module.settings.mention.search = async function(query){ return fetch(module.settings.mention.url + '?query=' + encodeURIComponent(query)).then(response => response.json()).then(data => data.results) };
+
   // debug mode enabled (bool)
   module.settings.debug = typeof settings.debug === 'boolean' ? settings.debug : false;
 
@@ -38,6 +56,7 @@ window.pos.modules.markdown = function(settings){
 
 
 
+
   // purpose:		initializes the component
   // ------------------------------------------------------------------------
   module.init = () => {
@@ -79,32 +98,39 @@ window.pos.modules.markdown = function(settings){
       previewClass: ['pos-prose', 'editor-preview']
     });
 
-    // accessibility: escape releases the Tab trap so keyboard users can navigate out
+    // purpose: escape releases the TAB trap so keyboard users can navigate out
     // pressing Esc sets a flag; the capture-phase listener on the wrapper intercepts the next tab before codemirror can call preventDefault, letting the browser move focus naturally; any other key cancels the released state
-    const cmWrapper = module.settings.easyMde.codemirror.getWrapperElement();
-    
     module.settings.easyMde.codemirror.addKeyMap({
       'Esc': function(){
+        pos.modules.debug(module.settings.debug, module.settings.id, 'Escape pressed, releasing tab trap', module.settings.easyMde);
         module.settings.easyMde.codemirror.state.tabTrapReleased = true;
       }
     });
     
-    cmWrapper.addEventListener('keydown', function(event) {
-      if (module.settings.easyMde.codemirror.state.tabTrapReleased) {
-        if(event.key === 'Tab') {
+    const cmWrapper = module.settings.easyMde.codemirror.getWrapperElement();
+
+    cmWrapper.addEventListener('keydown', function(event){
+      if(module.settings.easyMde.codemirror.state.tabTrapReleased){
+        if(event.key === 'Tab'){
+          pos.modules.debug(module.settings.debug, module.settings.id, 'Tab trap was released, navigating focus outside of the editor', module.settings.easyMde);
           module.settings.easyMde.codemirror.state.tabTrapReleased = false;
           event.stopPropagation(); // codemirror never sees it → never calls preventDefault → browser navigates
-        } else if(event.key !== 'Escape') {
+        } else if(event.key !== 'Escape'){
+          pos.modules.debug(module.settings.debug, module.settings.id, 'Re-engaging tab trap as the user resumed editing', module.settings.easyMde);
           module.settings.easyMde.codemirror.state.tabTrapReleased = false; // user resumed editing, re-engage tab trap
         }
       }
     }, true); // capture phase — fires before codemirror's listener on the inner textarea
 
+    // purpose: sets up @mention detection and popup
+    if(module.settings.mention.url){
+      module.mention.start();
+    }
+
     pos.modules.debug(module.settings.debug, module.settings.id, 'EasyMDE instance created', module.settings.easyMde);
   };
 
 
-
   // purpose:		uploads images in the editor
   // ------------------------------------------------------------------------
   module.uploadImage = async (file, onSuccess, onError) => {
@@ -191,6 +217,7 @@ window.pos.modules.markdown = function(settings){
   module.value = (value) => {
     if(value){
       module.settings.easyMde.value(value);
+      module.mention.reapplyMarks();
 
       pos.modules.debug(module.settings.debug, module.settings.id, 'Changed editor content', value);
       // dispatch custom event
@@ -224,7 +251,6 @@ window.pos.modules.markdown = function(settings){
   };
 
 
-
   // purpose:   validates the value
   // ------------------------------------------------------------------------
   module.validate = event => {
@@ -263,6 +289,287 @@ window.pos.modules.markdown = function(settings){
   };
 
 
+  // purpose:   sets up @mention detection and popup
+  // ------------------------------------------------------------------------
+  module.mention.start = () => {
+    module.settings.easyMde.codemirror.on('change', () => {
+      if (module.mention.cleaningUp) return;
+
+      module.mention.cleanupIfEditingMark();
+
+      const cursor = module.settings.easyMde.codemirror.getCursor();
+      const textBefore = module.settings.easyMde.codemirror.getLine(cursor.line).slice(0, cursor.ch);
+      const atIdx = textBefore.lastIndexOf('@');
+
+      if(atIdx === -1){
+        module.mention.hide();
+        return;
+      }
+
+      const charBefore = atIdx > 0 ? textBefore[atIdx - 1] : ' ';
+      const query = textBefore.slice(atIdx + 1);
+
+      if(!/\s/.test(charBefore) && atIdx > 0){
+        module.mention.hide();
+        return;
+      }
+      if(query.length < 1 || /\s/.test(query)){
+        module.mention.hide();
+        return;
+      }
+
+      module.settings.mention.state = { query, line: cursor.line, atCh: atIdx };
+      clearTimeout(module.mention.searchTimeout);
+      module.mention.searchTimeout = setTimeout(async () => {
+        const results = await module.settings.mention.search(query);
+        module.mention.renderPopup(results);
+      }, 300);
+    });
+
+    document.addEventListener('click', e => {
+      if(!module.settings.mention.results.contains(e.target)){
+        module.mention.hide();
+      }
+    });
+
+    module.settings.easyMde.codemirror.addKeyMap({
+      'Esc': () => {
+        if(!module.settings.mention.popover.settings.opened){
+          return module.settings.easyMde.codemirror.constructor.Pass;
+        }
+      },
+      'Up':  () => {
+        if(!module.settings.mention.popover.settings.opened){
+          return module.settings.easyMde.codemirror.constructor.Pass;
+        }
+      },
+      'Down': () => {
+        if(!module.settings.mention.popover.settings.opened){
+          return module.settings.easyMde.codemirror.constructor.Pass;
+        }
+      },
+      'Enter': () => {
+        if(module.settings.mention.popover.settings.opened){
+          if(module.settings.mention.menu.contains(document.activeElement)){
+            document.activeElement.click();
+          }
+        } else {
+          return module.settings.easyMde.codemirror.constructor.Pass;
+        }
+      }
+    });
+
+    // reposition popup when the page or the editor itself scrolls
+    window.addEventListener('scroll', () => {
+      if(module.settings.mention.popover?.settings.opened) module.mention.updatePopupPosition();
+    }, { passive: true });
+
+    module.settings.easyMde.codemirror.on('scroll', () => {
+      if(module.settings.mention.popover?.settings.opened) module.mention.updatePopupPosition();
+    });
+
+    module.mention.reapplyMarks();
+
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Activated @mentions', module.settings.mention);
+  };
+
+
+  // purpose:   renders mention results in the popup, positioned at the cursor
+  // ------------------------------------------------------------------------
+  module.mention.renderPopup = (results) => {
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Rendering @mention results in the popover', results);
+
+    module.settings.mention.results.innerHTML = '';
+
+    if(!results?.length){
+      module.mention.hide();
+      return;
+    }
+
+    results.forEach(person => {
+      const template = module.settings.mention.template.content.cloneNode(true);
+
+      if(person.avatar.photo){
+        template.querySelector('img').src = person.avatar.photo.versions.sm;
+        template.querySelector('.pos-markdown-mention-avatar-initials').remove();
+      } else {
+        template.querySelector('img').remove();
+        const names = person.name.split(' ');
+        template.querySelector('.pos-markdown-mention-avatar-initials').textContent = names[0][0] + names[1][0];
+      }
+      template.querySelector('.pos-markdown-mention-name').textContent = person.name;
+
+      template.querySelector('button').addEventListener('click', e => {
+        e.preventDefault();
+        module.mention.insert(person);
+      });
+
+      module.settings.mention.results.appendChild(template);
+    });
+
+    module.mention.updatePopupPosition();
+
+    module.settings.mention.popover.buildFocusableMenuItems();
+
+    module.settings.mention.popover.open();
+  };
+
+
+  // purpose:   recalculates popup position anchored to the @ character (fixed to viewport)
+  // ------------------------------------------------------------------------
+  module.mention.updatePopupPosition = () => {
+    if(!module.settings.mention.state){
+      return;
+    }
+
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Updating @mention popover position', module.settings.mention.state);
+
+    const atPos = { line: module.settings.mention.state.line, ch: module.settings.mention.state.atCh };
+    const coords = module.settings.easyMde.codemirror.charCoords(atPos, 'window');
+    module.settings.mention.results.style.left = coords.left + 'px';
+    module.settings.mention.results.style.top = (coords.bottom + 4) + 'px';
+  };
+
+
+  // purpose:   hides the mention popup and clears state
+  // ------------------------------------------------------------------------
+  module.mention.hide = () => {
+    if(module.settings.mention.popover && module.settings.mention.popover.settings.opened){
+      module.settings.mention.popover.close();
+    }
+    module.settings.mention.state = null;
+  };
+
+
+  // purpose:   when a change lands inside an existing mention mark, strips @[name](id) to plain @name
+  //            so backspacing or typing within the visible "@name" doesn't leave hidden markdown syntax
+  // ------------------------------------------------------------------------
+  module.mention.cleanupIfEditingMark = () => {
+    const cm = module.settings.easyMde.codemirror;
+    const cursor = cm.getCursor();
+
+    // findMarksAt uses exclusive right boundary, so also check one char left to catch right-edge deletions
+    const positions = [cursor];
+    if (cursor.ch > 0) positions.push({ line: cursor.line, ch: cursor.ch - 1 });
+
+    let mentionMark = null;
+    for (const pos of positions) {
+      mentionMark = cm.findMarksAt(pos).find(m => m.className === 'pos-markdown-mention-mark');
+      if (mentionMark) break;
+    }
+    if (!mentionMark) return;
+
+    const range = mentionMark.find();
+    if (!range) return;
+
+    const underlyingText = cm.getRange(range.from, range.to);
+    if (!underlyingText.startsWith('@')) return;
+
+    // extract the visible name from @[Name (collapse removes [, but it's still in underlying text)
+    const displayName = underlyingText.startsWith('@[') ? underlyingText.slice(2) : underlyingText.slice(1);
+
+    // find and clear the closing ](id) collapsed mark (starts exactly where the styling mark ends)
+    let endPos = range.to;
+    const allMarks = cm.getAllMarks();
+    for (const m of allMarks) {
+      if (m === mentionMark || m.className) continue;
+      const mRange = m.find();
+      if (!mRange || !m.collapsed) continue;
+      if (mRange.from.line === range.to.line && mRange.from.ch === range.to.ch) {
+        endPos = mRange.to;
+        m.clear();
+        break;
+      }
+    }
+
+    // find and clear the opening [ collapsed mark (one char after the @ )
+    for (const m of cm.getAllMarks()) {
+      if (m === mentionMark || m.className) continue;
+      const mRange = m.find();
+      if (!mRange || !m.collapsed) continue;
+      if (mRange.from.line === range.from.line && mRange.from.ch === range.from.ch + 1) {
+        m.clear();
+        break;
+      }
+    }
+
+    mentionMark.clear();
+
+    // replace @[name](id) with plain @name; guard flag prevents re-entry on the change this fires
+    const origCh = cursor.ch;
+    module.mention.cleaningUp = true;
+    cm.replaceRange('@' + displayName, range.from, endPos);
+    module.mention.cleaningUp = false;
+
+    // restore cursor: removing the hidden '[' shifts positions after it back by one
+    const newCh = origCh > range.from.ch + 1 ? origCh - 1 : origCh;
+    cm.setCursor({ line: range.from.line, ch: newCh });
+  };
+
+
+  // purpose:   collapses "[" and "](id)" in a single mention so only "@Name" is visible
+  // ------------------------------------------------------------------------
+  module.mention.applyMark = (line, atCh, name, id) => {
+    const cm = module.settings.easyMde.codemirror;
+    // @[Name](id) — collapse "[" (1 char) so "@Name" is visible
+    cm.markText(
+      { line, ch: atCh + 1 },
+      { line, ch: atCh + 2 },
+      { collapsed: true, atomic: true }
+    );
+    // collapse "](id)" (id.length + 3 chars) so nothing after the name is visible
+    cm.markText(
+      { line, ch: atCh + 2 + name.length },
+      { line, ch: atCh + 2 + name.length + id.length + 3 },
+      { collapsed: true, atomic: true }
+    );
+    // style the visible "@Name" span
+    cm.markText(
+      { line, ch: atCh },
+      { line, ch: atCh + 2 + name.length },
+      { className: 'pos-markdown-mention-mark' }
+    );
+  };
+
+
+  // purpose:   re-applies mention marks on existing content (init or programmatic value set)
+  // ------------------------------------------------------------------------
+  module.mention.reapplyMarks = () => {
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Re-applying @mention marks', module.settings.mention);
+
+    const cm = module.settings.easyMde.codemirror;
+    const regex = /@\[([^\]]+)\]\(([^)]+)\)/g;
+    for (let line = 0; line < cm.lineCount(); line++) {
+      regex.lastIndex = 0;
+      let match;
+      while ((match = regex.exec(cm.getLine(line))) !== null) {
+        module.mention.applyMark(line, match.index, match[1], match[2]);
+      }
+    }
+  };
+
+
+  // purpose:   replaces the @query text with the selected mention
+  // ------------------------------------------------------------------------
+  module.mention.insert = (person) => {
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Inserting @mention to the editor', person);
+
+    const cm = module.settings.easyMde.codemirror;
+    const s = module.settings.mention.state;
+    if (!s) return;
+    const cursor = cm.getCursor();
+    cm.replaceRange(
+      `@[${person.name}](${person.id}) `,
+      { line: s.line, ch: s.atCh },
+      { line: cursor.line, ch: cursor.ch }
+    );
+    module.mention.applyMark(s.line, s.atCh, person.name, person.id);
+    module.mention.hide();
+    cm.focus();
+  };
+
+
+
   module.init();
 
 };
\ No newline at end of file
diff --git a/pos-module-common-styling/modules/common-styling/public/assets/js/pos-popover.js b/pos-module-common-styling/modules/common-styling/public/assets/js/pos-popover.js
index 4bd86b64..8890438b 100644
--- a/pos-module-common-styling/modules/common-styling/public/assets/js/pos-popover.js
+++ b/pos-module-common-styling/modules/common-styling/public/assets/js/pos-popover.js
@@ -22,7 +22,7 @@ window.pos.modules.popover = function(container, userSettings = {}){
   // popover trigger (dom node)
   module.settings.trigger = module.settings.container.querySelector('[popovertarget]');
   // id used to mark the module (string)
-  module.settings.id = module.settings.trigger.getAttribute('popovertarget');
+  module.settings.id = module.settings.trigger?.getAttribute('popovertarget') || 'pos-popover-' + Math.floor(Math.random() * 1000000);
   // popover content (dom node)
   module.settings.popover = module.settings.container.querySelector('[popover]');
   // if the popover is opened (bool)
@@ -45,7 +45,7 @@ window.pos.modules.popover = function(container, userSettings = {}){
       if(event.newState == 'open'){
         // set all the focusable menu items
         if(module.settings.menu){
-          module.settings.focusable = Array.from(module.settings.menu.querySelectorAll('li a, li button')).filter(element => element.checkVisibility())
+          module.buildFocusableMenuItems();
         }
 
         // set state
@@ -77,7 +77,7 @@ window.pos.modules.popover = function(container, userSettings = {}){
     });
 
     // if the popover is triggered by keyboard navigation, focus the first element
-    if(module.settings.menu){
+    if(module.settings.menu && module.settings.trigger){
       module.settings.trigger.addEventListener('keyup', event => {
         if(event.keyCode === 32 || event.key === 'Enter'){
           if(!module.settings.opened){
@@ -183,6 +183,33 @@ window.pos.modules.popover = function(container, userSettings = {}){
   };
 
 
+  // purpose:		opens the popover menu
+  // ------------------------------------------------------------------------
+  module.open = () => {
+    module.settings.popover.showPopover();
+
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Programatically opening popover', module.settings.container);
+  };
+
+
+  // purpose:		closes the popover menu
+  // ------------------------------------------------------------------------
+  module.close = () => {
+    module.settings.popover.hidePopover();
+
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Programatically closing popover', module.settings.container);
+  };
+
+
+  // purpose:		builds an array of all the focusable menu items
+  // ------------------------------------------------------------------------
+  module.buildFocusableMenuItems = () => {
+    return module.settings.focusable = Array.from(module.settings.menu.querySelectorAll('li a, li button')).filter(element => element.checkVisibility())
+
+    pos.modules.debug(module.settings.debug, module.settings.id, 'Built focusable menu items list', module.settings.focusable);
+  }
+
+
   // purpose:		focuses first visible menu item
   // ------------------------------------------------------------------------
   module.focusFirstMenuItem = () => {
diff --git a/pos-module-common-styling/modules/common-styling/public/assets/style/pos-avatar.css b/pos-module-common-styling/modules/common-styling/public/assets/style/pos-avatar.css
index 87fa2f20..93c644d1 100644
--- a/pos-module-common-styling/modules/common-styling/public/assets/style/pos-avatar.css
+++ b/pos-module-common-styling/modules/common-styling/public/assets/style/pos-avatar.css
@@ -25,6 +25,7 @@
   background-color: var(--pos-color-frame);
 
   line-height: 0;
+  text-transform: uppercase;
   font-weight: 500;
   color: var(--pos-color-content-text-supplementary);
 }
diff --git a/pos-module-common-styling/modules/common-styling/public/assets/style/pos-markdown.css b/pos-module-common-styling/modules/common-styling/public/assets/style/pos-markdown.css
index 703f5720..8c0f643c 100644
--- a/pos-module-common-styling/modules/common-styling/public/assets/style/pos-markdown.css
+++ b/pos-module-common-styling/modules/common-styling/public/assets/style/pos-markdown.css
@@ -14,6 +14,7 @@
   ============================================================================ */
   .pos-markdown {
       width: 100%;
+      position: relative;
   }
 
   .EasyMDEContainer .editor-toolbar {
@@ -71,6 +72,50 @@
   }
 
 
+  /* @mention popup
+  ============================================================================ */
+  .pos-markdown-mention [popover] {
+    margin-inline-start: calc(var(--pos-radius-card) * -2);
+    overflow: visible;
+  
+    position: fixed;
+  }
+
+  .pos-markdown-mention [popover]:after {
+    width: 16px;
+    height: 11px;
+    position: absolute;
+    top: -11px;
+    inset-inline-start: calc(var(--pos-radius-card) * 2);
+
+    clip-path: polygon(50% 0%, 0% 100%, 100% 100%);
+    background-color: var(--pos-color-interactive);
+
+    content: '';
+  }
+
+  .pos-markdown-mention menu li button {
+    padding: .5rem .75rem;
+  }
+
+  .pos-markdown-mention menu li:first-child button {
+    border-start-start-radius: var(--pos-radius-card);
+    border-start-end-radius: var(--pos-radius-card);
+  }
+
+  .pos-markdown-mention menu li:last-child button {
+    border-end-start-radius: var(--pos-radius-card);
+    border-end-end-radius: var(--pos-radius-card);
+  }
+
+  /* @mention mark inside the editor */
+  .EasyMDEContainer .CodeMirror .pos-markdown-mention-mark {
+    font-weight: 600 !important;
+    color: var(--pos-color-interactive-active) !important;
+    text-decoration: none !important;
+  }
+
+
   /* content
   ============================================================================ */
   .EasyMDEContainer .CodeMirror-code [data-img-src]::after {
diff --git a/pos-module-common-styling/modules/common-styling/public/views/partials/forms/markdown.liquid b/pos-module-common-styling/modules/common-styling/public/views/partials/forms/markdown.liquid
index 0739d595..6c239898 100644
--- a/pos-module-common-styling/modules/common-styling/public/views/partials/forms/markdown.liquid
+++ b/pos-module-common-styling/modules/common-styling/public/views/partials/forms/markdown.liquid
@@ -1,29 +1,28 @@
 {% doc %}
+  Renders an rich-text markdown editor with optional @mention support and file uploads.
+
   @param {string} id - unique id for the module
-  @param {string} value - pre-filled content for the textarea
-  @param {number} minlength - minimum number of characters allowed
-  @param {number} maxlength - maximum number of characters allowed
   @param {string} name - name for the textarea
-  @param {object} presigned_upload - presigned upload data for file uploads
-{% enddoc %}
-{% comment %}
+  @param {string} [value] - pre-filled content for the textarea
 
-  Rich text editor
+  @param {object} [presigned_upload] - presigned upload data for file uploads
 
-  Arguments:
-    - id                    (string) unique id for the module
-    - name                  (string, required) name for the <textarea> with the content
-    - presigned_upload      (object, required) presigned upload data (upload url and payload) returned from a `property_upload_presigned_url` query
-    - value                 (string) pre-filled content for the textarea
-    - minlength             (number) minimum number of characters allowed in the textarea
-    - maxlength             (number) maximum number of characters allowed in the textarea
+  @param {number} [minlength] - minimum number of characters allowed
+  @param {number} [maxlength] - maximum number of characters allowed
 
-{% endcomment %}
+  @param {string} [mention_search_url] - URL to search for @mentions, e.g. `/api/v1/users/search?query=`
 
 
+  @example
+  {% render 'modules/common-styling/forms/markdown',
+    id: 'markdown-editor',
+    name: 'markdown-editor',
+    presigned_upload: presigned_upload
+  %}
+{% enddoc %}
+
 {% liquid
   assign id = id | default: 'pos-rte'
-  assign value = value | default: ''
 
   assign minlength = minlength | default: 0
   assign maxlength = maxlength | default: 10000
@@ -42,6 +41,24 @@
     {% endfor %}
   >{{ value }}</textarea>
 
+  {% if mention_search_url %}
+    <div class="pos-popover pos-markdown-mention" {% if mention_search_url %}data-url="{{ mention_search_url }}"{% endif %}>
+      <template>
+        <li>
+          <button type="button">
+            <div class="pos-avatar pos-avatar-sm pos-markdown-mention-avatar">
+              <img width="24" height="24" loading="lazy" class="pos-avatar">
+              <div class="pos-markdown-mention-avatar-initials"></div>
+            </div>
+            <span class="pos-markdown-mention-name"></span>
+          </button>
+        </li>
+      </template>
+      <menu popover id="{{ id }}-mention-popover">
+      </menu>
+    </div>
+  {% endif %}
+
   <small id="{{ id }}-instructions" class="pos-tip">
     {% render 'modules/common-styling/icon', icon: 'info' %}
     <span>
diff --git a/pos-module-common-styling/modules/common-styling/public/views/partials/icon.liquid b/pos-module-common-styling/modules/common-styling/public/views/partials/icon.liquid
index c004addd..65d26664 100644
--- a/pos-module-common-styling/modules/common-styling/public/views/partials/icon.liquid
+++ b/pos-module-common-styling/modules/common-styling/public/views/partials/icon.liquid
@@ -1,21 +1,14 @@
 {% doc %}
-  @param {string} icon - name of the icon to render
-  @param {string} class - CSS class to apply to the icon
-{% enddoc %}
-{% comment %}
-
-  List of icons in SVG format
+  Renders an SVG icon with the default attributes from the predefined set.
 
-  Params:
-    - icon name (string)
-    - class (string, optional)
+  @param {string} icon - name of the icon to render
+  @param {string} [class] - CSS class to apply to the icon
 
-{% endcomment %}
+  @example 
+  {% render 'modules/common-styling/icon', icon: 'plus' %}
+{% enddoc %}
 
 
-{% liquid
-  assign class = class | default: ''
-%}
 
 {% capture attrs %}
   viewBox="0 0 24 24"
diff --git a/pos-module-common-styling/modules/common-styling/public/views/partials/style-guide/forms.liquid b/pos-module-common-styling/modules/common-styling/public/views/partials/style-guide/forms.liquid
index 2c9c03c0..16423a0c 100644
--- a/pos-module-common-styling/modules/common-styling/public/views/partials/style-guide/forms.liquid
+++ b/pos-module-common-styling/modules/common-styling/public/views/partials/style-guide/forms.liquid
@@ -332,7 +332,11 @@
 
 
   <h3 class="pos-heading-4 styleguide-heading-4">Markdown editor</h3>
-  {% render 'modules/common-styling/forms/markdown', id: 'styleguide-markdown-editor', name: 'styleguide-markdown-editor', value: null, minlength: null, maxlength: null, presigned_upload: null %}
+  {% render 'modules/common-styling/forms/markdown',
+    id: 'styleguide-markdown-editor',
+    name: 'styleguide-markdown-editor',
+    mention_search_url: '/api/users/search?query='
+  %}
 
 {% capture code %}{% raw %}
 {% render 'modules/common-styling/forms/markdown',
diff --git a/pos-module-common-styling/platformos-tools.log b/pos-module-common-styling/platformos-tools.log
new file mode 100644
index 00000000..a3432a3e
--- /dev/null
+++ b/pos-module-common-styling/platformos-tools.log
@@ -0,0 +1,3 @@
+[2026-06-30T14:39:50.717Z] [platformos-tools] lsp-mcp-server started: ROOT=X:\2026, platformos, modules\pos-modules\pos-module-common-styling
+[2026-06-30T14:39:50.728Z] [platformos-tools] LSP init failed: spawn pos-cli ENOENT
+[2026-06-30T14:39:51.028Z] session started: cwd=X:\2026, platformos, modules\pos-modules\pos-module-common-styling