diff --git a/MODULE.bazel b/MODULE.bazel
index 1e66a96d..83339a7c 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -96,7 +96,7 @@ annex_scalafmt.install(
     artifacts = [
         "org.scalameta:parsers_2.13:4.9.7",
         "org.scalameta:metaconfig-core_2.13:0.13.0",
-        "org.scalameta:scalafmt-core_2.13:3.8.2",
+        "org.scalameta:scalafmt-core_2.13:3.9.7",
     ],
     fetch_sources = True,
     lock_file = "//:annex_scalafmt_install.json",
diff --git a/annex_scalafmt_install.json b/annex_scalafmt_install.json
index d34dbb87..646291d2 100644
--- a/annex_scalafmt_install.json
+++ b/annex_scalafmt_install.json
@@ -1,36 +1,12 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 947240537,
-  "__RESOLVED_ARTIFACTS_HASH": 394657198,
+  "__INPUT_ARTIFACTS_HASH": 946099427,
+  "__RESOLVED_ARTIFACTS_HASH": -533228911,
+  "conflict_resolution": {
+    "org.scalameta:metaconfig-core_2.13:0.13.0": "org.scalameta:metaconfig-core_2.13:0.15.0",
+    "org.scalameta:parsers_2.13:4.9.7": "org.scalameta:parsers_2.13:4.13.6"
+  },
   "artifacts": {
-    "com.geirsson:metaconfig-core_2.13": {
-      "shasums": {
-        "jar": "2c91199ae5b206afdd52538f8c4da67c1794bcce0b5b06cf25679db00cf32c19",
-        "sources": "ee580615d04a856f07ef3c951d3bd11b0d1f5d1c3f25394bc6e9b14a7054fb14"
-      },
-      "version": "0.12.0"
-    },
-    "com.geirsson:metaconfig-pprint_2.13": {
-      "shasums": {
-        "jar": "6d8b0b4279116c11d4f29443bd2a9411bedb3d86ccaf964599a9420f530ed062",
-        "sources": "c6e46a8f940b62574b09edce3a0b0f3824e7241d46eacd0518c4b82f66bea8b3"
-      },
-      "version": "0.12.0"
-    },
-    "com.geirsson:metaconfig-typesafe-config_2.13": {
-      "shasums": {
-        "jar": "b4c5dbf863dadde363d8bd24333ce1091fec94fc5b88efd04607a26f3eab61b8",
-        "sources": "218c549853b2217dce6337b7d2853e9feb3f17376e23fd36d4e30b1e427075ce"
-      },
-      "version": "0.12.0"
-    },
-    "com.google.protobuf:protobuf-java": {
-      "shasums": {
-        "jar": "6a9a2dff91dcf71f85be71ae971f6164b5a631dcd34bff08f0618535ca44ad02",
-        "sources": "98118edf28c74f173b25d8fce03f86ff95d61009df0c66324333573ec842f5d3"
-      },
-      "version": "3.19.6"
-    },
     "com.lihaoyi:fansi_2.13": {
       "shasums": {
         "jar": "fcae26580f7d6e72adbd6e5c504bb1715fbe3f5fb814d70e84bc5427a835e42c",
@@ -45,159 +21,145 @@
       },
       "version": "0.4.2"
     },
-    "com.thesamet.scalapb:lenses_2.13": {
-      "shasums": {
-        "jar": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf",
-        "sources": "268a45ae25f08e4236a2194fd180bd29c2607920827d7342bb3f8ac77481010c"
-      },
-      "version": "0.11.17"
-    },
-    "com.thesamet.scalapb:scalapb-runtime_2.13": {
-      "shasums": {
-        "jar": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077",
-        "sources": "2e14340da16b0f7dc2c1d41c6b26b3bf0a691e05319a3d08e73b1c5d221dc67f"
-      },
-      "version": "0.11.17"
-    },
     "com.typesafe:config": {
       "shasums": {
-        "jar": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f",
-        "sources": "89af318a607f7e2b2691ed1ef4b4890bd37ea17d6986b0aec50dd4d5f889520c"
+        "jar": "8ada4c185ce72416712d63e0b5afdc5f009c0cdf405e5f26efecdf156aa5dfb6",
+        "sources": "d3330505601cc47d97d03349d93dff32c85ec3881b5b168a8881c6af8ceb852a"
       },
-      "version": "1.4.1"
+      "version": "1.4.3"
     },
     "io.github.java-diff-utils:java-diff-utils": {
       "shasums": {
-        "jar": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
-        "sources": "fa24217b6eaa115a05d4a8f0003fe913c62716ca2184d2e4f17de4a7d42a8822"
+        "jar": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
+        "sources": "85e4ed33a7688be204d36d48a244cf815c05b54c626c6297ec4cf75be2af922f"
       },
-      "version": "4.12"
-    },
-    "net.java.dev.jna:jna": {
-      "shasums": {
-        "jar": "34ed1e1f27fa896bca50dbc4e99cf3732967cec387a7a0d5e3486c09673fe8c6",
-        "sources": "ebd774c761215676cda059fd68240628ef99f4aafa6d355ae00d184855aef134"
-      },
-      "version": "5.14.0"
+      "version": "4.15"
     },
     "org.jline:jline": {
       "shasums": {
-        "jar": "421efcde9db04c34b9c03cd66e0460e75e5cdd4a3cafde54ef370049ac092e7c",
-        "sources": "fc452b72d16b34773168a8e5e6aa9d5a54e4bd85fc099e397fe34e4133ab5efd"
+        "jdk8": "9d165aff3d714a455de2e711dc90df09fdb0a0969a1cd4d52aa72a44cb545db0",
+        "sources": "6ca4d8eacb00f9c99a86732f99087ce1f8f2b94294651b042cb6fdcfbf73e136"
       },
-      "version": "3.25.1"
+      "version": "3.27.1"
     },
     "org.scala-lang.modules:scala-collection-compat_2.13": {
       "shasums": {
-        "jar": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
-        "sources": "1a60fde64d08f19fe2ce38d99accf6cfefa4eeac3c194fa36ef5f6b89b5f7564"
-      },
-      "version": "2.12.0"
-    },
-    "org.scala-lang.modules:scala-parallel-collections_2.13": {
-      "shasums": {
-        "jar": "68f266c4fa37cb20a76e905ad940e241190ce288b7e4a9877f1dd1261cd1a9a7",
-        "sources": "7f190cd21b0a2de3e0509920b5d548174c2c4a791108b854673ea40f3ea331d2"
+        "jar": "40f141575b57796bf0c1e4b5f0974d91e3a6dee6ecea47ceed62c0efa1298234",
+        "sources": "76b9e86eb8f6cba0a93c271169bfa46b3e1c647477e39c68c9adc55c0a27ffc6"
       },
-      "version": "1.0.4"
+      "version": "2.13.0"
     },
     "org.scala-lang:scala-compiler": {
       "shasums": {
-        "jar": "17b7e1dd95900420816a3bc2788c8c7358c2a3c42899765a5c463a46bfa569a6",
-        "sources": "d6fc2c62cb90e32d5c08a1fbd312e2c5995d2a128f89ce34a5181e52cbff0809"
+        "jar": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
+        "sources": "e922dc2f97d545fdc083f2fcf2915eb00c7647f3770b95489de0bc9ef7b54a3e"
       },
-      "version": "2.13.14"
+      "version": "2.13.16"
     },
     "org.scala-lang:scala-library": {
       "shasums": {
-        "jar": "43e0ca1583df1966eaf02f0fbddcfb3784b995dd06bfc907209347758ce4b7e3",
-        "sources": "4be0650f427ebf6ff8a462fe634fdc02665d59ec3962c4d98dbf5ac766f1dd4f"
+        "jar": "1ebb2b6f9e4eb4022497c19b1e1e825019c08514f962aaac197145f88ed730f1",
+        "sources": "c02edc324e7db59c52115214a6ef36e2d78d0a50dff635eda4dcee5502b1dea5"
       },
-      "version": "2.13.14"
+      "version": "2.13.16"
     },
     "org.scala-lang:scala-reflect": {
       "shasums": {
-        "jar": "8846baaa8cf43b1b19725ab737abff145ca58d14a4d02e75d71ca8f7ca5f2926",
-        "sources": "94bf451e612d9460dbc7cee4beed84a7e5dd7b86bcb901ee8c78f7cf5e035e01"
+        "jar": "fb49ccd9cac7464486ab993cda20a3c1569d8ef26f052e897577ad2a4970fb1d",
+        "sources": "11c15fbf9ee203e262049fdd54d8b8472e1601970fba655678c237629815117e"
       },
-      "version": "2.13.14"
+      "version": "2.13.16"
     },
-    "org.scala-lang:scalap": {
+    "org.scalameta:common_2.13": {
       "shasums": {
-        "jar": "b92a0f32ae645064f828005f883ce4aeec110fe6971f1b030643ff005a77e7c0",
-        "sources": "9537d815ee0cf482379b4a2f270ae7746aa92822c12403c264e2566d496c6d40"
+        "jar": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f",
+        "sources": "f525477507eef239bedf45cdc57a13441bcc52cf0dce01498ff8848437fcb53b"
       },
-      "version": "2.13.14"
+      "version": "4.13.6"
     },
-    "org.scalameta:common_2.13": {
+    "org.scalameta:io_2.13": {
       "shasums": {
-        "jar": "2a94a8ab2e8151279738a0ed7989c085a5f61636df5087611ca65f083747f5ab",
-        "sources": "6b6c6c24164802bb750caa793ae4fab9857b71f4018f25bdb15eacb324937a7a"
+        "jar": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9",
+        "sources": "9922701148889896e00ff04e54dc4b27049f5c1b211c4438f2f4f340e9168ed8"
       },
-      "version": "4.9.7"
+      "version": "4.13.6"
     },
     "org.scalameta:mdoc-parser_2.13": {
       "shasums": {
-        "jar": "c7fd2cfd6b23d2b118945301c720650db20c9bbedf80f37e26b218afca3ae2e2",
-        "sources": "f33544adbc642c83b6056a1ee828ebd4e16e860fef4f1a7c0806df9ead889001"
+        "jar": "d1462cf777c227a9a751ae9aae3cb7ab7c3fc1f70689f35eafe58746e33566cc",
+        "sources": "75f10d53ccb7459087b8c966aab3d7eb85988f706396839948d7610c03e2feab"
       },
-      "version": "2.5.2"
+      "version": "2.6.4"
     },
     "org.scalameta:metaconfig-core_2.13": {
       "shasums": {
-        "jar": "d01b98aea01a48297d10b45472f9892fbde4a12a40f4e059271b5a818d18f425",
-        "sources": "e9198448760ee50c4c85603448253788da56bf6725c71bca0aa2fe65eeee2ef4"
+        "jar": "c0b789c2d4468238fc325ef0a17f1a029b3635ff12b510bde03dd577a1281278",
+        "sources": "2b7d19eeef271242082938ff385ba5ff67cff8d4f27931da5428382daab415c3"
       },
-      "version": "0.13.0"
+      "version": "0.15.0"
     },
     "org.scalameta:metaconfig-pprint_2.13": {
       "shasums": {
-        "jar": "173b3b32e4101d91479968b0c311071d2b056811d2f0d3cba934bbbfb04637a6",
-        "sources": "1e015629bfc50954b12b7c0b31ab88c9fc26b30eedd9b3a5546f7696843ca412"
+        "jar": "357e65682c00db62978f0dd21fea01f13a5f0fb31b45308ad74b136b1ec4f021",
+        "sources": "948a8e8125c4a492b19c1ccfc15f8b47652de01b0169210892913a64601e00c0"
+      },
+      "version": "0.15.0"
+    },
+    "org.scalameta:metaconfig-typesafe-config_2.13": {
+      "shasums": {
+        "jar": "2ae5a8ecba43fb809696e419f1f98739e419534cc25918e2d8949a2d2727327e",
+        "sources": "bdcae524648e8207dae36bc08c667d5a479bd18a5ab2f8bf7df9d128a258c55a"
       },
-      "version": "0.13.0"
+      "version": "0.15.0"
     },
     "org.scalameta:parsers_2.13": {
       "shasums": {
-        "jar": "401cbfef329bbb1a700cd4f3532769c0d552e22fe18781959cee652586fb0410",
-        "sources": "a73f2975408fc0b0846192673b4499a4dffe199f5088fadf1849e87f0304d8fa"
+        "jar": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c",
+        "sources": "2bfd3ea99d78a772269cbe6c1e065cc77d1dc6c68b72d00ea6faed14c952487e"
       },
-      "version": "4.9.7"
+      "version": "4.13.6"
     },
     "org.scalameta:scalafmt-config_2.13": {
       "shasums": {
-        "jar": "0ba81c4e3ea109e4d75f9e956a5d1ae75eb6731d1502ea2cd26492d22daf2fe0",
-        "sources": "671f383c9730c70ace4a79ea0c9c9523e335b4c224a32fac8f22547b4976d9cc"
+        "jar": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2",
+        "sources": "fb811acf23d227522b1e98c2537002aa3aed212e2ee731b1a26598847f03c606"
       },
-      "version": "3.8.2"
+      "version": "3.9.7"
     },
     "org.scalameta:scalafmt-core_2.13": {
       "shasums": {
-        "jar": "d5f6a2eb56850875b30b7efd16cb829e010e5da64959c831f1706b7bda780c9b",
-        "sources": "3bf791f0c4216974238474ba4dea338025e1c5bc2d82dd2f3c3aa3554190150d"
+        "jar": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6",
+        "sources": "6b3e9cdcbe5dd2ce902553593dea28104a0e6bac381961c5b009a05e95c94baf"
+      },
+      "version": "3.9.7"
+    },
+    "org.scalameta:scalafmt-macros_2.13": {
+      "shasums": {
+        "jar": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8",
+        "sources": "5ba8e3519ed164ccdc3d16f502dbaf0d010f77f2f56899d0ef53f674ddfa7fac"
       },
-      "version": "3.8.2"
+      "version": "3.9.7"
     },
     "org.scalameta:scalafmt-sysops_2.13": {
       "shasums": {
-        "jar": "292f0e5f9bc51ebfe80f15a15232269a0de1ad1f90a105719a40411ab17c0226",
-        "sources": "078c8a3daa0eb621617cb0b7b07e4668fa5116f18dc6bb68832ce4ae9b29fe54"
+        "jar": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60",
+        "sources": "6dae2e68ee677947757e76eba24d039e2c4b38c2e8162bf63c2dad8020e63e93"
       },
-      "version": "3.8.2"
+      "version": "3.9.7"
     },
     "org.scalameta:scalameta_2.13": {
       "shasums": {
-        "jar": "8ac56c994ebdd81115d2af9d39ab7c4cf5559a2822765deb8ddf085bf30f9092",
-        "sources": "36c1629d23d86c72b08ead6b51b746fd72c52be4e6a8f3c752fac341817c33f1"
+        "jar": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503",
+        "sources": "47b699e20a873cb90dc97c17ad701d7366b6ad938ca0bfca797c2a320223e95f"
       },
-      "version": "4.9.6"
+      "version": "4.13.6"
     },
     "org.scalameta:trees_2.13": {
       "shasums": {
-        "jar": "c273b84a54fbfef3a48a36ce14310b0e93a7b139a1186019717b25876bd3bb8c",
-        "sources": "81ae77354163118c728f5b7424efd43290e1c2c7b3bc665fb30ffb4978a2f67b"
+        "jar": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015",
+        "sources": "0cb90c0c9acec39ae63672c441277b86dceed90187c53d72910bd8bc01279f47"
       },
-      "version": "4.9.7"
+      "version": "4.13.6"
     },
     "org.typelevel:paiges-core_2.13": {
       "shasums": {
@@ -208,24 +170,6 @@
     }
   },
   "dependencies": {
-    "com.geirsson:metaconfig-core_2.13": [
-      "com.geirsson:metaconfig-pprint_2.13",
-      "org.scala-lang.modules:scala-collection-compat_2.13",
-      "org.scala-lang:scala-library",
-      "org.scala-lang:scala-reflect",
-      "org.typelevel:paiges-core_2.13"
-    ],
-    "com.geirsson:metaconfig-pprint_2.13": [
-      "com.lihaoyi:fansi_2.13",
-      "org.scala-lang:scala-compiler",
-      "org.scala-lang:scala-library",
-      "org.scala-lang:scala-reflect"
-    ],
-    "com.geirsson:metaconfig-typesafe-config_2.13": [
-      "com.geirsson:metaconfig-core_2.13",
-      "com.typesafe:config",
-      "org.scala-lang:scala-library"
-    ],
     "com.lihaoyi:fansi_2.13": [
       "com.lihaoyi:sourcecode_2.13",
       "org.scala-lang:scala-library"
@@ -233,38 +177,23 @@
     "com.lihaoyi:sourcecode_2.13": [
       "org.scala-lang:scala-library"
     ],
-    "com.thesamet.scalapb:lenses_2.13": [
-      "org.scala-lang.modules:scala-collection-compat_2.13",
-      "org.scala-lang:scala-library"
-    ],
-    "com.thesamet.scalapb:scalapb-runtime_2.13": [
-      "com.google.protobuf:protobuf-java",
-      "com.thesamet.scalapb:lenses_2.13",
-      "org.scala-lang.modules:scala-collection-compat_2.13",
-      "org.scala-lang:scala-library"
-    ],
     "org.scala-lang.modules:scala-collection-compat_2.13": [
       "org.scala-lang:scala-library"
     ],
-    "org.scala-lang.modules:scala-parallel-collections_2.13": [
-      "org.scala-lang:scala-library"
-    ],
     "org.scala-lang:scala-compiler": [
       "io.github.java-diff-utils:java-diff-utils",
-      "net.java.dev.jna:jna",
-      "org.jline:jline",
+      "org.jline:jline:jar:jdk8",
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-reflect"
     ],
     "org.scala-lang:scala-reflect": [
       "org.scala-lang:scala-library"
     ],
-    "org.scala-lang:scalap": [
-      "org.scala-lang:scala-compiler"
-    ],
     "org.scalameta:common_2.13": [
       "com.lihaoyi:sourcecode_2.13",
-      "com.thesamet.scalapb:scalapb-runtime_2.13",
+      "org.scala-lang:scala-library"
+    ],
+    "org.scalameta:io_2.13": [
       "org.scala-lang:scala-library"
     ],
     "org.scalameta:mdoc-parser_2.13": [
@@ -283,88 +212,55 @@
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-reflect"
     ],
+    "org.scalameta:metaconfig-typesafe-config_2.13": [
+      "com.typesafe:config",
+      "org.scala-lang:scala-library",
+      "org.scalameta:metaconfig-core_2.13"
+    ],
     "org.scalameta:parsers_2.13": [
       "org.scala-lang:scala-library",
       "org.scalameta:trees_2.13"
     ],
     "org.scalameta:scalafmt-config_2.13": [
-      "com.geirsson:metaconfig-core_2.13",
-      "com.geirsson:metaconfig-typesafe-config_2.13",
-      "org.scala-lang:scala-library"
+      "org.scala-lang:scala-library",
+      "org.scalameta:metaconfig-core_2.13",
+      "org.scalameta:metaconfig-typesafe-config_2.13"
     ],
     "org.scalameta:scalafmt-core_2.13": [
       "org.scala-lang:scala-library",
-      "org.scala-lang:scala-reflect",
       "org.scalameta:mdoc-parser_2.13",
       "org.scalameta:scalafmt-config_2.13",
-      "org.scalameta:scalafmt-sysops_2.13",
+      "org.scalameta:scalafmt-macros_2.13",
+      "org.scalameta:scalafmt-sysops_2.13"
+    ],
+    "org.scalameta:scalafmt-macros_2.13": [
+      "org.scala-lang:scala-library",
+      "org.scala-lang:scala-reflect",
       "org.scalameta:scalameta_2.13"
     ],
     "org.scalameta:scalafmt-sysops_2.13": [
-      "org.scala-lang.modules:scala-parallel-collections_2.13",
       "org.scala-lang:scala-library"
     ],
     "org.scalameta:scalameta_2.13": [
       "org.scala-lang:scala-library",
-      "org.scala-lang:scalap",
       "org.scalameta:parsers_2.13"
     ],
     "org.scalameta:trees_2.13": [
       "org.scala-lang:scala-library",
-      "org.scalameta:common_2.13"
+      "org.scalameta:common_2.13",
+      "org.scalameta:io_2.13"
     ],
     "org.typelevel:paiges-core_2.13": [
       "org.scala-lang:scala-library"
     ]
   },
   "packages": {
-    "com.geirsson:metaconfig-core_2.13": [
-      "metaconfig",
-      "metaconfig.annotation",
-      "metaconfig.cli",
-      "metaconfig.error",
-      "metaconfig.generic",
-      "metaconfig.internal"
-    ],
-    "com.geirsson:metaconfig-pprint_2.13": [
-      "metaconfig.pprint"
-    ],
-    "com.geirsson:metaconfig-typesafe-config_2.13": [
-      "metaconfig",
-      "metaconfig.typesafeconfig"
-    ],
-    "com.google.protobuf:protobuf-java": [
-      "com.google.protobuf",
-      "com.google.protobuf.compiler"
-    ],
     "com.lihaoyi:fansi_2.13": [
       "fansi"
     ],
     "com.lihaoyi:sourcecode_2.13": [
       "sourcecode"
     ],
-    "com.thesamet.scalapb:lenses_2.13": [
-      "scalapb.lenses"
-    ],
-    "com.thesamet.scalapb:scalapb-runtime_2.13": [
-      "com.google.protobuf.any",
-      "com.google.protobuf.api",
-      "com.google.protobuf.compiler.plugin",
-      "com.google.protobuf.descriptor",
-      "com.google.protobuf.duration",
-      "com.google.protobuf.empty",
-      "com.google.protobuf.field_mask",
-      "com.google.protobuf.source_context",
-      "com.google.protobuf.struct",
-      "com.google.protobuf.timestamp",
-      "com.google.protobuf.type",
-      "com.google.protobuf.wrappers",
-      "scalapb",
-      "scalapb.descriptors",
-      "scalapb.internal",
-      "scalapb.options",
-      "scalapb.textformat"
-    ],
     "com.typesafe:config": [
       "com.typesafe.config",
       "com.typesafe.config.impl",
@@ -378,13 +274,7 @@
       "com.github.difflib.text",
       "com.github.difflib.unifieddiff"
     ],
-    "net.java.dev.jna:jna": [
-      "com.sun.jna",
-      "com.sun.jna.internal",
-      "com.sun.jna.ptr",
-      "com.sun.jna.win32"
-    ],
-    "org.jline:jline": [
+    "org.jline:jline:jar:jdk8": [
       "org.jline.builtins",
       "org.jline.builtins.ssh",
       "org.jline.builtins.telnet",
@@ -402,7 +292,6 @@
       "org.jline.terminal",
       "org.jline.terminal.impl",
       "org.jline.terminal.impl.exec",
-      "org.jline.terminal.impl.ffm",
       "org.jline.terminal.impl.jansi",
       "org.jline.terminal.impl.jansi.freebsd",
       "org.jline.terminal.impl.jansi.linux",
@@ -431,15 +320,6 @@
       "scala.util.control.compat",
       "scala.util.matching.compat"
     ],
-    "org.scala-lang.modules:scala-parallel-collections_2.13": [
-      "scala.collection",
-      "scala.collection.generic",
-      "scala.collection.immutable",
-      "scala.collection.mutable",
-      "scala.collection.parallel",
-      "scala.collection.parallel.immutable",
-      "scala.collection.parallel.mutable"
-    ],
     "org.scala-lang:scala-compiler": [
       "com.github.difflib",
       "com.github.difflib.algorithm",
@@ -555,11 +435,6 @@
       "scala.reflect.macros.whitebox",
       "scala.reflect.runtime"
     ],
-    "org.scala-lang:scalap": [
-      "scala.tools.scalap",
-      "scala.tools.scalap.scalax.rules",
-      "scala.tools.scalap.scalax.rules.scalasig"
-    ],
     "org.scalameta:common_2.13": [
       "org.scalameta",
       "org.scalameta.adt",
@@ -576,20 +451,21 @@
       "scala.meta.internal.classifiers",
       "scala.meta.internal.platform",
       "scala.meta.internal.prettyprinters",
-      "scala.meta.internal.semanticdb",
-      "scala.meta.internal.semanticidx",
       "scala.meta.internal.tokens",
       "scala.meta.internal.transversers",
       "scala.meta.internal.trees",
       "scala.meta.prettyprinters"
     ],
+    "org.scalameta:io_2.13": [
+      "scala.meta.internal.io",
+      "scala.meta.io"
+    ],
     "org.scalameta:mdoc-parser_2.13": [
       "mdoc.parser"
     ],
     "org.scalameta:metaconfig-core_2.13": [
       "metaconfig",
       "metaconfig.annotation",
-      "metaconfig.cli",
       "metaconfig.error",
       "metaconfig.generic",
       "metaconfig.internal"
@@ -597,6 +473,10 @@
     "org.scalameta:metaconfig-pprint_2.13": [
       "metaconfig.pprint"
     ],
+    "org.scalameta:metaconfig-typesafe-config_2.13": [
+      "metaconfig",
+      "metaconfig.typesafeconfig"
+    ],
     "org.scalameta:parsers_2.13": [
       "scala.meta.internal.parsers",
       "scala.meta.internal.quasiquotes",
@@ -614,43 +494,33 @@
       "org.scalafmt.rewrite",
       "org.scalafmt.util"
     ],
+    "org.scalameta:scalafmt-macros_2.13": [
+      "org.scalafmt.config"
+    ],
     "org.scalameta:scalafmt-sysops_2.13": [
       "org.scalafmt",
       "org.scalafmt.sysops"
     ],
     "org.scalameta:scalameta_2.13": [
       "scala.meta",
-      "scala.meta.cli",
       "scala.meta.contrib",
       "scala.meta.contrib.equality",
       "scala.meta.contrib.implicits",
-      "scala.meta.contrib.instances",
-      "scala.meta.internal.classpath",
-      "scala.meta.internal.cli",
-      "scala.meta.internal.javacp",
-      "scala.meta.internal.javacp.asm",
-      "scala.meta.internal.metacp",
-      "scala.meta.internal.metap",
-      "scala.meta.internal.scalacp",
-      "scala.meta.internal.semanticdb",
-      "scala.meta.internal.semanticidx",
-      "scala.meta.internal.symtab",
-      "scala.meta.metacp",
-      "scala.meta.metap"
+      "scala.meta.contrib.instances"
     ],
     "org.scalameta:trees_2.13": [
       "scala.meta",
+      "scala.meta.contrib",
       "scala.meta.dialects",
       "scala.meta.inputs",
       "scala.meta.internal",
       "scala.meta.internal.dialects",
       "scala.meta.internal.inputs",
-      "scala.meta.internal.io",
+      "scala.meta.internal.parsers",
       "scala.meta.internal.prettyprinters",
       "scala.meta.internal.tokenizers",
       "scala.meta.internal.tokens",
       "scala.meta.internal.trees",
-      "scala.meta.io",
       "scala.meta.shaded.internal.fastparse",
       "scala.meta.shaded.internal.fastparse.internal",
       "scala.meta.shaded.internal.geny",
@@ -664,56 +534,44 @@
   },
   "repositories": {
     "https://repo.maven.apache.org/maven2/": [
-      "com.geirsson:metaconfig-core_2.13",
-      "com.geirsson:metaconfig-core_2.13:jar:sources",
-      "com.geirsson:metaconfig-pprint_2.13",
-      "com.geirsson:metaconfig-pprint_2.13:jar:sources",
-      "com.geirsson:metaconfig-typesafe-config_2.13",
-      "com.geirsson:metaconfig-typesafe-config_2.13:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.lihaoyi:fansi_2.13",
       "com.lihaoyi:fansi_2.13:jar:sources",
       "com.lihaoyi:sourcecode_2.13",
       "com.lihaoyi:sourcecode_2.13:jar:sources",
-      "com.thesamet.scalapb:lenses_2.13",
-      "com.thesamet.scalapb:lenses_2.13:jar:sources",
-      "com.thesamet.scalapb:scalapb-runtime_2.13",
-      "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources",
       "com.typesafe:config",
       "com.typesafe:config:jar:sources",
       "io.github.java-diff-utils:java-diff-utils",
       "io.github.java-diff-utils:java-diff-utils:jar:sources",
-      "net.java.dev.jna:jna",
-      "net.java.dev.jna:jna:jar:sources",
-      "org.jline:jline",
+      "org.jline:jline:jar:jdk8",
       "org.jline:jline:jar:sources",
       "org.scala-lang.modules:scala-collection-compat_2.13",
       "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources",
-      "org.scala-lang.modules:scala-parallel-collections_2.13",
-      "org.scala-lang.modules:scala-parallel-collections_2.13:jar:sources",
       "org.scala-lang:scala-compiler",
       "org.scala-lang:scala-compiler:jar:sources",
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-library:jar:sources",
       "org.scala-lang:scala-reflect",
       "org.scala-lang:scala-reflect:jar:sources",
-      "org.scala-lang:scalap",
-      "org.scala-lang:scalap:jar:sources",
       "org.scalameta:common_2.13",
       "org.scalameta:common_2.13:jar:sources",
+      "org.scalameta:io_2.13",
+      "org.scalameta:io_2.13:jar:sources",
       "org.scalameta:mdoc-parser_2.13",
       "org.scalameta:mdoc-parser_2.13:jar:sources",
       "org.scalameta:metaconfig-core_2.13",
       "org.scalameta:metaconfig-core_2.13:jar:sources",
       "org.scalameta:metaconfig-pprint_2.13",
       "org.scalameta:metaconfig-pprint_2.13:jar:sources",
+      "org.scalameta:metaconfig-typesafe-config_2.13",
+      "org.scalameta:metaconfig-typesafe-config_2.13:jar:sources",
       "org.scalameta:parsers_2.13",
       "org.scalameta:parsers_2.13:jar:sources",
       "org.scalameta:scalafmt-config_2.13",
       "org.scalameta:scalafmt-config_2.13:jar:sources",
       "org.scalameta:scalafmt-core_2.13",
       "org.scalameta:scalafmt-core_2.13:jar:sources",
+      "org.scalameta:scalafmt-macros_2.13",
+      "org.scalameta:scalafmt-macros_2.13:jar:sources",
       "org.scalameta:scalafmt-sysops_2.13",
       "org.scalameta:scalafmt-sysops_2.13:jar:sources",
       "org.scalameta:scalameta_2.13",
@@ -724,56 +582,44 @@
       "org.typelevel:paiges-core_2.13:jar:sources"
     ],
     "https://maven-central.storage-download.googleapis.com/maven2/": [
-      "com.geirsson:metaconfig-core_2.13",
-      "com.geirsson:metaconfig-core_2.13:jar:sources",
-      "com.geirsson:metaconfig-pprint_2.13",
-      "com.geirsson:metaconfig-pprint_2.13:jar:sources",
-      "com.geirsson:metaconfig-typesafe-config_2.13",
-      "com.geirsson:metaconfig-typesafe-config_2.13:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.lihaoyi:fansi_2.13",
       "com.lihaoyi:fansi_2.13:jar:sources",
       "com.lihaoyi:sourcecode_2.13",
       "com.lihaoyi:sourcecode_2.13:jar:sources",
-      "com.thesamet.scalapb:lenses_2.13",
-      "com.thesamet.scalapb:lenses_2.13:jar:sources",
-      "com.thesamet.scalapb:scalapb-runtime_2.13",
-      "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources",
       "com.typesafe:config",
       "com.typesafe:config:jar:sources",
       "io.github.java-diff-utils:java-diff-utils",
       "io.github.java-diff-utils:java-diff-utils:jar:sources",
-      "net.java.dev.jna:jna",
-      "net.java.dev.jna:jna:jar:sources",
-      "org.jline:jline",
+      "org.jline:jline:jar:jdk8",
       "org.jline:jline:jar:sources",
       "org.scala-lang.modules:scala-collection-compat_2.13",
       "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources",
-      "org.scala-lang.modules:scala-parallel-collections_2.13",
-      "org.scala-lang.modules:scala-parallel-collections_2.13:jar:sources",
       "org.scala-lang:scala-compiler",
       "org.scala-lang:scala-compiler:jar:sources",
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-library:jar:sources",
       "org.scala-lang:scala-reflect",
       "org.scala-lang:scala-reflect:jar:sources",
-      "org.scala-lang:scalap",
-      "org.scala-lang:scalap:jar:sources",
       "org.scalameta:common_2.13",
       "org.scalameta:common_2.13:jar:sources",
+      "org.scalameta:io_2.13",
+      "org.scalameta:io_2.13:jar:sources",
       "org.scalameta:mdoc-parser_2.13",
       "org.scalameta:mdoc-parser_2.13:jar:sources",
       "org.scalameta:metaconfig-core_2.13",
       "org.scalameta:metaconfig-core_2.13:jar:sources",
       "org.scalameta:metaconfig-pprint_2.13",
       "org.scalameta:metaconfig-pprint_2.13:jar:sources",
+      "org.scalameta:metaconfig-typesafe-config_2.13",
+      "org.scalameta:metaconfig-typesafe-config_2.13:jar:sources",
       "org.scalameta:parsers_2.13",
       "org.scalameta:parsers_2.13:jar:sources",
       "org.scalameta:scalafmt-config_2.13",
       "org.scalameta:scalafmt-config_2.13:jar:sources",
       "org.scalameta:scalafmt-core_2.13",
       "org.scalameta:scalafmt-core_2.13:jar:sources",
+      "org.scalameta:scalafmt-macros_2.13",
+      "org.scalameta:scalafmt-macros_2.13:jar:sources",
       "org.scalameta:scalafmt-sysops_2.13",
       "org.scalameta:scalafmt-sysops_2.13:jar:sources",
       "org.scalameta:scalameta_2.13",
@@ -784,56 +630,44 @@
       "org.typelevel:paiges-core_2.13:jar:sources"
     ],
     "https://mirror.bazel.build/repo1.maven.org/maven2/": [
-      "com.geirsson:metaconfig-core_2.13",
-      "com.geirsson:metaconfig-core_2.13:jar:sources",
-      "com.geirsson:metaconfig-pprint_2.13",
-      "com.geirsson:metaconfig-pprint_2.13:jar:sources",
-      "com.geirsson:metaconfig-typesafe-config_2.13",
-      "com.geirsson:metaconfig-typesafe-config_2.13:jar:sources",
-      "com.google.protobuf:protobuf-java",
-      "com.google.protobuf:protobuf-java:jar:sources",
       "com.lihaoyi:fansi_2.13",
       "com.lihaoyi:fansi_2.13:jar:sources",
       "com.lihaoyi:sourcecode_2.13",
       "com.lihaoyi:sourcecode_2.13:jar:sources",
-      "com.thesamet.scalapb:lenses_2.13",
-      "com.thesamet.scalapb:lenses_2.13:jar:sources",
-      "com.thesamet.scalapb:scalapb-runtime_2.13",
-      "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources",
       "com.typesafe:config",
       "com.typesafe:config:jar:sources",
       "io.github.java-diff-utils:java-diff-utils",
       "io.github.java-diff-utils:java-diff-utils:jar:sources",
-      "net.java.dev.jna:jna",
-      "net.java.dev.jna:jna:jar:sources",
-      "org.jline:jline",
+      "org.jline:jline:jar:jdk8",
       "org.jline:jline:jar:sources",
       "org.scala-lang.modules:scala-collection-compat_2.13",
       "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources",
-      "org.scala-lang.modules:scala-parallel-collections_2.13",
-      "org.scala-lang.modules:scala-parallel-collections_2.13:jar:sources",
       "org.scala-lang:scala-compiler",
       "org.scala-lang:scala-compiler:jar:sources",
       "org.scala-lang:scala-library",
       "org.scala-lang:scala-library:jar:sources",
       "org.scala-lang:scala-reflect",
       "org.scala-lang:scala-reflect:jar:sources",
-      "org.scala-lang:scalap",
-      "org.scala-lang:scalap:jar:sources",
       "org.scalameta:common_2.13",
       "org.scalameta:common_2.13:jar:sources",
+      "org.scalameta:io_2.13",
+      "org.scalameta:io_2.13:jar:sources",
       "org.scalameta:mdoc-parser_2.13",
       "org.scalameta:mdoc-parser_2.13:jar:sources",
       "org.scalameta:metaconfig-core_2.13",
       "org.scalameta:metaconfig-core_2.13:jar:sources",
       "org.scalameta:metaconfig-pprint_2.13",
       "org.scalameta:metaconfig-pprint_2.13:jar:sources",
+      "org.scalameta:metaconfig-typesafe-config_2.13",
+      "org.scalameta:metaconfig-typesafe-config_2.13:jar:sources",
       "org.scalameta:parsers_2.13",
       "org.scalameta:parsers_2.13:jar:sources",
       "org.scalameta:scalafmt-config_2.13",
       "org.scalameta:scalafmt-config_2.13:jar:sources",
       "org.scalameta:scalafmt-core_2.13",
       "org.scalameta:scalafmt-core_2.13:jar:sources",
+      "org.scalameta:scalafmt-macros_2.13",
+      "org.scalameta:scalafmt-macros_2.13:jar:sources",
       "org.scalameta:scalafmt-sysops_2.13",
       "org.scalameta:scalafmt-sysops_2.13:jar:sources",
       "org.scalameta:scalameta_2.13",
@@ -845,7 +679,7 @@
     ]
   },
   "services": {
-    "org.jline:jline": {
+    "org.jline:jline:jar:jdk8": {
       "org/": [],
       "org/jline/": [],
       "org/jline/terminal/": [],
@@ -891,6 +725,11 @@
       "javax.script.ScriptEngineFactory": [
         "scala.tools.nsc.interpreter.shell.Scripted$Factory"
       ]
+    },
+    "org.scala-lang:scala-compiler:jar:sources": {
+      "javax.script.ScriptEngineFactory": [
+        "scala.tools.nsc.interpreter.shell.Scripted$Factory"
+      ]
     }
   },
   "version": "2"
diff --git a/rules/scalafmt/scalafmt/ScalafmtRunner.scala b/rules/scalafmt/scalafmt/ScalafmtRunner.scala
index 6cc1b7c7..fbe265cb 100644
--- a/rules/scalafmt/scalafmt/ScalafmtRunner.scala
+++ b/rules/scalafmt/scalafmt/ScalafmtRunner.scala
@@ -13,7 +13,7 @@ import net.sourceforge.argparse4j.impl.Arguments
 import net.sourceforge.argparse4j.inf.{ArgumentParser, Namespace}
 import org.scalafmt.Scalafmt
 import org.scalafmt.config.ScalafmtConfig
-import org.scalafmt.sysops.FileOps
+import org.scalafmt.sysops.PlatformFileOps
 import scala.annotation.tailrec
 import scala.io.Codec
 
@@ -52,7 +52,7 @@ object ScalafmtRunner extends WorkerMain[Unit] {
     )
     InterruptUtil.throwIfInterrupted(task.isCancelled)
 
-    val source = FileOps.readFile(workRequest.inputFile)(Codec.UTF8)
+    val source = PlatformFileOps.readFile(workRequest.inputFile)(Codec.UTF8)
 
     val config = ScalafmtConfig.fromHoconFile(workRequest.configFile).get
     @tailrec
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/AnnexMapper.scala b/src/main/scala/higherkindness/rules_scala/workers/common/AnnexMapper.scala
index 5fe982ee..bac4432c 100644
--- a/src/main/scala/higherkindness/rules_scala/workers/common/AnnexMapper.scala
+++ b/src/main/scala/higherkindness/rules_scala/workers/common/AnnexMapper.scala
@@ -61,8 +61,8 @@ object AnnexMapper {
    */
   final def getIncrementalModeReadStamp(file: VirtualFileRef, stamp: Stamp): Stamp = {
     stamp match {
-      case farmHash: FarmHash => farmHash
-      case hash: Hash         => hash
+      case farmHash: FarmHash         => farmHash
+      case hash: Hash                 => hash
       case lastModified: LastModified => {
         Stamper.forLastModifiedP(PlainVirtualFileConverter.converter.toPath(file))
       }
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/FileUtil.scala b/src/main/scala/higherkindness/rules_scala/workers/common/FileUtil.scala
index 70ac5ad8..6c822343 100644
--- a/src/main/scala/higherkindness/rules_scala/workers/common/FileUtil.scala
+++ b/src/main/scala/higherkindness/rules_scala/workers/common/FileUtil.scala
@@ -131,7 +131,7 @@ object FileUtil {
       @tailrec
       def next(files: List[Path]): List[Path] = {
         zipStream.getNextEntry match {
-          case null => files
+          case null                       => files
           case entry if entry.isDirectory =>
             zipStream.closeEntry()
             next(files)