diff --git a/lib/analysis_options.yaml b/lib/analysis_options.yaml
index 1bfca58..7e9c1e0 100644
--- a/lib/analysis_options.yaml
+++ b/lib/analysis_options.yaml
@@ -205,6 +205,7 @@ linter:
     - use_key_in_widget_constructors
     - use_late_for_private_fields_and_variables
     - use_named_constants
+    - use_null_aware_elements
     - use_raw_strings
     - use_rethrow_when_possible
     - use_setters_to_change_properties
@@ -244,6 +245,14 @@ dart_code_metrics:
     - '**/*.graphql.dart'
 
   rules:
+    - prefer-returning-shorthands
+    - prefer-shorthands-with-static-fields
+    - prefer-shorthands-with-enums
+    - avoid-nested-shorthands
+    - prefer-shorthands-with-constructors
+    - newline-before-constructor
+    - avoid-always-null-parameters
+    - avoid-unassigned-fields
     - avoid-unremovable-callbacks-in-listeners
     - avoid-constant-switches
     - avoid-constant-conditions
diff --git a/pubspec.yaml b/pubspec.yaml
index 76c735a..e8ec600 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: theodo_analysis
 description: Lint and dcm rules for Dart and Flutter used internally at Theodo Apps.
-version: 1.8.0
+version: 1.9.0
 homepage: https://github.com/bamlab/theodo_analysis
 repository: https://github.com/bamlab/theodo_analysis