diff --git a/site/_includes/header.html b/site/_includes/header.html
index 9543da66..5c44dfd3 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -19,9 +19,6 @@
Plugins
-
- Wiki
-
Changelog
diff --git a/site/_layouts/frontpage.html b/site/_layouts/frontpage.html
index 4ae94d87..4666a487 100644
--- a/site/_layouts/frontpage.html
+++ b/site/_layouts/frontpage.html
@@ -6,4 +6,29 @@ {{ site.title }}
v{{ site.data.otd-versions | last }}
{{ content }}
-{% include platformcards.html %}
+
+ {%- include platformcards.html -%}
+
+ {% assign wikifiles = site.collections | where: "label", "wiki" | first %}
+ {% assign folders = site.wiki |
+ where_exp: "item", "item.hide_from_auto_list == false" |
+ group_by_exp: "item", "item.path | split: '/' | slice: 1" |
+ reverse %}
+
+ {%- for folder in folders -%}
+ {% assign folderTitle = site.data.wiki.title-remaps |
+ where: "OldTitle", folder.name[0] |
+ map: "NewTitle" | first |
+ default: folder.name[0] %}
+
+
{{ folderTitle }}
+
+ {% assign sortedItems = folder.items | sort: "title" %}
+ {%- for file in sortedItems -%}
+ -
+ {{ file.title }}
+
+ {%- endfor -%}
+
+ {%- endfor -%}
+
diff --git a/site/_layouts/redirect.html b/site/_layouts/redirect.html
index ccf80f6b..82507750 100644
--- a/site/_layouts/redirect.html
+++ b/site/_layouts/redirect.html
@@ -1,10 +1,13 @@
{% if page.redirect == "special_discord" %}
{% assign redirect = site.data.links.project.DiscordInvite %}
- {% assign redirect_set = True %}
-{% endif %}
-{% if redirect_set %}
- {% assign redirect = page.redirect | replace: "@@OTD_VERSION@@", site.latest_otd_version %}
{% endif %}
+{% unless redirect %}
+ {% if page.redirect %}
+ {% assign redirect = page.redirect | replace: "@@OTD_VERSION@@", site.latest_otd_version %}
+ {% else if layout.redirect %}
+ {% assign redirect = layout.redirect %}
+ {% endif %}
+{% endunless %}