diff --git a/components/selectors/rustfmt.toml b/components/selectors/rustfmt.toml
new file mode 100644
index 00000000000..c7ad93bafe3
--- /dev/null
+++ b/components/selectors/rustfmt.toml
@@ -0,0 +1 @@
+disable_all_formatting = true
diff --git a/components/style_derive/rustfmt.toml b/components/style_derive/rustfmt.toml
new file mode 100644
index 00000000000..c7ad93bafe3
--- /dev/null
+++ b/components/style_derive/rustfmt.toml
@@ -0,0 +1 @@
+disable_all_formatting = true
diff --git a/servo-tidy.toml b/servo-tidy.toml
index a2d4f10c724..0560ae5afd8 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -86,32 +86,9 @@ packages = [
 # Files that are ignored for all tidy and lint checks.
 files = [
   "./components/net/tests/parsable_mime/text",
-  # These are ignored to avoid diverging from Gecko
-  "./components/style/counter_style/mod.rs",
-  "./components/style/properties/declaration_block.rs",
-  "./components/style/properties/helpers.mako.rs",
-  "./components/style/rule_collector.rs",
-  "./components/style/selector_map.rs",
-  "./components/style/stylesheets/import_rule.rs",
-  "./components/style/stylesheets/layer_rule.rs",
-  "./components/style/stylesheets/origin.rs",
-  "./components/style/stylesheets/page_rule.rs",
-  "./components/style/stylesheets/rule_parser.rs",
-  "./components/style/stylesheets/scroll_timeline_rule.rs",
-  "./components/style/stylist.rs",
-  "./components/style/values/animated/transform.rs",
-  "./components/style/values/computed/font.rs",
-  "./components/style/values/computed/image.rs",
-  "./components/style/values/specified/box.rs",
-  "./components/style/values/specified/color.rs",
-  "./components/style/values/specified/transform.rs",
-  # Mako does not lend itself easily to splitting long lines
-  "./components/style/properties/helpers/animated_properties.mako.rs",
-  "./components/style/properties/shorthands/text.mako.rs",
-  # Long regexes are long.
-  "./components/style/gecko/regen_atoms.py",
-  # Helper macro where actually a pseudo-element per line makes sense.
-  "./components/style/gecko/non_ts_pseudo_class_list.rs",
+  # Ignore style files to avoid diverging too much from upstream Gecko
+  "./components/style/",
+  "./components/style_derive/parse.rs",
   "./resources/hsts_preload.json",
   "./tests/wpt/meta/MANIFEST.json",
   "./tests/wpt/meta-legacy-layout/MANIFEST.json",