diff --git a/src/.vuepress/config.js b/src/.vuepress/config.js
index 1f064c88..b02cf047 100644
--- a/src/.vuepress/config.js
+++ b/src/.vuepress/config.js
@@ -17,7 +17,12 @@ module.exports = {
sidebar: [
'/',
'/guide/',
- '/faq/',
+ {
+ title: 'FAQ',
+ path: '/faq/',
+ collapsable: false,
+ children: ['/faq/application/', '/faq/extensions/']
+ },
'/extensions/'
],
lastUpdated: 'Last Updated'
diff --git a/src/faq/README.md b/src/faq/README.md
index abc4f249..86d7dc8d 100644
--- a/src/faq/README.md
+++ b/src/faq/README.md
@@ -6,125 +6,9 @@ sidebarDepth: 2
# FAQ
-You can find more frequently asked questions
-[here](https://github.com/inorichi/tachiyomi/wiki/FAQ#frequently-asked-questions).
+Here you can find the frequently asked questions.
-## App questions
+They are separated by the categories listed below.
-### What are some good extensions?
-
-The most popular are MangaDex, MangaRock and MangaSee, these are large
-sites which host content from scanlators, there's also extensions like
-Genkan, Madara, FoolSlide and ComiCake which contain sources which
-host directly from the scanlators own websites.
-
-[Here](https://docs.google.com/spreadsheets/d/1TyJEUg78WWH4zgnf3g6M2lkbWpBWbd40FYiPVQhW8IU/edit#gid=0)
-is a good spreadsheet showing the different extensions and their sources.
-
-### How do I allow third-party installations?
-
-When installing your first extension and are prompted that your phone
-isn't allowed to install unknown apps from that source, simply press
-the `Settings` button and then allow it.
-
-Two example videos, left one is for newer Androids.
-
-
-
-### Why won't the extensions install?
-
-In some cases your phone might have some issues downloading the
-extensions, in those cases you can try installing them yourselves
-directly from the source. [Here](https://github.com/inorichi/tachiyomi-extensions/tree/repo/apk)
-is the repository for the files.
-
-To install just download the `.apk` file for the extension you want
-and then install it, like how you installed Tachiyomi.
-
-### Does Tachiyomi have automatic updates?
-
-The Tachiyomi app now has in-app updating for both stable and dev
-versions. If you go to `Settings > About > Version` to check for updates,
-you can force an update there or wait for the app to notify you.
-
-### Why are some images not displayed?
-
-Aside from network issues, it could be because the images are too
-big or the decoder doesn't support that image.
-
-### How do I change the app language?
-
-Tachiyomi is (as of writing) available in 35 different languages.
-
-By default, the app language follows the language setting of your device.
-
-You can also set your own preferred language for Tachiyomi. Simply
-from side panel go to the `Settings > General > Language`.
-
-::: tip NOTE
-Only the UI has been localized, content will still be using
-the language of the source selected (i.e. English for KissManga
-source, Some sources have multiple Language too).
-:::
-
-If you want to help translate Tachiyomi, read [this](https://github.com/inorichi/tachiyomi/wiki/Translation).
-
-
-
-## MangaDex
-
-### No results when searching
-
-::: tip
-Make sure you're on app version `0.8.4` or higher.
-:::
-
-If you're not getting any results when searching MangaDex then
-you need to log in.
-
-To do so, go to `Browse`/`Latest` for MangaDex under `Catalogues`, open
-any manga from the list and then press the overflow menu (3 dot menu)
-in the top-right corner and then the `Open in web view` button.
-
-Now go to the hamburger menu, press the `Manga` drop-down and then
-choose either `Sign up` or `Log in` to proceed with the log in.
-
-### Chapters from Mangaplus are broken
-
-Install the Mangaplus extension and then migrate the manga that
-uses Mangaplus on Mangadex onto the Mangaplus source.
-
-## MangaRock
-
-### Slow updates to Tachiyomi
-
-MangaRock's API updates less frequently than the app or the website,
-so you may need to wait a couple hours or more before it shows up
-in Tachiyomi.
-
-## Madara
-
-### Leviatan Scans is missing
-
-Leviatan Scans has shifted from Madara to Genkan extension.
-
-Install Genkan. Migrate all Leviatan scans. Update Madara.
+- [Application](/faq/application/)
+- [Extensions](/faq/extensions/)
diff --git a/src/faq/application/README.md b/src/faq/application/README.md
new file mode 100644
index 00000000..acd92757
--- /dev/null
+++ b/src/faq/application/README.md
@@ -0,0 +1,84 @@
+---
+title: Application
+lang: en-US
+sidebarDepth: 2
+---
+
+## What are some good extensions?
+
+The most popular are MangaDex, MangaRock and MangaSee, these are large
+sites which host content from scanlators, there's also extensions like
+Genkan, Madara, FoolSlide and ComiCake which contain sources which
+host directly from the scanlators own websites.
+
+[Here](https://docs.google.com/spreadsheets/d/1TyJEUg78WWH4zgnf3g6M2lkbWpBWbd40FYiPVQhW8IU/edit#gid=0)
+is a good spreadsheet showing the different extensions and their sources.
+
+## How do I allow third-party installations?
+
+When installing your first extension and are prompted that your phone
+isn't allowed to install unknown apps from that source, simply press
+the `Settings` button and then allow it.
+
+Two example videos, left one is for newer Androids.
+
+
+
+## Why won't the extensions install?
+
+In some cases your phone might have some issues downloading the
+extensions, in those cases you can try installing them yourselves
+directly from the source. [Here](https://github.com/inorichi/tachiyomi-extensions/tree/repo/apk)
+is the repository for the files.
+
+To install just download the `.apk` file for the extension you want
+and then install it, like how you installed Tachiyomi.
+
+## Does Tachiyomi have automatic updates?
+
+The Tachiyomi app now has in-app updating for both stable and dev
+versions. If you go to `Settings > About > Version` to check for updates,
+you can force an update there or wait for the app to notify you.
+
+## Why are some images not displayed?
+
+Aside from network issues, it could be because the images are too
+big or the decoder doesn't support that image.
+
+## How do I change the app language?
+
+Tachiyomi is (as of writing) available in 35 different languages.
+
+By default, the app language follows the language setting of your device.
+
+You can also set your own preferred language for Tachiyomi. Simply
+from side panel go to the `Settings > General > Language`.
+
+::: tip NOTE
+Only the UI has been localized, content will still be using
+the language of the source selected (i.e. English for KissManga
+source, Some sources have multiple Language too).
+:::
+
+If you want to help translate Tachiyomi, read [this](https://github.com/inorichi/tachiyomi/wiki/Translation).
+
+
diff --git a/src/faq/extensions/README.md b/src/faq/extensions/README.md
new file mode 100644
index 00000000..fb34f14d
--- /dev/null
+++ b/src/faq/extensions/README.md
@@ -0,0 +1,44 @@
+---
+title: Extensions
+lang: en-US
+sidebarDepth: 3
+---
+
+## MangaDex
+
+### No results when searching
+
+::: tip
+Make sure you're on app version `0.8.4` or higher.
+:::
+
+If you're not getting any results when searching MangaDex then
+you need to log in.
+
+To do so, go to `Browse`/`Latest` for MangaDex under `Catalogues`, open
+any manga from the list and then press the overflow menu (3 dot menu)
+in the top-right corner and then the `Open in web view` button.
+
+Now go to the hamburger menu, press the `Manga` drop-down and then
+choose either `Sign up` or `Log in` to proceed with the log in.
+
+### Chapters from Mangaplus are broken
+
+Install the Mangaplus extension and then migrate the manga that
+uses Mangaplus on Mangadex onto the Mangaplus source.
+
+## MangaRock
+
+### Slow updates to Tachiyomi
+
+MangaRock's API updates less frequently than the app or the website,
+so you may need to wait a couple hours or more before it shows up
+in Tachiyomi.
+
+## Madara
+
+### Leviatan Scans is missing
+
+Leviatan Scans has shifted from Madara to Genkan extension.
+
+Install Genkan. Migrate all Leviatan scans. Update Madara.