diff --git a/mevislab.github.io/content/glossary.md b/mevislab.github.io/content/glossary.md
index c4d6a75ce..ad7c8b216 100644
--- a/mevislab.github.io/content/glossary.md
+++ b/mevislab.github.io/content/glossary.md
@@ -6,4 +6,4 @@ status: "OK"
 ---
 
 ## Glossary
-{{<embed file="/layouts/partials/glossarycontents.html">}}
\ No newline at end of file
+{{<embed file="/layouts/_partials/glossarycontents.html">}}
\ No newline at end of file
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/_default/_markup/render-image.html b/mevislab.github.io/themes/MeVisLab/layouts/_markup/render-image.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/_default/_markup/render-image.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_markup/render-image.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/_default/_markup/render-link.html b/mevislab.github.io/themes/MeVisLab/layouts/_markup/render-link.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/_default/_markup/render-link.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_markup/render-link.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/doclist.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/doclist.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/doclist.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/doclist.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/footer.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/footer.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/footer.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/footer.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/glossarycontents.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/glossarycontents.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/glossarycontents.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/glossarycontents.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/head.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/head.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/head.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/head.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/header.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/header.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/header.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/header.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/nextprev.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/nextprev.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/nextprev.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/nextprev.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/partials/subpages.html b/mevislab.github.io/themes/MeVisLab/layouts/_partials/subpages.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/partials/subpages.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_partials/subpages.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/alert.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/alert.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/alert.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/alert.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/bootstrap-table.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/bootstrap-table.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/bootstrap-table.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/bootstrap-table.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/childpages.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/childpages.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/childpages.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/childpages.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/docuLinks.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/docuLinks.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/docuLinks.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/docuLinks.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/embed.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/embed.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/embed.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/embed.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/highlight.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/highlight.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/highlight.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/highlight.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/imagegallery.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/imagegallery.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/imagegallery.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/imagegallery.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/keyboard.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/keyboard.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/keyboard.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/keyboard.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/menuitem.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/menuitem.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/menuitem.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/menuitem.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/mousebutton.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/mousebutton.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/mousebutton.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/mousebutton.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/networkfile.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/networkfile.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/networkfile.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/networkfile.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/search.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/search.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/search.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/search.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/shortcodes/youtube.html b/mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/youtube.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/shortcodes/youtube.html
rename to mevislab.github.io/themes/MeVisLab/layouts/_shortcodes/youtube.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/_default/baseof.html b/mevislab.github.io/themes/MeVisLab/layouts/baseof.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/_default/baseof.html
rename to mevislab.github.io/themes/MeVisLab/layouts/baseof.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/_default/list.html b/mevislab.github.io/themes/MeVisLab/layouts/list.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/_default/list.html
rename to mevislab.github.io/themes/MeVisLab/layouts/list.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/_default/single.html b/mevislab.github.io/themes/MeVisLab/layouts/single.html
similarity index 100%
rename from mevislab.github.io/themes/MeVisLab/layouts/_default/single.html
rename to mevislab.github.io/themes/MeVisLab/layouts/single.html
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/tags/list.html b/mevislab.github.io/themes/MeVisLab/layouts/tags/list.html
new file mode 100644
index 000000000..4d624c4e7
--- /dev/null
+++ b/mevislab.github.io/themes/MeVisLab/layouts/tags/list.html
@@ -0,0 +1,19 @@
+{{ define "main" }}
+<div class="container pb-5 pt-3">
+    <div class="container-fluid overflow-hidden">
+        <div class="row vh-auto overflow-auto">
+            <div class="col d-flex flex-column h-sm-auto">
+                <div class="col px-6">
+                    <p>{{ if eq .Title "Beginner" }}<span class="badge bg-success">{{ .Title }}{{ else if eq .Title "Advanced" }}<span class="badge bg-warning">{{ .Title }}{{ else if eq . "Expert" }}<span class="badge bg-danger">{{ .Title }}{{ else }}<span class="badge bg-secondary">{{ .Title }}{{ end }}</span></p>
+                    {{ range .Data.Pages }}                    
+                    <ol class="list-group">
+                        <li class="list-group-item" style="position: inherit; !important"><a class="fw-bold" href="{{.Permalink}}" title="{{ .Title }}" target="_self">{{ .Name }}</a><div class="ps-4">{{ .Title }}</div></li>
+                    </ol>
+                    {{ end }}
+                </div>
+            </div>
+        </div>
+    </div> 
+</div>  
+            
+{{ end }}
\ No newline at end of file
diff --git a/mevislab.github.io/themes/MeVisLab/layouts/taxonomy/tag.html b/mevislab.github.io/themes/MeVisLab/layouts/taxonomy/tag.html
deleted file mode 100644
index 0a21ecccd..000000000
--- a/mevislab.github.io/themes/MeVisLab/layouts/taxonomy/tag.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{ define "main" }}
-<div class="container pb-5 pt-3">
-    <div class="container-fluid overflow-hidden">
-        <div class="row vh-auto overflow-auto">
-            <div class="col d-flex flex-column h-sm-auto">
-                <div class="col px-6">
-                    <h3>{{ if eq .Title "Beginner" }}<span class="badge bg-success">{{ .Title }}{{ else if eq .Title "Advanced" }}<span class="badge bg-warning">{{ .Title }}{{ else if eq . "Expert" }}<span class="badge bg-danger">{{ .Title }}{{ else }}<span class="badge bg-secondary">{{ .Title }}{{ end }}</span></h3>
-                    {{ range .Data.Pages }}
-                    <h4><a href="{{.Permalink}}">{{.Title}}</a></h4>{{.Summary}}
-                    {{ end }}
-                </div>
-            </div>
-        </div>
-    </div> 
-</div>  
-            
-{{ end }}
\ No newline at end of file