diff --git a/layouts/shortcodes/alert.html b/layouts/shortcodes/alert.html
index b707016..1bdb08f 100644
--- a/layouts/shortcodes/alert.html
+++ b/layouts/shortcodes/alert.html
@@ -1 +1 @@
-<div class="alert {{ with .Get "theme" }}alert-{{.}}{{ end }}" role="alert" data-dir="{{ with .Get "dir" }}{{.}}{{ else }}ltr{{ end }}">{{ .Inner | markdownify }}</div>
\ No newline at end of file
+<div class="alert {{ with .Get "theme" }}alert-{{.}}{{ end }}" role="alert" data-dir="{{ with .Get "dir" }}{{.}}{{ else }}ltr{{ end }}">{{ .Inner | .Page.RenderString }}</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/boxmd.html b/layouts/shortcodes/boxmd.html
index 0c314ec..3539bf2 100644
--- a/layouts/shortcodes/boxmd.html
+++ b/layouts/shortcodes/boxmd.html
@@ -1 +1 @@
-<div class="box">{{ .Inner | markdownify }}</div>
\ No newline at end of file
+<div class="box">{{ .Inner | .Page.RenderString }}</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/button.html b/layouts/shortcodes/button.html
index 378fac4..ad20396 100644
--- a/layouts/shortcodes/button.html
+++ b/layouts/shortcodes/button.html
@@ -1,5 +1,5 @@
 <a href="{{ .Get "href" | default "#" }}" class="button" style="width: {{ .Get "width" | default "72px" }}; height: {{ .Get "height" | default "30px" }};" data-color="{{ .Get "color" | default "default" }}" target="_blank" rel="noreferrer">
   <span class="button__text">
-    {{ .Inner | markdownify }}
+    {{ .Inner | .Page.RenderString }}
   </span>
 </a>
\ No newline at end of file
diff --git a/layouts/shortcodes/code.html b/layouts/shortcodes/code.html
index 67e1426..8929705 100644
--- a/layouts/shortcodes/code.html
+++ b/layouts/shortcodes/code.html
@@ -1,4 +1,4 @@
 {{ $id := substr (md5 .Inner) 0 16 }}
 <div id="{{ $id }}" class="codetab__content">
-  {{ .Inner | markdownify }}
+  {{ .Inner | .Page.RenderString }}
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/color.html b/layouts/shortcodes/color.html
index 3ff4470..e14801c 100644
--- a/layouts/shortcodes/color.html
+++ b/layouts/shortcodes/color.html
@@ -1 +1 @@
-<span style="color: {{ .Get 0 | default "#f48fb1" }}">{{ .Inner | markdownify }}</span>
\ No newline at end of file
+<span style="color: {{ .Get 0 | default "#f48fb1" }}">{{ .Inner | .Page.RenderString }}</span>
\ No newline at end of file
diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index 38d812d..d047b11 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -6,6 +6,6 @@
     {{ .Get 0 }}
   </button>
   <div class="expand__content">
-    {{ .Inner | markdownify }}
+    {{ .Inner | .Page.RenderString }}
   </div>
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/notice.html b/layouts/shortcodes/notice.html
index 65fad9b..437ad3e 100644
--- a/layouts/shortcodes/notice.html
+++ b/layouts/shortcodes/notice.html
@@ -1,3 +1,3 @@
 <div class="notices {{ .Get 0 }}" data-title="{{ .Get 1 | default (.Get 0) | humanize }}">
-  {{ .Inner | markdownify }}
+  {{ .Inner | .Page.RenderString }}
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/swiperItem.html b/layouts/shortcodes/swiperItem.html
index e39385e..3c0e35d 100644
--- a/layouts/shortcodes/swiperItem.html
+++ b/layouts/shortcodes/swiperItem.html
@@ -1,5 +1,5 @@
-<div class="swiper-slide" data-align="{{ .Get "align" | default "center" }}">
-  <div class="swiper-slide__inner">
-    {{ .Inner | markdownify }}
-  </div>
+<div class="swiper-slide" data-align="{{ .Get "align" | default "center" }}">
+  <div class="swiper-slide__inner">
+    {{ .Inner | .Page.RenderString }}
+  </div>
 </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html
index 2541912..efb8eca 100644
--- a/layouts/shortcodes/tab.html
+++ b/layouts/shortcodes/tab.html
@@ -1,4 +1,4 @@
 {{ $id := substr (md5 .Inner) 0 16 }}
 <div id="{{ $id }}" class="tab__content">
-  {{ .Inner | markdownify }}
+  {{ .Inner | .Page.RenderString }}
 </div>
\ No newline at end of file