diff --git a/netlify.toml b/netlify.toml
index 4ede955ab..d0e6fc114 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,4 +4,6 @@ to = "https://v1.tauri.app/:locale/v1/:splat"
 
 [[redirects]]
 from = "/v1/*"
-to = "https://v1.tauri.app/v1/:splat"
\ No newline at end of file
+to = "https://v1.tauri.app/v1/:splat"
+
+# More redirects in /public/_redirects and astro.config.mjs
\ No newline at end of file
diff --git a/public/_redirects b/public/_redirects
index d205ab2de..d912c2af1 100644
--- a/public/_redirects
+++ b/public/_redirects
@@ -1,4 +1,5 @@
-# Refer to astro.config.mjs
+# These redirects are handled by netlify: https://docs.netlify.com/routing/redirects/
+# Refer to astro.config.mjs for i18n sensitive redirects
 
 # Decommissioned locales
 /ko/*  /:splat  302
@@ -21,13 +22,13 @@
 /guides/upgrade-migrate/*   /start/upgrade--migrate/:splat       301
 
 /references/v2/cli          /references/cli                      301
-/references/v2/acl          /references/acl/capability               301
+/references/v2/acl          /references/acl/capability           301
 /references/v2/config       /references/config                   301
 /references/v2/js           /references/javascript/api           301
 /references/v2/js/*         /references/javascript/api/:splat    301
 /references/v2/*            /references/:splat                   301
 
-/2/reference/js/core/namespacepath          /references/javascript/api/namespacepath 301
+/2/reference/js/core/namespacepath      /references/javascript/api/namespacepath 301
 /2/reference/                /references/                       301
 
 
@@ -40,3 +41,7 @@
 /guides/features            /guides/feature                     301
 /features                   /plugin                             301
 /start/upgrade--migrate     /start/migrate                      301
+
+# mid v2 docs restructuring
+/plugin/system-tray             /learn/system-tray              301
+/plugin/window-customization    /learn/window-customization     301
diff --git a/src/content/docs/concept/architecture.mdx b/src/content/docs/concept/architecture.mdx
index 0f58cb17b..198dece3d 100644
--- a/src/content/docs/concept/architecture.mdx
+++ b/src/content/docs/concept/architecture.mdx
@@ -8,7 +8,7 @@ sidebar:
 
 Tauri is a polyglot and generic toolkit that is very composable and allows engineers to make a wide variety of applications. It is used for building applications for desktop computers using a combination of Rust tools and HTML rendered in a Webview. Apps built with Tauri can ship with any number of pieces of an optional JS API and Rust API so that webviews can control the system via message passing. Developers can extend the default API with their own functionality and bridge the Webview and Rust-based backend easily.
 
-Tauri apps can have [tray-type interfaces](/plugin/system-tray/). They can be [updated](/plugin/updater/) and are managed by the user's operating system as expected. They are very small because they use the OS's webview. They do not ship a runtime since the final binary is compiled from Rust. This makes the [reversing of Tauri apps not a trivial task](/security/).
+Tauri apps can have [tray-type interfaces](/learn/system-tray/). They can be [updated](/plugin/updater/) and are managed by the user's operating system as expected. They are very small because they use the OS's webview. They do not ship a runtime since the final binary is compiled from Rust. This makes the [reversing of Tauri apps not a trivial task](/security/).
 
 ### What Tauri is Not
 
diff --git a/src/content/docs/plugin/system-tray.mdx b/src/content/docs/learn/system-tray.mdx
similarity index 99%
rename from src/content/docs/plugin/system-tray.mdx
rename to src/content/docs/learn/system-tray.mdx
index fdc37c180..9f77a1ff1 100644
--- a/src/content/docs/plugin/system-tray.mdx
+++ b/src/content/docs/learn/system-tray.mdx
@@ -1,5 +1,7 @@
 ---
 title: System Tray
+sidebar:
+  order: 1
 tableOfContents:
   maxHeadingLevel: 4
 ---
diff --git a/src/content/docs/plugin/window-customization.mdx b/src/content/docs/learn/window-customization.mdx
similarity index 99%
rename from src/content/docs/plugin/window-customization.mdx
rename to src/content/docs/learn/window-customization.mdx
index a4ad66e95..61d61a0bd 100644
--- a/src/content/docs/plugin/window-customization.mdx
+++ b/src/content/docs/learn/window-customization.mdx
@@ -1,5 +1,7 @@
 ---
 title: Window Customization
+sidebar:
+  order: 1
 tableOfContents:
   maxHeadingLevel: 4
 ---
diff --git a/src/content/docs/zh-cn/plugin/window-customization.mdx b/src/content/docs/zh-cn/learn/window-customization.mdx
similarity index 100%
rename from src/content/docs/zh-cn/plugin/window-customization.mdx
rename to src/content/docs/zh-cn/learn/window-customization.mdx