diff --git a/docs/Sonarr/Sonarr-collection-of-custom-formats.md b/docs/Sonarr/Sonarr-collection-of-custom-formats.md
index c66c9458a..8cd8e0d76 100644
--- a/docs/Sonarr/Sonarr-collection-of-custom-formats.md
+++ b/docs/Sonarr/Sonarr-collection-of-custom-formats.md
@@ -64,13 +64,13 @@ I also made 3 guides related to this one.
 | Misc                            | Anime                                                                       | Anime                                                                 | Anime                     |
 | ------------------------------- | --------------------------------------------------------------------------- | --------------------------------------------------------------------- | ------------------------- |
 | [Repack/Proper](#repack-proper) | [Anime BD Tier 01 (Top SeaDex Muxers)](#anime-bd-tier-01-top-seadex-muxers) | [Anime Raws](#anime-raws)                                             | [Uncensored](#uncensored) |
-| [Repack2](#repack2)             | [Anime BD Tier 02 (SeaDex Muxers)](#anime-bd-tier-02-seadex-muxers)         | [Anime LQ Groups](#anime-lq-groups)                                   | [v0](#v0)                 |
-| [Multi](#multi)                 | [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers)         | [Anime Web Tier 01 (Muxers)](#anime-web-tier-01-muxers)               | [v1](v1)                  |
-| [x264](#x264)                   | [Anime BD Tier 04 (SeaDex Muxers)](#anime-bd-tier-04-seadex-muxers)         | [Anime Web Tier 02 (Top FanSubs)](#anime-web-tier-02-top-fansubs)     | [v2](#v2)                 |
-| [x265](#x265)                   | [Anime BD Tier 05 (Remuxes)](#anime-bd-tier-05-remuxes)                     | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease)       | [v3](#v3)                 |
-| [MPEG2](#mpeg2)                 | [Anime BD Tier 06 (FanSubs)](#anime-bd-tier-06-fansubs)                     | [Anime Web Tier 04 (Official Subs)](#anime-web-tier-04-official-subs) | [v4](#v4)                 |
-| [FreeLeech](#freeleech)         | [Anime BD Tier 07 (P2P/Scene)](#anime-bd-tier-07-p2pscene)                  | [Anime Web Tier 05 (FanSubs)](#anime-web-tier-05-fansubs)             | [VRV](#vrv)               |
-|                                 | [Anime BD Tier 08 (Mini Encodes)](#anime-bd-tier-08-mini-encodes)           | [Anime Web Tier 06 (FanSubs)](#anime-web-tier-06-fansubs)             |                      |
+| [Repack v2](#repack-v2)         | [Anime BD Tier 02 (SeaDex Muxers)](#anime-bd-tier-02-seadex-muxers)         | [Anime LQ Groups](#anime-lq-groups)                                   | [v0](#v0)                 |
+| [Repack v3](#repack-v3)         | [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers)         | [Anime Web Tier 01 (Muxers)](#anime-web-tier-01-muxers)               | [v1](v1)                  |
+| [Multi](#multi)                 | [Anime BD Tier 04 (SeaDex Muxers)](#anime-bd-tier-04-seadex-muxers)         | [Anime Web Tier 02 (Top FanSubs)](#anime-web-tier-02-top-fansubs)     | [v2](#v2)                 |
+| [x264](#x264)                   | [Anime BD Tier 05 (Remuxes)](#anime-bd-tier-05-remuxes)                     | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease)       | [v3](#v3)                 |
+| [x265](#x265)                   | [Anime BD Tier 06 (FanSubs)](#anime-bd-tier-06-fansubs)                     | [Anime Web Tier 04 (Official Subs)](#anime-web-tier-04-official-subs) | [v4](#v4)                 |
+| [MPEG2](#mpeg2)                 | [Anime BD Tier 07 (P2P/Scene)](#anime-bd-tier-07-p2pscene)                  | [Anime Web Tier 05 (FanSubs)](#anime-web-tier-05-fansubs)             | [VRV](#vrv)               |
+| [FreeLeech](#freeleech)         | [Anime BD Tier 08 (Mini Encodes)](#anime-bd-tier-08-mini-encodes)           | [Anime Web Tier 06 (FanSubs)](#anime-web-tier-06-fansubs)             |                      |
 |                                 | [Anime Dual Audio](#anime-dual-audio)                                       | [Dubs Only](#dubs-only)                                               |                      |
 
 ## Audio Advanced
@@ -933,12 +933,24 @@ I also made 3 guides related to this one.
 
 ------
 
-### Repack2
+### Repack v2
 
 ??? example "JSON - [CLICK TO EXPAND]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/repack2.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/repack-v2.json' %]][[% endfilter %]]
+    ```
+
+<sub><sup>[TOP](#index)</sup>
+
+------
+
+### Repack v3
+
+??? example "JSON - [CLICK TO EXPAND]"
+
+    ```json
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/repack-v3.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>
diff --git a/docs/Sonarr/images/cf-mm-propers-repacks-disable.png b/docs/Sonarr/images/cf-mm-propers-repacks-disable.png
new file mode 100644
index 000000000..a7f92f0d9
Binary files /dev/null and b/docs/Sonarr/images/cf-mm-propers-repacks-disable.png differ
diff --git a/docs/json/sonarr/cf/flac.json b/docs/json/sonarr/cf/flac.json
new file mode 100644
index 000000000..8545d2b96
--- /dev/null
+++ b/docs/json/sonarr/cf/flac.json
@@ -0,0 +1,70 @@
+{
+  "trash_id": "851bd64e04c9374c51102be3dd9ae4cc",
+  "trash_score": "2250",
+  "name": "FLAC",
+  "includeCustomFormatWhenRenaming": false,
+  "specifications": [{
+          "name": "FLAC",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": false,
+          "required": true,
+          "fields": {
+              "value": "\\bFLAC(\\b|\\d)"
+          }
+      },
+      {
+          "name": "Not PCM",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": true,
+          "required": true,
+          "fields": {
+              "value": "\\b(l?)PCM(\\b|\\d)"
+          }
+      },
+      {
+          "name": "Not AAC",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": true,
+          "required": true,
+          "fields": {
+              "value": "\\bAAC(\\b|\\d)"
+          }
+      },
+      {
+          "name": "Not DTS",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": true,
+          "required": true,
+          "fields": {
+              "value": "\\bDTS(\\b|\\d)"
+          }
+      },
+      {
+          "name": "Not TrueHD/ATMOS",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": true,
+          "required": true,
+          "fields": {
+              "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)"
+          }
+      },
+      {
+          "name": "Not Basic Dolby Digital",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": true,
+          "required": true,
+          "fields": {
+              "value": "\\bDD[^a-z+]|(?<!e)ac3"
+          }
+      },
+      {
+          "name": "Not Dolby Digital Plus ",
+          "implementation": "ReleaseTitleSpecification",
+          "negate": true,
+          "required": true,
+          "fields": {
+              "value": "[^-]dd[p+]|eac3"
+          }
+      }
+  ]
+}
diff --git a/docs/json/sonarr/cf/freeleech.json b/docs/json/sonarr/cf/freeleech.json
new file mode 100644
index 000000000..8a47db60d
--- /dev/null
+++ b/docs/json/sonarr/cf/freeleech.json
@@ -0,0 +1,15 @@
+{
+  "trash_id": "d7c747094a7c65f4c2de083c24899e8b",
+  "trash_score": "1",
+  "name": "FreeLeech",
+  "includeCustomFormatWhenRenaming": false,
+  "specifications": [{
+      "name": "FreeLeech",
+      "implementation": "IndexerFlagSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+          "value": 1
+      }
+  }]
+}