diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index be8c746..9243fe4 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -45,6 +45,8 @@
       {{- $content := replaceRE "a href=\"(#.*?)\"" (printf "%s%s%s" "a href=\"" .Permalink "$1\"") .Content -}}
       {{- $content = replaceRE "img src=\"(.*?)\"" (printf "%s%s%s" "img src=\"" .Permalink "$1\"") $content -}}
       {{- $content = replaceRE "<svg.*</svg>" "" $content -}}
+      {{- $content = replaceRE `(?:(?:<!--)|(?:#)|(?:\/\/))*\s*torchlight!.*\n` "" $content -}}
+      {{- $content = replaceRE `(?:(?:<!--)|(?:#)|(?:\/\/))*\s*\[tl!.*\].*\n` "" $content -}}
       {{- $content = replaceRE `-moz-tab-size:\d;-o-tab-size:\d;tab-size:\d;?` "" $content -}}
       <description>{{ $content | html }}</description>
     </item>
diff --git a/layouts/_default/single.gmi b/layouts/_default/single.gmi
index 7404ef6..d48ba07 100644
--- a/layouts/_default/single.gmi
+++ b/layouts/_default/single.gmi
@@ -18,7 +18,7 @@
   {{- $content := $content | replaceRE "(?m:^`([^`]*)`$)" "```\n$1\n```\n" -}}{{/* convert single-line inline code to blocks */}}
   {{- $content := $content | replaceRE `\{\{%\snotice.*%\}\}` "<-- note -->" -}}{{/* convert hugo notices */}}
   {{- $content := $content | replaceRE `\{\{%\s/notice.*%\}\}` "<-- /note -->" -}}
-  {{- $content := $content | replaceRE `((\/\/)|#)\s*torchlight!.*\n` "" -}}{{/* remove torchlight markup */}}
+  {{- $content := $content | replaceRE `(?:(?:<!--)|(?:#)|(?:\/\/))\s*torchlight!.*\n` "" -}}{{/* remove torchlight markup */}}
   {{- $content := $content | replaceRE `(?:(?:<!--)|(?:#)|(?:\/\/))*\s*\[tl!.*\].*` "" -}}
   {{- $content := $content | replaceRE `(?m:^\[!\[(.*)\]\(.*\)\]\((.*)\)$)` "=> $2 $1" -}}{{/* remove images from uptime links */}}
   {{- $content := $content | replaceRE `(?m:^\s*(?:(?:\*|\-)\s+)?\[(.*)\]\((.*)\)$)` "=> $2 $1" -}}{{/* convert links already on own line */}}