diff --git a/rubocop.yml b/rubocop.yml
index 222cb19d..3d227783 100644
--- a/rubocop.yml
+++ b/rubocop.yml
@@ -10,12 +10,15 @@ inherit_mode:
   - Include
 
 AllCops:
-  StyleGuideBaseURL: https://shopify.github.io/ruby-style-guide/
   NewCops: disable # New cops will be triaged by style guide maintainers instead.
+  StyleGuideBaseURL: https://shopify.github.io/ruby-style-guide/
 
 Bundler/OrderedGems:
   Enabled: false
 
+Gemspec/AddRuntimeDependency:
+  Enabled: true
+
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 
@@ -44,8 +47,8 @@ Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 Layout/FirstArrayElementLineBreak:
-  Enabled: true
   AllowMultilineFinalElement: true
+  Enabled: true
 
 Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
@@ -54,8 +57,8 @@ Layout/FirstHashElementLineBreak:
   Enabled: true
 
 Layout/FirstMethodArgumentLineBreak:
-  Enabled: true
   AllowMultilineFinalElement: true
+  Enabled: true
 
 Layout/HashAlignment:
   EnforcedLastArgumentHashStyle: ignore_implicit
@@ -76,15 +79,15 @@ Layout/LineLength:
   - "\\A\\s*def test_\\w+\\s*\\Z"
 
 Layout/MultilineArrayLineBreaks:
-  Enabled: true
   AllowMultilineFinalElement: true
+  Enabled: true
 
 Layout/MultilineHashKeyLineBreaks:
   Enabled: true
 
 Layout/MultilineMethodArgumentLineBreaks:
-  Enabled: true
   AllowMultilineFinalElement: true
+  Enabled: true
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
@@ -111,6 +114,9 @@ Lint/AmbiguousOperatorPrecedence:
 Lint/AmbiguousRange:
   Enabled: false
 
+Lint/ArrayLiteralInRegexp:
+  Enabled: true
+
 Lint/BooleanSymbol:
   Enabled: false
 
@@ -120,6 +126,9 @@ Lint/ConstantDefinitionInBlock:
 Lint/ConstantOverwrittenInRescue:
   Enabled: true
 
+Lint/ConstantReassignment:
+  Enabled: true
+
 Lint/DeprecatedConstants:
   Enabled: false
 
@@ -150,6 +159,9 @@ Lint/DuplicateRequire:
 Lint/DuplicateRescueException:
   Enabled: false
 
+Lint/DuplicateSetElement:
+  Enabled: true
+
 Lint/EmptyBlock:
   Enabled: false
 
@@ -180,6 +192,9 @@ Lint/FloatComparison:
 Lint/HashCompareByIdentity:
   Enabled: false
 
+Lint/HashNewWithKeywordArgumentsAsDefault:
+  Enabled: true
+
 Lint/IdentityComparison:
   Enabled: false
 
@@ -228,6 +243,9 @@ Lint/NonDeterministicRequireOrder:
 Lint/NumberedParameterAssignment:
   Enabled: false
 
+Lint/NumericOperationWithConstantResult:
+  Enabled: true
+
 Lint/OrAssignmentToConstant:
   Enabled: false
 
@@ -296,6 +314,9 @@ Lint/ShadowedArgument:
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
+Lint/SharedMutableDefault:
+  Enabled: true
+
 Lint/StructNewOverride:
   Enabled: false
 
@@ -317,6 +338,9 @@ Lint/TrailingCommaInAttributeDeclaration:
 Lint/TripleQuotes:
   Enabled: false
 
+Lint/UnescapedBracketInRegexp:
+  Enabled: true
+
 Lint/UnexpectedBlockArity:
   Enabled: false
 
@@ -335,9 +359,15 @@ Lint/UriEscapeUnescape:
 Lint/UriRegexp:
   Enabled: false
 
+Lint/UselessDefined:
+  Enabled: true
+
 Lint/UselessMethodDefinition:
   Enabled: false
 
+Lint/UselessNumericOperation:
+  Enabled: true
+
 Lint/UselessRescue:
   Enabled: true
 
@@ -400,10 +430,10 @@ Naming/MethodParameterName:
   Enabled: false
 
 Naming/PredicateName:
-  NamePrefix:
-  - is_
   ForbiddenPrefixes:
   - is_
+  NamePrefix:
+  - is_
 
 Naming/RescuedExceptionsVariableName:
   Enabled: false
@@ -432,6 +462,9 @@ Style/AccessorGrouping:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
+Style/AmbiguousEndlessMethodDefinition:
+  Enabled: true
+
 Style/ArgumentsForwarding:
   Enabled: false
 
@@ -441,6 +474,9 @@ Style/ArrayIntersect:
 Style/BisectedAttrAccessor:
   Enabled: false
 
+Style/BitwisePredicate:
+  Enabled: true
+
 Style/CaseEquality:
   AllowOnConstant: true
   AllowOnSelfClass: true
@@ -452,8 +488,8 @@ Style/ClassEqualityComparison:
   Enabled: false
 
 Style/ClassMethodsDefinitions:
-  EnforcedStyle: self_class
   Enabled: true
+  EnforcedStyle: self_class
 
 Style/CollectionCompact:
   Enabled: false
@@ -461,6 +497,9 @@ Style/CollectionCompact:
 Style/ColonMethodDefinition:
   Enabled: false
 
+Style/CombinableDefined:
+  Enabled: true
+
 Style/CombinableLoops:
   Enabled: false
 
@@ -482,6 +521,9 @@ Style/DataInheritance:
 Style/DateTime:
   Enabled: true
 
+Style/DigChain:
+  Enabled: true
+
 Style/Dir:
   Enabled: false
 
@@ -539,9 +581,15 @@ Style/FetchEnvVar:
 Style/FileEmpty:
   Enabled: true
 
+Style/FileNull:
+  Enabled: true
+
 Style/FileRead:
   Enabled: false
 
+Style/FileTouch:
+  Enabled: true
+
 Style/FileWrite:
   Enabled: false
 
@@ -552,11 +600,11 @@ Style/FormatStringToken:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
-  SafeAutoCorrect: true
-  EnforcedStyle: always_true
   Details: 'Add `# frozen_string_literal: true` to the top of the file. Frozen string
     literals will become the default in a future Ruby version, and we want to make
     sure we''re ready.'
+  EnforcedStyle: always_true
+  SafeAutoCorrect: true
 
 Style/GuardClause:
   Enabled: false
@@ -576,6 +624,9 @@ Style/HashExcept:
 Style/HashLikeCase:
   Enabled: false
 
+Style/HashSlice:
+  Enabled: true
+
 Style/HashTransformKeys:
   Enabled: false
 
@@ -597,6 +648,12 @@ Style/InverseMethods:
 Style/InvertibleUnlessCondition:
   Enabled: true
 
+Style/ItAssignment:
+  Enabled: true
+
+Style/KeywordArgumentsMerging:
+  Enabled: true
+
 Style/KeywordParametersOrder:
   Enabled: false
 
@@ -622,7 +679,6 @@ Style/MapToSet:
   Enabled: false
 
 Style/MethodCallWithArgsParentheses:
-  Enabled: true
   AllowedMethods:
   - require
   - require_relative
@@ -630,6 +686,7 @@ Style/MethodCallWithArgsParentheses:
   - yield
   - raise
   - puts
+  Enabled: true
   Exclude:
   - "/**/Gemfile"
 
@@ -759,6 +816,9 @@ Style/RedundantHeredocDelimiterQuotes:
 Style/RedundantInitialize:
   Enabled: false
 
+Style/RedundantInterpolationUnfreeze:
+  Enabled: true
+
 Style/RedundantLineContinuation:
   Enabled: true
 
@@ -804,9 +864,15 @@ Style/ReturnNilInPredicateMethodDefinition:
   Enabled: true
 <% end %>
 
+Style/SafeNavigationChainLength:
+  Enabled: true
+
 Style/SelectByRegexp:
   Enabled: false
 
+Style/SendWithLiteralMethodName:
+  Enabled: true
+
 Style/SingleArgumentDig:
   Enabled: false
 
@@ -839,6 +905,9 @@ Style/StringLiteralsInInterpolation:
 Style/StructInheritance:
   Enabled: false
 
+Style/SuperArguments:
+  Enabled: true
+
 <% if rubocop_version >= "1.58" %>
 Style/SuperWithArgsParentheses:
   Enabled: true
@@ -881,72 +950,3 @@ Style/YAMLFileRead:
 
 Style/YodaCondition:
   Enabled: false
-
-Gemspec/AddRuntimeDependency:
-  Enabled: true
-
-Lint/ArrayLiteralInRegexp:
-  Enabled: true
-
-Lint/ConstantReassignment:
-  Enabled: true
-
-Lint/DuplicateSetElement:
-  Enabled: true
-
-Lint/HashNewWithKeywordArgumentsAsDefault:
-  Enabled: true
-
-Lint/NumericOperationWithConstantResult:
-  Enabled: true
-
-Lint/SharedMutableDefault:
-  Enabled: true
-
-Lint/UnescapedBracketInRegexp:
-  Enabled: true
-
-Lint/UselessDefined:
-  Enabled: true
-
-Lint/UselessNumericOperation:
-  Enabled: true
-
-Style/AmbiguousEndlessMethodDefinition:
-  Enabled: true
-
-Style/BitwisePredicate:
-  Enabled: true
-
-Style/CombinableDefined:
-  Enabled: true
-
-Style/DigChain:
-  Enabled: true
-
-Style/FileNull:
-  Enabled: true
-
-Style/FileTouch:
-  Enabled: true
-
-Style/HashSlice:
-  Enabled: true
-
-Style/ItAssignment:
-  Enabled: true
-
-Style/KeywordArgumentsMerging:
-  Enabled: true
-
-Style/RedundantInterpolationUnfreeze:
-  Enabled: true
-
-Style/SafeNavigationChainLength:
-  Enabled: true
-
-Style/SendWithLiteralMethodName:
-  Enabled: true
-
-Style/SuperArguments:
-  Enabled: true