diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index f8c7779..41517f7 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,38 +1,131 @@
 {{ define "main" }}
+<div class="section">
+    <div class="container">
+        <div class="row g-4">
+            <div class="col-12 col-md-10 offset-md-1">
+                <h1 class="fw-normal">{{ .Title }}</h1>
+                <ul class="list-inline-dash">
+                    {{ if .Params.author }}
+                        <li><a href="#">{{ .Params.author }}</a></li>
+                    {{ else }}
+                        <li><a href="#">by Admin</a></li>
+                    {{ end }}
+                    {{ with .Params.categories }}
+                        {{ range . }}
+                            <li><a href="/categories/{{ . | urlize }}">{{ . }}</a></li>
+                        {{ end }}
+                    {{ else }}
+                        <li><a href="/categories/non-classe">Non classé</a></li>
+                    {{ end }}
+                    <li><a href="#">{{ .Date.Format "Jan 2, 2006" }}</a></li>
+                </ul>
+            </div>
+        </div><!-- end row -->
+    </div><!-- end container -->
+</div>
 
-<article class="post">
-  <header class="post-header">
-    <h1 class="post-title">{{ .Title }}</h1>
-    <div class="post-meta">
-      <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "January 2, 2006" }}</time>
-      {{ if .Params.author }}
-        <span class="post-author">{{ .Params.author }}</span>
-      {{ end }}
-      <div class="post-categories">
-        {{ with .Params.categories }}
-          {{ range . }}
-            <a href="/categories/{{ . | urlize }}" class="category">{{ . }}</a>
-          {{ end }}
-        {{ else }}
-          <a href="/categories/non-classe" class="category">Non classé</a>
-        {{ end }}
-      </div>
-    </div>
-    {{ if .Params.featured_image }}
-      <img src="{{ .Params.featured_image }}" alt="{{ .Title }}" class="featured-image">
-    {{ end }}
-  </header>
+<!-- Featured Image -->
+{{ if .Params.featured_image }}
+<div class="container">
+    <img src="{{ .Params.featured_image }}" alt="{{ .Title }}">
+</div><!-- end container -->
+{{ end }}
+<!-- end Featured Image -->
 
-  <div class="post-content">
-    {{ .Content }}
-  </div>
+<!-- Post Content -->
+<div class="section">
+    <div class="container">
+        <div class="row g-4">
+            <div class="col-12 col-md-10 offset-md-1">
+                <div class="post-content">
+                    {{ .Content }}
+                </div>
+            </div>
+        </div><!-- end row -->
+    </div><!-- end container -->
+</div>
+<!-- end Post Content -->
 
-  {{ if .Params.tags }}
-    <div class="post-tags">
-      {{ range .Params.tags }}
-        <a href="/tags/{{ . | urlize }}" class="tag">#{{ . }}</a>
-      {{ end }}
-    </div>
-  {{ end }}
-</article>
+<!-- Tags and Share -->
+<div class="section-xs border-top">
+    <div class="container">
+        <div class="row g-4">
+            {{ if .Params.tags }}
+            <div class="col-6">
+                <h6 class="font-small fw-medium uppercase">Tags</h6>
+                <ul class="list-inline-sm">
+                    {{ range .Params.tags }}
+                        <li><a href="/tags/{{ . | urlize }}">{{ . }}</a></li>
+                    {{ end }}
+                </ul>
+            </div>
+            {{ end }}
+            <div class="col-6 text-end">
+                <h6 class="font-small fw-medium uppercase">Share On</h6>
+                <ul class="list-inline">
+                    <li><a href="#"><i class="bi bi-facebook"></i></a></li>
+                    <li><a href="#"><i class="bi bi-twitter-x"></i></a></li>
+                    <li><a href="#"><i class="bi bi-google"></i></a></li>
+                </ul>
+            </div>
+        </div><!-- end row -->
+    </div><!-- end container -->
+</div>
+
+<!-- Comments section -->
+{{ if .Site.Params.comments.enable }}
+<div class="section bg-gray-lighter">
+    <div class="container">
+        <div class="row g-4">
+            <div class="col-12 col-md-10 offset-md-1">
+                <h4 class="fw-normal mb-5">Comments</h4>
+                
+                {{ if .Site.Params.comments.disqus }}
+                    <div id="disqus_thread"></div>
+                    <script>
+                        var disqus_config = function () {
+                            this.page.url = "{{ .Permalink }}";
+                            this.page.identifier = "{{ .RelPermalink }}";
+                        };
+                        (function() {
+                            var d = document, s = d.createElement('script');
+                            s.src = 'https://{{ .Site.Params.comments.disqus }}.disqus.com/embed.js';
+                            s.setAttribute('data-timestamp', +new Date());
+                            (d.head || d.body).appendChild(s);
+                        })();
+                    </script>
+                {{ else }}
+                    <p>Comments are disabled.</p>
+                {{ end }}
+                
+            </div>
+        </div><!-- end row -->
+    </div><!-- end container -->
+</div>
+{{ end }}
+
+<!-- Write Comment section -->
+{{ if .Site.Params.comments.enable }}
+<div class="section">
+    <div class="container">
+        <div class="row g-4">
+            <div class="col-12 col-md-10 offset-md-1">
+                <h4 class="fw-normal mb-5">Write a Comment</h4>
+                <form id="comment-form">
+                    <div class="row g-4">
+                        <div class="col-12 col-sm-6">
+                            <input type="text" name="name" placeholder="Name" required>
+                        </div>
+                        <div class="col-12 col-sm-6">
+                            <input type="email" name="email" placeholder="E-Mail" required>
+                        </div>
+                    </div>
+                    <textarea name="message" placeholder="Message"></textarea>
+                    <button class="button button-lg button-outline-gray" type="submit">Post Comment</button>
+                </form>
+            </div>
+        </div><!-- end row -->
+    </div><!-- end container -->
+</div>
+{{ end }}
 {{ end }}
\ No newline at end of file