diff --git a/src/.vuepress/public/assets/media/amoled-theme.png b/src/.vuepress/public/assets/media/amoled-theme.png
new file mode 100644
index 00000000..38451a50
Binary files /dev/null and b/src/.vuepress/public/assets/media/amoled-theme.png differ
diff --git a/src/.vuepress/public/assets/media/dark-blue.png b/src/.vuepress/public/assets/media/dark-blue.png
new file mode 100644
index 00000000..d7972c17
Binary files /dev/null and b/src/.vuepress/public/assets/media/dark-blue.png differ
diff --git a/src/.vuepress/public/assets/media/dark-theme.png b/src/.vuepress/public/assets/media/dark-theme.png
new file mode 100644
index 00000000..aa743d57
Binary files /dev/null and b/src/.vuepress/public/assets/media/dark-theme.png differ
diff --git a/src/.vuepress/public/assets/media/main-theme.png b/src/.vuepress/public/assets/media/main-theme.png
new file mode 100644
index 00000000..baa55391
Binary files /dev/null and b/src/.vuepress/public/assets/media/main-theme.png differ
diff --git a/src/.vuepress/styles/index.scss b/src/.vuepress/styles/index.scss
index 0bbdbcd8..d3c67a03 100644
--- a/src/.vuepress/styles/index.scss
+++ b/src/.vuepress/styles/index.scss
@@ -9,3 +9,12 @@
.custom-block.tip {
border-color: #2E84BF !important;
}
+
+.badge.default-indicator {
+ background-color: #2E84BF !important;
+}
+
+.badge.version-indicator {
+ background-color: #000000 !important;
+}
+
diff --git a/src/help/guides/general.md b/src/help/guides/general.md
index f9bffc89..016abb02 100644
--- a/src/help/guides/general.md
+++ b/src/help/guides/general.md
@@ -4,34 +4,76 @@ lang: en-US
---
# General
-:construction: :construction_worker_man: W.I.P. Description, help us improve through [here](https://github.com/tachiyomiorg/website/edit/master/src/help/guides/general.md)!
+This category of settings allows you to change the look of the app, and the update schedule and how the app updates.
+The blue badges next to titles is how we indicate the default option, a yellow badge can be used to indicate if for example the feature isn't yet available in the public release.
-## Language
-:construction: :construction_worker_man: W.I.P.
-## Application theme
-:construction: :construction_worker_man: W.I.P.
+## Language
+The language of the app. If changed, all parts of the app change to the language. Defaults to system language. Does not affect which catalog languages are enabled
-## Library manga per row
-:construction: :construction_worker_man: W.I.P.
+## Application theme
+How the app looks and what colors are used through the app. There are four themes included, consisting of a light theme and three dark themes.
+- `Main` is the default white theme with blue accents.
+- `Dark` is themed to completely to material grey.
+- `AMOLED` is pitch black in most places and suitable for OLED screens.
+- `Dark Blue` is like the main theme as it keeps the blue accents but it's dark instead of white.
-## Start screen
-:construction: :construction_worker_man: W.I.P.
+### Light themes
-## Library update frequency
-:construction: :construction_worker_man: W.I.P.
+#### Main
+::: expander Click to expand!
+
+:::
-## Library update restrictions
-:construction: :construction_worker_man: W.I.P.
+### Dark themes
-## Only update ongoing manga
-:construction: :construction_worker_man: W.I.P.
+#### Dark
+::: expander Click to expand!
+
+:::
-## Categories to include in global update
-:construction: :construction_worker_man: W.I.P.
+#### AMOLED
+::: expander Click to expand!
+
+:::
-## Library update order
-:construction: :construction_worker_man: W.I.P.
+#### Dark Blue
+::: expander Click to expand!
+
+:::
-## Default category
-:construction: :construction_worker_man: W.I.P.
+## Library manga per row
+This setting allows you to set how many manga show up per row. It can be between 1 and 10 and can be set to differing amounts depending on the orientation you want.
+
+## Start screen
+This setting changes what screen the app opens up to. It can be changed between `My library`, `Recently read`, and `Library updates`.
+
+## Library update frequency
+This setting changes how often the app automatically scans for manga updates. It can be changed from preset values between hourly and every 2 days.
+
+## Library update restrictions
+This setting allows you to keep certain categories from updating. If you have categories you don't want to update, because you have a category that you would not like to update, then you can use this setting to save time from updating. If you would like to update manga while this setting is on, pull down in the manga or chapters view to manually update
+
+## Only update ongoing manga
+This setting allows you to keep manga that sources have mark as finished from updating. If you would like to update manga while this setting is on, pull down in the manga or chapters view to manually update.
+
+## Categories to include in global update
+This setting allows you to change which categories are updated when a manual (pull down in library) or automatic update occurs.
+
+## Library update order
+This setting allows you to update in different orders, in alphabetical or in the order of the last updated manga.
+
+## Default category
+This setting allows you to change the category that a manga is added to when the bookmark button is tapped and no category is selected.