diff --git a/chrome/browserSpecific.js b/chrome/browserSpecific.js
index 6478d1e..cd5196c 100644
--- a/chrome/browserSpecific.js
+++ b/chrome/browserSpecific.js
@@ -38,10 +38,9 @@ export function getShortcutInstructions() {
 
 /**
  * createContextMenus creates the context menu options.
- * @param {string} markupLanguage - the markup language the user chose.
  * @returns {void}
  */
-export function createContextMenus(markupLanguage) {
+export function createContextMenus() {
     // This function should do nothing. It needs to exist because the Firefox extension
     // uses a function by the same name that is imported into the background script.
 }
@@ -57,10 +56,9 @@ let isTableSelected = false;
  * of HTML element the mouse is interacting with. This only has an effect if the context
  * menu is not currently visible.
  * @param {string} context - info about the element the mouse is interacting with.
- * @param {string} markupLanguage - the markup language the user chose.
  * @returns {Promise<void>}
  */
-export async function updateContextMenu(context, markupLanguage) {
+export async function updateContextMenu(context) {
     // The `browser.contextMenus.update` method doesn't work well in Chromium because
     // when it's used to hide all but one context menu option, the one remaining would
     // appear under a "Stardown" parent menu option instead of being in the root of the
@@ -88,48 +86,12 @@ export async function updateContextMenu(context, markupLanguage) {
             }
 
             browser.contextMenus.create(menu.selectionItem);
+            browser.contextMenus.create(menu.selectionWithSourceItem);
+            browser.contextMenus.create(menu.selectionQuoteItem);
             browser.contextMenus.create(menu.pageItem);
             browser.contextMenus.create(menu.pageSectionItem);
             browser.contextMenus.create(menu.videoItem);
             browser.contextMenus.create(menu.audioItem);
         }
-
-        updateContextMenuLanguage(markupLanguage);
-    }
-}
-
-/**
- * updateContextMenuLanguage changes the context menu options to reflect the user's
- * chosen markup language.
- * @param {string} markupLanguage - the markup language the user chose.
- * @returns {void}
- */
-export function updateContextMenuLanguage(markupLanguage) {
-    if (markupLanguage === 'html') {
-        markupLanguage = 'HTML';
-    } else if (markupLanguage === 'markdown with some html') {
-        markupLanguage = 'markdown';
     }
-
-    browser.contextMenus.update('page', {
-        title: `Copy ${markupLanguage} link for this page`,
-    }, () => { if (browser.runtime.lastError) return; });
-    browser.contextMenus.update('pageSection', {
-        title: `Copy ${markupLanguage} link for this section`,
-    }, () => { if (browser.runtime.lastError) return; });
-    browser.contextMenus.update('selection', {
-        title: `Copy ${markupLanguage} of selection`,
-    }, () => { if (browser.runtime.lastError) return; });
-    browser.contextMenus.update('link', {
-        title: `Copy ${markupLanguage} of link`,
-    }, () => { if (browser.runtime.lastError) return; });
-    browser.contextMenus.update('image', {
-        title: `Copy ${markupLanguage} of image`,
-    }, () => { if (browser.runtime.lastError) return; });
-    browser.contextMenus.update('video', {
-        title: `Copy ${markupLanguage} of video`,
-    }, () => { if (browser.runtime.lastError) return; });
-    browser.contextMenus.update('audio', {
-        title: `Copy ${markupLanguage} of audio`,
-    }, () => { if (browser.runtime.lastError) return; });
 }
diff --git a/docs/manual-testing.md b/docs/manual-testing.md
index 2ac0ad0..f6e29b4 100644
--- a/docs/manual-testing.md
+++ b/docs/manual-testing.md
@@ -49,24 +49,22 @@ When the user right-clicks part of a web page, their browser detects the type of
 
 - [ ] **Pressing any button in the popup** should do what the button's text describes.
 - [ ] **Pressing Alt+C (Mac: ⌥+C)** copies a markdown link for the page, unless part of the page is selected in which case markdown of the selection is copied instead.
-- [ ] **Right-clicking an empty part of a page** shows the "Copy markdown link for this page" and "Copy markdown link for this section" options.
-- [ ] **Right-clicking a website's unselected header** shows the "Copy markdown link for this page" and "Copy markdown link for this section" options.
-- [ ] **Right-clicking selected text** shows the "Copy markdown of selection" option.
-- [ ] **Right-clicking an unselected image** shows the "Copy markdown of image" option.
-- [ ] **Selecting text, then right-clicking an unselected image**, due to browser limitations, shows no context menu option in Chromium and shows "Copy markdown of selection" in Firefox.
-- [ ] **Selecting text and image(s), then right-clicking the selected text** shows the "Copy markdown of selection" option.
-- [ ] **Selecting text and image(s), then right-clicking a selected image** shows the "Copy markdown of selection" option.
-- [ ] **Selecting text and link(s), then right-clicking a selected link** shows the "Copy markdown of selection" option.
-- [ ] **Right-clicking a link that is not an image** shows the "Copy markdown of link" option.
-- [ ] **Right-clicking a link that is an image** might not show any context menu options due to browser limitations. If a context menu option appears, it should be "Copy markdown of image".
-- [ ] **Right-clicking a video** shows the "Copy markdown of video" option, but may require a second right-click for the correct context menu to appear because some videos (e.g. YouTube videos) have a special context menu.
-- [ ] **Right-clicking an audio player** shows the "Copy markdown of audio" option.
+- [ ] **Right-clicking an unselected part of a page** shows the "Copy link for this page" and "Copy link for this section" options.
+- [ ] **Right-clicking an unselected image** shows the "Copy image" option.
+- [ ] **Selecting text and/or image(s), then right-clicking the selection** shows the options "Copy selection", "Copy selection with source", and "Copy selection quote".
+- [ ] **Right-clicking a link that is not an image** shows the "Copy link" option.
+- [ ] **Right-clicking a link that is an image** might not show any context menu options due to browser limitations. If a context menu option appears, it should be "Copy image".
+- [ ] **Right-clicking a video** shows the "Copy video" option, but may require a second right-click for the correct context menu to appear because some videos (e.g. YouTube videos) have a special context menu.
+- [ ] **Right-clicking an audio player** shows the "Copy audio" option.
 - [ ] **Selecting the contents of a table and right-clicking the selection** shows several options: "Copy markdown of table", "Copy TSV of table", "Copy CSV of table", "Copy JSON of table", and "Copy HTML of table". Each option should result in a table with everything aligned correctly, leaving some cells empty and others duplicated as necessary.
-- [ ] "Copy markdown link for this page" copies a markdown link for the page. The link is guaranteed to not have an HTML element ID nor a text fragment.
-- [ ] "Copy markdown link for this section" copies a markdown link for the page with the nearest HTML element ID above (*above* in the HTML element tree sense) where the page was right-clicked.
-- [ ] "Copy markdown of selection", by default, copies markdown of the selected text (including all of the page's formatting that markdown supports), and a markdown link containing a text fragment and possibly an HTML element ID.
-- [ ] "Copy markdown of image" copies markdown of the image using the image's URL and any alt text.
-- [ ] "Copy markdown of link" copies markdown of the link, using the same title and URL as the link in the page (except for any character escapes or encodings).
-- [ ] "Copy markdown of video" copies markdown of the video using the video source's URL.
-- [ ] "Copy markdown of audio" copies a markdown link to either an audio file or a site that plays the audio.
+- [ ] Context menu options
+  - [ ] "Copy link for this page" copies a markdown link for the page. The link is guaranteed to not have an HTML element ID nor a text fragment.
+  - [ ] "Copy link for this section" copies a markdown link for the page with the nearest HTML element ID above (*above* in the HTML element tree sense) where the page was right-clicked.
+  - [ ] "Copy selection" copies markdown of the selection (including all of the page's formatting that markdown supports).
+  - [ ] "Copy selection with source" does the same as "Copy selection" but also includes a markdown link containing a text fragment and possibly an HTML element ID.
+  - [ ] "Copy selection quote" does the same as "Copy selection with source" but formats the output as a markdown block quote.
+  - [ ] "Copy image" copies markdown of the image using the image's URL and any alt text.
+  - [ ] "Copy link" copies markdown of the link, using the same title and URL as the link in the page (except for any character escapes or encodings).
+  - [ ] "Copy video" copies markdown of the video using the video source's URL.
+  - [ ] "Copy audio" copies a markdown link to either an audio file or a site that plays the audio.
 - [ ] **Change settings and repeat as necessary**
diff --git a/firefox/browserSpecific.js b/firefox/browserSpecific.js
index 07848ed..7862598 100644
--- a/firefox/browserSpecific.js
+++ b/firefox/browserSpecific.js
@@ -40,14 +40,15 @@ export function getShortcutInstructions() {
 
 /**
  * createContextMenus creates the context menu options.
- * @param {string} markupLanguage - the markup language the user chose.
  * @returns {void}
  */
-export function createContextMenus(markupLanguage) {
+export function createContextMenus() {
     browser.runtime.onInstalled.addListener(() => {
         browser.contextMenus.create(menu.pageItem);
         browser.contextMenus.create(menu.pageSectionItem);
         browser.contextMenus.create(menu.selectionItem);
+        browser.contextMenus.create(menu.selectionWithSourceItem);
+        browser.contextMenus.create(menu.selectionQuoteItem);
         browser.contextMenus.create(menu.linkItem);
         browser.contextMenus.create(menu.imageItem);
         browser.contextMenus.create(menu.videoItem);
@@ -63,8 +64,6 @@ export function createContextMenus(markupLanguage) {
         browser.contextMenus.update('csvTable', { visible: false });
         browser.contextMenus.update('jsonTable', { visible: false });
         browser.contextMenus.update('htmlTable', { visible: false });
-
-        updateContextMenuLanguage(markupLanguage);
     });
 }
 
@@ -73,10 +72,9 @@ export function createContextMenus(markupLanguage) {
  * of HTML element the mouse is interacting with. This only has an effect if the context
  * menu is not currently visible.
  * @param {string} context - info about the element the mouse is interacting with.
- * @param {string} markupLanguage - the markup language the user chose.
  * @returns {Promise<void>}
  */
-export async function updateContextMenu(context, markupLanguage) {
+export async function updateContextMenu(context) {
     switch (context.mouseover) {
         case 'selection':
             browser.contextMenus.update('link', { visible: false });
@@ -96,6 +94,8 @@ export async function updateContextMenu(context, markupLanguage) {
         await sleep(100); // wait for the context menu
 
         browser.contextMenus.update('selection', { visible: false });
+        browser.contextMenus.update('selectionWithSource', { visible: false });
+        browser.contextMenus.update('selectionQuote', { visible: false });
 
         browser.contextMenus.update('markdownTable', { visible: true });
         browser.contextMenus.update('tsvTable', { visible: true });
@@ -104,6 +104,8 @@ export async function updateContextMenu(context, markupLanguage) {
         browser.contextMenus.update('htmlTable', { visible: true });
     } else if (context.selectionchange) {
         browser.contextMenus.update('selection', { visible: true });
+        browser.contextMenus.update('selectionWithSource', { visible: true });
+        browser.contextMenus.update('selectionQuote', { visible: true });
 
         browser.contextMenus.update('markdownTable', { visible: false });
         browser.contextMenus.update('tsvTable', { visible: false });
@@ -111,42 +113,4 @@ export async function updateContextMenu(context, markupLanguage) {
         browser.contextMenus.update('jsonTable', { visible: false });
         browser.contextMenus.update('htmlTable', { visible: false });
     }
-
-    updateContextMenuLanguage(markupLanguage);
-}
-
-/**
- * updateContextMenuLanguage changes the context menu options to reflect the user's
- * chosen markup language.
- * @param {string} markupLanguage - the markup language the user chose.
- * @returns {void}
- */
-export function updateContextMenuLanguage(markupLanguage) {
-    if (markupLanguage === 'html') {
-        markupLanguage = 'HTML';
-    } else if (markupLanguage === 'markdown with some html') {
-        markupLanguage = 'markdown';
-    }
-
-    browser.contextMenus.update('page', {
-        title: `Copy ${markupLanguage} link for this page`,
-    });
-    browser.contextMenus.update('pageSection', {
-        title: `Copy ${markupLanguage} link for this section`,
-    });
-    browser.contextMenus.update('selection', {
-        title: `Copy ${markupLanguage} of selection`,
-    });
-    browser.contextMenus.update('link', {
-        title: `Copy ${markupLanguage} of link`,
-    });
-    browser.contextMenus.update('image', {
-        title: `Copy ${markupLanguage} of image`,
-    });
-    browser.contextMenus.update('video', {
-        title: `Copy ${markupLanguage} of video`,
-    });
-    browser.contextMenus.update('audio', {
-        title: `Copy ${markupLanguage} of audio`,
-    });
 }
diff --git a/src/background.js b/src/background.js
index 3a1fb05..1a64c9e 100644
--- a/src/background.js
+++ b/src/background.js
@@ -14,11 +14,10 @@
    limitations under the License.
 */
 
-import { browser, sleep, createContextMenus, updateContextMenu, updateContextMenuLanguage } from './browserSpecific.js';
+import { browser, sleep, createContextMenus, updateContextMenu } from './browserSpecific.js';
 import { getSetting } from './getSetting.js';
 import { createTabLink } from './generators/md.js';
 
-let markupLanguage = 'markdown';
 let jsonDestination = 'clipboard';
 let windowId = null;
 
@@ -28,10 +27,7 @@ browser.runtime.onInstalled.addListener(async details => {
     }
 });
 
-getSetting('markupLanguage').then(value => {
-    markupLanguage = value;
-    createContextMenus(value);
-});
+createContextMenus();
 getSetting('jsonDestination').then(value => jsonDestination = value);
 browser.tabs.query({ currentWindow: true, active: true }).then(tabs => {
     windowId = tabs[0].windowId;
@@ -85,7 +81,7 @@ browser.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
             // because the contextMenus.update method cannot update a context menu that
             // is already open. The content script listens for mouseover and mouseup
             // events.
-            await updateContextMenu(message.context, markupLanguage);
+            await updateContextMenu(message.context);
             break;
         case 'downloadFile':
             await downloadFile(message.file);
@@ -118,10 +114,6 @@ browser.runtime.onMessage.addListener(async (message, sender, sendResponse) => {
         case 'settingsButtonPressed':
             browser.runtime.openOptionsPage();
             break;
-        case 'markupLanguage':
-            markupLanguage = message.markupLanguage;
-            updateContextMenuLanguage(markupLanguage);
-            break;
         case 'jsonDestination':
             jsonDestination = message.jsonDestination;
             break;
@@ -148,6 +140,16 @@ browser.contextMenus.onClicked.addListener(async (info, tab) => {
                 tab, { category: 'selectionRightClick' }, { frameId: info.frameId },
             );
             break;
+        case 'selectionWithSource':
+            await handleInteraction(
+                tab, { category: 'selectionWithSourceRightClick' }, { frameId: info.frameId },
+            );
+            break;
+        case 'selectionQuote':
+            await handleInteraction(
+                tab, { category: 'selectionQuoteRightClick' }, { frameId: info.frameId },
+            );
+            break;
         case 'link':
             // In Chromium unlike in Firefox, `info.linkText` is undefined and no
             // property in `info` has the link's text.
@@ -304,6 +306,7 @@ async function handleCopyMultipleTabs(activeTab) {
 
     // create the links
     let text = '';
+    const markupLanguage = await getSetting('markupLanguage');
     switch (markupLanguage) {
         case 'html':
             const result = ['<ul>'];
diff --git a/src/content.js b/src/content.js
index 6ad0653..a85d89b 100644
--- a/src/content.js
+++ b/src/content.js
@@ -203,7 +203,7 @@ async function handleRequest(message) {
             return await handleCopyRequest(message.text);
         case 'copySelectionShortcut':
             // respond to use of the copy keyboard shortcut or copy button
-            return await handleCopySelectionShortcut();
+            return await handleCopySelectionShortcut(message.category);
         case 'copyEntirePageShortcut':
             return await handleCopyPageRequest();
         case 'pageRightClick':
@@ -214,9 +214,11 @@ async function handleRequest(message) {
             const id1 = await getClickedElementId(clickedElement);
             return await handlePageSectionRightClick(id1, selection);
         case 'selectionRightClick':
+        case 'selectionWithSourceRightClick':
+        case 'selectionQuoteRightClick':
             const selection1 = window.getSelection();
             const id2 = await getClickedElementId(clickedElement);
-            return await handleSelectionCopyRequest(id2, selection1);
+            return await handleSelectionCopyRequest(id2, selection1, message.category);
         case 'linkRightClick':
             return await handleCreateLink(linkText, message.linkUrl);
         case 'imageRightClick':
@@ -227,7 +229,7 @@ async function handleRequest(message) {
             return await handleCreateAudio(message.srcUrl, message.pageUrl);
         case 'markdownTableRightClick':
             const id3 = await getClickedElementId(clickedElement);
-            return await handleSelectionCopyRequest(id3, tableSelection);
+            return await handleSelectionCopyRequest(id3, tableSelection, message.category);
         case 'tsvTableRightClick':
             return await handleCsvTableRightClick(tableSelection, '\t');
         case 'csvTableRightClick':
@@ -274,15 +276,16 @@ async function getClickedElementId(clickedElement) {
 /**
  * handleCopySelectionShortcut handles a request from the user to copy a Selection or a
  * link for the current tab.
+ * @param {string} messageCategory
  * @returns {Promise<ContentResponse>}
  */
-async function handleCopySelectionShortcut() {
+async function handleCopySelectionShortcut(messageCategory) {
     const selection = window.getSelection();
     if (selection && selection.type === 'Range') {
         // Only allow Range (and not Caret) Selections because the copy selection
         // shortcut must copy a link for the current tab when there is no Range
         // Selection (when none of the page is highlighted).
-        return await handleSelectionCopyRequest('', selection);
+        return await handleSelectionCopyRequest('', selection, messageCategory);
     }
 
     // none of the page is highlighted, so create a link for the page instead
@@ -308,12 +311,13 @@ async function handlePageSectionRightClick(htmlId, selection) {
  * handleSelectionCopyRequest handles a request to copy a selection.
  * @param {string} htmlId - the ID of the HTML element that was right-clicked.
  * @param {Selection} selection - a selection object.
+ * @param {string} messageCategory
  * @returns {Promise<ContentResponse>}
  */
-async function handleSelectionCopyRequest(htmlId, selection) {
+async function handleSelectionCopyRequest(htmlId, selection, messageCategory) {
     const title = document.title;
     const url = await addIdAndTextFragment(location.href, htmlId, selection);
-    const text = await htmlSelection.createText(title, url, selection);
+    const text = await htmlSelection.createText(title, url, selection, messageCategory);
     return await handleCopyRequest(text);
 }
 
diff --git a/src/contentUtils.js b/src/contentUtils.js
index e3d578f..572668f 100644
--- a/src/contentUtils.js
+++ b/src/contentUtils.js
@@ -106,7 +106,7 @@ export async function applyTemplate(template, title, url, text) {
     const templateVars = {
         link: { title, url },
         date: { YYYYMMDD },
-        text,
+        text: text.trim(),
     };
 
     try {
diff --git a/src/getSetting.js b/src/getSetting.js
index c20fcbc..e50c3cf 100644
--- a/src/getSetting.js
+++ b/src/getSetting.js
@@ -28,14 +28,14 @@ const defaultSettings = {
     copyTabsWindows: 'current',
     notepadContent: '',
 
-    mdSelectionFormat: 'source with link',
     mdYoutube: 'almost everywhere',
     mdSubBrackets: 'underlined',
     mdBulletPoint: '-',
-    mdSelectionTemplate: `> [!note]
+    mdSelectionWithSourceTemplate: `> [!note]
 > from [{{link.title}}]({{link.url}}) on {{date.YYYYMMDD}}
 
-{{text}}`,
+{{text}}
+`,
 
     jsonEmptyCell: 'null',
     jsonDestination: 'clipboard',
diff --git a/src/htmlPage.js b/src/htmlPage.js
index 9c1a875..6b1c4eb 100644
--- a/src/htmlPage.js
+++ b/src/htmlPage.js
@@ -15,14 +15,11 @@
 */
 
 import { getSetting } from './getSetting.js';
-import {
-    sendToNotepad, handleCopyRequest, applyTemplate, removeIdAndTextFragment,
-} from './contentUtils.js';
+import { sendToNotepad, handleCopyRequest } from './contentUtils.js';
 import { extractMainContent } from './extractMainContent.js';
 import { improveConvertibility } from './converters/utils/html.js';
 import { absolutizeNodeUrls } from './converters/utils/urls.js';
-import * as md from './generators/md.js';
-import { htmlToMd, mdEncodeUri } from './converters/md.js';
+import { htmlToMd } from './converters/md.js';
 import { htmlToMdAndHtml } from './converters/mdAndHtml.js';
 
 /**
@@ -70,52 +67,9 @@ async function createPageText() {
         throw new Error(`Unknown markupLanguage: ${markupLanguage}`);
     }
 
-    const title = document.title;
-    const url = removeIdAndTextFragment(location.href);
-
-    const mdSelectionFormat = await getSetting('mdSelectionFormat');
-    switch (mdSelectionFormat) {
-        case 'source with link':
-            return await getSourceFormatMdWithLink(title, url, markupLanguage) + '\n';
-        case 'source':
-            const srcMd = await getSourceFormatMd(markupLanguage);
-            await sendToNotepad(srcMd);
-            return srcMd;
-        case 'template':
-            const templateMd = await getTemplateMd(title, url, markupLanguage);
-            await sendToNotepad(templateMd);
-            return templateMd;
-        case 'blockquote with link':
-            const body = await getSourceFormatMd(markupLanguage);
-            const blockquote = await md.createBlockquote(body, title, url) + '\n';
-            await sendToNotepad(blockquote);
-            return blockquote;
-        case 'link with selection as title':
-            let text = window.getSelection()?.toString() || 'link';
-            text = text.trim().replaceAll('\r\n', ' ').replaceAll('\n', ' ');
-            const link = await md.createLink(text, url);
-            await sendToNotepad(link);
-            return link;
-        case 'link with page title as title':
-            const link2 = await md.createLink(title, url);
-            await sendToNotepad(link2);
-            return link2;
-        default:
-            console.error(`Unknown mdSelectionFormat: ${mdSelectionFormat}`);
-            throw new Error(`Unknown mdSelectionFormat: ${mdSelectionFormat}`);
-    }
-}
-
-async function getSourceFormatMdWithLink(title, url, markupLanguage) {
-    const link = await md.createLink(title, url);
-    const today = new Date();
-    const todayStr = today.getFullYear() + '/' + (today.getMonth() + 1) + '/' + today.getDate();
-    const alert = await md.createAlert('note', `from ${link} on ${todayStr}`);
-
-    const text = await getSourceFormatMd(markupLanguage);
-
-    await sendToNotepad(text);
-    return alert + '\n\n' + text;
+    const srcMd = await getSourceFormatMd(markupLanguage);
+    await sendToNotepad(srcMd);
+    return srcMd;
 }
 
 /**
@@ -146,20 +100,3 @@ async function getSourceFormatMd(markupLanguage) {
             throw new Error(`Unknown markupLanguage: ${markupLanguage}`);
     }
 }
-
-/**
- * getTemplateMd gets markdown of the current page in the user's chosen markup language
- * and uses a template to format it.
- * @param {string} title - the title of the page.
- * @param {string} url - the URL of the page.
- * @param {string} markupLanguage - the user's chosen markup language.
- * @returns {Promise<string>}
- */
-async function getTemplateMd(title, url, markupLanguage) {
-    title = await md.createLinkTitle(title);
-    url = mdEncodeUri(url);
-    const text = await getSourceFormatMd(markupLanguage);
-    const template = await getSetting('mdSelectionTemplate');
-
-    return await applyTemplate(template, title, url, text);
-}
diff --git a/src/htmlSelection.js b/src/htmlSelection.js
index 8a68996..e5f6941 100644
--- a/src/htmlSelection.js
+++ b/src/htmlSelection.js
@@ -24,15 +24,16 @@ import { htmlToMd, mdEncodeUri } from './converters/md.js';
 import { htmlToMdAndHtml } from './converters/mdAndHtml.js';
 
 /**
- * createText creates text of the selected part of the page. The language and format are
- * determined by the user's settings. If there is no selection, a link to the page is
+ * createText creates text of the selected part of the page. The output markup language
+ * is determined by the user's settings. If there is no selection, a link to the page is
  * created.
  * @param {string} title - the title of the page.
  * @param {string} url - the URL of the page.
  * @param {Selection|null} selection - a selection object.
+ * @param {string} messageCategory
  * @returns {Promise<string>}
  */
-export async function createText(title, url, selection) {
+export async function createText(title, url, selection, messageCategory) {
     const markupLanguage = await getSetting('markupLanguage');
 
     const selectedText = selection?.toString().trim();
@@ -68,39 +69,27 @@ export async function createText(title, url, selection) {
         throw new Error(`Unknown markupLanguage: ${markupLanguage}`);
     }
 
-    const mdSelectionFormat = await getSetting('mdSelectionFormat');
-    switch (mdSelectionFormat) {
-        case 'source with link':
-            return await getSourceFormatMdWithLink(
-                title, url, selection, selectedText, markupLanguage,
-            ) + '\n';
-        case 'source':
+    switch (messageCategory) {
+        case 'copySelectionShortcut':
+        case 'selectionRightClick':
+        case 'markdownTableRightClick':
             const srcMd = await getSourceFormatMd(selection, selectedText, markupLanguage);
             await sendToNotepad(srcMd);
             return srcMd;
-        case 'template':
+        case 'selectionWithSourceRightClick':
             const templateMd = await getTemplatedMd(
                 title, url, selection, selectedText, markupLanguage,
             );
             await sendToNotepad(templateMd);
             return templateMd;
-        case 'blockquote with link':
+        case 'selectionQuoteRightClick':
             const body = await getSourceFormatMd(selection, selectedText, markupLanguage);
             const blockquote = await md.createBlockquote(body, title, url) + '\n';
             await sendToNotepad(blockquote);
             return blockquote;
-        case 'link with selection as title':
-            const text = selectedText.replaceAll('\r\n', ' ').replaceAll('\n', ' ');
-            const link = await md.createLink(text, url);
-            await sendToNotepad(link);
-            return link;
-        case 'link with page title as title':
-            const link2 = await md.createLink(title, url);
-            await sendToNotepad(link2);
-            return link2;
         default:
-            console.error(`Unknown mdSelectionFormat: ${mdSelectionFormat}`);
-            throw new Error(`Unknown mdSelectionFormat: ${mdSelectionFormat}`);
+            console.error(`Unknown messageCategory: ${messageCategory}`);
+            throw new Error(`Unknown messageCategory: ${messageCategory}`);
     }
 }
 
@@ -188,34 +177,11 @@ async function getTemplatedMd(title, url, selection, selectedText, markupLanguag
     title = await md.createLinkTitle(title);
     url = mdEncodeUri(url);
     const text = await getSourceFormatMd(selection, selectedText, markupLanguage);
-    const template = await getSetting('mdSelectionTemplate');
+    const template = await getSetting('mdSelectionWithSourceTemplate');
 
     return await applyTemplate(template, title, url, text);
 }
 
-/**
- * getSourceFormatMdWithLink gets markdown of the selected part of the document,
- * attempts to keep the source formatting, and adds a link to the page. The selected
- * text is used as a fallback if the source formatting cannot be obtained.
- * @param {string} title - the page's title.
- * @param {string} url - the page's URL.
- * @param {Selection|null} selection - a selection object.
- * @param {string} selectedText - the selected text.
- * @param {string} markupLanguage - the user's chosen markup language.
- * @returns {Promise<string>}
- */
-async function getSourceFormatMdWithLink(title, url, selection, selectedText, markupLanguage) {
-    const link = await md.createLink(title, url);
-    const today = new Date();
-    const todayStr = today.getFullYear() + '/' + (today.getMonth() + 1) + '/' + today.getDate();
-    const alert = await md.createAlert('note', `from ${link} on ${todayStr}`);
-
-    const text = await getSourceFormatMd(selection, selectedText, markupLanguage);
-
-    await sendToNotepad(text);
-    return alert + '\n\n' + text;
-}
-
 /**
  * combineRanges combines the ranges of a selection into one range, modifying the
  * selection in place. This function has no effect on selections with 0 or 1 ranges.
diff --git a/src/menu.js b/src/menu.js
index e03ae86..c5531bf 100644
--- a/src/menu.js
+++ b/src/menu.js
@@ -14,49 +14,57 @@
    limitations under the License.
 */
 
-// The context menu item titles are also defined in the updateContextMenuLanguage
-// functions in the browserSpecific.js files. If you change the titles here, you should
-// probably also update the titles in those functions.
-
 export const pageItem = {
     id: 'page',
-    title: 'Copy markdown link for this page',
+    title: 'Copy link for this page',
     contexts: ['page', 'editable'],
 };
 
 export const pageSectionItem = {
     id: 'pageSection',
-    title: 'Copy markdown link for this section',
+    title: 'Copy link for this section',
     contexts: ['page', 'editable'],
 };
 
 export const selectionItem = {
     id: 'selection',
-    title: 'Copy markdown of selection',
+    title: 'Copy selection',
+    contexts: ['selection'],
+};
+
+export const selectionWithSourceItem = {
+    id: 'selectionWithSource',
+    title: 'Copy selection with source',
+    contexts: ['selection'],
+};
+
+export const selectionQuoteItem = {
+    id: 'selectionQuote',
+    title: 'Copy selection quote',
     contexts: ['selection'],
 };
 
 export const linkItem = {
     id: 'link',
-    title: 'Copy markdown of link',
+    title: 'Copy link',
     contexts: ['link'],
 };
 
 export const imageItem = {
     id: 'image',
-    title: 'Copy markdown of image',
+    title: 'Copy image',
     contexts: ['image'],
 };
 
 export const videoItem = {
     id: 'video',
-    title: 'Copy markdown of video',
+    title: 'Copy video',
     contexts: ['video'],
 };
 
 export const audioItem = {
     id: 'audio',
-    title: 'Copy markdown of audio',
+    title: 'Copy audio',
     contexts: ['audio'],
 };
 
diff --git a/src/settings.html b/src/settings.html
index 260ad55..6ff5a6d 100644
--- a/src/settings.html
+++ b/src/settings.html
@@ -158,26 +158,6 @@ <h4>Readability</h4>
       <br />
       <hr />
       <h4>Markdown</h4>
-      <label for="mdSelectionFormat">When creating markdown of a selection,</label>
-      <select id="mdSelectionFormat" name="mdSelectionFormat">
-        <option value="source with link">try to keep the same formatting and link to the source</option>
-        <option value="source">try to keep the same formatting</option>
-        <option value="template">use a custom template</option>
-        <option value="blockquote with link">create a block quote and link to the source</option>
-        <option value="link with selection as title">create a link with the selected text as the title</option>
-        <option value="link with page title as title">create a link with the page title as the link title</option>
-      </select>
-      <br />
-      <label id="mdSelectionTemplateLabel" for="mdSelectionTemplate">Selection template:</label>
-      <textarea id="mdSelectionTemplate" name="mdSelectionTemplate" rows="5" cols="75">
-> [!note]
-> from [{{link.title}}]({{link.url}}) on {{date.YYYYMMDD}}
-
-{{selection}}
-</textarea>
-      <p id="mdSelectionTemplateError" style="display: none"></p>
-      <br />
-      <br />
       <label for="mdBulletPoint">Markdown bullet point symbol:</label>
       <select id="mdBulletPoint" name="mdBulletPoint">
         <option value="-">-</option>
@@ -203,6 +183,17 @@ <h4>Markdown</h4>
       </select>
       <br />
       <br />
+      <label id="mdSelectionWithSourceTemplateLabel" for="mdSelectionWithSourceTemplate">
+        "Copy selection with source" template:</label>
+      <textarea id="mdSelectionWithSourceTemplate" name="mdSelectionWithSourceTemplate" rows="5" cols="75">
+> [!note]
+> from [{{link.title}}]({{link.url}}) on {{date.YYYYMMDD}}
+
+{{text}}
+</textarea>
+      <p id="mdSelectionWithSourceTemplateError" style="display: none; color: red;"></p>
+      <br />
+      <br />
       <hr />
       <h4>JSON</h4>
       <label for="jsonEmptyCell">Empty table cells are converted to
diff --git a/src/settings.js b/src/settings.js
index cb12993..0df085b 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -33,11 +33,9 @@ const omitHiddenEl = document.querySelector('#omitHidden');
 const notifyOnWarningEl = document.querySelector('#notifyOnWarning');
 const notifyOnSuccessEl = document.querySelector('#notifyOnSuccess');
 
-const mdSelectionFormatEl = document.querySelector('#mdSelectionFormat');
 const mdYoutubeEl = document.querySelector('#mdYoutube');
-const mdSelectionTemplateEl = document.querySelector('#mdSelectionTemplate');
-const mdSelectionTemplateLabelEl = document.querySelector('#mdSelectionTemplateLabel');
-const mdSelectionTemplateErrorEl = document.querySelector('#mdSelectionTemplateError');
+const mdSelectionWithSourceTemplateEl = document.querySelector('#mdSelectionWithSourceTemplate');
+const mdSelectionWithSourceTemplateErrorEl = document.querySelector('#mdSelectionWithSourceTemplateError');
 const mdSubBracketsEl = document.querySelector('#mdSubBrackets');
 const mdBulletPointEl = document.querySelector('#mdBulletPoint');
 
@@ -47,13 +45,7 @@ const jsonDestinationEl = document.querySelector('#jsonDestination');
 const resetButton = document.querySelector('#reset');
 
 // set up setting autosaving
-initAutosave('markupLanguage', markupLanguageEl, 'value', async () => {
-    browser.runtime.sendMessage({
-        destination: 'background',
-        category: 'markupLanguage',
-        markupLanguage: markupLanguageEl.value,
-    });
-});
+initAutosave('markupLanguage', markupLanguageEl, 'value');
 initAutosave('createTextFragment', createTextFragmentEl, 'checked');
 initAutosave('extractMainContent', extractMainContentEl, 'checked');
 initAutosave('omitNav', omitNavEl, 'checked');
@@ -63,9 +55,8 @@ initAutosave('notifyOnWarning', notifyOnWarningEl, 'checked');
 initAutosave('notifyOnSuccess', notifyOnSuccessEl, 'checked');
 initAutosave('copyTabsWindows', copyTabsWindowsEl, 'value');
 
-initAutosave('mdSelectionFormat', mdSelectionFormatEl, 'value');
 initAutosave('mdYoutube', mdYoutubeEl, 'value');
-initAutosave('mdSelectionTemplate', mdSelectionTemplateEl, 'value');
+initAutosave('mdSelectionWithSourceTemplate', mdSelectionWithSourceTemplateEl, 'value');
 initAutosave('mdSubBrackets', mdSubBracketsEl, 'value');
 initAutosave('mdBulletPoint', mdBulletPointEl, 'value');
 
@@ -110,9 +101,8 @@ async function loadSettings() {
         notifyOnWarningEl.checked = await getSetting('notifyOnWarning');
         notifyOnSuccessEl.checked = await getSetting('notifyOnSuccess');
 
-        mdSelectionFormatEl.value = await getSetting('mdSelectionFormat');
         mdYoutubeEl.value = await getSetting('mdYoutube');
-        mdSelectionTemplateEl.value = await getSetting('mdSelectionTemplate');
+        mdSelectionWithSourceTemplateEl.value = await getSetting('mdSelectionWithSourceTemplate');
         mdSubBracketsEl.value = await getSetting('mdSubBrackets');
         mdBulletPointEl.value = await getSetting('mdBulletPoint');
 
@@ -132,9 +122,6 @@ async function loadSettings() {
 async function resetSettings() {
     await browser.storage.sync.clear();
 
-    mdSelectionTemplateEl.style.display = 'none';
-    mdSelectionTemplateLabelEl.style.display = 'none';
-
     resetButton.value = 'Reset all ✔';
     resetButton.style.backgroundColor = '#aadafa';
     setTimeout(() => {
@@ -159,7 +146,7 @@ async function validateTemplateVariables() {
         text,
     };
 
-    const matches = mdSelectionTemplateEl.value.matchAll(/{{([^{}]+)}}/g);
+    const matches = mdSelectionWithSourceTemplateEl.value.matchAll(/{{([^{}]+)}}/g);
     if (!matches) {
         return;
     }
@@ -181,32 +168,17 @@ async function validateTemplateVariables() {
         }
 
         if (value === undefined) {
-            mdSelectionTemplateErrorEl.textContent = `Unknown variable "${group}"`;
-            mdSelectionTemplateErrorEl.style.color = 'red';
-            mdSelectionTemplateErrorEl.style.display = 'inline-block';
+            mdSelectionWithSourceTemplateErrorEl.textContent = `Unknown variable "${group}"`;
+            mdSelectionWithSourceTemplateErrorEl.style.display = 'inline-block';
             return;
         }
     }
 
-    mdSelectionTemplateErrorEl.textContent = '';
-    mdSelectionTemplateErrorEl.style.display = 'none';
+    mdSelectionWithSourceTemplateErrorEl.textContent = '';
+    mdSelectionWithSourceTemplateErrorEl.style.display = 'none';
 }
 
-mdSelectionFormatEl.addEventListener('change', function () {
-    // hide or show the selection template setting based on the selection format
-    if (mdSelectionFormatEl.value === 'template') {
-        mdSelectionTemplateEl.style.display = 'block';
-        mdSelectionTemplateLabelEl.style.display = 'block';
-    } else {
-        mdSelectionTemplateEl.style.display = 'none';
-        mdSelectionTemplateLabelEl.style.display = 'none';
-    }
-});
-new Promise(resolve => setTimeout(resolve, 50)).then(() => {
-    mdSelectionFormatEl.dispatchEvent(new Event('change'));
-});
-
-mdSelectionTemplateEl.addEventListener('input', async function () {
+mdSelectionWithSourceTemplateEl.addEventListener('input', async function () {
     await validateTemplateVariables();
 });