diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml
index 9411422..2363ba4 100644
--- a/xcode/.swiftlint.yml
+++ b/xcode/.swiftlint.yml
@@ -1,36 +1,62 @@
 opt_in_rules:
+
+  # performance
+
+  - first_where
+  - last_where
+  - empty_string
+  - empty_count
+
+  # idiomatic
+
+  - legacy_random
+  - pattern_matching_keywords
+  - redundant_nil_coalescing
+  - redundant_type_annotation
+  - static_operator
+  - toggle_bool
+  - joined_default_parameter
+  - implicitly_unwrapped_optional
+  - convenience_type
+  - object_literal
+  - force_unwrapping
+  - force_cast
+  - force_try
+  - fatal_error_message
+  - extension_access_modifier
+  - explicit_init
+
+  # style
+
+  - literal_expression_end_indentation
+  - multiline_arguments_brackets
+  - multiline_function_chains
+  - multiline_literal_brackets
+  - multiline_parameters
+  - multiline_parameters_brackets
+  - operator_usage_whitespace
+  - switch_case_on_newline
+  - unneeded_parentheses_in_closure_argument
+  - vertical_parameter_alignment_on_call
+  - vertical_whitespace_between_cases
+  - vertical_whitespace_closing_braces
+  - yoda_condition
+  - number_separator
+  - let_var_whitespace
+  - implicit_return
+  - conditional_returns_on_newline
   - closure_spacing
   - closure_end_indentation
-  - conditional_returns_on_newline
 
-  - empty_count
-  - explicit_init
-  - extension_access_modifier
-
-  - fatal_error_message
-  - first_where
-  - force_unwrapping
-
-  - implicit_return
-
-  - let_var_whitespace
-
-  - multiline_parameters
-
-  - nimble_operator - discuss
-  - number_separator
-
-  - object_literal
-  - overridden_super_call
+  # lint
 
+  - private_action
   - private_outlet
   - prohibited_super_call
-
-  - redundant_nil_coalescing
-
-  - unneeded_parentheses_in_closure_argument
-
-  - vertical_parameter_alignment_on_call
+  - unused_import
+  - unused_private_declaration
+  - identical_operands
+  - overridden_super_call
 
 excluded:
   - Carthage