diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000000..047aba690d0
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,53 @@
+
+remote_theme: pmarsceill/just-the-docs
+
+# GitHub uses it's own markdown renderer.
+# We use this in order to try and have the docs pages match ones in the repo.
+markdown: CommonMarkGhPages
+
+# Plugins:
+#  jekyll-commonmark-ghpages -- This is needed in order to use CommonMarkGhPages
+#  jemoji                    -- For rendering emoji like :point_right:
+plugins:
+  - jekyll-commonmark-ghpages
+  - jekyll-remote-theme
+  - jemoji
+
+commonmark:
+  options: ["SMART", "FOOTNOTES"]
+  extensions: ["strikethrough", "autolink", "table", "tagfilter"]
+
+title: ICU Documentation
+description: ICU Documentation
+
+baseurl: "/icu" # the subpath for the site
+url: "https://jefgen.github.io" # the base hostname & protocol for your site
+
+search_enabled: true
+
+# Color scheme currently only supports "dark" or nil (default)
+color_scheme: nil
+
+# Aux links for the upper right navigation
+aux_links:
+  "ICU on GitHub":
+    - "//github.com/jefgen/icu"
+
+# Back to top link
+back_to_top: true
+back_to_top_text: "Back to top"
+
+# Enable heading anchors
+heading_anchors: true
+
+# Footer content 
+# appears at the bottom of every page's main content
+footer_content: "Copyright &copy; 2016 and later Unicode, Inc. and others. All Rights Reserved. <a href=\"http://www.unicode.org/copyright.html\">Terms of use and License</a>."
+
+# TODO: I think this would be better at the top of the page, but I'm not sure how to do that.
+# Footer "Edit this page on GitHub" link text
+gh_edit_link: true # show or hide edit this page link
+gh_edit_link_text: "Edit this page on GitHub."
+gh_edit_repository: "https://github.com/jefgen/icu" # the github URL for your repo
+gh_edit_branch: "master" # the branch that your docs is served from
+gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into the editor immediately
diff --git a/docs/index.md b/docs/index.md
index ed2a355ac49..2c3fafb5c3d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,3 +1,11 @@
+---
+layout: default
+title: ICU Documentation
+nav_order: 1
+description: ICU Documentation
+permalink: /
+---
+
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
@@ -9,7 +17,7 @@ License & terms of use: http://www.unicode.org/copyright.html
 
 ## ICU User Guide
 
-The [ICU User Guide](./userguide/) provides information on i18n topics for which ICU has services, and
+The [ICU User Guide](./userguideintro) provides information on i18n topics for which ICU has services, and
 includes details that go beyond the C, C++, and Java API docs (and avoids some duplication between them).
 
 This is the new home of the User Guide (since 2020 August).
diff --git a/docs/userguide/conversion/compression.md b/docs/userguide/conversion/compression.md
index 9922baa5f37..d8a83887b0a 100644
--- a/docs/userguide/conversion/compression.md
+++ b/docs/userguide/conversion/compression.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Compression
+permalink: /conversion/compression
+nav_order: 4
+parent: Conversion
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/conversion/converters.md b/docs/userguide/conversion/converters.md
index 10c5731405c..a9c99a40798 100644
--- a/docs/userguide/conversion/converters.md
+++ b/docs/userguide/conversion/converters.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Converter
+permalink: /conversion/converter
+nav_order: 4
+parent: Conversion
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/conversion/data.md b/docs/userguide/conversion/data.md
index ed31a2c9a07..31ff617b7b9 100644
--- a/docs/userguide/conversion/data.md
+++ b/docs/userguide/conversion/data.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Conversion Data
+permalink: /conversion/data
+nav_order: 4
+parent: Conversion
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/conversion/detection.md b/docs/userguide/conversion/detection.md
index 5e2abf54ecb..03853037265 100644
--- a/docs/userguide/conversion/detection.md
+++ b/docs/userguide/conversion/detection.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: CharSet Detection
+permalink: /conversion/detection
+nav_order: 4
+parent: Conversion
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/conversion/index.md b/docs/userguide/conversion/index.md
index 06838c32dc7..564d64eb8e8 100644
--- a/docs/userguide/conversion/index.md
+++ b/docs/userguide/conversion/index.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Conversion
+permalink: /conversion
+nav_order: 4
+has_children: true
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/design.md b/docs/userguide/design.md
index 536b12c99f3..217a7d5cb45 100644
--- a/docs/userguide/design.md
+++ b/docs/userguide/design.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: ICU Design
+permalink: /design
+nav_order: 5
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/glossary.md b/docs/userguide/glossary.md
index bf810dec7e7..871cf4acd30 100644
--- a/docs/userguide/glossary.md
+++ b/docs/userguide/glossary.md
@@ -1,3 +1,9 @@
+---
+layout: default
+title: Glossary
+permalink: /glossary
+nav_order: 9000
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/howtouseicu.md b/docs/userguide/howtouseicu.md
index 46270eec9b1..06d9c0bec72 100644
--- a/docs/userguide/howtouseicu.md
+++ b/docs/userguide/howtouseicu.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: How To Use ICU
+permalink: /howtouseicu
+nav_order: 2
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/i18n.md b/docs/userguide/i18n.md
index f21e7160be5..ea3b2a6e69e 100644
--- a/docs/userguide/i18n.md
+++ b/docs/userguide/i18n.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Internationalization
+permalink: /i18n
+nav_order: 1
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/icu4j-locale-service-provider.md b/docs/userguide/icu4j-locale-service-provider.md
index 7d327983f1c..2d56d229566 100644
--- a/docs/userguide/icu4j-locale-service-provider.md
+++ b/docs/userguide/icu4j-locale-service-provider.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: ICU4J Locale Service Provider
+permalink: /icu4j-locale-service-provider
+nav_order: 7
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/index.md b/docs/userguide/index.md
index a37be87047c..af9147f52ef 100644
--- a/docs/userguide/index.md
+++ b/docs/userguide/index.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Introduction
+permalink: /userguideintro
+nav_order: 2
+has_children: true
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/posix.md b/docs/userguide/posix.md
index 4a332f96460..3d5c033ad70 100644
--- a/docs/userguide/posix.md
+++ b/docs/userguide/posix.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: C/POSIX Migration
+permalink: /posix
+nav_order: 6
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/services.md b/docs/userguide/services.md
index ca46fc6c283..cc5b6e5bdf9 100644
--- a/docs/userguide/services.md
+++ b/docs/userguide/services.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: ICU Services
+permalink: /services
+nav_order: 4
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/characteriterator.md b/docs/userguide/strings/characteriterator.md
index e53b6276a8d..5144d2f76b7 100644
--- a/docs/userguide/strings/characteriterator.md
+++ b/docs/userguide/strings/characteriterator.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: CharacterIterator
+permalink: /characteriterator
+nav_order: 3
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/index.md b/docs/userguide/strings/index.md
index 12ceed4e88f..204a2a8a9fb 100644
--- a/docs/userguide/strings/index.md
+++ b/docs/userguide/strings/index.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Chars and Strings
+permalink: /strings
+nav_order: 3
+has_children: true
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/properties.md b/docs/userguide/strings/properties.md
index c9f65649f04..d209c64ad81 100644
--- a/docs/userguide/strings/properties.md
+++ b/docs/userguide/strings/properties.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Properties
+permalink: /properties
+nav_order: 2
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/regexp.md b/docs/userguide/strings/regexp.md
index 1d11aba5402..f2b5a5a0cd1 100644
--- a/docs/userguide/strings/regexp.md
+++ b/docs/userguide/strings/regexp.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Regular Expressions
+permalink: /regexp
+nav_order: 6
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/stringprep.md b/docs/userguide/strings/stringprep.md
index ed6174ee593..9d147b708eb 100644
--- a/docs/userguide/strings/stringprep.md
+++ b/docs/userguide/strings/stringprep.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: StringPrep
+permalink: /stringprep
+nav_order: 7
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/unicodeset.md b/docs/userguide/strings/unicodeset.md
index 886803fc296..bececa888a9 100644
--- a/docs/userguide/strings/unicodeset.md
+++ b/docs/userguide/strings/unicodeset.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: UnicodeSet
+permalink: /unicodeset
+nav_order: 5
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/utext.md b/docs/userguide/strings/utext.md
index bc31cc4c585..d872516cda2 100644
--- a/docs/userguide/strings/utext.md
+++ b/docs/userguide/strings/utext.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: UText
+permalink: /utext
+nav_order: 4
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/strings/utf-8.md b/docs/userguide/strings/utf-8.md
index d4159256ed5..8f5d9f57f65 100644
--- a/docs/userguide/strings/utf-8.md
+++ b/docs/userguide/strings/utf-8.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: UTF-8
+permalink: /utf-8
+nav_order: 1
+parent: Chars and Strings
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html
diff --git a/docs/userguide/unicode.md b/docs/userguide/unicode.md
index eee36df1cef..a0954e78146 100644
--- a/docs/userguide/unicode.md
+++ b/docs/userguide/unicode.md
@@ -1,3 +1,10 @@
+---
+layout: default
+title: Unicode Basics
+permalink: /unicode
+nav_order: 3
+parent: Introduction
+---
 <!--
 © 2020 and later: Unicode, Inc. and others.
 License & terms of use: http://www.unicode.org/copyright.html