diff --git a/.clang-tidy b/.clang-tidy
index 4e0602b32..630f1723e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -56,6 +56,14 @@ HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
 FormatStyle: 'file'
 CheckOptions:
+  - key:             cert-dcl16-c.NewSuffixes
+    value:           'L;LL;LU;LLU'
+  - key:             cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+    value:           '1'
+  - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions
+    value:           '0'
+  - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
+    value:           '0'
   - key:             google-build-namespaces.HeaderFileExtensions
     value:           ',h'
   - key:             google-readability-braces-around-statements.ShortStatementLines
@@ -92,8 +100,18 @@ CheckOptions:
     value:           '5'
   - key:             modernize-use-auto.RemoveStars
     value:           '0'
+  - key:             modernize-use-emplace.ContainersWithPushBack
+    value:           '::std::vector;::std::list;::std::deque'
+  - key:             modernize-use-emplace.SmartPointers
+    value:           '::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr'
+  - key:             modernize-use-emplace.TupleMakeFunctions
+    value:           '::std::make_pair;::std::make_tuple'
+  - key:             modernize-use-emplace.TupleTypes
+    value:           '::std::pair;::std::tuple'
   - key:             modernize-use-equals-default.IgnoreMacros
     value:           '1'
+  - key:             modernize-use-equals-delete.IgnoreMacros
+    value:           '1'
   - key:             modernize-use-noexcept.ReplacementString
     value:           ''
   - key:             modernize-use-noexcept.UseNoexceptFalse
@@ -102,10 +120,24 @@ CheckOptions:
     value:           'NULL'
   - key:             performance-faster-string-find.StringLikeClasses
     value:           'std::basic_string'
+  - key:             performance-for-range-copy.AllowedTypes
+    value:           ''
+  - key:             performance-for-range-copy.WarnOnAllAutoCopies
+    value:           '0'
+  - key:             performance-inefficient-string-concatenation.StrictMode
+    value:           '0'
+  - key:             performance-inefficient-vector-operation.VectorLikeClasses
+    value:           '::std::vector'
   - key:             performance-move-const-arg.CheckTriviallyCopyableMove
     value:           '1'
+  - key:             performance-move-constructor-init.IncludeStyle
+    value:           llvm
   - key:             performance-type-promotion-in-math-fn.IncludeStyle
     value:           llvm
+  - key:             performance-unnecessary-copy-initialization.AllowedTypes
+    value:           ''
+  - key:             performance-unnecessary-value-param.AllowedTypes
+    value:           ''
   - key:             performance-unnecessary-value-param.IncludeStyle
     value:           llvm
   - key:             readability-identifier-naming.AbstractClassCase