diff --git a/assets/scss/main.scss b/assets/scss/main.scss
deleted file mode 100644
index 66c036c7b..000000000
--- a/assets/scss/main.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-@import "support/functions";
-@import "variables_project";
-@import "variables";
-@import "support/mixins";
-
-@import "../vendor/bootstrap/scss/bootstrap";
-
-@import "../vendor/Font-Awesome//web-fonts-with-css/scss/fontawesome.scss";
-@import "../vendor/Font-Awesome//web-fonts-with-css/scss/fa-solid.scss";
-@import "../vendor/Font-Awesome//web-fonts-with-css/scss/fa-brands.scss";
-
-@import "support/utilities";
-@import "colors";
-@import "boxes";
-@import "blog";
-@import "code";
-@import "nav";
-@import "sidebar-tree";
-@import "sidebar-toc";
-@import "buttons";
-@import "breadcrumb";
-@import "alerts";
-@import "content";
-@import "search";
-@import "main-container";
-@import "blocks/blocks";
-
-@if $td-enable-google-fonts {
-    @import url($web-font-path);
-}
-
-footer {
-    min-height: 150px;
-
-    @include media-breakpoint-down(md) {
-         min-height: 200px;
-    }
-}
-
-// Adjust anchors vs the fixed menu.
-@include media-breakpoint-up(md) {
-    .td-offset-anchor:target {
-        display: block;
-        position: relative;
-        top: -4rem;
-        visibility: hidden;
-    }
-
-    h2[id]:before, h3[id]:before, h4[id]:before, h5[id]:before {
-        display: block;
-        content: " ";
-        margin-top: -5rem;
-        height: 5rem;
-        visibility: hidden;
-    }
-}
-
-@import "styles_project";
diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html
deleted file mode 100644
index 5d590ee41..000000000
--- a/layouts/partials/page-meta-links.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ if .Path }}
-{{ $gh_repo := ($.Param "github_repo") }}
-{{ if $gh_repo }}
-<div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-{{ $editURL := printf "%s/edit/master/content/%s" $gh_repo .Path }}
-{{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (htmlEscape $.Title )}}
-<a href="{{ $editURL }}" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
-<a href="{{ $issuesURL }}" target="_blank" rel="noopener"><i class="fab fa-github fa-fw"></i> {{ T "post_create_issue" }}</a>
-</div>
-{{ end }}
-{{ end }}
diff --git a/themes/docsy/assets/scss/_styles_project.scss b/themes/docsy/assets/scss/_styles_project.scss
new file mode 100644
index 000000000..ab68a8844
--- /dev/null
+++ b/themes/docsy/assets/scss/_styles_project.scss
@@ -0,0 +1,7 @@
+/*
+
+Nothing defined here. The Hugo project that uses this theme can override Bootstrap by adding a file to:
+
+assets/scss/_styles_project.scss
+
+*/
diff --git a/themes/docsy/assets/scss/_variables_project.scss b/themes/docsy/assets/scss/_variables_project.scss
index 69ee04629..387082dca 100644
--- a/themes/docsy/assets/scss/_variables_project.scss
+++ b/themes/docsy/assets/scss/_variables_project.scss
@@ -1,7 +1,7 @@
 /*
 
-Nothing defined here. The Hugo project that uses this theme can override Bootstrap and theme variables by adding a file to:
+Nothing defined here. The Hugo project that uses this theme can override theme variables by adding a file to:
 
 assets/scss/_variables_project.scss
 
-*/
\ No newline at end of file
+*/
diff --git a/themes/docsy/assets/scss/main.scss b/themes/docsy/assets/scss/main.scss
index 909935b4d..66c036c7b 100644
--- a/themes/docsy/assets/scss/main.scss
+++ b/themes/docsy/assets/scss/main.scss
@@ -53,4 +53,6 @@ footer {
         height: 5rem;
         visibility: hidden;
     }
-}
\ No newline at end of file
+}
+
+@import "styles_project";
diff --git a/themes/docsy/layouts/partials/page-meta-links.html b/themes/docsy/layouts/partials/page-meta-links.html
index b8e0925b5..0f18b1e37 100644
--- a/themes/docsy/layouts/partials/page-meta-links.html
+++ b/themes/docsy/layouts/partials/page-meta-links.html
@@ -2,7 +2,10 @@
 {{ $gh_repo := ($.Param "github_repo") }}
 {{ if $gh_repo }}
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-{{ $editURL := printf "%s/edit/master/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }}
+{{ $editURL := printf "%s/edit/master/content/%s" $gh_repo .Path }}
+{{ if .Site.IsMultiLingual }}
+{{ $editURL = printf "%s/edit/master/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }}
+{{ end }}
 {{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (htmlEscape $.Title )}}
 <a href="{{ $editURL }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
 <a href="{{ $issuesURL }}" target="_blank"><i class="fab fa-github fa-fw"></i> {{ T "post_create_issue" }}</a>
diff --git a/themes/docsy/static/favicons/android-144x144.png b/themes/docsy/static/favicons/android-144x144.png
old mode 100644
new mode 100755
index b65a18405..8851c09a4
Binary files a/themes/docsy/static/favicons/android-144x144.png and b/themes/docsy/static/favicons/android-144x144.png differ
diff --git a/themes/docsy/static/favicons/android-192x192.png b/themes/docsy/static/favicons/android-192x192.png
old mode 100644
new mode 100755
index 6cbdc25ec..94b2ad2db
Binary files a/themes/docsy/static/favicons/android-192x192.png and b/themes/docsy/static/favicons/android-192x192.png differ
diff --git a/themes/docsy/static/favicons/android-36x36.png b/themes/docsy/static/favicons/android-36x36.png
old mode 100644
new mode 100755
index 3321febae..7ec5cf650
Binary files a/themes/docsy/static/favicons/android-36x36.png and b/themes/docsy/static/favicons/android-36x36.png differ
diff --git a/themes/docsy/static/favicons/android-48x48.png b/themes/docsy/static/favicons/android-48x48.png
old mode 100644
new mode 100755
index 0e93c9e56..419a445ad
Binary files a/themes/docsy/static/favicons/android-48x48.png and b/themes/docsy/static/favicons/android-48x48.png differ
diff --git a/themes/docsy/static/favicons/android-72x72.png b/themes/docsy/static/favicons/android-72x72.png
old mode 100644
new mode 100755
index fdc0453d3..230b18fd5
Binary files a/themes/docsy/static/favicons/android-72x72.png and b/themes/docsy/static/favicons/android-72x72.png differ
diff --git a/themes/docsy/static/favicons/android-96x196.png b/themes/docsy/static/favicons/android-96x196.png
old mode 100644
new mode 100755
index 997d5e35a..8cc698973
Binary files a/themes/docsy/static/favicons/android-96x196.png and b/themes/docsy/static/favicons/android-96x196.png differ
diff --git a/themes/docsy/static/favicons/apple-touch-icon-180x180.png b/themes/docsy/static/favicons/apple-touch-icon-180x180.png
old mode 100644
new mode 100755
index 0d2d95cbf..03d0b5134
Binary files a/themes/docsy/static/favicons/apple-touch-icon-180x180.png and b/themes/docsy/static/favicons/apple-touch-icon-180x180.png differ
diff --git a/themes/docsy/static/favicons/favicon-1024.png b/themes/docsy/static/favicons/favicon-1024.png
index c65839bbe..920f10720 100644
Binary files a/themes/docsy/static/favicons/favicon-1024.png and b/themes/docsy/static/favicons/favicon-1024.png differ
diff --git a/themes/docsy/static/favicons/favicon-16x16.png b/themes/docsy/static/favicons/favicon-16x16.png
old mode 100644
new mode 100755
index dfbcd7a07..ce918ee3a
Binary files a/themes/docsy/static/favicons/favicon-16x16.png and b/themes/docsy/static/favicons/favicon-16x16.png differ
diff --git a/themes/docsy/static/favicons/favicon-256.png b/themes/docsy/static/favicons/favicon-256.png
index 944522e18..ebd3f8c98 100644
Binary files a/themes/docsy/static/favicons/favicon-256.png and b/themes/docsy/static/favicons/favicon-256.png differ
diff --git a/themes/docsy/static/favicons/favicon-32x32.png b/themes/docsy/static/favicons/favicon-32x32.png
old mode 100644
new mode 100755
index 58b2ce3f3..e95c80ad6
Binary files a/themes/docsy/static/favicons/favicon-32x32.png and b/themes/docsy/static/favicons/favicon-32x32.png differ
diff --git a/themes/docsy/static/favicons/favicon.ico b/themes/docsy/static/favicons/favicon.ico
old mode 100644
new mode 100755
index 1275d6996..216330ff2
Binary files a/themes/docsy/static/favicons/favicon.ico and b/themes/docsy/static/favicons/favicon.ico differ
diff --git a/themes/docsy/static/favicons/pwa-192x192.png b/themes/docsy/static/favicons/pwa-192x192.png
old mode 100644
new mode 100755
index 6cbdc25ec..94b2ad2db
Binary files a/themes/docsy/static/favicons/pwa-192x192.png and b/themes/docsy/static/favicons/pwa-192x192.png differ
diff --git a/themes/docsy/static/favicons/pwa-512x512.png b/themes/docsy/static/favicons/pwa-512x512.png
old mode 100644
new mode 100755
index 384c8b603..89258a4e6
Binary files a/themes/docsy/static/favicons/pwa-512x512.png and b/themes/docsy/static/favicons/pwa-512x512.png differ
diff --git a/themes/docsy/static/favicons/tile150x150.png b/themes/docsy/static/favicons/tile150x150.png
old mode 100644
new mode 100755
index 53ff09748..3d0c7604e
Binary files a/themes/docsy/static/favicons/tile150x150.png and b/themes/docsy/static/favicons/tile150x150.png differ
diff --git a/themes/docsy/static/favicons/tile310x150.png b/themes/docsy/static/favicons/tile310x150.png
old mode 100644
new mode 100755
index 104925c6d..ed8904286
Binary files a/themes/docsy/static/favicons/tile310x150.png and b/themes/docsy/static/favicons/tile310x150.png differ
diff --git a/themes/docsy/static/favicons/tile310x310.png b/themes/docsy/static/favicons/tile310x310.png
old mode 100644
new mode 100755
index 267f13ec8..67172b306
Binary files a/themes/docsy/static/favicons/tile310x310.png and b/themes/docsy/static/favicons/tile310x310.png differ
diff --git a/themes/docsy/static/favicons/tile70x70.png b/themes/docsy/static/favicons/tile70x70.png
old mode 100644
new mode 100755
index 1894ab4d6..31413a2be
Binary files a/themes/docsy/static/favicons/tile70x70.png and b/themes/docsy/static/favicons/tile70x70.png differ