diff --git a/templates/shortcodes/link.html b/templates/shortcodes/link.html
index cc1df77..4f7a9a6 100644
--- a/templates/shortcodes/link.html
+++ b/templates/shortcodes/link.html
@@ -1 +1 @@
-<a href="{{ href }}" class="text-blue-400">{{ text }}</a>
+<a rel="noopener" href="{{ href }}" class="text-blue-400">{{ text }}</a>
diff --git a/templates/shortcodes/subheading.html b/templates/shortcodes/subheading.html
index bcf91b1..5161746 100644
--- a/templates/shortcodes/subheading.html
+++ b/templates/shortcodes/subheading.html
@@ -1,4 +1,10 @@
+{% set href = text
+    | regex_replace(pattern="[\\\/#%<>\[\]\(\)`\\^{}\|.]", rep="")
+    | regex_replace(pattern=" +", rep="-")
+    | lower
+%}
+
 <hr class="border-gray-700 my-4">
-<h3 class="text-3xl font-bold">
-  {{ text }}
-</h3>
+<a id="{{ href }}" class="text-3xl font-bold focus:outline-none focus:ring-0" href="#{{ href }}" aria-label="Anchor link for : {{ href }}">
+  {{ text | safe }}
+</a>
diff --git a/templates/shortcodes/table.html b/templates/shortcodes/table.html
index 8e2c76b..c1e6869 100644
--- a/templates/shortcodes/table.html
+++ b/templates/shortcodes/table.html
@@ -1,4 +1,4 @@
-<div class="relative overflow-x-auto shadow-md sm:rounded-lg my-8">
+<div class="relative overflow-x-auto shadow-md rounded-lg my-8">
     <table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
         <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
             <tr>