diff --git a/README.md b/README.md
index 2bc617a6..cd96e124 100644
--- a/README.md
+++ b/README.md
@@ -200,8 +200,8 @@ Compression tools:
                                    - 0: Skip intra if inter is good enough.
                                    - 1: Rough intra mode search with SATD.
                                    - 2: Refine intra mode search with SSE.
-                                   - 3: Try all intra modes and enable intra
-                                        chroma mode search.
+                                   - 3: Enable intra chroma mode search.
+                                   - 4: Try all intra modes.
       --(no-)mv-rdo          : Rate-distortion optimized motion vector costs
                                [disabled]
       --(no-)zero-coeff-rdo  : If a CU is set inter, check if forcing zero
@@ -209,6 +209,7 @@ Compression tools:
       --(no-)full-intra-search : Try all intra modes during rough search.
                                [disabled]
       --(no-)transform-skip  : Try transform skip [disabled]
+      --tr-skip-max-size     : Max log2 size of transform skip 2..5 [2]
       --me <string>          : Integer motion estimation algorithm [hexbs]
                                    - hexbs: Hexagon Based Search
                                    - tz:    Test Zone Search
@@ -266,11 +267,13 @@ Compression tools:
                                For rd=0..1: Try the first candidate.
                                For rd=2.. : Try the best candidate based
                                             on luma satd cost. [enabled]
-      --max-merge <integer>  : Maximum number of merge candidates, 1..5 [5]
+      --max-merge <integer>  : Maximum number of merge candidates, 1..6 [6]
       --(no-)implicit-rdpcm  : Implicit residual DPCM. Currently only supported
                                with lossless coding. [disabled]
       --(no-)tmvp            : Temporal motion vector prediction [enabled]
-      --mts <string>         : Multiple Transform Selection [off].
+      --(no-)mrl             : Enable use of multiple reference lines in intra
+                               predictions.
+      --(no-)mip             : Enable matrix weighted intra prediction.      --mts <string>         : Multiple Transform Selection [off].
                                (Currently only implemented for intra
                                and has effect only when rd >= 2)
                                    - off: MTS disabled
@@ -279,6 +282,13 @@ Compression tools:
                                    - both: MTS applied for both intra and inter blocks.
                                    - implicit: uses implicit MTS. Applies DST7 instead 
                                                of DCT2 to certain intra blocks.
+      --(no-)jccr            : Joint coding of chroma residual.                                Requires rdo> = 2. [disabled]
+      --(no-)cclm            : Cross component linear model. 
+                               Extra chroma prediction modes that are formed
+                               via linear transformation from the luma
+                               prediction. Requires rdo >=3. [disabled
+      --(no-)amvr            : Adaptive Motion Vector Resolution.
+                               Code some mv's with reduced resolution [disabled]
 
 Parallel processing:
       --threads <integer>    : Number of threads to use [auto]
diff --git a/doc/kvazaar.1 b/doc/kvazaar.1
index 017b34c0..f6f7821a 100644
--- a/doc/kvazaar.1
+++ b/doc/kvazaar.1
@@ -1,4 +1,4 @@
-.TH KVAZAAR "1" "July 2021" "uvg266 v2.0.0" "User Commands"
+.TH KVAZAAR "1" "March 2022" "uvg266 v2.1.0" "User Commands"
 .SH NAME
 uvg266 \- open source VVC encoder
 .SH SYNOPSIS
@@ -248,8 +248,8 @@ Intra mode search complexity [0]
     \- 0: Skip intra if inter is good enough.
     \- 1: Rough intra mode search with SATD.
     \- 2: Refine intra mode search with SSE.
-    \- 3: Try all intra modes and enable intra
-         chroma mode search.
+    \- 3: Enable intra chroma mode search.
+    \- 4: Try all intra modes.
 .TP
 \fB\-\-(no\-)mv\-rdo         
 Rate\-distortion optimized motion vector costs
@@ -266,6 +266,9 @@ Try all intra modes during rough search.
 \fB\-\-(no\-)transform\-skip 
 Try transform skip [disabled]
 .TP
+\fB\-\-tr\-skip\-max\-size    
+Max log2 size of transform skip 2..5 [2]
+.TP
 \fB\-\-me <string>         
 Integer motion estimation algorithm [hexbs]
     \- hexbs: Hexagon Based Search
@@ -359,7 +362,7 @@ Try the best candidate based
              on luma satd cost. [enabled]
 .TP
 \fB\-\-max\-merge <integer> 
-Maximum number of merge candidates, 1..5 [5]
+Maximum number of merge candidates, 1..6 [6]
 .TP
 \fB\-\-(no\-)implicit\-rdpcm 
 Implicit residual DPCM. Currently only supported
@@ -368,7 +371,12 @@ with lossless coding. [disabled]
 \fB\-\-(no\-)tmvp           
 Temporal motion vector prediction [enabled]
 .TP
-\fB\-\-mts <string>        
+\fB\-\-(no\-)mrl            
+Enable use of multiple reference lines in intra
+predictions.
+.TP
+\fB\-\-(no\-)mip            
+Enable matrix weighted intra prediction.      \-\-mts <string>        
 Multiple Transform Selection [off].
 (Currently only implemented for intra
 and has effect only when rd >= 2)
@@ -378,6 +386,19 @@ and has effect only when rd >= 2)
     \- both: MTS applied for both intra and inter blocks.
     \- implicit: uses implicit MTS. Applies DST7 instead 
                 of DCT2 to certain intra blocks.
+.TP
+\fB\-\-(no\-)jccr           
+Joint coding of chroma residual.                                Requires rdo> = 2. [disabled]
+.TP
+\fB\-\-(no\-)cclm           
+Cross component linear model. 
+Extra chroma prediction modes that are formed
+via linear transformation from the luma
+prediction. Requires rdo >=3. [disabled
+.TP
+\fB\-\-(no\-)amvr           
+Adaptive Motion Vector Resolution.
+Code some mv's with reduced resolution [disabled]
 
 .SS "Parallel processing:"
 .TP