diff --git a/layouts/blogibis/list.html b/layouts/blogibis/list.html
index 224b795..98c26e1 100644
--- a/layouts/blogibis/list.html
+++ b/layouts/blogibis/list.html
@@ -10,7 +10,7 @@
   <header class="blog">
     <div class="container">
       <div class="row">
-        <div class="col m9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/spot"  | relLangURL }}">IBIS Blog</a></h2>
           {{ partial "widgets/categoriesibis.html" . }}
         </div>
@@ -18,43 +18,19 @@
     </div>
   </header>
 
-  <div id="content">
+  <div id="page-content">
     <div class="container">
         <div class="row">
-            <div class="col l9 m9">
+            <div class="col l9 m9 s12">
                 <section class="col s12">
                   <div class="list-group">
                     {{ $paginator := .Paginate ((where .Pages "Type" "blogibis").ByParam "lastmod").Reverse}}
                     {{ range $paginator.Pages }}
-                        <div class="row blog-article-item-list">
-                          <h4><a href="{{ .Permalink }}">{{.Title}}</a></h4>
-                          <div class="col l4 col m4 col s12">
-
-                            {{ if isset .Params "images"}}
-                            {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
-                            {{ $mainimage := resources.Get (index .Params.images 0) }}
-                              <p class="text-center"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"
-                                width="300">
-                            </p>
-                            {{ end }}
-                            {{ end }}
-                          
-                          </div>
-                          <div class="col l8 col m8 col s12">
-
-                          <p class="blog-article-introduction">
-                            {{ .Summary | plainify}}
-                            <a href="{{ .Permalink }}">{{ i18n "read_more" }}</a>
-                          </p>
-
-                          {{ partial "partials/widgets/ibiscattags.html" . }}
-
-                          </div>   
-                        </div>
+                      {{ partial "partials/article-item.html" (dict "article" . "tags" "ibiscattags") }}
                     {{ end }}
-                      </div>
+                  </div>
         
-                    {{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }}
+                  {{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }}
 
                 </section>
             </div>
@@ -63,9 +39,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
diff --git a/layouts/blogibis/single.html b/layouts/blogibis/single.html
index b3010c9..2ea86b1 100644
--- a/layouts/blogibis/single.html
+++ b/layouts/blogibis/single.html
@@ -9,7 +9,7 @@
   <header class="blog-single">
     <div class="container">
       <div class="row">
-        <div class="col m9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/ibis"  | relLangURL }}">IBIS Blog</a></h2>
           {{ partial "widgets/categoriesibis.html" . }}
           <h3 class="title">{{ .Title }}</h3>
@@ -18,11 +18,11 @@
     </div>
   </header>
 
-  <div id="content">
+  <div id="page-content">
     <div class="container">
         <div class="row">
-            <div class="col m9">
-                <section class="col s12">
+            <div class="col s12 m9 l9">
+                <section>
                     <article>
                       {{ if isset .Params "images"}}
                       {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
@@ -49,9 +49,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
diff --git a/layouts/blogspot/list.html b/layouts/blogspot/list.html
index d84d8d1..4215ac2 100644
--- a/layouts/blogspot/list.html
+++ b/layouts/blogspot/list.html
@@ -9,7 +9,7 @@
   <header class="blog">
     <div class="container">
       <div class="row">
-        <div class="col-md-9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/spot"  | relLangURL }}">SPOT Blog</a></h2>
           {{ partial "widgets/categoriesspot.html" . }}
         </div>
@@ -17,54 +17,27 @@
     </div>
   </header>
 
-  <div id="content">
+  <div id="page-content">
     <div class="container">
         <div class="row">
-            <div class="col-md-9">
-                <section class="col-sm-12">
+            <div class="col s12 m9 l9">
+                <section>
                   <div class="list-group">
                     {{ $paginator := .Paginate ((where .Pages "Type" "blogspot").ByParam "lastmod").Reverse}}
                     {{ range $paginator.Pages }}
-                        <div class="row blog-article-item-list">
-                          <h4><a href="{{ .Permalink }}">{{.Title}}</a></h4>
-                          <div class="col-lg-4 col-md-4 col-sm-12">
-
-                            {{ if isset .Params "images"}}
-                            {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
-                            {{ $mainimage := resources.Get (index .Params.images 0) }}
-                              <p class="text-center"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"
-                                width="300">
-                            </p>
-                            {{ end }}
-                            {{ end }}
-                          
-                          </div>
-                          <div class="col-lg-8 col-md-8 col-sm-12">
-
-                          <p class="blog-article-introduction">
-                            {{ .Summary | plainify}}
-                            <a href="{{ .Permalink }}">{{ i18n "read_more" }}</a>
-                          </p>
-
-                          {{ partial "partials/widgets/spotcattags.html" . }}
-                          
-                          </div>   
-                        </div>
+                      {{ partial "partials/article-item.html" (dict "article" . "tags" "spotcattags") }}
                     {{ end }}
-                      </div>
+                  </div>
         
-                    {{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }}
+                  {{ partial "partials/pagination.html" (dict "page" . "format" "default" "align" "center") }}
 
                 </section>
             </div>
             {{ partial "partials/widgets/spotsidebar.html" . }}
         </div>
-    </div>
+      </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
diff --git a/layouts/blogspot/single.html b/layouts/blogspot/single.html
index 2fc9459..6a890bf 100644
--- a/layouts/blogspot/single.html
+++ b/layouts/blogspot/single.html
@@ -9,7 +9,7 @@
   <header class="blog-single">
     <div class="container">
       <div class="row">
-        <div class="col-md-9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/spot"  | relLangURL }}">SPOT Blog</a></h2>
           {{ partial "widgets/categoriesspot.html" . }}
           <h3 class="title">{{ .Title }}</h3>
@@ -18,19 +18,17 @@
     </div>
   </header>
 
-  <div id="content">
+  <div id="page-content">
     <div class="container">
         <div class="row">
-            <div class="col-md-9">
-                <section class="col-sm-12">
+            <div class="col s12 m9 l9">
+                <section>
                     <article>
 
                       {{ if isset .Params "images"}}
                       {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
                       {{ $mainimage := resources.Get (index .Params.images 0) }}
-                        <p class="text-center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}"
-                          width="500">
-                      </p>
+                        <p class="text-center"><img class="img-fluid" src="{{ $mainimage.RelPermalink }}" width="400"></p>
                       {{ end }}
                       {{ end }}
 
@@ -51,9 +49,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
diff --git a/layouts/categoriesibis/list.html b/layouts/categoriesibis/list.html
index a68e1cf..fc4817e 100644
--- a/layouts/categoriesibis/list.html
+++ b/layouts/categoriesibis/list.html
@@ -9,7 +9,7 @@
   <header class="service">
     <div class="container">
       <div class="row">
-        <div class="col-md-9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/ibis"  | relLangURL }}">IBIS Blog</a></h2>
           {{ partial "widgets/categoriesibis.html" . }}
         </div>
@@ -17,42 +17,15 @@
     </div>
   </header>
 
-  <div id="content">
+  <div id="page-content">
     <div class="container">
         <div class="row">
-            <div class="col-md-9">
-                <section class="col-sm-12">
+            <div class="col s12 m9 l9">
+                <section>
                   <div class="list-group">
                     {{ $paginator := .Paginate ((where .Pages "Type" "blogibis").ByParam "LastmodDate")}}
                     {{ range $paginator.Pages }}
-                        <div class="row blog-article-item-list">
-                          <h4><a href="{{ .Permalink }}">{{.Title}}</a></h4>
-                          <div class="col-lg-4 col-md-4 col-sm-12">
-
-                            {{ if isset .Params "images"}}
-                            {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
-                            {{ $mainimage := resources.Get (index .Params.images 0) }}
-                            {{ $mainimage := $mainimage.Resize "300x" }}
-                              <p class="text-center"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"
-                                width="{{ $mainimage.Width }}" height="{{ $mainimage.Height }}">
-                            </p>
-                            {{ end }}
-                            {{ end }}
-                          
-                          </div>
-                          <div class="col-lg-8 col-md-8 col-sm-12">
-
-                          <p class="blog-article-introduction">
-                            {{ .Summary | safeHTML}}
-                            <br />
-                            <a href="{{ .Permalink }}">{{ i18n "read_more" }}</a>
-                          </p>
-
-                          <small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
-
-                          {{ partial "widgets/ibiscattags.html" . }}
-                          </div>   
-                        </div>
+                      {{ partial "partials/article-item.html" (dict "article" . "tags" "ibiscattags") }}
                     {{ end }}
                       </div>
         
@@ -65,9 +38,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
\ No newline at end of file
diff --git a/layouts/categoriesspot/list.html b/layouts/categoriesspot/list.html
index ce3f914..d9aa3d9 100644
--- a/layouts/categoriesspot/list.html
+++ b/layouts/categoriesspot/list.html
@@ -9,7 +9,7 @@
   <header class="blog">
     <div class="container">
       <div class="row">
-        <div class="col-md-9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/spot"  | relLangURL }}">SPOT Blog</a></h2>
           {{ partial "widgets/categoriesspot.html" . }}
         </div>
@@ -17,43 +17,15 @@
     </div>
   </header>
 
-  <div id="content">
+  <div id="page-content">
     <div class="container">
         <div class="row">
-            <div class="col-md-9">
-                <section class="col-sm-12">
+            <div class="col s12 m9 l9">
+                <section>
                   <div class="list-group">
                     {{ $paginator := .Paginate ((where .Pages "Type" "blogspot").ByParam "LastmodDate")}}
                     {{ range $paginator.Pages }}
-                        <div class="row blog-article-item-list">
-                          <h4><a href="{{ .Permalink }}">{{.Title}}</a></h4>
-                          <div class="col-lg-4 col-md-4 col-sm-12">
-
-                            {{ if isset .Params "images"}}
-                            {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
-                            {{ $mainimage := resources.Get (index .Params.images 0) }}
-                            {{ $mainimage := $mainimage.Resize "300x" }}
-                              <p class="text-center"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"
-                                width="{{ $mainimage.Width }}" height="{{ $mainimage.Height }}">
-                            </p>
-                            {{ end }}
-                            {{ end }}
-                          
-                          </div>
-                          <div class="col-lg-8 col-md-8 col-sm-12">
-
-                          <p class="blog-article-introduction">
-                            {{ .Summary | safeHTML}}
-                            <br />
-                            <a href="{{ .Permalink }}">{{ i18n "read_more" }}</a>
-                          </p>
-
-                          <small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
-
-                          {{ partial "widgets/spotcattags.html" . }}
-
-                          </div>   
-                        </div>
+                      {{ partial "partials/article-item.html" (dict "article" . "tags" "spotcattags") }}
                     {{ end }}
                       </div>
         
@@ -66,9 +38,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
\ No newline at end of file
diff --git a/layouts/partials/article-item.html b/layouts/partials/article-item.html
new file mode 100644
index 0000000..0827068
--- /dev/null
+++ b/layouts/partials/article-item.html
@@ -0,0 +1,18 @@
+<div class="row blog-article-item-list">
+    <h4 class="blog-article-title"><a href="{{ .Permalink }}">{{.article.Title}}</a></h4>
+    <div class="col s12 m4 l4 blog-article-image">
+        {{ if isset .article.Params "images"}}
+        {{ if (fileExists (printf "assets/%s" (index .article.Params.images 0))) -}}
+        {{ $mainimage := resources.Get (index .article.Params.images 0) }}
+        <a href="{{ .article.Permalink }}"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"></a>
+        {{ end }}
+        {{ end }}
+    </div>
+    <div class="col s12 m8 l8 blog-article-summary">
+        <p class="blog-article-introduction">
+            {{ .article.Summary | plainify}}
+            <a href="{{ .article.Permalink }}">{{ i18n "read_more" }}</a>
+        </p>
+        {{ partial (printf "partials/widgets/%s.html" .tags) .article }}
+    </div>
+</div>
diff --git a/layouts/partials/widgets/ibissidebar.html b/layouts/partials/widgets/ibissidebar.html
index ab35cef..da11bca 100644
--- a/layouts/partials/widgets/ibissidebar.html
+++ b/layouts/partials/widgets/ibissidebar.html
@@ -1,4 +1,4 @@
-<section class="col s3 text-center blogsidebar" style="border-left: 1px solid #ddd">
+<section class="col s12 m3 l3 text-center blogsidebar" style="border-left: 1px solid #ddd">
   {{ if isset .Site.Taxonomies "tagsibis" }}
   {{ if not (eq (len .Site.Taxonomies.tagsibis) 0) }}
     <div class="tags">
diff --git a/layouts/partials/widgets/spotsidebar.html b/layouts/partials/widgets/spotsidebar.html
index 001856e..2b50982 100644
--- a/layouts/partials/widgets/spotsidebar.html
+++ b/layouts/partials/widgets/spotsidebar.html
@@ -1,4 +1,4 @@
-<section class="col-sm-3 text-center blogsidebar" style="border-left: 1px solid #ddd">
+<section class="col s12 m3 l3 text-center blogsidebar" style="border-left: 1px solid #ddd">
   {{ if isset .Site.Taxonomies "tagsspot" }}
   {{ if not (eq (len .Site.Taxonomies.tagsspot) 0) }}
     <div class="tags">
@@ -29,7 +29,7 @@
   <h4 class="text-center">{{ i18n "latest_articles" }}</h4>
   {{ range . }}
 
-  <div class="col-12 article" style="text-align: center">
+  <div class="col s12 m12 l12 article" style="text-align: center">
   {{ partial "widgets/article.html" . }}
   </div>
   
diff --git a/layouts/service/single.html b/layouts/service/single.html
index 8551a85..b464c1a 100644
--- a/layouts/service/single.html
+++ b/layouts/service/single.html
@@ -10,7 +10,7 @@
   <header class="service">
     <div class="container">
       <div class="row">
-        <div class="col m9">
+        <div class="col s12 m9 l9">
           <h2>{{ .Title }}</h2>
           <p>{{ .Params.shortDescription }}</p>
         </div>
@@ -52,8 +52,6 @@
     </div>
     <!-- /#content -->
     </div>
-
     {{ partial "footer.html" . }}
-    {{ partial "scripts.html" }}
 </body>
 </html>
\ No newline at end of file
diff --git a/layouts/tagsibis/list.html b/layouts/tagsibis/list.html
index 9e5ceeb..be44c21 100644
--- a/layouts/tagsibis/list.html
+++ b/layouts/tagsibis/list.html
@@ -9,7 +9,7 @@
   <header class="blog">
     <div class="container">
       <div class="row">
-        <div class="col-md-9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/ibis"  | relLangURL }}">IBIS Blog</a></h2>
           {{ partial "widgets/categoriesibis.html" . }}
         </div>
@@ -20,40 +20,12 @@
   <div id="content">
     <div class="container">
         <div class="row">
-            <div class="col-md-9">
-                <section class="col-sm-12">
+            <div class="col s12 m9 l9">
+                <section>
                   <div class="list-group">
                     {{ $paginator := .Paginate ((where .Pages "Type" "blogibis").ByParam "LastmodDate")}}
                     {{ range $paginator.Pages }}
-                        <div class="row blog-article-item-list">
-                          <h4><a href="{{ .Permalink }}">{{.Title}}</a></h4>
-                          <div class="col-lg-4 col-md-4 col-sm-12">
-
-                            {{ if isset .Params "images"}}
-                            {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
-                            {{ $mainimage := resources.Get (index .Params.images 0) }}
-                            {{ $mainimage := $mainimage.Resize "300x" }}
-                              <p class="text-center"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"
-                                width="{{ $mainimage.Width }}" height="{{ $mainimage.Height }}">
-                              </p>
-                            {{ end }}
-                            {{ end }}
-                          
-                          </div>
-                          <div class="col-lg-8 col-md-8 col-sm-12">
-
-                          <p class="blog-article-introduction">
-                            {{ .Summary | safeHTML}}
-                            <br />
-                            <a href="{{ .Permalink }}">{{ i18n "read_more" }}</a>
-                          </p>
-
-                          <small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
-
-                          {{ partial "partials/widgets/ibiscattags.html" . }}
-
-                          </div>   
-                        </div>
+                      {{ partial "partials/article-item.html" (dict "article" . "tags" "ibiscattags") }}
                     {{ end }}
                       </div>
         
@@ -66,9 +38,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
\ No newline at end of file
diff --git a/layouts/tagsspot/list.html b/layouts/tagsspot/list.html
index 40a9d68..3381bb4 100644
--- a/layouts/tagsspot/list.html
+++ b/layouts/tagsspot/list.html
@@ -9,7 +9,7 @@
   <header class="blog">
     <div class="container">
       <div class="row">
-        <div class="col-md-9">
+        <div class="col s12 m9 l9">
           <h2><a href="{{ "blog/spot"  | relLangURL }}">SPOT Blog</a></h2>
           {{ partial "widgets/categoriesspot.html" . }}
         </div>
@@ -20,40 +20,12 @@
   <div id="content">
     <div class="container">
         <div class="row">
-            <div class="col-md-9">
-                <section class="col-sm-12">
+            <div class="col s12 m9 l9">
+                <section>
                   <div class="list-group">
                     {{ $paginator := .Paginate ((where .Pages "Type" "blogspot").ByParam "LastmodDate")}}
                     {{ range $paginator.Pages }}
-                        <div class="row blog-article-item-list">
-                          <h4><a href="{{ .Permalink }}">{{.Title}}</a></h4>
-                          <div class="col-lg-4 col-md-4 col-sm-12">
-
-                            {{ if isset .Params "images"}}
-                            {{ if (fileExists (printf "assets/%s" (index .Params.images 0))) -}}
-                            {{ $mainimage := resources.Get (index .Params.images 0) }}
-                            {{ $mainimage := $mainimage.Resize "300x" }}
-                              <p class="text-center"><img class="img-thumbnail img-fluid" src="{{ $mainimage.RelPermalink }}"
-                                width="{{ $mainimage.Width }}" height="{{ $mainimage.Height }}">
-                              </p>
-                            {{ end }}
-                            {{ end }}
-                          
-                          </div>
-                          <div class="col-lg-8 col-md-8 col-sm-12">
-
-                          <p class="blog-article-introduction">
-                            {{ .Summary | safeHTML}}
-                            <br />
-                            <a href="{{ .Permalink }}">{{ i18n "read_more" }}</a>
-                          </p>
-
-                          <small>{{ i18n "publishdate"}} : {{.PublishDate.Format "2006-01-02"}}</small> | <small>{{ i18n "lastchange"}} : {{.Lastmod.Format "2006-01-02"}}</small>
-
-                          {{ partial "partials/widgets/spotcattags.html" . }}
-
-                          </div>   
-                        </div>
+                      {{ partial "partials/article-item.html" (dict "article" . "tags" "spotcattags") }}
                     {{ end }}
                       </div>
         
@@ -66,9 +38,6 @@
     </div>
   </div>
   <!-- /#content -->
-
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
-
 </body>
 </html>
\ No newline at end of file
diff --git a/static/css/custom.css b/static/css/custom.css
index e45a41b..0704723 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -69,4 +69,13 @@
 
 footer .menu {
     border-bottom: 1px solid;
+}
+
+.blog-article-title {
+    margin-bottom: 20px;
+}
+
+.blog-article-image {
+    padding-left: 20px;
+    padding-right: 20px;
 }
\ No newline at end of file
diff --git a/static/css/styles.css b/static/css/styles.css
deleted file mode 100644
index 2dffd13..0000000
--- a/static/css/styles.css
+++ /dev/null
@@ -1,993 +0,0 @@
-@import url('https://rsms.me/inter/inter.css');
-
-html { font-family: 'Inter', sans-serif; }
-
-@supports (font-variation-settings: normal) {
-  html { font-family: 'Inter var', sans-serif; }
-}
-
-:root {
-  --font-family: 'Inter var';
-}
-
-html,
-body {
-  height: 100%;
-  color: #333;
-}
-
-body {
-  font-weight: 300;
-  padding-top: 130px;
-}
-
-a {
-  text-decoration: none;
-}
-
-.container, .container-lg, .container-md, .container-sm, .container-xl, .container-xxl {
-  max-width: 1140px;
-}
-
-@media (max-width: 767px) {
-  .h1, h1 {
-    font-size: 2rem;
-  }
-}
-
-@media (max-width: 980px) {
-  body {
-    padding-top: 84px;
-  }
-}
-
-hr {
-  max-width: 120px;
-}
-hr.colored {
-  color: #207491;
-  border-top: 4px solid #207491;
-}
-@media (min-width: 992px) {
-  hr {
-    max-width: 180px;
-  }
-}
-section.page-section {
-  padding: 50px 0;
-}
-@media (max-width: 767px) {
-  section.page-section {
-    padding: 75px 0;
-  }
-}
-::-webkit-input-placeholder {
-  font-weight: 300;
-}
-:-moz-placeholder {
-  font-weight: 300;
-}
-::-moz-placeholder {
-  font-weight: 300;
-}
-:-ms-input-placeholder {
-  font-weight: 300;
-}
-
-a {
-  color: #207491;
-  -webkit-transition: all 0.5s;
-  -moz-transition: all 0.5s;
-  transition: all 0.5s;
-}
-
-.page-link {
-  color: #207491;
-}
-
-.page-item.active .page-link {
-  background-color: #207491;
-  border-color: #207491;
-}
-
-a:hover, a:focus {
-  color: #333;
-  text-decoration: none;
-}
-p {
-  font-size: 16px;
-  line-height: 1.5;
-}
-p.lead {
-  font-size: 24px;
-  font-weight: 900;
-  text-transform: uppercase;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-weight: 900;
-}
-#mainNav {
-  background-color: #333;
-}
-
-#mainNav .navbar-brand {
-  color: white;
-  font-size: 24px;
-  line-height: 44px;
-  font-weight: 900;
-  text-transform: uppercase;
-}
-#mainNav .navbar-brand img {
-  height: 40px;
-}
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link {
-  padding-top: 15px;
-  padding-bottom: 15px;
-  color: rgba(255, 255, 255, 0.7);
-}
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link:focus, 
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link:hover {
-  color: rgba(255, 255, 255, 0.5);
-}
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link.active, 
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link.active:focus, 
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link.active:hover {
-  color: #207491;
-}
-@media (min-width: 992px) {
-  #mainNav {
-    height: auto;
-    -webkit-transition: padding-top 0.3s, padding-bottom 0.3s;
-    -moz-transition: padding-top 0.3s, padding-bottom 0.3s;
-    transition: padding-top 0.3s, padding-bottom 0.3s;
-    background-color: #333;
-  }
-  /*
-  #mainNav.navbar-shrink {
-    padding: 5px 0;
-    background-color: #333;
-  }
-  */
-  #mainNav .navbar-brand {
-    font-size: 26px;
-    line-height: 50px;
-  }
-  #mainNav .navbar-brand img {
-    height: 50px;
-    -webkit-transition: height 0.3s, height 0.3s;
-    -moz-transition: height 0.3s, height 0.3s;
-    transition: height 0.3s, height 0.3s;
-  }
-
-  #mainNav .navbar-collapse .navbar-nav > .nav-item {
-    margin-right: 5px;
-  }
-  #mainNav .navbar-collapse .navbar-nav > .nav-item:last-child {
-    margin-right: 0;
-  }
-  #mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link {
-    padding-top: 8px;
-    padding-bottom: 8px;
-  }
-  #mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link.active, 
-  #mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link.active:focus, 
-  #mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link.active:hover {
-    color: #207491;
-    border-radius: 0;
-    border-radius: 5px;
-    background-color: white;
-  }
-}
-header.masthead {
-  position: relative;
-  padding-top: 150px;
-  padding-bottom: 150px;
-  background-color: #333;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-  background-attachment: scroll;
-  background-position: center 0;
-}
-@media (min-width: 1024px) {
-  header.masthead {
-    background-attachment: fixed;
-  }
-}
-@media only screen and (min-device-width: 768px) and (max-device-width: 1366px) and (-webkit-min-device-pixel-ratio: 2) {
-  header.masthead {
-    background-attachment: scroll;
-  }
-}
-header.masthead .masthead-img {
-  max-width: 150px;
-  max-height: 150px;
-}
-header.masthead .masthead-title {
-  font-size: 3.4rem;
-  line-height: 3.4rem;
-  font-family: 'Raleway', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: 900;
-  text-transform: uppercase;
-}
-header.masthead .masthead-subtitle {
-  font-size: 1.5rem;
-  line-height: 1.5rem;
-}
-header.masthead .scroll-down {
-  position: absolute;
-  bottom: 20px;
-  width: 100%;
-  text-align: center;
-}
-header.masthead .scroll-down .btn {
-  font-size: 30px;
-  line-height: 50px;
-  width: 50px;
-  height: 50px;
-  padding: 0;
-  letter-spacing: normal;
-  color: white;
-  border: 2px solid white;
-  border-radius: 100% !important;
-  -webkit-transition: all 0.5s;
-  -moz-transition: all 0.5s;
-  transition: all 0.5s;
-}
-header.masthead .scroll-down .btn:hover {
-  color: rgba(255, 255, 255, 0.5) !important;
-  border-color: rgba(255, 255, 255, 0.5);
-  outline: none;
-}
-@media (min-width: 992px) {
-  header.masthead {
-    height: 100vh;
-    min-height: 700px;
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-  header.masthead .masthead-img {
-    max-width: 250px;
-    max-height: 250px;
-  }
-  header.masthead .masthead-title {
-    font-size: 4rem;
-    line-height: 4rem;
-  }
-  header.masthead .masthead-subtitle {
-    font-size: 2rem;
-    line-height: 2rem;
-  }
-}
-
-@media (min-width: 1024px) {
-  .call-to-action {
-    background-attachment: fixed;
-  }
-}
-@media only screen and (min-device-width: 768px) and (max-device-width: 1366px) and (-webkit-min-device-pixel-ratio: 2) {
-  .call-to-action {
-    background-attachment: scroll;
-  }
-}
-.call-to-action span.quote {
-  font-size: 30px;
-  font-weight: 300;
-  line-height: 32px;
-  display: block;
-}
-@media (min-width: 768px) {
-  .call-to-action {
-    padding: 150px 0;
-  }
-  .call-to-action span.quote {
-    font-size: 36px;
-    line-height: 38px;
-  }
-}
-@media (min-width: 992px) {
-  .call-to-action {
-    padding: 300px 0;
-  }
-  .call-to-action span.quote {
-    font-size: 40px;
-    line-height: 42px;
-  }
-}
-.services .media {
-  margin-bottom: 30px;
-}
-.services .media i.fa {
-  font-size: 30px;
-  line-height: 70px;
-  width: 75px;
-  height: 75px;
-  text-align: center;
-  border: 3px solid #333;
-}
-.services .media .media-body {
-  min-width: none;
-  padding-left: 15px;
-}
-.services .media .media-body h3 {
-  margin-bottom: 15px;
-}
-.services .media .media-body ul {
-  padding: 0;
-  list-style: inside;
-}
-.services .media .media-body ul li {
-  margin-bottom: 10px;
-}
-@media (min-width: 992px) {
-  .services .media {
-    margin-bottom: 0;
-  }
-}
-.portfolio-carousel {
-  padding: 0;
-  color: white;
-  background-color: #333;
-}
-.portfolio-carousel .item {
-  padding: 75px 30px;
-  text-align: center;
-  background-color: #333;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-}
-.portfolio-carousel .item .project-details .project-name {
-  font-size: 40px;
-  line-height: 40px;
-  display: block;
-  margin-bottom: 5px;
-  font-family: 'Raleway', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: 900;
-  text-transform: uppercase;
-}
-.portfolio-carousel .item .project-details .project-description {
-  font-size: 18px;
-  line-height: 18px;
-  display: block;
-}
-.portfolio-carousel .item .device-container {
-  padding: 25px;
-}
-@media (min-width: 768px) {
-  .portfolio-carousel .item {
-    padding: 155px 30px;
-    text-align: left;
-  }
-  .portfolio-carousel .item .project-details img.client-logo {
-    margin: 0 auto 25px 0;
-  }
-  .portfolio-carousel .item .project-details .project-name {
-    font-size: 50px;
-    line-height: 50px;
-    display: block;
-  }
-  .portfolio-carousel .item .project-details .project-description {
-    font-size: 20px;
-    line-height: 20px;
-  }
-  .portfolio-carousel .item hr.colored {
-    margin: 20px auto 20px 0;
-  }
-}
-.portfolio-gallery .item {
-  padding: 15px;
-}
-.portfolio-modal {
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-  background-attachment: scroll;
-}
-@media (min-width: 1024px) {
-  .portfolio-modal {
-    background-attachment: fixed;
-  }
-}
-@media only screen and (min-device-width: 768px) and (max-device-width: 1366px) and (-webkit-min-device-pixel-ratio: 2) {
-  .portfolio-modal {
-    background-attachment: scroll;
-  }
-}
-.portfolio-modal .modal-backdrop {
-  display: none;
-}
-.portfolio-modal .modal-dialog {
-  max-width: none;
-}
-.portfolio-modal .modal-dialog .modal-content {
-  min-height: 100%;
-  padding: 100px 0;
-  text-align: center;
-  color: white;
-  border: none;
-  border-radius: 0;
-  background: transparent;
-  background-clip: border-box;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.portfolio-modal .modal-dialog .modal-content h2 {
-    font-size: 46px;
-    margin: 0;
-}
-.portfolio-modal .modal-dialog .modal-content .item-details {
-    margin: 30px 0;
-}
-.portfolio-modal .modal-dialog .close-modal {
-  position: absolute;
-  top: 25px;
-  right: 25px;
-  width: 75px;
-  height: 75px;
-  cursor: pointer;
-  background-color: transparent;
-}
-.portfolio-modal .modal-dialog .close-modal:hover {
-  opacity: 0.3;
-}
-.portfolio-modal .modal-dialog .close-modal .lr {
-  /* Safari and Chrome */
-  z-index: 1051;
-  width: 1px;
-  height: 75px;
-  margin-left: 35px;
-  /* IE 9 */
-  -webkit-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  transform: rotate(45deg);
-  background-color: white;
-}
-.portfolio-modal .modal-dialog .close-modal .lr .rl {
-  /* Safari and Chrome */
-  z-index: 1052;
-  width: 1px;
-  height: 75px;
-  /* IE 9 */
-  -webkit-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  transform: rotate(90deg);
-  background-color: white;
-}
-
-.portfolio-grid .mix {
-  float: left;
-  overflow: hidden;
-  width: 21%;
-  margin: 1%;
-}
-.portfolio-grid .mix .portfolio-wrapper {
-  position: relative !important;
-  overflow: hidden;
-  cursor: pointer;
-}
-.portfolio-grid .mix .portfolio-wrapper img {
-  position: relative;
-  max-width: 100%;
-  -webkit-filter: grayscale(0);
-  filter: grayscale(0);
-  -webkit-transition: all 0.5s;
-  -moz-transition: all 0.5s;
-  transition: all 0.5s;
-  padding: 2px;
-}
-.portfolio-grid .mix .portfolio-wrapper img:hover {
-  -webkit-filter: grayscale(1);
-  filter: grayscale(1);
-}
-.portfolio-grid .mix .portfolio-wrapper .caption {
-  position: absolute;
-  bottom: -60px;
-  width: 100%;
-  height: 60px;
-  -webkit-transition: all 0.5s;
-  -moz-transition: all 0.5s;
-  transition: all 0.5s;
-}
-.portfolio-grid .mix .portfolio-wrapper .caption .caption-bg {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: #207491;
-}
-@media (max-width: 768px) {
-  .portfolio-grid .mix .portfolio-wrapper .caption .caption-text {
-    position: relative;
-    z-index: 500;
-    padding: 4px 5px 3px 5px;
-    color: white;
-  }
-  .portfolio-grid .mix .portfolio-wrapper .caption .caption-text a.text-title {
-    font-size: .6em;
-    color: white;
-  }
-  .portfolio-grid .mix .portfolio-wrapper .caption .caption-text .text-category {
-    font-size: .7em;
-    display: block;
-  }
-}
-@media (min-width: 768px) {
-  .portfolio-grid .mix .portfolio-wrapper .caption .caption-text {
-    position: relative;
-    z-index: 500;
-    padding: 8px 10px 8px 10px;
-    color: white;
-  }
-  .portfolio-grid .mix .portfolio-wrapper .caption .caption-text a.text-title {
-    font-size: 13px;
-    color: white;
-    font-weight: bold;
-  }
-  .portfolio-grid .mix .portfolio-wrapper .caption .caption-text .text-category {
-    font-size: 12px;
-    display: block;
-  }
-}
-.portfolio-grid .mix:hover .portfolio-wrapper .caption {
-  bottom: 0;
-}
-@media (min-width: 768px) {
-  .portfolio-grid .mix {
-    width: 21%;
-    margin: 1%;
-  }
-}
-
-footer.footer {
-  padding: 40px 0 10px;
-  color: rgba(255, 255, 255, 0.7);
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-  background-attachment: scroll;
-}
-@media (min-width: 1024px) {
-  footer.footer {
-    background-attachment: fixed;
-  }
-}
-@media only screen and (min-device-width: 768px) and (max-device-width: 1366px) and (-webkit-min-device-pixel-ratio: 2) {
-  footer.footer {
-    background-attachment: scroll;
-  }
-}
-footer.footer a {
-  color: rgba(255, 255, 255, 0.7);
-}
-footer.footer a:hover {
-  color: white;
-}
-footer.footer p {
-  font-size: 14px;
-}
-
-footer.footer .footer-social {
-  margin-bottom: 75px;
-}
-footer.footer .copyright {
-  font-size: 1rem;
-}
-.btn {
-  font-weight: 900;
-  padding: 12px 18px;
-  letter-spacing: 1px;
-  text-transform: uppercase;
-  border-radius: 0;
-}
-.btn-primary {
-  border: 1px solid white;
-  background-color: transparent;
-}
-.btn-primary:focus, .btn-primary:hover {
-  color: #207491;
-  border-color: white;
-  background-color: white;
-}
-.btn-secondary {
-  border: 1px solid #333;
-  background-color: transparent;
-  color: #333;
-}
-.btn-secondary:focus, .btn-secondary:hover,
-.btn-secondary.mixitup-control-active {
-  color: white;
-  border-color: #207491;
-  background-color: #207491;
-}
-button:hover {
-  cursor: pointer;
-}
-.btn-full-width {
-  font-size: 26px;
-  font-weight: 200;
-  padding: 50px 0;
-  letter-spacing: normal;
-  text-transform: none;
-  color: white;
-  border: 0;
-  border-radius: 0;
-  background-color: #333;
-}
-.btn-full-width:hover {
-  color: white;
-  background-color: #207491;
-}
-.btn-full-width:focus {
-  color: white;
-}
-.text-primary {
-  color: #319FBC !important;
-}
-a.text-primary {
-  color: #207491 !important;
-}
-a.text-primary:focus, a.text-primary:hover {
-  color: #17baad !important;
-}
-.bg-inverse {
-  background-color: #333 !important;
-}
-
-.space {
-  padding: 20px 0;
-}
-.fa {
-  font-size: 1.5rem;
-}
-.testimonial .media-left,
-.media .media-left {
-  width: 40px;
-  float: left;
-}
-.testimonial img,
-.media img {
-  display: block;
-  max-width: 100%;
-  height: auto;
-  padding-right: 20px;
-}
-.default-bg {
-  background-color: #333;
-  color: #fff;
-}
-.default-bg.blue {
-  background-color: #207491;
-}
-.translucent-bg {
-  color: #fff;
-}
-.default-bg h1,
-.default-bg h2,
-.default-bg h3,
-.default-bg h4,
-.default-bg h5,
-.default-bg h6,
-.translucent-bg h1,
-.translucent-bg h2,
-.translucent-bg h3,
-.translucent-bg h4,
-.translucent-bg h5,
-.translucent-bg h6 {
-  color: #fff;
-}
-.default-bg blockquote footer,
-.translucent-bg blockquote footer {
-  color: #ccc;
-}
-.default-bg a,
-.translucent-bg a {
-  color: #fff;
-  text-decoration: underline;
-}
-.default-bg a:hover,
-.translucent-bg a:hover {
-  text-decoration: none;
-}
-.translucent-bg {
-  -webkit-background-size: cover !important;
-  -moz-background-size: cover !important;
-  -o-background-size: cover !important;
-  background-size: cover !important;
-  background-position: 50% 0;
-  background-repeat: no-repeat;
-  z-index: 1;
-  position: relative;
-}
-.translucent-bg:after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 2;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.3);
-}
-.translucent-bg.blue:after {
-  background-color: rgba(32, 116, 150, 0.3);
-}
-.translucent-bg .container {
-  z-index: 3;
-  position: relative;
-  padding-top: 50px;
-}
-
-.home.masthead {
-  background: url("../img/home-header.jpg") no-repeat;
-  background-position: fixed;
-}
-
-.bg-image-1 {
-  background: url("../img/bg-image-1.jpg") no-repeat;
-}
-
-.bg-image-2 {
-  background: url("../img/bg-image-2.jpg") 50% 0px no-repeat;
-}
-.media h2 {
-  font-size: 1.3rem;
-}
-#topcontrol {
- color:#fff;
- z-index:99;
- width:30px;
- height:30px;
- font-size:20px;
- background:#333;
- position:relative;
- right:14px !important;
- bottom:11px !important;
- border-radius:10% !important;
-}
-#topcontrol:after {
- top:-2px;
- left:8px;
- content:"\f106";
- position:absolute;
- text-align:center;
- font-weight: 900;
- font-family: "Font Awesome 5 Free";
-}
-
-#topcontrol:hover {
- color:#fff;
- -webkit-transition:all 0.35s, -webkit-transform 0.35s;
- transition:all 0.35s, -webkit-transform 0.35s;
- transition:all 0.35s, transform 0.35s;
- transition:all 0.35s, transform 0.35s, -webkit-transform 0.35s;
-}
-.modal-body p {
-  text-align: left;
-}
-.modal-body .text-left {
-  font-size: .9rem;
-}
-
-#mainNav .navbar-collapse .navbar-nav > .nav-item > .nav-link {
-  font-weight: 500;
-  font-size: 1rem;
-}
-
-.footer-contact-details i {
-  margin-right: 10px;
-}
-
-p.client {
-  margin-top: 15px;
-  font-size: .9rem;
-}
-
-h3, .h3 {
-  font-size: 1.5rem;
-}
-
-#work button, .modal-dialog button, #contact button {
-	border-radius: 5px;
-  border: 2px solid #207491;
-}
-
-#services a {
-  text-decoration: none;
-}
-
-.section p.lead {
-  color: #207491;
-}
-
-.maincontent {
-  min-height: 400px;
-}
-
-header.service {
-  position: relative;
-  padding-top: 34px;
-  background-color: #fff;
-  color: #000;
-  text-align: center;
-}
-
-header.service .icon {
-  margin-right: 5px;
-  font-size: 1.2em;
-}
-
-.service-page {
-  color: #ddd;
-}
-
-header h4 {
-  color: #333;
-}
-
-.service-projects-clients .mix {
-  margin-bottom: 30px;
-}
-
-.service-projects-clients .mix {
-  cursor: pointer;
-}
-
-.service-projects-clients ul {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-.service-projects-clients ul li {
-    list-style-type: none;
-}
-
-div.technologies {
-  margin-top: 20px;
-  margin-bottom: 10px;  
-}
-
-div.applications {
-  margin-top: 10px;
-  margin-bottom: 10px;  
-}
-
-.h1, h1 {
-  font-size: 1.3rem;
-}
-
-.h2, h2 {
-  font-size: 1.2rem;
-  color: #333;
-}
-
-.h3, h3 {
-  font-size: 1.1rem;
-}
-
-.h4, h4 {
-  font-size: 1rem;
-}
-
-.h5, h5 {
-  font-size: 0.9rem;
-}
-
-.fa-2x {
-  font-size: 1.5em;
-}
-
-.row {
-  margin-right: 0;
-  margin-left: 0;
-}
-
-.blog-article-item-list {
-  margin-bottom: 20px;
-}
-
-#blog-subtitle {
-  text-transform: none;
-  font-style: italic;
-  font-weight: 700;
-}
-
-.highlight > pre {
-  padding: 20px;
-}
-
-figure.img-fluid img {
-  width: 100%;
-}
-
-article blockquote {
-  background: #f9f9f9;
-  border-left: 10px solid #ccc;
-  margin: 1.5em 10px;
-  padding: 1em 10px .1em 10px;
-  quotes: "\201C""\201D""\2018""\2019";
-}
-
-.recommended-tool {
-  margin-top: 30px;
-  border-bottom: 1px solid #dee2e6;
-}
-
-.recommended-tool p {
-  font-size: 15px;
-}
-
-.blog-article-item-list h4 {
-  text-align: center;
-}
-
-header.blog {
-  position: relative;
-  padding-top: 34px;
-  background-color: #fff;
-  color: #000;
-  text-align: center;
-  margin-bottom: 30px;
-}
-
-header.blog-single {
-  position: relative;
-  padding-top: 34px;
-  background-color: #fff;
-  color: #000;
-  text-align: center;
-}
-
-header.blog-single .title {
-  margin-top: 20px;
-}
-
-.blogsidebar .articles {
-  margin-top: 20px;
-}
-
-.blogsidebar .article, .servicesidebar .article {
-  margin-bottom: 20px;
-}
-
-.img-content.text-center img {
-  max-width: 100%;
-  height: auto;
-}
-
-.footer-menu {
-  margin-bottom: 30px;
-  border-bottom: 1px solid;
-  color: rgba(255, 255, 255, 0.7);
-}
-
-.footer-menu h4 {
-  min-height: 40px;
-}
-
-.footer-menu ul {
-  list-style: none;
-  padding-left: 0;
-}
-
-.footer-title {
-  font-size: 1rem;
-  font-weight: 900;
-}
-
-@media (min-width: 992px) {
-  .img-content.text-center img {
-    max-width: 400px;
-    height: auto;
-  }
-}
diff --git a/themes/lean/layouts/index.html b/themes/lean/layouts/index.html
index ca2a4d1..7f94d82 100644
--- a/themes/lean/layouts/index.html
+++ b/themes/lean/layouts/index.html
@@ -20,7 +20,5 @@
   {{ partial "home-bottom.html" . }}
   </div>
   {{ partial "footer.html" . }}
-  {{ partial "scripts.html" }}
 </body>
-
 </html>
\ No newline at end of file
diff --git a/themes/lean/layouts/partials/analytics.html b/themes/lean/layouts/partials/analytics.html
index b8d304e..89fc92b 100644
--- a/themes/lean/layouts/partials/analytics.html
+++ b/themes/lean/layouts/partials/analytics.html
@@ -1,5 +1,5 @@
 <!-- Matomo -->
-<script>
+<script type="text/javascript" async>
     var _paq = window._paq = window._paq || [];
     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
     _paq.push(['trackPageView']);
diff --git a/themes/lean/layouts/partials/footer.html b/themes/lean/layouts/partials/footer.html
index 07531ab..f2ff744 100644
--- a/themes/lean/layouts/partials/footer.html
+++ b/themes/lean/layouts/partials/footer.html
@@ -29,5 +29,4 @@
         </div>
 </footer>
 
-{{ partial "analytics.html" . }}
 
diff --git a/themes/lean/layouts/partials/head.html b/themes/lean/layouts/partials/head.html
index 23ef7d3..182b95e 100644
--- a/themes/lean/layouts/partials/head.html
+++ b/themes/lean/layouts/partials/head.html
@@ -40,5 +40,8 @@
 
   {{ partial "opengraph.html" . }}
 
-  {{ partial "scripts.html" . }}
+  <script src="/js/htmx/htmx.min.js" defer></script>
+  <script src="/js/main.js" defer></script>
+
+  {{ partial "analytics.html" . }}
 </head>
diff --git a/themes/lean/layouts/partials/pagination.html b/themes/lean/layouts/partials/pagination.html
index bcd48b3..ce93cf3 100644
--- a/themes/lean/layouts/partials/pagination.html
+++ b/themes/lean/layouts/partials/pagination.html
@@ -23,15 +23,13 @@
   {{- end }}
 {{- end }}
 
-{{- $alignments := (dict "left" "" "center" "justify-content-center" "end" "justify-content-end") }}
-
 {{- if not (in $validFormats $format) }}
     {{- errorf $msg2 (delimit $validFormats ", ") }}
 {{- else if not (in $validFormats $format) }}
     {{- errorf $msg3 (delimit $validAlignments ", ") }}
 {{- else }}
     {{- if gt $page.Paginator.TotalPages 1 }}
-    <ul class="pagination {{ index $alignments $align }} pagination-{{ $format }}">
+    <ul class="pagination pagination-{{ $format }}">
       {{- partial (printf "partials/pagination/%s" $format) $page }}
     </ul>
   {{- end }}
diff --git a/themes/lean/layouts/partials/scripts.html b/themes/lean/layouts/partials/scripts.html
deleted file mode 100644
index 934e82d..0000000
--- a/themes/lean/layouts/partials/scripts.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<script src="/js/htmx/htmx.min.js"></script>
-<script src="/js/main.js"></script>
\ No newline at end of file
diff --git a/themes/lean/static/css/main.css b/themes/lean/static/css/main.css
index 5805a85..596e1d6 100644
--- a/themes/lean/static/css/main.css
+++ b/themes/lean/static/css/main.css
@@ -264,130 +264,135 @@ body {
     align-items: center;
     justify-content: flex-end;
     flex-grow: 1;
-    
-    ul {
-        list-style: none;
-    }
-    
-    ul li {
-        display: block;
-        float: left;
-        padding: 1rem;
-        position: relative;
-        text-decoration: none;
-        transition-duration: 0.5s;
-        font-weight: 500;
-    }
+}
 
-    ul li.dropdown:after {
-        content: "\25BE";
-        margin-left: 5px;
-        color: #fff;
-    }
+#responsive-button {
+    display: none;
+    margin: 0;
+    padding: 0;
+    width: 32px;
+    height: 32px;
+    cursor: pointer
+}
 
-    ul.submenu {
-        background-color: #fff;
-        background-clip: padding-box;
-        border: 1px solid rgba(0,0,0,.15);
-        border-radius: .25rem;
-        visibility: hidden;
-        opacity: 0;
-        min-width: 5rem;
-        position: absolute;
-        transition: all 0.5s ease;
-        margin-top: 1rem;
-        left: 0;
-        display: none;
-        z-index: 2000;
-        padding: 0px;
-    }
+#topmenu ul {
+    list-style: none;
+}
 
-    ul.submenu li {
-        clear: both;
-        width: 100%;
-        padding: 0.25rem;
-        text-align: left;
-        white-space: nowrap;
-        background-color: transparent;
-        border: 0;
-        padding: 5px 10px;
-    }
-    
-    ul li ul li:hover {
-        background-color: #ccc;
-    }
+#topmenu ul li {
+    display: block;
+    float: left;
+    padding: 1rem;
+    position: relative;
+    text-decoration: none;
+    transition-duration: 0.5s;
+    font-weight: 500;
+}
 
-    ul li ul a {
-        color: var(--dark-color);
-    }
+#topmenu ul li.dropdown:after {
+    content: "\25BE";
+    margin-left: 5px;
+    color: #fff;
+}
 
-    :is(ul li:hover > ul, li:focus-within > ul, ul li ul:hover, ul li ul:focus) {
-        visibility: visible;
-        opacity: 1;
-        display: block;
-    }
+#topmenu ul.submenu {
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid rgba(0,0,0,.15);
+    border-radius: .25rem;
+    visibility: hidden;
+    opacity: 0;
+    min-width: 5rem;
+    position: absolute;
+    transition: all 0.5s ease;
+    margin-top: 1rem;
+    left: 0;
+    display: none;
+    z-index: 2000;
+    padding: 0px;
+}
 
-    #responsive-button {
-        display: none;
-        margin: 0;
-        padding: 0;
-        width: 32px;
-        height: 32px;
-        cursor: pointer
-    }
+#topmenu ul.submenu li {
+    clear: both;
+    width: 100%;
+    padding: 0.25rem;
+    text-align: left;
+    white-space: nowrap;
+    background-color: transparent;
+    border: 0;
+    padding: 5px 10px;
+}
+
+#topmenu ul li ul li:hover {
+    background-color: #ccc;
+}
+
+#topmenu ul li ul a {
+    color: var(--dark-color);
+}
+
+#topmenu :is(ul li:hover > ul, li:focus-within > ul, ul li ul:hover, ul li ul:focus) {
+    visibility: visible;
+    opacity: 1;
+    display: block;
 }
 
 @media screen and (max-width: 992px) {
     body {
         padding-top: 60px;
-    };
+    }
+
+    #responsive-button {
+        display: block;
+    }
 
     #topmenu {
         position:relative;
-        #responsive-button {
-            display: block;
-        }
-        ul {
-            background:var(--dark-color);
-            position:absolute;
-            z-index:3;
-            height:auto;
-            display:none;
-            top: 45px;
-            right: -10px;
-            flex-direction: column;
-            border-bottom-left-radius: 10px;
-            padding-left:0;
-        }
-
-        ul li {
-          padding-top:4px;
-          padding-bottom: 4px;
-        }
-
-        ul li.dropdown:after {
-            content: none;
-        }
-        ul.submenu {
-            width:100%; 
-            position:static;
-            background: var(--dark-color);
-            color: #fff;
-            padding-top:4px;
-            padding-bottom: 4px;
-            margin-top:0;
-            margin-bottom:0;
-        }
-        ul.submenu li a{
-            color: #fff;
-        }
-        li {display:block;float:left;width:auto;}
-
-        :is(ul li:hover > ul, li:focus-within > ul, ul li ul:hover, ul li ul:focus) {
-            display: flex;
-        }
-
     }
+
+    #topmenu ul {
+        background:var(--dark-color);
+        position:absolute;
+        z-index:3;
+        height:auto;
+        display:none;
+        top: 45px;
+        right: -30px;
+        flex-direction: column;
+        border-bottom-left-radius: 10px;
+        padding-left:0;
+    }
+
+    #topmenu ul li {
+        padding-top:4px;
+        padding-bottom: 4px;
+    }
+
+    #topmenu ul li.dropdown:after {
+        content: none;
+    }
+
+    #topmenu ul.submenu {
+        width:100%;
+        position:static;
+        background: var(--dark-color);
+        color: #fff;
+        padding-top:4px;
+        padding-bottom: 4px;
+        margin-top:0;
+        margin-bottom:0;
+    }
+
+    #topmenu ul.submenu li a{
+        color: #fff;
+    }
+
+    #topmenu li {display:block;float:left;width:auto;}
+
+    #topmenu :is(ul li:hover > ul, li:focus-within > ul, ul li ul:hover, ul li ul:focus) {
+        display: flex;
+    }
+
     #topmenu.responsive ul {display: flex;visibility: visible; opacity: 1; margin-top:0}
     #topmenu.responsive ul>li>ul.submenu>li {visibility: visible; display:block;}
 }
@@ -426,6 +431,22 @@ body {
     }
 }
 
+header {
+    margin-bottom: 30px;
+}
+
+header .col {
+    text-align: center;
+}
+
+.list-group .row {
+    margin-bottom: 20px;
+}
+
+.list-group .row h4 {
+    text-align: center
+}
+
 footer {
     background-color: var(--dark-color);
     color: rgba(255, 255, 255, 0.7);
@@ -438,6 +459,70 @@ footer {
     }
 }
 
+.img-fluid {
+    max-width: 100%
+}
+
+.text-center {
+    text-align: center;
+}
+
+ul.pagination {
+    list-style-type: none;
+    display: flex;
+    justify-content: center;
+}
+
+link {
+    border-top-left-radius: .25rem;
+    border-bottom-left-radius: .25rem;
+}
+.page-item.disabled .page-link {
+    color: #6c757d;
+    pointer-events: none;
+    background-color: #fff;
+    border-color: #dee2e6;
+}
+
+.page-link {
+    position: relative;
+    display: block;
+    color: #207491;
+    padding: .375rem .75rem;
+    text-decoration: none;
+    background-color: #fff;
+    border: 1px solid #dee2e6;
+    transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
+
+.page-item.active .page-link {
+    background-color: #207491;
+    border-color: #207491;
+    color: #fff;
+}
+
+.page-item:not(:first-child) .page-link {
+    margin-left: -1px;
+}
+
+.page-item:first-child .page-link {
+    border-top-left-radius: .25rem;
+    border-bottom-left-radius: .25rem;
+}
+
+.page-item:last-child .page-link {
+    border-top-right-radius: .25rem;
+    border-bottom-right-radius: .25rem;
+}
+
+.blogsidebar {
+    margin-bottom: 20px;
+}
+
+.blogsidebar .tags {
+    margin-bottom: 20px;
+}
+
 /* Extra small */
 @media (max-width: 576px) {
     .table-all.responsive table,
@@ -680,7 +765,7 @@ footer {
         display: block !important;
     }
 
-    .row > .half:first {
+    .row > .half:first-child {
         padding-right: 4px;
     }
 
@@ -690,7 +775,7 @@ footer {
 }
 
 @media (max-width: 1140px) {
-    #page-content .container, footer .container {
+    .container {
         padding-left: 20px;
         padding-right: 20px;
     }