diff --git a/analysis_options.yaml b/analysis_options.yaml
index 63fb278c..824e9aee 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -41,9 +41,14 @@ dart_code_metrics:
   metrics-exclude:
     - test/**
   rules:
-    - newline-before-return
+    - avoid-nested-conditional-expressions:
+        - acceptable-level: 2
+    - avoid-throw-in-catch-block # throwWithStackTrace should be used instead
+    - avoid-unnecessary-type-casts
+    - avoid-unused-parameters # should use throwaway syntax in such cases
     - no-boolean-literal-compare
     - no-empty-block
-    - prefer-trailing-comma
-    - prefer-conditional-expressions
     - no-equal-then-else
+    - no-magic-number:
+        - allowed: [3.14, -1, 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 100]
+    - prefer-correct-type-name