diff --git a/src/main.sh b/src/main.sh
index 7f87b1d..d7442d2 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -239,6 +239,7 @@ if [ "${1:-}" = "--show-thread" ]; then
     --bind="$KEYS_PREVIEW_UP:preview-up" \
     --bind="$KEYS_PREVIEW_DOWN_HP:preview-half-page-down" \
     --bind="$KEYS_PREVIEW_UP_HP:preview-half-page-up" \
+    --bind="$KEYS_PREVIEW_TOGGLE_WRAP:toggle-preview-wrap-word" \
     --bind="$KEYS_CYCLE_DISPLAY:change-with-nth({1}  {2} {3} ({4})|$FZF_DEFAULT_THREAD_LINE)" \
     --bind="$KEYS_DOWN_HP:half-page-down" \
     --bind="$KEYS_UP_HP:half-page-up" \
@@ -421,6 +422,7 @@ while true; do
     --bind="$KEYS_PREVIEW_UP:preview-up" \
     --bind="$KEYS_PREVIEW_DOWN_HP:preview-half-page-down" \
     --bind="$KEYS_PREVIEW_UP_HP:preview-half-page-up" \
+    --bind="$KEYS_PREVIEW_TOGGLE_WRAP:toggle-preview-wrap-word" \
     --bind="$KEYS_CANCEL:clear-multi" \
     --bind="$KEYS_ENTER:execute($0 --show-thread {4})+reload:$0 --list-threads \"$nmquery\"" \
     --bind="$KEYS_DOWN_HP:half-page-down" \
diff --git a/src/sh/keys.sh b/src/sh/keys.sh
index 293e063..449946e 100644
--- a/src/sh/keys.sh
+++ b/src/sh/keys.sh
@@ -3,62 +3,52 @@ if [ ! "${KEYS_LOADED:-}" ]; then
   # The keys are comma separated. See `fzf --man` for the possible keys.
 
   # List
-  KEYS_DOWN_HP="ctrl-d"
-  KEYS_UP_HP="ctrl-u"
-  KEYS_BACK="ctrl-h"
-  KEYS_ENTER="enter,ctrl-l"
-  KEYS_CANCEL="esc"
-  KEYS_ENTER_ALTERNATIVE="alt-enter"
-  KEYS_CYCLE_DISPLAY="ctrl-space"
+  export KEYS_DOWN_HP="ctrl-d"
+  export KEYS_UP_HP="ctrl-u"
+  export KEYS_BACK="ctrl-h"
+  export KEYS_ENTER="enter,ctrl-l"
+  export KEYS_CANCEL="esc"
+  export KEYS_ENTER_ALTERNATIVE="alt-enter"
+  export KEYS_CYCLE_DISPLAY="ctrl-space"
 
-  KEYS_VIEW_SOURCE="alt-v"
-  KEYS_HTML_PREVIEW="alt-h"
-  KEYS_TAG_ADD="alt-+"
-  KEYS_TAG_REMOVE="alt--"
-  KEYS_ARCHIVE="ctrl-a"
-  KEYS_DELETE="ctrl-delete"
-  KEYS_FLAG="ctrl-x"
-  KEYS_UNFLAG="ctrl-alt-x"
-  KEYS_OPEN="ctrl-o"
-  KEYS_REPLY="ctrl-r"
-  KEYS_COMPOSE="ctrl-n"
-  KEYS_VIEW_LOGS="alt-0"
-  KEYS_SYNC="ctrl-s"
-  KEYS_GOTO_FIRST="home"
+  export KEYS_VIEW_SOURCE="alt-v"
+  export KEYS_HTML_PREVIEW="alt-h"
+  export KEYS_TAG_ADD="alt-+"
+  export KEYS_TAG_REMOVE="alt--"
+  export KEYS_ARCHIVE="ctrl-a"
+  export KEYS_DELETE="ctrl-delete"
+  export KEYS_FLAG="ctrl-x"
+  export KEYS_UNFLAG="ctrl-alt-x"
+  export KEYS_OPEN="ctrl-o"
+  export KEYS_REPLY="ctrl-r"
+  export KEYS_COMPOSE="ctrl-n"
+  export KEYS_VIEW_LOGS="alt-0"
+  export KEYS_SYNC="ctrl-s"
+  export KEYS_GOTO_FIRST="home"
 
   # Preview window
-  KEYS_PREVIEW_DOWN="alt-j"
-  KEYS_PREVIEW_UP="alt-k"
-  KEYS_PREVIEW_DOWN_HP="page-down"
-  KEYS_PREVIEW_UP_HP="page-up"
-  KEYS_PREVIEW_TOGGLE_SIZE="alt-/"
+  export KEYS_PREVIEW_DOWN="alt-j"
+  export KEYS_PREVIEW_UP="alt-k"
+  export KEYS_PREVIEW_DOWN_HP="page-down"
+  export KEYS_PREVIEW_UP_HP="page-up"
+  export KEYS_PREVIEW_TOGGLE_SIZE="alt-/"
+  export KEYS_PREVIEW_TOGGLE_WRAP="alt-w"
 
   # Keys specific to purge window
-  KEYS_PURGE_ALL="ctrl-alt-d"
+  export KEYS_PURGE_ALL="ctrl-alt-d"
 
   # Change main views
-  KEYS_SEARCH_TAG_REPLCE="alt-t"
-  KEYS_SEARCH_TAG_APPEND="alt-T"
-  KEYS_SEARCH_FROM_REPLCE="alt-s"
-  KEYS_SEARCH_FROM_APPEND="alt-S"
-  KEYS_SEARCH_TO_REPLCE="alt-r"
-  KEYS_SEARCH_TO_APPEND="alt-R"
-  KEYS_SEARCH_EDIT_QUERY="alt-q"
-  KEYS_SEARCH_DELETED="alt-d"
-  KEYS_SEARCH_INBOX="alt-1"
-  KEYS_SEARCH_UNREAD="alt-2"
-  KEYS_SEARCH_FLAGGED="alt-3"
-
-  export KEYS_DOWN_HP KEYS_UP_HP KEYS_BACK KEYS_ENTER KEYS_CANCEL \
-    KEYS_ENTER_ALTERNATIVE KEYS_CYCLE_DISPLAY KEYS_VIEW_SOURCE \
-    KEYS_HTML_PREVIEW KEYS_TAG_ADD KEYS_TAG_REMOVE KEYS_ARCHIVE KEYS_DELETE \
-    KEYS_FLAG KEYS_UNFLAG KEYS_OPEN KEYS_REPLY KEYS_COMPOSE KEYS_VIEW_LOGS \
-    KEYS_SYNC KEYS_GOTO_FIRST KEYS_PREVIEW_DOWN KEYS_PREVIEW_UP KEYS_PREVIEW_DOWN_HP \
-    KEYS_PREVIEW_UP_HP KEYS_PREVIEW_TOGGLE_SIZE KEYS_SEARCH_TAG_REPLCE \
-    KEYS_SEARCH_TAG_APPEND KEYS_SEARCH_FROM_REPLCE KEYS_SEARCH_FROM_APPEND \
-    KEYS_SEARCH_TO_REPLCE KEYS_SEARCH_TO_APPEND KEYS_SEARCH_EDIT_QUERY \
-    KEYS_SEARCH_DELETED KEYS_SEARCH_INBOX KEYS_SEARCH_UNREAD \
-    KEYS_SEARCH_FLAGGED KEYS_PURGE_ALL
+  export KEYS_SEARCH_TAG_REPLCE="alt-t"
+  export KEYS_SEARCH_TAG_APPEND="alt-T"
+  export KEYS_SEARCH_FROM_REPLCE="alt-s"
+  export KEYS_SEARCH_FROM_APPEND="alt-S"
+  export KEYS_SEARCH_TO_REPLCE="alt-r"
+  export KEYS_SEARCH_TO_APPEND="alt-R"
+  export KEYS_SEARCH_EDIT_QUERY="alt-q"
+  export KEYS_SEARCH_DELETED="alt-d"
+  export KEYS_SEARCH_INBOX="alt-1"
+  export KEYS_SEARCH_UNREAD="alt-2"
+  export KEYS_SEARCH_FLAGGED="alt-3"
 
   export KEYS_LOADED=1
 fi
diff --git a/src/sh/theme.sh b/src/sh/theme.sh
index 1a3fd17..db1d992 100644
--- a/src/sh/theme.sh
+++ b/src/sh/theme.sh
@@ -9,7 +9,7 @@ if [ ! "${THEME_LOADED:-}" ]; then
   COLCNTS="$(printf '\033[38;5;%sm' "$ANSICOLORCNTS")"
   COLFROM="$(printf '\033[38;5;%sm' "$ANSICOLORFROM")"
   COLSUBJ="$(printf '\033[38;5;%sm\033[3m' "$ANSICOLORSUBJ")"
-  COLTAGS="$(printf '\033[38;5;%sm\033[2m' "$ANSICOLORTAGS")"
+  COLTAGS="$(printf '\033[38;5;%sm' "$ANSICOLORTAGS")"
   COLRESET="$(printf '\033[0m')"
 
   export ANSICOLORDATE ANSICOLORCNTS ANSICOLORFROM ANSICOLORSUBJ ANSICOLORTAGS