diff --git a/content/apage.md b/content/apage.md
index ef78ffa..b59cace 100644
--- a/content/apage.md
+++ b/content/apage.md
@@ -19,9 +19,14 @@ test
 
 {% end %}
 
+{% row() %}
+
 ## My example mermaid diagram
 
 I wanted to use mermaid in this project, and it looks like this
+
+|||
+
 {% mermaid() %}
 
 classDiagram
diff --git a/content/blog/_index.md b/content/blog/_index.md
index 9bedfdf..2f3a95b 100644
--- a/content/blog/_index.md
+++ b/content/blog/_index.md
@@ -8,6 +8,7 @@ insert_anchor_links: "left"
 #first: "first"
 #last: "last"
 template: "blog/blog.html"
+page_template: "blogPage.html"
 #transparent: true
 extra:
   imgPath: /images/threefold_img2.png
diff --git a/templates/shortcodes/row.html b/templates/shortcodes/row.html
index c94aca8..cf46462 100644
--- a/templates/shortcodes/row.html
+++ b/templates/shortcodes/row.html
@@ -9,7 +9,6 @@ Parameters:
 - bgPath: if bgPath is passed, the row has a full width background
 -->
 
-
 {% set columns = body | safe | markdown | split(pat="|||") %}
 {% set classes =  "relative pt-12 flex flex-col md:flex-row lg:flex-row p-8 sm:p-12 md:p-16 lg:p-20 lg:py-16"%}
 
@@ -41,10 +40,27 @@ Parameters:
     {% set classes = classes ~ " lg:py-40"  %}
 {% endif %}
 
+
 <div class="{{classes}}" style="{{styles}}">
 {% for column in columns%} 
+
 <div class="{{column_classes}}">
+    {% if "{% mermaid() %}" in column %}
+
+    {% set mermaid_section = column | safe | markdown | split(pat="{% mermaid() %}") %}
+    {% set mermaid_content = mermaid_section[1] | striptags | replace(from="–", to="--")%}
+    
+    <div class="mermaid">
+        {{mermaid_content | safe }} yo
+    </div> 
+
+    {% else %}
+
     {{ column | safe }}
+
+    {% endif %}
+
+    
 </div>
 {% endfor %}
 </div>
\ No newline at end of file