diff --git a/README.md b/README.md
index 7617867a..8176ae24 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,11 @@ Development roadmap
 -------------------
 
 - #1 priority is quality assurance to continue to make sure ugrep has no bugs and is reliable
+
 - listen to users to continue to add new and updated features
+
 - share [reproducible performance results](https://github.com/Genivia/ugrep-benchmarks) with the community
+
 - make ugrep even faster, see [my latest article](https://www.genivia.com/ugrep.html) and planned enhancements [#288](https://github.com/Genivia/ugrep/issues/288)
 
 Overview
@@ -56,7 +59,7 @@ Overview
 
 - Interactive [query TUI](#query), press F1 or CTRL-Z for help and TAB/SHIFT-TAB to navigate to dirs and files
 
-      ug -Q                                  ug -Q -e PATTERN    
+      ug -Q                                  ug -Q -e PATTERN
 
   💡 `-Q` replaces `PATTERN` on the command line to let you enter patterns interactively in the TUI.  In the TUI use ALT+letter keys to toggle short "letter options" on/off, for example ALT-n (option `-n`) to show/hide line numbers.
 
@@ -66,7 +69,7 @@ Overview
 
   💡 specify `-z --zmax=2` to search compressed files and archives nested within archives.  The `--zmax` argument may range from 1 (default) to 99 for up to 99 decompression and de-archiving steps to search nested archives
 
-- Search with Google-like [Boolean query patterns](#bool) using `--bool` patterns with `AND` (or just space), `OR` (or a bar `|`), `NOT` (or a dash `-`), using quotes to match exactly, and grouping with `( )`; or with options `-e` (as an "or"), `--and`, `--andnot`, and `--not` regex patterns
+- Search with Google-like [Boolean query patterns](#bool) using `--bool` patterns with `AND` (or just space), `OR` (or a bar `|`), `NOT` (or a dash `-`), using quotes to match exactly, and grouping with `( )` (shown on the left side below); or with options `-e` (as an "or"), `--and`, `--andnot`, and `--not` regex patterns (shown on the right side below):
 
       ug --bool 'A B C' ...                  ug -e 'A' --and 'B' --and 'C' ...
       ug --bool 'A|B C' ...                  ug -e 'A' -e 'B' --and 'C' ...
@@ -162,7 +165,7 @@ Overview
 
       ug --sort PATTERN ...                  ug --sort=size PATTERN ...
       ug --sort=changed PATTERN ...          ug --sort=created PATTERN ...
-      ug -Z --sort=best PATTERN ...
+      ug -Z --sort=best PATTERN ...          ug --no-sort PATTERN ...
 
 - Output results in [CSV, JSON, XML](#json), and [user-specified formats](#format)
 
@@ -264,17 +267,17 @@ directory or home directory.
 
 ### Windows
 
-Practical hints on using `ugrep.exe` and `ug.exe` for interactive use on the
-Windows command line:
+Practical hints on using `ugrep.exe` and `ug.exe` on the Windows command line:
+
 - when quoting patterns and arguments on the command line, do not use single
   `'` quotes but use `"` instead; most Windows command utilities consider
   the single `'` quotes part of the command-line argument!
-- file and directory globs specified with option `-g/GLOB` may behave more
-  intuitively than a `GLOB` command line argument, especially when directory
-  recursion is enabled;
+- file and directory globs are best specified with option `-g/GLOB` instead of
+  the usual `GLOB` command line arguments to select files and directories to
+  search, especially for recursive searches;
 - when specifying an empty pattern `""` to match all input, this may be ignored
-  by some Windows command interpreters such as Powershell, in that case use
-  option `--match` instead;
+  by some Windows command interpreters such as Powershell, in that case you
+  must specify option `--match` instead;
 - to match newlines in patterns, you may want to use `\R` instead of `\n` to
   match any Unicode newlines, such as `\r\n` pairs and single `\r` and `\n`.
 
@@ -583,7 +586,7 @@ CtrlP uses **ugrep** by adding the following lines to your `.vimrc`:
 
 where `-I` skips binary files, option `--ignore-files` skips files specified in
 `.gitignore` files, when present, and option `-3` restricts searching
-directories to three levels (the working directory and up to two levels below). 
+directories to three levels (the working directory and up to two levels below).
 
 Start Vim then enter the command:
 
@@ -2255,7 +2258,7 @@ To recursively list Python files (extension `.py` or a shebang) that have
 import statements, including hidden files with `-.`:
 
     ug -l. -tPython -f python/imports
- 
+
 🔝 [Back to table of contents](#toc)
 
 <a name="fuzzy"/>
@@ -2942,17 +2945,17 @@ Note that a list of mounted file systems is typically stored in `/etc/mtab`.
 To restrict recursive searches to the file system of the working directory
 only, without crossing into other file systems (similar to `find` option `-x`):
 
-    ug -rl --include-fs=. 'xyz' 
+    ug -rl --include-fs=. 'xyz'
 
 To exclude the file systems mounted at `/dev` and `/proc` from recursive
 searches:
 
-    ug -rl --exclude-fs=/dev,/proc 'xyz' 
+    ug -rl --exclude-fs=/dev,/proc 'xyz'
 
 To only include the file system associated with drive `d:` in recursive
 searches:
 
-    ug -rl --include-fs=d:/ 'xyz' 
+    ug -rl --include-fs=d:/ 'xyz'
 
 To exclude `fuse` and `tmpfs` type file systems from recursive searches:
 
@@ -3073,16 +3076,16 @@ To display the line and column numbers of matches in XML with `--xml`:
             context), `fn=' (file name), `ln=' (line number), `cn=' (column
             number), `bn=' (byte offset), `se=' (separator), `qp=' (TUI
             prompt), `qe=' (TUI errors), `qr=' (TUI regex), `qm=' (TUI regex
-            meta characters), `ql=' (TUI regex bracket lists), `qb=' (TUI regex
-            braces).  Parameter values are ANSI SGR color codes or `k' (black),
-            `r' (red), `g' (green), `y' (yellow), `b' (blue), `m' (magenta),
-            `c' (cyan), `w' (white).  Upper case specifies background colors.
-            A `+' qualifies a color as bright.  A foreground and a background
-            color may be combined with font properties `n' (normal), `f'
-            (faint), `h' (highlight), `i' (invert), `u' (underline).  Parameter
-            `hl' enables file name hyperlinks.  Parameter `rv' reverses the
-            `sl=' and `cx=' parameters when option -v is specified.
-            Selectively overrides GREP_COLORS.
+            meta characters), `ql=' (TUI regex lists and literals), `qb=' (TUI
+            regex braces).  Parameter values are ANSI SGR color codes or `k'
+            (black), `r' (red), `g' (green), `y' (yellow), `b' (blue), `m'
+            (magenta), `c' (cyan), `w' (white), or leave empty for no color.
+            Upper case specifies background colors.  A `+' qualifies a color as
+            bright.  A foreground and a background color may be combined with
+            font properties `n' (normal), `f' (faint), `h' (highlight), `i'
+            (invert), `u' (underline).  Parameter `hl' enables file name
+            hyperlinks.  Parameter `rv' reverses the `sl=' and `cx=' parameters
+            when option -v is specified.  Selectively overrides GREP_COLORS.
     --tag[=TAG[,END]]
             Disables colors to mark up matches with TAG.  END marks the end of
             a match if specified, otherwise TAG.  The default is `___'.
@@ -3115,7 +3118,7 @@ param | result
 `qe=` | TUI errors
 `qr=` | TUI regex
 `qm=` | TUI regex meta characters
-`ql=` | TUI regex bracket lists
+`ql=` | TUI regex lists and literals
 `qb=` | TUI regex braces
 
 Multiple SGR codes may be specified for a single parameter when separated by a
@@ -3148,7 +3151,7 @@ code | c | effect                     | code | c  | effect
 See Wikipedia [ANSI escape code - SGR parameters](https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters)
 
 For quick and easy color specification, the corresponding single-letter color
-names may be used in place of numeric SGR codes.  Semicolons are not required
+names may be used in place of numeric SGR codes and semicolons are not required
 to separate color names.  Color names and numeric codes may be mixed.
 
 For example, to display matches in underlined bright green on bright selected
@@ -3605,7 +3608,8 @@ Same, but in this case select `<script>` `src` URLs when referencing `http` and
     -m [MIN,][MAX], --min-count=MIN, --max-count=MAX
             Require MIN matches, stop after MAX matches when specified.  Output
             MIN to MAX matches.  For example, -m1 outputs the first match and
-            -cm1, (with comma) counts non-zero matches.  See also option -K.
+            -cm1, (with a comma) counts nonzero matches.  If -u is specified,
+            each individual match counts.  See also option -K.
     --max-files=NUM
             Restrict the number of files matched to NUM.  Note that --sort or
             -J1 may be specified to produce replicable results.  If --sort is
@@ -3624,8 +3628,8 @@ Same, but in this case select `<script>` `src` URLs when referencing `http` and
             not sorted.  Subdirectories are sorted and displayed after matching
             files.  FILE arguments are searched in the same order as specified.
 
-To show only the first 10 matches of `FIXME` in C++ files in the working
-directory and all subdirectories below:
+To show only up to the first 10 matching lines with `FIXME` in C++ files in the
+working directory and all subdirectories below:
 
     ug -r -m10 -tc++ FIXME
 
@@ -4055,14 +4059,14 @@ in markdown:
                   context), `fn=' (file name), `ln=' (line number), `cn=' (column
                   number), `bn=' (byte offset), `se=' (separator), `qp=' (TUI
                   prompt), `qe=' (TUI errors), `qr=' (TUI regex), `qm=' (TUI regex
-                  meta characters), `ql=' (TUI regex bracket lists), `qb=' (TUI
+                  meta characters), `ql=' (TUI regex lists and literals), `qb=' (TUI
                   regex braces).  Parameter values are ANSI SGR color codes or `k'
                   (black), `r' (red), `g' (green), `y' (yellow), `b' (blue), `m'
-                  (magenta), `c' (cyan), `w' (white).  Upper case specifies
-                  background colors.  A `+' qualifies a color as bright.  A
-                  foreground and a background color may be combined with font
-                  properties `n' (normal), `f' (faint), `h' (highlight), `i'
-                  (invert), `u' (underline).  Parameter `hl' enables file name
+                  (magenta), `c' (cyan), `w' (white), or leave empty for no color.
+                  Upper case specifies background colors.  A `+' qualifies a color
+                  as bright.  A foreground and a background color may be combined
+                  with font properties `n' (normal), `f' (faint), `h' (highlight),
+                  `i' (invert), `u' (underline).  Parameter `hl' enables file name
                   hyperlinks.  Parameter `rv' reverses the `sl=' and `cx='
                   parameters when option -v is specified.  Selectively overrides
                   GREP_COLORS.
@@ -4430,8 +4434,8 @@ in markdown:
            -m [MIN,][MAX], --min-count=MIN, --max-count=MAX
                   Require MIN matches, stop after MAX matches when specified.
                   Output MIN to MAX matches.  For example, -m1 outputs the first
-                  match and -cm1, (with a comma) counts non-zero matches.  See also
-                  option -K.
+                  match and -cm1, (with a comma) counts nonzero matches.  If -u is
+                  specified, each individual match counts.  See also option -K.
 
            --match
                   Match all input.  Same as specifying an empty pattern to search.
@@ -4908,7 +4912,7 @@ in markdown:
                   colon-separated list of ANSI SGR parameters that defaults to
                   cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36 with
                   additional parameters for TUI colors
-                  :qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=35.  The mt=, ms=, and mc=
+                  :qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35.  The mt=, ms=, and mc=
                   capabilities of GREP_COLORS take priority over GREP_COLOR.  Option
                   --colors takes priority over GREP_COLORS.
 
@@ -4958,7 +4962,7 @@ in markdown:
 
            qm=    TUI regex meta characters.
 
-           ql=    TUI regex bracket lists.
+           ql=    TUI regex lists and literals.
 
            qb=    TUI regex braces.
 
@@ -5324,7 +5328,7 @@ in markdown:
 
 
 
-    ugrep 4.3.1                      October 9, 2023                        UGREP(1)
+    ugrep 4.3.1                     October 18, 2023                        UGREP(1)
 
 🔝 [Back to table of contents](#toc)
 
@@ -5411,7 +5415,7 @@ follows, from high to low precedence:
   2. Grouping `(φ)`, `(?:φ)`, `(?=φ)`, and inline modifiers `(?imsux:φ)`
   3. Quantifiers `?`, `*`, `+`, `{n,m}`
   4. Concatenation `φψ`
-  5. Anchoring `^`, `$`, `\<`, `\>`, `\b`, `\B`, `\A`, `\z` 
+  5. Anchoring `^`, `$`, `\<`, `\>`, `\b`, `\B`, `\A`, `\z`
   6. Alternation `φ|ψ`
   7. Global modifiers `(?imsux)φ`
 
@@ -5448,7 +5452,7 @@ compatibility with traditional grep pattern matching.
 ### POSIX and Unicode character categories
 
 The POSIX form can only be used in bracket lists, for example
-`[[:lower:][:digit:]]` matches an ASCII lower case letter or a digit.  
+`[[:lower:][:digit:]]` matches an ASCII lower case letter or a digit.
 
 You can also use the `\p{C}` form for class `C` and upper case `\P{C}` form
 that has the same meaning as `\p{^C}`, which matches any character except
diff --git a/bin/win32/ugrep.exe b/bin/win32/ugrep.exe
index ccaaff84..c490a6c9 100755
Binary files a/bin/win32/ugrep.exe and b/bin/win32/ugrep.exe differ
diff --git a/bin/win64/ugrep.exe b/bin/win64/ugrep.exe
index f5f39092..baf96bb7 100755
Binary files a/bin/win64/ugrep.exe and b/bin/win64/ugrep.exe differ
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cec16157..66e863aa 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LIBRARIES      = libreflex.a
-libreflex_a_CPPFLAGS  = -I$(top_srcdir)/include $(SIMD_FLAGS)
+libreflex_a_CPPFLAGS  = -I$(top_srcdir)/include $(SIMD_FLAGS) -DWITH_NO_INDENT -DWITH_NO_CODEGEN
 libreflex_a_SOURCES   = $(top_srcdir)/include/reflex/abslexer.h $(top_srcdir)/include/reflex/absmatcher.h $(top_srcdir)/include/reflex/bits.h $(top_srcdir)/include/reflex/boostmatcher.h $(top_srcdir)/include/reflex/convert.h $(top_srcdir)/include/reflex/debug.h $(top_srcdir)/include/reflex/error.h $(top_srcdir)/include/reflex/flexlexer.h $(top_srcdir)/include/reflex/input.h $(top_srcdir)/include/reflex/matcher.h $(top_srcdir)/include/reflex/pattern.h $(top_srcdir)/include/reflex/posix.h $(top_srcdir)/include/reflex/ranges.h $(top_srcdir)/include/reflex/setop.h $(top_srcdir)/include/reflex/simd.h $(top_srcdir)/include/reflex/stdmatcher.h $(top_srcdir)/include/reflex/timer.h $(top_srcdir)/include/reflex/traits.h $(top_srcdir)/include/reflex/unicode.h $(top_srcdir)/include/reflex/utf8.h convert.cpp debug.cpp error.cpp input.cpp matcher.cpp matcher_avx2.cpp matcher_avx512bw.cpp pattern.cpp posix.cpp simd_avx2.cpp simd_avx512bw.cpp unicode.cpp utf8.cpp block_scripts.cpp language_scripts.cpp letter_scripts.cpp
 
 # separately compile matcher_avx2.cpp and matcher_avx512bw (with the same content as matcher.cpp) with AVX optimizations enabled
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d7c2bc37..d08a86fd 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -330,7 +330,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libreflex.a
-libreflex_a_CPPFLAGS = -I$(top_srcdir)/include $(SIMD_FLAGS)
+libreflex_a_CPPFLAGS = -I$(top_srcdir)/include $(SIMD_FLAGS) -DWITH_NO_INDENT -DWITH_NO_CODEGEN
 libreflex_a_SOURCES = $(top_srcdir)/include/reflex/abslexer.h $(top_srcdir)/include/reflex/absmatcher.h $(top_srcdir)/include/reflex/bits.h $(top_srcdir)/include/reflex/boostmatcher.h $(top_srcdir)/include/reflex/convert.h $(top_srcdir)/include/reflex/debug.h $(top_srcdir)/include/reflex/error.h $(top_srcdir)/include/reflex/flexlexer.h $(top_srcdir)/include/reflex/input.h $(top_srcdir)/include/reflex/matcher.h $(top_srcdir)/include/reflex/pattern.h $(top_srcdir)/include/reflex/posix.h $(top_srcdir)/include/reflex/ranges.h $(top_srcdir)/include/reflex/setop.h $(top_srcdir)/include/reflex/simd.h $(top_srcdir)/include/reflex/stdmatcher.h $(top_srcdir)/include/reflex/timer.h $(top_srcdir)/include/reflex/traits.h $(top_srcdir)/include/reflex/unicode.h $(top_srcdir)/include/reflex/utf8.h convert.cpp debug.cpp error.cpp input.cpp matcher.cpp matcher_avx2.cpp matcher_avx512bw.cpp pattern.cpp posix.cpp simd_avx2.cpp simd_avx512bw.cpp unicode.cpp utf8.cpp block_scripts.cpp language_scripts.cpp letter_scripts.cpp
 all: all-am
 
diff --git a/lib/block_scripts.cpp b/lib/block_scripts.cpp
index f1ffcb03..2b7a8bb5 100644
--- a/lib/block_scripts.cpp
+++ b/lib/block_scripts.cpp
@@ -26,6 +26,8 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsArabicExtended-A"] = IsArabicExtended_A;
   static const int IsArabicExtended_B[] = { 2160, 2207, 0, 0 };
   range["IsArabicExtended-B"] = IsArabicExtended_B;
+  static const int IsArabicExtended_C[] = { 69312, 69375, 0, 0 };
+  range["IsArabicExtended-C"] = IsArabicExtended_C;
   static const int IsArabicMathematicalAlphabeticSymbols[] = { 126464, 126719, 0, 0 };
   range["IsArabicMathematicalAlphabeticSymbols"] = IsArabicMathematicalAlphabeticSymbols;
   static const int IsArabicPresentationForms_A[] = { 64336, 65023, 0, 0 };
@@ -104,6 +106,10 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsCJKUnifiedIdeographsExtensionF"] = IsCJKUnifiedIdeographsExtensionF;
   static const int IsCJKUnifiedIdeographsExtensionG[] = { 196608, 201551, 0, 0 };
   range["IsCJKUnifiedIdeographsExtensionG"] = IsCJKUnifiedIdeographsExtensionG;
+  static const int IsCJKUnifiedIdeographsExtensionH[] = { 201552, 205743, 0, 0 };
+  range["IsCJKUnifiedIdeographsExtensionH"] = IsCJKUnifiedIdeographsExtensionH;
+  static const int IsCJKUnifiedIdeographsExtensionI[] = { 191472, 192095, 0, 0 };
+  range["IsCJKUnifiedIdeographsExtensionI"] = IsCJKUnifiedIdeographsExtensionI;
   static const int IsCarian[] = { 66208, 66271, 0, 0 };
   range["IsCarian"] = IsCarian;
   static const int IsCaucasianAlbanian[] = { 66864, 66927, 0, 0 };
@@ -158,6 +164,8 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsCyrillicExtended-B"] = IsCyrillicExtended_B;
   static const int IsCyrillicExtended_C[] = { 7296, 7311, 0, 0 };
   range["IsCyrillicExtended-C"] = IsCyrillicExtended_C;
+  static const int IsCyrillicExtended_D[] = { 122928, 123023, 0, 0 };
+  range["IsCyrillicExtended-D"] = IsCyrillicExtended_D;
   static const int IsCyrillicSupplement[] = { 1280, 1327, 0, 0 };
   range["IsCyrillicSupplement"] = IsCyrillicSupplement;
   static const int IsDeseret[] = { 66560, 66639, 0, 0 };
@@ -166,6 +174,8 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsDevanagari"] = IsDevanagari;
   static const int IsDevanagariExtended[] = { 43232, 43263, 0, 0 };
   range["IsDevanagariExtended"] = IsDevanagariExtended;
+  static const int IsDevanagariExtended_A[] = { 72448, 72543, 0, 0 };
+  range["IsDevanagariExtended-A"] = IsDevanagariExtended_A;
   static const int IsDingbats[] = { 9984, 10175, 0, 0 };
   range["IsDingbats"] = IsDingbats;
   static const int IsDivesAkuru[] = { 71936, 72031, 0, 0 };
@@ -178,7 +188,7 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsDuployan"] = IsDuployan;
   static const int IsEarlyDynasticCuneiform[] = { 74880, 75087, 0, 0 };
   range["IsEarlyDynasticCuneiform"] = IsEarlyDynasticCuneiform;
-  static const int IsEgyptianHieroglyphFormatControls[] = { 78896, 78911, 0, 0 };
+  static const int IsEgyptianHieroglyphFormatControls[] = { 78896, 78943, 0, 0 };
   range["IsEgyptianHieroglyphFormatControls"] = IsEgyptianHieroglyphFormatControls;
   static const int IsEgyptianHieroglyphs[] = { 77824, 78895, 0, 0 };
   range["IsEgyptianHieroglyphs"] = IsEgyptianHieroglyphs;
@@ -280,6 +290,8 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsJavanese"] = IsJavanese;
   static const int IsKaithi[] = { 69760, 69839, 0, 0 };
   range["IsKaithi"] = IsKaithi;
+  static const int IsKaktovikNumerals[] = { 119488, 119519, 0, 0 };
+  range["IsKaktovikNumerals"] = IsKaktovikNumerals;
   static const int IsKanaExtended_A[] = { 110848, 110895, 0, 0 };
   range["IsKanaExtended-A"] = IsKanaExtended_A;
   static const int IsKanaExtended_B[] = { 110576, 110591, 0, 0 };
@@ -296,6 +308,8 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsKatakana"] = IsKatakana;
   static const int IsKatakanaPhoneticExtensions[] = { 12784, 12799, 0, 0 };
   range["IsKatakanaPhoneticExtensions"] = IsKatakanaPhoneticExtensions;
+  static const int IsKawi[] = { 73472, 73567, 0, 0 };
+  range["IsKawi"] = IsKawi;
   static const int IsKayahLi[] = { 43264, 43311, 0, 0 };
   range["IsKayahLi"] = IsKayahLi;
   static const int IsKharoshthi[] = { 68096, 68191, 0, 0 };
@@ -424,6 +438,8 @@ void reflex::Unicode::Tables::block_scripts(void)
   range["IsNKo"] = IsNKo;
   static const int IsNabataean[] = { 67712, 67759, 0, 0 };
   range["IsNabataean"] = IsNabataean;
+  static const int IsNagMundari[] = { 124112, 124159, 0, 0 };
+  range["IsNagMundari"] = IsNagMundari;
   static const int IsNandinagari[] = { 72096, 72191, 0, 0 };
   range["IsNandinagari"] = IsNandinagari;
   static const int IsNewTaiLue[] = { 6528, 6623, 0, 0 };
diff --git a/lib/convert.cpp b/lib/convert.cpp
index c5c68c7e..2f3e88d7 100644
--- a/lib/convert.cpp
+++ b/lib/convert.cpp
@@ -415,6 +415,7 @@ static void insert_list(const char *pattern, size_t len, size_t& pos, convert_fl
 
 static void expand_list(const char *pattern, size_t len, size_t& loc, size_t& pos, convert_flag_type flags, const std::map<size_t,std::string>& mod, const char *signature, const char *par, const std::map<std::string,std::string> *macros, std::string& regex, bool& nl)
 {
+  size_t bls = pos - 1;
   bool invert = false;
   bool newline = false;
   if (pos + 1 < len && pattern[pos] == '^')
@@ -502,7 +503,7 @@ static void expand_list(const char *pattern, size_t len, size_t& loc, size_t& po
       break;
   }
   if (pos >= len || pattern[pos] != ']')
-    throw regex_error(regex_error::mismatched_brackets, pattern, loc);
+    throw regex_error(regex_error::mismatched_brackets, pattern, bls);
   if (invert && !newline && (flags & convert_flag::notnewline))
   {
     regex.append(&pattern[loc], pos - loc).append("\\n");
@@ -1023,7 +1024,7 @@ static void insert_list(const char *pattern, size_t len, size_t& pos, convert_fl
     }
   }
   if (pos >= len || pattern[pos] != ']')
-    throw regex_error(regex_error::mismatched_brackets, pattern, loc);
+    throw regex_error(regex_error::mismatched_brackets, pattern, loc - 1);
   if (negate)
     negate_list(flags, mod, ranges);
   extend_list(pattern, len, pos, flags, mod, ranges, macros);
@@ -2005,6 +2006,7 @@ std::string convert(const char *pattern, const char *signature, convert_flag_typ
               throw regex_error(regex_error::invalid_repeat, pattern, pos);
             char *s;
             size_t n = static_cast<size_t>(std::strtoul(&pattern[pos], &s, 10));
+            size_t brc = pos - 1;
             pos = s - pattern;
             if (pos + 1 < len && pattern[pos] == ',')
             {
@@ -2031,7 +2033,7 @@ std::string convert(const char *pattern, const char *signature, convert_flag_typ
               if (pos + 1 < len)
                 throw regex_error(regex_error::invalid_repeat, pattern, pos);
               else
-                throw regex_error(regex_error::mismatched_braces, pattern, pos);
+                throw regex_error(regex_error::mismatched_braces, pattern, brc);
             }
             if (pos + 1 < len && (pattern[pos + 1] == '?' || pattern[pos + 1] == '+') && !supports_escape(signature, pattern[pos + 1]))
               throw regex_error(regex_error::invalid_quantifier, pattern, pos + 1);
diff --git a/lib/language_scripts.cpp b/lib/language_scripts.cpp
index b3bdff46..89f57e51 100644
--- a/lib/language_scripts.cpp
+++ b/lib/language_scripts.cpp
@@ -50,6 +50,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     65136, 65140,
     65142, 65276,
     69216, 69246,
+    69373, 69375,
     126464, 126467,
     126469, 126495,
     126497, 126498,
@@ -200,7 +201,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     65529, 65531,
     69821, 69821,
     69837, 69837,
-    78896, 78904,
+    78896, 78911,
     113824, 113827,
     119155, 119162,
     917505, 917505,
@@ -249,7 +250,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     65529, 65531,
     69821, 69821,
     69837, 69837,
-    78896, 78904,
+    78896, 78911,
     113824, 113827,
     119155, 119162,
     917505, 917505,
@@ -338,8 +339,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     11126, 11157,
     11159, 11263,
     11776, 11869,
-    12272, 12283,
-    12288, 12292,
+    12272, 12292,
     12294, 12294,
     12296, 12320,
     12336, 12343,
@@ -349,6 +349,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     12539, 12540,
     12688, 12703,
     12736, 12771,
+    12783, 12783,
     12832, 12895,
     12927, 13007,
     13055, 13055,
@@ -390,6 +391,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     119171, 119172,
     119180, 119209,
     119214, 119274,
+    119488, 119507,
     119520, 119539,
     119552, 119638,
     119648, 119672,
@@ -430,10 +432,10 @@ void reflex::Unicode::Tables::language_scripts(void)
     127568, 127569,
     127584, 127589,
     127744, 128727,
-    128733, 128748,
+    128732, 128748,
     128752, 128764,
-    128768, 128883,
-    128896, 128984,
+    128768, 128886,
+    128891, 128985,
     128992, 129003,
     129008, 129008,
     129024, 129035,
@@ -444,15 +446,13 @@ void reflex::Unicode::Tables::language_scripts(void)
     129200, 129201,
     129280, 129619,
     129632, 129645,
-    129648, 129652,
-    129656, 129660,
-    129664, 129670,
-    129680, 129708,
-    129712, 129722,
-    129728, 129733,
-    129744, 129753,
-    129760, 129767,
-    129776, 129782,
+    129648, 129660,
+    129664, 129672,
+    129680, 129725,
+    129727, 129733,
+    129742, 129755,
+    129760, 129768,
+    129776, 129784,
     129792, 129938,
     129940, 129994,
     130032, 130041,
@@ -630,7 +630,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3293, 3294,
     3296, 3299,
     3302, 3311,
-    3313, 3314,
+    3313, 3315,
     3328, 3340,
     3342, 3344,
     3346, 3396,
@@ -663,7 +663,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3751, 3773,
     3776, 3780,
     3782, 3782,
-    3784, 3789,
+    3784, 3790,
     3792, 3801,
     3804, 3807,
     3840, 3840,
@@ -983,7 +983,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     69248, 69289,
     69291, 69292,
     69296, 69297,
-    69376, 69404,
+    69373, 69404,
     69415, 69415,
     69424, 69456,
     69488, 69509,
@@ -1008,7 +1008,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70199,
-    70206, 70206,
+    70206, 70209,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -1089,13 +1089,16 @@ void reflex::Unicode::Tables::language_scripts(void)
     73107, 73112,
     73120, 73129,
     73440, 73462,
+    73472, 73488,
+    73490, 73530,
+    73534, 73538,
+    73552, 73561,
     73648, 73648,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
-    78896, 78904,
+    77824, 78933,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -1123,7 +1126,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -1177,17 +1182,21 @@ void reflex::Unicode::Tables::language_scripts(void)
     121499, 121503,
     121505, 121519,
     122624, 122654,
+    122661, 122666,
     122880, 122886,
     122888, 122904,
     122907, 122913,
     122915, 122916,
     122918, 122922,
+    122928, 122989,
+    123023, 123023,
     123136, 123180,
     123184, 123197,
     123200, 123209,
     123214, 123214,
     123536, 123566,
     123584, 123641,
+    124112, 124153,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -1231,12 +1240,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126635, 126651,
     130032, 130041,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     917505, 917505,
     917536, 917631,
     917760, 917999,
@@ -1721,6 +1732,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -1783,12 +1795,16 @@ void reflex::Unicode::Tables::language_scripts(void)
     73066, 73097,
     73112, 73112,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
     73648, 73648,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -1811,7 +1827,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -1849,11 +1867,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     120746, 120770,
     120772, 120779,
     122624, 122654,
+    122661, 122666,
+    122928, 122989,
     123136, 123180,
     123191, 123197,
     123214, 123214,
     123536, 123565,
     123584, 123627,
+    124112, 124139,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -1895,12 +1916,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126629, 126633,
     126635, 126651,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["CsIdentifierStart"] = CsIdentifierStart;
@@ -1936,6 +1959,8 @@ void reflex::Unicode::Tables::language_scripts(void)
     11744, 11775,
     42560, 42655,
     65070, 65071,
+    122928, 122989,
+    123023, 123023,
     0, 0
   };
   range["Cyrillic"] = Cyrillic;
@@ -1949,6 +1974,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     2389, 2403,
     2406, 2431,
     43232, 43263,
+    72448, 72457,
     0, 0
   };
   range["Devanagari"] = Devanagari;
@@ -1979,8 +2005,7 @@ void reflex::Unicode::Tables::language_scripts(void)
   };
   range["Duployan"] = Duployan;
   static const int Egyptian_Hieroglyphs[] = {
-    77824, 78894,
-    78896, 78904,
+    77824, 78933,
     0, 0
   };
   range["Egyptian_Hieroglyphs"] = Egyptian_Hieroglyphs;
@@ -2185,12 +2210,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     94178, 94179,
     94192, 94193,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["Han"] = Han;
@@ -2247,6 +2274,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     12353, 12438,
     12445, 12447,
     110593, 110879,
+    110898, 110898,
     110928, 110930,
     127488, 127488,
     0, 0
@@ -2480,7 +2508,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3293, 3294,
     3296, 3299,
     3302, 3311,
-    3313, 3314,
+    3313, 3315,
     3328, 3340,
     3342, 3344,
     3346, 3396,
@@ -2513,7 +2541,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3751, 3773,
     3776, 3780,
     3782, 3782,
-    3784, 3789,
+    3784, 3790,
     3792, 3801,
     3804, 3807,
     3840, 3840,
@@ -2839,7 +2867,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     69248, 69289,
     69291, 69292,
     69296, 69297,
-    69376, 69404,
+    69373, 69404,
     69415, 69415,
     69424, 69456,
     69488, 69509,
@@ -2864,7 +2892,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70199,
-    70206, 70206,
+    70206, 70209,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -2945,14 +2973,17 @@ void reflex::Unicode::Tables::language_scripts(void)
     73107, 73112,
     73120, 73129,
     73440, 73462,
+    73472, 73488,
+    73490, 73530,
+    73534, 73538,
+    73552, 73561,
     73648, 73648,
     73693, 73696,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
-    78896, 78904,
+    77824, 78933,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -2980,7 +3011,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -3034,11 +3067,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     121499, 121503,
     121505, 121519,
     122624, 122654,
+    122661, 122666,
     122880, 122886,
     122888, 122904,
     122907, 122913,
     122915, 122916,
     122918, 122922,
+    122928, 122989,
+    123023, 123023,
     123136, 123180,
     123184, 123197,
     123200, 123209,
@@ -3046,6 +3082,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     123536, 123566,
     123584, 123641,
     123647, 123647,
+    124112, 124153,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -3090,12 +3127,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126635, 126651,
     130032, 130041,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     917505, 917505,
     917536, 917631,
     917760, 917999,
@@ -3592,6 +3631,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -3654,13 +3694,17 @@ void reflex::Unicode::Tables::language_scripts(void)
     73066, 73097,
     73112, 73112,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
     73648, 73648,
     73693, 73696,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -3683,7 +3727,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -3721,12 +3767,15 @@ void reflex::Unicode::Tables::language_scripts(void)
     120746, 120770,
     120772, 120779,
     122624, 122654,
+    122661, 122666,
+    122928, 122989,
     123136, 123180,
     123191, 123197,
     123214, 123214,
     123536, 123565,
     123584, 123627,
     123647, 123647,
+    124112, 124139,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -3769,12 +3818,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126629, 126633,
     126635, 126651,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["JavaIdentifierStart"] = JavaIdentifierStart;
@@ -3804,7 +3855,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3293, 3294,
     3296, 3299,
     3302, 3311,
-    3313, 3314,
+    3313, 3315,
     0, 0
   };
   range["Kannada"] = Kannada;
@@ -3821,10 +3872,18 @@ void reflex::Unicode::Tables::language_scripts(void)
     110589, 110590,
     110592, 110592,
     110880, 110882,
+    110933, 110933,
     110948, 110951,
     0, 0
   };
   range["Katakana"] = Katakana;
+  static const int Kawi[] = {
+    73472, 73488,
+    73490, 73530,
+    73534, 73561,
+    0, 0
+  };
+  range["Kawi"] = Kawi;
   static const int Kayah_Li[] = {
     43264, 43309,
     43311, 43311,
@@ -3859,7 +3918,7 @@ void reflex::Unicode::Tables::language_scripts(void)
   range["Khmer"] = Khmer;
   static const int Khojki[] = {
     70144, 70161,
-    70163, 70206,
+    70163, 70209,
     0, 0
   };
   range["Khojki"] = Khojki;
@@ -4339,6 +4398,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -4401,11 +4461,15 @@ void reflex::Unicode::Tables::language_scripts(void)
     73066, 73097,
     73112, 73112,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
     73648, 73648,
     73728, 74649,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -4428,7 +4492,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -4466,11 +4532,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     120746, 120770,
     120772, 120779,
     122624, 122654,
+    122661, 122666,
+    122928, 122989,
     123136, 123180,
     123191, 123197,
     123214, 123214,
     123536, 123565,
     123584, 123627,
+    124112, 124139,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -4512,12 +4581,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126629, 126633,
     126635, 126651,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["L"] = L;
@@ -4663,6 +4734,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     120772, 120779,
     122624, 122633,
     122635, 122654,
+    122661, 122666,
     125184, 125251,
     0, 0
   };
@@ -4676,7 +4748,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3751, 3773,
     3776, 3780,
     3782, 3782,
-    3784, 3789,
+    3784, 3790,
     3792, 3801,
     3804, 3807,
     0, 0
@@ -4721,6 +4793,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     67463, 67504,
     67506, 67514,
     122624, 122654,
+    122661, 122666,
     0, 0
   };
   range["Latin"] = Latin;
@@ -4832,7 +4905,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110576, 110579,
     110581, 110587,
     110589, 110590,
+    122928, 122989,
     123191, 123197,
+    124139, 124139,
     125259, 125259,
     0, 0
   };
@@ -5202,6 +5277,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -5263,11 +5339,15 @@ void reflex::Unicode::Tables::language_scripts(void)
     73066, 73097,
     73112, 73112,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
     73648, 73648,
     73728, 74649,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -5282,7 +5362,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     100352, 101589,
     101632, 101640,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -5294,6 +5376,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     123214, 123214,
     123536, 123565,
     123584, 123627,
+    124112, 124138,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -5333,12 +5416,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126629, 126633,
     126635, 126651,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["Lo"] = Lo;
@@ -5434,6 +5519,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3274, 3277,
     3285, 3286,
     3298, 3299,
+    3315, 3315,
     3328, 3331,
     3387, 3388,
     3390, 3396,
@@ -5452,7 +5538,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3655, 3662,
     3761, 3761,
     3764, 3772,
-    3784, 3789,
+    3784, 3790,
     3864, 3865,
     3893, 3893,
     3895, 3895,
@@ -5554,6 +5640,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     68325, 68326,
     68900, 68903,
     69291, 69292,
+    69373, 69375,
     69446, 69456,
     69506, 69509,
     69632, 69634,
@@ -5573,6 +5660,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70094, 70095,
     70188, 70199,
     70206, 70206,
+    70209, 70209,
     70367, 70378,
     70400, 70403,
     70459, 70460,
@@ -5620,6 +5708,12 @@ void reflex::Unicode::Tables::language_scripts(void)
     73104, 73105,
     73107, 73111,
     73459, 73462,
+    73472, 73473,
+    73475, 73475,
+    73524, 73530,
+    73534, 73538,
+    78912, 78912,
+    78919, 78933,
     92912, 92916,
     92976, 92982,
     94031, 94031,
@@ -5647,9 +5741,11 @@ void reflex::Unicode::Tables::language_scripts(void)
     122907, 122913,
     122915, 122916,
     122918, 122922,
+    123023, 123023,
     123184, 123190,
     123566, 123566,
     123628, 123631,
+    124140, 124143,
     125136, 125142,
     125252, 125258,
     917760, 917999,
@@ -5743,6 +5839,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3271, 3272,
     3274, 3275,
     3285, 3286,
+    3315, 3315,
     3330, 3331,
     3390, 3392,
     3398, 3400,
@@ -5881,6 +5978,10 @@ void reflex::Unicode::Tables::language_scripts(void)
     73107, 73108,
     73110, 73110,
     73461, 73462,
+    73475, 73475,
+    73524, 73525,
+    73534, 73535,
+    73537, 73537,
     94033, 94087,
     94192, 94193,
     119141, 119142,
@@ -6027,7 +6128,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3655, 3662,
     3761, 3761,
     3764, 3772,
-    3784, 3789,
+    3784, 3790,
     3864, 3865,
     3893, 3893,
     3895, 3895,
@@ -6158,6 +6259,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     68325, 68326,
     68900, 68903,
     69291, 69292,
+    69373, 69375,
     69446, 69456,
     69506, 69509,
     69633, 69633,
@@ -6180,6 +6282,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70196, 70196,
     70198, 70199,
     70206, 70206,
+    70209, 70209,
     70367, 70367,
     70371, 70378,
     70400, 70401,
@@ -6241,6 +6344,12 @@ void reflex::Unicode::Tables::language_scripts(void)
     73109, 73109,
     73111, 73111,
     73459, 73460,
+    73472, 73473,
+    73526, 73530,
+    73536, 73536,
+    73538, 73538,
+    78912, 78912,
+    78919, 78933,
     92912, 92916,
     92976, 92982,
     94031, 94031,
@@ -6265,9 +6374,11 @@ void reflex::Unicode::Tables::language_scripts(void)
     122907, 122913,
     122915, 122916,
     122918, 122922,
+    123023, 123023,
     123184, 123190,
     123566, 123566,
     123628, 123631,
+    124140, 124143,
     125136, 125142,
     125252, 125258,
     917760, 917999,
@@ -6427,6 +6538,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     72784, 72812,
     73040, 73049,
     73120, 73129,
+    73552, 73561,
     73664, 73684,
     74752, 74862,
     92768, 92777,
@@ -6434,11 +6546,13 @@ void reflex::Unicode::Tables::language_scripts(void)
     93008, 93017,
     93019, 93025,
     93824, 93846,
+    119488, 119507,
     119520, 119539,
     119648, 119672,
     120782, 120831,
     123200, 123209,
     123632, 123641,
+    124144, 124153,
     125127, 125135,
     125264, 125273,
     126065, 126123,
@@ -6457,6 +6571,11 @@ void reflex::Unicode::Tables::language_scripts(void)
     0, 0
   };
   range["Nabataean"] = Nabataean;
+  static const int Nag_Mundari[] = {
+    124112, 124153,
+    0, 0
+  };
+  range["Nag_Mundari"] = Nag_Mundari;
   static const int Nandinagari[] = {
     72096, 72103,
     72106, 72151,
@@ -6519,12 +6638,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     72784, 72793,
     73040, 73049,
     73120, 73129,
+    73552, 73561,
     92768, 92777,
     92864, 92873,
     93008, 93017,
     120782, 120831,
     123200, 123209,
     123632, 123641,
+    124144, 124153,
     125264, 125273,
     130032, 130041,
     0, 0
@@ -6629,6 +6750,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     73664, 73684,
     93019, 93025,
     93824, 93846,
+    119488, 119507,
     119520, 119539,
     119648, 119672,
     125127, 125135,
@@ -6925,9 +7047,11 @@ void reflex::Unicode::Tables::language_scripts(void)
     72255, 72262,
     72346, 72348,
     72350, 72354,
+    72448, 72457,
     72769, 72773,
     72816, 72817,
     73463, 73464,
+    73539, 73551,
     73727, 73727,
     74864, 74868,
     77809, 77810,
@@ -7286,9 +7410,11 @@ void reflex::Unicode::Tables::language_scripts(void)
     72255, 72262,
     72346, 72348,
     72350, 72354,
+    72448, 72457,
     72769, 72773,
     72816, 72817,
     73463, 73464,
+    73539, 73551,
     73727, 73727,
     74864, 74868,
     77809, 77810,
@@ -7553,7 +7679,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3293, 3294,
     3296, 3299,
     3302, 3311,
-    3313, 3314,
+    3313, 3315,
     3328, 3340,
     3342, 3344,
     3346, 3396,
@@ -7586,7 +7712,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3751, 3773,
     3776, 3780,
     3782, 3782,
-    3784, 3789,
+    3784, 3790,
     3792, 3801,
     3804, 3807,
     3840, 3840,
@@ -7902,7 +8028,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     69248, 69289,
     69291, 69292,
     69296, 69297,
-    69376, 69404,
+    69373, 69404,
     69415, 69415,
     69424, 69456,
     69488, 69509,
@@ -7925,7 +8051,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70199,
-    70206, 70206,
+    70206, 70209,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -8006,12 +8132,17 @@ void reflex::Unicode::Tables::language_scripts(void)
     73107, 73112,
     73120, 73129,
     73440, 73462,
+    73472, 73488,
+    73490, 73530,
+    73534, 73538,
+    73552, 73561,
     73648, 73648,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78912, 78933,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -8039,7 +8170,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -8093,17 +8226,21 @@ void reflex::Unicode::Tables::language_scripts(void)
     121499, 121503,
     121505, 121519,
     122624, 122654,
+    122661, 122666,
     122880, 122886,
     122888, 122904,
     122907, 122913,
     122915, 122916,
     122918, 122922,
+    122928, 122989,
+    123023, 123023,
     123136, 123180,
     123184, 123197,
     123200, 123209,
     123214, 123214,
     123536, 123566,
     123584, 123641,
+    124112, 124153,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -8147,12 +8284,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126635, 126651,
     130032, 130041,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     917760, 917999,
     0, 0
   };
@@ -8627,6 +8766,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -8689,12 +8829,16 @@ void reflex::Unicode::Tables::language_scripts(void)
     73066, 73097,
     73112, 73112,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
     73648, 73648,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -8717,7 +8861,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -8755,11 +8901,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     120746, 120770,
     120772, 120779,
     122624, 122654,
+    122661, 122666,
+    122928, 122989,
     123136, 123180,
     123191, 123197,
     123214, 123214,
     123536, 123565,
     123584, 123627,
+    124112, 124139,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -8801,12 +8950,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126629, 126633,
     126635, 126651,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["PythonIdentifierStart"] = PythonIdentifierStart;
@@ -8930,7 +9081,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     11904, 11929,
     11931, 12019,
     12032, 12245,
-    12272, 12283,
+    12272, 12287,
     12292, 12292,
     12306, 12307,
     12320, 12320,
@@ -8940,6 +9091,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     12688, 12689,
     12694, 12703,
     12736, 12771,
+    12783, 12783,
     12800, 12830,
     12842, 12871,
     12880, 12880,
@@ -9032,10 +9184,10 @@ void reflex::Unicode::Tables::language_scripts(void)
     127568, 127569,
     127584, 127589,
     127744, 128727,
-    128733, 128748,
+    128732, 128748,
     128752, 128764,
-    128768, 128883,
-    128896, 128984,
+    128768, 128886,
+    128891, 128985,
     128992, 129003,
     129008, 129008,
     129024, 129035,
@@ -9046,15 +9198,13 @@ void reflex::Unicode::Tables::language_scripts(void)
     129200, 129201,
     129280, 129619,
     129632, 129645,
-    129648, 129652,
-    129656, 129660,
-    129664, 129670,
-    129680, 129708,
-    129712, 129722,
-    129728, 129733,
-    129744, 129753,
-    129760, 129767,
-    129776, 129782,
+    129648, 129660,
+    129664, 129672,
+    129680, 129725,
+    129727, 129733,
+    129742, 129755,
+    129760, 129768,
+    129776, 129784,
     129792, 129938,
     129940, 129994,
     0, 0
@@ -9327,7 +9477,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     11904, 11929,
     11931, 12019,
     12032, 12245,
-    12272, 12283,
+    12272, 12287,
     12292, 12292,
     12306, 12307,
     12320, 12320,
@@ -9336,6 +9486,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     12688, 12689,
     12694, 12703,
     12736, 12771,
+    12783, 12783,
     12800, 12830,
     12842, 12871,
     12880, 12880,
@@ -9402,10 +9553,10 @@ void reflex::Unicode::Tables::language_scripts(void)
     127584, 127589,
     127744, 127994,
     128000, 128727,
-    128733, 128748,
+    128732, 128748,
     128752, 128764,
-    128768, 128883,
-    128896, 128984,
+    128768, 128886,
+    128891, 128985,
     128992, 129003,
     129008, 129008,
     129024, 129035,
@@ -9416,15 +9567,13 @@ void reflex::Unicode::Tables::language_scripts(void)
     129200, 129201,
     129280, 129619,
     129632, 129645,
-    129648, 129652,
-    129656, 129660,
-    129664, 129670,
-    129680, 129708,
-    129712, 129722,
-    129728, 129733,
-    129744, 129753,
-    129760, 129767,
-    129776, 129782,
+    129648, 129660,
+    129664, 129672,
+    129680, 129725,
+    129727, 129733,
+    129742, 129755,
+    129760, 129768,
+    129776, 129784,
     129792, 129938,
     129940, 129994,
     0, 0
@@ -9787,7 +9936,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3293, 3294,
     3296, 3299,
     3302, 3311,
-    3313, 3314,
+    3313, 3315,
     3328, 3340,
     3342, 3344,
     3346, 3396,
@@ -9820,7 +9969,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     3751, 3773,
     3776, 3780,
     3782, 3782,
-    3784, 3789,
+    3784, 3790,
     3792, 3801,
     3804, 3807,
     3840, 3840,
@@ -10140,7 +10289,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     69248, 69289,
     69291, 69292,
     69296, 69297,
-    69376, 69404,
+    69373, 69404,
     69415, 69415,
     69424, 69456,
     69488, 69509,
@@ -10165,7 +10314,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70199,
-    70206, 70206,
+    70206, 70209,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -10246,13 +10395,16 @@ void reflex::Unicode::Tables::language_scripts(void)
     73107, 73112,
     73120, 73129,
     73440, 73462,
+    73472, 73488,
+    73490, 73530,
+    73534, 73538,
+    73552, 73561,
     73648, 73648,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
-    78896, 78904,
+    77824, 78933,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -10280,7 +10432,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -10334,17 +10488,21 @@ void reflex::Unicode::Tables::language_scripts(void)
     121499, 121503,
     121505, 121519,
     122624, 122654,
+    122661, 122666,
     122880, 122886,
     122888, 122904,
     122907, 122913,
     122915, 122916,
     122918, 122922,
+    122928, 122989,
+    123023, 123023,
     123136, 123180,
     123184, 123197,
     123200, 123209,
     123214, 123214,
     123536, 123566,
     123584, 123641,
+    124112, 124153,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -10388,12 +10546,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126635, 126651,
     130032, 130041,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     917505, 917505,
     917536, 917631,
     917760, 917999,
@@ -10872,6 +11032,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -10934,12 +11095,16 @@ void reflex::Unicode::Tables::language_scripts(void)
     73066, 73097,
     73112, 73112,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
     73648, 73648,
     73728, 74649,
     74752, 74862,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -10962,7 +11127,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -11000,11 +11167,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     120746, 120770,
     120772, 120779,
     122624, 122654,
+    122661, 122666,
+    122928, 122989,
     123136, 123180,
     123191, 123197,
     123214, 123214,
     123536, 123565,
     123584, 123627,
+    124112, 124139,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -11046,12 +11216,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126629, 126633,
     126635, 126651,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["UnicodeIdentifierStart"] = UnicodeIdentifierStart;
@@ -11586,6 +11758,7 @@ void reflex::Unicode::Tables::language_scripts(void)
     70108, 70108,
     70144, 70161,
     70163, 70187,
+    70207, 70208,
     70272, 70278,
     70280, 70280,
     70282, 70285,
@@ -11658,11 +11831,16 @@ void reflex::Unicode::Tables::language_scripts(void)
     73112, 73112,
     73120, 73129,
     73440, 73458,
+    73474, 73474,
+    73476, 73488,
+    73490, 73523,
+    73552, 73561,
     73648, 73648,
     73728, 74649,
     74880, 75075,
     77712, 77808,
-    77824, 78894,
+    77824, 78895,
+    78913, 78918,
     82944, 83526,
     92160, 92728,
     92736, 92766,
@@ -11688,7 +11866,9 @@ void reflex::Unicode::Tables::language_scripts(void)
     110581, 110587,
     110589, 110590,
     110592, 110882,
+    110898, 110898,
     110928, 110930,
+    110933, 110933,
     110948, 110951,
     110960, 111355,
     113664, 113770,
@@ -11727,6 +11907,8 @@ void reflex::Unicode::Tables::language_scripts(void)
     120772, 120779,
     120782, 120831,
     122624, 122654,
+    122661, 122666,
+    122928, 122989,
     123136, 123180,
     123191, 123197,
     123200, 123209,
@@ -11734,6 +11916,8 @@ void reflex::Unicode::Tables::language_scripts(void)
     123536, 123565,
     123584, 123627,
     123632, 123641,
+    124112, 124139,
+    124144, 124153,
     124896, 124902,
     124904, 124907,
     124909, 124910,
@@ -11777,12 +11961,14 @@ void reflex::Unicode::Tables::language_scripts(void)
     126635, 126651,
     130032, 130041,
     131072, 173791,
-    173824, 177976,
+    173824, 177977,
     177984, 178205,
     178208, 183969,
     183984, 191456,
+    191472, 192093,
     194560, 195101,
     196608, 201546,
+    201552, 205743,
     0, 0
   };
   range["Word"] = Word;
diff --git a/lib/letter_scripts.cpp b/lib/letter_scripts.cpp
index 689f285b..84166696 100644
--- a/lib/letter_scripts.cpp
+++ b/lib/letter_scripts.cpp
@@ -659,6 +659,7 @@ void reflex::Unicode::Tables::letter_scripts(void)
     120779, 120779,
     122624, 122633,
     122635, 122654,
+    122661, 122666,
     125218, 125251,
     0, 0
   };
diff --git a/lib/pattern.cpp b/lib/pattern.cpp
index 3592bddf..cfe4cdd4 100644
--- a/lib/pattern.cpp
+++ b/lib/pattern.cpp
@@ -89,6 +89,7 @@ inline int fopen_s(FILE **file, const char *name, const char *mode) { return ::f
 inline int fopen_s(FILE **file, const char *name, const char *mode) { return (*file = ::fopen(name, mode)) ? 0 : errno; }
 #endif
 
+#ifndef WITH_NO_CODEGEN
 static void print_char(FILE *file, int c, bool h = false)
 {
   if (c >= '\a' && c <= '\r')
@@ -104,24 +105,9 @@ static void print_char(FILE *file, int c, bool h = false)
   else
     ::fprintf(file, "%u", c);
 }
+#endif
 
-static const char *posix_class[] = {
-  "ASCII",
-  "Space",
-  "XDigit",
-  "Cntrl",
-  "Print",
-  "Alnum",
-  "Alpha",
-  "Blank",
-  "Digit",
-  "Graph",
-  "Lower",
-  "Punct",
-  "Upper",
-  "Word",
-};
-
+#ifndef WITH_NO_CODEGEN
 static const char *meta_label[] = {
   NULL,
   "NWB",
@@ -138,6 +124,24 @@ static const char *meta_label[] = {
   "IND",
   "DED",
 };
+#endif
+
+static const char *posix_class[] = {
+  "ASCII",
+  "Space",
+  "XDigit",
+  "Cntrl",
+  "Print",
+  "Alnum",
+  "Alpha",
+  "Blank",
+  "Digit",
+  "Graph",
+  "Lower",
+  "Punct",
+  "Upper",
+  "Word",
+};
 
 const std::string Pattern::operator[](Accept choice) const
 {
@@ -3049,6 +3053,7 @@ void Pattern::encode_dfa(DFA::State *start)
 
 void Pattern::gencode_dfa(const DFA::State *start) const
 {
+#ifndef WITH_NO_CODEGEN
   for (std::vector<std::string>::const_iterator i = opt_.f.begin(); i != opt_.f.end(); ++i)
   {
     const std::string& filename = *i;
@@ -3351,8 +3356,12 @@ void Pattern::gencode_dfa(const DFA::State *start) const
         ::fclose(file);
     }
   }
+#else
+  (void)start;
+#endif
 }
 
+#ifndef WITH_NO_CODEGEN
 void Pattern::check_dfa_closure(const DFA::State *state, int nest, bool& peek, bool& prev) const
 {
   if (nest > 5)
@@ -3381,7 +3390,9 @@ void Pattern::check_dfa_closure(const DFA::State *state, int nest, bool& peek, b
     }
   }
 }
+#endif
 
+#ifndef WITH_NO_CODEGEN
 void Pattern::gencode_dfa_closure(FILE *file, const DFA::State *state, int nest, bool peek) const
 {
   bool elif = false;
@@ -3543,9 +3554,11 @@ void Pattern::gencode_dfa_closure(FILE *file, const DFA::State *state, int nest,
   }
 #endif
 }
+#endif
 
 void Pattern::graph_dfa(const DFA::State *start) const
 {
+#ifndef WITH_NO_CODEGEN
   for (std::vector<std::string>::const_iterator i = opt_.f.begin(); i != opt_.f.end(); ++i)
   {
     const std::string& filename = *i;
@@ -3687,10 +3700,14 @@ void Pattern::graph_dfa(const DFA::State *start) const
       }
     }
   }
+#else
+  (void)start;
+#endif
 }
 
 void Pattern::export_code() const
 {
+#ifndef WITH_NO_CODEGEN
   if (nop_ == 0)
     return;
   for (std::vector<std::string>::const_iterator i = opt_.f.begin(); i != opt_.f.end(); ++i)
@@ -3789,6 +3806,7 @@ void Pattern::export_code() const
       }
     }
   }
+#endif
 }
 
 void Pattern::predict_match_dfa(const DFA::State *start)
diff --git a/man.sh b/man.sh
index 4cdf2c59..d16f3267 100755
--- a/man.sh
+++ b/man.sh
@@ -298,9 +298,11 @@ supported.
 May be used to specify ANSI SGR parameters to highlight matches and other
 attributes when option \fB--color\fR is used.  Its value is a colon-separated
 list of ANSI SGR parameters that defaults to
-\fBcx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36\fR.  The \fBmt=\fR,
-\fBms=\fR, and \fBmc=\fR capabilities of \fBGREP_COLORS\fR take priority over
-\fBGREP_COLOR\fR.  Option \fB--colors\fR takes priority over \fBGREP_COLORS\fR.
+\fBcx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36\fR with additional
+parameters for TUI colors \fB:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35\fR.
+The \fBmt=\fR, \fBms=\fR, and \fBmc=\fR capabilities of \fBGREP_COLORS\fR take
+priority over \fBGREP_COLOR\fR.  Option \fB--colors\fR takes priority over
+\fBGREP_COLORS\fR.
 .SH GREP_COLORS
 Colors are specified as string of colon-separated ANSI SGR parameters of the
 form `what=substring', where `substring' is a semicolon-separated list of ANSI
@@ -310,35 +312,47 @@ SGR codes or `k' (black), `r' (red), `g' (green), `y' (yellow), `b' (blue), `m'
 combined with one or more font properties `n' (normal), `f' (faint), `h'
 (highlight), `i' (invert), `u' (underline).  Substrings may be specified for:
 .IP \fBsl=\fR
-SGR substring for selected lines.
+selected lines.
 .IP \fBcx=\fR
-SGR substring for context lines.
+context lines.
 .IP \fBrv\fR
-Swaps the \fBsl=\fR and \fBcx=\fR capabilities when \fB-v\fR is specified.
+swaps the \fBsl=\fR and \fBcx=\fR capabilities when \fB-v\fR is specified.
 .IP \fBmt=\fR
-SGR substring for matching text in any matching line.
+matching text in any matching line.
 .IP \fBms=\fR
-SGR substring for matching text in a selected line.  The substring \fBmt=\fR by
+matching text in a selected line.  The substring \fBmt=\fR by
 default.
 .IP \fBmc=\fR
-SGR substring for matching text in a context line.  The substring \fBmt=\fR by
+matching text in a context line.  The substring \fBmt=\fR by
 default.
 .IP \fBfn=\fR
-SGR substring for filenames.
+filenames.
 .IP \fBln=\fR
-SGR substring for line numbers.
+line numbers.
 .IP \fBcn=\fR
-SGR substring for column numbers.
+column numbers.
 .IP \fBbn=\fR
-SGR substring for byte offsets.
+byte offsets.
 .IP \fBse=\fR
-SGR substring for separators.
+separators.
 .IP \fBrv\fR
 a Boolean parameter, switches \fBsl=\fR and \fBcx=\fR with option \fB-v\fR.
 .IP \fBhl\fR
 a Boolean parameter, enables filename hyperlinks (\fB\\33]8;;link\fR).
 .IP \fBne\fR
 a Boolean parameter, disables ``erase in line'' \fB\\33[K\fR.
+.IP \fBqp=\fR
+TUI prompt.
+.IP \fBqe=\fR
+TUI errors.
+.IP \fBqr=\fR
+TUI regex.
+.IP \fBqm=\fR
+TUI regex meta characters.
+.IP \fBql=\fR
+TUI regex lists and literals.
+.IP \fBqb=\fR
+TUI regex braces.
 .SH FORMAT
 Option \fB--format\fR=\fIFORMAT\fR specifies an output format for file matches.
 Fields may be used in \fIFORMAT\fR, which expand into the following values:
diff --git a/man/ugrep.1 b/man/ugrep.1
index e0e51842..329f056a 100644
--- a/man/ugrep.1
+++ b/man/ugrep.1
@@ -1,4 +1,4 @@
-.TH UGREP "1" "October 07, 2023" "ugrep 4.3.0" "User Commands"
+.TH UGREP "1" "October 18, 2023" "ugrep 4.3.1" "User Commands"
 .SH NAME
 \fBugrep\fR, \fBug\fR -- file pattern searcher
 .SH SYNOPSIS
@@ -228,9 +228,12 @@ Use COLORS to mark up text.  COLORS is a colon\-separated list of
 one or more parameters `sl=' (selected line), `cx=' (context line),
 `mt=' (matched text), `ms=' (match selected), `mc=' (match
 context), `fn=' (file name), `ln=' (line number), `cn=' (column
-number), `bn=' (byte offset), `se=' (separator).  Parameter values
-are ANSI SGR color codes or `k' (black), `r' (red), `g' (green),
-`y' (yellow), `b' (blue), `m' (magenta), `c' (cyan), `w' (white).
+number), `bn=' (byte offset), `se=' (separator), `qp=' (TUI
+prompt), `qe=' (TUI errors), `qr=' (TUI regex), `qm=' (TUI regex
+meta characters), `ql=' (TUI regex lists and literals), `qb=' (TUI
+regex braces).  Parameter values are ANSI SGR color codes or `k'
+(black), `r' (red), `g' (green), `y' (yellow), `b' (blue), `m'
+(magenta), `c' (cyan), `w' (white), or leave empty for no color.
 Upper case specifies background colors.  A `+' qualifies a color as
 bright.  A foreground and a background color may be combined with
 font properties `n' (normal), `f' (faint), `h' (highlight), `i'
@@ -594,7 +597,8 @@ search path is read, making searches potentially more expensive.
 \fB\-m\fR [\fIMIN\fR,][\fIMAX\fR], \fB\-\-min\-count\fR=\fIMIN\fR, \fB\-\-max\-count\fR=\fIMAX\fR
 Require MIN matches, stop after MAX matches when specified.  Output
 MIN to MAX matches.  For example, \fB\-m\fR1 outputs the first match and
-\fB\-c\fRm1, (with a comma) counts non\-zero matches.  See also option \fB\-K\fR.
+\fB\-c\fRm1, (with a comma) counts nonzero matches.  If \fB\-u\fR is specified,
+each individual match counts.  See also option \fB\-K\fR.
 .TP
 \fB\-\-match\fR
 Match all input.  Same as specifying an empty pattern to search.
@@ -1049,9 +1053,11 @@ supported.
 May be used to specify ANSI SGR parameters to highlight matches and other
 attributes when option \fB--color\fR is used.  Its value is a colon-separated
 list of ANSI SGR parameters that defaults to
-\fBcx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36\fR.  The \fBmt=\fR,
-\fBms=\fR, and \fBmc=\fR capabilities of \fBGREP_COLORS\fR take priority over
-\fBGREP_COLOR\fR.  Option \fB--colors\fR takes priority over \fBGREP_COLORS\fR.
+\fBcx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36\fR with additional
+parameters for TUI colors \fB:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35\fR.
+The \fBmt=\fR, \fBms=\fR, and \fBmc=\fR capabilities of \fBGREP_COLORS\fR take
+priority over \fBGREP_COLOR\fR.  Option \fB--colors\fR takes priority over
+\fBGREP_COLORS\fR.
 .SH GREP_COLORS
 Colors are specified as string of colon-separated ANSI SGR parameters of the
 form `what=substring', where `substring' is a semicolon-separated list of ANSI
@@ -1061,35 +1067,47 @@ SGR codes or `k' (black), `r' (red), `g' (green), `y' (yellow), `b' (blue), `m'
 combined with one or more font properties `n' (normal), `f' (faint), `h'
 (highlight), `i' (invert), `u' (underline).  Substrings may be specified for:
 .IP \fBsl=\fR
-SGR substring for selected lines.
+selected lines.
 .IP \fBcx=\fR
-SGR substring for context lines.
+context lines.
 .IP \fBrv\fR
-Swaps the \fBsl=\fR and \fBcx=\fR capabilities when \fB-v\fR is specified.
+swaps the \fBsl=\fR and \fBcx=\fR capabilities when \fB-v\fR is specified.
 .IP \fBmt=\fR
-SGR substring for matching text in any matching line.
+matching text in any matching line.
 .IP \fBms=\fR
-SGR substring for matching text in a selected line.  The substring \fBmt=\fR by
+matching text in a selected line.  The substring \fBmt=\fR by
 default.
 .IP \fBmc=\fR
-SGR substring for matching text in a context line.  The substring \fBmt=\fR by
+matching text in a context line.  The substring \fBmt=\fR by
 default.
 .IP \fBfn=\fR
-SGR substring for filenames.
+filenames.
 .IP \fBln=\fR
-SGR substring for line numbers.
+line numbers.
 .IP \fBcn=\fR
-SGR substring for column numbers.
+column numbers.
 .IP \fBbn=\fR
-SGR substring for byte offsets.
+byte offsets.
 .IP \fBse=\fR
-SGR substring for separators.
+separators.
 .IP \fBrv\fR
 a Boolean parameter, switches \fBsl=\fR and \fBcx=\fR with option \fB-v\fR.
 .IP \fBhl\fR
 a Boolean parameter, enables filename hyperlinks (\fB\\33]8;;link\fR).
 .IP \fBne\fR
 a Boolean parameter, disables ``erase in line'' \fB\\33[K\fR.
+.IP \fBqp=\fR
+TUI prompt.
+.IP \fBqe=\fR
+TUI errors.
+.IP \fBqr=\fR
+TUI regex.
+.IP \fBqm=\fR
+TUI regex meta characters.
+.IP \fBql=\fR
+TUI regex lists and literals.
+.IP \fBqb=\fR
+TUI regex braces.
 .SH FORMAT
 Option \fB--format\fR=\fIFORMAT\fR specifies an output format for file matches.
 Fields may be used in \fIFORMAT\fR, which expand into the following values:
diff --git a/src/query.cpp b/src/query.cpp
index dcef4c4e..aa458065 100644
--- a/src/query.cpp
+++ b/src/query.cpp
@@ -100,10 +100,8 @@ inline void set_blocking(int fd0)
 
 #endif
 
-static const char *PROMPT = "\033[32;1m";    // bright green
-static const char *CERROR = "\033[37;41;1m"; // bright white on red
-static const char *LARROW = "«";             // left arrow
-static const char *RARROW = "»";             // right arrow
+static const char *LARROW = "«"; // left arrow
+static const char *RARROW = "»"; // right arrow
 
 // return pointer to character in the query search line at screen col, taking UTF-8 double width characters into account
 char *Query::line_ptr(int col)
@@ -170,55 +168,186 @@ int Query::line_wsize()
 // draw a textual part of the query search line, this function is called by draw()
 void Query::display(int col, int len)
 {
-  char *ptr = line_ptr(col);
-  char *end = line_ptr(col + len);
-  char *err = error_ >= 0 && !Screen::mono ? line_ + error_ : NULL;
-  char *next;
+  const char *ptr = line_ptr(col);
+  const char *end = line_ptr(col + len);
+  const char *err = error_ >= 0 && !Screen::mono ? line_ + error_ : NULL;
+  const char *next;
   bool alert = false;
+  bool list = false;
+  bool braced = false;
+  bool literal = false;
+  if (!Screen::mono)
+  {
+    if (!flag_fixed_strings)
+    {
+      for (const char *look = line_; look < ptr; ++look)
+      {
+        if (!braced && !literal && *look == (list ? ']' : '['))
+          list = !list, look += (*look == '[') + (look[1] == '^' || look[1] == '\\');
+        else if (!list && !literal && *look == (braced ? '}' : '{'))
+          braced = !braced;
+        else if (!list && !braced && *look == '"' && flag_bool)
+          literal = !literal;
+        else if (*look == '\\' && look[1] == (literal ? 'E' : 'Q'))
+          literal = !literal;
+        else if (*look == '\\')
+          ++look;
+      }
+    }
+    if (literal || list)
+      Screen::put(color_ql);
+    else if (braced)
+      Screen::put(color_qb);
+    else
+      Screen::put(color_qr);
+  }
   for (next = ptr; next < end; ++next)
   {
     if (next == err)
     {
       Screen::put(ptr, next - ptr);
-      Screen::put(CERROR);
+      Screen::normal();
+      if (!Screen::mono)
+        Screen::put(color_qe);
       ptr = next;
       alert = true;
     }
-    int ch = static_cast<unsigned char>(*next);
-    if (ch < ' ' || ch == 0x7f)
+    else
     {
-      Screen::put(ptr, next - ptr);
-      if (err != NULL && alert && next > err)
+      int ch = static_cast<unsigned char>(*next);
+      if (err != NULL && alert && next > err && (ch & 0xc0) != 0x80)
       {
+        Screen::put(ptr, next - ptr);
         Screen::normal();
+        if (list)
+          Screen::put(color_ql);
+        else if (braced)
+          Screen::put(color_qb);
+        else
+          Screen::put(color_qr);
+        ptr = next;
         alert = false;
       }
-      if (!alert)
-        Screen::invert();
-      if (ch == 0x7f)
+      if (ch <= 0x1f || ch == 0x7f)
       {
-        Screen::put("^?");
+        Screen::put(ptr, next - ptr);
+        if (err != NULL && alert && next > err)
+        {
+          Screen::normal();
+          if (!Screen::mono)
+            Screen::put(color_qr);
+          alert = false;
+        }
+        if (!alert)
+          Screen::invert();
+        if (ch == 0x7f)
+        {
+          Screen::put("^?");
+        }
+        else
+        {
+          char buf[2] = { '^', static_cast<char>('@' + ch) };
+          Screen::put(buf, 2);
+        }
+        Screen::normal();
+        ptr = next + 1;
+        alert = false;
       }
-      else
+      else if (ch == '[' && !Screen::mono && !list && !literal && !braced && !flag_fixed_strings)
       {
-        char buf[2] = { '^', static_cast<char>('@' + ch) };
-        Screen::put(buf, 2);
+        list = true;
+        Screen::put(ptr, next - ptr);
+        Screen::normal();
+        Screen::put(color_qm);
+        Screen::put(ch);
+        Screen::normal();
+        Screen::put(color_ql);
+        ptr = ++next;
+        next += (*next == '^');
+        next += (*next == '\\');
+      }
+      else if (ch == ']' && !Screen::mono && list && !literal && !braced && !flag_fixed_strings)
+      {
+        list = false;
+        Screen::put(ptr, next - ptr);
+        Screen::normal();
+        Screen::put(color_qm);
+        Screen::put(ch);
+        Screen::normal();
+        Screen::put(color_qr);
+        ptr = next + 1;
+      }
+      else if (ch == '{' && !Screen::mono && !list && !literal && !braced && !flag_fixed_strings)
+      {
+        braced = true;
+        Screen::put(ptr, next - ptr);
+        Screen::normal();
+        Screen::put(color_qb);
+        ptr = next;
+      }
+      else if (ch == '}' && !Screen::mono && !list && !literal && braced && !flag_fixed_strings)
+      {
+        braced = false;
+        Screen::put(ptr, next - ptr + 1);
+        Screen::normal();
+        Screen::put(color_qr);
+        ptr = next + 1;
+      }
+      else if (ch == '"' && !Screen::mono && !list && !braced && flag_bool && !flag_fixed_strings)
+      {
+        literal = !literal;
+        Screen::put(ptr, next - ptr);
+        Screen::normal();
+        Screen::put(color_ql);
+        Screen::put(ch);
+        Screen::normal();
+        if (literal)
+          Screen::put(color_ql);
+        else
+          Screen::put(color_qr);
+        ptr = next + 1;
+      }
+      else if (ch == '\\' && next + 1 != err && next[1] >= ' ' && next[1] <= '~' && !Screen::mono && !flag_fixed_strings)
+      {
+        if (next[1] == 'E' && !list)
+          literal = false;
+        if (!literal)
+        {
+          if (next[1] == 'Q' && !list)
+            literal = true;
+          Screen::put(ptr, next - ptr);
+          Screen::normal();
+          Screen::put(color_qm);
+          Screen::put(ch);
+          Screen::put(next[1]);
+          Screen::normal();
+          if (literal || list)
+            Screen::put(color_ql);
+          else if (braced)
+            Screen::put(color_qb);
+          else
+            Screen::put(color_qr);
+          ptr = ++next + 1;
+        }
+      }
+      else if (strchr("$()*+.?^|", ch) != NULL && !list && !literal && !braced && !Screen::mono && !flag_fixed_strings)
+      {
+        if (!flag_basic_regexp || strchr("()+?|", ch) == NULL)
+        {
+          Screen::put(ptr, next - ptr);
+          Screen::normal();
+          Screen::put(color_qm);
+          Screen::put(ch);
+          Screen::normal();
+          Screen::put(color_qr);
+          ptr = next + 1;
+        }
       }
-      Screen::normal();
-      ptr = next + 1;
-      alert = false;
-    }
-    else if (err != NULL && alert && next > err && (ch & 0xc0) != 0x80)
-    {
-      Screen::put(ptr, next - ptr);
-      Screen::normal();
-      ptr = next;
-      alert = false;
     }
   }
   Screen::put(ptr, next - ptr);
-  if (next == err)
-    Screen::put(CERROR);
+  if (next == err && !Screen::mono)
+    Screen::put(color_qe);
 }
 
 // draw the query search line
@@ -266,14 +395,10 @@ void Query::draw()
       if (!Screen::mono)
       {
         Screen::normal();
-        if (error_ == -1)
-          Screen::put(PROMPT);
-        else
-          Screen::put(CERROR);
+        Screen::put(error_ == -1 ? color_qp : color_qe);
       }
 
       Screen::put(prompt_.c_str());
-
       Screen::normal();
 
       start_ += static_cast<int>(prompt_.size());
@@ -289,12 +414,7 @@ void Query::draw()
       if (offset_ > 0)
       {
         if (!Screen::mono)
-        {
-          if (error_ == -1)
-            Screen::put(PROMPT);
-          else
-            Screen::put(CERROR);
-        }
+          Screen::put(error_ == -1 ? color_qp : color_qe);
 
         Screen::put(LARROW);
         Screen::normal();
@@ -311,12 +431,7 @@ void Query::draw()
           display(offset_ + adj, Screen::cols - start_ - adj - 1);
           Screen::erase();
           if (!Screen::mono)
-          {
-            if (error_ == -1)
-              Screen::put(PROMPT);
-            else
-              Screen::put(CERROR);
-          }
+            Screen::put(error_ == -1 ? color_qp : color_qe);
           Screen::put(RARROW);
         }
         else
@@ -332,12 +447,7 @@ void Query::draw()
           display(0, Screen::cols - start_ - 1);
           Screen::erase();
           if (!Screen::mono)
-          {
-            if (error_ == -1)
-              Screen::put(PROMPT);
-            else
-              Screen::put(CERROR);
-          }
+            Screen::put(error_ == -1 ? color_qp : color_qe);
           Screen::put(RARROW);
         }
         else
@@ -608,6 +718,9 @@ void Query::erase(int num)
 // called by the main program
 void Query::query()
 {
+  // do not exit on usage warnings
+  flag_usage_warnings = true;
+
   get_stdin();
 
   if (!VKey::setup(VKey::TTYRAW))
@@ -699,25 +812,25 @@ void Query::query()
 // run the query UI
 void Query::query_ui()
 {
-  mode_       = Mode::QUERY;
-  updated_    = false;
-  message_    = false;
-  *line_      = '\0';
-  col_        = 0;
-  len_        = 0;
-  offset_     = 0;
-  shift_      = 8;
-  error_      = -1;
-  tick_       = 4;
-  row_        = 0;
-  rows_       = 0;
-  maxrows_    = Screen::rows;
-  skip_       = 0;
-  select_     = -1;
+  mode_ = Mode::QUERY;
+  updated_ = false;
+  message_ = false;
+  *line_ = '\0';
+  col_ = 0;
+  len_ = 0;
+  offset_ = 0;
+  shift_ = 8;
+  error_ = -1;
+  tick_ = 4;
+  row_ = 0;
+  rows_ = 0;
+  maxrows_ = Screen::rows;
+  skip_ = 0;
+  select_ = -1;
   select_all_ = false;
-  globbing_   = false;
-  eof_        = true;
-  buflen_     = 0;
+  globbing_ = false;
+  eof_ = true;
+  buflen_ = 0;
 
   Screen::clear();
 
@@ -760,14 +873,11 @@ void Query::query_ui()
   }
 
   set_prompt();
-
-  redraw();
-
   search();
+  redraw();
 
   bool ctrl_o = false;
   bool ctrl_v = false;
-
   bool err = false;
 
   while (true)
@@ -1257,7 +1367,7 @@ void Query::query_ui()
             else
             {
 #ifdef __APPLE__
-              Screen::put(CERROR);
+              Screen::put(color_qe);
               Screen::put(0, 0, "MacOS Terminal Preferences/Profiles/Keyboard: enable \"Use Option as Meta key\"");
 #endif
               Screen::alert();
@@ -1340,6 +1450,9 @@ void Query::search()
   found_ = 0;
   error_ = -1;
 
+  // reset ugrep stats
+  Stats::reset();
+
   Static::arg_pattern = globbing_ ? temp_ : line_;
 
   if (*Static::arg_pattern == '\0' && !flag_file.empty())
@@ -1347,12 +1460,13 @@ void Query::search()
 
   if (deselect_file_)
   {
+    // S-Tab back out of a selected file
     selected_file_.clear();
-    Static::arg_files.clear();
     deselect_file_ = false;
   }
   else if (!selected_file_.empty() && Static::arg_files.empty())
   {
+    // Tab into the selected file to search
     Static::arg_files.emplace_back(selected_file_.c_str());
   }
 
@@ -1400,6 +1514,8 @@ void Query::status(bool show)
   {
     if (tick_ < 8)
     {
+      Screen::normal();
+
       if (ff == 0)
         Screen::put(1, 0, "[no matches found]");
 
@@ -1408,7 +1524,6 @@ void Query::status(bool show)
       const char *pager = flag_view ? flag_view : "-";
 
       snprintf(banner, banlen, "%zu/%zu files | %zu dirs | %zu warnings | ^Q quit  ^T split  ^Y %s  ^Z help  %s%*s", ff, sf, sd, ws, pager, bookmark, banlen - 100, "");
-      Screen::normal();
       Screen::invert();
       Screen::put(maxrows_ - 1, 0, banner);
       Screen::normal();
@@ -1432,11 +1547,12 @@ void Query::status(bool show)
 
     if (tick_ == 4)
     {
+      Screen::normal();
+
       int spinner = "-\\|/"[spin_];
       const char *pager = flag_view ? flag_view : "-";
 
       snprintf(banner, banlen, "[%c] %zu/%zu files queued | ^Q quit  ^T split  ^Y %s  ^Z help  %s%*s", spinner, ff, sf, pager, bookmark, banlen - 100, "");
-      Screen::normal();
       Screen::invert();
       Screen::put(maxrows_ - 1, 0, banner);
       Screen::normal();
@@ -1490,6 +1606,7 @@ bool Query::update()
       Screen::setpos(row, 0);
       if (tick_ < 4)
       {
+        Screen::normal();
         if (tick_ == 0)
           Screen::erase();
         else
@@ -1521,6 +1638,7 @@ bool Query::update()
         else
         {
           // clear all below last row
+          Screen::normal();
           Screen::end();
         }
       }
@@ -1538,7 +1656,7 @@ bool Query::update()
     if (!Screen::mono)
     {
       Screen::setpos(2, 0);
-      Screen::put(CERROR);
+      Screen::put(color_qe);
       Screen::erase();
     }
 
@@ -2225,39 +2343,50 @@ void Query::view()
     if (filename.empty())
       found = false;
 
-    if (!found && Static::arg_files.size() == 1)
-    {
-      // if not found an only one FILE argument was provided then view FILE
-      filename = Static::arg_files.front();
-      found = true;
-    }
-    else if (!partname.empty())
+    if (!found)
     {
-      // cannot view an archive part
-      found = false;
+      if (Static::arg_files.size() == 1)
+      {
+        // if not found and only one FILE argument was provided then view FILE
+        filename = Static::arg_files.front();
+        if (filename == "-")
+          filename = flag_label;
+        found = true;
+      }
+      else if (flag_stdin && Static::arg_files.empty())
+      {
+        // view standard input
+        filename = flag_label;
+        found = true;
+      }
     }
-
-    // cannot view standard input
-    if (found && flag_stdin && filename.compare(flag_label) == 0)
-      found = false;
   }
 
   if (found)
   {
 #ifdef OS_WIN
     _WIN32_FILE_ATTRIBUTE_DATA attr_before;
-    found = GetFileAttributesExW(utf8_decode(filename).c_str(), GetFileExInfoStandard, &attr_before);
 #else
     struct stat buf;
-    found = stat(filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode);
+    uint64_t mtime;
+#endif
+
+    if (!flag_stdin || filename != flag_label)
+    {
+      // check if the file exists and is a regular file, also get the file's last modification time
+#ifdef OS_WIN
+      found = GetFileAttributesExW(utf8_decode(filename).c_str(), GetFileExInfoStandard, &attr_before);
+#else
+      found = stat(filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode);
 #if defined(HAVE_STAT_ST_ATIM) && defined(HAVE_STAT_ST_MTIM) && defined(HAVE_STAT_ST_CTIM)
-    uint64_t mtime = static_cast<uint64_t>(buf.st_mtim.tv_sec) * 1000000 + buf.st_mtim.tv_nsec / 1000;
+      mtime = static_cast<uint64_t>(buf.st_mtim.tv_sec) * 1000000 + buf.st_mtim.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_ATIMESPEC) && defined(HAVE_STAT_ST_MTIMESPEC) && defined(HAVE_STAT_ST_CTIMESPEC)
-    uint64_t mtime = static_cast<uint64_t>(buf.st_mtimespec.tv_sec) * 1000000 + buf.st_mtimespec.tv_nsec / 1000;
+      mtime = static_cast<uint64_t>(buf.st_mtimespec.tv_sec) * 1000000 + buf.st_mtimespec.tv_nsec / 1000;
 #else
-    uint64_t mtime = static_cast<uint64_t>(buf.st_mtime);
+      mtime = static_cast<uint64_t>(buf.st_mtime);
 #endif
 #endif
+    }
 
     if (found)
     {
@@ -2265,11 +2394,50 @@ void Query::view()
       if (line_number > 0)
         command.append(" +").append(std::to_string(line_number));
 
-      command.append(" \"").append(filename).append("\"");
-
       Screen::clear();
 
-      if (system(command.c_str()) == 0)
+      FILE *pager = NULL;
+
+      if (flag_stdin && filename == flag_label)
+      {
+        // standard input is viewed via a pipe to the pager
+#ifdef OS_WIN
+        pager = popen(command.c_str(), "wb");
+#else
+        pager = popen(command.c_str(), "w");
+#endif
+        if (pager != NULL)
+          fwrite(stdin_buffer_.c_str(), 1, stdin_buffer_.size(), pager);
+      }
+      else if (!partname.empty())
+      {
+        // archive part is viewed via a pipe to the pager
+#ifdef OS_WIN
+        pager = popen(command.c_str(), "wb");
+#else
+        pager = popen(command.c_str(), "w");
+#endif
+        if (pager != NULL)
+        {
+          try
+          {
+            ugrep_extract(filename.c_str(), partname.c_str(), pager);
+          }
+
+          catch (...)
+          {
+            // this should never happen, but just in case we ignore errors
+          }
+        }
+      }
+      else
+      {
+        // view file in the pager
+        command.append(" \"").append(filename).append("\"");
+      }
+
+      // pipe to pager was OK or execute the command
+      if ((flag_stdin && filename == flag_label) || !partname.empty() ? pager != NULL : system(command.c_str()) == 0)
       {
 #ifdef OS_WIN
         if (strcmp(flag_view, "more") == 0)
@@ -2282,25 +2450,33 @@ void Query::view()
         }
 #endif
 
-        Screen::clear();
-
-        bool changed;
+        bool changed = false;
 
+        if (pager == NULL)
+        {
+          // check if file was changed by the pager (when it is an editor)
 #ifdef OS_WIN
-        _WIN32_FILE_ATTRIBUTE_DATA attr_after;
-        changed = GetFileAttributesExW(utf8_decode(filename).c_str(), GetFileExInfoStandard, &attr_after) == 0 ||
-          attr_before.ftLastWriteTime.dwLowDateTime != attr_after.ftLastWriteTime.dwLowDateTime ||
-          attr_before.ftLastWriteTime.dwHighDateTime != attr_after.ftLastWriteTime.dwHighDateTime;
+          _WIN32_FILE_ATTRIBUTE_DATA attr_after;
+          changed = GetFileAttributesExW(utf8_decode(filename).c_str(), GetFileExInfoStandard, &attr_after) == 0 ||
+            attr_before.ftLastWriteTime.dwLowDateTime != attr_after.ftLastWriteTime.dwLowDateTime ||
+            attr_before.ftLastWriteTime.dwHighDateTime != attr_after.ftLastWriteTime.dwHighDateTime;
 #else
-        stat(filename.c_str(), &buf);
+          stat(filename.c_str(), &buf);
 #if defined(HAVE_STAT_ST_ATIM) && defined(HAVE_STAT_ST_MTIM) && defined(HAVE_STAT_ST_CTIM)
-        changed = (mtime != static_cast<uint64_t>(buf.st_mtim.tv_sec) * 1000000 + buf.st_mtim.tv_nsec / 1000);
+          changed = (mtime != static_cast<uint64_t>(buf.st_mtim.tv_sec) * 1000000 + buf.st_mtim.tv_nsec / 1000);
 #elif defined(HAVE_STAT_ST_ATIMESPEC) && defined(HAVE_STAT_ST_MTIMESPEC) && defined(HAVE_STAT_ST_CTIMESPEC)
-        changed = (mtime != static_cast<uint64_t>(buf.st_mtimespec.tv_sec) * 1000000 + buf.st_mtimespec.tv_nsec / 1000);
+          changed = (mtime != static_cast<uint64_t>(buf.st_mtimespec.tv_sec) * 1000000 + buf.st_mtimespec.tv_nsec / 1000);
 #else
-        changed = (mtime != static_cast<uint64_t>(buf.st_mtime));
+          changed = (mtime != static_cast<uint64_t>(buf.st_mtime));
 #endif
 #endif
+        }
+        else
+        {
+          // close the pipe to the pager
+          pclose(pager);
+          pager = NULL;
+        }
 
         if (changed)
         {
@@ -2322,14 +2498,13 @@ void Query::view()
     }
   }
 
-  if (!found)
+  if (!found && (!filename.empty() || !partname.empty()))
   {
     std::string problem("cannot view or edit ");
     if (partname.empty())
       problem.append(filename);
     else
-     problem.append(partname).append(" in ").append(filename);
-    problem.append(" (coming in a release update)");
+      problem.append(partname).append(" in ").append(filename);
     message(problem);
   }
 }
@@ -2457,40 +2632,46 @@ void Query::preview()
 // chdir one level down into the directory of the file located under the cursor or just above the screen
 void Query::select()
 {
-  if (flag_stdin)
-  {
-    message("cannot chdir: standard input is searched");
-    return;
-  }
-
-  if (!Static::arg_files.empty())
+  if (!selected_file_.empty())
   {
-    message("cannot chdir: file or directory arguments are present");
+    Screen::alert();
     return;
   }
 
-  int row = select_ >= 0 ? select_ : row_;
+  int ref = select_ >= 0 ? select_ : row_;
 
   // --tree: move down over non-filename lines to reach a filename
   if (flag_tree && (flag_files_with_matches || flag_count))
   {
-    while (row + 1 < rows_ && (view_[row].empty() || view_[row].front() != '\0'))
-      ++row;
+    while (ref + 1 < rows_ && (view_[ref].empty() || view_[ref].front() != '\0'))
+      ++ref;
   }
-  else if (row + 1 < rows_ && (view_[row].empty() || view_[row].front() != '\0'))
+  else
   {
-    ++row; // skip a non-filename line to get to a potential filename just below this line
+    // move down to skip empty lines
+    while (ref + 1 < rows_ && view_[ref].empty())
+      ++ref;
   }
 
   std::string pathname;
   bool found = false;
 
   // move up until a filename header is found
-  while (row >= 0 && !(found = find_filename(row, pathname, false, true)))
-    --row;
+  while (ref >= 0 && !(found = find_filename(ref, pathname, false, true)))
+    --ref;
+
+  if (pathname.empty())
+    found = false;
 
   if (found)
   {
+    // cannot view standard input
+    if (flag_stdin && pathname == flag_label)
+    {
+      message("cannot chdir to standard input");
+      return;
+    }
+
     if (globbing_)
     {
       globbing_ = false;
@@ -2502,6 +2683,9 @@ void Query::select()
       set_prompt();
     }
 
+    if (history_.empty())
+      files_.swap(Static::arg_files);
+
     history_.emplace();
     history_.top().save(line_, col_, row_, flags_, mark_);
 
@@ -2511,19 +2695,23 @@ void Query::select()
     size_t b = pathname.find('{'); // do not cd into archives
     if (n != std::string::npos && (b == std::string::npos || n < b))
     {
-      pathname.resize(n);
+      std::string dir(pathname.substr(0, n + 1));
 
-      if (chdir(pathname.c_str()) < 0)
+      if (chdir(dir.c_str()) < 0)
       {
         message("cannot chdir: operation denied");
+        history_.pop();
+        if (history_.empty())
+          files_.swap(Static::arg_files);
         return;
       }
 
+      dirs_.append(dir);
+      pathname.erase(0, n + 1);
+
       // a directory change affects --hyperlink
       set_terminal_hyperlink();
 
-      dirs_.append(pathname).append(PATHSEPSTR);
-
       search();
     }
     else
@@ -2551,13 +2739,13 @@ void Query::deselect()
   {
     if (flag_stdin)
     {
-      message("cannot chdir: standard input is searched");
+      message("cannot chdir .. because standard input is searched");
       return;
     }
 
-    if (!Static::arg_files.empty())
+    if (selected_file_.empty() && !Static::arg_files.empty())
     {
-      message("cannot chdir: file or directory arguments are present");
+      message("cannot chdir .. because file or directory arguments are present");
       return;
     }
 
@@ -2626,6 +2814,7 @@ void Query::deselect()
       dirs_.clear();
 
     deselect_file_ = true;
+    Static::arg_files.clear();
   }
 
   mark_.reset();
@@ -2635,6 +2824,8 @@ void Query::deselect()
     int row;
     history_.top().restore(line_, col_, row, flags_, mark_);
     history_.pop();
+    if (history_.empty())
+      files_.swap(Static::arg_files);
     globbing_ = false;
     set_prompt();
     len_ = line_len();
@@ -2703,6 +2894,7 @@ void Query::unselect()
   dirs_.clear();
   wdir_.clear();
   deselect_file_ = true;
+  Static::arg_files.clear();
 
   mark_.reset();
 
@@ -2713,6 +2905,7 @@ void Query::unselect()
     int row;
     history_.top().restore(line_, col_, row, flags_, mark_);
     history_.pop();
+    files_.swap(Static::arg_files);
     globbing_ = false;
     set_prompt();
     len_ = line_len();
@@ -2730,7 +2923,7 @@ void Query::message(const std::string& message)
 {
   Screen::normal();
   if (!Screen::mono)
-    Screen::put(PROMPT);
+    Screen::put(color_qp);
   Screen::put(0, 0, "-> ");
   Screen::normal();
   Screen::put(0, 3, message.c_str());
@@ -2768,8 +2961,8 @@ bool Query::help()
   Screen::clear();
   redraw();
 
-  bool ctrl_q  = false; // CTRL-Q is pressed
-  bool ctrl_o  = false; // CTRL-O is pressed
+  bool ctrl_q = false; // CTRL-Q is pressed
+  bool ctrl_o = false; // CTRL-O is pressed
   bool restart = false; // META key pressed, restart search when exiting the help screen
 
   while (true)
@@ -3707,7 +3900,7 @@ void Query::get_stdin()
     while (true)
     {
       size_t len = input.get(buffer_, QUERY_BUFFER_SIZE);
-      if (len <= 0)
+      if (len == 0)
         break;
       stdin_buffer_.append(buffer_, len);
     }
@@ -3990,6 +4183,7 @@ size_t                     Query::prevnum_;
 bool                       Query::deselect_file_;
 std::string                Query::selected_file_;
 std::stack<Query::History> Query::history_;
+std::vector<const char*>   Query::files_;
 int                        Query::skip_                = 0;
 std::vector<std::string>   Query::view_;
 std::vector<bool>          Query::selected_;
diff --git a/src/query.hpp b/src/query.hpp
index 4d2f655c..4713b3d0 100644
--- a/src/query.hpp
+++ b/src/query.hpp
@@ -305,7 +305,8 @@ class Query {
   static size_t                   prevnum_;     // the number of previous text entries
   static bool                     deselect_file_;
   static std::string              selected_file_;
-  static std::stack<History>      history_;
+  static std::stack<History>      history_;     // tabbing history
+  static std::vector<const char*> files_;       // saved arg_files command line FILEs to search
   static std::vector<std::string> view_;        // search output text to display, incrementally fetched
   static std::vector<bool>        selected_;    // marked lines in view_[] selected in selection mode
   static bool                     eof_;         // end of results, no more results can be fetched
diff --git a/src/screen.cpp b/src/screen.cpp
index edd7e449..3b14bba9 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -341,7 +341,7 @@ void Screen::cleanup()
 #endif
 }
 
-// return character width, 0 (non-spacing or invalid character), 1 (single width) or 2 (double width)
+// return character display width, 0 (non-spacing or invalid character), 1 (single width) or 2 (double width)
 int Screen::wchar_width(uint32_t wc)
 {
   /* based on https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c with full table
@@ -503,7 +503,7 @@ int Screen::put(int row, int col, const char *text, size_t size, int skip, int w
 
   int len = cols - col;
 
-  // when text starts with \0, how many more nulls to ignore, part of filename marking?
+  // when text starts with \0, how many more nulls to ignore, part of filename marking for the TUI
   nulls = *text == '\0' ? nulls : 0;
 
   if (nulls > 0)
@@ -801,7 +801,7 @@ int Screen::put(int row, int col, const char *text, size_t size, int skip, int w
             }
             else if (wc == 0x7f)
             {
-              // display control character 0x7f
+              // display control character 0x7f as ^?
               put(text, ptr - text);
               invert();
               put("^?", 2);
diff --git a/src/ugrep.cpp b/src/ugrep.cpp
index c8944288..f5246303 100644
--- a/src/ugrep.cpp
+++ b/src/ugrep.cpp
@@ -202,6 +202,13 @@ char color_cn[COLORLEN]; // column number
 char color_bn[COLORLEN]; // byte offset
 char color_se[COLORLEN]; // separator
 
+char color_qp[COLORLEN]; // TUI prompt
+char color_qe[COLORLEN]; // TUI errors
+char color_qr[COLORLEN]; // TUI regex highlight
+char color_qm[COLORLEN]; // TUI regex meta characters highlight
+char color_ql[COLORLEN]; // TUI regex lists and literals highlight
+char color_qb[COLORLEN]; // TUI regex braces highlight
+
 char match_ms[COLORLEN];  // --match or --tag: matched text in a selected line
 char match_mc[COLORLEN];  // --match or --tag: matched text in a context line
 char match_off[COLORLEN]; // --match or --tag: off
@@ -3198,8 +3205,11 @@ struct Grep {
   // search a file or archive
   virtual void search(const char *pathname, uint16_t cost);
 
-  // search a file to find matching text lines
-  virtual void find_text_preview(const char *filename, const char *partname, size_t from_lineno, size_t max, size_t& lineno, size_t& num, std::vector<std::string>& text);
+  // search input after lineno to populate a string vector with the matching line and lines after up to max lines
+  void find_text_preview(const char *filename, const char *partname, size_t from_lineno, size_t max, size_t& lineno, size_t& num, std::vector<std::string>& text);
+
+  // extract a part from an archive and send to a stream
+  void extract(const char *filename, const char *partname, FILE *output);
 
   // check CNF AND/OR/NOT conditions are met for the line(s) spanning bol to eol
   bool cnf_matching(const char *bol, const char *eol, bool acquire = false)
@@ -3449,7 +3459,7 @@ struct Grep {
   }
 
   // return true on success, create a pipe to replace file input if filtering files in a forked process
-  bool filter(FILE *& in, const char *pathname)
+  bool filter(FILE*& in, const char *pathname)
   {
 #ifndef OS_WIN
 
@@ -4423,14 +4433,14 @@ int main(int argc, const char **argv)
   if (flag_query)
   {
     if (!flag_no_messages && Static::warnings > 0)
-      abort("option -Q: warnings are present, use -s to ignore");
+      abort("option -Q: warnings are present, specify -s to ignore");
 
     Query::query();
   }
   else
   {
     if (!flag_no_messages && flag_pager != NULL && Static::warnings > 0)
-      abort("option --pager: warnings are present, use -s to ignore");
+      abort("option --pager: warnings are present, specify -s to ignore");
 
     try
     {
@@ -4594,25 +4604,32 @@ static void save_config()
 # The argument is a colon-separated list of one or more parameters `sl='\n\
 # (selected line), `cx=' (context line), `mt=' (matched text), `ms=' (match\n\
 # selected), `mc=' (match context), `fn=' (file name), `ln=' (line number),\n\
-# `cn=' (column number), `bn=' (byte offset), `se=' (separator).  Parameter\n\
-# values are ANSI SGR color codes or `k' (black), `r' (red), `g' (green), `y'\n\
-# (yellow), `b' (blue), `m' (magenta), `c' (cyan), `w' (white).  Upper case\n\
-# specifies background colors.  A `+' qualifies a color as bright.  A\n\
-# foreground and a background color may be combined with font properties `n'\n\
+# `cn=' (column number), `bn=' (byte offset), `se=' (separator), `qp=' (TUI\n\
+# prompt), `qe=' (TUI errors), `qr=' (TUI regex), `qm=' (TUI regex meta\n\
+# characters), `ql=' (TUI regex lists and literals), `qb=' (TUI regex braces).\n\
+# Parameter values are ANSI SGR color codes or `k' (black), `r' (red), `g'\n\
+# (green), `y' (yellow), `b' (blue), `m' (magenta), `c' (cyan), `w' (white), or\n\
+# leave empty for no color.\n\
+# Upper case specifies background colors.\n\
+# A `+' qualifies a color as bright.\n\
+# A foreground and a background color may be combined with font properties `n'\n\
 # (normal), `f' (faint), `h' (highlight), `i' (invert), `u' (underline).\n\
-# Parameter `hl' enables file name hyperlinks (same as --hyperlink).  Parameter\n\
-# `rv' reverses the `sl=' and `cx=' parameters when option -v is used.\n\
+# Parameter `hl' enables file name hyperlinks (same as --hyperlink).\n\
+# Parameter `rv' reverses the `sl=' and `cx=' parameters when option -v is\n\
+# used.\n\
 #\n\
 # The ugrep default color scheme:\n\
-#   colors=sl=1;37:cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36\n\
+#   colors=cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35\n\
 # The GNU grep and ripgrep default color scheme:\n\
-#   colors=sl=37:cx=33:mt=1;31:fn=35:ln=32:cn=32:bn=32:se=36\n\
+#   colors=sl=37:cx=33:mt=1;31:fn=35:ln=32:cn=32:bn=32:se=36:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35\n\
 # The silver searcher default color scheme:\n\
-#   colors=mt=30;43:fn=1;32:ln=1;33:cn=1;33:bn=1;33\n\
+#   colors=mt=30;43:fn=1;32:ln=1;33:cn=1;33:bn=1;33:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35\n\
 # Underlined bright green matches with shaded background on bright selected lines:\n\
-#   colors=sl=1:cx=33:ms=1;4;32;100:mc=1;4;32:fn=1;32;100:ln=1;32:cn=1;32:bn=1;32:se=36\n\
-# Inverted bright yellow matches:\n\
-#   colors=cx=hb:ms=hiy:mc=hic:fn=hi+y+K:ln=hg:cn=hg:bn=hg:se=c\n\n");
+#   colors=sl=1:cx=33:ms=1;4;32;100:mc=1;4;32:fn=1;32;100:ln=1;32:cn=1;32:bn=1;32:se=36:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35\n\
+# Inverted bright yellow matches and TUI regex syntax highlighting with background colors:\n\
+#   colors=cx=hb:ms=hiy:mc=hic:fn=hi+y+K:ln=hg:cn=hg:bn=hg:se=c:gp=hg:qr=hwB:qm=hwG:ql=hwC:qb=hwM\n\
+# Only change the TUI regex syntax highlighting to use background colors:\n\
+#   colors=gp=hg:qr=hwB:qm=hwG:ql=hwC:qb=hwM\n\n");
 
   fprintf(file, "# Enable color output to a terminal\n%s\n\n", flag_color != NULL ? "color" : "no-color");
   if (flag_hyperlink != NULL && *flag_hyperlink == '\0')
@@ -4697,7 +4714,7 @@ static void save_config()
   fprintf(file, "# Enable case-insensitive search, default: no-ignore-case\n%s\n\n", flag_ignore_case.is_undefined() ? "# no-ignore-case" : flag_ignore_case ? "ignore-case" : "no-ignore-case");
   fprintf(file, "# Enable smart case, default: no-smart-case\n%s\n\n", flag_smart_case.is_undefined() ? "# no-smart-case" : flag_smart_case ? "smart-case" : "no-smart-case");
   fprintf(file, "# Enable empty pattern matches, default: no-empty\n%s\n\n", flag_empty.is_undefined() ? "# no-empty" : flag_empty ? "empty" : "no-empty");
-  fprintf(file, "# Force option -c (--count) to return non-zero matches with --min-count=1, default: --min-count=0\n");
+  fprintf(file, "# Force option -c (--count) to return nonzero matches with --min-count=1, default: --min-count=0\n");
   if (flag_min_count == 0)
     fprintf(file, "# min-count=1\n\n");
   else
@@ -7013,6 +7030,13 @@ void terminal()
           set_color(grep_colors, "bn=", color_bn); // byte offset
           set_color(grep_colors, "se=", color_se); // separator
 
+          set_color(grep_colors, "qp=", color_qp); // TUI prompt
+          set_color(grep_colors, "qe=", color_qe); // TUI errors
+          set_color(grep_colors, "qr=", color_qr); // TUI regex highlight
+          set_color(grep_colors, "qm=", color_qm); // TUI regex meta characters highlight
+          set_color(grep_colors, "ql=", color_ql); // TUI regex lists and literals highlight
+          set_color(grep_colors, "qb=", color_qb); // TUI regex braces highlight
+
           // parse --colors to override GREP_COLORS
           set_color(flag_colors, "sl=", color_sl); // selected line
           set_color(flag_colors, "cx=", color_cx); // context line
@@ -7025,6 +7049,13 @@ void terminal()
           set_color(flag_colors, "bn=", color_bn); // byte offset
           set_color(flag_colors, "se=", color_se); // separator
 
+          set_color(flag_colors, "qp=", color_qp); // TUI prompt
+          set_color(flag_colors, "qe=", color_qe); // TUI errors
+          set_color(flag_colors, "qr=", color_qr); // TUI regex highlight
+          set_color(flag_colors, "qm=", color_qm); // TUI regex meta characters highlight
+          set_color(flag_colors, "ql=", color_ql); // TUI regex lists and literals highlight
+          set_color(flag_colors, "qb=", color_qb); // TUI regex braces highlight
+
           // -v: if rv in GREP_COLORS then swap the sl and cx colors (note that rv does not match color letters)
           if (flag_invert_match &&
               ((grep_colors != NULL && strstr(grep_colors, "rv") != NULL) ||
@@ -8254,6 +8285,13 @@ void ugrep_find_text_preview(const char *filename, const char *partname, size_t
   delete matcher;
 }
 
+// extract a part from an archive and send to a stream
+void ugrep_extract(const char *filename, const char *partname, FILE *output)
+{
+  Grep grep(NULL, NULL, NULL);
+  grep.extract(filename, partname, output);
+}
+
 // set the handle to be able to use cancel_ugrep()
 void Static::set_grep_handle(Grep *grep)
 {
@@ -12543,6 +12581,36 @@ void Grep::find_text_preview(const char *filename, const char *findpart, size_t
     continue;
 }
 
+// extract a part from an archive and send to a stream
+void Grep::extract(const char *filename, const char *findpart, FILE *output)
+{
+  try
+  {
+    // open (archive or compressed) file
+    if (!open_file(filename, findpart))
+      return;
+  }
+
+  catch (...)
+  {
+    // this should never happen
+    return;
+  }
+
+  // copy input to output
+  char buffer[65536];
+  while (true)
+  {
+    size_t len = input.get(buffer, sizeof(buffer));
+    if (len == 0 || fwrite(buffer, 1, len, output) < len)
+      break;
+  }
+
+  // close file or -z: loop over next extracted archive parts, when applicable
+  while (close_file(filename))
+    continue;
+}
+
 // read globs from a file and split them into files or dirs to include or exclude by pushing them onto the vectors
 void import_globs(FILE *file, std::vector<std::string>& files, std::vector<std::string>& dirs, bool gitignore)
 {
@@ -12998,9 +13066,12 @@ void help(std::ostream& out)
             one or more parameters `sl=' (selected line), `cx=' (context line),\n\
             `mt=' (matched text), `ms=' (match selected), `mc=' (match\n\
             context), `fn=' (file name), `ln=' (line number), `cn=' (column\n\
-            number), `bn=' (byte offset), `se=' (separator).  Parameter values\n\
-            are ANSI SGR color codes or `k' (black), `r' (red), `g' (green),\n\
-            `y' (yellow), `b' (blue), `m' (magenta), `c' (cyan), `w' (white).\n\
+            number), `bn=' (byte offset), `se=' (separator), `qp=' (TUI\n\
+            prompt), `qe=' (TUI errors), `qr=' (TUI regex), `qm=' (TUI regex\n\
+            meta characters), `ql=' (TUI regex lists and literals), `qb=' (TUI\n\
+            regex braces).  Parameter values are ANSI SGR color codes or `k'\n\
+            (black), `r' (red), `g' (green), `y' (yellow), `b' (blue), `m'\n\
+            (magenta), `c' (cyan), `w' (white), or leave empty for no color.\n\
             Upper case specifies background colors.  A `+' qualifies a color as\n\
             bright.  A foreground and a background color may be combined with\n\
             font properties `n' (normal), `f' (faint), `h' (highlight), `i'\n\
@@ -13339,7 +13410,8 @@ void help(std::ostream& out)
     -m [MIN,][MAX], --min-count=MIN, --max-count=MAX\n\
             Require MIN matches, stop after MAX matches when specified.  Output\n\
             MIN to MAX matches.  For example, -m1 outputs the first match and\n\
-            -cm1, (with a comma) counts non-zero matches.  See also option -K.\n\
+            -cm1, (with a comma) counts nonzero matches.  If -u is specified,\n\
+            each individual match counts.  See also option -K.\n\
     --match\n\
             Match all input.  Same as specifying an empty pattern to search.\n\
     --max-files=NUM\n\
diff --git a/src/ugrep.hpp b/src/ugrep.hpp
index bdc659c5..59df7afc 100644
--- a/src/ugrep.hpp
+++ b/src/ugrep.hpp
@@ -38,7 +38,7 @@
 #define UGREP_HPP
 
 // ugrep version
-#define UGREP_VERSION "4.3.0"
+#define UGREP_VERSION "4.3.1"
 
 // disable mmap because mmap is almost always slower than the file reading speed improvements since 3.0.0
 #define WITH_NO_MMAP
@@ -318,9 +318,9 @@ inline const char *utf8skipn(const char *s, size_t n, size_t k)
 // the default GREP_COLORS
 #ifndef DEFAULT_GREP_COLORS
 # ifdef OS_WIN
-#  define DEFAULT_GREP_COLORS "sl=1;37:cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36"
+#  define DEFAULT_GREP_COLORS "sl=1;37:cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36:qp=1;32:qe=1;37;41:qr=1;37:qm=1;32:ql=36:qb=1;35"
 # else
-#  define DEFAULT_GREP_COLORS "cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36"
+#  define DEFAULT_GREP_COLORS "cx=33:mt=1;31:fn=1;35:ln=1;32:cn=1;32:bn=1;32:se=36:qp=1;32:qe=1;37;41:qm=1;32:ql=36:qb=1;35"
 # endif
 #endif
 
@@ -521,6 +521,13 @@ extern char color_cn[COLORLEN]; // column number
 extern char color_bn[COLORLEN]; // byte offset
 extern char color_se[COLORLEN]; // separator
 
+extern char color_qp[COLORLEN]; // TUI prompt
+extern char color_qe[COLORLEN]; // TUI errors
+extern char color_qr[COLORLEN]; // TUI regex highlight
+extern char color_qm[COLORLEN]; // TUI regex meta symbols highlight
+extern char color_ql[COLORLEN]; // TUI regex bracket list highlight
+extern char color_qb[COLORLEN]; // TUI regex brace highlight
+
 extern char match_ms[COLORLEN];  // --match or --tag: matched text in a selected line
 extern char match_mc[COLORLEN];  // --match or --tag: matched text in a context line
 extern char match_off[COLORLEN]; // --match or --tag: off
@@ -565,6 +572,9 @@ extern void ugrep();
 // perform a limited ugrep search on a single file with optional archive part and store up to num results in a vector, may throw an exception
 extern void ugrep_find_text_preview(const char *filename, const char *partname, size_t from_lineno, size_t max, size_t& lineno, size_t& num, std::vector<std::string>& text);
 
+// extract a part from an archive and send to a stream
+extern void ugrep_extract(const char *filename, const char *partname, FILE *output);
+
 extern void warning(const char *message, const char *arg);
 extern void error(const char *message, const char *arg);
 extern void abort(const char *message);
diff --git a/vs/ugrep/README.txt b/vs/ugrep/README.txt
index 6f456051..733f4a5d 100755
--- a/vs/ugrep/README.txt
+++ b/vs/ugrep/README.txt
@@ -157,7 +157,7 @@ Project Configuration Properties
 		General:
 			Additional Include Directories: $(ProjectDir)\include;$(ProjectDir)\..\pcre2-10.37\src;$(ProjectDir)\..\zlib-1.2.11;$(ProjectDir)\..\bzip2-1.0.5;$(ProjectDir)\..\api;$(ProjectDir)\..\lz4-dev\lib;$(ProjectDir)\..\zstd-dev\lib
 		Preprocessor: 
-			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;HAVE_AVX2;HAVE_PCRE2;PCRE2_STATIC;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
+			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;WITH_NO_CODEGEN;HAVE_AVX2;HAVE_PCRE2;PCRE2_STATIC;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
 		Code Generation:
 			Runtime Library:
 				Multi-threaded (/MT)
@@ -182,7 +182,7 @@ Optionally, right-click on the matcher_avx512bw.cpp file to enable AVX512 when a
 
 	C/C++
 		Preprocessor: 
-			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;HAVE_AVX2;HAVE_AVX512BW;HAVE_BOOST_REGEX;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
+			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;WITH_NO_CODEGEN;HAVE_AVX2;HAVE_AVX512BW;HAVE_BOOST_REGEX;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
 		Code Generation:
 			Enable Enhanced Instruction Set: Advanced Vector Extensions 512 (/arch:AVX512) 
 
@@ -279,7 +279,7 @@ Project Configuration Properties
 		General:
 			Additional Include Directories: $(ProjectDir)\include;$(ProjectDir)\..\boost_1_72_0;$(ProjectDir)\..\zlib-1.2.11;$(ProjectDir)\..\bzip2-1.0.5;$(ProjectDir)\..\api;$(ProjectDir)\..\lz4-dev\lib;$(ProjectDir)\..\zstd-dev\lib
 		Preprocessor: 
-			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;HAVE_AVX2;HAVE_BOOST_REGEX;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
+			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;WITH_NO_CODEGEN;HAVE_AVX2;HAVE_BOOST_REGEX;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
 		Code Generation:
 			Runtime Library:
 				Multi-threaded (/MT)
@@ -310,7 +310,7 @@ Optionally, right-click on the matcher_avx512bw.cpp file to enable AVX512 when a
 
 	C/C++
 		Preprocessor: 
-			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;HAVE_AVX2;HAVE_AVX512BW;HAVE_BOOST_REGEX;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
+			Preprocessor Definitions: WIN32;NDEBUG;_CONSOLE;WITH_NO_INDENT;WITH_NO_CODEGEN;HAVE_AVX2;HAVE_AVX512BW;HAVE_BOOST_REGEX;HAVE_LIBZ;HAVE_LIBBZ2;HAVE_LIBLZMA;HAVE_LIBLZ4;HAVE_LIBZSTD;WITH_COLOR;ZLIB_WINAPI;NO_GZCOMPRESS;LZMA_API_STATIC;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS
 		Code Generation:
 			Enable Enhanced Instruction Set: Advanced Vector Extensions 512 (/arch:AVX512)