120 files changed, 2549 insertions, 489 deletions

diff --git a/docs/Config.md b/docs/Config.md
index 86681264c..08e82b5ab 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -36,6 +36,9 @@ gui:
       - bold
     inactiveBorderColor:
       - white
+    searchingActiveBorderColor:
+      - cyan
+      - bold
     optionsTextColor:
       - blue
     selectedLineBgColor:
diff --git a/docs/README.md b/docs/README.md
index 4f58a2a56..c0c8191d2 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,7 +1,8 @@
-# Documentation Overview 

+# Documentation Overview

 

 * [Configuration](./Config.md).

 * [Custom Commands](./Custom_Command_Keybindings.md)

 * [Custom Pagers](./Custom_Pagers.md)

 * [Keybindings](./keybindings)

 * [Undo/Redo](./Undoing.md)

+* [Searching/Filtering](./Searching.md)

diff --git a/docs/Searching.md b/docs/Searching.md
new file mode 100644
index 000000000..589831c55
--- /dev/null
+++ b/docs/Searching.md
@@ -0,0 +1,21 @@
+# Searching/Filtering
+
+## View searching/filtering
+
+Depending on the currently focused view, hitting '/' will bring up a filter or search prompt. When filtering, the contents of the view will be filtered down to only those lines which match the query string. When searching, the conten