diff --git a/Gemfile b/Gemfile
index fb73f9ac8d..87f042e6a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem "middleman-syntax"
 
 ## Template engines
 gem "builder"
-gem "haml", "~> 5.2.2"
+gem "haml", "~> 6.3"
 gem "kramdown"
 
 # Rake tasks
diff --git a/Gemfile.lock b/Gemfile.lock
index 77ae92d73b..bb09858cce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,8 +106,9 @@ GEM
     ffi (1.17.1)
     ffi (1.17.1-arm64-darwin)
     ffi (1.17.1-x86_64-linux-gnu)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     haml_lint (0.59.0)
       haml (>= 5.0)
@@ -247,7 +248,7 @@ PLATFORMS
 DEPENDENCIES
   builder
   faraday-retry (~> 2.2)
-  haml (~> 5.2.2)
+  haml (~> 6.3)
   haml_lint (~> 0.59)
   irb
   kramdown
diff --git a/source/contributors.html.haml b/source/contributors.html.haml
index 638be3943e..03909a70c7 100644
--- a/source/contributors.html.haml
+++ b/source/contributors.html.haml
@@ -48,7 +48,7 @@ title: Contributors
       - data.contributors.each do |c|
         %span.contributor
           = link_to c[:name], c[:href], title: "#{pluralize(c[:commits], "commit")}"
-          = " • " unless c == data.contributors.last
+          != " • " unless c == data.contributors.last
       %br
       %p
         …and everyone who has given time, effort, thought, or help, instead of git commits <3
diff --git a/source/layouts/base.haml b/source/layouts/base.haml
index 9b431036ab..2569dffb02 100644
--- a/source/layouts/base.haml
+++ b/source/layouts/base.haml
@@ -30,7 +30,5 @@
 
     ~ yield
 
-    = yield_content :tail
-
     .footer
       = partial 'layouts/footer'
diff --git a/source/layouts/two_column_layout.haml b/source/layouts/two_column_layout.haml
index ef8a224d74..c9902eaf19 100644
--- a/source/layouts/two_column_layout.haml
+++ b/source/layouts/two_column_layout.haml
@@ -5,18 +5,8 @@
   - content_for(:canonical, commands_toplevel_path(current_page.destination_path))
 
 ~ wrap_layout :base do
-  - content_for :tail do
-    .bg-light-blue
-      .container
-        .contents
-          .edit-on-github.text-center
-            = link_to_editable_version
+  = partial 'partials/docs_header'
 
-  .bg-light-blue.header
-    = image_tag '/images/docs_header_transparent_bg.png',
-                srcset: '/images/docs_header_transparent_bg.png 1x, /images/docs_header_transparent_bg@2x.png 2x, /images/docs_header_transparent_bg@3x.png 3x',
-                class: 'img-fluid header-padding',
-                style: 'max-width: 400px;'
   .container
     .row.flex-column.flex-md-row-reverse
       .col-12.col-md-9.contents#page-content-wrapper{ class: is_command ? "commands" : "guide" }
@@ -29,3 +19,9 @@
             = partial 'partials/guides_sidebar'
 
   = javascript_include_tag 'two_column_layout.min'
+
+  .bg-light-blue
+    .container
+      .contents
+        .edit-on-github.text-center
+          = link_to_editable_version
diff --git a/source/localizable/index.html.haml b/source/localizable/index.html.haml
index c6fa547df2..801f0ece59 100644
--- a/source/localizable/index.html.haml
+++ b/source/localizable/index.html.haml
@@ -9,7 +9,7 @@
 .container.py-5
   .mx-xl-5.px-xl-5.my-4.large-font
     %p= t('home.bundler_info1')
-    %p= t('home.bundler_info2')
+    %p!= t('home.bundler_info2')
 
   .d-grid.d-md-flex.gap-2.mx-auto.my-md-4.justify-content-md-center
     = link_to t('home.what_can_bundler_do'), "/guides/getting_started.html#getting-started", class: 'btn btn-primary btn-lg'
diff --git a/source/partials/_docs_header.haml b/source/partials/_docs_header.haml
new file mode 100644
index 0000000000..c9146b3972
--- /dev/null
+++ b/source/partials/_docs_header.haml
@@ -0,0 +1,5 @@
+.bg-light-blue.header
+  = image_tag '/images/docs_header_transparent_bg.png',
+              srcset: '/images/docs_header_transparent_bg.png 1x, /images/docs_header_transparent_bg@2x.png 2x, /images/docs_header_transparent_bg@3x.png 3x',
+              class: 'img-fluid header-padding',
+              style: 'max-width: 400px;'