diff --git a/analysis_options.yaml b/analysis_options.yaml
index 07e49b9..5d52a63 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,15 +1,9 @@
 include: package:pedantic/analysis_options.yaml
-analyzer:
-  errors:
-    dead_code: error
-    override_on_non_overriding_method: error
-    unused_element: error
-    unused_import: error
-    unused_local_variable: error
-    todo: ignore
+
 linter:
   rules:
     - always_declare_return_types
+    - always_require_non_null_named_parameters
     - annotate_overrides
     - avoid_empty_else
     - avoid_function_literals_in_foreach_calls
@@ -20,67 +14,46 @@
     - avoid_return_types_on_setters
     - avoid_returning_null
     - avoid_returning_null_for_future
-    - avoid_shadowing_type_parameters
-    - avoid_types_as_parameter_names
     - avoid_unused_constructor_parameters
     - await_only_futures
+    - camel_case_extensions
     - camel_case_types
     - cancel_subscriptions
     - comment_references
     - constant_identifier_names
     - control_flow_in_finally
+    - curly_braces_in_flow_control_structures
     - directives_ordering
-    - empty_catches
-    - empty_constructor_bodies
     - empty_statements
     - hash_and_equals
     - implementation_imports
     - invariant_booleans
     - iterable_contains_unrelated_type
-    - library_names
-    - library_prefixes
     - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - no_adjacent_strings_in_list
-    - no_duplicate_case_values
     - non_constant_identifier_names
-    - null_closures
-    - omit_local_variable_types
     - only_throw_errors
     - overridden_fields
     - package_api_docs
     - package_names
     - package_prefixed_library_names
-    - prefer_adjacent_string_concatenation
-    - prefer_collection_literals
-    - prefer_conditional_assignment
     - prefer_const_constructors
-    - prefer_contains
-    - prefer_equal_for_default_values
-    - prefer_final_fields
-    - prefer_generic_function_type_aliases
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_if_null_operators
     - prefer_initializing_formals
-    #- prefer_interpolation_to_compose_strings
-    - prefer_is_empty
-    - prefer_is_not_empty
-    #- prefer_single_quotes
+    - prefer_iterable_whereType
+    - prefer_single_quotes
+    - prefer_spread_collections
     - prefer_typing_uninitialized_variables
-    - recursive_getters
-    - slash_for_doc_comments
     - test_types_in_equals
     - throw_in_finally
-    - type_init_formals
-    - unawaited_futures
     - unnecessary_await_in_return
     - unnecessary_brace_in_string_interps
-    - unnecessary_const
     - unnecessary_getters_setters
     - unnecessary_lambdas
-    - unnecessary_new
     - unnecessary_null_aware_assignments
+    - unnecessary_null_in_if_null_operators
     - unnecessary_parenthesis
     - unnecessary_statements
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    - use_rethrow_when_possible
-    - valid_regexps
+    - use_function_type_syntax_for_parameters