diff --git a/.actrc b/.actrc
new file mode 100644
index 0000000..151033e
--- /dev/null
+++ b/.actrc
@@ -0,0 +1,4 @@
+--artifact-server-path=./.act/artifacts
+--cache-server-path=./.act/cache
+--container-options --privileged
+--env ACT=true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 67a0006..3e504e6 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -76,15 +76,15 @@ jobs:
           RUSTDOCFLAGS: --cfg docsrs
   msrv:
     # check that we can build using the minimal rust version that is specified by this crate
-    name: 1.85.0 / check
+    name: 1.89.0 / check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install 1.85.0
+      - name: Install 1.89.0
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.85.0
+          toolchain: 1.89.0
 
-      - name: cargo +1.85.0 check
+      - name: cargo +1.89.0 check
         run: cargo check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 528bbb1..a5ece84 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,6 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Configure SSH for Git
+        if: env.ACT != 'true'
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.RELEASE_BOT_SSH_KEY }}" > ~/.ssh/id_ed25519
@@ -30,11 +31,18 @@ jobs:
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
 
       - name: Checkout repository
+        if: env.ACT != 'true'
         uses: actions/checkout@v3
         with:
           ssh-key: ${{ secrets.RELEASE_BOT_SSH_KEY }}
           fetch-depth: 0
 
+      - name: Checkout repository
+        if: env.ACT == 'true'
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -62,12 +70,6 @@ jobs:
       - name: Install Rust stable
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Update the Cargo.lock
-        run: |
-          cargo update
-          git add Cargo.lock
-          git commit -m "chore: Bump the version in Cargo.lock"
-
       - name: Get the new version tag
         id: version
         run: |
@@ -84,6 +86,46 @@ jobs:
           echo "Previous tag: $PREV_TAG"
           echo "prev_version=$PREV_TAG" >> $GITHUB_ENV
 
+      - name: Bump Cargo.toml version
+        shell: bash
+        working-directory: ${{ github.workspace }}
+        env:
+          VERSION: ${{ env.version }}
+        run: |
+          set -euo pipefail
+          : "${VERSION:?env.version is empty}"
+
+          # Ignore Act's local artifact dir noise
+          echo artifacts/ >> .git/info/exclude || true
+
+          # Edit the version line right after name="managarr"
+          sed -E -i '
+            /^[[:space:]]*name[[:space:]]*=[[:space:]]*"managarr"[[:space:]]*$/ {
+              n
+              s|^[[:space:]]*version[[:space:]]*=[[:space:]]*"[^"]*"|version = "'"$VERSION"'"|
+            }
+          ' Cargo.toml
+
+          cargo update || true
+
+          # Git config that helps in containers (Act)
+          git config user.name  "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+          # Debug: show what changed
+          git status --porcelain
+          git diff --name-only -- Cargo.toml Cargo.lock || true
+
+          # Only commit if one of these files actually changed
+          if ! git diff --quiet -- Cargo.toml Cargo.lock; then
+            # Stage only modifications of already tracked files (won't pick up artifacts/)
+            git add -u -- Cargo.toml Cargo.lock
+            git commit -m "chore: bump Cargo.toml to $VERSION"
+          else
+            echo "No changes to commit (already at $VERSION)"
+          fi
+
       - name: Generate changelog for the version bump
         id: changelog
         run: |
@@ -92,6 +134,7 @@ jobs:
           echo "changelog_body=$(cat artifacts/changelog.md)" >> $GITHUB_ENV
 
       - name: Push changes
+        if: env.ACT != 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -102,6 +145,15 @@ jobs:
         with:
           path: artifacts
 
+      - name: Upload the changed Cargo files (Act)
+        if: env.ACT == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: bumped-cargo-files
+          path: |
+            Cargo.toml
+            Cargo.lock
+
   build-release-artifacts:
     name: build-release
     needs: [bump-version]
@@ -129,7 +181,7 @@ jobs:
 
     steps:
       - name: Check if actor is repository owner
-        if: ${{ github.actor != github.repository_owner }}
+        if: ${{ github.actor != github.repository_owner && env.ACT != 'true' }}
         run: |
           echo "You are not authorized to run this workflow."
           exit 1
@@ -140,10 +192,18 @@ jobs:
           fetch-depth: 1
 
       - name: Ensure repository is up-to-date
+        if: env.ACT != 'true'
         run: |
           git fetch --all
           git pull
 
+      - name: Get bumped Cargo files (Act)
+        if: env.ACT == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: bumped-cargo-files
+          path: ${{ github.workspace }}
+
       - uses: actions/cache@v3
         name: Cache Cargo registry
         with:
@@ -246,6 +306,12 @@ jobs:
     needs: [build-release-artifacts]
     runs-on: ubuntu-latest
     steps:
+      - name: Check if actor is repository owner
+        if: ${{ github.actor != github.repository_owner  && env.ACT != 'true' }}
+        run: |
+          echo "You are not authorized to run this workflow."
+          exit 1
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
@@ -258,6 +324,7 @@ jobs:
           merge-multiple: true
 
       - name: Ensure repository is up-to-date
+        if: env.ACT != 'true'
         run: |
           git fetch --all
           git pull
@@ -269,7 +336,13 @@ jobs:
           changelog_body="$(cat ./artifacts/changelog.md)"
           echo "changelog_body=$(cat artifacts/changelog.md)" >> $GITHUB_ENV
 
+      - name: Validate release environment variables
+        run: |
+          echo "Release version: ${{ env.RELEASE_VERSION }}"
+          echo "Changelog body: ${{ env.changelog_body }}"
+
       - name: Create a GitHub Release
+        if: env.ACT != 'true'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -316,6 +389,12 @@ jobs:
     name: Publish Chocolatey Package
     runs-on: windows-latest
     steps:
+      - name: Check if actor is repository owner
+        if: ${{ github.actor != github.repository_owner  && env.ACT != 'true' }}
+        run: |
+          echo "You are not authorized to run this workflow."
+          exit 1
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -344,6 +423,7 @@ jobs:
           echo "Release version: ${{ env.RELEASE_VERSION }}"
 
       - name: Package and Publish package to Chocolatey
+        if: env.ACT != 'true'
         run: |
           mkdir ./deployment/chocolatey/tools
           # Run packaging script
@@ -363,6 +443,12 @@ jobs:
     name: Update Homebrew formulas
     runs-on: ubuntu-latest
     steps:
+      - name: Check if actor is repository owner
+        if: ${{ github.actor != github.repository_owner  && env.ACT != 'true' }}
+        run: |
+          echo "You are not authorized to run this workflow."
+          exit 1
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -395,11 +481,13 @@ jobs:
           echo "Release version: ${{ env.RELEASE_VERSION }}"
 
       - name: Execute Homebrew packaging script
+        if: env.ACT != 'true'
         run: |
           # run packaging script
           python "./deployment/homebrew/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/homebrew/managarr.rb.template" "./managarr.rb" ${{ env.MACOS_SHA }} ${{ env.MACOS_SHA_ARM }} ${{ env.LINUX_SHA }}
 
       - name: Push changes to Homebrew tap
+        if: env.ACT != 'true'
         env:
           TOKEN: ${{ secrets.MANAGARR_GITHUB_TOKEN }}
         run: |
@@ -419,6 +507,12 @@ jobs:
     name: Publishing Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
+      - name: Check if actor is repository owner
+        if: ${{ github.actor != github.repository_owner  && env.ACT != 'true' }}
+        run: |
+          echo "You are not authorized to run this workflow."
+          exit 1
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -431,6 +525,7 @@ jobs:
           merge-multiple: true
 
       - name: Ensure repository is up-to-date
+        if: env.ACT != 'true'
         run: |
           git fetch --all
           git pull
@@ -451,6 +546,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
+        if: env.ACT != 'true'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -462,7 +558,7 @@ jobs:
           context: .
           file: Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ env.ACT != 'true' }}
           tags: darkalex17/managarr:latest, darkalex17/managarr:${{ env.version }}
 
   publish-crate:
@@ -471,7 +567,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if actor is repository owner
-        if: ${{ github.actor != github.repository_owner }}
+        if: ${{ github.actor != github.repository_owner  && env.ACT != 'true' }}
         run: |
           echo "You are not authorized to run this workflow."
           exit 1
@@ -481,7 +577,15 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Get bumped Cargo files (Act)
+        if: env.ACT == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: bumped-cargo-files
+          path: ${{ github.workspace }}
+
       - name: Ensure repository is up-to-date
+        if: env.ACT != 'true'
         run: |
           git fetch --all
           git pull
@@ -501,5 +605,6 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - uses: katyo/publish-crates@v2
+        if: env.ACT != 'true'
         with:
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 79e06a0..226c2a9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -175,6 +175,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Upload to codecov.io
+        if: env.ACT != 'true'
         uses: codecov/codecov-action@v4
         with:
           fail_ci_if_error: true
diff --git a/.gitignore b/.gitignore
index d8a9f38..5ebe242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /target
 /.idea/
 /.scannerwork/
+/.act/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9bc33b4..729d9b5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -63,12 +63,32 @@ cz commit
 ## Setup workspace
 
 1. Clone this repo
-2. Run `cargo test` to setup hooks
+2. Run `cargo test` to set up hooks
 3. Make changes
 4. Run the application using `make run` or `cargo run`
 5. Commit changes. This will trigger pre-commit hooks that will run format, test and lint. If there are errors or warnings from Clippy, please fix them.
 6. Push your code to a new branch named after the feature/bug/etc. you're adding. This will trigger pre-push hooks that will run lint and test.
 7. Create a PR
 
+### CI/CD Testing with Act
+If you also are planning on testing out your changes before pushing them with [Act](https://github.com/nektos/act), you will need to set up `act`,
+`docker`, and configure your local system to run different architectures:
+
+1. Install `docker` by following the instructions on the [official Docker installation page](https://docs.docker.com/get-docker/).
+2. Install `act` by following the instructions on the [official Act installation page](https://nektosact.com/installation/index.html).
+3. Install `binfmt` on your system once so that `act` can run the correct architecture for the CI/CD workflows. 
+   You can do this by running:
+   ```shell
+   sudo docker run --rm --privileged tonistiigi/binfmt --install all
+   ```
+   
+Then, you can run workflows locally without having to commit and see if the GitHub action passes or fails. 
+
+**For example**: To test the [release.yml](.github/workflows/release.yml) workflow locally, you can run:
+
+```shell
+act -W .github/workflows/release.yml --input_type bump=minor
+```
+
 ## Questions? Reach out to me!
 If you encounter any questions while developing Managarr, please don't hesitate to reach out to me at alex.j.tusa@gmail.com. I'm happy to help contributors, new and experienced in any way I can!
diff --git a/Cargo.lock b/Cargo.lock
index 1ee6861..2dc6d09 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
@@ -49,9 +49,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -64,44 +64,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
 dependencies = [
  "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
 [[package]]
 name = "arc-swap"
@@ -121,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
+checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
 dependencies = [
  "anstyle",
  "bstr",
@@ -137,13 +137,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -154,15 +154,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -190,15 +190,15 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
 
 [[package]]
 name = "bstr"
-version = "1.11.3"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -207,15 +207,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytes"
@@ -237,27 +231,27 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "castaway"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
 dependencies = [
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "cfg_aliases"
@@ -267,9 +261,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -282,9 +276,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -292,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
 dependencies = [
  "anstream",
  "anstyle",
@@ -305,36 +299,36 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.46"
+version = "4.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
+checksum = "4d9501bd3f5f09f7bbee01da9a511073ed30a80cd7a509f1214bb74eadea71ad"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.28"
+version = "4.5.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "colored"
@@ -427,9 +421,9 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.5"
+version = "3.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
 dependencies = [
  "nix",
  "windows-sys 0.59.0",
@@ -437,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -447,34 +441,34 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
@@ -492,14 +486,14 @@ dependencies = [
 
 [[package]]
 name = "derive_setters"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d"
+checksum = "ae5c625eda104c228c06ecaf988d1c60e542176bd7a490e60eeda3493244c0c9"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -510,9 +504,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7"
 
 [[package]]
 name = "deunicode"
-version = "1.6.0"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
 
 [[package]]
 name = "diff"
@@ -576,7 +570,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -618,7 +612,7 @@ version = "0.1.0"
 dependencies = [
  "darling",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -629,12 +623,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -651,9 +645,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "foreign-types"
@@ -672,18 +666,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
 
 [[package]]
 name = "fragile"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
 
 [[package]]
 name = "futures"
@@ -741,7 +735,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -782,25 +776,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.3+wasi-0.2.4",
 ]
 
 [[package]]
@@ -811,15 +805,15 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "h2"
-version = "0.4.8"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -836,9 +830,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -853,9 +847,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -874,12 +868,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "pin-project-lite",
@@ -899,9 +893,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "human-panic"
-version = "2.0.2"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7"
+checksum = "ac63a746b187e95d51fe16850eb04d1cfef203f6af98e6c405a6f262ad3df00a"
 dependencies = [
  "anstream",
  "anstyle",
@@ -915,19 +909,20 @@ dependencies = [
 
 [[package]]
 name = "humantime"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "h2",
  "http",
  "http-body",
@@ -935,6 +930,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -942,11 +938,10 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
  "http",
  "hyper",
  "hyper-util",
@@ -975,33 +970,41 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
 dependencies = [
+ "base64",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
  "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
  "pin-project-lite",
  "socket2",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -1017,21 +1020,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1040,31 +1044,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -1072,67 +1056,54 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.99",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1141,9 +1112,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1152,9 +1123,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1162,9 +1133,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1191,15 +1162,26 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "instability"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d"
+checksum = "435d80800b936787d62688c927b6490e887c7ef5ff9ce922c6c6050fca75eb9a"
 dependencies = [
  "darling",
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "io-uring"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
 ]
 
 [[package]]
@@ -1208,6 +1190,16 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1250,15 +1242,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
  "bitflags",
  "libc",
@@ -1272,21 +1264,21 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1294,9 +1286,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 dependencies = [
  "serde",
 ]
@@ -1391,6 +1383,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "urlencoding",
+ "validate_theme_derive",
  "veil",
 ]
 
@@ -1406,9 +1399,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "mime"
@@ -1418,23 +1411,23 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1460,7 +1453,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -1479,7 +1472,7 @@ dependencies = [
  "hyper",
  "hyper-util",
  "log",
- "rand 0.9.0",
+ "rand 0.9.2",
  "regex",
  "serde_json",
  "serde_urlencoded",
@@ -1506,9 +1499,9 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1557,15 +1550,21 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "openssl"
-version = "0.10.71"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1584,7 +1583,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -1595,18 +1594,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-src"
-version = "300.4.2+3.4.1"
+version = "300.5.2+3.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2"
+checksum = "d270b79e2926f5150189d475bc7e9d2c69f9c4697b185fa917d5a32b792d21b4"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.106"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -1632,20 +1631,21 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.10.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5"
+checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
 dependencies = [
  "log",
+ "plist",
  "serde",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1653,9 +1653,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1672,9 +1672,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project-lite"
@@ -1695,10 +1695,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
-name = "portable-atomic"
-version = "1.11.0"
+name = "plist"
+version = "1.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1"
+dependencies = [
+ "base64",
+ "indexmap",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
 
 [[package]]
 name = "powerfmt"
@@ -1708,11 +1730,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
@@ -1763,22 +1785,37 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.39"
+name = "quick-xml"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1792,13 +1829,12 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "zerocopy 0.8.23",
 ]
 
 [[package]]
@@ -1827,7 +1863,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -1836,7 +1872,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
 ]
 
 [[package]]
@@ -1863,9 +1899,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
  "bitflags",
 ]
@@ -1876,16 +1912,16 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1895,9 +1931,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1906,9 +1942,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "relative-path"
@@ -1918,15 +1954,14 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.12.12"
+version = "0.12.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
 dependencies = [
  "base64",
  "bytes",
  "encoding_rs",
  "futures-core",
- "futures-util",
  "h2",
  "http",
  "http-body",
@@ -1935,40 +1970,37 @@ dependencies = [
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
 name = "ring"
-version = "0.17.13"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -2000,15 +2032,15 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.99",
+ "syn 2.0.106",
  "unicode-ident",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustc_version"
@@ -2034,22 +2066,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.1"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
- "linux-raw-sys 0.9.2",
- "windows-sys 0.59.0",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.23"
+version = "0.23.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -2059,25 +2091,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
+name = "rustls-pki-types"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
- "rustls-pki-types",
+ "zeroize",
 ]
 
-[[package]]
-name = "rustls-pki-types"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
-
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -2086,9 +2112,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -2098,9 +2124,9 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "scc"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
+checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
 dependencies = [
  "sdd",
 ]
@@ -2122,9 +2148,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sdd"
-version = "3.0.7"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca"
+checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
 
 [[package]]
 name = "security-framework"
@@ -2157,9 +2183,9 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
 
 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
@@ -2176,20 +2202,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "itoa",
  "memchr",
@@ -2199,9 +2225,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
 dependencies = [
  "serde",
 ]
@@ -2253,7 +2279,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2264,9 +2290,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -2285,9 +2311,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
 dependencies = [
  "libc",
 ]
@@ -2300,27 +2326,24 @@ checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2360,7 +2383,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2382,9 +2405,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.99"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2402,13 +2425,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2434,26 +2457,25 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.18.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
 dependencies = [
- "cfg-if",
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.1",
- "windows-sys 0.59.0",
+ "rustix 1.0.8",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
+checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 dependencies = [
- "rustix 0.38.44",
- "windows-sys 0.59.0",
+ "rustix 1.0.8",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2479,7 +2501,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2494,30 +2516,42 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.39"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
+ "itoa",
  "libc",
  "num-conv",
  "num_threads",
  "powerfmt",
  "serde",
  "time-core",
+ "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+
+[[package]]
+name = "time-macros"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -2525,20 +2559,22 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
+ "slab",
  "socket2",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2549,7 +2585,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2574,9 +2610,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2587,38 +2623,48 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.20"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
 dependencies = [
  "serde",
  "serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "toml_datetime 0.7.0",
+ "toml_writer",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
+ "toml_datetime 0.6.11",
  "winnow",
 ]
 
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -2634,6 +2680,24 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -2658,9 +2722,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
 ]
@@ -2738,13 +2802,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -2753,12 +2818,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -2773,11 +2832,20 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.15.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
+]
+
+[[package]]
+name = "validate_theme_derive"
+version = "0.1.0"
+dependencies = [
+ "log",
+ "quote",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2804,7 +2872,7 @@ checksum = "5b2d5567b6fbd34e8f0488d56b648e67c0d999535f4af2060d14f9074b43e833"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -2827,17 +2895,17 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.3+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -2862,7 +2930,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
  "wasm-bindgen-shared",
 ]
 
@@ -2897,7 +2965,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2955,47 +3023,72 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-registry"
-version = "0.2.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
 dependencies = [
+ "windows-link",
  "windows-result",
  "windows-strings",
- "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -3025,6 +3118,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -3049,13 +3151,30 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -3068,6 +3187,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -3080,6 +3205,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -3092,12 +3223,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -3110,6 +3253,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -3122,6 +3271,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -3134,6 +3289,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -3147,34 +3308,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.7.3"
+name = "windows_x86_64_msvc"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.33.0"
+name = "wit-bindgen"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "yansi"
@@ -3184,9 +3342,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -3196,55 +3354,34 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
- "byteorder",
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
-dependencies = [
- "zerocopy-derive 0.8.23",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
 
 [[package]]
@@ -3264,7 +3401,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
  "synstructure",
 ]
 
@@ -3275,10 +3412,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zerotrie"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3287,11 +3435,11 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.106",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a6442ed..2437906 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,11 +10,14 @@ homepage = "https://github.com/Dark-Alex-17/managarr"
 readme = "README.md"
 edition = "2021"
 license = "MIT"
-rust-version = "1.85.0"
+rust-version = "1.89.0"
 exclude = [".github", "CONTRIBUTING.md", "*.log", "tags"]
 
 [workspace]
-members = ["proc_macros/enum_display_style_derive"]
+members = [
+  "proc_macros/enum_display_style_derive",
+  "proc_macros/validate_theme_derive",
+]
 
 [dependencies]
 anyhow = "1.0.68"
@@ -37,7 +40,7 @@ serde_json = "1.0.91"
 serde = { version = "1.0.214", features = ["derive"] }
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
-tokio = { version = "1.36.0", features = ["full"] }
+tokio = { version = "1.44.2", features = ["full"] }
 tokio-util = "0.7.8"
 ratatui = { version = "0.29.0", features = [
   "all-widgets",
@@ -63,6 +66,7 @@ deunicode = "1.6.0"
 paste = "1.0.15"
 openssl = { version = "0.10.70", features = ["vendored"] }
 veil = "0.2.0"
+validate_theme_derive = { path = "proc_macros/validate_theme_derive" }
 enum_display_style_derive = { path = "proc_macros/enum_display_style_derive" }
 
 [dev-dependencies]
diff --git a/Dockerfile b/Dockerfile
index eba1c08..1d88b89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.85 AS builder
+FROM rust:1.89 AS builder
 WORKDIR /usr/src
 
 # Download and compile Rust dependencies in an empty project and cache as a separate Docker layer
@@ -6,6 +6,7 @@ RUN USER=root cargo new --bin managarr-temp
 
 WORKDIR /usr/src/managarr-temp
 COPY Cargo.* .
+COPY proc_macros ./proc_macros
 RUN cargo build --release
 # remove src from empty project
 RUN rm -r src
diff --git a/README.md b/README.md
index 95f9cb1..6716b09 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Managarr is a TUI and CLI to help you manage your HTPC (Home Theater PC). Built
 - [ ] ![bazarr_logo](logos/bazarr.png) [Bazarr](https://www.bazarr.media/)
 - [ ] ![tautulli_logo](logos/tautulli.png) [Tautulli](https://tautulli.com/)
 
-## Try Before You Buy
+## Try Out the Demo
 To try out Managarr before linking it to your HTPC, you can use the purpose built [managarr-demo](https://github.com/Dark-Alex-17/managarr-demo) repository.
 Simply run the following command to start a demo:
 
@@ -63,7 +63,7 @@ Please note that you will need to create and popular your configuration file fir
 **Note:** If you run into errors using relative file paths when mounting the volume with the configuration file, try using an absolute path.
 
 ### Homebrew (Mac and Linux)
-To install Managarr from Homebrew, install the Managarr tap and then you'll be able to install Managarr:
+To install Managarr from Homebrew, install the Managarr tap. Then you'll be able to install Managarr:
 
 ```shell
 brew tap Dark-Alex-17/managarr
@@ -119,16 +119,16 @@ Binaries are available on the [releases](https://github.com/Dark-Alex-17/managar
 #### Windows Instructions
 To use a binary from the releases page on Windows, do the following:
 
-1. Download the latest binary [binary](https://github.com/Dark-Alex-17/managarr/releases) for your OS.
+1. Download the latest [binary](https://github.com/Dark-Alex-17/managarr/releases) for your OS.
 2. Use 7-Zip or TarTool to unpack the Tar file.
 3. Run the executable `managarr.exe`!
 
 #### Linux/MacOS Instructions
 To use a binary from the releases page on Linux/MacOS, do the following:
 
-1. Download the latest binary [binary](https://github.com/Dark-Alex-17/managarr/releases) for your OS.
+1. Download the latest [binary](https://github.com/Dark-Alex-17/managarr/releases) for your OS.
 2. `cd` to the directory where you downloaded the binary.
-3. Extract the binary with `tar -C /usr/local/bin -xzf managarr-<arch>.tar.gz` (NB: This may require `sudo`)
+3. Extract the binary with `tar -C /usr/local/bin -xzf managarr-<arch>.tar.gz` (Note: This may require `sudo`)
 4. Now you can run `managarr`!
 
 ## Features
@@ -166,21 +166,21 @@ Key:
 
 | TUI | CLI | Feature                                                                                                            |
 |-----|-----|--------------------------------------------------------------------------------------------------------------------|
-| ✅  | ✅   | View your library, downloads, blocklist, episodes                                                                  |
-| ✅  | ✅   | View details of a specific series, or episode including description, history, downloaded file info, or the credits |
+| ✅   | ✅   | View your library, downloads, blocklist, episodes                                                                  |
+| ✅   | ✅   | View details of a specific series, or episode including description, history, downloaded file info, or the credits |
 | 🚫  | ✅   | View your host and security configs from the CLI to programmatically fetch the API token, among other settings     |
-| ✅  | ✅   | Search your library                                                                                                |
-| ✅  | ✅   | Add series to your library                                                                                         |
-| ✅  | ✅   | Delete series, downloads, indexers, root folders, and episode files                                                |
-| ✅  | ✅   | Trigger automatic searches for series, seasons, or episodes                                                        |
-| ✅  | ✅   | Trigger refresh and disk scan for series and downloads                                                             |
-| ✅  | ✅   | Manually search for series, seasons, or episodes                                                                   |
-| ✅  | ✅   | Edit your series and indexers                                                                                      |
-| ✅  | ✅   | Manage your tags                                                                                                   |
-| ✅  | ✅   | Manage your root folders                                                                                           |
-| ✅  | ✅   | Manage your blocklist                                                                                              |
-| ✅  | ✅   | View and browse logs, tasks, events queues, and updates                                                            |
-| ✅  | ✅   | Manually trigger scheduled tasks                                                                                   |
+| ✅   | ✅   | Search your library                                                                                                |
+| ✅   | ✅   | Add series to your library                                                                                         |
+| ✅   | ✅   | Delete series, downloads, indexers, root folders, and episode files                                                |
+| ✅   | ✅   | Trigger automatic searches for series, seasons, or episodes                                                        |
+| ✅   | ✅   | Trigger refresh and disk scan for series and downloads                                                             |
+| ✅   | ✅   | Manually search for series, seasons, or episodes                                                                   |
+| ✅   | ✅   | Edit your series and indexers                                                                                      |
+| ✅   | ✅   | Manage your tags                                                                                                   |
+| ✅   | ✅   | Manage your root folders                                                                                           |
+| ✅   | ✅   | Manage your blocklist                                                                                              |
+| ✅   | ✅   | View and browse logs, tasks, events queues, and updates                                                            |
+| ✅   | ✅   | Manually trigger scheduled tasks                                                                                   |
 
 ### Readarr
 
@@ -206,6 +206,19 @@ Key:
 
 - [ ] Support for Tautulli
 
+### Themes
+Managarr ships with a few themes out of the box. Here's a few examples:
+
+#### Default
+![default](themes/default/manual_episode_search.png)
+#### Dracula
+![dracula](themes/dracula/manual_episode_search.png)
+#### Watermelon Dark
+![watermelon-dark](themes/watermelon-dark/manual_episode_search.png)
+
+You can also create your own custom themes as well. To learn more about what themes are built-in to Managarr and how
+to create your own custom themes, check out the [Themes README](themes/README.md).
+
 ### The Managarr CLI
 Managarr can be used in one of two ways: As a TUI, or as a CLI for managing your Servarrs. 
 
@@ -218,7 +231,7 @@ To see all available commands, simply run `managarr --help`:
 
 ```shell
 $ managarr --help
-managarr 0.5.0
+managarr 0.5.1
 Alex Clarke <alex.j.tusa@gmail.com>
 
 A TUI and CLI to manage your Servarrs
@@ -235,6 +248,8 @@ Commands:
 Options:
       --disable-spinner              Disable the spinner (can sometimes make parsing output challenging) [env: MANAGARR_DISABLE_SPINNER=]
       --config-file <CONFIG_FILE>    The Managarr configuration file to use [env: MANAGARR_CONFIG_FILE=]
+      --themes-file <THEMES_FILE>    The Managarr themes file to use [env: MANAGARR_THEMES_FILE=]
+      --theme <THEME>                The name of the Managarr theme to use [env: MANAGARR_THEME=]
       --servarr-name <SERVARR_NAME>  For multi-instance configurations, you need to specify the name of the instance configuration that you want to use.
                                          This is useful when you have multiple instances of the same Servarr defined in your config file.
                                          By default, if left empty, the first configured Servarr instance listed in the config file will be used.
@@ -315,6 +330,7 @@ managarr --config-file /path/to/config.yml
 
 ### Example Configuration:
 ```yaml
+theme: default
 radarr:
   - host: 192.168.0.78
     port: 7878
@@ -341,6 +357,9 @@ whisparr:
     port: 6969
     api_token: someApiToken1234567890
     ssl_cert_path: /path/to/whisparr.crt
+    custom_headers: # Example of adding custom headers to all requests to the Servarr instance
+      traefik-auth-bypass-key: someBypassKey1234567890
+      SOME-OTHER-CUSTOM-HEADER: ${MY_CUSTOM_HEADER_VALUE}
 bazarr:
   - host: 192.168.0.67
     port: 6767
@@ -357,6 +376,7 @@ tautulli:
 
 ### Example Multi-Instance Configuration:
 ```yaml
+theme: default
 radarr:
   - host: 192.168.0.78 # No name specified, so this instance's name will default to 'Radarr 1'
     port: 7878
diff --git a/proc_macros/enum_display_style_derive/src/lib.rs b/proc_macros/enum_display_style_derive/src/lib.rs
index 05d2f5e..3e2c941 100644
--- a/proc_macros/enum_display_style_derive/src/lib.rs
+++ b/proc_macros/enum_display_style_derive/src/lib.rs
@@ -4,7 +4,8 @@ use crate::macro_models::DisplayStyleArgs;
 use darling::FromVariant;
 use quote::quote;
 use syn::{Data, DeriveInput, parse_macro_input};
-/// Derive macro for the EnumDisplayStyle trait.
+
+/// Derive macro for generating a `to_display_str` method for an enum.
 ///
 /// # Example
 ///
@@ -15,13 +16,12 @@ use syn::{Data, DeriveInput, parse_macro_input};
 ///
 /// #[derive(EnumDisplayStyle)]
 /// enum Weekend {
-///   Saturday,
-///   Sunday,
+///     Saturday,
+///     Sunday,
 /// }
 ///
 /// assert_eq!(Weekend::Saturday.to_display_str(), "Saturday");
 /// assert_eq!(Weekend::Sunday.to_display_str(), "Sunday");
-///
 /// ```
 ///
 /// Using custom values for the display style:
@@ -31,10 +31,10 @@ use syn::{Data, DeriveInput, parse_macro_input};
 ///
 /// #[derive(EnumDisplayStyle)]
 /// enum MonitorStatus {
-///   #[display_style(name = "Monitor Transactions")]
-///   Active,
-///   #[display_style(name = "Don't Monitor Transactions")]
-///   None,
+///     #[display_style(name = "Monitor Transactions")]
+///     Active,
+///     #[display_style(name = "Don't Monitor Transactions")]
+///     None,
 /// }
 ///
 /// assert_eq!(MonitorStatus::Active.to_display_str(), "Monitor Transactions");
diff --git a/proc_macros/validate_theme_derive/Cargo.toml b/proc_macros/validate_theme_derive/Cargo.toml
new file mode 100644
index 0000000..084f7a4
--- /dev/null
+++ b/proc_macros/validate_theme_derive/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "validate_theme_derive"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0.39"
+syn = "2.0.99"
+
+[dev-dependencies]
+log = "0.4.17"
diff --git a/proc_macros/validate_theme_derive/src/lib.rs b/proc_macros/validate_theme_derive/src/lib.rs
new file mode 100644
index 0000000..4bde5a4
--- /dev/null
+++ b/proc_macros/validate_theme_derive/src/lib.rs
@@ -0,0 +1,106 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{Data, DeriveInput, Fields, parse_macro_input};
+
+/// Derive macro for generating a `validate` method for a Theme struct.
+/// The `validate` method ensures that all values with the `validate` attribute are not `None`.
+/// Otherwise, an error message it output to both the log file and stdout and the program exits.
+///
+/// # Example
+///
+/// Valid themes pass through the program transitively without any messages being output.
+///
+/// ```
+/// use validate_theme_derive::ValidateTheme;
+///
+/// #[derive(ValidateTheme, Default)]
+/// struct Theme {
+///     pub name: String,
+///     #[validate]
+///     pub good: Option<Style>,
+///     #[validate]
+///     pub bad: Option<Style>,
+///     pub ugly: Option<Style>,
+/// }
+///
+/// struct Style {
+///     color: String,
+/// }
+///
+/// let theme = Theme {
+///     good: Some(Style { color: "Green".to_owned() }),
+///     bad: Some(Style { color: "Red".to_owned() }),
+///     ..Theme::default()
+/// };
+///
+/// // Since only `good` and `bad` have the `validate` attribute, the `validate` method will only check those fields.
+/// theme.validate();
+/// // Since both `good` and `bad` have values, the program will not exit and no message is output.
+/// ```
+///
+/// Invalid themes will output an error message to both the log file and stdout and the program will exit.
+///
+/// ```should_panic
+/// use validate_theme_derive::ValidateTheme;
+///
+/// #[derive(ValidateTheme, Default)]
+/// struct Theme {
+///     pub name: String,
+///     #[validate]
+///     pub good: Option<Style>,
+///     #[validate]
+///     pub bad: Option<Style>,
+///     pub ugly: Option<Style>,
+/// }
+///
+/// struct Style {
+///     color: String,
+/// }
+///
+/// let theme = Theme {
+///     bad: Some(Style { color: "Red".to_owned() }),
+///     ..Theme::default()
+/// };
+///
+/// // Since `good` has the `validate` attribute and since `good` is `None`, the `validate` method will output an error message and exit the program.
+/// theme.validate();
+/// ```
+#[proc_macro_derive(ValidateTheme, attributes(validate))]
+pub fn derive_validate_theme(input: TokenStream) -> TokenStream {
+  let input = parse_macro_input!(input as DeriveInput);
+  let struct_name = &input.ident;
+
+  let mut validation_checks = Vec::new();
+
+  if let Data::Struct(data_struct) = &input.data
+    && let Fields::Named(fields) = &data_struct.fields
+  {
+    for field in &fields.named {
+      let field_name = &field.ident;
+
+      let has_validate_attr = field
+        .attrs
+        .iter()
+        .any(|attr| attr.path().is_ident("validate"));
+
+      if has_validate_attr {
+        validation_checks.push(quote! {
+          if self.#field_name.is_none() {
+            log::error!("{} is missing a color value.", stringify!(#field_name));
+            eprintln!("{} is missing a color value.", stringify!(#field_name));
+            std::process::exit(1);
+          }
+        })
+      }
+    }
+  }
+
+  quote! {
+    impl #struct_name {
+      pub fn validate(&self) {
+        #(#validation_checks)*
+      }
+    }
+  }
+  .into()
+}
diff --git a/screenshots/radarr/manual_search.png b/screenshots/radarr/manual_search.png
index 99443af..9bcbf7a 100644
Binary files a/screenshots/radarr/manual_search.png and b/screenshots/radarr/manual_search.png differ
diff --git a/screenshots/sonarr/add_series.png b/screenshots/sonarr/add_series.png
index 6a2907a..3eb2bab 100644
Binary files a/screenshots/sonarr/add_series.png and b/screenshots/sonarr/add_series.png differ
diff --git a/screenshots/sonarr/sonarr_library.png b/screenshots/sonarr/sonarr_library.png
index 57aa9c2..8799701 100644
Binary files a/screenshots/sonarr/sonarr_library.png and b/screenshots/sonarr/sonarr_library.png differ
diff --git a/src/app/app_tests.rs b/src/app/app_tests.rs
index b0b6101..bda0636 100644
--- a/src/app/app_tests.rs
+++ b/src/app/app_tests.rs
@@ -2,10 +2,11 @@
 mod tests {
   use anyhow::anyhow;
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
+  use serde_json::Value;
   use serial_test::serial;
   use tokio::sync::mpsc;
 
-  use crate::app::context_clues::{build_context_clue_string, SERVARR_CONTEXT_CLUES};
   use crate::app::{interpolate_env_vars, App, AppConfig, Data, ServarrConfig};
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, RadarrData};
   use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SonarrData};
@@ -31,6 +32,7 @@ mod tests {
     };
     let sonarr_config_2 = ServarrConfig::default();
     let config = AppConfig {
+      theme: None,
       radarr: Some(vec![radarr_config_1.clone(), radarr_config_2.clone()]),
       sonarr: Some(vec![sonarr_config_1.clone(), sonarr_config_2.clone()]),
     };
@@ -38,40 +40,24 @@ mod tests {
       TabRoute {
         title: "Sonarr Test".to_owned(),
         route: ActiveSonarrBlock::default().into(),
-        help: format!(
-          "<↑↓> scroll | ←→ change tab | {}  ",
-          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-        ),
         contextual_help: None,
         config: Some(sonarr_config_1),
       },
       TabRoute {
         title: "Radarr 1".to_owned(),
         route: ActiveRadarrBlock::default().into(),
-        help: format!(
-          "<↑↓> scroll | ←→ change tab | {}  ",
-          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-        ),
         contextual_help: None,
         config: Some(radarr_config_2),
       },
       TabRoute {
         title: "Radarr Test".to_owned(),
         route: ActiveRadarrBlock::default().into(),
-        help: format!(
-          "<↑↓> scroll | ←→ change tab | {}  ",
-          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-        ),
         contextual_help: None,
         config: Some(radarr_config_1),
       },
       TabRoute {
         title: "Sonarr 1".to_owned(),
         route: ActiveSonarrBlock::default().into(),
-        help: format!(
-          "<↑↓> scroll | ←→ change tab | {}  ",
-          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-        ),
         contextual_help: None,
         config: Some(sonarr_config_2),
       },
@@ -97,7 +83,7 @@ mod tests {
     assert!(!app.is_loading);
     assert!(!app.is_routing);
     assert!(!app.should_refresh);
-    assert!(!app.should_ignore_quit_key);
+    assert!(!app.ignore_special_keys_for_textbox_input);
     assert!(!app.cli_mode);
   }
 
@@ -117,7 +103,7 @@ mod tests {
     assert!(!app.is_loading);
     assert!(!app.is_routing);
     assert!(!app.should_refresh);
-    assert!(!app.should_ignore_quit_key);
+    assert!(!app.ignore_special_keys_for_textbox_input);
     assert!(!app.cli_mode);
   }
 
@@ -283,7 +269,7 @@ mod tests {
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
@@ -356,6 +342,43 @@ mod tests {
     assert_eq!(servarr_config.api_token, Some(String::new()));
     assert_eq!(servarr_config.api_token_file, None);
     assert_eq!(servarr_config.ssl_cert_path, None);
+    assert_eq!(servarr_config.custom_headers, None);
+  }
+
+  #[test]
+  fn serialize_header_map_basic() {
+    let mut header_map = HeaderMap::new();
+    header_map.insert(
+      HeaderName::from_static("x-api-key"),
+      HeaderValue::from_static("abc123"),
+    );
+    header_map.insert(
+      HeaderName::from_static("header-1"),
+      HeaderValue::from_static("test"),
+    );
+
+    let config = ServarrConfig {
+      custom_headers: Some(header_map),
+      ..ServarrConfig::default()
+    };
+
+    let v: Value = serde_json::to_value(&config).expect("serialize ok");
+    let custom = v.get("custom_headers").unwrap();
+    assert!(custom.is_object());
+    let obj = custom.as_object().unwrap();
+
+    assert_eq!(obj.get("x-api-key").unwrap(), "abc123");
+    assert_eq!(obj.get("header-1").unwrap(), "test");
+
+    assert!(obj.get("X-Api-Key").is_none());
+    assert!(obj.get("HEADER-1").is_none());
+  }
+
+  #[test]
+  fn serialize_header_map_none_is_null() {
+    let config = ServarrConfig::default();
+    let v: Value = serde_json::to_value(&config).expect("serialize ok");
+    assert!(v.get("custom_headers").unwrap().is_null());
   }
 
   #[test]
@@ -399,6 +422,66 @@ mod tests {
     assert_eq!(config.port, None);
   }
 
+  #[test]
+  #[serial]
+  fn test_deserialize_optional_env_var_header_map_is_present() {
+    unsafe { std::env::set_var("TEST_VAR_DESERIALIZE_HEADER_OPTION", "localhost") };
+    let expected_custom_headers = {
+      let mut headers = HeaderMap::new();
+      headers.insert("X-Api-Host", "localhost".parse().unwrap());
+      headers.insert("api-token", "test123".parse().unwrap());
+      headers
+    };
+    let yaml_data = r#"
+      custom_headers:
+        X-Api-Host: ${TEST_VAR_DESERIALIZE_HEADER_OPTION}
+        api-token: "test123"
+    "#;
+
+    let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
+
+    assert_eq!(config.custom_headers, Some(expected_custom_headers));
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_HEADER_OPTION") };
+  }
+
+  #[test]
+  #[serial]
+  fn test_deserialize_optional_env_var_header_map_does_not_overwrite_non_env_value() {
+    unsafe {
+      std::env::set_var(
+        "TEST_VAR_DESERIALIZE_HEADER_OPTION_NO_OVERWRITE",
+        "localhost",
+      )
+    };
+    let expected_custom_headers = {
+      let mut headers = HeaderMap::new();
+      headers.insert("X-Api-Host", "www.example.com".parse().unwrap());
+      headers.insert("api-token", "test123".parse().unwrap());
+      headers
+    };
+    let yaml_data = r#"
+      custom_headers:
+        X-Api-Host: www.example.com
+        api-token: "test123"
+    "#;
+
+    let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
+
+    assert_eq!(config.custom_headers, Some(expected_custom_headers));
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_HEADER_OPTION_NO_OVERWRITE") };
+  }
+
+  #[test]
+  fn test_deserialize_optional_env_var_header_map_empty() {
+    let yaml_data = r#"
+      api_token: "test123"
+    "#;
+
+    let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
+
+    assert_eq!(config.custom_headers, None);
+  }
+
   #[test]
   #[serial]
   fn test_deserialize_optional_u16_env_var_is_present() {
@@ -512,8 +595,9 @@ mod tests {
     let api_token = "thisisatest".to_owned();
     let api_token_file = "/root/.config/api_token".to_owned();
     let ssl_cert_path = "/some/path".to_owned();
-    let expected_str = format!("ServarrConfig {{ name: Some(\"{}\"), host: Some(\"{}\"), port: Some({}), uri: Some(\"{}\"), weight: Some({}), api_token: Some(\"***********\"), api_token_file: Some(\"{}\"), ssl_cert_path: Some(\"{}\") }}",
-    name, host, port, uri, weight, api_token_file, ssl_cert_path);
+    let mut custom_headers = HeaderMap::new();
+    custom_headers.insert("X-Custom-Header", "value".parse().unwrap());
+    let expected_str = format!("ServarrConfig {{ name: Some(\"{name}\"), host: Some(\"{host}\"), port: Some({port}), uri: Some(\"{uri}\"), weight: Some({weight}), api_token: Some(\"***********\"), api_token_file: Some(\"{api_token_file}\"), ssl_cert_path: Some(\"{ssl_cert_path}\"), custom_headers: Some({{\"x-custom-header\": \"value\"}}) }}");
     let servarr_config = ServarrConfig {
       name: Some(name),
       host: Some(host),
@@ -523,6 +607,7 @@ mod tests {
       api_token: Some(api_token),
       api_token_file: Some(api_token_file),
       ssl_cert_path: Some(ssl_cert_path),
+      custom_headers: Some(custom_headers),
     };
 
     assert_str_eq!(format!("{servarr_config:?}"), expected_str);
diff --git a/src/app/context_clues.rs b/src/app/context_clues.rs
index 32a6463..b4a03ab 100644
--- a/src/app/context_clues.rs
+++ b/src/app/context_clues.rs
@@ -1,20 +1,41 @@
 use crate::app::key_binding::{KeyBinding, DEFAULT_KEYBINDINGS};
+use crate::app::radarr::radarr_context_clues::RadarrContextClueProvider;
+use crate::app::sonarr::sonarr_context_clues::SonarrContextClueProvider;
+use crate::app::App;
+use crate::models::Route;
 
 #[cfg(test)]
 #[path = "context_clues_tests.rs"]
 mod context_clues_tests;
 
-pub(in crate::app) type ContextClue = (KeyBinding, &'static str);
+pub type ContextClue = (KeyBinding, &'static str);
 
-pub fn build_context_clue_string(context_clues: &[(KeyBinding, &str)]) -> String {
-  context_clues
-    .iter()
-    .map(|(key_binding, desc)| format!("{} {desc}", key_binding.key))
-    .collect::<Vec<String>>()
-    .join(" | ")
+pub trait ContextClueProvider {
+  fn get_context_clues(_app: &mut App<'_>) -> Option<&'static [ContextClue]>;
 }
 
-pub static SERVARR_CONTEXT_CLUES: [ContextClue; 3] = [
+pub struct ServarrContextClueProvider;
+
+impl ContextClueProvider for ServarrContextClueProvider {
+  fn get_context_clues(app: &mut App<'_>) -> Option<&'static [ContextClue]> {
+    match app.get_current_route() {
+      Route::Radarr(_, _) => RadarrContextClueProvider::get_context_clues(app),
+      Route::Sonarr(_, _) => SonarrContextClueProvider::get_context_clues(app),
+      _ => None,
+    }
+  }
+}
+
+pub static SERVARR_CONTEXT_CLUES: [ContextClue; 10] = [
+  (DEFAULT_KEYBINDINGS.up, "scroll up"),
+  (DEFAULT_KEYBINDINGS.down, "scroll down"),
+  (DEFAULT_KEYBINDINGS.left, "previous tab"),
+  (DEFAULT_KEYBINDINGS.right, "next tab"),
+  (DEFAULT_KEYBINDINGS.pg_up, DEFAULT_KEYBINDINGS.pg_up.desc),
+  (
+    DEFAULT_KEYBINDINGS.pg_down,
+    DEFAULT_KEYBINDINGS.pg_down.desc,
+  ),
   (
     DEFAULT_KEYBINDINGS.next_servarr,
     DEFAULT_KEYBINDINGS.next_servarr.desc,
@@ -24,6 +45,7 @@ pub static SERVARR_CONTEXT_CLUES: [ContextClue; 3] = [
     DEFAULT_KEYBINDINGS.previous_servarr.desc,
   ),
   (DEFAULT_KEYBINDINGS.quit, DEFAULT_KEYBINDINGS.quit.desc),
+  (DEFAULT_KEYBINDINGS.help, DEFAULT_KEYBINDINGS.help.desc),
 ];
 
 pub static BARE_POPUP_CONTEXT_CLUES: [ContextClue; 1] =
diff --git a/src/app/context_clues_tests.rs b/src/app/context_clues_tests.rs
index 0e9fdaa..d5be326 100644
--- a/src/app/context_clues_tests.rs
+++ b/src/app/context_clues_tests.rs
@@ -3,24 +3,15 @@ mod test {
   use pretty_assertions::{assert_eq, assert_str_eq};
 
   use crate::app::context_clues::{
-    BARE_POPUP_CONTEXT_CLUES, BLOCKLIST_CONTEXT_CLUES, CONFIRMATION_PROMPT_CONTEXT_CLUES,
-    DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES, ROOT_FOLDERS_CONTEXT_CLUES,
-    SERVARR_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+    ContextClueProvider, ServarrContextClueProvider, BARE_POPUP_CONTEXT_CLUES,
+    BLOCKLIST_CONTEXT_CLUES, CONFIRMATION_PROMPT_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES,
+    INDEXERS_CONTEXT_CLUES, ROOT_FOLDERS_CONTEXT_CLUES, SERVARR_CONTEXT_CLUES,
+    SYSTEM_CONTEXT_CLUES,
   };
-  use crate::app::{context_clues::build_context_clue_string, key_binding::DEFAULT_KEYBINDINGS};
-
-  #[test]
-  fn test_build_context_clue_string() {
-    let test_context_clues_array = [
-      (DEFAULT_KEYBINDINGS.add, "add"),
-      (DEFAULT_KEYBINDINGS.delete, "delete"),
-    ];
-
-    assert_str_eq!(
-      build_context_clue_string(&test_context_clues_array),
-      "<a> add | <del> delete"
-    );
-  }
+  use crate::app::{key_binding::DEFAULT_KEYBINDINGS, App};
+  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use crate::models::servarr_data::ActiveKeybindingBlock;
 
   #[test]
   fn test_servarr_context_clues() {
@@ -28,6 +19,36 @@ mod test {
 
     let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
 
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.up);
+    assert_str_eq!(*description, "scroll up");
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.down);
+    assert_str_eq!(*description, "scroll down");
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.left);
+    assert_str_eq!(*description, "previous tab");
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.right);
+    assert_str_eq!(*description, "next tab");
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.pg_up);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.pg_up.desc);
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.pg_down);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.pg_down.desc);
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.next_servarr);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.next_servarr.desc);
 
@@ -40,6 +61,11 @@ mod test {
 
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.quit);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.quit.desc);
+
+    let (key_binding, description) = servarr_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.help);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.help.desc);
     assert_eq!(servarr_context_clues_iter.next(), None);
   }
 
@@ -209,4 +235,42 @@ mod test {
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.refresh.desc);
     assert_eq!(system_context_clues_iter.next(), None);
   }
+
+  #[test]
+  fn test_servarr_context_clue_provider_delegates_to_radarr_provider() {
+    let mut app = App::test_default();
+    app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
+
+    let context_clues = ServarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(
+      &crate::app::radarr::radarr_context_clues::SYSTEM_TASKS_CONTEXT_CLUES,
+      context_clues.unwrap()
+    );
+  }
+
+  #[test]
+  fn test_servarr_context_clue_provider_delegates_to_sonarr_provider() {
+    let mut app = App::test_default();
+    app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
+
+    let context_clues = ServarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(
+      &crate::app::sonarr::sonarr_context_clues::SYSTEM_TASKS_CONTEXT_CLUES,
+      context_clues.unwrap()
+    );
+  }
+
+  #[test]
+  fn test_servarr_context_clue_provider_unsupported_route_returns_none() {
+    let mut app = App::test_default();
+    app.push_navigation_stack(ActiveKeybindingBlock::Help.into());
+
+    let context_clues = ServarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_none());
+  }
 }
diff --git a/src/app/key_binding.rs b/src/app/key_binding.rs
index f939a6d..d63f9e8 100644
--- a/src/app/key_binding.rs
+++ b/src/app/key_binding.rs
@@ -14,6 +14,8 @@ generate_keybindings! {
   down,
   left,
   right,
+  pg_down,
+  pg_up,
   backspace,
   next_servarr,
   previous_servarr,
@@ -21,6 +23,7 @@ generate_keybindings! {
   search,
   auto_search,
   settings,
+  help,
   filter,
   sort,
   edit,
@@ -44,128 +47,203 @@ generate_keybindings! {
 #[derive(Clone, Copy, Eq, PartialEq, Debug)]
 pub struct KeyBinding {
   pub key: Key,
+  pub alt: Option<Key>,
   pub desc: &'static str,
 }
 
 pub const DEFAULT_KEYBINDINGS: KeyBindings = KeyBindings {
   add: KeyBinding {
     key: Key::Char('a'),
+    alt: None,
     desc: "add",
   },
   up: KeyBinding {
     key: Key::Up,
+    alt: Some(Key::Char('k')),
     desc: "up",
   },
   down: KeyBinding {
     key: Key::Down,
+    alt: Some(Key::Char('j')),
     desc: "down",
   },
   left: KeyBinding {
     key: Key::Left,
+    alt: Some(Key::Char('h')),
     desc: "left",
   },
   right: KeyBinding {
     key: Key::Right,
+    alt: Some(Key::Char('l')),
     desc: "right",
   },
+  pg_down: KeyBinding {
+    key: Key::PgDown,
+    alt: Some(Key::Ctrl('d')),
+    desc: "page down",
+  },
+  pg_up: KeyBinding {
+    key: Key::PgUp,
+    alt: Some(Key::Ctrl('u')),
+    desc: "page up",
+  },
   backspace: KeyBinding {
     key: Key::Backspace,
+    alt: Some(Key::Ctrl('h')),
     desc: "backspace",
   },
   next_servarr: KeyBinding {
     key: Key::Tab,
+    alt: None,
     desc: "next servarr",
   },
   previous_servarr: KeyBinding {
     key: Key::BackTab,
+    alt: None,
     desc: "previous servarr",
   },
   clear: KeyBinding {
     key: Key::Char('c'),
+    alt: None,
     desc: "clear",
   },
   auto_search: KeyBinding {
     key: Key::Char('S'),
+    alt: None,
     desc: "auto search",
   },
   search: KeyBinding {
     key: Key::Char('s'),
+    alt: None,
     desc: "search",
   },
   settings: KeyBinding {
     key: Key::Char('S'),
+    alt: None,
     desc: "settings",
   },
+  help: KeyBinding {
+    key: Key::Char('?'),
+    alt: None,
+    desc: "show/hide keybindings",
+  },
   filter: KeyBinding {
     key: Key::Char('f'),
+    alt: None,
     desc: "filter",
   },
   sort: KeyBinding {
     key: Key::Char('o'),
+    alt: None,
     desc: "sort",
   },
   edit: KeyBinding {
     key: Key::Char('e'),
+    alt: None,
     desc: "edit",
   },
   events: KeyBinding {
     key: Key::Char('e'),
+    alt: None,
     desc: "events",
   },
   logs: KeyBinding {
-    key: Key::Char('l'),
+    key: Key::Char('L'),
+    alt: None,
     desc: "logs",
   },
   tasks: KeyBinding {
     key: Key::Char('t'),
+    alt: None,
     desc: "tasks",
   },
   test: KeyBinding {
     key: Key::Char('t'),
+    alt: None,
     desc: "test",
   },
   test_all: KeyBinding {
     key: Key::Char('T'),
+    alt: None,
     desc: "test all",
   },
   toggle_monitoring: KeyBinding {
     key: Key::Char('m'),
+    alt: None,
     desc: "toggle monitoring",
   },
   refresh: KeyBinding {
     key: Key::Ctrl('r'),
+    alt: None,
     desc: "refresh",
   },
   update: KeyBinding {
     key: Key::Char('u'),
+    alt: None,
     desc: "update",
   },
   home: KeyBinding {
     key: Key::Home,
+    alt: None,
     desc: "home",
   },
   end: KeyBinding {
     key: Key::End,
+    alt: None,
     desc: "end",
   },
   delete: KeyBinding {
     key: Key::Delete,
+    alt: None,
     desc: "delete",
   },
   submit: KeyBinding {
     key: Key::Enter,
+    alt: None,
     desc: "submit",
   },
   confirm: KeyBinding {
     key: Key::Ctrl('s'),
+    alt: None,
     desc: "submit",
   },
   quit: KeyBinding {
     key: Key::Char('q'),
+    alt: None,
     desc: "quit",
   },
   esc: KeyBinding {
     key: Key::Esc,
+    alt: None,
     desc: "close",
   },
 };
+
+#[macro_export]
+macro_rules! matches_key {
+  ($binding:ident, $key:expr) => {
+    $crate::app::key_binding::DEFAULT_KEYBINDINGS.$binding.key == $key
+      || ($crate::app::key_binding::DEFAULT_KEYBINDINGS
+        .$binding
+        .alt
+        .is_some()
+        && $crate::app::key_binding::DEFAULT_KEYBINDINGS
+          .$binding
+          .alt
+          .unwrap()
+          == $key)
+  };
+  ($binding:ident, $key:expr, $ignore_special_keys:expr) => {
+    $crate::app::key_binding::DEFAULT_KEYBINDINGS.$binding.key == $key
+      || !$ignore_special_keys
+        && ($crate::app::key_binding::DEFAULT_KEYBINDINGS
+          .$binding
+          .alt
+          .is_some()
+          && $crate::app::key_binding::DEFAULT_KEYBINDINGS
+            .$binding
+            .alt
+            .unwrap()
+            == $key)
+  };
+}
diff --git a/src/app/key_binding_tests.rs b/src/app/key_binding_tests.rs
index c78c210..a5357f3 100644
--- a/src/app/key_binding_tests.rs
+++ b/src/app/key_binding_tests.rs
@@ -5,44 +5,88 @@ mod test {
 
   use crate::app::key_binding::{KeyBinding, DEFAULT_KEYBINDINGS};
   use crate::event::Key;
+  use crate::matches_key;
 
   #[rstest]
-  #[case(DEFAULT_KEYBINDINGS.add, Key::Char('a'), "add")]
-  #[case(DEFAULT_KEYBINDINGS.up, Key::Up, "up")]
-  #[case(DEFAULT_KEYBINDINGS.down, Key::Down, "down")]
-  #[case(DEFAULT_KEYBINDINGS.left, Key::Left, "left")]
-  #[case(DEFAULT_KEYBINDINGS.right, Key::Right, "right")]
-  #[case(DEFAULT_KEYBINDINGS.backspace, Key::Backspace, "backspace")]
-  #[case(DEFAULT_KEYBINDINGS.next_servarr, Key::Tab, "next servarr")]
-  #[case(DEFAULT_KEYBINDINGS.previous_servarr, Key::BackTab, "previous servarr")]
-  #[case(DEFAULT_KEYBINDINGS.clear, Key::Char('c'), "clear")]
-  #[case(DEFAULT_KEYBINDINGS.auto_search, Key::Char('S'), "auto search")]
-  #[case(DEFAULT_KEYBINDINGS.search, Key::Char('s'), "search")]
-  #[case(DEFAULT_KEYBINDINGS.settings, Key::Char('S'), "settings")]
-  #[case(DEFAULT_KEYBINDINGS.filter, Key::Char('f'), "filter")]
-  #[case(DEFAULT_KEYBINDINGS.sort, Key::Char('o'), "sort")]
-  #[case(DEFAULT_KEYBINDINGS.edit, Key::Char('e'), "edit")]
-  #[case(DEFAULT_KEYBINDINGS.events, Key::Char('e'), "events")]
-  #[case(DEFAULT_KEYBINDINGS.logs, Key::Char('l'), "logs")]
-  #[case(DEFAULT_KEYBINDINGS.tasks, Key::Char('t'), "tasks")]
-  #[case(DEFAULT_KEYBINDINGS.test, Key::Char('t'), "test")]
-  #[case(DEFAULT_KEYBINDINGS.test_all, Key::Char('T'), "test all")]
-  #[case(DEFAULT_KEYBINDINGS.toggle_monitoring, Key::Char('m'), "toggle monitoring")]
-  #[case(DEFAULT_KEYBINDINGS.refresh, Key::Ctrl('r'), "refresh")]
-  #[case(DEFAULT_KEYBINDINGS.update, Key::Char('u'), "update")]
-  #[case(DEFAULT_KEYBINDINGS.home, Key::Home, "home")]
-  #[case(DEFAULT_KEYBINDINGS.end, Key::End, "end")]
-  #[case(DEFAULT_KEYBINDINGS.delete, Key::Delete, "delete")]
-  #[case(DEFAULT_KEYBINDINGS.submit, Key::Enter, "submit")]
-  #[case(DEFAULT_KEYBINDINGS.confirm, Key::Ctrl('s'), "submit")]
-  #[case(DEFAULT_KEYBINDINGS.quit, Key::Char('q'), "quit")]
-  #[case(DEFAULT_KEYBINDINGS.esc, Key::Esc, "close")]
+  #[case(DEFAULT_KEYBINDINGS.add, Key::Char('a'), None, "add")]
+  #[case(DEFAULT_KEYBINDINGS.up, Key::Up, Some(Key::Char('k')), "up")]
+  #[case(DEFAULT_KEYBINDINGS.down, Key::Down, Some(Key::Char('j')), "down")]
+  #[case(DEFAULT_KEYBINDINGS.left, Key::Left, Some(Key::Char('h')), "left")]
+  #[case(DEFAULT_KEYBINDINGS.right, Key::Right, Some(Key::Char('l')), "right")]
+  #[case(DEFAULT_KEYBINDINGS.pg_down, Key::PgDown, Some(Key::Ctrl('d')), "page down")]
+  #[case(DEFAULT_KEYBINDINGS.pg_up, Key::PgUp, Some(Key::Ctrl('u')), "page up")]
+  #[case(DEFAULT_KEYBINDINGS.backspace, Key::Backspace, Some(Key::Ctrl('h')), "backspace")]
+  #[case(DEFAULT_KEYBINDINGS.next_servarr, Key::Tab, None, "next servarr")]
+  #[case(DEFAULT_KEYBINDINGS.previous_servarr, Key::BackTab, None, "previous servarr")]
+  #[case(DEFAULT_KEYBINDINGS.clear, Key::Char('c'), None, "clear")]
+  #[case(DEFAULT_KEYBINDINGS.auto_search, Key::Char('S'), None, "auto search")]
+  #[case(DEFAULT_KEYBINDINGS.search, Key::Char('s'), None, "search")]
+  #[case(DEFAULT_KEYBINDINGS.settings, Key::Char('S'), None, "settings")]
+  #[case(DEFAULT_KEYBINDINGS.help, Key::Char('?'), None, "show/hide keybindings")]
+  #[case(DEFAULT_KEYBINDINGS.filter, Key::Char('f'), None, "filter")]
+  #[case(DEFAULT_KEYBINDINGS.sort, Key::Char('o'), None, "sort")]
+  #[case(DEFAULT_KEYBINDINGS.edit, Key::Char('e'), None, "edit")]
+  #[case(DEFAULT_KEYBINDINGS.events, Key::Char('e'), None, "events")]
+  #[case(DEFAULT_KEYBINDINGS.logs, Key::Char('L'), None, "logs")]
+  #[case(DEFAULT_KEYBINDINGS.tasks, Key::Char('t'), None, "tasks")]
+  #[case(DEFAULT_KEYBINDINGS.test, Key::Char('t'), None, "test")]
+  #[case(DEFAULT_KEYBINDINGS.test_all, Key::Char('T'), None, "test all")]
+  #[case(DEFAULT_KEYBINDINGS.toggle_monitoring, Key::Char('m'), None, "toggle monitoring")]
+  #[case(DEFAULT_KEYBINDINGS.refresh, Key::Ctrl('r'), None, "refresh")]
+  #[case(DEFAULT_KEYBINDINGS.update, Key::Char('u'), None, "update")]
+  #[case(DEFAULT_KEYBINDINGS.home, Key::Home, None, "home")]
+  #[case(DEFAULT_KEYBINDINGS.end, Key::End, None, "end")]
+  #[case(DEFAULT_KEYBINDINGS.delete, Key::Delete, None, "delete")]
+  #[case(DEFAULT_KEYBINDINGS.submit, Key::Enter, None, "submit")]
+  #[case(DEFAULT_KEYBINDINGS.confirm, Key::Ctrl('s'), None, "submit")]
+  #[case(DEFAULT_KEYBINDINGS.quit, Key::Char('q'), None, "quit")]
+  #[case(DEFAULT_KEYBINDINGS.esc, Key::Esc, None, "close")]
   fn test_default_key_bindings_and_descriptions(
     #[case] key_binding: KeyBinding,
     #[case] expected_key: Key,
+    #[case] expected_alt_key: Option<Key>,
     #[case] expected_desc: &str,
   ) {
     assert_eq!(key_binding.key, expected_key);
+    assert_eq!(key_binding.alt, expected_alt_key);
     assert_str_eq!(key_binding.desc, expected_desc);
   }
+
+  #[test]
+  fn test_matches_key_macro() {
+    let key = Key::Char('t');
+
+    assert!(matches_key!(test, key));
+    assert!(!matches_key!(test, Key::Char('T')));
+  }
+
+  #[test]
+  fn test_matches_key_macro_with_alt_keybinding() {
+    let alt_key = Key::Char('k');
+    let key = Key::Up;
+
+    assert!(matches_key!(up, key));
+    assert!(matches_key!(up, alt_key));
+    assert!(!matches_key!(up, Key::Char('t')));
+  }
+
+  #[test]
+  fn test_matches_key_macro_with_alt_keybinding_uses_alt_key_when_ignore_special_keys_is_false() {
+    let alt_key = Key::Char('k');
+    let key = Key::Up;
+
+    assert!(matches_key!(up, key, false));
+    assert!(matches_key!(up, alt_key, false));
+    assert!(!matches_key!(up, Key::Char('t'), false));
+  }
+
+  #[test]
+  fn test_matches_key_macro_with_alt_keybinding_ignores_alt_key_when_ignore_special_keys_is_true() {
+    let alt_key = Key::Char('k');
+    let key = Key::Up;
+
+    assert!(matches_key!(up, key, true));
+    assert!(!matches_key!(up, alt_key, true));
+    assert!(!matches_key!(up, Key::Char('t'), true));
+  }
 }
diff --git a/src/app/mod.rs b/src/app/mod.rs
index d4f7b42..7ff3a48 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -3,17 +3,20 @@ use colored::Colorize;
 use itertools::Itertools;
 use log::{debug, error};
 use regex::Regex;
+use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 use std::path::PathBuf;
 use std::{fs, process};
 use tokio::sync::mpsc::Sender;
 use tokio_util::sync::CancellationToken;
 use veil::Redact;
 
-use crate::app::context_clues::{build_context_clue_string, SERVARR_CONTEXT_CLUES};
 use crate::cli::Command;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, RadarrData};
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SonarrData};
+use crate::models::servarr_models::KeybindingItem;
+use crate::models::stateful_table::StatefulTable;
 use crate::models::{HorizontallyScrollableText, Route, TabRoute, TabState};
 use crate::network::NetworkEvent;
 
@@ -32,6 +35,7 @@ pub struct App<'a> {
   pub cancellation_token: CancellationToken,
   pub is_first_render: bool,
   pub server_tabs: TabState,
+  pub keymapping_table: Option<StatefulTable<KeybindingItem>>,
   pub error: HorizontallyScrollableText,
   pub tick_until_poll: u64,
   pub ticks_until_scroll: u64,
@@ -39,7 +43,7 @@ pub struct App<'a> {
   pub is_routing: bool,
   pub is_loading: bool,
   pub should_refresh: bool,
-  pub should_ignore_quit_key: bool,
+  pub ignore_special_keys_for_textbox_input: bool,
   pub cli_mode: bool,
   pub data: Data<'a>,
 }
@@ -51,10 +55,6 @@ impl App<'_> {
     cancellation_token: CancellationToken,
   ) -> Self {
     let mut server_tabs = Vec::new();
-    let help = format!(
-      "<↑↓> scroll | ←→ change tab | {}  ",
-      build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-    );
 
     if let Some(radarr_configs) = config.radarr {
       let mut idx = 0;
@@ -63,13 +63,12 @@ impl App<'_> {
           name
         } else {
           idx += 1;
-          format!("Radarr {}", idx)
+          format!("Radarr {idx}")
         };
 
         server_tabs.push(TabRoute {
           title: name,
           route: ActiveRadarrBlock::Movies.into(),
-          help: help.clone(),
           contextual_help: None,
           config: Some(radarr_config),
         });
@@ -84,13 +83,12 @@ impl App<'_> {
           name
         } else {
           idx += 1;
-          format!("Sonarr {}", idx)
+          format!("Sonarr {idx}")
         };
 
         server_tabs.push(TabRoute {
           title: name,
           route: ActiveSonarrBlock::Series.into(),
-          help: help.clone(),
           contextual_help: None,
           config: Some(sonarr_config),
         });
@@ -215,6 +213,7 @@ impl Default for App<'_> {
       navigation_stack: Vec::new(),
       network_tx: None,
       cancellation_token: CancellationToken::new(),
+      keymapping_table: None,
       error: HorizontallyScrollableText::default(),
       is_first_render: true,
       server_tabs: TabState::new(Vec::new()),
@@ -224,7 +223,7 @@ impl Default for App<'_> {
       is_loading: false,
       is_routing: false,
       should_refresh: false,
-      should_ignore_quit_key: false,
+      ignore_special_keys_for_textbox_input: false,
       cli_mode: false,
       data: Data::default(),
     }
@@ -239,20 +238,12 @@ impl App<'_> {
         TabRoute {
           title: "Radarr".to_owned(),
           route: ActiveRadarrBlock::Movies.into(),
-          help: format!(
-            "<↑↓> scroll | ←→ change tab | {}  ",
-            build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-          ),
           contextual_help: None,
           config: Some(ServarrConfig::default()),
         },
         TabRoute {
           title: "Sonarr".to_owned(),
           route: ActiveSonarrBlock::Series.into(),
-          help: format!(
-            "<↑↓> scroll | ←→ change tab | {}  ",
-            build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-          ),
           contextual_help: None,
           config: Some(ServarrConfig::default()),
         },
@@ -270,6 +261,7 @@ pub struct Data<'a> {
 
 #[derive(Debug, Deserialize, Serialize, Default, Clone)]
 pub struct AppConfig {
+  pub theme: Option<String>,
   pub radarr: Option<Vec<ServarrConfig>>,
   pub sonarr: Option<Vec<ServarrConfig>>,
 }
@@ -295,8 +287,7 @@ impl AppConfig {
   pub fn verify_config_present_for_cli(&self, command: &Command) {
     let msg = |servarr: &str| {
       log_and_print_error(format!(
-        "{} configuration missing; Unable to run any {} commands.",
-        servarr, servarr
+        "{servarr} configuration missing; Unable to run any {servarr} commands."
       ))
     };
     match command {
@@ -346,6 +337,12 @@ pub struct ServarrConfig {
   pub api_token_file: Option<String>,
   #[serde(default, deserialize_with = "deserialize_optional_env_var")]
   pub ssl_cert_path: Option<String>,
+  #[serde(
+    default,
+    deserialize_with = "deserialize_optional_env_var_header_map",
+    serialize_with = "serialize_header_map"
+  )]
+  pub custom_headers: Option<HeaderMap>,
 }
 
 impl ServarrConfig {
@@ -367,8 +364,7 @@ impl ServarrConfig {
     if let Some(api_token_file) = self.api_token_file.as_ref() {
       if !PathBuf::from(api_token_file).exists() {
         log_and_print_error(format!(
-          "The specified {} API token file does not exist",
-          api_token_file
+          "The specified {api_token_file} API token file does not exist"
         ));
         process::exit(1);
       }
@@ -392,15 +388,37 @@ impl Default for ServarrConfig {
       api_token: Some(String::new()),
       api_token_file: None,
       ssl_cert_path: None,
+      custom_headers: None,
     }
   }
 }
 
 pub fn log_and_print_error(error: String) {
-  error!("{}", error);
+  error!("{error}");
   eprintln!("error: {}", error.red());
 }
 
+fn serialize_header_map<S>(headers: &Option<HeaderMap>, serializer: S) -> Result<S::Ok, S::Error>
+where
+  S: serde::Serializer,
+{
+  if let Some(headers) = headers {
+    let mut map = HashMap::new();
+    for (name, value) in headers.iter() {
+      let name_str = name.as_str().to_string();
+      let value_str = value
+        .to_str()
+        .map_err(serde::ser::Error::custom)?
+        .to_string();
+
+      map.insert(name_str, value_str);
+    }
+    map.serialize(serializer)
+  } else {
+    serializer.serialize_none()
+  }
+}
+
 fn deserialize_optional_env_var<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
 where
   D: serde::Deserializer<'de>,
@@ -415,6 +433,28 @@ where
   }
 }
 
+fn deserialize_optional_env_var_header_map<'de, D>(
+  deserializer: D,
+) -> Result<Option<HeaderMap>, D::Error>
+where
+  D: serde::Deserializer<'de>,
+{
+  let opt: Option<HashMap<String, String>> = Option::deserialize(deserializer)?;
+  match opt {
+    Some(map) => {
+      let mut header_map = HeaderMap::new();
+      for (k, v) in map.iter() {
+        let name = HeaderName::from_bytes(k.as_bytes()).map_err(serde::de::Error::custom)?;
+        let value_str = interpolate_env_vars(v);
+        let value = HeaderValue::from_str(&value_str).map_err(serde::de::Error::custom)?;
+        header_map.insert(name, value);
+      }
+      Ok(Some(header_map))
+    }
+    None => Ok(None),
+  }
+}
+
 fn deserialize_u16_env_var<'de, D>(deserializer: D) -> Result<Option<u16>, D::Error>
 where
   D: serde::Deserializer<'de>,
diff --git a/src/app/radarr/mod.rs b/src/app/radarr/mod.rs
index 6ecba83..b749d03 100644
--- a/src/app/radarr/mod.rs
+++ b/src/app/radarr/mod.rs
@@ -40,7 +40,7 @@ impl App<'_> {
       }
       ActiveRadarrBlock::Downloads => {
         self
-          .dispatch_network_event(RadarrEvent::GetDownloads.into())
+          .dispatch_network_event(RadarrEvent::GetDownloads(500).into())
           .await;
       }
       ActiveRadarrBlock::RootFolders => {
@@ -59,7 +59,7 @@ impl App<'_> {
           .dispatch_network_event(RadarrEvent::GetMovies.into())
           .await;
         self
-          .dispatch_network_event(RadarrEvent::GetDownloads.into())
+          .dispatch_network_event(RadarrEvent::GetDownloads(500).into())
           .await;
       }
       ActiveRadarrBlock::Indexers => {
@@ -201,7 +201,7 @@ impl App<'_> {
       .dispatch_network_event(RadarrEvent::GetRootFolders.into())
       .await;
     self
-      .dispatch_network_event(RadarrEvent::GetDownloads.into())
+      .dispatch_network_event(RadarrEvent::GetDownloads(500).into())
       .await;
     self
       .dispatch_network_event(RadarrEvent::GetDiskSpace.into())
diff --git a/src/app/radarr/radarr_context_clues.rs b/src/app/radarr/radarr_context_clues.rs
index d35222b..68d2823 100644
--- a/src/app/radarr/radarr_context_clues.rs
+++ b/src/app/radarr/radarr_context_clues.rs
@@ -1,13 +1,25 @@
-use crate::app::context_clues::ContextClue;
+use crate::app::context_clues::{
+  ContextClue, ContextClueProvider, BARE_POPUP_CONTEXT_CLUES, CONFIRMATION_PROMPT_CONTEXT_CLUES,
+};
 use crate::app::key_binding::DEFAULT_KEYBINDINGS;
+use crate::app::App;
+use crate::models::servarr_data::radarr::radarr_data::{
+  ActiveRadarrBlock, ADD_MOVIE_BLOCKS, EDIT_COLLECTION_BLOCKS, EDIT_INDEXER_BLOCKS,
+  EDIT_MOVIE_BLOCKS, INDEXER_SETTINGS_BLOCKS, MOVIE_DETAILS_BLOCKS,
+};
+use crate::models::Route;
 
 #[cfg(test)]
 #[path = "radarr_context_clues_tests.rs"]
 mod radarr_context_clues_tests;
 
-pub static LIBRARY_CONTEXT_CLUES: [ContextClue; 10] = [
+pub static LIBRARY_CONTEXT_CLUES: [ContextClue; 11] = [
   (DEFAULT_KEYBINDINGS.add, DEFAULT_KEYBINDINGS.add.desc),
   (DEFAULT_KEYBINDINGS.edit, DEFAULT_KEYBINDINGS.edit.desc),
+  (
+    DEFAULT_KEYBINDINGS.toggle_monitoring,
+    DEFAULT_KEYBINDINGS.toggle_monitoring.desc,
+  ),
   (DEFAULT_KEYBINDINGS.sort, DEFAULT_KEYBINDINGS.sort.desc),
   (DEFAULT_KEYBINDINGS.delete, DEFAULT_KEYBINDINGS.delete.desc),
   (DEFAULT_KEYBINDINGS.search, DEFAULT_KEYBINDINGS.search.desc),
@@ -49,7 +61,7 @@ pub static MOVIE_DETAILS_CONTEXT_CLUES: [ContextClue; 5] = [
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
 
-pub static MANUAL_MOVIE_SEARCH_CONTEXT_CLUES: [ContextClue; 6] = [
+pub static MANUAL_MOVIE_SEARCH_CONTEXT_CLUES: [ContextClue; 7] = [
   (
     DEFAULT_KEYBINDINGS.refresh,
     DEFAULT_KEYBINDINGS.refresh.desc,
@@ -61,12 +73,10 @@ pub static MANUAL_MOVIE_SEARCH_CONTEXT_CLUES: [ContextClue; 6] = [
     DEFAULT_KEYBINDINGS.auto_search,
     DEFAULT_KEYBINDINGS.auto_search.desc,
   ),
+  (DEFAULT_KEYBINDINGS.submit, "details"),
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
 
-pub static MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES: [ContextClue; 1] =
-  [(DEFAULT_KEYBINDINGS.submit, "details")];
-
 pub static ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES: [ContextClue; 2] = [
   (DEFAULT_KEYBINDINGS.submit, "details"),
   (DEFAULT_KEYBINDINGS.esc, "edit search"),
@@ -82,3 +92,54 @@ pub static COLLECTION_DETAILS_CONTEXT_CLUES: [ContextClue; 3] = [
   (DEFAULT_KEYBINDINGS.edit, "edit collection"),
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
+
+pub(in crate::app) struct RadarrContextClueProvider;
+
+impl ContextClueProvider for RadarrContextClueProvider {
+  fn get_context_clues(app: &mut App<'_>) -> Option<&'static [ContextClue]> {
+    let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() else {
+      panic!("RadarrContextClueProvider::get_context_clues called with non-Radarr route");
+    };
+    match active_radarr_block {
+      _ if MOVIE_DETAILS_BLOCKS.contains(&active_radarr_block) => app
+        .data
+        .radarr_data
+        .movie_info_tabs
+        .get_active_route_contextual_help(),
+      ActiveRadarrBlock::TestAllIndexers
+      | ActiveRadarrBlock::AddMovieSearchInput
+      | ActiveRadarrBlock::AddMovieEmptySearchResults
+      | ActiveRadarrBlock::SystemLogs
+      | ActiveRadarrBlock::SystemUpdates => Some(&BARE_POPUP_CONTEXT_CLUES),
+      _ if context_option.unwrap_or(active_radarr_block)
+        == ActiveRadarrBlock::ViewMovieOverview =>
+      {
+        Some(&BARE_POPUP_CONTEXT_CLUES)
+      }
+      ActiveRadarrBlock::SystemTasks => Some(&SYSTEM_TASKS_CONTEXT_CLUES),
+      _ if EDIT_COLLECTION_BLOCKS.contains(&active_radarr_block)
+        || EDIT_INDEXER_BLOCKS.contains(&active_radarr_block)
+        || INDEXER_SETTINGS_BLOCKS.contains(&active_radarr_block)
+        || EDIT_MOVIE_BLOCKS.contains(&active_radarr_block) =>
+      {
+        Some(&CONFIRMATION_PROMPT_CONTEXT_CLUES)
+      }
+      ActiveRadarrBlock::AddMoviePrompt
+      | ActiveRadarrBlock::AddMovieSelectMonitor
+      | ActiveRadarrBlock::AddMovieSelectMinimumAvailability
+      | ActiveRadarrBlock::AddMovieSelectQualityProfile
+      | ActiveRadarrBlock::AddMovieSelectRootFolder
+      | ActiveRadarrBlock::AddMovieTagsInput
+      | ActiveRadarrBlock::SystemTaskStartConfirmPrompt => Some(&CONFIRMATION_PROMPT_CONTEXT_CLUES),
+      _ if ADD_MOVIE_BLOCKS.contains(&active_radarr_block) => {
+        Some(&ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES)
+      }
+      ActiveRadarrBlock::CollectionDetails => Some(&COLLECTION_DETAILS_CONTEXT_CLUES),
+      _ => app
+        .data
+        .radarr_data
+        .main_tabs
+        .get_active_route_contextual_help(),
+    }
+  }
+}
diff --git a/src/app/radarr/radarr_context_clues_tests.rs b/src/app/radarr/radarr_context_clues_tests.rs
index 91c2528..b98c5b5 100644
--- a/src/app/radarr/radarr_context_clues_tests.rs
+++ b/src/app/radarr/radarr_context_clues_tests.rs
@@ -1,14 +1,21 @@
 #[cfg(test)]
 mod tests {
-  use pretty_assertions::{assert_eq, assert_str_eq};
-
+  use crate::app::context_clues::{
+    ContextClue, ContextClueProvider, BARE_POPUP_CONTEXT_CLUES, BLOCKLIST_CONTEXT_CLUES,
+    CONFIRMATION_PROMPT_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES,
+    ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+  };
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::radarr::radarr_context_clues::{
-    ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES, COLLECTIONS_CONTEXT_CLUES,
-    COLLECTION_DETAILS_CONTEXT_CLUES, LIBRARY_CONTEXT_CLUES,
-    MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES, MANUAL_MOVIE_SEARCH_CONTEXT_CLUES,
+    RadarrContextClueProvider, ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES, COLLECTIONS_CONTEXT_CLUES,
+    COLLECTION_DETAILS_CONTEXT_CLUES, LIBRARY_CONTEXT_CLUES, MANUAL_MOVIE_SEARCH_CONTEXT_CLUES,
     MOVIE_DETAILS_CONTEXT_CLUES, SYSTEM_TASKS_CONTEXT_CLUES,
   };
+  use crate::app::App;
+  use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, RadarrData};
+  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
 
   #[test]
   fn test_library_context_clues() {
@@ -26,6 +33,11 @@ mod tests {
 
     let (key_binding, description) = library_context_clues_iter.next().unwrap();
 
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.toggle_monitoring);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.toggle_monitoring.desc);
+
+    let (key_binding, description) = library_context_clues_iter.next().unwrap();
+
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.sort);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.sort.desc);
 
@@ -174,26 +186,15 @@ mod tests {
 
     let (key_binding, description) = manual_movie_search_context_clues_iter.next().unwrap();
 
-    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
-    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
-    assert_eq!(manual_movie_search_context_clues_iter.next(), None);
-  }
-
-  #[test]
-  fn test_manual_movie_search_contextual_context_clues() {
-    let mut manual_movie_search_contextual_context_clues_iter =
-      MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES.iter();
-
-    let (key_binding, description) = manual_movie_search_contextual_context_clues_iter
-      .next()
-      .unwrap();
-
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
     assert_str_eq!(*description, "details");
-    assert_eq!(
-      manual_movie_search_contextual_context_clues_iter.next(),
-      None
-    );
+
+    let (key_binding, description) = manual_movie_search_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
+
+    assert_eq!(manual_movie_search_context_clues_iter.next(), None);
   }
 
   #[test]
@@ -249,4 +250,255 @@ mod tests {
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
     assert_eq!(collection_details_context_clues_iter.next(), None);
   }
+
+  #[test]
+  #[should_panic(
+    expected = "RadarrContextClueProvider::get_context_clues called with non-Radarr route"
+  )]
+  fn test_radarr_context_clue_provider_get_context_clues_non_radarr_route() {
+    let mut app = App::test_default();
+    app.push_navigation_stack(ActiveSonarrBlock::default().into());
+
+    // This should panic because the route is not a Radarr route
+    RadarrContextClueProvider::get_context_clues(&mut app);
+  }
+
+  #[rstest]
+  #[case(ActiveRadarrBlock::TestAllIndexers, None)]
+  #[case(ActiveRadarrBlock::AddMovieSearchInput, None)]
+  #[case(ActiveRadarrBlock::AddMovieEmptySearchResults, None)]
+  #[case(ActiveRadarrBlock::SystemLogs, None)]
+  #[case(ActiveRadarrBlock::SystemUpdates, None)]
+  #[case(ActiveRadarrBlock::ViewMovieOverview, None)]
+  #[case(
+    ActiveRadarrBlock::CollectionDetails,
+    Some(ActiveRadarrBlock::ViewMovieOverview)
+  )]
+  fn test_radarr_context_clue_provider_bare_popup_context_clues(
+    #[case] active_radarr_block: ActiveRadarrBlock,
+    #[case] context_option: Option<ActiveRadarrBlock>,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack((active_radarr_block, context_option).into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&BARE_POPUP_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  #[case(0, ActiveRadarrBlock::MovieDetails, &MOVIE_DETAILS_CONTEXT_CLUES)]
+  #[case(1, ActiveRadarrBlock::MovieHistory, &MOVIE_DETAILS_CONTEXT_CLUES)]
+  #[case(2, ActiveRadarrBlock::FileInfo, &MOVIE_DETAILS_CONTEXT_CLUES)]
+  #[case(3, ActiveRadarrBlock::Cast, &MOVIE_DETAILS_CONTEXT_CLUES)]
+  #[case(4, ActiveRadarrBlock::Crew, &MOVIE_DETAILS_CONTEXT_CLUES)]
+  #[case(5, ActiveRadarrBlock::ManualSearch, &MANUAL_MOVIE_SEARCH_CONTEXT_CLUES)]
+  fn test_radarr_context_clue_provider_movie_details_block_context_clues(
+    #[case] index: usize,
+    #[case] active_radarr_block: ActiveRadarrBlock,
+    #[case] expected_context_clues: &[ContextClue],
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.data.radarr_data.movie_info_tabs.set_index(index);
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(expected_context_clues, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_radarr_context_clue_provider_confirmation_prompt_context_clues(
+    #[values(
+      ActiveRadarrBlock::AddMoviePrompt,
+      ActiveRadarrBlock::AddMovieSelectMonitor,
+      ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
+      ActiveRadarrBlock::AddMovieSelectQualityProfile,
+      ActiveRadarrBlock::AddMovieSelectRootFolder,
+      ActiveRadarrBlock::AddMovieTagsInput,
+      ActiveRadarrBlock::SystemTaskStartConfirmPrompt
+    )]
+    active_radarr_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&CONFIRMATION_PROMPT_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_radarr_context_clue_provider_confirmation_prompt_context_clues_edit_collection_blocks(
+    #[values(
+      ActiveRadarrBlock::EditCollectionPrompt,
+      ActiveRadarrBlock::EditCollectionConfirmPrompt,
+      ActiveRadarrBlock::EditCollectionRootFolderPathInput,
+      ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
+      ActiveRadarrBlock::EditCollectionSelectQualityProfile,
+      ActiveRadarrBlock::EditCollectionToggleSearchOnAdd,
+      ActiveRadarrBlock::EditCollectionToggleMonitored
+    )]
+    active_radarr_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&CONFIRMATION_PROMPT_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_radarr_context_clue_provider_confirmation_prompt_context_clues_edit_indexer_blocks(
+    #[values(
+      ActiveRadarrBlock::EditIndexerPrompt,
+      ActiveRadarrBlock::EditIndexerConfirmPrompt,
+      ActiveRadarrBlock::EditIndexerApiKeyInput,
+      ActiveRadarrBlock::EditIndexerNameInput,
+      ActiveRadarrBlock::EditIndexerSeedRatioInput,
+      ActiveRadarrBlock::EditIndexerToggleEnableRss,
+      ActiveRadarrBlock::EditIndexerToggleEnableAutomaticSearch,
+      ActiveRadarrBlock::EditIndexerToggleEnableInteractiveSearch,
+      ActiveRadarrBlock::EditIndexerPriorityInput,
+      ActiveRadarrBlock::EditIndexerUrlInput,
+      ActiveRadarrBlock::EditIndexerTagsInput
+    )]
+    active_radarr_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&CONFIRMATION_PROMPT_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_radarr_context_clue_provider_confirmation_prompt_context_clues_indexer_settings_blocks(
+    #[values(
+      ActiveRadarrBlock::AllIndexerSettingsPrompt,
+      ActiveRadarrBlock::IndexerSettingsAvailabilityDelayInput,
+      ActiveRadarrBlock::IndexerSettingsConfirmPrompt,
+      ActiveRadarrBlock::IndexerSettingsMaximumSizeInput,
+      ActiveRadarrBlock::IndexerSettingsMinimumAgeInput,
+      ActiveRadarrBlock::IndexerSettingsRetentionInput,
+      ActiveRadarrBlock::IndexerSettingsRssSyncIntervalInput,
+      ActiveRadarrBlock::IndexerSettingsToggleAllowHardcodedSubs,
+      ActiveRadarrBlock::IndexerSettingsTogglePreferIndexerFlags,
+      ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput
+    )]
+    active_radarr_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&CONFIRMATION_PROMPT_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_radarr_context_clue_provider_confirmation_prompt_context_clues_edit_movie_blocks(
+    #[values(
+      ActiveRadarrBlock::EditMoviePrompt,
+      ActiveRadarrBlock::EditMovieConfirmPrompt,
+      ActiveRadarrBlock::EditMoviePathInput,
+      ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
+      ActiveRadarrBlock::EditMovieSelectQualityProfile,
+      ActiveRadarrBlock::EditMovieTagsInput,
+      ActiveRadarrBlock::EditMovieToggleMonitored
+    )]
+    active_radarr_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&CONFIRMATION_PROMPT_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_radarr_context_clue_provider_add_movie_search_results_context_clues(
+    #[values(
+      ActiveRadarrBlock::AddMovieSearchResults,
+      ActiveRadarrBlock::AddMovieAlreadyInLibrary
+    )]
+    active_radarr_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(
+      &ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES,
+      context_clues.unwrap()
+    );
+  }
+
+  #[test]
+  fn test_radarr_context_clue_provider_collection_details_context_clues() {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&COLLECTION_DETAILS_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[test]
+  fn test_radarr_context_clue_provider_system_tasks_context_clues() {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+
+    app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(&SYSTEM_TASKS_CONTEXT_CLUES, context_clues.unwrap());
+  }
+
+  #[rstest]
+  #[case(0, ActiveRadarrBlock::Movies, &LIBRARY_CONTEXT_CLUES)]
+  #[case(1, ActiveRadarrBlock::Collections, &COLLECTIONS_CONTEXT_CLUES)]
+  #[case(2, ActiveRadarrBlock::Downloads, &DOWNLOADS_CONTEXT_CLUES)]
+  #[case(3, ActiveRadarrBlock::Blocklist, &BLOCKLIST_CONTEXT_CLUES)]
+  #[case(4, ActiveRadarrBlock::RootFolders, &ROOT_FOLDERS_CONTEXT_CLUES)]
+  #[case(5, ActiveRadarrBlock::Indexers, &INDEXERS_CONTEXT_CLUES)]
+  #[case(6, ActiveRadarrBlock::System, &SYSTEM_CONTEXT_CLUES)]
+  fn test_radarr_context_clue_provider_radarr_blocks_context_clues(
+    #[case] index: usize,
+    #[case] active_radarr_block: ActiveRadarrBlock,
+    #[case] expected_context_clues: &[ContextClue],
+  ) {
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.data.radarr_data.main_tabs.set_index(index);
+    app.push_navigation_stack(active_radarr_block.into());
+
+    let context_clues = RadarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(expected_context_clues, context_clues.unwrap());
+  }
 }
diff --git a/src/app/radarr/radarr_tests.rs b/src/app/radarr/radarr_tests.rs
index c37b819..9218162 100644
--- a/src/app/radarr/radarr_tests.rs
+++ b/src/app/radarr/radarr_tests.rs
@@ -140,7 +140,7 @@ mod tests {
     assert!(app.is_loading);
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert!(!app.data.radarr_data.prompt_confirm);
     assert_eq!(app.tick_count, 0);
@@ -186,7 +186,7 @@ mod tests {
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert!(!app.data.radarr_data.prompt_confirm);
     assert_eq!(app.tick_count, 0);
@@ -591,7 +591,7 @@ mod tests {
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
@@ -625,7 +625,7 @@ mod tests {
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
@@ -650,7 +650,7 @@ mod tests {
 
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert!(!app.data.radarr_data.prompt_confirm);
   }
@@ -675,7 +675,7 @@ mod tests {
 
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert!(app.should_refresh);
     assert!(!app.data.radarr_data.prompt_confirm);
@@ -692,7 +692,7 @@ mod tests {
 
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert!(app.is_loading);
     assert!(app.should_refresh);
@@ -722,7 +722,7 @@ mod tests {
     );
     assert_eq!(
       sync_network_rx.recv().await.unwrap(),
-      RadarrEvent::GetDownloads.into()
+      RadarrEvent::GetDownloads(500).into()
     );
     assert!(app.is_loading);
   }
diff --git a/src/app/sonarr/mod.rs b/src/app/sonarr/mod.rs
index a0fc76a..620784d 100644
--- a/src/app/sonarr/mod.rs
+++ b/src/app/sonarr/mod.rs
@@ -53,7 +53,7 @@ impl App<'_> {
           )
           .await;
         self
-          .dispatch_network_event(SonarrEvent::GetDownloads.into())
+          .dispatch_network_event(SonarrEvent::GetDownloads(500).into())
           .await;
       }
       ActiveSonarrBlock::SeasonHistory => {
@@ -108,7 +108,7 @@ impl App<'_> {
       }
       ActiveSonarrBlock::Downloads => {
         self
-          .dispatch_network_event(SonarrEvent::GetDownloads.into())
+          .dispatch_network_event(SonarrEvent::GetDownloads(500).into())
           .await;
       }
       ActiveSonarrBlock::Blocklist => {
@@ -234,7 +234,7 @@ impl App<'_> {
       .dispatch_network_event(SonarrEvent::GetRootFolders.into())
       .await;
     self
-      .dispatch_network_event(SonarrEvent::GetDownloads.into())
+      .dispatch_network_event(SonarrEvent::GetDownloads(500).into())
       .await;
     self
       .dispatch_network_event(SonarrEvent::GetDiskSpace.into())
diff --git a/src/app/sonarr/sonarr_context_clues.rs b/src/app/sonarr/sonarr_context_clues.rs
index cfb1945..28b642a 100644
--- a/src/app/sonarr/sonarr_context_clues.rs
+++ b/src/app/sonarr/sonarr_context_clues.rs
@@ -1,4 +1,12 @@
-use crate::app::{context_clues::ContextClue, key_binding::DEFAULT_KEYBINDINGS};
+use crate::app::context_clues::{
+  ContextClueProvider, BARE_POPUP_CONTEXT_CLUES, CONFIRMATION_PROMPT_CONTEXT_CLUES,
+};
+use crate::app::{context_clues::ContextClue, key_binding::DEFAULT_KEYBINDINGS, App};
+use crate::models::servarr_data::sonarr::sonarr_data::{
+  ActiveSonarrBlock, ADD_SERIES_BLOCKS, EDIT_INDEXER_BLOCKS, EDIT_SERIES_BLOCKS,
+  EPISODE_DETAILS_BLOCKS, INDEXER_SETTINGS_BLOCKS, SEASON_DETAILS_BLOCKS, SERIES_DETAILS_BLOCKS,
+};
+use crate::models::Route;
 
 #[cfg(test)]
 #[path = "sonarr_context_clues_tests.rs"]
@@ -9,9 +17,13 @@ pub static ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES: [ContextClue; 2] = [
   (DEFAULT_KEYBINDINGS.esc, "edit search"),
 ];
 
-pub static SERIES_CONTEXT_CLUES: [ContextClue; 10] = [
+pub static SERIES_CONTEXT_CLUES: [ContextClue; 11] = [
   (DEFAULT_KEYBINDINGS.add, DEFAULT_KEYBINDINGS.add.desc),
   (DEFAULT_KEYBINDINGS.edit, DEFAULT_KEYBINDINGS.edit.desc),
+  (
+    DEFAULT_KEYBINDINGS.toggle_monitoring,
+    DEFAULT_KEYBINDINGS.toggle_monitoring.desc,
+  ),
   (DEFAULT_KEYBINDINGS.sort, DEFAULT_KEYBINDINGS.sort.desc),
   (DEFAULT_KEYBINDINGS.delete, DEFAULT_KEYBINDINGS.delete.desc),
   (DEFAULT_KEYBINDINGS.search, DEFAULT_KEYBINDINGS.search.desc),
@@ -75,12 +87,7 @@ pub static SERIES_HISTORY_CONTEXT_CLUES: [ContextClue; 9] = [
   (DEFAULT_KEYBINDINGS.esc, "cancel filter/close"),
 ];
 
-pub static SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES: [ContextClue; 2] = [
-  (DEFAULT_KEYBINDINGS.submit, "episode details"),
-  (DEFAULT_KEYBINDINGS.delete, "delete episode"),
-];
-
-pub static SEASON_DETAILS_CONTEXT_CLUES: [ContextClue; 5] = [
+pub static SEASON_DETAILS_CONTEXT_CLUES: [ContextClue; 7] = [
   (
     DEFAULT_KEYBINDINGS.refresh,
     DEFAULT_KEYBINDINGS.refresh.desc,
@@ -95,9 +102,11 @@ pub static SEASON_DETAILS_CONTEXT_CLUES: [ContextClue; 5] = [
     DEFAULT_KEYBINDINGS.auto_search.desc,
   ),
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
+  (DEFAULT_KEYBINDINGS.submit, "episode details"),
+  (DEFAULT_KEYBINDINGS.delete, "delete episode"),
 ];
 
-pub static SEASON_HISTORY_CONTEXT_CLUES: [ContextClue; 6] = [
+pub static SEASON_HISTORY_CONTEXT_CLUES: [ContextClue; 7] = [
   (
     DEFAULT_KEYBINDINGS.refresh,
     DEFAULT_KEYBINDINGS.refresh.desc,
@@ -109,10 +118,11 @@ pub static SEASON_HISTORY_CONTEXT_CLUES: [ContextClue; 6] = [
     DEFAULT_KEYBINDINGS.auto_search,
     DEFAULT_KEYBINDINGS.auto_search.desc,
   ),
+  (DEFAULT_KEYBINDINGS.submit, "details"),
   (DEFAULT_KEYBINDINGS.esc, "cancel filter/close"),
 ];
 
-pub static MANUAL_SEASON_SEARCH_CONTEXT_CLUES: [ContextClue; 4] = [
+pub static MANUAL_SEASON_SEARCH_CONTEXT_CLUES: [ContextClue; 5] = [
   (
     DEFAULT_KEYBINDINGS.refresh,
     DEFAULT_KEYBINDINGS.refresh.desc,
@@ -122,10 +132,11 @@ pub static MANUAL_SEASON_SEARCH_CONTEXT_CLUES: [ContextClue; 4] = [
     DEFAULT_KEYBINDINGS.auto_search.desc,
   ),
   (DEFAULT_KEYBINDINGS.sort, DEFAULT_KEYBINDINGS.sort.desc),
+  (DEFAULT_KEYBINDINGS.submit, "details"),
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
 
-pub static MANUAL_EPISODE_SEARCH_CONTEXT_CLUES: [ContextClue; 4] = [
+pub static MANUAL_EPISODE_SEARCH_CONTEXT_CLUES: [ContextClue; 5] = [
   (
     DEFAULT_KEYBINDINGS.refresh,
     DEFAULT_KEYBINDINGS.refresh.desc,
@@ -135,12 +146,10 @@ pub static MANUAL_EPISODE_SEARCH_CONTEXT_CLUES: [ContextClue; 4] = [
     DEFAULT_KEYBINDINGS.auto_search.desc,
   ),
   (DEFAULT_KEYBINDINGS.sort, DEFAULT_KEYBINDINGS.sort.desc),
+  (DEFAULT_KEYBINDINGS.submit, "details"),
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
 
-pub static DETAILS_CONTEXTUAL_CONTEXT_CLUES: [ContextClue; 1] =
-  [(DEFAULT_KEYBINDINGS.submit, "details")];
-
 pub static EPISODE_DETAILS_CONTEXT_CLUES: [ContextClue; 3] = [
   (
     DEFAULT_KEYBINDINGS.refresh,
@@ -153,7 +162,84 @@ pub static EPISODE_DETAILS_CONTEXT_CLUES: [ContextClue; 3] = [
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
 
+pub static SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES: [ContextClue; 4] = [
+  (
+    DEFAULT_KEYBINDINGS.refresh,
+    DEFAULT_KEYBINDINGS.refresh.desc,
+  ),
+  (
+    DEFAULT_KEYBINDINGS.auto_search,
+    DEFAULT_KEYBINDINGS.auto_search.desc,
+  ),
+  (DEFAULT_KEYBINDINGS.submit, "details"),
+  (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
+];
+
 pub static SYSTEM_TASKS_CONTEXT_CLUES: [ContextClue; 2] = [
   (DEFAULT_KEYBINDINGS.submit, "start task"),
   (DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc),
 ];
+
+pub(in crate::app) struct SonarrContextClueProvider;
+
+impl ContextClueProvider for SonarrContextClueProvider {
+  fn get_context_clues(app: &mut App<'_>) -> Option<&'static [ContextClue]> {
+    let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() else {
+      panic!("SonarrContextClueProvider::get_context_clues called with non-Sonarr route");
+    };
+    match active_sonarr_block {
+      _ if SERIES_DETAILS_BLOCKS.contains(&active_sonarr_block) => app
+        .data
+        .sonarr_data
+        .series_info_tabs
+        .get_active_route_contextual_help(),
+      _ if SEASON_DETAILS_BLOCKS.contains(&active_sonarr_block) => app
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .season_details_tabs
+        .get_active_route_contextual_help(),
+      _ if EPISODE_DETAILS_BLOCKS.contains(&active_sonarr_block) => app
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .episode_details_modal
+        .as_ref()
+        .unwrap()
+        .episode_details_tabs
+        .get_active_route_contextual_help(),
+      ActiveSonarrBlock::TestAllIndexers
+      | ActiveSonarrBlock::AddSeriesSearchInput
+      | ActiveSonarrBlock::AddSeriesEmptySearchResults
+      | ActiveSonarrBlock::SystemLogs
+      | ActiveSonarrBlock::SystemUpdates => Some(&BARE_POPUP_CONTEXT_CLUES),
+      _ if EDIT_INDEXER_BLOCKS.contains(&active_sonarr_block)
+        || INDEXER_SETTINGS_BLOCKS.contains(&active_sonarr_block)
+        || EDIT_SERIES_BLOCKS.contains(&active_sonarr_block) =>
+      {
+        Some(&CONFIRMATION_PROMPT_CONTEXT_CLUES)
+      }
+      ActiveSonarrBlock::AddSeriesPrompt
+      | ActiveSonarrBlock::AddSeriesSelectMonitor
+      | ActiveSonarrBlock::AddSeriesSelectSeriesType
+      | ActiveSonarrBlock::AddSeriesSelectQualityProfile
+      | ActiveSonarrBlock::AddSeriesSelectLanguageProfile
+      | ActiveSonarrBlock::AddSeriesSelectRootFolder
+      | ActiveSonarrBlock::AddSeriesTagsInput
+      | ActiveSonarrBlock::SystemTaskStartConfirmPrompt => Some(&CONFIRMATION_PROMPT_CONTEXT_CLUES),
+      _ if ADD_SERIES_BLOCKS.contains(&active_sonarr_block) => {
+        Some(&ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES)
+      }
+      ActiveSonarrBlock::SystemTasks => Some(&SYSTEM_TASKS_CONTEXT_CLUES),
+      _ => app
+        .data
+        .sonarr_data
+        .main_tabs
+        .get_active_route_contextual_help(),
+    }
+  }
+}
diff --git a/src/app/sonarr/sonarr_context_clues_tests.rs b/src/app/sonarr/sonarr_context_clues_tests.rs
index 46ec883..2560111 100644
--- a/src/app/sonarr/sonarr_context_clues_tests.rs
+++ b/src/app/sonarr/sonarr_context_clues_tests.rs
@@ -1,17 +1,29 @@
 #[cfg(test)]
 mod tests {
-  use pretty_assertions::{assert_eq, assert_str_eq};
-
+  use crate::app::context_clues::{
+    ContextClue, ContextClueProvider, BARE_POPUP_CONTEXT_CLUES, BLOCKLIST_CONTEXT_CLUES,
+    CONFIRMATION_PROMPT_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES,
+    ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+  };
+  use crate::app::sonarr::sonarr_context_clues::{
+    SonarrContextClueProvider, SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES,
+  };
   use crate::app::{
     key_binding::DEFAULT_KEYBINDINGS,
     sonarr::sonarr_context_clues::{
-      ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES, DETAILS_CONTEXTUAL_CONTEXT_CLUES,
-      EPISODE_DETAILS_CONTEXT_CLUES, HISTORY_CONTEXT_CLUES, MANUAL_EPISODE_SEARCH_CONTEXT_CLUES,
-      MANUAL_SEASON_SEARCH_CONTEXT_CLUES, SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES,
-      SEASON_DETAILS_CONTEXT_CLUES, SEASON_HISTORY_CONTEXT_CLUES, SERIES_CONTEXT_CLUES,
-      SERIES_DETAILS_CONTEXT_CLUES, SERIES_HISTORY_CONTEXT_CLUES, SYSTEM_TASKS_CONTEXT_CLUES,
+      ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES, EPISODE_DETAILS_CONTEXT_CLUES,
+      HISTORY_CONTEXT_CLUES, MANUAL_EPISODE_SEARCH_CONTEXT_CLUES,
+      MANUAL_SEASON_SEARCH_CONTEXT_CLUES, SEASON_DETAILS_CONTEXT_CLUES,
+      SEASON_HISTORY_CONTEXT_CLUES, SERIES_CONTEXT_CLUES, SERIES_DETAILS_CONTEXT_CLUES,
+      SERIES_HISTORY_CONTEXT_CLUES, SYSTEM_TASKS_CONTEXT_CLUES,
     },
+    App,
   };
+  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+  use crate::models::servarr_data::sonarr::modals::{EpisodeDetailsModal, SeasonDetailsModal};
+  use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SonarrData};
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
 
   #[test]
   fn test_add_series_search_results_context_clues() {
@@ -46,6 +58,11 @@ mod tests {
 
     let (key_binding, description) = series_context_clues_iter.next().unwrap();
 
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.toggle_monitoring);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.toggle_monitoring.desc);
+
+    let (key_binding, description) = series_context_clues_iter.next().unwrap();
+
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.sort);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.sort.desc);
 
@@ -247,23 +264,18 @@ mod tests {
 
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
-    assert_eq!(season_details_context_clues_iter.next(), None);
-  }
 
-  #[test]
-  fn test_season_details_contextual_context_clues() {
-    let mut season_details_contextual_context_clues_iter =
-      SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES.iter();
-    let (key_binding, description) = season_details_contextual_context_clues_iter.next().unwrap();
+    let (key_binding, description) = season_details_context_clues_iter.next().unwrap();
 
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
     assert_str_eq!(*description, "episode details");
 
-    let (key_binding, description) = season_details_contextual_context_clues_iter.next().unwrap();
+    let (key_binding, description) = season_details_context_clues_iter.next().unwrap();
 
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.delete);
     assert_str_eq!(*description, "delete episode");
-    assert_eq!(season_details_contextual_context_clues_iter.next(), None);
+
+    assert_eq!(season_details_context_clues_iter.next(), None);
   }
 
   #[test]
@@ -296,6 +308,11 @@ mod tests {
 
     let (key_binding, description) = season_history_context_clues_iter.next().unwrap();
 
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
+    assert_str_eq!(*description, "details");
+
+    let (key_binding, description) = season_history_context_clues_iter.next().unwrap();
+
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
     assert_str_eq!(*description, "cancel filter/close");
     assert_eq!(season_history_context_clues_iter.next(), None);
@@ -322,6 +339,11 @@ mod tests {
 
     let (key_binding, description) = manual_season_search_context_clues_iter.next().unwrap();
 
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
+    assert_str_eq!(*description, "details");
+
+    let (key_binding, description) = manual_season_search_context_clues_iter.next().unwrap();
+
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
     assert_eq!(manual_season_search_context_clues_iter.next(), None);
@@ -348,21 +370,16 @@ mod tests {
 
     let (key_binding, description) = manual_episode_search_context_clues_iter.next().unwrap();
 
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
+    assert_str_eq!(*description, "details");
+
+    let (key_binding, description) = manual_episode_search_context_clues_iter.next().unwrap();
+
     assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
     assert_eq!(manual_episode_search_context_clues_iter.next(), None);
   }
 
-  #[test]
-  fn details_contextual_context_clues() {
-    let mut manual_search_contextual_context_clues_iter = DETAILS_CONTEXTUAL_CONTEXT_CLUES.iter();
-    let (key_binding, description) = manual_search_contextual_context_clues_iter.next().unwrap();
-
-    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
-    assert_str_eq!(*description, "details");
-    assert_eq!(manual_search_contextual_context_clues_iter.next(), None);
-  }
-
   #[test]
   fn test_episode_details_context_clues() {
     let mut episode_details_context_clues_iter = EPISODE_DETAILS_CONTEXT_CLUES.iter();
@@ -384,6 +401,32 @@ mod tests {
     assert_eq!(episode_details_context_clues_iter.next(), None);
   }
 
+  #[test]
+  fn test_selectable_episode_details_context_clues() {
+    let mut episode_details_context_clues_iter = SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES.iter();
+
+    let (key_binding, description) = episode_details_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.refresh);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.refresh.desc);
+
+    let (key_binding, description) = episode_details_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.auto_search);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.auto_search.desc);
+
+    let (key_binding, description) = episode_details_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.submit);
+    assert_str_eq!(*description, "details");
+
+    let (key_binding, description) = episode_details_context_clues_iter.next().unwrap();
+
+    assert_eq!(*key_binding, DEFAULT_KEYBINDINGS.esc);
+    assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
+    assert_eq!(episode_details_context_clues_iter.next(), None);
+  }
+
   #[test]
   fn test_system_tasks_context_clues() {
     let mut system_tasks_context_clues_iter = SYSTEM_TASKS_CONTEXT_CLUES.iter();
@@ -399,4 +442,258 @@ mod tests {
     assert_str_eq!(*description, DEFAULT_KEYBINDINGS.esc.desc);
     assert_eq!(system_tasks_context_clues_iter.next(), None);
   }
+
+  #[test]
+  #[should_panic(
+    expected = "SonarrContextClueProvider::get_context_clues called with non-Sonarr route"
+  )]
+  fn test_sonarr_context_clue_provider_get_context_clues_non_sonarr_route() {
+    let mut app = App::test_default();
+    app.push_navigation_stack(ActiveRadarrBlock::default().into());
+
+    // This should panic because the route is not a Sonarr route
+    SonarrContextClueProvider::get_context_clues(&mut app);
+  }
+
+  #[rstest]
+  #[case(0, ActiveSonarrBlock::SeriesDetails, &SERIES_DETAILS_CONTEXT_CLUES)]
+  #[case(1, ActiveSonarrBlock::SeriesHistory, &SERIES_HISTORY_CONTEXT_CLUES)]
+  fn test_sonarr_context_clue_provider_series_info_tabs(
+    #[case] index: usize,
+    #[case] active_sonarr_block: ActiveSonarrBlock,
+    #[case] expected_context_clues: &[ContextClue],
+  ) {
+    let mut app = App::test_default();
+    app.data.sonarr_data = SonarrData::default();
+    app.data.sonarr_data.series_info_tabs.set_index(index);
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(expected_context_clues, context_clues.unwrap());
+  }
+
+  #[rstest]
+  #[case(0, ActiveSonarrBlock::SeasonDetails, &SEASON_DETAILS_CONTEXT_CLUES)]
+  #[case(1, ActiveSonarrBlock::SeasonHistory, &SEASON_HISTORY_CONTEXT_CLUES)]
+  #[case(2, ActiveSonarrBlock::ManualSeasonSearch, &MANUAL_SEASON_SEARCH_CONTEXT_CLUES)]
+  fn test_sonarr_context_clue_provider_season_details_tabs(
+    #[case] index: usize,
+    #[case] active_sonarr_block: ActiveSonarrBlock,
+    #[case] expected_context_clues: &[ContextClue],
+  ) {
+    let mut app = App::test_default();
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.season_details_tabs.set_index(index);
+    let sonarr_data = SonarrData {
+      season_details_modal: Some(season_details_modal),
+      ..SonarrData::default()
+    };
+    app.data.sonarr_data = sonarr_data;
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(expected_context_clues, context_clues.unwrap());
+  }
+
+  #[rstest]
+  #[case(0, ActiveSonarrBlock::EpisodeDetails, &EPISODE_DETAILS_CONTEXT_CLUES)]
+  #[case(1, ActiveSonarrBlock::EpisodeHistory, &SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES)]
+  #[case(2, ActiveSonarrBlock::EpisodeFile, &EPISODE_DETAILS_CONTEXT_CLUES)]
+  #[case(3, ActiveSonarrBlock::ManualEpisodeSearch, &MANUAL_EPISODE_SEARCH_CONTEXT_CLUES)]
+  fn test_sonarr_context_clue_provider_episode_details_tabs(
+    #[case] index: usize,
+    #[case] active_sonarr_block: ActiveSonarrBlock,
+    #[case] expected_context_clues: &[ContextClue],
+  ) {
+    let mut app = App::test_default();
+    let mut episode_details_modal = EpisodeDetailsModal::default();
+    episode_details_modal.episode_details_tabs.set_index(index);
+    let sonarr_data = SonarrData {
+      season_details_modal: Some(SeasonDetailsModal {
+        episode_details_modal: Some(episode_details_modal),
+        ..SeasonDetailsModal::default()
+      }),
+      ..SonarrData::default()
+    };
+    app.data.sonarr_data = sonarr_data;
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(expected_context_clues, context_clues.unwrap());
+  }
+
+  #[rstest]
+  fn test_sonarr_context_clue_provider_bare_popup_context_clues(
+    #[values(
+      ActiveSonarrBlock::TestAllIndexers,
+      ActiveSonarrBlock::AddSeriesSearchInput,
+      ActiveSonarrBlock::AddSeriesEmptySearchResults,
+      ActiveSonarrBlock::SystemLogs,
+      ActiveSonarrBlock::SystemUpdates
+    )]
+    active_sonarr_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(context_clues.unwrap(), &BARE_POPUP_CONTEXT_CLUES);
+  }
+
+  #[rstest]
+  fn test_sonarr_context_clue_provider_confirmation_prompt_context_clues(
+    #[values(
+      ActiveSonarrBlock::AddSeriesPrompt,
+      ActiveSonarrBlock::AddSeriesSelectMonitor,
+      ActiveSonarrBlock::AddSeriesSelectSeriesType,
+      ActiveSonarrBlock::AddSeriesSelectQualityProfile,
+      ActiveSonarrBlock::AddSeriesSelectLanguageProfile,
+      ActiveSonarrBlock::AddSeriesSelectRootFolder,
+      ActiveSonarrBlock::AddSeriesTagsInput,
+      ActiveSonarrBlock::SystemTaskStartConfirmPrompt
+    )]
+    active_sonarr_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(context_clues.unwrap(), &CONFIRMATION_PROMPT_CONTEXT_CLUES);
+  }
+
+  #[rstest]
+  fn test_sonarr_context_clue_provider_confirmation_prompt_popup_clues_edit_indexer_blocks(
+    #[values(
+      ActiveSonarrBlock::EditIndexerPrompt,
+      ActiveSonarrBlock::EditIndexerConfirmPrompt,
+      ActiveSonarrBlock::EditIndexerApiKeyInput,
+      ActiveSonarrBlock::EditIndexerNameInput,
+      ActiveSonarrBlock::EditIndexerSeedRatioInput,
+      ActiveSonarrBlock::EditIndexerToggleEnableRss,
+      ActiveSonarrBlock::EditIndexerToggleEnableAutomaticSearch,
+      ActiveSonarrBlock::EditIndexerToggleEnableInteractiveSearch,
+      ActiveSonarrBlock::EditIndexerPriorityInput,
+      ActiveSonarrBlock::EditIndexerUrlInput,
+      ActiveSonarrBlock::EditIndexerTagsInput
+    )]
+    active_sonarr_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(context_clues.unwrap(), &CONFIRMATION_PROMPT_CONTEXT_CLUES);
+  }
+
+  #[rstest]
+  fn test_sonarr_context_clue_provider_confirmation_prompt_popup_clues_indexer_settings_blocks(
+    #[values(
+      ActiveSonarrBlock::AllIndexerSettingsPrompt,
+      ActiveSonarrBlock::IndexerSettingsConfirmPrompt,
+      ActiveSonarrBlock::IndexerSettingsMaximumSizeInput,
+      ActiveSonarrBlock::IndexerSettingsMinimumAgeInput,
+      ActiveSonarrBlock::IndexerSettingsRetentionInput,
+      ActiveSonarrBlock::IndexerSettingsRssSyncIntervalInput
+    )]
+    active_sonarr_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(context_clues.unwrap(), &CONFIRMATION_PROMPT_CONTEXT_CLUES);
+  }
+
+  #[rstest]
+  fn test_sonarr_context_clue_provider_confirmation_prompt_popup_clues_edit_series_blocks(
+    #[values(
+      ActiveSonarrBlock::EditSeriesPrompt,
+      ActiveSonarrBlock::EditSeriesConfirmPrompt,
+      ActiveSonarrBlock::EditSeriesPathInput,
+      ActiveSonarrBlock::EditSeriesSelectSeriesType,
+      ActiveSonarrBlock::EditSeriesSelectQualityProfile,
+      ActiveSonarrBlock::EditSeriesSelectLanguageProfile,
+      ActiveSonarrBlock::EditSeriesTagsInput,
+      ActiveSonarrBlock::EditSeriesToggleMonitored,
+      ActiveSonarrBlock::EditSeriesToggleSeasonFolder
+    )]
+    active_sonarr_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(context_clues.unwrap(), &CONFIRMATION_PROMPT_CONTEXT_CLUES);
+  }
+
+  #[rstest]
+  fn test_sonarr_context_clue_provider_add_series_search_results_clues(
+    #[values(
+      ActiveSonarrBlock::AddSeriesAlreadyInLibrary,
+      ActiveSonarrBlock::AddSeriesSearchResults
+    )]
+    active_sonarr_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(
+      context_clues.unwrap(),
+      &ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES
+    );
+  }
+
+  #[test]
+  fn test_sonarr_context_clue_provider_system_tasks_clues() {
+    let mut app = App::test_default();
+
+    app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(context_clues.unwrap(), &SYSTEM_TASKS_CONTEXT_CLUES);
+  }
+
+  #[rstest]
+  #[case(0, ActiveSonarrBlock::Series, &SERIES_CONTEXT_CLUES)]
+  #[case(1, ActiveSonarrBlock::Downloads, &DOWNLOADS_CONTEXT_CLUES)]
+  #[case(2, ActiveSonarrBlock::Blocklist, &BLOCKLIST_CONTEXT_CLUES)]
+  #[case(3, ActiveSonarrBlock::History, &HISTORY_CONTEXT_CLUES)]
+  #[case(4, ActiveSonarrBlock::RootFolders, &ROOT_FOLDERS_CONTEXT_CLUES)]
+  #[case(5, ActiveSonarrBlock::Indexers, &INDEXERS_CONTEXT_CLUES)]
+  #[case(6, ActiveSonarrBlock::System, &SYSTEM_CONTEXT_CLUES)]
+  fn test_sonarr_context_clue_provider_sonarr_tabs(
+    #[case] index: usize,
+    #[case] active_sonarr_block: ActiveSonarrBlock,
+    #[case] expected_context_clues: &[ContextClue],
+  ) {
+    let mut app = App::test_default();
+    app.data.sonarr_data = SonarrData::default();
+    app.data.sonarr_data.main_tabs.set_index(index);
+    app.push_navigation_stack(active_sonarr_block.into());
+
+    let context_clues = SonarrContextClueProvider::get_context_clues(&mut app);
+
+    assert!(context_clues.is_some());
+    assert_eq!(expected_context_clues, context_clues.unwrap());
+  }
 }
diff --git a/src/app/sonarr/sonarr_tests.rs b/src/app/sonarr/sonarr_tests.rs
index 46c1382..904379f 100644
--- a/src/app/sonarr/sonarr_tests.rs
+++ b/src/app/sonarr/sonarr_tests.rs
@@ -107,7 +107,7 @@ mod tests {
       );
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert!(!app.data.sonarr_data.prompt_confirm);
       assert_eq!(app.tick_count, 0);
@@ -366,7 +366,7 @@ mod tests {
       assert!(app.is_loading);
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert!(!app.data.sonarr_data.prompt_confirm);
       assert_eq!(app.tick_count, 0);
@@ -604,7 +604,7 @@ mod tests {
       );
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
@@ -642,7 +642,7 @@ mod tests {
       );
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
@@ -667,7 +667,7 @@ mod tests {
 
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert!(!app.data.sonarr_data.prompt_confirm);
     }
@@ -692,7 +692,7 @@ mod tests {
 
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert!(app.should_refresh);
       assert!(!app.data.sonarr_data.prompt_confirm);
@@ -709,7 +709,7 @@ mod tests {
 
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert!(app.is_loading);
       assert!(app.should_refresh);
@@ -743,7 +743,7 @@ mod tests {
       );
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetDownloads.into()
+        SonarrEvent::GetDownloads(500).into()
       );
       assert!(app.is_loading);
     }
diff --git a/src/cli/radarr/list_command_handler.rs b/src/cli/radarr/list_command_handler.rs
index 57ae9f5..3fd1575 100644
--- a/src/cli/radarr/list_command_handler.rs
+++ b/src/cli/radarr/list_command_handler.rs
@@ -23,7 +23,10 @@ pub enum RadarrListCommand {
   #[command(about = "List all Radarr collections")]
   Collections,
   #[command(about = "List all active downloads in Radarr")]
-  Downloads,
+  Downloads {
+    #[arg(long, help = "How many downloads to fetch", default_value_t = 500)]
+    count: u64,
+  },
   #[command(about = "List disk space details for all provisioned root folders in Radarr")]
   DiskSpace,
   #[command(about = "List all Radarr indexers")]
@@ -104,10 +107,10 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrListCommand> for RadarrListCommandH
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
-      RadarrListCommand::Downloads => {
+      RadarrListCommand::Downloads { count } => {
         let resp = self
           .network
-          .handle_network_event(RadarrEvent::GetDownloads.into())
+          .handle_network_event(RadarrEvent::GetDownloads(count).into())
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
diff --git a/src/cli/radarr/list_command_handler_tests.rs b/src/cli/radarr/list_command_handler_tests.rs
index 781ccf4..fb7e2d6 100644
--- a/src/cli/radarr/list_command_handler_tests.rs
+++ b/src/cli/radarr/list_command_handler_tests.rs
@@ -29,7 +29,6 @@ mod tests {
       #[values(
         "blocklist",
         "collections",
-        "downloads",
         "disk-space",
         "indexers",
         "movies",
@@ -59,6 +58,15 @@ mod tests {
       );
     }
 
+    #[test]
+    fn test_list_downloads_count_flag_requires_arguments() {
+      let result =
+        Cli::command().try_get_matches_from(["managarr", "radarr", "list", "downloads", "--count"]);
+
+      assert!(result.is_err());
+      assert_eq!(result.unwrap_err().kind(), ErrorKind::InvalidValue);
+    }
+
     #[test]
     fn test_list_logs_events_flag_requires_arguments() {
       let result =
@@ -87,6 +95,18 @@ mod tests {
       }
     }
 
+    #[test]
+    fn test_list_downloads_default_values() {
+      let expected_args = RadarrListCommand::Downloads { count: 500 };
+      let result = Cli::try_parse_from(["managarr", "radarr", "list", "downloads"]);
+
+      assert!(result.is_ok());
+
+      if let Some(Command::Radarr(RadarrCommand::List(refresh_command))) = result.unwrap().command {
+        assert_eq!(refresh_command, expected_args);
+      }
+    }
+
     #[test]
     fn test_list_logs_default_values() {
       let expected_args = RadarrListCommand::Logs {
@@ -122,7 +142,6 @@ mod tests {
     #[rstest]
     #[case(RadarrListCommand::Blocklist, RadarrEvent::GetBlocklist)]
     #[case(RadarrListCommand::Collections, RadarrEvent::GetCollections)]
-    #[case(RadarrListCommand::Downloads, RadarrEvent::GetDownloads)]
     #[case(RadarrListCommand::DiskSpace, RadarrEvent::GetDiskSpace)]
     #[case(RadarrListCommand::Indexers, RadarrEvent::GetIndexers)]
     #[case(RadarrListCommand::Movies, RadarrEvent::GetMovies)]
@@ -182,6 +201,32 @@ mod tests {
       assert!(result.is_ok());
     }
 
+    #[tokio::test]
+    async fn test_handle_list_downloads_command() {
+      let expected_count = 1000;
+      let mut mock_network = MockNetworkTrait::new();
+      mock_network
+        .expect_handle_network_event()
+        .with(eq::<NetworkEvent>(
+          RadarrEvent::GetDownloads(expected_count).into(),
+        ))
+        .times(1)
+        .returning(|_| {
+          Ok(Serdeable::Radarr(RadarrSerdeable::Value(
+            json!({"testResponse": "response"}),
+          )))
+        });
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
+      let list_downloads_command = RadarrListCommand::Downloads { count: 1000 };
+
+      let result =
+        RadarrListCommandHandler::with(&app_arc, list_downloads_command, &mut mock_network)
+          .handle()
+          .await;
+
+      assert!(result.is_ok());
+    }
+
     #[tokio::test]
     async fn test_handle_list_logs_command() {
       let expected_events = 1000;
diff --git a/src/cli/radarr/mod.rs b/src/cli/radarr/mod.rs
index 2641691..11b4d9e 100644
--- a/src/cli/radarr/mod.rs
+++ b/src/cli/radarr/mod.rs
@@ -118,6 +118,17 @@ pub enum RadarrCommand {
   },
   #[command(about = "Test all Radarr indexers")]
   TestAllIndexers,
+  #[command(
+    about = "Toggle monitoring for the specified movie corresponding to the given movie ID"
+  )]
+  ToggleMovieMonitoring {
+    #[arg(
+      long,
+      help = "The Radarr ID of the movie to toggle monitoring on",
+      required = true
+    )]
+    movie_id: i64,
+  },
   #[command(about = "Trigger an automatic search for the movie with the specified ID")]
   TriggerAutomaticSearch {
     #[arg(
@@ -250,6 +261,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrCommand> for RadarrCliHandler<'a, '
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
+      RadarrCommand::ToggleMovieMonitoring { movie_id } => {
+        let resp = self
+          .network
+          .handle_network_event(RadarrEvent::ToggleMovieMonitoring(movie_id).into())
+          .await?;
+        serde_json::to_string_pretty(&resp)?
+      }
       RadarrCommand::TriggerAutomaticSearch { movie_id } => {
         let resp = self
           .network
diff --git a/src/cli/radarr/radarr_command_tests.rs b/src/cli/radarr/radarr_command_tests.rs
index ace8826..90a7efe 100644
--- a/src/cli/radarr/radarr_command_tests.rs
+++ b/src/cli/radarr/radarr_command_tests.rs
@@ -215,6 +215,31 @@ mod tests {
       assert!(result.is_ok());
     }
 
+    #[test]
+    fn test_toggle_movie_monitoring_requires_movie_id() {
+      let result =
+        Cli::command().try_get_matches_from(["managarr", "radarr", "toggle-movie-monitoring"]);
+
+      assert!(result.is_err());
+      assert_eq!(
+        result.unwrap_err().kind(),
+        ErrorKind::MissingRequiredArgument
+      );
+    }
+
+    #[test]
+    fn test_toggle_movie_monitoring_requirements_satisfied() {
+      let result = Cli::command().try_get_matches_from([
+        "managarr",
+        "radarr",
+        "toggle-movie-monitoring",
+        "--movie-id",
+        "1",
+      ]);
+
+      assert!(result.is_ok());
+    }
+
     #[test]
     fn test_trigger_automatic_search_requires_movie_id() {
       let result =
@@ -461,6 +486,32 @@ mod tests {
       assert!(result.is_ok());
     }
 
+    #[tokio::test]
+    async fn test_toggle_movie_monitoring_command() {
+      let expected_movie_id = 1;
+      let mut mock_network = MockNetworkTrait::new();
+      mock_network
+        .expect_handle_network_event()
+        .with(eq::<NetworkEvent>(
+          RadarrEvent::ToggleMovieMonitoring(expected_movie_id).into(),
+        ))
+        .times(1)
+        .returning(|_| {
+          Ok(Serdeable::Radarr(RadarrSerdeable::Value(
+            json!({"testResponse": "response"}),
+          )))
+        });
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
+      let toggle_movie_monitoring_command = RadarrCommand::ToggleMovieMonitoring { movie_id: 1 };
+
+      let result =
+        RadarrCliHandler::with(&app_arc, toggle_movie_monitoring_command, &mut mock_network)
+          .handle()
+          .await;
+
+      assert!(result.is_ok());
+    }
+
     #[tokio::test]
     async fn test_trigger_automatic_search_command() {
       let expected_movie_id = 1;
diff --git a/src/cli/sonarr/list_command_handler.rs b/src/cli/sonarr/list_command_handler.rs
index ca839fd..5a9ecda 100644
--- a/src/cli/sonarr/list_command_handler.rs
+++ b/src/cli/sonarr/list_command_handler.rs
@@ -21,7 +21,10 @@ pub enum SonarrListCommand {
   #[command(about = "List all items in the Sonarr blocklist")]
   Blocklist,
   #[command(about = "List all active downloads in Sonarr")]
-  Downloads,
+  Downloads {
+    #[arg(long, help = "How many downloads to fetch", default_value_t = 500)]
+    count: u64,
+  },
   #[command(about = "List disk space details for all provisioned root folders in Sonarr")]
   DiskSpace,
   #[command(about = "List the episodes for the series with the given ID")]
@@ -146,10 +149,10 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, SonarrListCommand> for SonarrListCommandH
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
-      SonarrListCommand::Downloads => {
+      SonarrListCommand::Downloads { count } => {
         let resp = self
           .network
-          .handle_network_event(SonarrEvent::GetDownloads.into())
+          .handle_network_event(SonarrEvent::GetDownloads(count).into())
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
diff --git a/src/cli/sonarr/list_command_handler_tests.rs b/src/cli/sonarr/list_command_handler_tests.rs
index 4c10a77..94c755c 100644
--- a/src/cli/sonarr/list_command_handler_tests.rs
+++ b/src/cli/sonarr/list_command_handler_tests.rs
@@ -28,7 +28,6 @@ mod tests {
       #[values(
         "blocklist",
         "series",
-        "downloads",
         "disk-space",
         "quality-profiles",
         "indexers",
@@ -102,6 +101,28 @@ mod tests {
       }
     }
 
+    #[test]
+    fn test_list_downloads_count_flag_requires_arguments() {
+      let result =
+        Cli::command().try_get_matches_from(["managarr", "sonarr", "list", "downloads", "--count"]);
+
+      assert!(result.is_err());
+      assert_eq!(result.unwrap_err().kind(), ErrorKind::InvalidValue);
+    }
+
+    #[test]
+    fn test_list_downloads_default_values() {
+      let expected_args = SonarrListCommand::Downloads { count: 500 };
+      let result = Cli::try_parse_from(["managarr", "sonarr", "list", "downloads"]);
+
+      assert!(result.is_ok());
+
+      if let Some(Command::Sonarr(SonarrCommand::List(downloads_command))) = result.unwrap().command
+      {
+        assert_eq!(downloads_command, expected_args);
+      }
+    }
+
     #[test]
     fn test_list_history_events_flag_requires_arguments() {
       let result =
@@ -287,7 +308,6 @@ mod tests {
 
     #[rstest]
     #[case(SonarrListCommand::Blocklist, SonarrEvent::GetBlocklist)]
-    #[case(SonarrListCommand::Downloads, SonarrEvent::GetDownloads)]
     #[case(SonarrListCommand::DiskSpace, SonarrEvent::GetDiskSpace)]
     #[case(SonarrListCommand::Indexers, SonarrEvent::GetIndexers)]
     #[case(SonarrListCommand::QualityProfiles, SonarrEvent::GetQualityProfiles)]
@@ -374,6 +394,32 @@ mod tests {
       assert!(result.is_ok());
     }
 
+    #[tokio::test]
+    async fn test_handle_list_downloads_command() {
+      let expected_count = 1000;
+      let mut mock_network = MockNetworkTrait::new();
+      mock_network
+        .expect_handle_network_event()
+        .with(eq::<NetworkEvent>(
+          SonarrEvent::GetDownloads(expected_count).into(),
+        ))
+        .times(1)
+        .returning(|_| {
+          Ok(Serdeable::Sonarr(SonarrSerdeable::Value(
+            json!({"testResponse": "response"}),
+          )))
+        });
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
+      let list_downloads_command = SonarrListCommand::Downloads { count: 1000 };
+
+      let result =
+        SonarrListCommandHandler::with(&app_arc, list_downloads_command, &mut mock_network)
+          .handle()
+          .await;
+
+      assert!(result.is_ok());
+    }
+
     #[tokio::test]
     async fn test_handle_list_history_command() {
       let expected_events = 1000;
diff --git a/src/cli/sonarr/mod.rs b/src/cli/sonarr/mod.rs
index b19e837..ddc9f43 100644
--- a/src/cli/sonarr/mod.rs
+++ b/src/cli/sonarr/mod.rs
@@ -146,6 +146,17 @@ pub enum SonarrCommand {
     )]
     season_number: i64,
   },
+  #[command(
+    about = "Toggle monitoring for the specified series corresponding to the given series ID"
+  )]
+  ToggleSeriesMonitoring {
+    #[arg(
+      long,
+      help = "The Sonarr ID of the series to toggle monitoring on",
+      required = true
+    )]
+    series_id: i64,
+  },
 }
 
 impl From<SonarrCommand> for Command {
@@ -290,6 +301,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, SonarrCommand> for SonarrCliHandler<'a, '
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
+      SonarrCommand::ToggleSeriesMonitoring { series_id } => {
+        let resp = self
+          .network
+          .handle_network_event(SonarrEvent::ToggleSeriesMonitoring(series_id).into())
+          .await?;
+        serde_json::to_string_pretty(&resp)?
+      }
     };
 
     Ok(result)
diff --git a/src/cli/sonarr/sonarr_command_tests.rs b/src/cli/sonarr/sonarr_command_tests.rs
index dd92be7..838ef30 100644
--- a/src/cli/sonarr/sonarr_command_tests.rs
+++ b/src/cli/sonarr/sonarr_command_tests.rs
@@ -216,6 +216,31 @@ mod tests {
 
       assert!(result.is_ok());
     }
+
+    #[test]
+    fn test_toggle_series_monitoring_requires_series_id() {
+      let result =
+        Cli::command().try_get_matches_from(["managarr", "sonarr", "toggle-series-monitoring"]);
+
+      assert!(result.is_err());
+      assert_eq!(
+        result.unwrap_err().kind(),
+        ErrorKind::MissingRequiredArgument
+      );
+    }
+
+    #[test]
+    fn test_toggle_series_monitoring_requirements_satisfied() {
+      let result = Cli::command().try_get_matches_from([
+        "managarr",
+        "sonarr",
+        "toggle-series-monitoring",
+        "--series-id",
+        "1",
+      ]);
+
+      assert!(result.is_ok());
+    }
   }
 
   mod handler {
@@ -692,7 +717,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_list_toggle_episode_monitoring_command() {
+    async fn test_toggle_episode_monitoring_command() {
       let expected_episode_id = 1;
       let mut mock_network = MockNetworkTrait::new();
       mock_network
@@ -722,7 +747,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_list_toggle_season_monitoring_command() {
+    async fn test_toggle_season_monitoring_command() {
       let expected_series_id = 1;
       let expected_season_number = 1;
       let mut mock_network = MockNetworkTrait::new();
@@ -753,5 +778,34 @@ mod tests {
 
       assert!(result.is_ok());
     }
+
+    #[tokio::test]
+    async fn test_toggle_series_monitoring_command() {
+      let expected_series_id = 1;
+      let mut mock_network = MockNetworkTrait::new();
+      mock_network
+        .expect_handle_network_event()
+        .with(eq::<NetworkEvent>(
+          SonarrEvent::ToggleSeriesMonitoring(expected_series_id).into(),
+        ))
+        .times(1)
+        .returning(|_| {
+          Ok(Serdeable::Sonarr(SonarrSerdeable::Value(
+            json!({"testResponse": "response"}),
+          )))
+        });
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
+      let toggle_series_monitoring_command = SonarrCommand::ToggleSeriesMonitoring { series_id: 1 };
+
+      let result = SonarrCliHandler::with(
+        &app_arc,
+        toggle_series_monitoring_command,
+        &mut mock_network,
+      )
+      .handle()
+      .await;
+
+      assert!(result.is_ok());
+    }
   }
 }
diff --git a/src/event/input_event.rs b/src/event/input_event.rs
index da6b7e4..9626979 100644
--- a/src/event/input_event.rs
+++ b/src/event/input_event.rs
@@ -4,7 +4,7 @@ use std::thread;
 use std::time::{Duration, Instant};
 
 use crossterm::event;
-use crossterm::event::Event as CrosstermEvent;
+use crossterm::event::{Event as CrosstermEvent, KeyEventKind};
 
 use crate::event::Key;
 
@@ -30,8 +30,12 @@ impl Events {
           .unwrap_or_else(|| Duration::from_secs(0));
         if event::poll(timeout).unwrap() {
           if let CrosstermEvent::Key(key_event) = event::read().unwrap() {
-            let key = Key::from(key_event);
-            tx.send(InputEvent::KeyEvent(key)).unwrap();
+            // Only process the key event if it's a press event
+            // Source: https://ratatui.rs/faq/ Why am I getting duplicate key events on Windows?
+            if key_event.kind == KeyEventKind::Press {
+              let key = Key::from(key_event);
+              tx.send(InputEvent::KeyEvent(key)).unwrap();
+            }
           }
         }
 
diff --git a/src/event/key.rs b/src/event/key.rs
index 51e10fe..f0146f7 100644
--- a/src/event/key.rs
+++ b/src/event/key.rs
@@ -13,6 +13,8 @@ pub enum Key {
   Down,
   Left,
   Right,
+  PgDown,
+  PgUp,
   Enter,
   Esc,
   Backspace,
@@ -29,21 +31,23 @@ pub enum Key {
 impl Display for Key {
   fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
     match *self {
-      Key::Char(c) => write!(f, "<{c}>"),
-      Key::Ctrl(c) => write!(f, "<ctrl-{c}>"),
-      Key::Up => write!(f, "<↑>"),
-      Key::Down => write!(f, "<↓>"),
-      Key::Left => write!(f, "<←>"),
-      Key::Right => write!(f, "<→>"),
-      Key::Enter => write!(f, "<enter>"),
-      Key::Esc => write!(f, "<esc>"),
-      Key::Backspace => write!(f, "<backspace>"),
-      Key::Home => write!(f, "<home>"),
-      Key::End => write!(f, "<end>"),
-      Key::Tab => write!(f, "<tab>"),
-      Key::BackTab => write!(f, "<shift-tab>"),
-      Key::Delete => write!(f, "<del>"),
-      _ => write!(f, "<{self:?}>"),
+      Key::Char(c) => write!(f, "{c}"),
+      Key::Ctrl(c) => write!(f, "ctrl-{c}"),
+      Key::Up => write!(f, "↑"),
+      Key::Down => write!(f, "↓"),
+      Key::Left => write!(f, "←"),
+      Key::Right => write!(f, "→"),
+      Key::PgDown => write!(f, "pgDown"),
+      Key::PgUp => write!(f, "pgUp"),
+      Key::Enter => write!(f, "enter"),
+      Key::Esc => write!(f, "esc"),
+      Key::Backspace => write!(f, "backspace"),
+      Key::Home => write!(f, "home"),
+      Key::End => write!(f, "end"),
+      Key::Tab => write!(f, "tab"),
+      Key::BackTab => write!(f, "shift-tab"),
+      Key::Delete => write!(f, "del"),
+      _ => write!(f, "{self:?}"),
     }
   }
 }
@@ -66,6 +70,14 @@ impl From<KeyEvent> for Key {
         code: KeyCode::Right,
         ..
       } => Key::Right,
+      KeyEvent {
+        code: KeyCode::PageDown,
+        ..
+      } => Key::PgDown,
+      KeyEvent {
+        code: KeyCode::PageUp,
+        ..
+      } => Key::PgUp,
       KeyEvent {
         code: KeyCode::Backspace,
         ..
diff --git a/src/event/key_tests.rs b/src/event/key_tests.rs
index a06269c..8ef6d4c 100644
--- a/src/event/key_tests.rs
+++ b/src/event/key_tests.rs
@@ -11,6 +11,8 @@ mod tests {
   #[case(Key::Down, "↓")]
   #[case(Key::Left, "←")]
   #[case(Key::Right, "→")]
+  #[case(Key::PgDown, "pgDown")]
+  #[case(Key::PgUp, "pgUp")]
   #[case(Key::Enter, "enter")]
   #[case(Key::Esc, "esc")]
   #[case(Key::Backspace, "backspace")]
@@ -22,7 +24,7 @@ mod tests {
   #[case(Key::Char('q'), "q")]
   #[case(Key::Ctrl('q'), "ctrl-q")]
   fn test_key_formatter(#[case] key: Key, #[case] expected_str: &str) {
-    assert_str_eq!(format!("{key}"), format!("<{expected_str}>"));
+    assert_str_eq!(format!("{key}"), format!("{expected_str}"));
   }
 
   #[test]
@@ -45,6 +47,16 @@ mod tests {
     assert_eq!(Key::from(KeyEvent::from(KeyCode::Right)), Key::Right);
   }
 
+  #[test]
+  fn test_key_from_page_down() {
+    assert_eq!(Key::from(KeyEvent::from(KeyCode::PageDown)), Key::PgDown);
+  }
+
+  #[test]
+  fn test_key_from_page_up() {
+    assert_eq!(Key::from(KeyEvent::from(KeyCode::PageUp)), Key::PgUp);
+  }
+
   #[test]
   fn test_key_from_backspace() {
     assert_eq!(
diff --git a/src/handlers/handlers_tests.rs b/src/handlers/handlers_tests.rs
index c4c9977..ac81556 100644
--- a/src/handlers/handlers_tests.rs
+++ b/src/handlers/handlers_tests.rs
@@ -6,13 +6,20 @@ mod tests {
   use rstest::rstest;
   use tokio_util::sync::CancellationToken;
 
-  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
+  use crate::app::context_clues::SERVARR_CONTEXT_CLUES;
+  use crate::app::key_binding::{KeyBinding, DEFAULT_KEYBINDINGS};
+  use crate::app::radarr::radarr_context_clues::{
+    LIBRARY_CONTEXT_CLUES, MOVIE_DETAILS_CONTEXT_CLUES,
+  };
   use crate::app::App;
   use crate::event::Key;
-  use crate::handlers::handle_events;
   use crate::handlers::{handle_clear_errors, handle_prompt_toggle};
-  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+  use crate::handlers::{handle_events, populate_keymapping_table};
+  use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, RadarrData};
   use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use crate::models::servarr_data::ActiveKeybindingBlock;
+  use crate::models::servarr_models::KeybindingItem;
+  use crate::models::stateful_table::StatefulTable;
   use crate::models::HorizontallyScrollableText;
   use crate::models::Route;
 
@@ -82,6 +89,82 @@ mod tests {
     assert!(app.cancellation_token.is_cancelled());
   }
 
+  #[test]
+  fn test_handle_populate_keybindings_table_on_help_button_press() {
+    let mut app = App::test_default();
+    let expected_keybinding_items = Vec::from(SERVARR_CONTEXT_CLUES)
+      .iter()
+      .map(|(key, desc)| context_clue_to_keybinding_item(key, desc))
+      .collect::<Vec<_>>();
+    app.push_navigation_stack(ActiveKeybindingBlock::Help.into());
+
+    handle_events(DEFAULT_KEYBINDINGS.help.key, &mut app);
+
+    assert!(app.keymapping_table.is_some());
+    assert_eq!(
+      expected_keybinding_items,
+      app.keymapping_table.unwrap().items
+    );
+  }
+
+  #[test]
+  fn test_handle_ignore_help_button_when_ignore_special_keys_for_textbox_input_is_true() {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = true;
+    app.push_navigation_stack(ActiveRadarrBlock::default().into());
+
+    handle_events(DEFAULT_KEYBINDINGS.help.key, &mut app);
+
+    assert!(app.keymapping_table.is_none());
+  }
+
+  #[test]
+  fn test_handle_empties_keybindings_table_on_help_button_press_when_keybindings_table_is_already_populated(
+  ) {
+    let mut app = App::test_default();
+    let keybinding_items = Vec::from(SERVARR_CONTEXT_CLUES)
+      .iter()
+      .map(|(key, desc)| context_clue_to_keybinding_item(key, desc))
+      .collect::<Vec<_>>();
+    let mut stateful_table = StatefulTable::default();
+    stateful_table.set_items(keybinding_items);
+    app.keymapping_table = Some(stateful_table);
+    app.push_navigation_stack(ActiveRadarrBlock::default().into());
+
+    handle_events(DEFAULT_KEYBINDINGS.help.key, &mut app);
+
+    assert!(app.keymapping_table.is_none());
+  }
+
+  #[test]
+  fn test_handle_shows_keymapping_popup_when_keymapping_table_is_populated() {
+    let mut app = App::test_default();
+    let keybinding_items = Vec::from(SERVARR_CONTEXT_CLUES)
+      .iter()
+      .map(|(key, desc)| context_clue_to_keybinding_item(key, desc))
+      .collect::<Vec<_>>();
+    let mut stateful_table = StatefulTable::default();
+    stateful_table.set_items(keybinding_items);
+    app.keymapping_table = Some(stateful_table);
+    app.push_navigation_stack(ActiveRadarrBlock::default().into());
+    let expected_selection = KeybindingItem {
+      key: SERVARR_CONTEXT_CLUES[1].0.key.to_string(),
+      alt_key: SERVARR_CONTEXT_CLUES[1]
+        .0
+        .alt
+        .map_or(String::new(), |k| k.to_string()),
+      desc: SERVARR_CONTEXT_CLUES[1].1.to_string(),
+    };
+
+    handle_events(DEFAULT_KEYBINDINGS.down.key, &mut app);
+
+    assert!(app.keymapping_table.is_some());
+    assert_eq!(
+      &expected_selection,
+      app.keymapping_table.unwrap().current_selection()
+    );
+  }
+
   #[rstest]
   fn test_handle_prompt_toggle_left_right_radarr(#[values(Key::Left, Key::Right)] key: Key) {
     let mut app = App::test_default();
@@ -113,4 +196,95 @@ mod tests {
 
     assert!(!app.data.sonarr_data.prompt_confirm);
   }
+
+  #[test]
+  fn test_populate_keymapping_table_global_options() {
+    let expected_keybinding_items = Vec::from(SERVARR_CONTEXT_CLUES)
+      .iter()
+      .map(|(key, desc)| {
+        let (key, alt_key) = if key.alt.is_some() {
+          (key.key.to_string(), key.alt.as_ref().unwrap().to_string())
+        } else {
+          (key.key.to_string(), String::new())
+        };
+        KeybindingItem {
+          key,
+          alt_key,
+          desc: desc.to_string(),
+        }
+      })
+      .collect::<Vec<_>>();
+    let mut app = App::test_default();
+    app.push_navigation_stack(ActiveKeybindingBlock::Help.into());
+
+    populate_keymapping_table(&mut app);
+
+    assert!(app.keymapping_table.is_some());
+    assert_eq!(
+      expected_keybinding_items,
+      app.keymapping_table.unwrap().items
+    );
+  }
+
+  #[test]
+  fn test_populate_keymapping_table_populates_servarr_specific_tab_info_before_global_options() {
+    let mut expected_keybinding_items = LIBRARY_CONTEXT_CLUES
+      .iter()
+      .map(|(key, desc)| context_clue_to_keybinding_item(key, desc))
+      .collect::<Vec<_>>();
+    expected_keybinding_items.extend(
+      SERVARR_CONTEXT_CLUES
+        .iter()
+        .map(|(key, desc)| context_clue_to_keybinding_item(key, desc)),
+    );
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(ActiveRadarrBlock::default().into());
+
+    populate_keymapping_table(&mut app);
+
+    assert!(app.keymapping_table.is_some());
+    assert_eq!(
+      expected_keybinding_items,
+      app.keymapping_table.unwrap().items
+    );
+  }
+
+  #[test]
+  fn test_populate_keymapping_table_populates_delegated_servarr_context_provider_options_before_global_options(
+  ) {
+    let mut expected_keybinding_items = MOVIE_DETAILS_CONTEXT_CLUES
+      .iter()
+      .map(|(key, desc)| context_clue_to_keybinding_item(key, desc))
+      .collect::<Vec<_>>();
+    expected_keybinding_items.extend(
+      SERVARR_CONTEXT_CLUES
+        .iter()
+        .map(|(key, desc)| context_clue_to_keybinding_item(key, desc)),
+    );
+    let mut app = App::test_default();
+    app.data.radarr_data = RadarrData::default();
+    app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into());
+
+    populate_keymapping_table(&mut app);
+
+    assert!(app.keymapping_table.is_some());
+    assert_eq!(
+      expected_keybinding_items,
+      app.keymapping_table.unwrap().items
+    );
+  }
+
+  fn context_clue_to_keybinding_item(key: &KeyBinding, desc: &&str) -> KeybindingItem {
+    let (key, alt_key) = if key.alt.is_some() {
+      (key.key.to_string(), key.alt.as_ref().unwrap().to_string())
+    } else {
+      (key.key.to_string(), String::new())
+    };
+    KeybindingItem {
+      key,
+      alt_key,
+      desc: desc.to_string(),
+    }
+  }
 }
diff --git a/src/handlers/keybinding_handler.rs b/src/handlers/keybinding_handler.rs
new file mode 100644
index 0000000..b33dfbd
--- /dev/null
+++ b/src/handlers/keybinding_handler.rs
@@ -0,0 +1,80 @@
+use crate::app::App;
+use crate::event::Key;
+use crate::handle_table_events;
+use crate::handlers::table_handler::TableHandlingConfig;
+use crate::handlers::KeyEventHandler;
+use crate::models::servarr_data::ActiveKeybindingBlock;
+use crate::models::servarr_models::KeybindingItem;
+
+#[cfg(test)]
+#[path = "keybinding_handler_tests.rs"]
+mod keybinding_handler_tests;
+
+pub(super) struct KeybindingHandler<'a, 'b> {
+  key: Key,
+  app: &'a mut App<'b>,
+}
+
+impl KeybindingHandler<'_, '_> {
+  handle_table_events!(
+    self,
+    keybindings,
+    self.app.keymapping_table.as_mut().unwrap(),
+    KeybindingItem
+  );
+}
+
+impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveKeybindingBlock> for KeybindingHandler<'a, 'b> {
+  fn handle(&mut self) {
+    let keybinding_table_handling_config = TableHandlingConfig::new(self.app.get_current_route());
+
+    if !self.handle_keybindings_table_events(keybinding_table_handling_config) {
+      self.handle_key_event();
+    }
+  }
+
+  fn accepts(_active_block: ActiveKeybindingBlock) -> bool {
+    true
+  }
+
+  fn new(
+    key: Key,
+    app: &'a mut App<'b>,
+    _active_block: ActiveKeybindingBlock,
+    _context: Option<ActiveKeybindingBlock>,
+  ) -> KeybindingHandler<'a, 'b> {
+    KeybindingHandler { key, app }
+  }
+
+  fn get_key(&self) -> Key {
+    self.key
+  }
+
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
+  fn is_ready(&self) -> bool {
+    self.app.keymapping_table.is_some()
+  }
+
+  fn handle_scroll_up(&mut self) {}
+
+  fn handle_scroll_down(&mut self) {}
+
+  fn handle_home(&mut self) {}
+
+  fn handle_end(&mut self) {}
+
+  fn handle_delete(&mut self) {}
+
+  fn handle_left_right_action(&mut self) {}
+
+  fn handle_submit(&mut self) {}
+
+  fn handle_esc(&mut self) {
+    self.app.keymapping_table = None;
+  }
+
+  fn handle_char_key_event(&mut self) {}
+}
diff --git a/src/handlers/keybinding_handler_tests.rs b/src/handlers/keybinding_handler_tests.rs
new file mode 100644
index 0000000..5a44ea8
--- /dev/null
+++ b/src/handlers/keybinding_handler_tests.rs
@@ -0,0 +1,69 @@
+#[cfg(test)]
+mod tests {
+  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
+  use crate::app::App;
+  use crate::event::Key;
+  use crate::handlers::KeyEventHandler;
+  use crate::handlers::KeybindingHandler;
+  use crate::models::servarr_data::ActiveKeybindingBlock;
+  use crate::models::stateful_table::StatefulTable;
+  use rstest::rstest;
+
+  mod test_handle_esc {
+    use super::*;
+    use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+    use pretty_assertions::assert_eq;
+
+    const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
+
+    #[test]
+    fn test_esc_empties_keymapping_table() {
+      let mut app = App::test_default();
+      app.is_loading = true;
+      app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
+
+      KeybindingHandler::new(ESC_KEY, &mut app, ActiveKeybindingBlock::Help, None).handle();
+
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
+      assert!(app.keymapping_table.is_none());
+    }
+  }
+
+  #[test]
+  fn test_keybinding_handler_accepts() {
+    assert!(KeybindingHandler::accepts(ActiveKeybindingBlock::Help));
+  }
+
+  #[test]
+  fn test_keybinding_handler_not_ready_when_keybinding_is_empty() {
+    let mut app = App::test_default();
+    app.is_loading = false;
+
+    let handler = KeybindingHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveKeybindingBlock::Help,
+      None,
+    );
+
+    assert!(!handler.is_ready());
+  }
+
+  #[rstest]
+  fn test_keybinding_handler_ready_when_keymapping_table_is_not_empty(
+    #[values(true, false)] is_loading: bool,
+  ) {
+    let mut app = App::test_default();
+    app.keymapping_table = Some(StatefulTable::default());
+    app.is_loading = is_loading;
+
+    let handler = KeybindingHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveKeybindingBlock::Help,
+      None,
+    );
+
+    assert!(handler.is_ready());
+  }
+}
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 518d01b..619cd72 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -1,11 +1,20 @@
 use radarr_handlers::RadarrHandler;
 use sonarr_handlers::SonarrHandler;
 
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
+use crate::app::context_clues::{
+  ContextClueProvider, ServarrContextClueProvider, SERVARR_CONTEXT_CLUES,
+};
+use crate::app::key_binding::KeyBinding;
 use crate::app::App;
 use crate::event::Key;
+use crate::handlers::keybinding_handler::KeybindingHandler;
+use crate::matches_key;
+use crate::models::servarr_data::ActiveKeybindingBlock;
+use crate::models::servarr_models::KeybindingItem;
+use crate::models::stateful_table::StatefulTable;
 use crate::models::{HorizontallyScrollableText, Route};
 
+mod keybinding_handler;
 mod radarr_handlers;
 mod sonarr_handlers;
 
@@ -22,40 +31,42 @@ pub trait KeyEventHandler<'a, 'b, T: Into<Route> + Copy> {
   fn handle_key_event(&mut self) {
     let key = self.get_key();
     match key {
-      _ if key == DEFAULT_KEYBINDINGS.up.key => {
+      _ if matches_key!(up, key, self.ignore_special_keys()) => {
         if self.is_ready() {
           self.handle_scroll_up();
         }
       }
-      _ if key == DEFAULT_KEYBINDINGS.down.key => {
+      _ if matches_key!(down, key, self.ignore_special_keys()) => {
         if self.is_ready() {
           self.handle_scroll_down();
         }
       }
-      _ if key == DEFAULT_KEYBINDINGS.home.key => {
+      _ if matches_key!(home, key) => {
         if self.is_ready() {
           self.handle_home();
         }
       }
-      _ if key == DEFAULT_KEYBINDINGS.end.key => {
+      _ if matches_key!(end, key) => {
         if self.is_ready() {
           self.handle_end();
         }
       }
-      _ if key == DEFAULT_KEYBINDINGS.delete.key => {
+      _ if matches_key!(delete, key) => {
         if self.is_ready() {
           self.handle_delete();
         }
       }
-      _ if key == DEFAULT_KEYBINDINGS.left.key || key == DEFAULT_KEYBINDINGS.right.key => {
+      _ if matches_key!(left, key, self.ignore_special_keys())
+        || matches_key!(right, key, self.ignore_special_keys()) =>
+      {
         self.handle_left_right_action()
       }
-      _ if key == DEFAULT_KEYBINDINGS.submit.key => {
+      _ if matches_key!(submit, key) => {
         if self.is_ready() {
           self.handle_submit();
         }
       }
-      _ if key == DEFAULT_KEYBINDINGS.esc.key => self.handle_esc(),
+      _ if matches_key!(esc, key) => self.handle_esc(),
       _ => {
         if self.is_ready() {
           self.handle_char_key_event();
@@ -71,6 +82,7 @@ pub trait KeyEventHandler<'a, 'b, T: Into<Route> + Copy> {
   fn accepts(active_block: T) -> bool;
   fn new(key: Key, app: &'a mut App<'b>, active_block: T, context: Option<T>) -> Self;
   fn get_key(&self) -> Key;
+  fn ignore_special_keys(&self) -> bool;
   fn is_ready(&self) -> bool;
   fn handle_scroll_up(&mut self);
   fn handle_scroll_down(&mut self);
@@ -84,18 +96,27 @@ pub trait KeyEventHandler<'a, 'b, T: Into<Route> + Copy> {
 }
 
 pub fn handle_events(key: Key, app: &mut App<'_>) {
-  if key == DEFAULT_KEYBINDINGS.next_servarr.key {
+  if matches_key!(next_servarr, key) {
     app.reset();
     app.server_tabs.next();
     app.pop_and_push_navigation_stack(app.server_tabs.get_active_route());
     app.cancellation_token.cancel();
-  } else if key == DEFAULT_KEYBINDINGS.previous_servarr.key {
+  } else if matches_key!(previous_servarr, key) {
     app.reset();
     app.server_tabs.previous();
     app.pop_and_push_navigation_stack(app.server_tabs.get_active_route());
     app.cancellation_token.cancel();
+  } else if matches_key!(help, key) && !app.ignore_special_keys_for_textbox_input {
+    if app.keymapping_table.is_none() {
+      populate_keymapping_table(app);
+    } else {
+      app.keymapping_table = None;
+    }
   } else {
     match app.get_current_route() {
+      _ if app.keymapping_table.is_some() => {
+        KeybindingHandler::new(key, app, ActiveKeybindingBlock::Help, None).handle();
+      }
       Route::Radarr(active_radarr_block, context) => {
         RadarrHandler::new(key, app, active_radarr_block, context).handle()
       }
@@ -107,6 +128,48 @@ pub fn handle_events(key: Key, app: &mut App<'_>) {
   }
 }
 
+fn populate_keymapping_table(app: &mut App<'_>) {
+  let context_clue_to_keybinding_item = |key: &KeyBinding, desc: &&str| {
+    let (key, alt_key) = if key.alt.is_some() {
+      (key.key.to_string(), key.alt.as_ref().unwrap().to_string())
+    } else {
+      (key.key.to_string(), String::new())
+    };
+    KeybindingItem {
+      key,
+      alt_key,
+      desc: desc.to_string(),
+    }
+  };
+  let mut keybindings = Vec::new();
+  let global_keybindings = Vec::from(SERVARR_CONTEXT_CLUES)
+    .iter()
+    .map(|(key, desc)| context_clue_to_keybinding_item(key, desc))
+    .collect::<Vec<_>>();
+
+  if let Some(contextual_help) = app.server_tabs.get_active_route_contextual_help() {
+    keybindings.extend(
+      contextual_help
+        .iter()
+        .map(|(key, desc)| context_clue_to_keybinding_item(key, desc)),
+    );
+  }
+
+  if let Some(contextual_help) = ServarrContextClueProvider::get_context_clues(app) {
+    keybindings.extend(
+      contextual_help
+        .iter()
+        .map(|(key, desc)| context_clue_to_keybinding_item(key, desc)),
+    );
+  }
+
+  keybindings.extend(global_keybindings);
+
+  let mut table = StatefulTable::default();
+  table.set_items(keybindings);
+  app.keymapping_table = Some(table);
+}
+
 fn handle_clear_errors(app: &mut App<'_>) {
   if !app.error.text.is_empty() {
     app.error = HorizontallyScrollableText::default();
@@ -115,17 +178,15 @@ fn handle_clear_errors(app: &mut App<'_>) {
 
 fn handle_prompt_toggle(app: &mut App<'_>, key: Key) {
   match key {
-    _ if key == DEFAULT_KEYBINDINGS.left.key || key == DEFAULT_KEYBINDINGS.right.key => {
-      match app.get_current_route() {
-        Route::Radarr(_, _) => {
-          app.data.radarr_data.prompt_confirm = !app.data.radarr_data.prompt_confirm
-        }
-        Route::Sonarr(_, _) => {
-          app.data.sonarr_data.prompt_confirm = !app.data.sonarr_data.prompt_confirm
-        }
-        _ => (),
+    _ if matches_key!(left, key) || matches_key!(right, key) => match app.get_current_route() {
+      Route::Radarr(_, _) => {
+        app.data.radarr_data.prompt_confirm = !app.data.radarr_data.prompt_confirm
       }
-    }
+      Route::Sonarr(_, _) => {
+        app.data.sonarr_data.prompt_confirm = !app.data.sonarr_data.prompt_confirm
+      }
+      _ => (),
+    },
     _ => (),
   }
 }
@@ -149,7 +210,7 @@ macro_rules! handle_text_box_left_right_keys {
 macro_rules! handle_text_box_keys {
   ($self:expr, $key:expr, $input:expr) => {
     match $self.key {
-      _ if $key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.backspace.key => {
+      _ if $crate::matches_key!(backspace, $key) => {
         $input.pop();
       }
       Key::Char(character) => {
@@ -165,7 +226,7 @@ macro_rules! handle_prompt_left_right_keys {
   ($self:expr, $confirm_prompt:expr, $data:ident) => {
     if $self.app.data.$data.selected_block.get_active_block() == $confirm_prompt {
       handle_prompt_toggle($self.app, $self.key);
-    } else if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.left.key {
+    } else if $crate::matches_key!(left, $self.key) {
       $self.app.data.$data.selected_block.left();
     } else {
       $self.app.data.$data.selected_block.right();
diff --git a/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs b/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
index d65f467..bc76578 100644
--- a/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
+++ b/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
@@ -4,6 +4,7 @@ mod tests {
 
   use chrono::DateTime;
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -541,6 +542,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_blocklist_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = BlocklistHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_blocklist_item_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/blocklist/mod.rs b/src/handlers/radarr_handlers/blocklist/mod.rs
index 9dee67a..1160781 100644
--- a/src/handlers/radarr_handlers/blocklist/mod.rs
+++ b/src/handlers/radarr_handlers/blocklist/mod.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
@@ -9,6 +7,7 @@ use crate::models::radarr_models::BlocklistItem;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, BLOCKLIST_BLOCKS};
 use crate::models::stateful_table::SortOption;
 use crate::network::radarr_network::RadarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "blocklist_handler_tests.rs"]
@@ -51,6 +50,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a,
     BLOCKLIST_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -143,10 +146,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a,
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::Blocklist => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.clear.key => {
+        _ if matches_key!(clear, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::BlocklistClearAllItemsPrompt.into());
@@ -154,7 +157,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a,
         _ => (),
       },
       ActiveRadarrBlock::DeleteBlocklistItemPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteBlocklistItem(
             self.extract_blocklist_item_id(),
@@ -164,7 +167,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a,
         }
       }
       ActiveRadarrBlock::BlocklistClearAllItemsPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::ClearBlocklist);
 
diff --git a/src/handlers/radarr_handlers/collections/collection_details_handler.rs b/src/handlers/radarr_handlers/collections/collection_details_handler.rs
index 4780ee6..70af277 100644
--- a/src/handlers/radarr_handlers/collections/collection_details_handler.rs
+++ b/src/handlers/radarr_handlers/collections/collection_details_handler.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::KeyEventHandler;
 use crate::models::radarr_models::CollectionMovie;
@@ -11,6 +9,7 @@ use crate::models::servarr_data::radarr::radarr_data::{
 };
 use crate::models::stateful_table::StatefulTable;
 use crate::models::BlockSelectionState;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "collection_details_handler_tests.rs"]
@@ -46,6 +45,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionDetailsHan
     COLLECTION_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -130,7 +133,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionDetailsHan
 
   fn handle_char_key_event(&mut self) {
     if self.active_radarr_block == ActiveRadarrBlock::CollectionDetails
-      && self.key == DEFAULT_KEYBINDINGS.edit.key
+      && matches_key!(edit, self.key)
     {
       self.app.push_navigation_stack(
         (
diff --git a/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs b/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
index 3d016da..62fec18 100644
--- a/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
+++ b/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_str_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -278,6 +279,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_collection_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = CollectionDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_collection_details_handler_not_ready_when_loading() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/collections/collections_handler_tests.rs b/src/handlers/radarr_handlers/collections/collections_handler_tests.rs
index 7fd2179..6467417 100644
--- a/src/handlers/radarr_handlers/collections/collections_handler_tests.rs
+++ b/src/handlers/radarr_handlers/collections/collections_handler_tests.rs
@@ -589,6 +589,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_collections_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = CollectionsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_collections_handler_not_ready_when_loading() {
     let mut app = App::test_default();
@@ -644,7 +663,7 @@ mod tests {
       Collection {
         id: 3,
         title: "test 1".into(),
-        movies: Some(iter::repeat(CollectionMovie::default()).take(3).collect()),
+        movies: Some(iter::repeat_n(CollectionMovie::default(), 3).collect()),
         root_folder_path: Some("/nfs/movies".into()),
         quality_profile_id: 1,
         search_on_add: false,
@@ -654,7 +673,7 @@ mod tests {
       Collection {
         id: 2,
         title: "test 2".into(),
-        movies: Some(iter::repeat(CollectionMovie::default()).take(7).collect()),
+        movies: Some(iter::repeat_n(CollectionMovie::default(), 7).collect()),
         root_folder_path: Some("/htpc/movies".into()),
         quality_profile_id: 3,
         search_on_add: true,
@@ -664,7 +683,7 @@ mod tests {
       Collection {
         id: 1,
         title: "test 3".into(),
-        movies: Some(iter::repeat(CollectionMovie::default()).take(1).collect()),
+        movies: Some(iter::repeat_n(CollectionMovie::default(), 1).collect()),
         root_folder_path: Some("/nfs/some/stupidly/long/path/to/test/with".into()),
         quality_profile_id: 1,
         search_on_add: false,
diff --git a/src/handlers/radarr_handlers/collections/edit_collection_handler.rs b/src/handlers/radarr_handlers/collections/edit_collection_handler.rs
index 04e3555..77426b9 100644
--- a/src/handlers/radarr_handlers/collections/edit_collection_handler.rs
+++ b/src/handlers/radarr_handlers/collections/edit_collection_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -7,7 +6,7 @@ use crate::models::servarr_data::radarr::modals::EditCollectionModal;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS};
 use crate::models::Scrollable;
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{handle_text_box_keys, handle_text_box_left_right_keys, matches_key};
 
 #[cfg(test)]
 #[path = "edit_collection_handler_tests.rs"]
@@ -69,6 +68,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
     EDIT_COLLECTION_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -262,7 +265,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
               )
                 .into(),
             );
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveRadarrBlock::EditCollectionToggleMonitored => {
             self
@@ -311,7 +314,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
       | ActiveRadarrBlock::EditCollectionSelectQualityProfile => self.app.pop_navigation_stack(),
       ActiveRadarrBlock::EditCollectionRootFolderPathInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -321,7 +324,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
     match self.active_radarr_block {
       ActiveRadarrBlock::EditCollectionRootFolderPathInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveRadarrBlock::EditCollectionPrompt => {
         self.app.pop_navigation_stack();
@@ -354,7 +357,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
       ActiveRadarrBlock::EditCollectionPrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
           == ActiveRadarrBlock::EditCollectionConfirmPrompt
-          && key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, key)
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::EditCollection(
diff --git a/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs b/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
index f76f831..8e9a0d4 100644
--- a/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
+++ b/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
@@ -2,6 +2,7 @@
 mod tests {
   use bimap::BiMap;
   use pretty_assertions::assert_str_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -457,7 +458,7 @@ mod tests {
     #[test]
     fn test_edit_collection_root_folder_path_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
         path: "Test Path".into(),
         ..EditCollectionModal::default()
@@ -473,7 +474,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -759,7 +760,7 @@ mod tests {
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
 
       if selected_block == ActiveRadarrBlock::EditCollectionRootFolderPathInput {
-        assert!(app.should_ignore_quit_key);
+        assert!(app.ignore_special_keys_for_textbox_input);
       }
     }
 
@@ -791,7 +792,7 @@ mod tests {
       );
 
       if active_radarr_block == ActiveRadarrBlock::EditCollectionRootFolderPathInput {
-        assert!(!app.should_ignore_quit_key);
+        assert!(!app.ignore_special_keys_for_textbox_input);
       }
     }
   }
@@ -811,7 +812,7 @@ mod tests {
       let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditCollectionRootFolderPathInput.into());
 
@@ -823,7 +824,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveRadarrBlock::EditCollectionPrompt.into()
@@ -926,7 +927,7 @@ mod tests {
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
 
       EditCollectionHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditCollectionRootFolderPathInput,
         None,
@@ -942,7 +943,7 @@ mod tests {
           .unwrap()
           .path
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1019,6 +1020,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_edit_collection_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = EditCollectionHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_collection_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/collections/mod.rs b/src/handlers/radarr_handlers/collections/mod.rs
index 507a9f0..2164080 100644
--- a/src/handlers/radarr_handlers/collections/mod.rs
+++ b/src/handlers/radarr_handlers/collections/mod.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::radarr_handlers::collections::collection_details_handler::CollectionDetailsHandler;
 use crate::handlers::radarr_handlers::collections::edit_collection_handler::EditCollectionHandler;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
@@ -14,6 +12,7 @@ use crate::models::servarr_data::radarr::radarr_data::{
 use crate::models::stateful_table::SortOption;
 use crate::models::BlockSelectionState;
 use crate::network::radarr_network::RadarrEvent;
+use crate::{handle_table_events, matches_key};
 
 mod collection_details_handler;
 mod edit_collection_handler;
@@ -73,6 +72,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
       || COLLECTIONS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -145,7 +148,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::Collections => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if matches_key!(edit, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into());
@@ -154,18 +157,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
           self.app.data.radarr_data.selected_block =
             BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS);
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::UpdateAllCollectionsPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
         _ => (),
       },
       ActiveRadarrBlock::UpdateAllCollectionsPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::UpdateCollections);
 
diff --git a/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs b/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
index 2efc8f2..bbdd673 100644
--- a/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
+++ b/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -387,6 +388,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_downloads_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = DownloadsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_download_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/downloads/mod.rs b/src/handlers/radarr_handlers/downloads/mod.rs
index b4094d8..173019f 100644
--- a/src/handlers/radarr_handlers/downloads/mod.rs
+++ b/src/handlers/radarr_handlers/downloads/mod.rs
@@ -1,13 +1,12 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
 use crate::models::radarr_models::DownloadRecord;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
 use crate::network::radarr_network::RadarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "downloads_handler_tests.rs"]
@@ -47,6 +46,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DownloadsHandler<'a,
     DOWNLOADS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -130,18 +133,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DownloadsHandler<'a,
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::Downloads => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::UpdateDownloadsPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
         _ => (),
       },
       ActiveRadarrBlock::DeleteDownloadPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
             Some(RadarrEvent::DeleteDownload(self.extract_download_id()));
@@ -150,7 +153,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DownloadsHandler<'a,
         }
       }
       ActiveRadarrBlock::UpdateDownloadsPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::UpdateDownloads);
 
diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs
index 15350b1..d9ba23c 100644
--- a/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs
+++ b/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -6,7 +5,9 @@ use crate::models::servarr_data::modals::EditIndexerModal;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::models::servarr_models::EditIndexerParams;
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{
+  handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
+};
 
 #[cfg(test)]
 #[path = "edit_indexer_handler_tests.rs"]
@@ -65,6 +66,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
     EDIT_INDEXER_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -356,7 +361,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
           | ActiveRadarrBlock::EditIndexerSeedRatioInput
           | ActiveRadarrBlock::EditIndexerTagsInput => {
             self.app.push_navigation_stack(selected_block.into());
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveRadarrBlock::EditIndexerPriorityInput => self
             .app
@@ -402,7 +407,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
       | ActiveRadarrBlock::EditIndexerSeedRatioInput
       | ActiveRadarrBlock::EditIndexerTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveRadarrBlock::EditIndexerPriorityInput => self.app.pop_navigation_stack(),
       _ => (),
@@ -423,7 +428,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
       | ActiveRadarrBlock::EditIndexerPriorityInput
       | ActiveRadarrBlock::EditIndexerTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => self.app.pop_navigation_stack(),
     }
@@ -504,7 +509,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
       ActiveRadarrBlock::EditIndexerPrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
           == ActiveRadarrBlock::EditIndexerConfirmPrompt
-          && self.key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, self.key)
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
index a8b0fce..b3107f2 100644
--- a/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
@@ -10,6 +10,7 @@ mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
   use crate::models::servarr_models::EditIndexerParams;
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   mod test_handle_scroll_up_and_down {
@@ -1002,7 +1003,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), block.into());
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -1027,7 +1028,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::EditIndexerPriorityInput.into()
       );
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -1193,7 +1194,7 @@ mod tests {
     fn test_edit_indexer_name_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
         ..EditIndexerModal::default()
@@ -1209,7 +1210,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -1229,7 +1230,7 @@ mod tests {
     fn test_edit_indexer_url_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
         ..EditIndexerModal::default()
@@ -1245,7 +1246,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -1265,7 +1266,7 @@ mod tests {
     fn test_edit_indexer_api_key_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
         ..EditIndexerModal::default()
@@ -1281,7 +1282,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -1301,7 +1302,7 @@ mod tests {
     fn test_edit_indexer_seed_ratio_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
         ..EditIndexerModal::default()
@@ -1317,7 +1318,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -1337,7 +1338,7 @@ mod tests {
     fn test_edit_indexer_tags_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
         ..EditIndexerModal::default()
@@ -1353,7 +1354,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -1417,12 +1418,12 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       EditIndexerHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.radarr_data.edit_indexer_modal,
         Some(EditIndexerModal::default())
@@ -1597,7 +1598,7 @@ mod tests {
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditIndexerNameInput,
         None,
@@ -1613,7 +1614,7 @@ mod tests {
           .unwrap()
           .name
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1624,7 +1625,7 @@ mod tests {
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditIndexerUrlInput,
         None,
@@ -1640,7 +1641,7 @@ mod tests {
           .unwrap()
           .url
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1651,7 +1652,7 @@ mod tests {
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditIndexerApiKeyInput,
         None,
@@ -1667,7 +1668,7 @@ mod tests {
           .unwrap()
           .api_key
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1678,7 +1679,7 @@ mod tests {
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditIndexerSeedRatioInput,
         None,
@@ -1694,7 +1695,7 @@ mod tests {
           .unwrap()
           .seed_ratio
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1705,7 +1706,7 @@ mod tests {
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditIndexerTagsInput,
         None,
@@ -1721,7 +1722,7 @@ mod tests {
           .unwrap()
           .tags
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1793,6 +1794,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_edit_indexer_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = EditIndexerHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_indexer_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs
index d304449..4e1eca5 100644
--- a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs
+++ b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -7,7 +6,9 @@ use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
 };
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{
+  handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
+};
 
 #[cfg(test)]
 #[path = "edit_indexer_settings_handler_tests.rs"]
@@ -37,6 +38,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
     INDEXER_SETTINGS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -207,7 +212,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
             self.app.push_navigation_stack(
               ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into(),
             );
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveRadarrBlock::IndexerSettingsTogglePreferIndexerFlags => {
             let indexer_settings = self.app.data.radarr_data.indexer_settings.as_mut().unwrap();
@@ -224,7 +229,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
       }
       ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveRadarrBlock::IndexerSettingsMinimumAgeInput
       | ActiveRadarrBlock::IndexerSettingsRetentionInput
@@ -244,7 +249,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
       }
       ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => self.app.pop_navigation_stack(),
     }
@@ -269,7 +274,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
       ActiveRadarrBlock::AllIndexerSettingsPrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
           == ActiveRadarrBlock::IndexerSettingsConfirmPrompt
-          && self.key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, self.key)
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(
diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
index 7dfb325..25fe87a 100644
--- a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -602,7 +603,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -716,7 +717,7 @@ mod tests {
     #[test]
     fn test_edit_indexer_settings_whitelisted_subtitle_tags_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.indexer_settings = Some(IndexerSettings {
         whitelisted_hardcoded_subs: "Test tags".into(),
         ..IndexerSettings::default()
@@ -734,7 +735,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -814,7 +815,7 @@ mod tests {
         ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into(),
       );
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       IndexerSettingsHandler::new(
         ESC_KEY,
@@ -825,7 +826,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.radarr_data.indexer_settings,
         Some(IndexerSettings::default())
@@ -907,7 +908,7 @@ mod tests {
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
 
       IndexerSettingsHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
         None,
@@ -923,7 +924,7 @@ mod tests {
           .unwrap()
           .whitelisted_hardcoded_subs
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -970,6 +971,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_indexer_settings_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = IndexerSettingsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_indexer_settings_body() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs b/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
index e1e562b..e4a26c4 100644
--- a/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
@@ -633,6 +633,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_indexers_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = IndexersHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_indexer_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/indexers/mod.rs b/src/handlers/radarr_handlers/indexers/mod.rs
index 28371c9..5770c2a 100644
--- a/src/handlers/radarr_handlers/indexers/mod.rs
+++ b/src/handlers/radarr_handlers/indexers/mod.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::radarr_handlers::indexers::edit_indexer_handler::EditIndexerHandler;
 use crate::handlers::radarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
@@ -15,6 +13,7 @@ use crate::models::servarr_data::radarr::radarr_data::{
 use crate::models::servarr_models::Indexer;
 use crate::models::BlockSelectionState;
 use crate::network::radarr_network::RadarrEvent;
+use crate::{handle_table_events, matches_key};
 
 mod edit_indexer_handler;
 mod edit_indexer_settings_handler;
@@ -70,6 +69,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
       || INDEXERS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -169,20 +172,20 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::Indexers => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.test.key => {
+        _ if matches_key!(test, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::TestIndexer.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.test_all.key => {
+        _ if matches_key!(test_all, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::TestAllIndexers.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.settings.key => {
+        _ if matches_key!(settings, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
@@ -192,7 +195,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
         _ => (),
       },
       ActiveRadarrBlock::DeleteIndexerPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
             Some(RadarrEvent::DeleteIndexer(self.extract_indexer_id()));
diff --git a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs
index 220fa3f..896bd72 100644
--- a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs
+++ b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs
@@ -48,6 +48,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
     active_block == ActiveRadarrBlock::TestAllIndexers
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
diff --git a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
index bd84171..7bfc93c 100644
--- a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
@@ -7,6 +7,7 @@ mod tests {
   use crate::models::servarr_data::modals::IndexerTestResultModalItem;
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
   use crate::models::stateful_table::StatefulTable;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   mod test_handle_esc {
@@ -48,6 +49,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_test_all_indexers_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = TestAllIndexersHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_loading() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/library/add_movie_handler.rs b/src/handlers/radarr_handlers/library/add_movie_handler.rs
index d0c90c0..3480bdb 100644
--- a/src/handlers/radarr_handlers/library/add_movie_handler.rs
+++ b/src/handlers/radarr_handlers/library/add_movie_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
 use crate::models::radarr_models::{
@@ -11,7 +10,9 @@ use crate::models::servarr_data::radarr::radarr_data::{
 use crate::models::stateful_table::StatefulTable;
 use crate::models::{BlockSelectionState, Scrollable};
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
+use crate::{
+  handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, matches_key, App, Key,
+};
 
 #[cfg(test)]
 #[path = "add_movie_handler_tests.rs"]
@@ -132,6 +133,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
     ADD_MOVIE_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -404,7 +409,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
         self
           .app
           .push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ if self.active_radarr_block == ActiveRadarrBlock::AddMovieSearchResults
         && self.app.data.radarr_data.add_searched_movies.is_some() =>
@@ -468,7 +473,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
               )
                 .into(),
             );
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           _ => (),
         }
@@ -479,7 +484,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
       | ActiveRadarrBlock::AddMovieSelectRootFolder => self.app.pop_navigation_stack(),
       ActiveRadarrBlock::AddMovieTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -490,12 +495,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
       ActiveRadarrBlock::AddMovieSearchInput => {
         self.app.pop_navigation_stack();
         self.app.data.radarr_data.add_movie_search = None;
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveRadarrBlock::AddMovieSearchResults | ActiveRadarrBlock::AddMovieEmptySearchResults => {
         self.app.pop_navigation_stack();
         self.app.data.radarr_data.add_searched_movies = None;
-        self.app.should_ignore_quit_key = true;
+        self.app.ignore_special_keys_for_textbox_input = true;
       }
       ActiveRadarrBlock::AddMoviePrompt => {
         self.app.pop_navigation_stack();
@@ -509,7 +514,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
       | ActiveRadarrBlock::AddMovieSelectRootFolder => self.app.pop_navigation_stack(),
       ActiveRadarrBlock::AddMovieTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -542,7 +547,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
       ActiveRadarrBlock::AddMoviePrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
           == ActiveRadarrBlock::AddMovieConfirmPrompt
-          && key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, key)
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
diff --git a/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
index 8be52b8..4449905 100644
--- a/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
@@ -782,7 +782,7 @@ mod tests {
     #[test]
     fn test_add_movie_search_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.add_movie_search = Some("test".into());
 
       AddMovieHandler::new(
@@ -793,7 +793,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveRadarrBlock::AddMovieSearchResults.into()
@@ -805,7 +805,7 @@ mod tests {
       let mut app = App::test_default();
       app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       AddMovieHandler::new(
         SUBMIT_KEY,
@@ -815,7 +815,7 @@ mod tests {
       )
       .handle();
 
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveRadarrBlock::AddMovieSearchInput.into()
@@ -1093,7 +1093,7 @@ mod tests {
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
 
       if selected_block == ActiveRadarrBlock::AddMovieTagsInput {
-        assert!(app.should_ignore_quit_key);
+        assert!(app.ignore_special_keys_for_textbox_input);
       }
     }
 
@@ -1126,7 +1126,7 @@ mod tests {
       );
 
       if active_radarr_block == ActiveRadarrBlock::AddMovieTagsInput {
-        assert!(!app.should_ignore_quit_key);
+        assert!(!app.ignore_special_keys_for_textbox_input);
       }
     }
   }
@@ -1149,7 +1149,7 @@ mod tests {
       let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data = create_test_radarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
 
       AddMovieHandler::new(
@@ -1160,7 +1160,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(app.data.radarr_data.add_movie_search, None);
     }
@@ -1169,7 +1169,7 @@ mod tests {
     fn test_add_movie_input_esc() {
       let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into());
 
@@ -1181,7 +1181,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveRadarrBlock::AddMoviePrompt.into()
@@ -1213,7 +1213,7 @@ mod tests {
         ActiveRadarrBlock::AddMovieSearchInput.into()
       );
       assert!(app.data.radarr_data.add_searched_movies.is_none());
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -1259,7 +1259,7 @@ mod tests {
     fn test_add_movie_tags_input_esc() {
       let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into());
 
@@ -1271,7 +1271,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveRadarrBlock::AddMoviePrompt.into()
@@ -1395,7 +1395,7 @@ mod tests {
       app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
 
       AddMovieHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::AddMovieSearchInput,
         None,
@@ -1404,7 +1404,7 @@ mod tests {
 
       assert_str_eq!(
         app.data.radarr_data.add_movie_search.as_ref().unwrap().text,
-        "h"
+        "a"
       );
     }
 
@@ -1414,7 +1414,7 @@ mod tests {
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
 
       AddMovieHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::AddMovieTagsInput,
         None,
@@ -1430,7 +1430,7 @@ mod tests {
           .unwrap()
           .tags
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1523,6 +1523,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_add_movie_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = AddMovieHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_add_movie_search_no_panic_on_none_search_result() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/library/delete_movie_handler.rs b/src/handlers/radarr_handlers/library/delete_movie_handler.rs
index 4f8d320..b10ac3c 100644
--- a/src/handlers/radarr_handlers/library/delete_movie_handler.rs
+++ b/src/handlers/radarr_handlers/library/delete_movie_handler.rs
@@ -1,7 +1,7 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
+use crate::matches_key;
 use crate::models::radarr_models::DeleteMovieParams;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::network::radarr_network::RadarrEvent;
@@ -37,6 +37,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
     DELETE_MOVIE_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -122,7 +126,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
     if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt
       && self.app.data.radarr_data.selected_block.get_active_block()
         == ActiveRadarrBlock::DeleteMovieConfirmPrompt
-      && self.key == DEFAULT_KEYBINDINGS.confirm.key
+      && matches_key!(confirm, self.key)
     {
       self.app.data.radarr_data.prompt_confirm = true;
       self.app.data.radarr_data.prompt_confirm_action =
diff --git a/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
index 151c105..17b9338 100644
--- a/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -313,6 +314,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_delete_movie_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = DeleteMovieHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_delete_movie_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/library/edit_movie_handler.rs b/src/handlers/radarr_handlers/library/edit_movie_handler.rs
index 9201091..10c3f14 100644
--- a/src/handlers/radarr_handlers/library/edit_movie_handler.rs
+++ b/src/handlers/radarr_handlers/library/edit_movie_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -7,7 +6,7 @@ use crate::models::servarr_data::radarr::modals::EditMovieModal;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS};
 use crate::models::Scrollable;
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{handle_text_box_keys, handle_text_box_left_right_keys, matches_key};
 
 #[cfg(test)]
 #[path = "edit_movie_handler_tests.rs"]
@@ -68,6 +67,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
     EDIT_MOVIE_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -290,7 +293,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
               )
                 .into(),
             );
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveRadarrBlock::EditMovieToggleMonitored => {
             self
@@ -319,7 +322,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
       | ActiveRadarrBlock::EditMovieSelectQualityProfile => self.app.pop_navigation_stack(),
       ActiveRadarrBlock::EditMoviePathInput | ActiveRadarrBlock::EditMovieTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -329,7 +332,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
     match self.active_radarr_block {
       ActiveRadarrBlock::EditMovieTagsInput | ActiveRadarrBlock::EditMoviePathInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveRadarrBlock::EditMoviePrompt => {
         self.app.pop_navigation_stack();
@@ -376,7 +379,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
       ActiveRadarrBlock::EditMoviePrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
           == ActiveRadarrBlock::EditMovieConfirmPrompt
-          && key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, key)
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
diff --git a/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
index eac5fe9..9853ee3 100644
--- a/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
@@ -2,6 +2,7 @@
 mod tests {
   use bimap::BiMap;
   use pretty_assertions::assert_str_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -548,7 +549,7 @@ mod tests {
     #[test]
     fn test_edit_movie_path_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         path: "Test Path".into(),
         ..EditMovieModal::default()
@@ -564,7 +565,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -583,7 +584,7 @@ mod tests {
     #[test]
     fn test_edit_movie_tags_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         tags: "Test Tags".into(),
         ..EditMovieModal::default()
@@ -599,7 +600,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .radarr_data
@@ -813,7 +814,7 @@ mod tests {
       if selected_block == ActiveRadarrBlock::EditMoviePathInput
         || selected_block == ActiveRadarrBlock::EditMovieTagsInput
       {
-        assert!(app.should_ignore_quit_key);
+        assert!(app.ignore_special_keys_for_textbox_input);
       }
     }
 
@@ -851,7 +852,7 @@ mod tests {
           .into()
       );
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
     }
 
     #[rstest]
@@ -885,7 +886,7 @@ mod tests {
       if active_radarr_block == ActiveRadarrBlock::EditMoviePathInput
         || active_radarr_block == ActiveRadarrBlock::EditMovieTagsInput
       {
-        assert!(!app.should_ignore_quit_key);
+        assert!(!app.ignore_special_keys_for_textbox_input);
       }
     }
   }
@@ -911,13 +912,13 @@ mod tests {
     ) {
       let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
       app.push_navigation_stack(active_radarr_block.into());
 
       EditMovieHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveRadarrBlock::EditMoviePrompt.into()
@@ -1033,7 +1034,7 @@ mod tests {
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
       EditMovieHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditMoviePathInput,
         None,
@@ -1049,7 +1050,7 @@ mod tests {
           .unwrap()
           .path
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1059,7 +1060,7 @@ mod tests {
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
       EditMovieHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::EditMovieTagsInput,
         None,
@@ -1075,7 +1076,7 @@ mod tests {
           .unwrap()
           .tags
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1148,6 +1149,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_edit_movie_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = EditMovieHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_movie_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/library/library_handler_tests.rs b/src/handlers/radarr_handlers/library/library_handler_tests.rs
index 5117095..f6bb55d 100644
--- a/src/handlers/radarr_handlers/library/library_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/library_handler_tests.rs
@@ -9,6 +9,7 @@ mod tests {
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::radarr_handlers::library::{movies_sorting_options, LibraryHandler};
+  use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::movie;
   use crate::handlers::KeyEventHandler;
   use crate::models::radarr_models::Movie;
   use crate::models::servarr_data::radarr::radarr_data::{
@@ -331,7 +332,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::AddMovieSearchInput.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.add_movie_search.is_some());
     }
 
@@ -355,7 +356,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.add_movie_search.is_none());
     }
 
@@ -391,6 +392,51 @@ mod tests {
       assert!(app.data.radarr_data.edit_movie_modal.is_none());
     }
 
+    #[test]
+    fn test_toggle_monitoring_key() {
+      let mut app = App::test_default();
+      app.data.radarr_data = create_test_radarr_data();
+      app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
+      app.is_routing = false;
+
+      LibraryHandler::new(
+        DEFAULT_KEYBINDINGS.toggle_monitoring.key,
+        &mut app,
+        ActiveRadarrBlock::Movies,
+        None,
+      )
+      .handle();
+
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
+      assert!(app.data.radarr_data.prompt_confirm);
+      assert!(app.is_routing);
+      assert_eq!(
+        app.data.radarr_data.prompt_confirm_action,
+        Some(RadarrEvent::ToggleMovieMonitoring(0))
+      );
+    }
+
+    #[test]
+    fn test_toggle_monitoring_key_no_op_when_not_ready() {
+      let mut app = App::test_default();
+      app.is_loading = true;
+      app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
+      app.is_routing = false;
+
+      LibraryHandler::new(
+        DEFAULT_KEYBINDINGS.toggle_monitoring.key,
+        &mut app,
+        ActiveRadarrBlock::Movies,
+        None,
+      )
+      .handle();
+
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
+      assert!(!app.data.radarr_data.prompt_confirm);
+      assert!(app.data.radarr_data.prompt_confirm_action.is_none());
+      assert!(!app.is_routing);
+    }
+
     #[test]
     fn test_update_all_movies_key() {
       let mut app = App::test_default();
@@ -580,6 +626,22 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_extract_movie_id() {
+    let mut app = App::test_default();
+    app.data.radarr_data.movies.set_items(vec![movie()]);
+
+    let movie_id = LibraryHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::Movies,
+      None,
+    )
+    .extract_movie_id();
+
+    assert_eq!(movie_id, 1);
+  }
+
   #[test]
   fn test_movies_sorting_options_title() {
     let expected_cmp_fn: fn(&Movie, &Movie) -> Ordering = |a, b| {
@@ -615,8 +677,13 @@ mod tests {
 
   #[test]
   fn test_movies_sorting_options_studio() {
-    let expected_cmp_fn: fn(&Movie, &Movie) -> Ordering =
-      |a, b| a.studio.to_lowercase().cmp(&b.studio.to_lowercase());
+    let expected_cmp_fn: fn(&Movie, &Movie) -> Ordering = |a, b| {
+      a.studio
+        .as_ref()
+        .unwrap_or(&String::new())
+        .to_lowercase()
+        .cmp(&b.studio.as_ref().unwrap_or(&String::new()).to_lowercase())
+    };
     let mut expected_movies_vec = movies_vec();
     expected_movies_vec.sort_by(expected_cmp_fn);
 
@@ -777,6 +844,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_library_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = LibraryHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_library_handler_not_ready_when_loading() {
     let mut app = App::test_default();
@@ -837,7 +923,7 @@ mod tests {
           name: "English".to_owned(),
         },
         size_on_disk: 1024,
-        studio: "Studio 1".to_owned(),
+        studio: Some("Studio 1".to_owned()),
         year: 2024,
         monitored: false,
         runtime: 12.into(),
@@ -854,7 +940,7 @@ mod tests {
           name: "Chinese".to_owned(),
         },
         size_on_disk: 2048,
-        studio: "Studio 2".to_owned(),
+        studio: Some("Studio 2".to_owned()),
         year: 1998,
         monitored: false,
         runtime: 60.into(),
@@ -871,7 +957,7 @@ mod tests {
           name: "Japanese".to_owned(),
         },
         size_on_disk: 512,
-        studio: "studio 3".to_owned(),
+        studio: Some("studio 3".to_owned()),
         year: 1954,
         monitored: true,
         runtime: 120.into(),
diff --git a/src/handlers/radarr_handlers/library/mod.rs b/src/handlers/radarr_handlers/library/mod.rs
index b7744a7..3c24f90 100644
--- a/src/handlers/radarr_handlers/library/mod.rs
+++ b/src/handlers/radarr_handlers/library/mod.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
@@ -8,7 +7,6 @@ use crate::handlers::radarr_handlers::library::edit_movie_handler::EditMovieHand
 use crate::handlers::radarr_handlers::library::movie_details_handler::MovieDetailsHandler;
 use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
 
-use crate::handle_table_events;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::models::radarr_models::Movie;
 use crate::models::servarr_data::radarr::radarr_data::{
@@ -17,6 +15,7 @@ use crate::models::servarr_data::radarr::radarr_data::{
 use crate::models::stateful_table::SortOption;
 use crate::models::{BlockSelectionState, HorizontallyScrollableText};
 use crate::network::radarr_network::RadarrEvent;
+use crate::{handle_table_events, matches_key};
 
 mod add_movie_handler;
 mod delete_movie_handler;
@@ -36,6 +35,9 @@ pub(super) struct LibraryHandler<'a, 'b> {
 
 impl LibraryHandler<'_, '_> {
   handle_table_events!(self, movies, self.app.data.radarr_data.movies, Movie);
+  fn extract_movie_id(&self) -> i64 {
+    self.app.data.radarr_data.movies.current_selection().id
+  }
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, 'b> {
@@ -81,6 +83,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
       || LIBRARY_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -161,7 +167,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::Movies => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if matches_key!(edit, key) => {
           self.app.push_navigation_stack(
             (
               ActiveRadarrBlock::EditMoviePrompt,
@@ -173,25 +179,34 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
           self.app.data.radarr_data.selected_block =
             BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS);
         }
-        _ if key == DEFAULT_KEYBINDINGS.add.key => {
+        _ if matches_key!(add, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
           self.app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
-          self.app.should_ignore_quit_key = true;
+          self.app.ignore_special_keys_for_textbox_input = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(toggle_monitoring, key) => {
+          self.app.data.radarr_data.prompt_confirm = true;
+          self.app.data.radarr_data.prompt_confirm_action =
+            Some(RadarrEvent::ToggleMovieMonitoring(self.extract_movie_id()));
+
+          self
+            .app
+            .pop_and_push_navigation_stack(self.active_radarr_block.into());
+        }
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
         _ => (),
       },
       ActiveRadarrBlock::UpdateAllMoviesPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::UpdateAllMovies);
 
@@ -220,7 +235,13 @@ fn movies_sorting_options() -> Vec<SortOption<Movie>> {
     },
     SortOption {
       name: "Studio",
-      cmp_fn: Some(|a, b| a.studio.to_lowercase().cmp(&b.studio.to_lowercase())),
+      cmp_fn: Some(|a, b| {
+        a.studio
+          .as_ref()
+          .unwrap_or(&String::new())
+          .to_lowercase()
+          .cmp(&b.studio.as_ref().unwrap_or(&String::new()).to_lowercase())
+      }),
     },
     SortOption {
       name: "Runtime",
diff --git a/src/handlers/radarr_handlers/library/movie_details_handler.rs b/src/handlers/radarr_handlers/library/movie_details_handler.rs
index 2e41f47..ac08fa1 100644
--- a/src/handlers/radarr_handlers/library/movie_details_handler.rs
+++ b/src/handlers/radarr_handlers/library/movie_details_handler.rs
@@ -1,9 +1,7 @@
 use serde_json::Number;
 
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
 use crate::models::radarr_models::{
@@ -16,6 +14,7 @@ use crate::models::servarr_models::Language;
 use crate::models::stateful_table::SortOption;
 use crate::models::{BlockSelectionState, Scrollable};
 use crate::network::radarr_network::RadarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "movie_details_handler_tests.rs"]
@@ -136,6 +135,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
     MOVIE_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -245,13 +248,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
       | ActiveRadarrBlock::Cast
       | ActiveRadarrBlock::Crew
       | ActiveRadarrBlock::ManualSearch => match self.key {
-        _ if self.key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if matches_key!(left, self.key) => {
           self.app.data.radarr_data.movie_info_tabs.previous();
           self.app.pop_and_push_navigation_stack(
             self.app.data.radarr_data.movie_info_tabs.get_active_route(),
           );
         }
-        _ if self.key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if matches_key!(right, self.key) => {
           self.app.data.radarr_data.movie_info_tabs.next();
           self.app.pop_and_push_navigation_stack(
             self.app.data.radarr_data.movie_info_tabs.get_active_route(),
@@ -332,12 +335,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
       | ActiveRadarrBlock::Cast
       | ActiveRadarrBlock::Crew
       | ActiveRadarrBlock::ManualSearch => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.auto_search.key => {
+        _ if matches_key!(auto_search, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AutomaticallySearchMoviePrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if matches_key!(edit, key) => {
           self.app.push_navigation_stack(
             (
               ActiveRadarrBlock::EditMoviePrompt,
@@ -349,35 +352,33 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
           self.app.data.radarr_data.selected_block =
             BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS);
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::UpdateAndScanPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self
             .app
             .pop_and_push_navigation_stack(self.active_radarr_block.into());
         }
         _ => (),
       },
-      ActiveRadarrBlock::AutomaticallySearchMoviePrompt
-        if key == DEFAULT_KEYBINDINGS.confirm.key =>
-      {
+      ActiveRadarrBlock::AutomaticallySearchMoviePrompt if matches_key!(confirm, key) => {
         self.app.data.radarr_data.prompt_confirm = true;
         self.app.data.radarr_data.prompt_confirm_action =
           Some(RadarrEvent::TriggerAutomaticSearch(self.extract_movie_id()));
 
         self.app.pop_navigation_stack();
       }
-      ActiveRadarrBlock::UpdateAndScanPrompt if key == DEFAULT_KEYBINDINGS.confirm.key => {
+      ActiveRadarrBlock::UpdateAndScanPrompt if matches_key!(confirm, key) => {
         self.app.data.radarr_data.prompt_confirm = true;
         self.app.data.radarr_data.prompt_confirm_action =
           Some(RadarrEvent::UpdateAndScan(self.extract_movie_id()));
 
         self.app.pop_navigation_stack();
       }
-      ActiveRadarrBlock::ManualSearchConfirmPrompt if key == DEFAULT_KEYBINDINGS.confirm.key => {
+      ActiveRadarrBlock::ManualSearchConfirmPrompt if matches_key!(confirm, key) => {
         self.app.data.radarr_data.prompt_confirm = true;
         self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DownloadRelease(
           self.build_radarr_release_download_body(),
diff --git a/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs b/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
index c7332e6..2153748 100644
--- a/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
@@ -1042,6 +1042,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_movie_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = MovieDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[rstest]
   fn test_movie_details_handler_is_not_ready_when_loading(
     #[values(
diff --git a/src/handlers/radarr_handlers/mod.rs b/src/handlers/radarr_handlers/mod.rs
index 8ffbf29..e27237e 100644
--- a/src/handlers/radarr_handlers/mod.rs
+++ b/src/handlers/radarr_handlers/mod.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::handlers::radarr_handlers::blocklist::BlocklistHandler;
 use crate::handlers::radarr_handlers::collections::CollectionsHandler;
 use crate::handlers::radarr_handlers::downloads::DownloadsHandler;
@@ -8,7 +7,7 @@ use crate::handlers::radarr_handlers::root_folders::RootFoldersHandler;
 use crate::handlers::radarr_handlers::system::SystemHandler;
 use crate::handlers::KeyEventHandler;
 use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
-use crate::{App, Key};
+use crate::{matches_key, App, Key};
 
 mod blocklist;
 mod collections;
@@ -65,6 +64,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RadarrHandler<'a, 'b
     true
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -109,11 +112,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RadarrHandler<'a, 'b
 pub fn handle_change_tab_left_right_keys(app: &mut App<'_>, key: Key) {
   let key_ref = key;
   match key_ref {
-    _ if key == DEFAULT_KEYBINDINGS.left.key => {
+    _ if matches_key!(left, key, app.ignore_special_keys_for_textbox_input) => {
       app.data.radarr_data.main_tabs.previous();
       app.pop_and_push_navigation_stack(app.data.radarr_data.main_tabs.get_active_route());
     }
-    _ if key == DEFAULT_KEYBINDINGS.right.key => {
+    _ if matches_key!(right, key, app.ignore_special_keys_for_textbox_input) => {
       app.data.radarr_data.main_tabs.next();
       app.pop_and_push_navigation_stack(app.data.radarr_data.main_tabs.get_active_route());
     }
@@ -139,7 +142,7 @@ macro_rules! search_table {
     };
 
     $app.data.radarr_data.is_searching = false;
-    $app.should_ignore_quit_key = false;
+    $app.ignore_special_keys_for_textbox_input = false;
 
     if search_index.is_some() {
       $app.pop_navigation_stack();
@@ -166,7 +169,7 @@ macro_rules! search_table {
     };
 
     $app.data.radarr_data.is_searching = false;
-    $app.should_ignore_quit_key = false;
+    $app.ignore_special_keys_for_textbox_input = false;
 
     if search_index.is_some() {
       $app.pop_navigation_stack();
diff --git a/src/handlers/radarr_handlers/radarr_handler_test_utils.rs b/src/handlers/radarr_handlers/radarr_handler_test_utils.rs
index eee27ec..afd8ff6 100644
--- a/src/handlers/radarr_handlers/radarr_handler_test_utils.rs
+++ b/src/handlers/radarr_handlers/radarr_handler_test_utils.rs
@@ -275,7 +275,7 @@ pub(in crate::handlers::radarr_handlers) mod utils {
       audio_stream_count: 1,
       video_bit_depth: 10,
       video_bitrate: 0,
-      video_codec: "x265".to_owned(),
+      video_codec: Some("x265".to_owned()),
       video_fps: Number::from_f64(23.976).unwrap(),
       resolution: "1920x804".to_owned(),
       run_time: "2:00:00".to_owned(),
@@ -327,7 +327,7 @@ pub(in crate::handlers::radarr_handlers) mod utils {
       status: "Downloaded".to_owned(),
       overview: "Blah blah blah".to_owned(),
       path: "/nfs/movies".to_owned(),
-      studio: "21st Century Alex".to_owned(),
+      studio: Some("21st Century Alex".to_owned()),
       genres: genres(),
       year: 2023,
       monitored: true,
diff --git a/src/handlers/radarr_handlers/radarr_handler_tests.rs b/src/handlers/radarr_handlers/radarr_handler_tests.rs
index cd0dc42..9003ded 100644
--- a/src/handlers/radarr_handlers/radarr_handler_tests.rs
+++ b/src/handlers/radarr_handlers/radarr_handler_tests.rs
@@ -46,6 +46,76 @@ mod tests {
     assert_eq!(app.get_current_route(), right_block.into());
   }
 
+  #[rstest]
+  #[case(0, ActiveRadarrBlock::System, ActiveRadarrBlock::Collections)]
+  #[case(1, ActiveRadarrBlock::Movies, ActiveRadarrBlock::Downloads)]
+  #[case(2, ActiveRadarrBlock::Collections, ActiveRadarrBlock::Blocklist)]
+  #[case(3, ActiveRadarrBlock::Downloads, ActiveRadarrBlock::RootFolders)]
+  #[case(4, ActiveRadarrBlock::Blocklist, ActiveRadarrBlock::Indexers)]
+  #[case(5, ActiveRadarrBlock::RootFolders, ActiveRadarrBlock::System)]
+  #[case(6, ActiveRadarrBlock::Indexers, ActiveRadarrBlock::Movies)]
+  fn test_radarr_handler_change_tab_left_right_keys_alt_navigation(
+    #[case] index: usize,
+    #[case] left_block: ActiveRadarrBlock,
+    #[case] right_block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = false;
+    app.data.radarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.left.alt.unwrap());
+
+    assert_eq!(
+      app.data.radarr_data.main_tabs.get_active_route(),
+      left_block.into()
+    );
+    assert_eq!(app.get_current_route(), left_block.into());
+
+    app.data.radarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.right.alt.unwrap());
+
+    assert_eq!(
+      app.data.radarr_data.main_tabs.get_active_route(),
+      right_block.into()
+    );
+    assert_eq!(app.get_current_route(), right_block.into());
+  }
+
+  #[rstest]
+  #[case(0, ActiveRadarrBlock::Movies)]
+  #[case(1, ActiveRadarrBlock::Collections)]
+  #[case(2, ActiveRadarrBlock::Downloads)]
+  #[case(3, ActiveRadarrBlock::Blocklist)]
+  #[case(4, ActiveRadarrBlock::RootFolders)]
+  #[case(5, ActiveRadarrBlock::Indexers)]
+  #[case(6, ActiveRadarrBlock::System)]
+  fn test_radarr_handler_change_tab_left_right_keys_alt_navigation_no_op_when_ignoring_quit_key(
+    #[case] index: usize,
+    #[case] block: ActiveRadarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = true;
+    app.push_navigation_stack(block.into());
+    app.data.radarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.left.alt.unwrap());
+
+    assert_eq!(
+      app.data.radarr_data.main_tabs.get_active_route(),
+      block.into()
+    );
+    assert_eq!(app.get_current_route(), block.into());
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.right.alt.unwrap());
+
+    assert_eq!(
+      app.data.radarr_data.main_tabs.get_active_route(),
+      block.into()
+    );
+    assert_eq!(app.get_current_route(), block.into());
+  }
+
   #[rstest]
   fn test_delegates_system_blocks_to_system_handler(
     #[values(
@@ -217,6 +287,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_radarr_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = RadarrHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::Movies,
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_radarr_handler_is_ready() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/root_folders/mod.rs b/src/handlers/radarr_handlers/root_folders/mod.rs
index feb6879..88c028b 100644
--- a/src/handlers/radarr_handlers/root_folders/mod.rs
+++ b/src/handlers/radarr_handlers/root_folders/mod.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
@@ -8,7 +7,9 @@ use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_F
 use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
 use crate::models::HorizontallyScrollableText;
 use crate::network::radarr_network::RadarrEvent;
-use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{
+  handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
+};
 
 #[cfg(test)]
 #[path = "root_folders_handler_tests.rs"]
@@ -68,6 +69,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
     ROOT_FOLDERS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -168,7 +173,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
           self.build_add_root_folder_body(),
         ));
         self.app.data.radarr_data.prompt_confirm = true;
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
         self.app.pop_navigation_stack();
       }
       _ => (),
@@ -181,7 +186,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
         self.app.pop_navigation_stack();
         self.app.data.radarr_data.edit_root_folder = None;
         self.app.data.radarr_data.prompt_confirm = false;
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveRadarrBlock::DeleteRootFolderPrompt => {
         self.app.pop_navigation_stack();
@@ -195,15 +200,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::RootFolders => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.add.key => {
+        _ if matches_key!(add, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
           self.app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
-          self.app.should_ignore_quit_key = true;
+          self.app.ignore_special_keys_for_textbox_input = true;
         }
         _ => (),
       },
@@ -215,7 +220,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
         )
       }
       ActiveRadarrBlock::DeleteRootFolderPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
             Some(RadarrEvent::DeleteRootFolder(self.extract_root_folder_id()));
diff --git a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
index 3cf7d98..632550a 100644
--- a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
+++ b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -262,7 +263,7 @@ mod tests {
         .set_items(vec![RootFolder::default()]);
       app.data.radarr_data.edit_root_folder = Some("Test".into());
       app.data.radarr_data.prompt_confirm = true;
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
 
@@ -275,7 +276,7 @@ mod tests {
       .handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::AddRootFolder(expected_add_root_folder_body))
@@ -291,7 +292,7 @@ mod tests {
       let mut app = App::test_default();
       app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
       app.data.radarr_data.prompt_confirm = false;
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
 
@@ -304,7 +305,7 @@ mod tests {
       .handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.prompt_confirm_action.is_none());
       assert_eq!(
         app.get_current_route(),
@@ -406,7 +407,7 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
       app.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       RootFoldersHandler::new(
         ESC_KEY,
@@ -423,7 +424,7 @@ mod tests {
 
       assert!(app.data.radarr_data.edit_root_folder.is_none());
       assert!(!app.data.radarr_data.prompt_confirm);
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
     }
 
     #[rstest]
@@ -472,7 +473,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::AddRootFolderPrompt.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.edit_root_folder.is_some());
     }
 
@@ -499,7 +500,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::RootFolders.into()
       );
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.edit_root_folder.is_none());
     }
 
@@ -589,7 +590,7 @@ mod tests {
       app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
 
       RootFoldersHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::AddRootFolderPrompt,
         None,
@@ -598,7 +599,7 @@ mod tests {
 
       assert_str_eq!(
         app.data.radarr_data.edit_root_folder.as_ref().unwrap().text,
-        "h"
+        "a"
       );
     }
 
@@ -644,6 +645,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_root_folders_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = RootFoldersHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_add_root_folder_body() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/system/mod.rs b/src/handlers/radarr_handlers/system/mod.rs
index 7652b36..0a194b5 100644
--- a/src/handlers/radarr_handlers/system/mod.rs
+++ b/src/handlers/radarr_handlers/system/mod.rs
@@ -1,9 +1,9 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::radarr_handlers::system::system_details_handler::SystemDetailsHandler;
 use crate::handlers::{handle_clear_errors, KeyEventHandler};
+use crate::matches_key;
 use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
 use crate::models::Scrollable;
 
@@ -35,6 +35,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemHandler<'a, 'b
     SystemDetailsHandler::accepts(active_block) || active_block == ActiveRadarrBlock::System
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -86,15 +90,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemHandler<'a, 'b
     if self.active_radarr_block == ActiveRadarrBlock::System {
       let key = self.key;
       match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.events.key => {
+        _ if matches_key!(events, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SystemQueuedEvents.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.logs.key => {
+        _ if matches_key!(logs, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SystemLogs.into());
@@ -106,12 +110,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemHandler<'a, 'b
             .set_items(self.app.data.radarr_data.logs.items.to_vec());
           self.app.data.radarr_data.log_details.scroll_to_bottom();
         }
-        _ if key == DEFAULT_KEYBINDINGS.tasks.key => {
+        _ if matches_key!(tasks, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SystemUpdates.into());
diff --git a/src/handlers/radarr_handlers/system/system_details_handler.rs b/src/handlers/radarr_handlers/system/system_details_handler.rs
index eaadb68..354fd08 100644
--- a/src/handlers/radarr_handlers/system/system_details_handler.rs
+++ b/src/handlers/radarr_handlers/system/system_details_handler.rs
@@ -1,7 +1,7 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
+use crate::matches_key;
 use crate::models::radarr_models::RadarrTaskName;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
 use crate::models::stateful_list::StatefulList;
@@ -36,6 +36,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler
     SYSTEM_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -114,7 +118,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler
 
     match self.active_radarr_block {
       ActiveRadarrBlock::SystemLogs => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if matches_key!(left, key) => {
           self
             .app
             .data
@@ -124,7 +128,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler
             .iter()
             .for_each(|log| log.scroll_right());
         }
-        _ if key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if matches_key!(right, key) => {
           self
             .app
             .data
@@ -178,14 +182,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler
   }
 
   fn handle_char_key_event(&mut self) {
-    if SYSTEM_DETAILS_BLOCKS.contains(&self.active_radarr_block)
-      && self.key == DEFAULT_KEYBINDINGS.refresh.key
+    if SYSTEM_DETAILS_BLOCKS.contains(&self.active_radarr_block) && matches_key!(refresh, self.key)
     {
       self.app.should_refresh = true;
     }
 
     if self.active_radarr_block == ActiveRadarrBlock::SystemTaskStartConfirmPrompt
-      && self.key == DEFAULT_KEYBINDINGS.confirm.key
+      && matches_key!(confirm, self.key)
     {
       self.app.data.radarr_data.prompt_confirm = true;
       self.app.data.radarr_data.prompt_confirm_action =
diff --git a/src/handlers/radarr_handlers/system/system_details_handler_tests.rs b/src/handlers/radarr_handlers/system/system_details_handler_tests.rs
index 7765670..bb9f098 100644
--- a/src/handlers/radarr_handlers/system/system_details_handler_tests.rs
+++ b/src/handlers/radarr_handlers/system/system_details_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -938,6 +939,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_system_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SystemDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_task_name() {
     let mut app = App::test_default();
diff --git a/src/handlers/radarr_handlers/system/system_handler_tests.rs b/src/handlers/radarr_handlers/system/system_handler_tests.rs
index 3a5be26..e59148d 100644
--- a/src/handlers/radarr_handlers/system/system_handler_tests.rs
+++ b/src/handlers/radarr_handlers/system/system_handler_tests.rs
@@ -450,6 +450,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_system_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SystemHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_system_handler_is_not_ready_when_loading() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs b/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
index da345db..81d2c5b 100644
--- a/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
@@ -4,6 +4,7 @@ mod tests {
 
   use chrono::DateTime;
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -513,6 +514,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_blocklist_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = BlocklistHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_blocklist_item_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/blocklist/mod.rs b/src/handlers/sonarr_handlers/blocklist/mod.rs
index ce4d07d..d891396 100644
--- a/src/handlers/sonarr_handlers/blocklist/mod.rs
+++ b/src/handlers/sonarr_handlers/blocklist/mod.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
@@ -9,6 +7,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, BLOCKL
 use crate::models::sonarr_models::BlocklistItem;
 use crate::models::stateful_table::SortOption;
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "blocklist_handler_tests.rs"]
@@ -51,6 +50,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
     BLOCKLIST_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -143,10 +146,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
     let key = self.key;
     match self.active_sonarr_block {
       ActiveSonarrBlock::Blocklist => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.clear.key => {
+        _ if matches_key!(clear, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::BlocklistClearAllItemsPrompt.into());
@@ -154,7 +157,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
         _ => (),
       },
       ActiveSonarrBlock::DeleteBlocklistItemPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::DeleteBlocklistItem(
             self.extract_blocklist_item_id(),
@@ -164,7 +167,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
         }
       }
       ActiveSonarrBlock::BlocklistClearAllItemsPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::ClearBlocklist);
 
diff --git a/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs b/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
index 06331bf..441a347 100644
--- a/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -389,6 +390,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_downloads_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = DownloadsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_download_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/downloads/mod.rs b/src/handlers/sonarr_handlers/downloads/mod.rs
index b7a3c46..d6adab0 100644
--- a/src/handlers/sonarr_handlers/downloads/mod.rs
+++ b/src/handlers/sonarr_handlers/downloads/mod.rs
@@ -1,13 +1,12 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DOWNLOADS_BLOCKS};
 use crate::models::sonarr_models::DownloadRecord;
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "downloads_handler_tests.rs"]
@@ -47,6 +46,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a,
     DOWNLOADS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -130,18 +133,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a,
     let key = self.key;
     match self.active_sonarr_block {
       ActiveSonarrBlock::Downloads => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::UpdateDownloadsPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
         _ => (),
       },
       ActiveSonarrBlock::DeleteDownloadPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action =
             Some(SonarrEvent::DeleteDownload(self.extract_download_id()));
@@ -150,7 +153,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a,
         }
       }
       ActiveSonarrBlock::UpdateDownloadsPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::UpdateDownloads);
 
diff --git a/src/handlers/sonarr_handlers/history/history_handler_tests.rs b/src/handlers/sonarr_handlers/history/history_handler_tests.rs
index 3eff736..9b860cc 100644
--- a/src/handlers/sonarr_handlers/history/history_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/history/history_handler_tests.rs
@@ -4,6 +4,7 @@ mod tests {
 
   use chrono::DateTime;
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -306,6 +307,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_history_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = HistoryHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_history_handler_not_ready_when_loading() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/history/mod.rs b/src/handlers/sonarr_handlers/history/mod.rs
index 2a11ee7..cf422d0 100644
--- a/src/handlers/sonarr_handlers/history/mod.rs
+++ b/src/handlers/sonarr_handlers/history/mod.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_clear_errors, KeyEventHandler};
@@ -9,6 +7,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, HISTOR
 use crate::models::servarr_models::Language;
 use crate::models::sonarr_models::SonarrHistoryItem;
 use crate::models::stateful_table::SortOption;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "history_handler_tests.rs"]
@@ -52,6 +51,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, '
     HISTORY_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -110,7 +113,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, '
     let key = self.key;
     if self.active_sonarr_block == ActiveSonarrBlock::History {
       match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
         _ => (),
diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs
index 485a4e2..68cd44c 100644
--- a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs
+++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -6,7 +5,9 @@ use crate::models::servarr_data::modals::EditIndexerModal;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::models::servarr_models::EditIndexerParams;
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{
+  handle_prompt_left_right_keys, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
+};
 
 #[cfg(test)]
 #[path = "edit_indexer_handler_tests.rs"]
@@ -64,6 +65,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<'
     EDIT_INDEXER_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -355,7 +360,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<'
           | ActiveSonarrBlock::EditIndexerSeedRatioInput
           | ActiveSonarrBlock::EditIndexerTagsInput => {
             self.app.push_navigation_stack(selected_block.into());
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveSonarrBlock::EditIndexerPriorityInput => self
             .app
@@ -401,7 +406,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<'
       | ActiveSonarrBlock::EditIndexerSeedRatioInput
       | ActiveSonarrBlock::EditIndexerTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveSonarrBlock::EditIndexerPriorityInput => self.app.pop_navigation_stack(),
       _ => (),
@@ -422,7 +427,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<'
       | ActiveSonarrBlock::EditIndexerPriorityInput
       | ActiveSonarrBlock::EditIndexerTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => self.app.pop_navigation_stack(),
     }
@@ -503,7 +508,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<'
       ActiveSonarrBlock::EditIndexerPrompt => {
         if self.app.data.sonarr_data.selected_block.get_active_block()
           == ActiveSonarrBlock::EditIndexerConfirmPrompt
-          && self.key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, self.key)
         {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action =
diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
index 22719ff..87468d0 100644
--- a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
@@ -10,6 +10,7 @@ mod tests {
   use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EDIT_INDEXER_BLOCKS};
   use crate::models::servarr_models::EditIndexerParams;
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   mod test_handle_scroll_up_and_down {
@@ -1002,7 +1003,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), block.into());
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -1027,7 +1028,7 @@ mod tests {
         app.get_current_route(),
         ActiveSonarrBlock::EditIndexerPriorityInput.into()
       );
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -1193,7 +1194,7 @@ mod tests {
     fn test_edit_indexer_name_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
         ..EditIndexerModal::default()
@@ -1209,7 +1210,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -1229,7 +1230,7 @@ mod tests {
     fn test_edit_indexer_url_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
         ..EditIndexerModal::default()
@@ -1245,7 +1246,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -1265,7 +1266,7 @@ mod tests {
     fn test_edit_indexer_api_key_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
         ..EditIndexerModal::default()
@@ -1281,7 +1282,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -1301,7 +1302,7 @@ mod tests {
     fn test_edit_indexer_seed_ratio_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
         ..EditIndexerModal::default()
@@ -1317,7 +1318,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -1337,7 +1338,7 @@ mod tests {
     fn test_edit_indexer_tags_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
         ..EditIndexerModal::default()
@@ -1353,7 +1354,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -1417,12 +1418,12 @@ mod tests {
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(active_sonarr_block.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       EditIndexerHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
 
       assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.sonarr_data.edit_indexer_modal,
         Some(EditIndexerModal::default())
@@ -1597,7 +1598,7 @@ mod tests {
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditIndexerNameInput,
         None,
@@ -1613,7 +1614,7 @@ mod tests {
           .unwrap()
           .name
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1624,7 +1625,7 @@ mod tests {
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditIndexerUrlInput,
         None,
@@ -1640,7 +1641,7 @@ mod tests {
           .unwrap()
           .url
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1651,7 +1652,7 @@ mod tests {
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditIndexerApiKeyInput,
         None,
@@ -1667,7 +1668,7 @@ mod tests {
           .unwrap()
           .api_key
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1678,7 +1679,7 @@ mod tests {
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditIndexerSeedRatioInput,
         None,
@@ -1694,7 +1695,7 @@ mod tests {
           .unwrap()
           .seed_ratio
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1705,7 +1706,7 @@ mod tests {
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
       EditIndexerHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditIndexerTagsInput,
         None,
@@ -1721,7 +1722,7 @@ mod tests {
           .unwrap()
           .tags
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1793,6 +1794,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_edit_indexer_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = EditIndexerHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_indexer_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs
index 4e1a45a..039f35f 100644
--- a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs
+++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs
@@ -1,13 +1,12 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_prompt_left_right_keys;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
 use crate::models::servarr_data::sonarr::sonarr_data::{
   ActiveSonarrBlock, INDEXER_SETTINGS_BLOCKS,
 };
 use crate::models::sonarr_models::IndexerSettings;
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_prompt_left_right_keys, matches_key};
 
 #[cfg(test)]
 #[path = "edit_indexer_settings_handler_tests.rs"]
@@ -37,6 +36,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexerSettingsHandl
     INDEXER_SETTINGS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -183,7 +186,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexerSettingsHandl
     if self.active_sonarr_block == ActiveSonarrBlock::AllIndexerSettingsPrompt
       && self.app.data.sonarr_data.selected_block.get_active_block()
         == ActiveSonarrBlock::IndexerSettingsConfirmPrompt
-      && self.key == DEFAULT_KEYBINDINGS.confirm.key
+      && matches_key!(confirm, self.key)
     {
       self.app.data.sonarr_data.prompt_confirm = true;
       self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::EditAllIndexerSettings(
diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
index 23446d8..f49a86a 100644
--- a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -521,6 +522,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_indexer_settings_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = IndexerSettingsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_indexer_settings_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
index b059315..5d218b3 100644
--- a/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
@@ -643,6 +643,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_indexers_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = IndexersHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_indexer_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/indexers/mod.rs b/src/handlers/sonarr_handlers/indexers/mod.rs
index 261ca3a..2dae7d9 100644
--- a/src/handlers/sonarr_handlers/indexers/mod.rs
+++ b/src/handlers/sonarr_handlers/indexers/mod.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::sonarr_handlers::indexers::edit_indexer_handler::EditIndexerHandler;
 use crate::handlers::sonarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
@@ -15,6 +13,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
 use crate::models::servarr_models::Indexer;
 use crate::models::BlockSelectionState;
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_table_events, matches_key};
 
 mod edit_indexer_handler;
 mod edit_indexer_settings_handler;
@@ -70,6 +69,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a,
       || INDEXERS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -168,20 +171,20 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a,
     let key = self.key;
     match self.active_sonarr_block {
       ActiveSonarrBlock::Indexers => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.test.key => {
+        _ if matches_key!(test, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::TestIndexer.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.test_all.key => {
+        _ if matches_key!(test_all, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::TestAllIndexers.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.settings.key => {
+        _ if matches_key!(settings, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
@@ -191,7 +194,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a,
         _ => (),
       },
       ActiveSonarrBlock::DeleteIndexerPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action =
             Some(SonarrEvent::DeleteIndexer(self.extract_indexer_id()));
diff --git a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs
index 96de3ca..de4bad1 100644
--- a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs
+++ b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs
@@ -48,6 +48,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for TestAllIndexersHandl
     active_block == ActiveSonarrBlock::TestAllIndexers
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
diff --git a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
index b52d39d..0764f16 100644
--- a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
@@ -7,6 +7,7 @@ mod tests {
   use crate::models::servarr_data::modals::IndexerTestResultModalItem;
   use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
   use crate::models::stateful_table::StatefulTable;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   mod test_handle_esc {
@@ -48,6 +49,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_test_all_indexers_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = TestAllIndexersHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_loading() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/library/add_series_handler.rs b/src/handlers/sonarr_handlers/library/add_series_handler.rs
index b50ab9d..304d3a6 100644
--- a/src/handlers/sonarr_handlers/library/add_series_handler.rs
+++ b/src/handlers/sonarr_handlers/library/add_series_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
 use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
@@ -9,7 +8,9 @@ use crate::models::sonarr_models::{AddSeriesBody, AddSeriesOptions, AddSeriesSea
 use crate::models::stateful_table::StatefulTable;
 use crate::models::{BlockSelectionState, Scrollable};
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
+use crate::{
+  handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, matches_key, App, Key,
+};
 
 #[cfg(test)]
 #[path = "add_series_handler_tests.rs"]
@@ -126,6 +127,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
     ADD_SERIES_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -440,7 +445,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
         self
           .app
           .push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into());
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ if self.active_sonarr_block == ActiveSonarrBlock::AddSeriesSearchResults
         && self.app.data.sonarr_data.add_searched_series.is_some() =>
@@ -509,7 +514,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
                 .get_active_block()
                 .into(),
             );
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveSonarrBlock::AddSeriesToggleUseSeasonFolder => {
             self
@@ -538,7 +543,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
       | ActiveSonarrBlock::AddSeriesSelectRootFolder => self.app.pop_navigation_stack(),
       ActiveSonarrBlock::AddSeriesTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -549,13 +554,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
       ActiveSonarrBlock::AddSeriesSearchInput => {
         self.app.pop_navigation_stack();
         self.app.data.sonarr_data.add_series_search = None;
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveSonarrBlock::AddSeriesSearchResults
       | ActiveSonarrBlock::AddSeriesEmptySearchResults => {
         self.app.pop_navigation_stack();
         self.app.data.sonarr_data.add_searched_series = None;
-        self.app.should_ignore_quit_key = true;
+        self.app.ignore_special_keys_for_textbox_input = true;
       }
       ActiveSonarrBlock::AddSeriesPrompt => {
         self.app.pop_navigation_stack();
@@ -570,7 +575,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
       | ActiveSonarrBlock::AddSeriesSelectRootFolder => self.app.pop_navigation_stack(),
       ActiveSonarrBlock::AddSeriesTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -609,7 +614,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
       ActiveSonarrBlock::AddSeriesPrompt => {
         if self.app.data.sonarr_data.selected_block.get_active_block()
           == ActiveSonarrBlock::AddSeriesConfirmPrompt
-          && key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, key)
         {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action =
diff --git a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
index 4919e5c..db9740b 100644
--- a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
@@ -2,6 +2,7 @@
 mod tests {
   use bimap::BiMap;
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -912,7 +913,7 @@ mod tests {
     fn test_add_series_search_input_submit() {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.add_series_search = Some("test".into());
 
       AddSeriesHandler::new(
@@ -923,7 +924,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveSonarrBlock::AddSeriesSearchResults.into()
@@ -936,7 +937,7 @@ mod tests {
       app.data.sonarr_data.add_series_search = Some(HorizontallyScrollableText::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       AddSeriesHandler::new(
         SUBMIT_KEY,
@@ -946,7 +947,7 @@ mod tests {
       )
       .handle();
 
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveSonarrBlock::AddSeriesSearchInput.into()
@@ -1230,7 +1231,7 @@ mod tests {
       assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
 
       if selected_block == ActiveSonarrBlock::AddSeriesTagsInput {
-        assert!(app.should_ignore_quit_key);
+        assert!(app.ignore_special_keys_for_textbox_input);
       }
     }
 
@@ -1259,7 +1260,7 @@ mod tests {
       );
 
       if active_sonarr_block == ActiveSonarrBlock::AddSeriesTagsInput {
-        assert!(!app.should_ignore_quit_key);
+        assert!(!app.ignore_special_keys_for_textbox_input);
       }
     }
 
@@ -1336,7 +1337,7 @@ mod tests {
       let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data = create_test_sonarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into());
 
@@ -1348,7 +1349,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
       assert_eq!(app.data.sonarr_data.add_series_search, None);
     }
@@ -1357,7 +1358,7 @@ mod tests {
     fn test_add_series_input_esc() {
       let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesTagsInput.into());
@@ -1370,7 +1371,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveSonarrBlock::AddSeriesPrompt.into()
@@ -1403,7 +1404,7 @@ mod tests {
         ActiveSonarrBlock::AddSeriesSearchInput.into()
       );
       assert!(app.data.sonarr_data.add_searched_series.is_none());
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
     }
 
     #[test]
@@ -1451,7 +1452,7 @@ mod tests {
     fn test_add_series_tags_input_esc() {
       let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesTagsInput.into());
@@ -1464,7 +1465,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveSonarrBlock::AddSeriesPrompt.into()
@@ -1570,7 +1571,7 @@ mod tests {
       app.data.sonarr_data.add_series_search = Some(HorizontallyScrollableText::default());
 
       AddSeriesHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::AddSeriesSearchInput,
         None,
@@ -1585,7 +1586,7 @@ mod tests {
           .as_ref()
           .unwrap()
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1596,7 +1597,7 @@ mod tests {
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
 
       AddSeriesHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::AddSeriesTagsInput,
         None,
@@ -1612,7 +1613,7 @@ mod tests {
           .unwrap()
           .tags
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1714,6 +1715,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_add_series_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = AddSeriesHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_add_series_search_no_panic_on_none_search_result() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/library/delete_series_handler.rs b/src/handlers/sonarr_handlers/library/delete_series_handler.rs
index e12f385..c98d262 100644
--- a/src/handlers/sonarr_handlers/library/delete_series_handler.rs
+++ b/src/handlers/sonarr_handlers/library/delete_series_handler.rs
@@ -1,9 +1,10 @@
 use crate::models::sonarr_models::DeleteSeriesParams;
 use crate::network::sonarr_network::SonarrEvent;
 use crate::{
-  app::{key_binding::DEFAULT_KEYBINDINGS, App},
+  app::App,
   event::Key,
   handlers::{handle_prompt_toggle, KeyEventHandler},
+  matches_key,
   models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DELETE_SERIES_BLOCKS},
 };
 
@@ -38,6 +39,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler<
     DELETE_SERIES_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -123,7 +128,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler<
     if self.active_sonarr_block == ActiveSonarrBlock::DeleteSeriesPrompt
       && self.app.data.sonarr_data.selected_block.get_active_block()
         == ActiveSonarrBlock::DeleteSeriesConfirmPrompt
-      && self.key == DEFAULT_KEYBINDINGS.confirm.key
+      && matches_key!(confirm, self.key)
     {
       self.app.data.sonarr_data.prompt_confirm = true;
       self.app.data.sonarr_data.prompt_confirm_action =
diff --git a/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
index cecdcbe..4c85ec7 100644
--- a/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -320,6 +321,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_delete_series_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = DeleteSeriesHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_delete_series_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/library/edit_series_handler.rs b/src/handlers/sonarr_handlers/library/edit_series_handler.rs
index c8047e5..fa72b4d 100644
--- a/src/handlers/sonarr_handlers/library/edit_series_handler.rs
+++ b/src/handlers/sonarr_handlers/library/edit_series_handler.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -7,7 +6,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EDIT_S
 use crate::models::sonarr_models::EditSeriesParams;
 use crate::models::Scrollable;
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{handle_text_box_keys, handle_text_box_left_right_keys, matches_key};
 
 #[cfg(test)]
 #[path = "edit_series_handler_tests.rs"]
@@ -83,6 +82,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a
     EDIT_SERIES_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -342,7 +345,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a
               )
                 .into(),
             );
-            self.app.should_ignore_quit_key = true;
+            self.app.ignore_special_keys_for_textbox_input = true;
           }
           ActiveSonarrBlock::EditSeriesToggleMonitored => {
             self
@@ -392,7 +395,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a
       | ActiveSonarrBlock::EditSeriesSelectLanguageProfile => self.app.pop_navigation_stack(),
       ActiveSonarrBlock::EditSeriesPathInput | ActiveSonarrBlock::EditSeriesTagsInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       _ => (),
     }
@@ -402,7 +405,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a
     match self.active_sonarr_block {
       ActiveSonarrBlock::EditSeriesTagsInput | ActiveSonarrBlock::EditSeriesPathInput => {
         self.app.pop_navigation_stack();
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveSonarrBlock::EditSeriesPrompt => {
         self.app.pop_navigation_stack();
@@ -450,7 +453,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a
       ActiveSonarrBlock::EditSeriesPrompt => {
         if self.app.data.sonarr_data.selected_block.get_active_block()
           == ActiveSonarrBlock::EditSeriesConfirmPrompt
-          && key == DEFAULT_KEYBINDINGS.confirm.key
+          && matches_key!(confirm, key)
         {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action =
diff --git a/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
index 6633c55..7bb05a1 100644
--- a/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
@@ -2,6 +2,7 @@
 mod tests {
   use bimap::BiMap;
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -677,7 +678,7 @@ mod tests {
     #[test]
     fn test_edit_series_path_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         path: "Test Path".into(),
         ..EditSeriesModal::default()
@@ -694,7 +695,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -713,7 +714,7 @@ mod tests {
     #[test]
     fn test_edit_series_tags_input_submit() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         tags: "Test Tags".into(),
         ..EditSeriesModal::default()
@@ -730,7 +731,7 @@ mod tests {
       )
       .handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(!app
         .data
         .sonarr_data
@@ -1010,7 +1011,7 @@ mod tests {
       if selected_block == ActiveSonarrBlock::EditSeriesPathInput
         || selected_block == ActiveSonarrBlock::EditSeriesTagsInput
       {
-        assert!(app.should_ignore_quit_key);
+        assert!(app.ignore_special_keys_for_textbox_input);
       }
     }
 
@@ -1049,7 +1050,7 @@ mod tests {
           .into()
       );
       assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
     }
 
     #[rstest]
@@ -1085,7 +1086,7 @@ mod tests {
       if active_sonarr_block == ActiveSonarrBlock::EditSeriesPathInput
         || active_sonarr_block == ActiveSonarrBlock::EditSeriesTagsInput
       {
-        assert!(!app.should_ignore_quit_key);
+        assert!(!app.ignore_special_keys_for_textbox_input);
       }
     }
   }
@@ -1111,14 +1112,14 @@ mod tests {
     ) {
       let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into());
       app.push_navigation_stack(active_sonarr_block.into());
 
       EditSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.get_current_route(),
         ActiveSonarrBlock::EditSeriesPrompt.into()
@@ -1243,7 +1244,7 @@ mod tests {
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
 
       EditSeriesHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditSeriesPathInput,
         None,
@@ -1259,7 +1260,7 @@ mod tests {
           .unwrap()
           .path
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1270,7 +1271,7 @@ mod tests {
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
 
       EditSeriesHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::EditSeriesTagsInput,
         None,
@@ -1286,7 +1287,7 @@ mod tests {
           .unwrap()
           .tags
           .text,
-        "h"
+        "a"
       );
     }
 
@@ -1368,6 +1369,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_edit_series_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = EditSeriesHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_build_edit_series_params() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/library/episode_details_handler.rs b/src/handlers/sonarr_handlers/library/episode_details_handler.rs
index 36370aa..037c97a 100644
--- a/src/handlers/sonarr_handlers/library/episode_details_handler.rs
+++ b/src/handlers/sonarr_handlers/library/episode_details_handler.rs
@@ -1,13 +1,12 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::library::season_details_handler::releases_sorting_options;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EPISODE_DETAILS_BLOCKS};
 use crate::models::sonarr_models::{SonarrHistoryItem, SonarrRelease, SonarrReleaseDownloadBody};
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "episode_details_handler_tests.rs"]
@@ -88,6 +87,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
     EPISODE_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -142,7 +145,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
       | ActiveSonarrBlock::EpisodeHistory
       | ActiveSonarrBlock::EpisodeFile
       | ActiveSonarrBlock::ManualEpisodeSearch => match self.key {
-        _ if self.key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if matches_key!(left, self.key) => {
           self
             .app
             .data
@@ -170,7 +173,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
               .get_active_route(),
           );
         }
-        _ if self.key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if matches_key!(right, self.key) => {
           self
             .app
             .data
@@ -306,21 +309,19 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
       | ActiveSonarrBlock::EpisodeHistory
       | ActiveSonarrBlock::EpisodeFile
       | ActiveSonarrBlock::ManualEpisodeSearch => match self.key {
-        _ if self.key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, self.key) => {
           self
             .app
             .pop_and_push_navigation_stack(self.active_sonarr_block.into());
         }
-        _ if self.key == DEFAULT_KEYBINDINGS.auto_search.key => {
+        _ if matches_key!(auto_search, self.key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AutomaticallySearchEpisodePrompt.into());
         }
         _ => (),
       },
-      ActiveSonarrBlock::AutomaticallySearchEpisodePrompt
-        if key == DEFAULT_KEYBINDINGS.confirm.key =>
-      {
+      ActiveSonarrBlock::AutomaticallySearchEpisodePrompt if matches_key!(confirm, key) => {
         self.app.data.sonarr_data.prompt_confirm = true;
         self.app.data.sonarr_data.prompt_confirm_action = Some(
           SonarrEvent::TriggerAutomaticEpisodeSearch(self.extract_episode_id()),
@@ -328,9 +329,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
 
         self.app.pop_navigation_stack();
       }
-      ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt
-        if key == DEFAULT_KEYBINDINGS.confirm.key =>
-      {
+      ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt if matches_key!(confirm, key) => {
         if self.app.data.sonarr_data.prompt_confirm {
           let SonarrRelease {
             guid, indexer_id, ..
diff --git a/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
index ffe2761..c8bba29 100644
--- a/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
@@ -625,6 +625,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_episode_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = EpisodeDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_episode_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/library/library_handler_tests.rs b/src/handlers/sonarr_handlers/library/library_handler_tests.rs
index 8466193..d09fd6a 100644
--- a/src/handlers/sonarr_handlers/library/library_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/library_handler_tests.rs
@@ -9,12 +9,13 @@ mod tests {
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::sonarr_handlers::library::{series_sorting_options, LibraryHandler};
+  use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::series;
   use crate::handlers::KeyEventHandler;
   use crate::models::servarr_data::sonarr::sonarr_data::{
     ActiveSonarrBlock, ADD_SERIES_BLOCKS, DELETE_SERIES_BLOCKS, EDIT_SERIES_BLOCKS,
     EPISODE_DETAILS_BLOCKS, LIBRARY_BLOCKS, SEASON_DETAILS_BLOCKS, SERIES_DETAILS_BLOCKS,
   };
-  use crate::models::sonarr_models::{Series, SeriesStatus, SeriesType};
+  use crate::models::sonarr_models::{Series, SeriesStatistics, SeriesStatus, SeriesType};
   use crate::test_handler_delegation;
 
   mod test_handle_delete {
@@ -316,7 +317,7 @@ mod tests {
         app.get_current_route(),
         ActiveSonarrBlock::AddSeriesSearchInput.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.sonarr_data.add_series_search.is_some());
     }
 
@@ -340,7 +341,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(app.data.sonarr_data.add_series_search.is_none());
     }
 
@@ -376,6 +377,51 @@ mod tests {
       assert!(app.data.sonarr_data.edit_series_modal.is_none());
     }
 
+    #[test]
+    fn test_toggle_monitoring_key() {
+      let mut app = App::test_default();
+      app.data.sonarr_data = create_test_sonarr_data();
+      app.push_navigation_stack(ActiveSonarrBlock::Series.into());
+      app.is_routing = false;
+
+      LibraryHandler::new(
+        DEFAULT_KEYBINDINGS.toggle_monitoring.key,
+        &mut app,
+        ActiveSonarrBlock::Series,
+        None,
+      )
+      .handle();
+
+      assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
+      assert!(app.data.sonarr_data.prompt_confirm);
+      assert!(app.is_routing);
+      assert_eq!(
+        app.data.sonarr_data.prompt_confirm_action,
+        Some(SonarrEvent::ToggleSeriesMonitoring(0))
+      );
+    }
+
+    #[test]
+    fn test_toggle_monitoring_key_no_op_when_not_ready() {
+      let mut app = App::test_default();
+      app.is_loading = true;
+      app.push_navigation_stack(ActiveSonarrBlock::Series.into());
+      app.is_routing = false;
+
+      LibraryHandler::new(
+        DEFAULT_KEYBINDINGS.toggle_monitoring.key,
+        &mut app,
+        ActiveSonarrBlock::Series,
+        None,
+      )
+      .handle();
+
+      assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
+      assert!(!app.data.sonarr_data.prompt_confirm);
+      assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
+      assert!(!app.is_routing);
+    }
+
     #[test]
     fn test_update_all_series_key() {
       let mut app = App::test_default();
@@ -618,6 +664,22 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_extract_series_id() {
+    let mut app = App::test_default();
+    app.data.sonarr_data.series.set_items(vec![series()]);
+
+    let series_id = LibraryHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::Series,
+      None,
+    )
+    .extract_series_id();
+
+    assert_eq!(series_id, 1);
+  }
+
   #[test]
   fn test_series_sorting_options_title() {
     let expected_cmp_fn: fn(&Series, &Series) -> Ordering = |a, b| {
@@ -764,13 +826,32 @@ mod tests {
     assert_str_eq!(sort_option.name, "Language");
   }
 
+  #[test]
+  fn test_series_sorting_options_size() {
+    let expected_cmp_fn: fn(&Series, &Series) -> Ordering = |a, b| {
+      a.statistics
+        .as_ref()
+        .map_or(0, |stats| stats.size_on_disk)
+        .cmp(&b.statistics.as_ref().map_or(0, |stats| stats.size_on_disk))
+    };
+    let mut expected_series_vec = series_vec();
+    expected_series_vec.sort_by(expected_cmp_fn);
+
+    let sort_option = series_sorting_options()[8].clone();
+    let mut sorted_series_vec = series_vec();
+    sorted_series_vec.sort_by(sort_option.cmp_fn.unwrap());
+
+    assert_eq!(sorted_series_vec, expected_series_vec);
+    assert_str_eq!(sort_option.name, "Size");
+  }
+
   #[test]
   fn test_series_sorting_options_monitored() {
     let expected_cmp_fn: fn(&Series, &Series) -> Ordering = |a, b| a.monitored.cmp(&b.monitored);
     let mut expected_series_vec = series_vec();
     expected_series_vec.sort_by(expected_cmp_fn);
 
-    let sort_option = series_sorting_options()[8].clone();
+    let sort_option = series_sorting_options()[9].clone();
     let mut sorted_series_vec = series_vec();
     sorted_series_vec.sort_by(sort_option.cmp_fn.unwrap());
 
@@ -799,7 +880,7 @@ mod tests {
     let mut expected_series_vec = series_vec();
     expected_series_vec.sort_by(expected_cmp_fn);
 
-    let sort_option = series_sorting_options()[9].clone();
+    let sort_option = series_sorting_options()[10].clone();
     let mut sorted_series_vec = series_vec();
     sorted_series_vec.sort_by(sort_option.cmp_fn.unwrap());
 
@@ -827,6 +908,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_library_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = LibraryHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_library_handler_not_ready_when_loading() {
     let mut app = App::test_default();
@@ -892,6 +992,10 @@ mod tests {
         certification: Some("TV-MA".to_owned()),
         series_type: SeriesType::Daily,
         tags: vec![1.into(), 2.into()],
+        statistics: Some(SeriesStatistics {
+          size_on_disk: 789,
+          ..SeriesStatistics::default()
+        }),
         ..Series::default()
       },
       Series {
@@ -907,6 +1011,10 @@ mod tests {
         certification: Some("TV-PG".to_owned()),
         series_type: SeriesType::Anime,
         tags: vec![1.into(), 3.into()],
+        statistics: Some(SeriesStatistics {
+          size_on_disk: 456,
+          ..SeriesStatistics::default()
+        }),
         ..Series::default()
       },
       Series {
diff --git a/src/handlers/sonarr_handlers/library/mod.rs b/src/handlers/sonarr_handlers/library/mod.rs
index 870876e..5ab3a6f 100644
--- a/src/handlers/sonarr_handlers/library/mod.rs
+++ b/src/handlers/sonarr_handlers/library/mod.rs
@@ -8,6 +8,7 @@ use crate::{
   event::Key,
   handle_table_events,
   handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler},
+  matches_key,
   models::{
     servarr_data::sonarr::sonarr_data::{
       ActiveSonarrBlock, DELETE_SERIES_SELECTION_BLOCKS, EDIT_SERIES_SELECTION_BLOCKS,
@@ -21,7 +22,6 @@ use crate::{
 };
 
 use super::handle_change_tab_left_right_keys;
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::handlers::sonarr_handlers::library::episode_details_handler::EpisodeDetailsHandler;
 use crate::handlers::sonarr_handlers::library::season_details_handler::SeasonDetailsHandler;
 use crate::handlers::sonarr_handlers::library::series_details_handler::SeriesDetailsHandler;
@@ -46,6 +46,9 @@ pub(super) struct LibraryHandler<'a, 'b> {
 
 impl LibraryHandler<'_, '_> {
   handle_table_events!(self, series, self.app.data.sonarr_data.series, Series);
+  fn extract_series_id(&self) -> i64 {
+    self.app.data.sonarr_data.series.current_selection().id
+  }
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, 'b> {
@@ -102,6 +105,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, '
       || LIBRARY_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -182,7 +189,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, '
     let key = self.key;
     match self.active_sonarr_block {
       ActiveSonarrBlock::Series => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if matches_key!(edit, key) => {
           self.app.push_navigation_stack(
             (
               ActiveSonarrBlock::EditSeriesPrompt,
@@ -194,25 +201,35 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, '
           self.app.data.sonarr_data.selected_block =
             BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS);
         }
-        _ if key == DEFAULT_KEYBINDINGS.add.key => {
+        _ if matches_key!(add, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into());
           self.app.data.sonarr_data.add_series_search = Some(HorizontallyScrollableText::default());
-          self.app.should_ignore_quit_key = true;
+          self.app.ignore_special_keys_for_textbox_input = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(toggle_monitoring, key) => {
+          self.app.data.sonarr_data.prompt_confirm = true;
+          self.app.data.sonarr_data.prompt_confirm_action = Some(
+            SonarrEvent::ToggleSeriesMonitoring(self.extract_series_id()),
+          );
+
+          self
+            .app
+            .pop_and_push_navigation_stack(self.active_sonarr_block.into());
+        }
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::UpdateAllSeriesPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
         _ => (),
       },
       ActiveSonarrBlock::UpdateAllSeriesPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::UpdateAllSeries);
 
@@ -285,6 +302,15 @@ fn series_sorting_options() -> Vec<SortOption<Series>> {
       name: "Language",
       cmp_fn: Some(|a, b| a.language_profile_id.cmp(&b.language_profile_id)),
     },
+    SortOption {
+      name: "Size",
+      cmp_fn: Some(|a, b| {
+        a.statistics
+          .as_ref()
+          .map_or(0, |stats| stats.size_on_disk)
+          .cmp(&b.statistics.as_ref().map_or(0, |stats| stats.size_on_disk))
+      }),
+    },
     SortOption {
       name: "Monitored",
       cmp_fn: Some(|a, b| a.monitored.cmp(&b.monitored)),
diff --git a/src/handlers/sonarr_handlers/library/season_details_handler.rs b/src/handlers/sonarr_handlers/library/season_details_handler.rs
index bf041b5..51708b2 100644
--- a/src/handlers/sonarr_handlers/library/season_details_handler.rs
+++ b/src/handlers/sonarr_handlers/library/season_details_handler.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::history::history_sorting_options;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -12,6 +10,7 @@ use crate::models::sonarr_models::{
 };
 use crate::models::stateful_table::SortOption;
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_table_events, matches_key};
 use serde_json::Number;
 
 #[cfg(test)]
@@ -140,6 +139,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
     SEASON_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -193,7 +196,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
       ActiveSonarrBlock::SeasonDetails
       | ActiveSonarrBlock::SeasonHistory
       | ActiveSonarrBlock::ManualSeasonSearch => match self.key {
-        _ if self.key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if matches_key!(left, self.key) => {
           self
             .app
             .data
@@ -215,7 +218,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
               .get_active_route(),
           );
         }
-        _ if self.key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if matches_key!(right, self.key) => {
           self
             .app
             .data
@@ -378,7 +381,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
   fn handle_char_key_event(&mut self) {
     let key = self.key;
     match self.active_sonarr_block {
-      ActiveSonarrBlock::SeasonDetails if self.key == DEFAULT_KEYBINDINGS.toggle_monitoring.key => {
+      ActiveSonarrBlock::SeasonDetails if matches_key!(toggle_monitoring, self.key) => {
         self.app.data.sonarr_data.prompt_confirm = true;
         self.app.data.sonarr_data.prompt_confirm_action = Some(
           SonarrEvent::ToggleEpisodeMonitoring(self.extract_episode_id()),
@@ -391,21 +394,19 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
       ActiveSonarrBlock::SeasonDetails
       | ActiveSonarrBlock::SeasonHistory
       | ActiveSonarrBlock::ManualSeasonSearch => match self.key {
-        _ if self.key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, self.key) => {
           self
             .app
             .pop_and_push_navigation_stack(self.active_sonarr_block.into());
         }
-        _ if self.key == DEFAULT_KEYBINDINGS.auto_search.key => {
+        _ if matches_key!(auto_search, self.key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AutomaticallySearchSeasonPrompt.into());
         }
         _ => (),
       },
-      ActiveSonarrBlock::AutomaticallySearchSeasonPrompt
-        if key == DEFAULT_KEYBINDINGS.confirm.key =>
-      {
+      ActiveSonarrBlock::AutomaticallySearchSeasonPrompt if matches_key!(confirm, key) => {
         self.app.data.sonarr_data.prompt_confirm = true;
         self.app.data.sonarr_data.prompt_confirm_action = Some(
           SonarrEvent::TriggerAutomaticSeasonSearch(self.extract_series_id_season_number_tuple()),
@@ -413,7 +414,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
 
         self.app.pop_navigation_stack();
       }
-      ActiveSonarrBlock::DeleteEpisodeFilePrompt if key == DEFAULT_KEYBINDINGS.confirm.key => {
+      ActiveSonarrBlock::DeleteEpisodeFilePrompt if matches_key!(confirm, key) => {
         self.app.data.sonarr_data.prompt_confirm = true;
         self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::DeleteEpisodeFile(
           self.extract_episode_file_id(),
@@ -421,9 +422,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
 
         self.app.pop_navigation_stack();
       }
-      ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt
-        if key == DEFAULT_KEYBINDINGS.confirm.key =>
-      {
+      ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt if matches_key!(confirm, key) => {
         self.app.data.sonarr_data.prompt_confirm = true;
         let SonarrRelease {
           guid, indexer_id, ..
diff --git a/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
index 3751514..da6c073 100644
--- a/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
@@ -789,6 +789,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_season_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SeasonDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_episode_file_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/library/series_details_handler.rs b/src/handlers/sonarr_handlers/library/series_details_handler.rs
index 52beadb..a87a419 100644
--- a/src/handlers/sonarr_handlers/library/series_details_handler.rs
+++ b/src/handlers/sonarr_handlers/library/series_details_handler.rs
@@ -1,7 +1,5 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::sonarr_handlers::history::history_sorting_options;
 use crate::handlers::table_handler::TableHandlingConfig;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
@@ -11,6 +9,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
 use crate::models::sonarr_models::{Season, SonarrHistoryItem};
 use crate::models::BlockSelectionState;
 use crate::network::sonarr_network::SonarrEvent;
+use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "series_details_handler_tests.rs"]
@@ -91,6 +90,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
     SERIES_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -130,7 +133,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
   fn handle_left_right_action(&mut self) {
     match self.active_sonarr_block {
       ActiveSonarrBlock::SeriesDetails | ActiveSonarrBlock::SeriesHistory => match self.key {
-        _ if self.key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if matches_key!(left, self.key) => {
           self.app.data.sonarr_data.series_info_tabs.previous();
           self.app.pop_and_push_navigation_stack(
             self
@@ -141,7 +144,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
               .get_active_route(),
           );
         }
-        _ if self.key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if matches_key!(right, self.key) => {
           self.app.data.sonarr_data.series_info_tabs.next();
           self.app.pop_and_push_navigation_stack(
             self
@@ -250,20 +253,20 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
     let key = self.key;
     match self.active_sonarr_block {
       ActiveSonarrBlock::SeriesDetails => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => self
+        _ if matches_key!(refresh, key) => self
           .app
           .pop_and_push_navigation_stack(self.active_sonarr_block.into()),
-        _ if key == DEFAULT_KEYBINDINGS.auto_search.key => {
+        _ if matches_key!(auto_search, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AutomaticallySearchSeriesPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::UpdateAndScanSeriesPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if matches_key!(edit, key) => {
           self.app.push_navigation_stack(
             (
               ActiveSonarrBlock::EditSeriesPrompt,
@@ -275,7 +278,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
           self.app.data.sonarr_data.selected_block =
             BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS);
         }
-        _ if key == DEFAULT_KEYBINDINGS.toggle_monitoring.key => {
+        _ if matches_key!(toggle_monitoring, key) => {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action = Some(
             SonarrEvent::ToggleSeasonMonitoring(self.extract_series_id_season_number_tuple()),
@@ -288,15 +291,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
         _ => (),
       },
       ActiveSonarrBlock::SeriesHistory => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => self
+        _ if matches_key!(refresh, key) => self
           .app
           .pop_and_push_navigation_stack(self.active_sonarr_block.into()),
-        _ if key == DEFAULT_KEYBINDINGS.auto_search.key => {
+        _ if matches_key!(auto_search, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AutomaticallySearchSeriesPrompt.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if matches_key!(edit, key) => {
           self.app.push_navigation_stack(
             (
               ActiveSonarrBlock::EditSeriesPrompt,
@@ -308,7 +311,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
           self.app.data.sonarr_data.selected_block =
             BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS);
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::UpdateAndScanSeriesPrompt.into());
@@ -316,7 +319,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
         _ => (),
       },
       ActiveSonarrBlock::AutomaticallySearchSeriesPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action = Some(
             SonarrEvent::TriggerAutomaticSeriesSearch(self.extract_series_id()),
diff --git a/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
index cb93842..9d1ccda 100644
--- a/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
@@ -611,6 +611,25 @@ mod tests {
     });
   }
 
+  #[rstest]
+  fn test_series_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SeriesDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_series_id_season_number_tuple() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/mod.rs b/src/handlers/sonarr_handlers/mod.rs
index 2cecd0d..2a05c69 100644
--- a/src/handlers/sonarr_handlers/mod.rs
+++ b/src/handlers/sonarr_handlers/mod.rs
@@ -7,9 +7,7 @@ use root_folders::RootFoldersHandler;
 use system::SystemHandler;
 
 use crate::{
-  app::{key_binding::DEFAULT_KEYBINDINGS, App},
-  event::Key,
-  models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock,
+  app::App, event::Key, matches_key, models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock,
 };
 
 use super::KeyEventHandler;
@@ -69,6 +67,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SonarrHandler<'a, 'b
     true
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -113,11 +115,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SonarrHandler<'a, 'b
 pub fn handle_change_tab_left_right_keys(app: &mut App<'_>, key: Key) {
   let key_ref = key;
   match key_ref {
-    _ if key == DEFAULT_KEYBINDINGS.left.key => {
+    _ if matches_key!(left, key, app.ignore_special_keys_for_textbox_input) => {
       app.data.sonarr_data.main_tabs.previous();
       app.pop_and_push_navigation_stack(app.data.sonarr_data.main_tabs.get_active_route());
     }
-    _ if key == DEFAULT_KEYBINDINGS.right.key => {
+    _ if matches_key!(right, key, app.ignore_special_keys_for_textbox_input) => {
       app.data.sonarr_data.main_tabs.next();
       app.pop_and_push_navigation_stack(app.data.sonarr_data.main_tabs.get_active_route());
     }
diff --git a/src/handlers/sonarr_handlers/root_folders/mod.rs b/src/handlers/sonarr_handlers/root_folders/mod.rs
index 5bd51cb..3d27a59 100644
--- a/src/handlers/sonarr_handlers/root_folders/mod.rs
+++ b/src/handlers/sonarr_handlers/root_folders/mod.rs
@@ -1,4 +1,3 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
@@ -8,7 +7,9 @@ use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ROOT_F
 use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
 use crate::models::HorizontallyScrollableText;
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys};
+use crate::{
+  handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
+};
 
 #[cfg(test)]
 #[path = "root_folders_handler_tests.rs"]
@@ -66,6 +67,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
     ROOT_FOLDERS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -166,7 +171,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
           self.build_add_root_folder_body(),
         ));
         self.app.data.sonarr_data.prompt_confirm = true;
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
         self.app.pop_navigation_stack();
       }
       _ => (),
@@ -179,7 +184,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
         self.app.pop_navigation_stack();
         self.app.data.sonarr_data.edit_root_folder = None;
         self.app.data.sonarr_data.prompt_confirm = false;
-        self.app.should_ignore_quit_key = false;
+        self.app.ignore_special_keys_for_textbox_input = false;
       }
       ActiveSonarrBlock::DeleteRootFolderPrompt => {
         self.app.pop_navigation_stack();
@@ -193,15 +198,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
     let key = self.key;
     match self.active_sonarr_block {
       ActiveSonarrBlock::RootFolders => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.add.key => {
+        _ if matches_key!(add, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into());
           self.app.data.sonarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
-          self.app.should_ignore_quit_key = true;
+          self.app.ignore_special_keys_for_textbox_input = true;
         }
         _ => (),
       },
@@ -213,7 +218,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
         )
       }
       ActiveSonarrBlock::DeleteRootFolderPrompt => {
-        if key == DEFAULT_KEYBINDINGS.confirm.key {
+        if matches_key!(confirm, key) {
           self.app.data.sonarr_data.prompt_confirm = true;
           self.app.data.sonarr_data.prompt_confirm_action =
             Some(SonarrEvent::DeleteRootFolder(self.extract_root_folder_id()));
diff --git a/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
index a18efac..aeb3c50 100644
--- a/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::assert_eq;
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -269,7 +270,7 @@ mod tests {
         .set_items(vec![RootFolder::default()]);
       app.data.sonarr_data.edit_root_folder = Some("Test".into());
       app.data.sonarr_data.prompt_confirm = true;
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into());
 
@@ -282,7 +283,7 @@ mod tests {
       .handle();
 
       assert!(app.data.sonarr_data.prompt_confirm);
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.sonarr_data.prompt_confirm_action,
         Some(SonarrEvent::AddRootFolder(expected_add_root_folder_body))
@@ -299,7 +300,7 @@ mod tests {
       let mut app = App::test_default();
       app.data.sonarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
       app.data.sonarr_data.prompt_confirm = false;
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into());
 
@@ -312,7 +313,7 @@ mod tests {
       .handle();
 
       assert!(!app.data.sonarr_data.prompt_confirm);
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
       assert_eq!(
         app.get_current_route(),
@@ -414,7 +415,7 @@ mod tests {
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into());
       app.data.sonarr_data.edit_root_folder = Some("/nfs/test".into());
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
 
       RootFoldersHandler::new(
         ESC_KEY,
@@ -431,7 +432,7 @@ mod tests {
 
       assert!(app.data.sonarr_data.edit_root_folder.is_none());
       assert!(!app.data.sonarr_data.prompt_confirm);
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
     }
 
     #[rstest]
@@ -481,7 +482,7 @@ mod tests {
         app.get_current_route(),
         ActiveSonarrBlock::AddRootFolderPrompt.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.sonarr_data.edit_root_folder.is_some());
     }
 
@@ -508,7 +509,7 @@ mod tests {
         app.get_current_route(),
         ActiveSonarrBlock::RootFolders.into()
       );
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(app.data.sonarr_data.edit_root_folder.is_none());
     }
 
@@ -600,7 +601,7 @@ mod tests {
       app.data.sonarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
 
       RootFoldersHandler::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveSonarrBlock::AddRootFolderPrompt,
         None,
@@ -609,7 +610,7 @@ mod tests {
 
       assert_str_eq!(
         app.data.sonarr_data.edit_root_folder.as_ref().unwrap().text,
-        "h"
+        "a"
       );
     }
 
@@ -655,6 +656,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_root_folders_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = RootFoldersHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_root_folder_id() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs
index 4a6d40c..e994020 100644
--- a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs
+++ b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs
@@ -297,7 +297,7 @@ pub(in crate::handlers::sonarr_handlers) mod utils {
       audio_stream_count: 1,
       video_bit_depth: 10,
       video_bitrate: 0,
-      video_codec: "x265".to_owned(),
+      video_codec: Some("x265".to_owned()),
       video_fps: Number::from_f64(23.976).unwrap(),
       resolution: "1920x1080".to_owned(),
       run_time: "23:51".to_owned(),
@@ -327,7 +327,7 @@ pub(in crate::handlers::sonarr_handlers) mod utils {
       title: None,
       season_number: 1,
       monitored: true,
-      statistics: season_statistics(),
+      statistics: Some(season_statistics()),
     }
   }
 
diff --git a/src/handlers/sonarr_handlers/sonarr_handler_tests.rs b/src/handlers/sonarr_handlers/sonarr_handler_tests.rs
index b55d07b..8dd160d 100644
--- a/src/handlers/sonarr_handlers/sonarr_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/sonarr_handler_tests.rs
@@ -9,6 +9,7 @@ mod tests {
   use crate::test_handler_delegation;
   use pretty_assertions::assert_eq;
   use rstest::rstest;
+  use strum::IntoEnumIterator;
 
   #[rstest]
   #[case(0, ActiveSonarrBlock::System, ActiveSonarrBlock::Downloads)]
@@ -45,6 +46,77 @@ mod tests {
     assert_eq!(app.get_current_route(), right_block.into());
   }
 
+  #[rstest]
+  #[case(0, ActiveSonarrBlock::System, ActiveSonarrBlock::Downloads)]
+  #[case(1, ActiveSonarrBlock::Series, ActiveSonarrBlock::Blocklist)]
+  #[case(2, ActiveSonarrBlock::Downloads, ActiveSonarrBlock::History)]
+  #[case(3, ActiveSonarrBlock::Blocklist, ActiveSonarrBlock::RootFolders)]
+  #[case(4, ActiveSonarrBlock::History, ActiveSonarrBlock::Indexers)]
+  #[case(5, ActiveSonarrBlock::RootFolders, ActiveSonarrBlock::System)]
+  #[case(6, ActiveSonarrBlock::Indexers, ActiveSonarrBlock::Series)]
+  fn test_sonarr_handler_change_tab_left_right_keys_alt_navigation(
+    #[case] index: usize,
+    #[case] left_block: ActiveSonarrBlock,
+    #[case] right_block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.data.sonarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.left.alt.unwrap());
+
+    assert_eq!(
+      app.data.sonarr_data.main_tabs.get_active_route(),
+      left_block.into()
+    );
+    assert_eq!(app.get_current_route(), left_block.into());
+
+    app.data.sonarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.right.alt.unwrap());
+
+    assert_eq!(
+      app.data.sonarr_data.main_tabs.get_active_route(),
+      right_block.into()
+    );
+    assert_eq!(app.get_current_route(), right_block.into());
+  }
+
+  #[rstest]
+  #[case(0, ActiveSonarrBlock::Series)]
+  #[case(1, ActiveSonarrBlock::Downloads)]
+  #[case(2, ActiveSonarrBlock::Blocklist)]
+  #[case(3, ActiveSonarrBlock::History)]
+  #[case(4, ActiveSonarrBlock::RootFolders)]
+  #[case(5, ActiveSonarrBlock::Indexers)]
+  #[case(6, ActiveSonarrBlock::System)]
+  fn test_sonarr_handler_change_tab_left_right_keys_alt_navigation_no_op_when_ignoring_quit_key(
+    #[case] index: usize,
+    #[case] block: ActiveSonarrBlock,
+  ) {
+    let mut app = App::test_default();
+    app.push_navigation_stack(block.into());
+    app.ignore_special_keys_for_textbox_input = true;
+    app.data.sonarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.left.alt.unwrap());
+
+    assert_eq!(
+      app.data.sonarr_data.main_tabs.get_active_route(),
+      block.into()
+    );
+    assert_eq!(app.get_current_route(), block.into());
+
+    app.data.sonarr_data.main_tabs.set_index(index);
+
+    handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.right.alt.unwrap());
+
+    assert_eq!(
+      app.data.sonarr_data.main_tabs.get_active_route(),
+      block.into()
+    );
+    assert_eq!(app.get_current_route(), block.into());
+  }
+
   #[rstest]
   fn test_delegates_library_blocks_to_library_handler(
     #[values(
@@ -59,10 +131,10 @@ mod tests {
       ActiveSonarrBlock::AddSeriesSelectRootFolder,
       ActiveSonarrBlock::AddSeriesSelectSeriesType,
       ActiveSonarrBlock::AddSeriesTagsInput,
-      // ActiveSonarrBlock::AutomaticallySearchEpisodePrompt,
-      // ActiveSonarrBlock::AutomaticallySearchSeasonPrompt,
-      // ActiveSonarrBlock::AutomaticallySearchSeriesPrompt,
-      // ActiveSonarrBlock::DeleteEpisodeFilePrompt,
+      ActiveSonarrBlock::AutomaticallySearchEpisodePrompt,
+      ActiveSonarrBlock::AutomaticallySearchSeasonPrompt,
+      ActiveSonarrBlock::AutomaticallySearchSeriesPrompt,
+      ActiveSonarrBlock::DeleteEpisodeFilePrompt,
       ActiveSonarrBlock::DeleteSeriesPrompt,
       ActiveSonarrBlock::EditSeriesPrompt,
       ActiveSonarrBlock::EditSeriesPathInput,
@@ -70,39 +142,36 @@ mod tests {
       ActiveSonarrBlock::EditSeriesSelectQualityProfile,
       ActiveSonarrBlock::EditSeriesSelectLanguageProfile,
       ActiveSonarrBlock::EditSeriesTagsInput,
-      // ActiveSonarrBlock::EpisodeDetails,
-      // ActiveSonarrBlock::EpisodeFile,
-      // ActiveSonarrBlock::EpisodeHistory,
-      // ActiveSonarrBlock::EpisodesSortPrompt,
-      // ActiveSonarrBlock::FilterEpisodes,
-      // ActiveSonarrBlock::FilterEpisodesError,
+      ActiveSonarrBlock::EpisodeDetails,
+      ActiveSonarrBlock::EpisodeFile,
+      ActiveSonarrBlock::EpisodeHistory,
       ActiveSonarrBlock::FilterSeries,
       ActiveSonarrBlock::FilterSeriesError,
-      // ActiveSonarrBlock::FilterSeriesHistory,
-      // ActiveSonarrBlock::FilterSeriesHistoryError,
-      // ActiveSonarrBlock::ManualEpisodeSearch,
-      // ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt,
-      // ActiveSonarrBlock::ManualEpisodeSearchSortPrompt,
-      // ActiveSonarrBlock::ManualSeasonSearch,
-      // ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt,
-      // ActiveSonarrBlock::ManualSeasonSearchSortPrompt,
-      // ActiveSonarrBlock::SearchEpisodes,
-      // ActiveSonarrBlock::SearchEpisodesError,
-      // ActiveSonarrBlock::SearchSeason,
-      // ActiveSonarrBlock::SearchSeasonError,
+      ActiveSonarrBlock::FilterSeriesHistory,
+      ActiveSonarrBlock::FilterSeriesHistoryError,
+      ActiveSonarrBlock::ManualEpisodeSearch,
+      ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt,
+      ActiveSonarrBlock::ManualEpisodeSearchSortPrompt,
+      ActiveSonarrBlock::ManualSeasonSearch,
+      ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt,
+      ActiveSonarrBlock::ManualSeasonSearchSortPrompt,
+      ActiveSonarrBlock::SearchEpisodes,
+      ActiveSonarrBlock::SearchEpisodesError,
+      ActiveSonarrBlock::SearchSeason,
+      ActiveSonarrBlock::SearchSeasonError,
       ActiveSonarrBlock::SearchSeries,
       ActiveSonarrBlock::SearchSeriesError,
-      // ActiveSonarrBlock::SearchSeriesHistory,
-      // ActiveSonarrBlock::SearchSeriesHistoryError,
-      // ActiveSonarrBlock::SeasonDetails,
+      ActiveSonarrBlock::SearchSeriesHistory,
+      ActiveSonarrBlock::SearchSeriesHistoryError,
+      ActiveSonarrBlock::SeasonDetails,
       ActiveSonarrBlock::Series,
-      // ActiveSonarrBlock::SeriesDetails,
-      // ActiveSonarrBlock::SeriesHistory,
-      // ActiveSonarrBlock::SeriesHistorySortPrompt,
+      ActiveSonarrBlock::SeriesDetails,
+      ActiveSonarrBlock::SeriesHistory,
+      ActiveSonarrBlock::SeriesHistorySortPrompt,
       ActiveSonarrBlock::SeriesSortPrompt,
       ActiveSonarrBlock::UpdateAllSeriesPrompt,
-      // ActiveSonarrBlock::UpdateAndScanSeriesPrompt
-      // ActiveSonarrBlock::SeriesHistoryDetails,
+      ActiveSonarrBlock::UpdateAndScanSeriesPrompt,
+      ActiveSonarrBlock::SeriesHistoryDetails
     )]
     active_sonarr_block: ActiveSonarrBlock,
   ) {
@@ -222,4 +291,45 @@ mod tests {
       active_sonarr_block
     );
   }
+
+  #[test]
+  fn test_sonarr_handler_accepts() {
+    ActiveSonarrBlock::iter().for_each(|active_sonarr_block| {
+      assert!(SonarrHandler::accepts(active_sonarr_block));
+    })
+  }
+
+  #[rstest]
+  fn test_sonarr_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SonarrHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
+  #[test]
+  fn test_sonarr_handler_is_ready() {
+    let mut app = App::test_default();
+    app.is_loading = true;
+
+    let handler = SonarrHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert!(handler.is_ready());
+  }
 }
diff --git a/src/handlers/sonarr_handlers/system/mod.rs b/src/handlers/sonarr_handlers/system/mod.rs
index 5b1261b..f792f77 100644
--- a/src/handlers/sonarr_handlers/system/mod.rs
+++ b/src/handlers/sonarr_handlers/system/mod.rs
@@ -1,9 +1,9 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::sonarr_handlers::system::system_details_handler::SystemDetailsHandler;
 use crate::handlers::{handle_clear_errors, KeyEventHandler};
+use crate::matches_key;
 use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
 use crate::models::Scrollable;
 
@@ -35,6 +35,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemHandler<'a, 'b
     SystemDetailsHandler::accepts(active_block) || active_block == ActiveSonarrBlock::System
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -86,15 +90,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemHandler<'a, 'b
     if self.active_sonarr_block == ActiveSonarrBlock::System {
       let key = self.key;
       match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if matches_key!(refresh, key) => {
           self.app.should_refresh = true;
         }
-        _ if key == DEFAULT_KEYBINDINGS.events.key => {
+        _ if matches_key!(events, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::SystemQueuedEvents.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.logs.key => {
+        _ if matches_key!(logs, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::SystemLogs.into());
@@ -106,12 +110,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemHandler<'a, 'b
             .set_items(self.app.data.sonarr_data.logs.items.to_vec());
           self.app.data.sonarr_data.log_details.scroll_to_bottom();
         }
-        _ if key == DEFAULT_KEYBINDINGS.tasks.key => {
+        _ if matches_key!(tasks, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
         }
-        _ if key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if matches_key!(update, key) => {
           self
             .app
             .push_navigation_stack(ActiveSonarrBlock::SystemUpdates.into());
diff --git a/src/handlers/sonarr_handlers/system/system_details_handler.rs b/src/handlers/sonarr_handlers/system/system_details_handler.rs
index a9786f6..7615581 100644
--- a/src/handlers/sonarr_handlers/system/system_details_handler.rs
+++ b/src/handlers/sonarr_handlers/system/system_details_handler.rs
@@ -1,7 +1,7 @@
-use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
+use crate::matches_key;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SYSTEM_DETAILS_BLOCKS};
 use crate::models::sonarr_models::SonarrTaskName;
 use crate::models::stateful_list::StatefulList;
@@ -36,6 +36,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemDetailsHandler
     SYSTEM_DETAILS_BLOCKS.contains(&active_block)
   }
 
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
   fn new(
     key: Key,
     app: &'a mut App<'b>,
@@ -114,7 +118,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemDetailsHandler
 
     match self.active_sonarr_block {
       ActiveSonarrBlock::SystemLogs => match self.key {
-        _ if key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if matches_key!(left, key) => {
           self
             .app
             .data
@@ -124,7 +128,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemDetailsHandler
             .iter()
             .for_each(|log| log.scroll_right());
         }
-        _ if key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if matches_key!(right, key) => {
           self
             .app
             .data
@@ -178,14 +182,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemDetailsHandler
   }
 
   fn handle_char_key_event(&mut self) {
-    if SYSTEM_DETAILS_BLOCKS.contains(&self.active_sonarr_block)
-      && self.key == DEFAULT_KEYBINDINGS.refresh.key
+    if SYSTEM_DETAILS_BLOCKS.contains(&self.active_sonarr_block) && matches_key!(refresh, self.key)
     {
       self.app.should_refresh = true;
     }
 
     if self.active_sonarr_block == ActiveSonarrBlock::SystemTaskStartConfirmPrompt
-      && self.key == DEFAULT_KEYBINDINGS.confirm.key
+      && matches_key!(confirm, self.key)
     {
       self.app.data.sonarr_data.prompt_confirm = true;
       self.app.data.sonarr_data.prompt_confirm_action =
diff --git a/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs b/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
index 18657af..57118c1 100644
--- a/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
   use pretty_assertions::{assert_eq, assert_str_eq};
+  use rstest::rstest;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -960,6 +961,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_system_details_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SystemDetailsHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_extract_task_name() {
     let mut app = App::test_default();
diff --git a/src/handlers/sonarr_handlers/system/system_handler_tests.rs b/src/handlers/sonarr_handlers/system/system_handler_tests.rs
index 9b866de..2678086 100644
--- a/src/handlers/sonarr_handlers/system/system_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/system/system_handler_tests.rs
@@ -456,6 +456,25 @@ mod tests {
     })
   }
 
+  #[rstest]
+  fn test_system_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = SystemHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
   #[test]
   fn test_system_handler_is_not_ready_when_loading() {
     let mut app = App::test_default();
diff --git a/src/handlers/table_handler.rs b/src/handlers/table_handler.rs
index 56b77b1..fc7ae1a 100644
--- a/src/handlers/table_handler.rs
+++ b/src/handlers/table_handler.rs
@@ -42,17 +42,19 @@ macro_rules! handle_table_events {
       fn [<handle_ $name _table_events>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
         if $self.is_ready() {
           match $self.key {
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.up.key => $self.[<handle_ $name _table_scroll_up>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.down.key => $self.[<handle_ $name _table_scroll_down>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.home.key => $self.[<handle_ $name _table_home>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.end.key => $self.[<handle_ $name _table_end>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.left.key
-              || $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.right.key =>
+            _ if $crate::matches_key!(up, $self.key, $self.ignore_special_keys()) => $self.[<handle_ $name _table_scroll_up>](config),
+            _ if $crate::matches_key!(down, $self.key, $self.ignore_special_keys()) => $self.[<handle_ $name _table_scroll_down>](config),
+            _ if $crate::matches_key!(pg_up, $self.key, $self.ignore_special_keys()) => $self.[<handle_ $name _table_page_up>](config),
+            _ if $crate::matches_key!(pg_down, $self.key, $self.ignore_special_keys()) => $self.[<handle_ $name _table_page_down>](config),
+            _ if $crate::matches_key!(home, $self.key) => $self.[<handle_ $name _table_home>](config),
+            _ if $crate::matches_key!(end, $self.key) => $self.[<handle_ $name _table_end>](config),
+            _ if $crate::matches_key!(left, $self.key, $self.ignore_special_keys())
+              || $crate::matches_key!(right, $self.key, $self.ignore_special_keys()) =>
             {
               $self.[<handle_ $name _table_left_right>](config)
             }
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.submit.key => $self.[<handle_ $name _table_submit>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.esc.key => $self.[<handle_ $name _table_esc>](config),
+            _ if $crate::matches_key!(submit, $self.key) => $self.[<handle_ $name _table_submit>](config),
+            _ if $crate::matches_key!(esc, $self.key) => $self.[<handle_ $name _table_esc>](config),
             _ if config.searching_block.is_some()
               && $self.app.get_current_route() == *config.searching_block.as_ref().unwrap() =>
             {
@@ -63,11 +65,11 @@ macro_rules! handle_table_events {
             {
               $self.[<handle_ $name _table_filter_box_input>]()
             }
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.filter.key
+            _ if $crate::matches_key!(filter, $self.key)
               && config.filtering_block.is_some() => $self.[<handle_ $name _table_filter_key>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.search.key
+            _ if $crate::matches_key!(search, $self.key)
               && config.searching_block.is_some() => $self.[<handle_ $name _table_search_key>](config),
-            _ if $self.key == $crate::app::key_binding::DEFAULT_KEYBINDINGS.sort.key
+            _ if $crate::matches_key!(sort, $self.key)
               && config.sorting_block.is_some() => $self.[<handle_ $name _table_sort_key>](config),
             _ => false,
           }
@@ -116,6 +118,30 @@ macro_rules! handle_table_events {
         }
       }
 
+      fn [<handle_ $name _table_page_down>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
+        use $crate::models::Paginated;
+
+        match $self.app.get_current_route() {
+          _ if config.table_block == $self.app.get_current_route() => {
+            $table.page_down();
+            true
+          }
+          _ => false,
+        }
+      }
+
+      fn [<handle_ $name _table_page_up>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
+        use $crate::models::Paginated;
+
+        match $self.app.get_current_route() {
+          _ if config.table_block == $self.app.get_current_route() => {
+            $table.page_up();
+            true
+          }
+          _ => false,
+        }
+      }
+
       fn [<handle_ $name _table_home>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
         use $crate::models::Scrollable;
 
@@ -244,7 +270,7 @@ macro_rules! handle_table_events {
             && $self.app.get_current_route() == *config.searching_block.as_ref().unwrap() =>
           {
             $self.app.pop_navigation_stack();
-            $self.app.should_ignore_quit_key = false;
+            $self.app.ignore_special_keys_for_textbox_input = false;
 
             if $table.search.is_some() {
               let search_field_fn = config
@@ -267,7 +293,7 @@ macro_rules! handle_table_events {
             && $self.app.get_current_route() == *config.filtering_block.as_ref().unwrap() =>
           {
             $self.app.pop_navigation_stack();
-            $self.app.should_ignore_quit_key = false;
+            $self.app.ignore_special_keys_for_textbox_input = false;
 
             if $table.filter.is_some() {
               let filter_field_fn = config
@@ -305,7 +331,7 @@ macro_rules! handle_table_events {
           {
             $self.app.pop_navigation_stack();
             $table.reset_search();
-            $self.app.should_ignore_quit_key = false;
+            $self.app.ignore_special_keys_for_textbox_input = false;
             true
           }
           _ if (config.filtering_block.is_some()
@@ -315,7 +341,7 @@ macro_rules! handle_table_events {
           {
             $self.app.pop_navigation_stack();
             $table.reset_filter();
-            $self.app.should_ignore_quit_key = false;
+            $self.app.ignore_special_keys_for_textbox_input = false;
             true
           }
           _ if config.table_block == $self.app.get_current_route()
@@ -335,7 +361,7 @@ macro_rules! handle_table_events {
             .push_navigation_stack(config.filtering_block.expect("Filtering block is undefined").into());
           $table.reset_filter();
           $table.filter = Some($crate::models::HorizontallyScrollableText::default());
-          $self.app.should_ignore_quit_key = true;
+          $self.app.ignore_special_keys_for_textbox_input = true;
 
           true
         } else {
@@ -349,7 +375,7 @@ macro_rules! handle_table_events {
             .app
             .push_navigation_stack(config.searching_block.expect("Searching block is undefined"));
           $table.search = Some($crate::models::HorizontallyScrollableText::default());
-          $self.app.should_ignore_quit_key = true;
+          $self.app.ignore_special_keys_for_textbox_input = true;
 
           true
         } else {
diff --git a/src/handlers/table_handler_tests.rs b/src/handlers/table_handler_tests.rs
index b7119fb..688bfcd 100644
--- a/src/handlers/table_handler_tests.rs
+++ b/src/handlers/table_handler_tests.rs
@@ -48,6 +48,10 @@ mod tests {
       true
     }
 
+    fn ignore_special_keys(&self) -> bool {
+      self.app.ignore_special_keys_for_textbox_input
+    }
+
     fn new(
       key: Key,
       app: &'a mut App<'b>,
@@ -425,6 +429,48 @@ mod tests {
     }
   }
 
+  mod test_handle_pagination_scroll {
+    use super::*;
+    use crate::handlers::table_handler::table_handler_tests::tests::TableHandlerUnit;
+    use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+    use pretty_assertions::assert_str_eq;
+    use rstest::rstest;
+    use std::iter;
+
+    #[rstest]
+    fn test_table_pagination_scroll(
+      #[values(DEFAULT_KEYBINDINGS.pg_up.key, DEFAULT_KEYBINDINGS.pg_down.key)] key: Key,
+    ) {
+      let mut app = App::test_default();
+      app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
+      let mut curr = 0;
+      let movies_vec = iter::repeat_with(|| {
+        let tmp = curr;
+        curr += 1;
+        Movie {
+          title: format!("Test {tmp}").into(),
+          ..Movie::default()
+        }
+      })
+      .take(100)
+      .collect();
+      app.data.radarr_data.movies.set_items(movies_vec);
+      TableHandlerUnit::new(key, &mut app, ActiveRadarrBlock::Movies, None).handle();
+
+      if key == Key::PgUp {
+        assert_str_eq!(
+          app.data.radarr_data.movies.current_selection().title.text,
+          "Test 79"
+        );
+      } else {
+        assert_str_eq!(
+          app.data.radarr_data.movies.current_selection().title.text,
+          "Test 20"
+        );
+      }
+    }
+  }
+
   mod test_handle_left_right_action {
     use pretty_assertions::assert_eq;
     use std::sync::atomic::Ordering::SeqCst;
@@ -648,7 +694,7 @@ mod tests {
       TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle();
 
       assert!(app.data.radarr_data.movies.filtered_items.is_some());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app
           .data
@@ -684,7 +730,7 @@ mod tests {
 
       TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle();
 
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.movies.filtered_items.is_none());
       assert_eq!(
         app.get_current_route(),
@@ -735,7 +781,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
     ) {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
@@ -744,7 +790,7 @@ mod tests {
       TableHandlerUnit::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.data.radarr_data.movies.search, None);
     }
 
@@ -754,7 +800,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
     ) {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data = create_test_radarr_data();
@@ -773,7 +819,7 @@ mod tests {
       TableHandlerUnit::new(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.data.radarr_data.movies.filter, None);
       assert_eq!(app.data.radarr_data.movies.filtered_items, None);
       assert_eq!(app.data.radarr_data.movies.filtered_state, None);
@@ -820,7 +866,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::SearchMovie.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.radarr_data.movies.search,
         Some(HorizontallyScrollableText::default())
@@ -847,7 +893,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.data.radarr_data.movies.search, None);
     }
 
@@ -869,7 +915,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.data.radarr_data.movies.search, None);
     }
 
@@ -894,7 +940,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::FilterMovies.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.movies.filter.is_some());
     }
 
@@ -918,14 +964,14 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert!(app.data.radarr_data.movies.filter.is_none());
     }
 
     #[test]
     fn test_filter_table_key_resets_previous_filter() {
       let mut app = App::test_default();
-      app.should_ignore_quit_key = true;
+      app.ignore_special_keys_for_textbox_input = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.data.radarr_data = create_test_radarr_data();
       app
@@ -947,7 +993,7 @@ mod tests {
         app.get_current_route(),
         ActiveRadarrBlock::FilterMovies.into()
       );
-      assert!(app.should_ignore_quit_key);
+      assert!(app.ignore_special_keys_for_textbox_input);
       assert_eq!(
         app.data.radarr_data.movies.filter,
         Some(HorizontallyScrollableText::default())
@@ -974,7 +1020,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
-      assert!(!app.should_ignore_quit_key);
+      assert!(!app.ignore_special_keys_for_textbox_input);
       assert_eq!(app.data.radarr_data.movies.filter, None);
     }
 
@@ -1040,7 +1086,7 @@ mod tests {
       app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
 
       TableHandlerUnit::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::SearchMovie,
         None,
@@ -1049,7 +1095,7 @@ mod tests {
 
       assert_str_eq!(
         app.data.radarr_data.movies.search.as_ref().unwrap().text,
-        "h"
+        "a"
       );
     }
 
@@ -1065,7 +1111,7 @@ mod tests {
       app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
 
       TableHandlerUnit::new(
-        Key::Char('h'),
+        Key::Char('a'),
         &mut app,
         ActiveRadarrBlock::FilterMovies,
         None,
@@ -1074,7 +1120,7 @@ mod tests {
 
       assert_str_eq!(
         app.data.radarr_data.movies.filter.as_ref().unwrap().text,
-        "h"
+        "a"
       );
     }
 
@@ -1161,7 +1207,7 @@ mod tests {
           name: "English".to_owned(),
         },
         size_on_disk: 1024,
-        studio: "Studio 1".to_owned(),
+        studio: Some("Studio 1".to_owned()),
         year: 2024,
         monitored: false,
         runtime: 12.into(),
@@ -1178,7 +1224,7 @@ mod tests {
           name: "Chinese".to_owned(),
         },
         size_on_disk: 2048,
-        studio: "Studio 2".to_owned(),
+        studio: Some("Studio 2".to_owned()),
         year: 1998,
         monitored: false,
         runtime: 60.into(),
@@ -1195,7 +1241,7 @@ mod tests {
           name: "Japanese".to_owned(),
         },
         size_on_disk: 512,
-        studio: "studio 3".to_owned(),
+        studio: Some("studio 3".to_owned()),
         year: 1954,
         monitored: true,
         runtime: 120.into(),
diff --git a/src/main.rs b/src/main.rs
index c6f1417..45799a9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,4 @@
 use anyhow::Result;
-use std::panic::PanicHookInfo;
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::{io, panic, process};
-
 use clap::{crate_authors, crate_description, crate_name, crate_version, CommandFactory, Parser};
 use clap_complete::generate;
 use crossterm::execute;
@@ -16,6 +10,11 @@ use network::NetworkTrait;
 use ratatui::backend::CrosstermBackend;
 use ratatui::Terminal;
 use reqwest::Client;
+use std::panic::PanicHookInfo;
+use std::path::PathBuf;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+use std::{io, panic, process};
 use tokio::select;
 use tokio::sync::mpsc::Receiver;
 use tokio::sync::{mpsc, Mutex};
@@ -24,12 +23,14 @@ use utils::{
   build_network_client, load_config, start_cli_no_spinner, start_cli_with_spinner, tail_logs,
 };
 
-use crate::app::App;
+use crate::app::{log_and_print_error, App};
 use crate::cli::Command;
 use crate::event::input_event::{Events, InputEvent};
 use crate::event::Key;
 use crate::network::{Network, NetworkEvent};
-use crate::ui::ui;
+use crate::ui::theme::{Theme, ThemeDefinitionsWrapper};
+use crate::ui::{ui, THEME};
+use crate::utils::load_theme_config;
 
 mod app;
 mod cli;
@@ -74,6 +75,22 @@ struct Cli {
     help = "The Managarr configuration file to use"
   )]
   config_file: Option<PathBuf>,
+  #[arg(
+    long,
+    global = true,
+    value_parser,
+    env = "MANAGARR_THEMES_FILE",
+    help = "The Managarr themes file to use"
+  )]
+  themes_file: Option<PathBuf>,
+  #[arg(
+    long,
+    global = true,
+    value_parser,
+    env = "MANAGARR_THEME",
+    help = "The name of the Managarr theme to use"
+  )]
+  theme: Option<String>,
   #[arg(
     long,
     global = true,
@@ -98,10 +115,12 @@ async fn main() -> Result<()> {
   } else {
     confy::load("managarr", "config")?
   };
+  let theme_name = config.theme.clone();
   let spinner_disabled = args.disable_spinner;
   debug!("Managarr loaded using config: {config:?}");
   config.validate();
   config.post_process_initialization();
+
   let reqwest_client = build_network_client(&config);
   let (sync_network_tx, sync_network_rx) = mpsc::channel(500);
   let cancellation_token = CancellationToken::new();
@@ -140,7 +159,12 @@ async fn main() -> Result<()> {
       std::thread::spawn(move || {
         start_networking(sync_network_rx, &app_nw, cancellation_token, reqwest_client)
       });
-      start_ui(&app).await?;
+      start_ui(
+        &app,
+        &args.themes_file,
+        args.theme.unwrap_or(theme_name.unwrap_or_default()),
+      )
+      .await?;
     }
   }
 
@@ -174,7 +198,36 @@ async fn start_networking(
   }
 }
 
-async fn start_ui(app: &Arc<Mutex<App<'_>>>) -> Result<()> {
+async fn start_ui(
+  app: &Arc<Mutex<App<'_>>>,
+  themes_file_arg: &Option<PathBuf>,
+  theme_name: String,
+) -> Result<()> {
+  let theme_definitions_wrapper = if let Some(ref theme_file) = themes_file_arg {
+    load_theme_config(theme_file.to_str().expect("Invalid theme file specified"))?
+  } else {
+    confy::load("managarr", "themes").unwrap_or_else(|_| ThemeDefinitionsWrapper::default())
+  };
+  let theme = if !theme_name.is_empty() {
+    let theme_definition = theme_definitions_wrapper
+      .theme_definitions
+      .iter()
+      .find(|t| t.name == theme_name);
+
+    if theme_definition.is_none() {
+      log_and_print_error(format!("The specified theme was not found: {theme_name}"));
+      process::exit(1);
+    }
+
+    theme_definition.unwrap().theme
+  } else {
+    debug!("No theme specified, using default theme");
+    Theme::default()
+  };
+  debug!("Managarr loaded using theme: {theme:?}");
+  theme.validate();
+  THEME.set(theme);
+
   let mut stdout = io::stdout();
   enable_raw_mode()?;
 
@@ -193,7 +246,7 @@ async fn start_ui(app: &Arc<Mutex<App<'_>>>) -> Result<()> {
 
     match input_events.next()? {
       InputEvent::KeyEvent(key) => {
-        if key == Key::Char('q') && !app.should_ignore_quit_key {
+        if key == Key::Char('q') && !app.ignore_special_keys_for_textbox_input {
           break;
         }
 
diff --git a/src/models/mod.rs b/src/models/mod.rs
index 75cb072..ce52d16 100644
--- a/src/models/mod.rs
+++ b/src/models/mod.rs
@@ -1,6 +1,7 @@
 use std::fmt::{Debug, Display, Formatter};
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+use crate::app::context_clues::ContextClue;
 use crate::app::ServarrConfig;
 use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
 use radarr_models::RadarrSerdeable;
@@ -9,6 +10,7 @@ use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Number;
 use servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
 use sonarr_models::SonarrSerdeable;
+
 pub mod radarr_models;
 pub mod servarr_data;
 pub mod servarr_models;
@@ -33,6 +35,7 @@ pub enum Route {
   Bazarr,
   Prowlarr,
   Tautulli,
+  Keybindings,
 }
 
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
@@ -49,6 +52,11 @@ pub trait Scrollable {
   fn scroll_to_bottom(&mut self);
 }
 
+pub trait Paginated {
+  fn page_down(&mut self);
+  fn page_up(&mut self);
+}
+
 #[derive(Default)]
 pub struct ScrollableText {
   pub items: Vec<String>,
@@ -266,8 +274,7 @@ impl HorizontallyScrollableText {
 pub struct TabRoute {
   pub title: String,
   pub route: Route,
-  pub help: String,
-  pub contextual_help: Option<String>,
+  pub contextual_help: Option<&'static [ContextClue]>,
   pub config: Option<ServarrConfig>,
 }
 
@@ -281,7 +288,7 @@ impl TabState {
     TabState { tabs, index: 0 }
   }
 
-  // Allowing this code for now since we'll eventually be implementing additional Servarr support and we'll need it then
+  // Allowing this code for now since we'll eventually be implementing additional Servarr support, and we'll need it then
   #[allow(dead_code)]
   pub fn set_index(&mut self, index: usize) -> &TabRoute {
     self.index = index;
@@ -332,12 +339,8 @@ impl TabState {
     false
   }
 
-  pub fn get_active_tab_help(&self) -> &str {
-    &self.tabs[self.index].help
-  }
-
-  pub fn get_active_tab_contextual_help(&self) -> Option<String> {
-    self.tabs[self.index].contextual_help.clone()
+  pub fn get_active_route_contextual_help(&self) -> Option<&'static [ContextClue]> {
+    self.tabs[self.index].contextual_help
   }
 
   pub fn next(&mut self) {
diff --git a/src/models/model_tests.rs b/src/models/model_tests.rs
index 38c9cb4..5f3494d 100644
--- a/src/models/model_tests.rs
+++ b/src/models/model_tests.rs
@@ -3,6 +3,8 @@ mod tests {
   use std::sync::atomic::AtomicUsize;
   use std::sync::atomic::Ordering;
 
+  use crate::app::context_clues::ContextClue;
+  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::ServarrConfig;
   use crate::models::from_f64;
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
@@ -18,6 +20,10 @@ mod tests {
   use serde_json::to_string;
 
   const BLOCKS: &[&[i32]] = &[&[11, 12], &[21, 22], &[31, 32]];
+  static HELP_KEYBINDINGS: [ContextClue; 1] =
+    [(DEFAULT_KEYBINDINGS.help, DEFAULT_KEYBINDINGS.help.desc)];
+  static ESC_KEYBINDINGS: [ContextClue; 1] =
+    [(DEFAULT_KEYBINDINGS.esc, DEFAULT_KEYBINDINGS.esc.desc)];
 
   #[test]
   fn test_scrollable_text_with_string() {
@@ -617,26 +623,15 @@ mod tests {
   }
 
   #[test]
-  fn test_tab_state_get_active_tab_help() {
+  fn test_tab_state_get_active_route_contextual_help() {
     let tabs = create_test_tab_routes();
-    let second_tab_help = tabs[1].help.clone();
+    let second_tab_help = tabs[1].contextual_help;
     let tab_state = TabState { tabs, index: 1 };
 
-    let tab_help = tab_state.get_active_tab_help();
+    let tab_help = tab_state.get_active_route_contextual_help();
 
-    assert_str_eq!(tab_help, second_tab_help);
-  }
-
-  #[test]
-  fn test_tab_state_get_active_tab_contextual_help() {
-    let tabs = create_test_tab_routes();
-    let second_tab_contextual_help = tabs[1].contextual_help.clone().unwrap();
-    let tab_state = TabState { tabs, index: 1 };
-
-    let tab_contextual_help = tab_state.get_active_tab_contextual_help();
-
-    assert!(tab_contextual_help.is_some());
-    assert_str_eq!(tab_contextual_help.unwrap(), second_tab_contextual_help);
+    assert!(tab_help.is_some());
+    assert_eq!(tab_help.unwrap(), second_tab_help.unwrap());
   }
 
   #[test]
@@ -823,15 +818,13 @@ mod tests {
       TabRoute {
         title: "Test 1".to_owned(),
         route: ActiveRadarrBlock::Movies.into(),
-        help: "Help for Test 1".to_owned(),
-        contextual_help: Some("Contextual Help for Test 1".to_owned()),
+        contextual_help: Some(&HELP_KEYBINDINGS),
         config: None,
       },
       TabRoute {
         title: "Test 2".to_owned(),
         route: ActiveRadarrBlock::Collections.into(),
-        help: "Help for Test 2".to_owned(),
-        contextual_help: Some("Contextual Help for Test 2".to_owned()),
+        contextual_help: Some(&ESC_KEYBINDINGS),
         config: None,
       },
     ]
diff --git a/src/models/radarr_models.rs b/src/models/radarr_models.rs
index d89af1b..e9b1d0e 100644
--- a/src/models/radarr_models.rs
+++ b/src/models/radarr_models.rs
@@ -1,5 +1,6 @@
 use std::fmt::{Display, Formatter};
 
+use crate::models::servarr_models::IndexerTestResult;
 use crate::{models::HorizontallyScrollableText, serde_enum_from};
 use chrono::{DateTime, Utc};
 use clap::ValueEnum;
@@ -216,23 +217,6 @@ pub struct IndexerSettings {
   pub whitelisted_hardcoded_subs: HorizontallyScrollableText,
 }
 
-#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct IndexerTestResult {
-  #[serde(deserialize_with = "super::from_i64")]
-  pub id: i64,
-  pub is_valid: bool,
-  pub validation_failures: Vec<IndexerValidationFailure>,
-}
-
-#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct IndexerValidationFailure {
-  pub property_name: String,
-  pub error_message: String,
-  pub severity: String,
-}
-
 #[derive(Serialize, Deserialize, Derivative, Debug, Clone, PartialEq, Eq)]
 #[derivative(Default)]
 #[serde(rename_all = "camelCase")]
@@ -249,7 +233,7 @@ pub struct MediaInfo {
   pub video_bit_depth: i64,
   #[serde(deserialize_with = "super::from_i64")]
   pub video_bitrate: i64,
-  pub video_codec: String,
+  pub video_codec: Option<String>,
   #[derivative(Default(value = "Number::from(0)"))]
   pub video_fps: Number,
   pub resolution: String,
@@ -308,7 +292,7 @@ pub struct Movie {
   pub status: String,
   pub overview: String,
   pub path: String,
-  pub studio: String,
+  pub studio: Option<String>,
   pub genres: Vec<String>,
   #[serde(deserialize_with = "super::from_i64")]
   pub year: i64,
diff --git a/src/models/servarr_data/mod.rs b/src/models/servarr_data/mod.rs
index c82e844..dcffb96 100644
--- a/src/models/servarr_data/mod.rs
+++ b/src/models/servarr_data/mod.rs
@@ -1,3 +1,21 @@
+use crate::models::Route;
+
 pub mod modals;
 pub mod radarr;
 pub mod sonarr;
+
+#[cfg(test)]
+#[path = "servarr_data_tests.rs"]
+mod servarr_data_tests;
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
+pub enum ActiveKeybindingBlock {
+  #[default]
+  Help,
+}
+
+impl From<ActiveKeybindingBlock> for Route {
+  fn from(_active_keybinding_block: ActiveKeybindingBlock) -> Route {
+    Route::Keybindings
+  }
+}
diff --git a/src/models/servarr_data/radarr/modals.rs b/src/models/servarr_data/radarr/modals.rs
index b4f7f73..55e3398 100644
--- a/src/models/servarr_data/radarr/modals.rs
+++ b/src/models/servarr_data/radarr/modals.rs
@@ -80,13 +80,8 @@ impl From<&RadarrData<'_>> for EditIndexerModal {
       .unwrap()
       .into();
 
-    if seed_ratio_value_option.is_some() {
-      edit_indexer_modal.seed_ratio = seed_ratio_value_option
-        .unwrap()
-        .as_f64()
-        .unwrap()
-        .to_string()
-        .into();
+    if let Some(seed_ratio_value) = seed_ratio_value_option {
+      edit_indexer_modal.seed_ratio = seed_ratio_value.as_f64().unwrap().to_string().into();
     }
 
     edit_indexer_modal.tags = tags
diff --git a/src/models/servarr_data/radarr/radarr_data.rs b/src/models/servarr_data/radarr/radarr_data.rs
index fb6326e..1c43015 100644
--- a/src/models/servarr_data/radarr/radarr_data.rs
+++ b/src/models/servarr_data/radarr/radarr_data.rs
@@ -1,10 +1,10 @@
 use crate::app::context_clues::{
-  build_context_clue_string, BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES,
-  INDEXERS_CONTEXT_CLUES, ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+  BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES,
+  ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
 };
 use crate::app::radarr::radarr_context_clues::{
-  COLLECTIONS_CONTEXT_CLUES, LIBRARY_CONTEXT_CLUES, MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES,
-  MANUAL_MOVIE_SEARCH_CONTEXT_CLUES, MOVIE_DETAILS_CONTEXT_CLUES,
+  COLLECTIONS_CONTEXT_CLUES, LIBRARY_CONTEXT_CLUES, MANUAL_MOVIE_SEARCH_CONTEXT_CLUES,
+  MOVIE_DETAILS_CONTEXT_CLUES,
 };
 use crate::models::radarr_models::{
   AddMovieSearchResult, BlocklistItem, Collection, CollectionMovie, DownloadRecord,
@@ -123,50 +123,43 @@ impl<'a> Default for RadarrData<'a> {
         TabRoute {
           title: "Library".to_string(),
           route: ActiveRadarrBlock::Movies.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&LIBRARY_CONTEXT_CLUES)),
+          contextual_help: Some(&LIBRARY_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Collections".to_string(),
           route: ActiveRadarrBlock::Collections.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&COLLECTIONS_CONTEXT_CLUES)),
+          contextual_help: Some(&COLLECTIONS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Downloads".to_string(),
           route: ActiveRadarrBlock::Downloads.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&DOWNLOADS_CONTEXT_CLUES)),
+          contextual_help: Some(&DOWNLOADS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Blocklist".to_string(),
           route: ActiveRadarrBlock::Blocklist.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&BLOCKLIST_CONTEXT_CLUES)),
+          contextual_help: Some(&BLOCKLIST_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Root Folders".to_string(),
           route: ActiveRadarrBlock::RootFolders.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&ROOT_FOLDERS_CONTEXT_CLUES)),
+          contextual_help: Some(&ROOT_FOLDERS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Indexers".to_string(),
           route: ActiveRadarrBlock::Indexers.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&INDEXERS_CONTEXT_CLUES)),
+          contextual_help: Some(&INDEXERS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "System".to_string(),
           route: ActiveRadarrBlock::System.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&SYSTEM_CONTEXT_CLUES)),
+          contextual_help: Some(&SYSTEM_CONTEXT_CLUES),
           config: None,
         },
       ]),
@@ -174,45 +167,37 @@ impl<'a> Default for RadarrData<'a> {
         TabRoute {
           title: "Details".to_string(),
           route: ActiveRadarrBlock::MovieDetails.into(),
-          help: build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&MOVIE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "History".to_string(),
           route: ActiveRadarrBlock::MovieHistory.into(),
-          help: build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&MOVIE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "File".to_string(),
           route: ActiveRadarrBlock::FileInfo.into(),
-          help: build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&MOVIE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Cast".to_string(),
           route: ActiveRadarrBlock::Cast.into(),
-          help: build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&MOVIE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Crew".to_string(),
           route: ActiveRadarrBlock::Crew.into(),
-          help: build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&MOVIE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Manual Search".to_string(),
           route: ActiveRadarrBlock::ManualSearch.into(),
-          help: build_context_clue_string(&MANUAL_MOVIE_SEARCH_CONTEXT_CLUES),
-          contextual_help: Some(build_context_clue_string(
-            &MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES,
-          )),
+          contextual_help: Some(&MANUAL_MOVIE_SEARCH_CONTEXT_CLUES),
           config: None,
         },
       ]),
diff --git a/src/models/servarr_data/radarr/radarr_data_tests.rs b/src/models/servarr_data/radarr/radarr_data_tests.rs
index 7ff699e..cd2d67f 100644
--- a/src/models/servarr_data/radarr/radarr_data_tests.rs
+++ b/src/models/servarr_data/radarr/radarr_data_tests.rs
@@ -5,12 +5,11 @@ mod tests {
     use pretty_assertions::{assert_eq, assert_str_eq};
 
     use crate::app::context_clues::{
-      build_context_clue_string, BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES,
-      INDEXERS_CONTEXT_CLUES, ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+      BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES,
+      ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
     };
     use crate::app::radarr::radarr_context_clues::{
-      COLLECTIONS_CONTEXT_CLUES, LIBRARY_CONTEXT_CLUES,
-      MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES, MANUAL_MOVIE_SEARCH_CONTEXT_CLUES,
+      COLLECTIONS_CONTEXT_CLUES, LIBRARY_CONTEXT_CLUES, MANUAL_MOVIE_SEARCH_CONTEXT_CLUES,
       MOVIE_DETAILS_CONTEXT_CLUES,
     };
 
@@ -107,10 +106,10 @@ mod tests {
         radarr_data.main_tabs.tabs[0].route,
         ActiveRadarrBlock::Movies.into()
       );
-      assert!(radarr_data.main_tabs.tabs[0].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[0].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[0].contextual_help,
-        Some(build_context_clue_string(&LIBRARY_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[0].contextual_help.unwrap(),
+        &LIBRARY_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[0].config, None);
 
@@ -119,10 +118,10 @@ mod tests {
         radarr_data.main_tabs.tabs[1].route,
         ActiveRadarrBlock::Collections.into()
       );
-      assert!(radarr_data.main_tabs.tabs[1].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[1].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[1].contextual_help,
-        Some(build_context_clue_string(&COLLECTIONS_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[1].contextual_help.unwrap(),
+        &COLLECTIONS_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[1].config, None);
 
@@ -131,10 +130,10 @@ mod tests {
         radarr_data.main_tabs.tabs[2].route,
         ActiveRadarrBlock::Downloads.into()
       );
-      assert!(radarr_data.main_tabs.tabs[2].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[2].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[2].contextual_help,
-        Some(build_context_clue_string(&DOWNLOADS_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[2].contextual_help.unwrap(),
+        &DOWNLOADS_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[2].config, None);
 
@@ -143,10 +142,10 @@ mod tests {
         radarr_data.main_tabs.tabs[3].route,
         ActiveRadarrBlock::Blocklist.into()
       );
-      assert!(radarr_data.main_tabs.tabs[3].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[3].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[3].contextual_help,
-        Some(build_context_clue_string(&BLOCKLIST_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[3].contextual_help.unwrap(),
+        &BLOCKLIST_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[3].config, None);
 
@@ -155,10 +154,10 @@ mod tests {
         radarr_data.main_tabs.tabs[4].route,
         ActiveRadarrBlock::RootFolders.into()
       );
-      assert!(radarr_data.main_tabs.tabs[4].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[4].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[4].contextual_help,
-        Some(build_context_clue_string(&ROOT_FOLDERS_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[4].contextual_help.unwrap(),
+        &ROOT_FOLDERS_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[4].config, None);
 
@@ -167,10 +166,10 @@ mod tests {
         radarr_data.main_tabs.tabs[5].route,
         ActiveRadarrBlock::Indexers.into()
       );
-      assert!(radarr_data.main_tabs.tabs[5].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[5].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[5].contextual_help,
-        Some(build_context_clue_string(&INDEXERS_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[5].contextual_help.unwrap(),
+        &INDEXERS_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[5].config, None);
 
@@ -179,10 +178,10 @@ mod tests {
         radarr_data.main_tabs.tabs[6].route,
         ActiveRadarrBlock::System.into()
       );
-      assert!(radarr_data.main_tabs.tabs[6].help.is_empty());
+      assert!(radarr_data.main_tabs.tabs[6].contextual_help.is_some());
       assert_eq!(
-        radarr_data.main_tabs.tabs[6].contextual_help,
-        Some(build_context_clue_string(&SYSTEM_CONTEXT_CLUES))
+        radarr_data.main_tabs.tabs[6].contextual_help.unwrap(),
+        &SYSTEM_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.main_tabs.tabs[6].config, None);
 
@@ -193,13 +192,13 @@ mod tests {
         radarr_data.movie_info_tabs.tabs[0].route,
         ActiveRadarrBlock::MovieDetails.into()
       );
-      assert_str_eq!(
-        radarr_data.movie_info_tabs.tabs[0].help,
-        build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES)
-      );
       assert!(radarr_data.movie_info_tabs.tabs[0]
         .contextual_help
-        .is_none());
+        .is_some());
+      assert_eq!(
+        radarr_data.movie_info_tabs.tabs[0].contextual_help.unwrap(),
+        &MOVIE_DETAILS_CONTEXT_CLUES
+      );
       assert_eq!(radarr_data.movie_info_tabs.tabs[0].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[1].title, "History");
@@ -207,13 +206,13 @@ mod tests {
         radarr_data.movie_info_tabs.tabs[1].route,
         ActiveRadarrBlock::MovieHistory.into()
       );
-      assert_str_eq!(
-        radarr_data.movie_info_tabs.tabs[1].help,
-        build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES)
-      );
       assert!(radarr_data.movie_info_tabs.tabs[1]
         .contextual_help
-        .is_none());
+        .is_some());
+      assert_eq!(
+        radarr_data.movie_info_tabs.tabs[1].contextual_help.unwrap(),
+        &MOVIE_DETAILS_CONTEXT_CLUES
+      );
       assert_eq!(radarr_data.movie_info_tabs.tabs[1].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[2].title, "File");
@@ -221,13 +220,13 @@ mod tests {
         radarr_data.movie_info_tabs.tabs[2].route,
         ActiveRadarrBlock::FileInfo.into()
       );
-      assert_str_eq!(
-        radarr_data.movie_info_tabs.tabs[2].help,
-        build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES)
-      );
       assert!(radarr_data.movie_info_tabs.tabs[2]
         .contextual_help
-        .is_none());
+        .is_some());
+      assert_eq!(
+        radarr_data.movie_info_tabs.tabs[2].contextual_help.unwrap(),
+        &MOVIE_DETAILS_CONTEXT_CLUES
+      );
       assert_eq!(radarr_data.movie_info_tabs.tabs[2].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[3].title, "Cast");
@@ -235,13 +234,13 @@ mod tests {
         radarr_data.movie_info_tabs.tabs[3].route,
         ActiveRadarrBlock::Cast.into()
       );
-      assert_str_eq!(
-        radarr_data.movie_info_tabs.tabs[3].help,
-        build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES)
-      );
       assert!(radarr_data.movie_info_tabs.tabs[3]
         .contextual_help
-        .is_none());
+        .is_some());
+      assert_eq!(
+        radarr_data.movie_info_tabs.tabs[3].contextual_help.unwrap(),
+        &MOVIE_DETAILS_CONTEXT_CLUES
+      );
       assert_eq!(radarr_data.movie_info_tabs.tabs[3].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[4].title, "Crew");
@@ -249,13 +248,13 @@ mod tests {
         radarr_data.movie_info_tabs.tabs[4].route,
         ActiveRadarrBlock::Crew.into()
       );
-      assert_str_eq!(
-        radarr_data.movie_info_tabs.tabs[4].help,
-        build_context_clue_string(&MOVIE_DETAILS_CONTEXT_CLUES)
-      );
       assert!(radarr_data.movie_info_tabs.tabs[4]
         .contextual_help
-        .is_none());
+        .is_some());
+      assert_eq!(
+        radarr_data.movie_info_tabs.tabs[4].contextual_help.unwrap(),
+        &MOVIE_DETAILS_CONTEXT_CLUES
+      );
       assert_eq!(radarr_data.movie_info_tabs.tabs[4].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[5].title, "Manual Search");
@@ -263,15 +262,12 @@ mod tests {
         radarr_data.movie_info_tabs.tabs[5].route,
         ActiveRadarrBlock::ManualSearch.into()
       );
-      assert_str_eq!(
-        radarr_data.movie_info_tabs.tabs[5].help,
-        build_context_clue_string(&MANUAL_MOVIE_SEARCH_CONTEXT_CLUES)
-      );
+      assert!(radarr_data.movie_info_tabs.tabs[5]
+        .contextual_help
+        .is_some());
       assert_eq!(
-        radarr_data.movie_info_tabs.tabs[5].contextual_help,
-        Some(build_context_clue_string(
-          &MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES
-        ))
+        radarr_data.movie_info_tabs.tabs[5].contextual_help.unwrap(),
+        &MANUAL_MOVIE_SEARCH_CONTEXT_CLUES
       );
       assert_eq!(radarr_data.movie_info_tabs.tabs[5].config, None);
     }
diff --git a/src/models/servarr_data/servarr_data_tests.rs b/src/models/servarr_data/servarr_data_tests.rs
new file mode 100644
index 0000000..5ee250e
--- /dev/null
+++ b/src/models/servarr_data/servarr_data_tests.rs
@@ -0,0 +1,11 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::ActiveKeybindingBlock;
+  use crate::models::Route;
+  use pretty_assertions::assert_eq;
+
+  #[test]
+  fn test_from_active_keybinding_block_to_route() {
+    assert_eq!(Route::from(ActiveKeybindingBlock::Help), Route::Keybindings);
+  }
+}
diff --git a/src/models/servarr_data/sonarr/modals.rs b/src/models/servarr_data/sonarr/modals.rs
index e74b201..0f6f043 100644
--- a/src/models/servarr_data/sonarr/modals.rs
+++ b/src/models/servarr_data/sonarr/modals.rs
@@ -1,16 +1,12 @@
 use strum::IntoEnumIterator;
 
 use super::sonarr_data::{ActiveSonarrBlock, SonarrData};
+use crate::app::sonarr::sonarr_context_clues::SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES;
 use crate::models::sonarr_models::EpisodeFile;
 use crate::{
-  app::{
-    context_clues::build_context_clue_string,
-    sonarr::sonarr_context_clues::{
-      DETAILS_CONTEXTUAL_CONTEXT_CLUES, EPISODE_DETAILS_CONTEXT_CLUES,
-      MANUAL_EPISODE_SEARCH_CONTEXT_CLUES, MANUAL_SEASON_SEARCH_CONTEXT_CLUES,
-      SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES, SEASON_DETAILS_CONTEXT_CLUES,
-      SEASON_HISTORY_CONTEXT_CLUES,
-    },
+  app::sonarr::sonarr_context_clues::{
+    EPISODE_DETAILS_CONTEXT_CLUES, MANUAL_EPISODE_SEARCH_CONTEXT_CLUES,
+    MANUAL_SEASON_SEARCH_CONTEXT_CLUES, SEASON_DETAILS_CONTEXT_CLUES, SEASON_HISTORY_CONTEXT_CLUES,
   },
   models::{
     servarr_data::modals::EditIndexerModal,
@@ -129,13 +125,8 @@ impl From<&SonarrData<'_>> for EditIndexerModal {
       .unwrap()
       .into();
 
-    if seed_ratio_value_option.is_some() {
-      edit_indexer_modal.seed_ratio = seed_ratio_value_option
-        .unwrap()
-        .as_f64()
-        .unwrap()
-        .to_string()
-        .into();
+    if let Some(seed_ratio_value) = seed_ratio_value_option {
+      edit_indexer_modal.seed_ratio = seed_ratio_value.as_f64().unwrap().to_string().into();
     }
 
     edit_indexer_modal.tags = tags
@@ -282,29 +273,25 @@ impl Default for EpisodeDetailsModal {
         TabRoute {
           title: "Details".to_string(),
           route: ActiveSonarrBlock::EpisodeDetails.into(),
-          help: build_context_clue_string(&EPISODE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&EPISODE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "History".to_string(),
           route: ActiveSonarrBlock::EpisodeHistory.into(),
-          help: build_context_clue_string(&EPISODE_DETAILS_CONTEXT_CLUES),
-          contextual_help: Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES)),
+          contextual_help: Some(&SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "File".to_string(),
           route: ActiveSonarrBlock::EpisodeFile.into(),
-          help: build_context_clue_string(&EPISODE_DETAILS_CONTEXT_CLUES),
-          contextual_help: None,
+          contextual_help: Some(&EPISODE_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Manual Search".to_string(),
           route: ActiveSonarrBlock::ManualEpisodeSearch.into(),
-          help: build_context_clue_string(&MANUAL_EPISODE_SEARCH_CONTEXT_CLUES),
-          contextual_help: Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES)),
+          contextual_help: Some(&MANUAL_EPISODE_SEARCH_CONTEXT_CLUES),
           config: None,
         },
       ]),
@@ -333,24 +320,19 @@ impl Default for SeasonDetailsModal {
         TabRoute {
           title: "Episodes".to_string(),
           route: ActiveSonarrBlock::SeasonDetails.into(),
-          help: build_context_clue_string(&SEASON_DETAILS_CONTEXT_CLUES),
-          contextual_help: Some(build_context_clue_string(
-            &SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES,
-          )),
+          contextual_help: Some(&SEASON_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "History".to_string(),
           route: ActiveSonarrBlock::SeasonHistory.into(),
-          help: build_context_clue_string(&SEASON_HISTORY_CONTEXT_CLUES),
-          contextual_help: Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES)),
+          contextual_help: Some(&SEASON_HISTORY_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Manual Search".to_string(),
           route: ActiveSonarrBlock::ManualSeasonSearch.into(),
-          help: build_context_clue_string(&MANUAL_SEASON_SEARCH_CONTEXT_CLUES),
-          contextual_help: Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES)),
+          contextual_help: Some(&MANUAL_SEASON_SEARCH_CONTEXT_CLUES),
           config: None,
         },
       ]),
diff --git a/src/models/servarr_data/sonarr/modals_tests.rs b/src/models/servarr_data/sonarr/modals_tests.rs
index 5ab6fc2..5aa259a 100644
--- a/src/models/servarr_data/sonarr/modals_tests.rs
+++ b/src/models/servarr_data/sonarr/modals_tests.rs
@@ -5,12 +5,10 @@ mod tests {
   use rstest::rstest;
   use strum::IntoEnumIterator;
 
-  use crate::app::context_clues::build_context_clue_string;
   use crate::app::sonarr::sonarr_context_clues::{
-    DETAILS_CONTEXTUAL_CONTEXT_CLUES, EPISODE_DETAILS_CONTEXT_CLUES,
-    MANUAL_EPISODE_SEARCH_CONTEXT_CLUES, MANUAL_SEASON_SEARCH_CONTEXT_CLUES,
-    SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES, SEASON_DETAILS_CONTEXT_CLUES,
-    SEASON_HISTORY_CONTEXT_CLUES,
+    EPISODE_DETAILS_CONTEXT_CLUES, MANUAL_EPISODE_SEARCH_CONTEXT_CLUES,
+    MANUAL_SEASON_SEARCH_CONTEXT_CLUES, SEASON_DETAILS_CONTEXT_CLUES, SEASON_HISTORY_CONTEXT_CLUES,
+    SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES,
   };
   use crate::models::servarr_data::sonarr::modals::{
     EditSeriesModal, EpisodeDetailsModal, SeasonDetailsModal,
@@ -257,13 +255,15 @@ mod tests {
       episode_details_modal.episode_details_tabs.tabs[0].route,
       ActiveSonarrBlock::EpisodeDetails.into()
     );
-    assert_str_eq!(
-      episode_details_modal.episode_details_tabs.tabs[0].help,
-      build_context_clue_string(&EPISODE_DETAILS_CONTEXT_CLUES)
-    );
     assert!(episode_details_modal.episode_details_tabs.tabs[0]
       .contextual_help
-      .is_none());
+      .is_some());
+    assert_eq!(
+      episode_details_modal.episode_details_tabs.tabs[0]
+        .contextual_help
+        .unwrap(),
+      &EPISODE_DETAILS_CONTEXT_CLUES
+    );
     assert_eq!(
       episode_details_modal.episode_details_tabs.tabs[0].config,
       None
@@ -277,13 +277,14 @@ mod tests {
       episode_details_modal.episode_details_tabs.tabs[1].route,
       ActiveSonarrBlock::EpisodeHistory.into()
     );
-    assert_str_eq!(
-      episode_details_modal.episode_details_tabs.tabs[1].help,
-      build_context_clue_string(&EPISODE_DETAILS_CONTEXT_CLUES)
-    );
+    assert!(episode_details_modal.episode_details_tabs.tabs[1]
+      .contextual_help
+      .is_some());
     assert_eq!(
-      episode_details_modal.episode_details_tabs.tabs[1].contextual_help,
-      Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
+      episode_details_modal.episode_details_tabs.tabs[1]
+        .contextual_help
+        .unwrap(),
+      &SELECTABLE_EPISODE_DETAILS_CONTEXT_CLUES
     );
     assert_eq!(
       episode_details_modal.episode_details_tabs.tabs[1].config,
@@ -298,13 +299,15 @@ mod tests {
       episode_details_modal.episode_details_tabs.tabs[2].route,
       ActiveSonarrBlock::EpisodeFile.into()
     );
-    assert_str_eq!(
-      episode_details_modal.episode_details_tabs.tabs[2].help,
-      build_context_clue_string(&EPISODE_DETAILS_CONTEXT_CLUES)
-    );
     assert!(episode_details_modal.episode_details_tabs.tabs[2]
       .contextual_help
-      .is_none());
+      .is_some());
+    assert_eq!(
+      episode_details_modal.episode_details_tabs.tabs[2]
+        .contextual_help
+        .unwrap(),
+      &EPISODE_DETAILS_CONTEXT_CLUES
+    );
     assert_eq!(
       episode_details_modal.episode_details_tabs.tabs[2].config,
       None
@@ -318,13 +321,14 @@ mod tests {
       episode_details_modal.episode_details_tabs.tabs[3].route,
       ActiveSonarrBlock::ManualEpisodeSearch.into()
     );
-    assert_str_eq!(
-      episode_details_modal.episode_details_tabs.tabs[3].help,
-      build_context_clue_string(&MANUAL_EPISODE_SEARCH_CONTEXT_CLUES)
-    );
+    assert!(episode_details_modal.episode_details_tabs.tabs[3]
+      .contextual_help
+      .is_some());
     assert_eq!(
-      episode_details_modal.episode_details_tabs.tabs[3].contextual_help,
-      Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
+      episode_details_modal.episode_details_tabs.tabs[3]
+        .contextual_help
+        .unwrap(),
+      &MANUAL_EPISODE_SEARCH_CONTEXT_CLUES
     );
     assert_eq!(
       episode_details_modal.episode_details_tabs.tabs[3].config,
@@ -352,15 +356,14 @@ mod tests {
       season_details_modal.season_details_tabs.tabs[0].route,
       ActiveSonarrBlock::SeasonDetails.into()
     );
-    assert_str_eq!(
-      season_details_modal.season_details_tabs.tabs[0].help,
-      build_context_clue_string(&SEASON_DETAILS_CONTEXT_CLUES)
-    );
+    assert!(season_details_modal.season_details_tabs.tabs[0]
+      .contextual_help
+      .is_some());
     assert_eq!(
-      season_details_modal.season_details_tabs.tabs[0].contextual_help,
-      Some(build_context_clue_string(
-        &SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES
-      ))
+      season_details_modal.season_details_tabs.tabs[0]
+        .contextual_help
+        .unwrap(),
+      &SEASON_DETAILS_CONTEXT_CLUES
     );
     assert_eq!(
       season_details_modal.season_details_tabs.tabs[0].config,
@@ -375,13 +378,14 @@ mod tests {
       season_details_modal.season_details_tabs.tabs[1].route,
       ActiveSonarrBlock::SeasonHistory.into()
     );
-    assert_str_eq!(
-      season_details_modal.season_details_tabs.tabs[1].help,
-      build_context_clue_string(&SEASON_HISTORY_CONTEXT_CLUES)
-    );
+    assert!(season_details_modal.season_details_tabs.tabs[1]
+      .contextual_help
+      .is_some());
     assert_eq!(
-      season_details_modal.season_details_tabs.tabs[1].contextual_help,
-      Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
+      season_details_modal.season_details_tabs.tabs[1]
+        .contextual_help
+        .unwrap(),
+      &SEASON_HISTORY_CONTEXT_CLUES
     );
     assert_eq!(
       season_details_modal.season_details_tabs.tabs[1].config,
@@ -396,13 +400,14 @@ mod tests {
       season_details_modal.season_details_tabs.tabs[2].route,
       ActiveSonarrBlock::ManualSeasonSearch.into()
     );
-    assert_str_eq!(
-      season_details_modal.season_details_tabs.tabs[2].help,
-      build_context_clue_string(&MANUAL_SEASON_SEARCH_CONTEXT_CLUES)
-    );
+    assert!(season_details_modal.season_details_tabs.tabs[2]
+      .contextual_help
+      .is_some());
     assert_eq!(
-      season_details_modal.season_details_tabs.tabs[2].contextual_help,
-      Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
+      season_details_modal.season_details_tabs.tabs[2]
+        .contextual_help
+        .unwrap(),
+      &MANUAL_SEASON_SEARCH_CONTEXT_CLUES
     );
     assert_eq!(
       season_details_modal.season_details_tabs.tabs[2].config,
diff --git a/src/models/servarr_data/sonarr/sonarr_data.rs b/src/models/servarr_data/sonarr/sonarr_data.rs
index 3275e91..6caa97d 100644
--- a/src/models/servarr_data/sonarr/sonarr_data.rs
+++ b/src/models/servarr_data/sonarr/sonarr_data.rs
@@ -5,8 +5,8 @@ use strum::EnumIter;
 use crate::{
   app::{
     context_clues::{
-      build_context_clue_string, BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES,
-      INDEXERS_CONTEXT_CLUES, ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+      BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES,
+      ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
     },
     sonarr::sonarr_context_clues::{
       HISTORY_CONTEXT_CLUES, SERIES_CONTEXT_CLUES, SERIES_DETAILS_CONTEXT_CLUES,
@@ -130,50 +130,43 @@ impl<'a> Default for SonarrData<'a> {
         TabRoute {
           title: "Library".to_string(),
           route: ActiveSonarrBlock::Series.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&SERIES_CONTEXT_CLUES)),
+          contextual_help: Some(&SERIES_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Downloads".to_string(),
           route: ActiveSonarrBlock::Downloads.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&DOWNLOADS_CONTEXT_CLUES)),
+          contextual_help: Some(&DOWNLOADS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Blocklist".to_string(),
           route: ActiveSonarrBlock::Blocklist.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&BLOCKLIST_CONTEXT_CLUES)),
+          contextual_help: Some(&BLOCKLIST_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "History".to_string(),
           route: ActiveSonarrBlock::History.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&HISTORY_CONTEXT_CLUES)),
+          contextual_help: Some(&HISTORY_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Root Folders".to_string(),
           route: ActiveSonarrBlock::RootFolders.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&ROOT_FOLDERS_CONTEXT_CLUES)),
+          contextual_help: Some(&ROOT_FOLDERS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "Indexers".to_string(),
           route: ActiveSonarrBlock::Indexers.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&INDEXERS_CONTEXT_CLUES)),
+          contextual_help: Some(&INDEXERS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "System".to_string(),
           route: ActiveSonarrBlock::System.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&SYSTEM_CONTEXT_CLUES)),
+          contextual_help: Some(&SYSTEM_CONTEXT_CLUES),
           config: None,
         },
       ]),
@@ -181,15 +174,13 @@ impl<'a> Default for SonarrData<'a> {
         TabRoute {
           title: "Seasons".to_string(),
           route: ActiveSonarrBlock::SeriesDetails.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&SERIES_DETAILS_CONTEXT_CLUES)),
+          contextual_help: Some(&SERIES_DETAILS_CONTEXT_CLUES),
           config: None,
         },
         TabRoute {
           title: "History".to_string(),
           route: ActiveSonarrBlock::SeriesHistory.into(),
-          help: String::new(),
-          contextual_help: Some(build_context_clue_string(&SERIES_HISTORY_CONTEXT_CLUES)),
+          contextual_help: Some(&SERIES_HISTORY_CONTEXT_CLUES),
           config: None,
         },
       ]),
diff --git a/src/models/servarr_data/sonarr/sonarr_data_tests.rs b/src/models/servarr_data/sonarr/sonarr_data_tests.rs
index 2ddd1e8..9b666dd 100644
--- a/src/models/servarr_data/sonarr/sonarr_data_tests.rs
+++ b/src/models/servarr_data/sonarr/sonarr_data_tests.rs
@@ -10,8 +10,8 @@ mod tests {
     use crate::{
       app::{
         context_clues::{
-          build_context_clue_string, BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES,
-          INDEXERS_CONTEXT_CLUES, ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
+          BLOCKLIST_CONTEXT_CLUES, DOWNLOADS_CONTEXT_CLUES, INDEXERS_CONTEXT_CLUES,
+          ROOT_FOLDERS_CONTEXT_CLUES, SYSTEM_CONTEXT_CLUES,
         },
         sonarr::sonarr_context_clues::{
           HISTORY_CONTEXT_CLUES, SERIES_CONTEXT_CLUES, SERIES_DETAILS_CONTEXT_CLUES,
@@ -123,10 +123,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[0].route,
         ActiveSonarrBlock::Series.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[0].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[0].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[0].contextual_help,
-        Some(build_context_clue_string(&SERIES_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[0].contextual_help.unwrap(),
+        &SERIES_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[0].config, None);
 
@@ -135,10 +135,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[1].route,
         ActiveSonarrBlock::Downloads.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[1].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[1].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[1].contextual_help,
-        Some(build_context_clue_string(&DOWNLOADS_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[1].contextual_help.unwrap(),
+        &DOWNLOADS_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[1].config, None);
 
@@ -147,10 +147,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[2].route,
         ActiveSonarrBlock::Blocklist.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[2].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[2].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[2].contextual_help,
-        Some(build_context_clue_string(&BLOCKLIST_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[2].contextual_help.unwrap(),
+        &BLOCKLIST_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[2].config, None);
 
@@ -159,10 +159,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[3].route,
         ActiveSonarrBlock::History.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[3].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[3].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[3].contextual_help,
-        Some(build_context_clue_string(&HISTORY_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[3].contextual_help.unwrap(),
+        &HISTORY_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[3].config, None);
 
@@ -171,10 +171,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[4].route,
         ActiveSonarrBlock::RootFolders.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[4].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[4].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[4].contextual_help,
-        Some(build_context_clue_string(&ROOT_FOLDERS_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[4].contextual_help.unwrap(),
+        &ROOT_FOLDERS_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[4].config, None);
 
@@ -183,10 +183,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[5].route,
         ActiveSonarrBlock::Indexers.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[5].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[5].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[5].contextual_help,
-        Some(build_context_clue_string(&INDEXERS_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[5].contextual_help.unwrap(),
+        &INDEXERS_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[5].config, None);
 
@@ -195,10 +195,10 @@ mod tests {
         sonarr_data.main_tabs.tabs[6].route,
         ActiveSonarrBlock::System.into()
       );
-      assert!(sonarr_data.main_tabs.tabs[6].help.is_empty());
+      assert!(sonarr_data.main_tabs.tabs[6].contextual_help.is_some());
       assert_eq!(
-        sonarr_data.main_tabs.tabs[6].contextual_help,
-        Some(build_context_clue_string(&SYSTEM_CONTEXT_CLUES))
+        sonarr_data.main_tabs.tabs[6].contextual_help.unwrap(),
+        &SYSTEM_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.main_tabs.tabs[6].config, None);
 
@@ -209,10 +209,14 @@ mod tests {
         sonarr_data.series_info_tabs.tabs[0].route,
         ActiveSonarrBlock::SeriesDetails.into()
       );
-      assert!(sonarr_data.series_info_tabs.tabs[0].help.is_empty());
+      assert!(sonarr_data.series_info_tabs.tabs[0]
+        .contextual_help
+        .is_some());
       assert_eq!(
-        sonarr_data.series_info_tabs.tabs[0].contextual_help,
-        Some(build_context_clue_string(&SERIES_DETAILS_CONTEXT_CLUES))
+        sonarr_data.series_info_tabs.tabs[0]
+          .contextual_help
+          .unwrap(),
+        &SERIES_DETAILS_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.series_info_tabs.tabs[0].config, None);
 
@@ -221,10 +225,14 @@ mod tests {
         sonarr_data.series_info_tabs.tabs[1].route,
         ActiveSonarrBlock::SeriesHistory.into()
       );
-      assert!(sonarr_data.series_info_tabs.tabs[1].help.is_empty());
+      assert!(sonarr_data.series_info_tabs.tabs[1]
+        .contextual_help
+        .is_some());
       assert_eq!(
-        sonarr_data.series_info_tabs.tabs[1].contextual_help,
-        Some(build_context_clue_string(&SERIES_HISTORY_CONTEXT_CLUES))
+        sonarr_data.series_info_tabs.tabs[1]
+          .contextual_help
+          .unwrap(),
+        &SERIES_HISTORY_CONTEXT_CLUES
       );
       assert_eq!(sonarr_data.series_info_tabs.tabs[1].config, None);
     }
diff --git a/src/models/servarr_models.rs b/src/models/servarr_models.rs
index 3a8b740..8c039bb 100644
--- a/src/models/servarr_models.rs
+++ b/src/models/servarr_models.rs
@@ -107,6 +107,13 @@ pub struct EditIndexerParams {
   pub clear_tags: bool,
 }
 
+#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub struct KeybindingItem {
+  pub key: String,
+  pub alt_key: String,
+  pub desc: String,
+}
+
 #[derive(Default, Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct HostConfig {
@@ -146,6 +153,23 @@ pub struct Indexer {
   pub tags: Vec<Number>,
 }
 
+#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct IndexerTestResult {
+  #[serde(deserialize_with = "super::from_i64")]
+  pub id: i64,
+  pub is_valid: bool,
+  pub validation_failures: Vec<IndexerValidationFailure>,
+}
+
+#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct IndexerValidationFailure {
+  pub property_name: String,
+  pub error_message: String,
+  pub severity: String,
+}
+
 #[derive(Default, Deserialize, Serialize, Debug, Clone, Eq, PartialEq)]
 pub struct IndexerField {
   pub name: Option<String>,
diff --git a/src/models/sonarr_models.rs b/src/models/sonarr_models.rs
index 4e0dbc2..1a9886e 100644
--- a/src/models/sonarr_models.rs
+++ b/src/models/sonarr_models.rs
@@ -1,6 +1,6 @@
 use std::fmt::{Display, Formatter};
 
-use crate::serde_enum_from;
+use crate::{models::servarr_models::IndexerTestResult, serde_enum_from};
 use chrono::{DateTime, Utc};
 use clap::ValueEnum;
 use derivative::Derivative;
@@ -11,7 +11,6 @@ use strum::EnumIter;
 use strum_macros::Display;
 
 use super::{
-  radarr_models::IndexerTestResult,
   servarr_models::{
     DiskSpace, HostConfig, Indexer, Language, LogResponse, QualityProfile, QualityWrapper,
     QueueEvent, RootFolder, SecurityConfig, Tag, Update,
@@ -253,7 +252,7 @@ pub struct MediaInfo {
   pub video_bit_depth: i64,
   #[serde(deserialize_with = "super::from_i64")]
   pub video_bitrate: i64,
-  pub video_codec: String,
+  pub video_codec: Option<String>,
   #[derivative(Default(value = "Number::from(0)"))]
   pub video_fps: Number,
   pub resolution: String,
@@ -288,7 +287,7 @@ pub struct Season {
   #[serde(deserialize_with = "super::from_i64")]
   pub season_number: i64,
   pub monitored: bool,
-  pub statistics: SeasonStatistics,
+  pub statistics: Option<SeasonStatistics>,
 }
 
 #[derive(Derivative, Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
diff --git a/src/models/sonarr_models_tests.rs b/src/models/sonarr_models_tests.rs
index be82201..632bacb 100644
--- a/src/models/sonarr_models_tests.rs
+++ b/src/models/sonarr_models_tests.rs
@@ -4,10 +4,9 @@ mod tests {
   use serde_json::json;
 
   use crate::models::{
-    radarr_models::IndexerTestResult,
     servarr_models::{
-      DiskSpace, HostConfig, Indexer, Language, Log, LogResponse, QualityProfile, QueueEvent,
-      RootFolder, SecurityConfig, Tag, Update,
+      DiskSpace, HostConfig, Indexer, IndexerTestResult, Language, Log, LogResponse,
+      QualityProfile, QueueEvent, RootFolder, SecurityConfig, Tag, Update,
     },
     sonarr_models::{
       AddSeriesSearchResult, BlocklistItem, BlocklistResponse, DownloadRecord, DownloadStatus,
diff --git a/src/models/stateful_table.rs b/src/models/stateful_table.rs
index fcc4dd6..cd2cc28 100644
--- a/src/models/stateful_table.rs
+++ b/src/models/stateful_table.rs
@@ -1,5 +1,7 @@
 use crate::models::stateful_list::StatefulList;
-use crate::models::{strip_non_search_characters, HorizontallyScrollableText, Scrollable};
+use crate::models::{
+  strip_non_search_characters, HorizontallyScrollableText, Paginated, Scrollable,
+};
 use ratatui::widgets::TableState;
 use std::cmp::Ordering;
 use std::fmt::Debug;
@@ -8,7 +10,7 @@ use std::fmt::Debug;
 #[path = "stateful_table_tests.rs"]
 mod stateful_table_tests;
 
-#[derive(Clone, PartialEq, Eq, Debug, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct SortOption<T>
 where
   T: Clone + PartialEq + Eq + Debug,
@@ -17,6 +19,17 @@ where
   pub cmp_fn: Option<fn(&T, &T) -> Ordering>,
 }
 
+impl<T> PartialEq for SortOption<T>
+where
+  T: Clone + PartialEq + Eq + Debug,
+{
+  fn eq(&self, other: &Self) -> bool {
+    self.name == other.name
+  }
+}
+
+impl<T> Eq for SortOption<T> where T: Clone + PartialEq + Eq + Debug {}
+
 #[derive(Default)]
 pub struct StatefulTable<T>
 where
@@ -151,6 +164,79 @@ where
   }
 }
 
+impl<T> Paginated for StatefulTable<T>
+where
+  T: Clone + PartialEq + Eq + Debug,
+{
+  fn page_down(&mut self) {
+    if let Some(filtered_items) = self.filtered_items.as_ref() {
+      if filtered_items.is_empty() {
+        return;
+      }
+
+      match self.filtered_state.as_ref().unwrap().selected() {
+        Some(i) => {
+          self
+            .filtered_state
+            .as_mut()
+            .unwrap()
+            .select(Some(i.saturating_add(20) % (filtered_items.len() - 1)));
+        }
+        None => self.filtered_state.as_mut().unwrap().select_first(),
+      };
+
+      return;
+    }
+
+    if self.items.is_empty() {
+      return;
+    }
+
+    match self.state.selected() {
+      Some(i) => {
+        self
+          .state
+          .select(Some(i.saturating_add(20) % (self.items.len() - 1)));
+      }
+      None => self.state.select_first(),
+    };
+  }
+
+  fn page_up(&mut self) {
+    if let Some(filtered_items) = self.filtered_items.as_ref() {
+      if filtered_items.is_empty() {
+        return;
+      }
+
+      match self.filtered_state.as_ref().unwrap().selected() {
+        Some(i) => {
+          let len = filtered_items.len() - 1;
+          self
+            .filtered_state
+            .as_mut()
+            .unwrap()
+            .select(Some((i + len - (20 % len)) % len));
+        }
+        None => self.filtered_state.as_mut().unwrap().select_last(),
+      };
+
+      return;
+    }
+
+    if self.items.is_empty() {
+      return;
+    }
+
+    match self.state.selected() {
+      Some(i) => {
+        let len = self.items.len() - 1;
+        self.state.select(Some((i + len - (20 % len)) % len));
+      }
+      None => self.state.select_last(),
+    };
+  }
+}
+
 impl<T> StatefulTable<T>
 where
   T: Clone + PartialEq + Eq + Debug + Default,
diff --git a/src/models/stateful_table_tests.rs b/src/models/stateful_table_tests.rs
index f87e417..924160b 100644
--- a/src/models/stateful_table_tests.rs
+++ b/src/models/stateful_table_tests.rs
@@ -1,9 +1,10 @@
 #[cfg(test)]
 mod tests {
   use crate::models::stateful_table::{SortOption, StatefulTable};
-  use crate::models::Scrollable;
+  use crate::models::{Paginated, Scrollable};
   use pretty_assertions::{assert_eq, assert_str_eq};
   use ratatui::widgets::TableState;
+  use std::iter;
 
   #[test]
   fn test_stateful_table_scrolling_on_empty_table_performs_no_op() {
@@ -190,6 +191,174 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_stateful_table_pagination_on_empty_table_performs_no_op() {
+    let mut stateful_table: StatefulTable<String> = StatefulTable::default();
+
+    assert_eq!(stateful_table.state.selected(), None);
+
+    stateful_table.page_down();
+
+    assert_eq!(stateful_table.state.selected(), None);
+
+    stateful_table.page_up();
+
+    assert_eq!(stateful_table.state.selected(), None);
+  }
+
+  #[test]
+  fn test_stateful_table_filtered_pagination_on_empty_table_performs_no_op() {
+    let mut filtered_stateful_table: StatefulTable<String> = StatefulTable {
+      filtered_items: Some(Vec::new()),
+      filtered_state: Some(TableState::default()),
+      ..StatefulTable::default()
+    };
+
+    assert_eq!(
+      filtered_stateful_table
+        .filtered_state
+        .as_ref()
+        .unwrap()
+        .selected(),
+      None
+    );
+
+    filtered_stateful_table.page_down();
+
+    assert_eq!(
+      filtered_stateful_table
+        .filtered_state
+        .as_ref()
+        .unwrap()
+        .selected(),
+      None
+    );
+
+    filtered_stateful_table.page_up();
+
+    assert_eq!(
+      filtered_stateful_table
+        .filtered_state
+        .as_ref()
+        .unwrap()
+        .selected(),
+      None
+    );
+  }
+
+  #[test]
+  fn test_stateful_table_pagination() {
+    let mut stateful_table = StatefulTable::default();
+    let mut curr = 0;
+    stateful_table.set_filtered_items(
+      iter::repeat_with(|| {
+        let tmp = curr;
+        curr += 1;
+        tmp
+      })
+      .take(100)
+      .collect(),
+    );
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(0)
+    );
+
+    stateful_table.page_down();
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(20)
+    );
+
+    stateful_table.page_up();
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(0)
+    );
+
+    stateful_table.page_up();
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(stateful_table.filtered_items.as_ref().unwrap().len() - 21)
+    );
+
+    stateful_table.page_down();
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(0)
+    );
+
+    stateful_table.scroll_down();
+    stateful_table.page_up();
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(stateful_table.filtered_items.as_ref().unwrap().len() - 20)
+    );
+
+    stateful_table.scroll_down();
+    stateful_table.page_down();
+
+    assert_eq!(
+      stateful_table.filtered_state.as_ref().unwrap().selected(),
+      Some(2)
+    );
+  }
+
+  #[test]
+  fn test_stateful_table_filtered_items_pagination() {
+    let mut stateful_table = StatefulTable::default();
+    let mut curr = 0;
+    stateful_table.set_items(
+      iter::repeat_with(|| {
+        let tmp = curr;
+        curr += 1;
+        tmp
+      })
+      .take(100)
+      .collect(),
+    );
+
+    assert_eq!(stateful_table.state.selected(), Some(0));
+
+    stateful_table.page_down();
+
+    assert_eq!(stateful_table.state.selected(), Some(20));
+
+    stateful_table.page_up();
+
+    assert_eq!(stateful_table.state.selected(), Some(0));
+
+    stateful_table.page_up();
+
+    assert_eq!(
+      stateful_table.state.selected(),
+      Some(stateful_table.items.len() - 21)
+    );
+
+    stateful_table.page_down();
+
+    assert_eq!(stateful_table.state.selected(), Some(0));
+
+    stateful_table.scroll_down();
+    stateful_table.page_up();
+
+    assert_eq!(
+      stateful_table.state.selected(),
+      Some(stateful_table.items.len() - 20)
+    );
+
+    stateful_table.scroll_down();
+    stateful_table.page_down();
+
+    assert_eq!(stateful_table.state.selected(), Some(2));
+  }
+
   #[test]
   fn test_stateful_table_set_items() {
     let items_vec = vec!["Test 1", "Test 2", "Test 3"];
diff --git a/src/network/mod.rs b/src/network/mod.rs
index 164a976..8f28b1f 100644
--- a/src/network/mod.rs
+++ b/src/network/mod.rs
@@ -19,6 +19,7 @@ use crate::models::Serdeable;
 use crate::network::radarr_network::RadarrEvent;
 #[cfg(test)]
 use mockall::automock;
+use reqwest::header::HeaderMap;
 
 pub mod radarr_network;
 pub mod sonarr_network;
@@ -167,28 +168,36 @@ impl<'a, 'b> Network<'a, 'b> {
       method,
       body,
       api_token,
+      custom_headers,
       ..
     } = request_props;
     debug!("Creating RequestBuilder for resource: {uri:?}");
     debug!("Sending {method:?} request to {uri} with body {body:?}");
 
     match method {
-      RequestMethod::Get => self.client.get(uri).header("X-Api-Key", api_token),
+      RequestMethod::Get => self
+        .client
+        .get(uri)
+        .header("X-Api-Key", api_token)
+        .headers(custom_headers),
       RequestMethod::Post => self
         .client
         .post(uri)
         .json(&body.unwrap_or_default())
-        .header("X-Api-Key", api_token),
+        .header("X-Api-Key", api_token)
+        .headers(custom_headers),
       RequestMethod::Put => self
         .client
         .put(uri)
         .json(&body.unwrap_or_default())
-        .header("X-Api-Key", api_token),
+        .header("X-Api-Key", api_token)
+        .headers(custom_headers),
       RequestMethod::Delete => self
         .client
         .delete(uri)
         .json(&body.unwrap_or_default())
-        .header("X-Api-Key", api_token),
+        .header("X-Api-Key", api_token)
+        .headers(custom_headers),
     }
   }
 
@@ -212,6 +221,7 @@ impl<'a, 'b> Network<'a, 'b> {
       uri,
       api_token,
       ssl_cert_path,
+      custom_headers: custom_headers_option,
       ..
     } = app
       .server_tabs
@@ -245,12 +255,15 @@ impl<'a, 'b> Network<'a, 'b> {
       uri = format!("{uri}?{params}");
     }
 
+    let custom_headers = custom_headers_option.clone().unwrap_or_default();
+
     RequestProps {
       uri,
       method,
       body,
       api_token: api_token.as_ref().expect("API token not found").clone(),
       ignore_status_code: false,
+      custom_headers,
     }
   }
 }
@@ -270,4 +283,5 @@ pub struct RequestProps<T: Serialize + Debug> {
   pub body: Option<T>,
   pub api_token: String,
   pub ignore_status_code: bool,
+  pub custom_headers: HeaderMap,
 }
diff --git a/src/network/network_tests.rs b/src/network/network_tests.rs
index 58cef91..6329fb1 100644
--- a/src/network/network_tests.rs
+++ b/src/network/network_tests.rs
@@ -6,6 +6,7 @@ mod tests {
 
   use mockito::{Mock, Server, ServerGuard};
   use pretty_assertions::assert_str_eq;
+  use reqwest::header::HeaderMap;
   use reqwest::Client;
   use rstest::rstest;
   use serde::{Deserialize, Serialize};
@@ -81,6 +82,7 @@ mod tests {
           }),
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |_, _| (),
       )
@@ -105,6 +107,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |response, mut app| app.error = HorizontallyScrollableText::from(response.value),
       )
@@ -138,6 +141,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: true,
+          custom_headers: HeaderMap::new(),
         },
         |response, _app| test_result = response.value,
       )
@@ -176,6 +180,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |_, _| (),
       )
@@ -229,6 +234,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |response, mut app| app.error = HorizontallyScrollableText::from(response.value),
       )
@@ -261,6 +267,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |response, mut app| app.error = HorizontallyScrollableText::from(response.value),
       )
@@ -301,6 +308,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |response, mut app| app.error = HorizontallyScrollableText::from(response.value),
       )
@@ -331,6 +339,7 @@ mod tests {
           body: None,
           api_token: "test1234".to_owned(),
           ignore_status_code: false,
+          custom_headers: HeaderMap::new(),
         },
         |response, mut app| app.error = HorizontallyScrollableText::from(response.value),
       )
@@ -363,8 +372,11 @@ mod tests {
     let mut async_server = server
       .mock(&request_method.to_string().to_uppercase(), "/test")
       .match_header("X-Api-Key", "test1234")
+      .match_header("X-Custom-Header", "CustomValue")
       .with_status(200);
     let mut body = None::<Test>;
+    let mut custom_headers = HeaderMap::new();
+    custom_headers.insert("X-Custom-Header", "CustomValue".parse().unwrap());
 
     if request_method == RequestMethod::Post {
       async_server = async_server.with_body(
@@ -388,6 +400,7 @@ mod tests {
         body,
         api_token: "test1234".to_owned(),
         ignore_status_code: false,
+        custom_headers,
       })
       .await
       .send()
@@ -440,6 +453,7 @@ mod tests {
     assert_eq!(request_props.method, RequestMethod::Get);
     assert_eq!(request_props.body, None);
     assert!(request_props.api_token.is_empty());
+    assert!(request_props.custom_headers.is_empty());
   }
 
   #[rstest]
@@ -476,6 +490,47 @@ mod tests {
     assert_eq!(request_props.method, RequestMethod::Get);
     assert_eq!(request_props.body, None);
     assert_str_eq!(request_props.api_token, api_token);
+    assert!(request_props.custom_headers.is_empty());
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_request_props_from_custom_config_custom_headers(
+    #[values(RadarrEvent::GetMovies, SonarrEvent::ListSeries)] network_event: impl Into<NetworkEvent>
+      + NetworkResource,
+  ) {
+    let api_token = "testToken1234".to_owned();
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
+    let resource = network_event.resource();
+    let mut header_map = HeaderMap::new();
+    header_map.insert("X-Custom-Header", "CustomValue".parse().unwrap());
+    let servarr_config = ServarrConfig {
+      host: Some("192.168.0.123".to_owned()),
+      port: Some(8080),
+      api_token: Some(api_token.clone()),
+      ssl_cert_path: Some("/test/cert.crt".to_owned()),
+      custom_headers: Some(header_map.clone()),
+      ..ServarrConfig::default()
+    };
+    {
+      let mut app = app_arc.lock().await;
+      app.server_tabs.tabs[0].config = Some(servarr_config.clone());
+      app.server_tabs.tabs[1].config = Some(servarr_config);
+    }
+    let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    let request_props = network
+      .request_props_from(network_event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    assert_str_eq!(
+      request_props.uri,
+      format!("https://192.168.0.123:8080/api/v3{resource}")
+    );
+    assert_eq!(request_props.method, RequestMethod::Get);
+    assert_eq!(request_props.body, None);
+    assert_str_eq!(request_props.api_token, api_token);
+    assert_eq!(request_props.custom_headers, header_map);
   }
 
   #[rstest]
@@ -510,6 +565,7 @@ mod tests {
     assert_eq!(request_props.method, RequestMethod::Get);
     assert_eq!(request_props.body, None);
     assert_str_eq!(request_props.api_token, api_token);
+    assert!(request_props.custom_headers.is_empty());
   }
 
   #[rstest]
@@ -546,6 +602,7 @@ mod tests {
     assert_eq!(request_props.method, RequestMethod::Get);
     assert_eq!(request_props.body, None);
     assert!(request_props.api_token.is_empty());
+    assert!(request_props.custom_headers.is_empty());
   }
 
   #[rstest]
@@ -588,6 +645,7 @@ mod tests {
     assert_eq!(request_props.method, RequestMethod::Get);
     assert_eq!(request_props.body, None);
     assert_str_eq!(request_props.api_token, api_token);
+    assert!(request_props.custom_headers.is_empty());
   }
 
   #[rstest]
@@ -628,6 +686,7 @@ mod tests {
     assert_eq!(request_props.method, RequestMethod::Get);
     assert_eq!(request_props.body, None);
     assert_str_eq!(request_props.api_token, api_token);
+    assert!(request_props.custom_headers.is_empty());
   }
 
   #[derive(Clone, Serialize, Deserialize, Debug, Default, PartialEq, Eq)]
diff --git a/src/network/radarr_network.rs b/src/network/radarr_network.rs
deleted file mode 100644
index 757cbc4..0000000
--- a/src/network/radarr_network.rs
+++ /dev/null
@@ -1,1877 +0,0 @@
-use anyhow::Result;
-use std::fmt::Debug;
-
-use indoc::formatdoc;
-use log::{debug, info};
-use serde_json::{json, Value};
-use urlencoding::encode;
-
-use crate::models::radarr_models::{
-  AddMovieBody, AddMovieSearchResult, BlocklistResponse, Collection, Credit, CreditType,
-  DeleteMovieParams, DownloadRecord, DownloadsResponse, EditCollectionParams, EditMovieParams,
-  IndexerSettings, IndexerTestResult, Movie, MovieCommandBody, MovieHistoryItem, RadarrRelease,
-  RadarrReleaseDownloadBody, RadarrSerdeable, RadarrTask, RadarrTaskName, SystemStatus,
-};
-use crate::models::servarr_data::modals::IndexerTestResultModalItem;
-use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
-use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
-use crate::models::servarr_models::{
-  AddRootFolderBody, CommandBody, DiskSpace, EditIndexerParams, HostConfig, Indexer, LogResponse,
-  QualityProfile, QueueEvent, RootFolder, SecurityConfig, Tag, Update,
-};
-use crate::models::stateful_table::StatefulTable;
-use crate::models::{HorizontallyScrollableText, Route, Scrollable, ScrollableText};
-use crate::network::{Network, NetworkEvent, RequestMethod};
-use crate::utils::{convert_runtime, convert_to_gb};
-
-use super::NetworkResource;
-
-#[cfg(test)]
-#[path = "radarr_network_tests.rs"]
-mod radarr_network_tests;
-
-#[derive(Debug, Eq, PartialEq, Clone)]
-pub enum RadarrEvent {
-  AddMovie(AddMovieBody),
-  AddRootFolder(AddRootFolderBody),
-  AddTag(String),
-  ClearBlocklist,
-  DeleteBlocklistItem(i64),
-  DeleteDownload(i64),
-  DeleteIndexer(i64),
-  DeleteMovie(DeleteMovieParams),
-  DeleteRootFolder(i64),
-  DeleteTag(i64),
-  DownloadRelease(RadarrReleaseDownloadBody),
-  EditAllIndexerSettings(IndexerSettings),
-  EditCollection(EditCollectionParams),
-  EditIndexer(EditIndexerParams),
-  EditMovie(EditMovieParams),
-  GetBlocklist,
-  GetCollections,
-  GetDownloads,
-  GetHostConfig,
-  GetIndexers,
-  GetAllIndexerSettings,
-  GetLogs(u64),
-  GetMovieCredits(i64),
-  GetMovieDetails(i64),
-  GetMovieHistory(i64),
-  GetMovies,
-  GetDiskSpace,
-  GetQualityProfiles,
-  GetQueuedEvents,
-  GetReleases(i64),
-  GetRootFolders,
-  GetSecurityConfig,
-  GetStatus,
-  GetTags,
-  GetTasks,
-  GetUpdates,
-  HealthCheck,
-  SearchNewMovie(String),
-  StartTask(RadarrTaskName),
-  TestIndexer(i64),
-  TestAllIndexers,
-  TriggerAutomaticSearch(i64),
-  UpdateAllMovies,
-  UpdateAndScan(i64),
-  UpdateCollections,
-  UpdateDownloads,
-}
-
-impl NetworkResource for RadarrEvent {
-  fn resource(&self) -> &'static str {
-    match &self {
-      RadarrEvent::ClearBlocklist => "/blocklist/bulk",
-      RadarrEvent::DeleteBlocklistItem(_) => "/blocklist",
-      RadarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
-      RadarrEvent::GetCollections | RadarrEvent::EditCollection(_) => "/collection",
-      RadarrEvent::GetDownloads | RadarrEvent::DeleteDownload(_) => "/queue",
-      RadarrEvent::GetHostConfig | RadarrEvent::GetSecurityConfig => "/config/host",
-      RadarrEvent::GetIndexers | RadarrEvent::EditIndexer(_) | RadarrEvent::DeleteIndexer(_) => {
-        "/indexer"
-      }
-      RadarrEvent::GetAllIndexerSettings | RadarrEvent::EditAllIndexerSettings(_) => {
-        "/config/indexer"
-      }
-      RadarrEvent::GetLogs(_) => "/log",
-      RadarrEvent::AddMovie(_)
-      | RadarrEvent::EditMovie(_)
-      | RadarrEvent::GetMovies
-      | RadarrEvent::GetMovieDetails(_)
-      | RadarrEvent::DeleteMovie(_) => "/movie",
-      RadarrEvent::SearchNewMovie(_) => "/movie/lookup",
-      RadarrEvent::GetMovieCredits(_) => "/credit",
-      RadarrEvent::GetMovieHistory(_) => "/history/movie",
-      RadarrEvent::GetDiskSpace => "/diskspace",
-      RadarrEvent::GetQualityProfiles => "/qualityprofile",
-      RadarrEvent::GetReleases(_) | RadarrEvent::DownloadRelease(_) => "/release",
-      RadarrEvent::AddRootFolder(_)
-      | RadarrEvent::GetRootFolders
-      | RadarrEvent::DeleteRootFolder(_) => "/rootfolder",
-      RadarrEvent::GetStatus => "/system/status",
-      RadarrEvent::GetTags | RadarrEvent::AddTag(_) | RadarrEvent::DeleteTag(_) => "/tag",
-      RadarrEvent::GetTasks => "/system/task",
-      RadarrEvent::GetUpdates => "/update",
-      RadarrEvent::TestIndexer(_) => "/indexer/test",
-      RadarrEvent::TestAllIndexers => "/indexer/testall",
-      RadarrEvent::StartTask(_)
-      | RadarrEvent::GetQueuedEvents
-      | RadarrEvent::TriggerAutomaticSearch(_)
-      | RadarrEvent::UpdateAndScan(_)
-      | RadarrEvent::UpdateAllMovies
-      | RadarrEvent::UpdateDownloads
-      | RadarrEvent::UpdateCollections => "/command",
-      RadarrEvent::HealthCheck => "/health",
-    }
-  }
-}
-
-impl From<RadarrEvent> for NetworkEvent {
-  fn from(radarr_event: RadarrEvent) -> Self {
-    NetworkEvent::Radarr(radarr_event)
-  }
-}
-
-impl Network<'_, '_> {
-  pub async fn handle_radarr_event(
-    &mut self,
-    radarr_event: RadarrEvent,
-  ) -> Result<RadarrSerdeable> {
-    match radarr_event {
-      RadarrEvent::AddMovie(body) => self.add_movie(body).await.map(RadarrSerdeable::from),
-      RadarrEvent::AddRootFolder(path) => self
-        .add_radarr_root_folder(path)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::AddTag(tag) => self.add_radarr_tag(tag).await.map(RadarrSerdeable::from),
-      RadarrEvent::ClearBlocklist => self
-        .clear_radarr_blocklist()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
-        .delete_radarr_blocklist_item(blocklist_item_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::DeleteDownload(download_id) => self
-        .delete_radarr_download(download_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::DeleteIndexer(indexer_id) => self
-        .delete_radarr_indexer(indexer_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::DeleteMovie(params) => {
-        self.delete_movie(params).await.map(RadarrSerdeable::from)
-      }
-      RadarrEvent::DeleteRootFolder(root_folder_id) => self
-        .delete_radarr_root_folder(root_folder_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::DeleteTag(tag_id) => self
-        .delete_radarr_tag(tag_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::DownloadRelease(params) => self
-        .download_radarr_release(params)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::EditAllIndexerSettings(params) => self
-        .edit_all_radarr_indexer_settings(params)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::EditCollection(params) => self
-        .edit_collection(params)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::EditIndexer(params) => self
-        .edit_radarr_indexer(params)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::EditMovie(params) => self.edit_movie(params).await.map(RadarrSerdeable::from),
-      RadarrEvent::GetAllIndexerSettings => self
-        .get_all_radarr_indexer_settings()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetBlocklist => self.get_radarr_blocklist().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetCollections => self.get_collections().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetDownloads => self.get_radarr_downloads().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetHostConfig => self
-        .get_radarr_host_config()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetIndexers => self.get_radarr_indexers().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetLogs(events) => self
-        .get_radarr_logs(events)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetMovieCredits(movie_id) => {
-        self.get_credits(movie_id).await.map(RadarrSerdeable::from)
-      }
-      RadarrEvent::GetMovieDetails(movie_id) => self
-        .get_movie_details(movie_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetMovieHistory(movie_id) => self
-        .get_movie_history(movie_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetMovies => self.get_movies().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetDiskSpace => self.get_radarr_diskspace().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetQualityProfiles => self
-        .get_radarr_quality_profiles()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetQueuedEvents => self
-        .get_queued_radarr_events()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetReleases(movie_id) => self
-        .get_movie_releases(movie_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetRootFolders => self
-        .get_radarr_root_folders()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetSecurityConfig => self
-        .get_radarr_security_config()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::GetStatus => self.get_radarr_status().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetTags => self.get_radarr_tags().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetTasks => self.get_radarr_tasks().await.map(RadarrSerdeable::from),
-      RadarrEvent::GetUpdates => self.get_radarr_updates().await.map(RadarrSerdeable::from),
-      RadarrEvent::HealthCheck => self
-        .get_radarr_healthcheck()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::SearchNewMovie(query) => {
-        self.search_movie(query).await.map(RadarrSerdeable::from)
-      }
-      RadarrEvent::StartTask(task_name) => self
-        .start_radarr_task(task_name)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::TestIndexer(indexer_id) => self
-        .test_radarr_indexer(indexer_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::TestAllIndexers => self
-        .test_all_radarr_indexers()
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::TriggerAutomaticSearch(movie_id) => self
-        .trigger_automatic_movie_search(movie_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::UpdateAllMovies => self.update_all_movies().await.map(RadarrSerdeable::from),
-      RadarrEvent::UpdateAndScan(movie_id) => self
-        .update_and_scan_movie(movie_id)
-        .await
-        .map(RadarrSerdeable::from),
-      RadarrEvent::UpdateCollections => self.update_collections().await.map(RadarrSerdeable::from),
-      RadarrEvent::UpdateDownloads => self
-        .update_radarr_downloads()
-        .await
-        .map(RadarrSerdeable::from),
-    }
-  }
-
-  async fn add_movie(&mut self, mut add_movie_body: AddMovieBody) -> Result<Value> {
-    info!("Adding new movie to Radarr");
-    let event = RadarrEvent::AddMovie(AddMovieBody::default());
-    if let Some(tag_input_str) = add_movie_body.tag_input_string.as_ref() {
-      let tag_ids_vec = self.extract_and_add_radarr_tag_ids_vec(tag_input_str).await;
-      add_movie_body.tags = tag_ids_vec;
-    }
-
-    debug!("Add movie body: {add_movie_body:?}");
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(add_movie_body), None, None)
-      .await;
-
-    self
-      .handle_request::<AddMovieBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn add_radarr_root_folder(
-    &mut self,
-    add_root_folder_body: AddRootFolderBody,
-  ) -> Result<Value> {
-    info!("Adding new root folder to Radarr");
-    let event = RadarrEvent::AddRootFolder(AddRootFolderBody::default());
-
-    debug!("Add root folder body: {add_root_folder_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        Some(add_root_folder_body),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<AddRootFolderBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn add_radarr_tag(&mut self, tag: String) -> Result<Tag> {
-    info!("Adding a new Radarr tag");
-    let event = RadarrEvent::AddTag(String::new());
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        Some(json!({ "label": tag })),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, Tag>(request_props, |tag, mut app| {
-        app.data.radarr_data.tags_map.insert(tag.id, tag.label);
-      })
-      .await
-  }
-
-  async fn delete_radarr_tag(&mut self, id: i64) -> Result<()> {
-    info!("Deleting Radarr tag with id: {id}");
-    let event = RadarrEvent::DeleteTag(id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn clear_radarr_blocklist(&mut self) -> Result<()> {
-    info!("Clearing Radarr blocklist");
-    let event = RadarrEvent::ClearBlocklist;
-
-    let ids = self
-      .app
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .blocklist
-      .items
-      .iter()
-      .map(|item| item.id)
-      .collect::<Vec<i64>>();
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        Some(json!({"ids": ids})),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_radarr_blocklist_item(&mut self, blocklist_item_id: i64) -> Result<()> {
-    let event = RadarrEvent::DeleteBlocklistItem(blocklist_item_id);
-
-    info!("Deleting Radarr blocklist item for item with id: {blocklist_item_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{blocklist_item_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_radarr_download(&mut self, download_id: i64) -> Result<()> {
-    let event = RadarrEvent::DeleteDownload(download_id);
-    info!("Deleting Radarr download for download with id: {download_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{download_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_radarr_indexer(&mut self, indexer_id: i64) -> Result<()> {
-    let event = RadarrEvent::DeleteIndexer(indexer_id);
-    info!("Deleting Radarr indexer for indexer with id: {indexer_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{indexer_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_movie(&mut self, delete_movie_params: DeleteMovieParams) -> Result<()> {
-    let event = RadarrEvent::DeleteMovie(DeleteMovieParams::default());
-    let DeleteMovieParams {
-      id,
-      delete_movie_files,
-      add_list_exclusion,
-    } = delete_movie_params;
-    info!("Deleting Radarr movie with ID: {id} with deleteFiles={delete_movie_files} and addImportExclusion={add_list_exclusion}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{id}")),
-        Some(format!(
-          "deleteFiles={delete_movie_files}&addImportExclusion={add_list_exclusion}"
-        )),
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_radarr_root_folder(&mut self, root_folder_id: i64) -> Result<()> {
-    let event = RadarrEvent::DeleteRootFolder(root_folder_id);
-    info!("Deleting Radarr root folder for folder with id: {root_folder_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{root_folder_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn download_radarr_release(&mut self, params: RadarrReleaseDownloadBody) -> Result<Value> {
-    let event = RadarrEvent::DownloadRelease(RadarrReleaseDownloadBody::default());
-    info!("Downloading Radarr release with params: {params:?}");
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(params), None, None)
-      .await;
-
-    self
-      .handle_request::<RadarrReleaseDownloadBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn edit_all_radarr_indexer_settings(&mut self, params: IndexerSettings) -> Result<Value> {
-    info!("Updating Radarr indexer settings");
-    let event = RadarrEvent::EditAllIndexerSettings(IndexerSettings::default());
-
-    debug!("Indexer settings body: {params:?}");
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Put, Some(params), None, None)
-      .await;
-
-    self
-      .handle_request::<IndexerSettings, Value>(request_props, |_, _| {})
-      .await
-  }
-
-  async fn edit_collection(&mut self, edit_collection_params: EditCollectionParams) -> Result<()> {
-    info!("Editing Radarr collection");
-    let detail_event = RadarrEvent::GetCollections;
-    let event = RadarrEvent::EditCollection(EditCollectionParams::default());
-    info!("Fetching collection details");
-    let collection_id = edit_collection_params.collection_id;
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{collection_id}")),
-        None,
-      )
-      .await;
-
-    let mut response = String::new();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_collection_body, _| {
-        response = detailed_collection_body.to_string()
-      })
-      .await?;
-
-    info!("Constructing edit collection body");
-
-    let mut detailed_collection_body: Value = serde_json::from_str(&response)?;
-    let (monitored, minimum_availability, quality_profile_id, root_folder_path, search_on_add) = {
-      let monitored = edit_collection_params.monitored.unwrap_or_else(|| {
-        detailed_collection_body["monitored"]
-          .as_bool()
-          .expect("Unable to deserialize 'monitored' bool")
-      });
-      let minimum_availability = edit_collection_params
-        .minimum_availability
-        .unwrap_or_else(|| {
-          serde_json::from_value(detailed_collection_body["minimumAvailability"].clone())
-            .expect("Unable to deserialize 'minimumAvailability'")
-        })
-        .to_string();
-      let quality_profile_id = edit_collection_params
-        .quality_profile_id
-        .unwrap_or_else(|| {
-          detailed_collection_body["qualityProfileId"]
-            .as_i64()
-            .expect("Unable to deserialize 'qualityProfileId'")
-        });
-      let root_folder_path = edit_collection_params.root_folder_path.unwrap_or_else(|| {
-        detailed_collection_body["rootFolderPath"]
-          .as_str()
-          .expect("Unable to deserialize 'rootFolderPath'")
-          .to_owned()
-      });
-      let search_on_add = edit_collection_params.search_on_add.unwrap_or_else(|| {
-        detailed_collection_body["searchOnAdd"]
-          .as_bool()
-          .expect("Unable to deserialize 'searchOnAdd'")
-      });
-
-      (
-        monitored,
-        minimum_availability,
-        quality_profile_id,
-        root_folder_path,
-        search_on_add,
-      )
-    };
-
-    *detailed_collection_body.get_mut("monitored").unwrap() = json!(monitored);
-    *detailed_collection_body
-      .get_mut("minimumAvailability")
-      .unwrap() = json!(minimum_availability);
-    *detailed_collection_body
-      .get_mut("qualityProfileId")
-      .unwrap() = json!(quality_profile_id);
-    *detailed_collection_body.get_mut("rootFolderPath").unwrap() = json!(root_folder_path);
-    *detailed_collection_body.get_mut("searchOnAdd").unwrap() = json!(search_on_add);
-
-    debug!("Edit collection body: {detailed_collection_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Put,
-        Some(detailed_collection_body),
-        Some(format!("/{collection_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn edit_radarr_indexer(
-    &mut self,
-    mut edit_indexer_params: EditIndexerParams,
-  ) -> Result<()> {
-    let detail_event = RadarrEvent::GetIndexers;
-    let event = RadarrEvent::EditIndexer(EditIndexerParams::default());
-    let id = edit_indexer_params.indexer_id;
-    if let Some(tag_input_str) = edit_indexer_params.tag_input_string.as_ref() {
-      let tag_ids_vec = self.extract_and_add_radarr_tag_ids_vec(tag_input_str).await;
-      edit_indexer_params.tags = Some(tag_ids_vec);
-    }
-    info!("Updating Radarr indexer with ID: {id}");
-
-    info!("Fetching indexer details for indexer with ID: {id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{id}")),
-        None,
-      )
-      .await;
-
-    let mut response = String::new();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
-        response = detailed_indexer_body.to_string()
-      })
-      .await?;
-
-    info!("Constructing edit indexer body");
-
-    let mut detailed_indexer_body: Value = serde_json::from_str(&response)?;
-
-    let (
-      name,
-      enable_rss,
-      enable_automatic_search,
-      enable_interactive_search,
-      url,
-      api_key,
-      seed_ratio,
-      tags,
-      priority,
-    ) = {
-      let priority = detailed_indexer_body["priority"]
-        .as_i64()
-        .expect("Unable to deserialize 'priority'");
-      let seed_ratio_field_option = detailed_indexer_body["fields"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .find(|field| field["name"] == "seedCriteria.seedRatio");
-      let name = edit_indexer_params.name.unwrap_or(
-        detailed_indexer_body["name"]
-          .as_str()
-          .expect("Unable to deserialize 'name'")
-          .to_owned(),
-      );
-      let enable_rss = edit_indexer_params.enable_rss.unwrap_or(
-        detailed_indexer_body["enableRss"]
-          .as_bool()
-          .expect("Unable to deserialize 'enableRss'"),
-      );
-      let enable_automatic_search = edit_indexer_params.enable_automatic_search.unwrap_or(
-        detailed_indexer_body["enableAutomaticSearch"]
-          .as_bool()
-          .expect("Unable to deserialize 'enableAutomaticSearch"),
-      );
-      let enable_interactive_search = edit_indexer_params.enable_interactive_search.unwrap_or(
-        detailed_indexer_body["enableInteractiveSearch"]
-          .as_bool()
-          .expect("Unable to deserialize 'enableInteractiveSearch'"),
-      );
-      let url = edit_indexer_params.url.unwrap_or(
-        detailed_indexer_body["fields"]
-          .as_array()
-          .expect("Unable to deserialize 'fields'")
-          .iter()
-          .find(|field| field["name"] == "baseUrl")
-          .expect("Field 'baseUrl' was not found in the 'fields' array")
-          .get("value")
-          .unwrap_or(&json!(""))
-          .as_str()
-          .expect("Unable to deserialize 'baseUrl value'")
-          .to_owned(),
-      );
-      let api_key = edit_indexer_params.api_key.unwrap_or(
-        detailed_indexer_body["fields"]
-          .as_array()
-          .expect("Unable to deserialize 'fields'")
-          .iter()
-          .find(|field| field["name"] == "apiKey")
-          .expect("Field 'apiKey' was not found in the 'fields' array")
-          .get("value")
-          .unwrap_or(&json!(""))
-          .as_str()
-          .expect("Unable to deserialize 'apiKey value'")
-          .to_owned(),
-      );
-      let seed_ratio = edit_indexer_params.seed_ratio.unwrap_or_else(|| {
-        if let Some(seed_ratio_field) = seed_ratio_field_option {
-          return seed_ratio_field
-            .get("value")
-            .unwrap_or(&json!(""))
-            .as_str()
-            .expect("Unable to deserialize 'seedCriteria.seedRatio value'")
-            .to_owned();
-        }
-
-        String::new()
-      });
-      let tags = if edit_indexer_params.clear_tags {
-        vec![]
-      } else {
-        edit_indexer_params.tags.unwrap_or(
-          detailed_indexer_body["tags"]
-            .as_array()
-            .expect("Unable to deserialize 'tags'")
-            .iter()
-            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
-            .collect(),
-        )
-      };
-      let priority = edit_indexer_params.priority.unwrap_or(priority);
-
-      (
-        name,
-        enable_rss,
-        enable_automatic_search,
-        enable_interactive_search,
-        url,
-        api_key,
-        seed_ratio,
-        tags,
-        priority,
-      )
-    };
-
-    *detailed_indexer_body.get_mut("name").unwrap() = json!(name);
-    *detailed_indexer_body.get_mut("priority").unwrap() = json!(priority);
-    *detailed_indexer_body.get_mut("enableRss").unwrap() = json!(enable_rss);
-    *detailed_indexer_body
-      .get_mut("enableAutomaticSearch")
-      .unwrap() = json!(enable_automatic_search);
-    *detailed_indexer_body
-      .get_mut("enableInteractiveSearch")
-      .unwrap() = json!(enable_interactive_search);
-    *detailed_indexer_body
-      .get_mut("fields")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|field| field["name"] == "baseUrl")
-      .unwrap()
-      .get_mut("value")
-      .unwrap() = json!(url);
-    *detailed_indexer_body
-      .get_mut("fields")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|field| field["name"] == "apiKey")
-      .unwrap()
-      .get_mut("value")
-      .unwrap() = json!(api_key);
-    *detailed_indexer_body.get_mut("tags").unwrap() = json!(tags);
-    let seed_ratio_field_option = detailed_indexer_body
-      .get_mut("fields")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|field| field["name"] == "seedCriteria.seedRatio");
-    if let Some(seed_ratio_field) = seed_ratio_field_option {
-      seed_ratio_field
-        .as_object_mut()
-        .unwrap()
-        .insert("value".to_string(), json!(seed_ratio));
-    }
-
-    debug!("Edit indexer body: {detailed_indexer_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Put,
-        Some(detailed_indexer_body),
-        Some(format!("/{id}")),
-        Some("forceSave=true".to_owned()),
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn edit_movie(&mut self, mut edit_movie_params: EditMovieParams) -> Result<()> {
-    info!("Editing Radarr movie");
-    let movie_id = edit_movie_params.movie_id;
-    let detail_event = RadarrEvent::GetMovieDetails(movie_id);
-    let event = RadarrEvent::EditMovie(EditMovieParams::default());
-    if let Some(tag_input_str) = edit_movie_params.tag_input_string.as_ref() {
-      let tag_ids_vec = self.extract_and_add_radarr_tag_ids_vec(tag_input_str).await;
-      edit_movie_params.tags = Some(tag_ids_vec);
-    }
-
-    info!("Fetching movie details for movie with ID: {movie_id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{movie_id}")),
-        None,
-      )
-      .await;
-
-    let mut response = String::new();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_movie_body, _| {
-        response = detailed_movie_body.to_string()
-      })
-      .await?;
-
-    info!("Constructing edit movie body");
-
-    let mut detailed_movie_body: Value = serde_json::from_str(&response)?;
-    let (monitored, minimum_availability, quality_profile_id, root_folder_path, tags) = {
-      let monitored = edit_movie_params.monitored.unwrap_or(
-        detailed_movie_body["monitored"]
-          .as_bool()
-          .expect("Unable to deserialize 'monitored'"),
-      );
-      let minimum_availability = edit_movie_params
-        .minimum_availability
-        .unwrap_or_else(|| {
-          serde_json::from_value(detailed_movie_body["minimumAvailability"].clone())
-            .expect("Unable to deserialize 'minimumAvailability'")
-        })
-        .to_string();
-      let quality_profile_id = edit_movie_params.quality_profile_id.unwrap_or_else(|| {
-        detailed_movie_body["qualityProfileId"]
-          .as_i64()
-          .expect("Unable to deserialize 'qualityProfileId'")
-      });
-      let root_folder_path = edit_movie_params.root_folder_path.unwrap_or_else(|| {
-        detailed_movie_body["path"]
-          .as_str()
-          .expect("Unable to deserialize 'path'")
-          .to_owned()
-      });
-      let tags = if edit_movie_params.clear_tags {
-        vec![]
-      } else {
-        edit_movie_params.tags.unwrap_or(
-          detailed_movie_body["tags"]
-            .as_array()
-            .expect("Unable to deserialize 'tags'")
-            .iter()
-            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
-            .collect(),
-        )
-      };
-
-      (
-        monitored,
-        minimum_availability,
-        quality_profile_id,
-        root_folder_path,
-        tags,
-      )
-    };
-
-    *detailed_movie_body.get_mut("monitored").unwrap() = json!(monitored);
-    *detailed_movie_body.get_mut("minimumAvailability").unwrap() = json!(minimum_availability);
-    *detailed_movie_body.get_mut("qualityProfileId").unwrap() = json!(quality_profile_id);
-    *detailed_movie_body.get_mut("path").unwrap() = json!(root_folder_path);
-    *detailed_movie_body.get_mut("tags").unwrap() = json!(tags);
-
-    debug!("Edit movie body: {detailed_movie_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Put,
-        Some(detailed_movie_body),
-        Some(format!("/{movie_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_radarr_blocklist(&mut self) -> Result<BlocklistResponse> {
-    info!("Fetching Radarr blocklist");
-    let event = RadarrEvent::GetBlocklist;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), BlocklistResponse>(request_props, |blocklist_resp, mut app| {
-        if !matches!(
-          app.get_current_route(),
-          Route::Radarr(ActiveRadarrBlock::BlocklistSortPrompt, _)
-        ) {
-          let mut blocklist_vec = blocklist_resp.records;
-          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app.data.radarr_data.blocklist.set_items(blocklist_vec);
-          app.data.radarr_data.blocklist.apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_collections(&mut self) -> Result<Vec<Collection>> {
-    info!("Fetching Radarr collections");
-    let event = RadarrEvent::GetCollections;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Collection>>(request_props, |mut collections_vec, mut app| {
-        if !matches!(
-          app.get_current_route(),
-          Route::Radarr(ActiveRadarrBlock::CollectionsSortPrompt, _)
-        ) {
-          collections_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app.data.radarr_data.collections.set_items(collections_vec);
-          app.data.radarr_data.collections.apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_credits(&mut self, movie_id: i64) -> Result<Vec<Credit>> {
-    info!("Fetching Radarr movie credits");
-    let event = RadarrEvent::GetMovieCredits(movie_id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("movieId={movie_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<Credit>>(request_props, |credit_vec, mut app| {
-        let cast_vec: Vec<Credit> = credit_vec
-          .iter()
-          .filter(|&credit| credit.credit_type == CreditType::Cast)
-          .cloned()
-          .collect();
-        let crew_vec: Vec<Credit> = credit_vec
-          .iter()
-          .filter(|&credit| credit.credit_type == CreditType::Crew)
-          .cloned()
-          .collect();
-
-        if app.data.radarr_data.movie_details_modal.is_none() {
-          app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
-        }
-
-        app
-          .data
-          .radarr_data
-          .movie_details_modal
-          .as_mut()
-          .unwrap()
-          .movie_cast
-          .set_items(cast_vec);
-        app
-          .data
-          .radarr_data
-          .movie_details_modal
-          .as_mut()
-          .unwrap()
-          .movie_crew
-          .set_items(crew_vec);
-      })
-      .await
-  }
-
-  async fn get_radarr_diskspace(&mut self) -> Result<Vec<DiskSpace>> {
-    info!("Fetching Radarr disk space");
-    let event = RadarrEvent::GetDiskSpace;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<DiskSpace>>(request_props, |disk_space_vec, mut app| {
-        app.data.radarr_data.disk_space_vec = disk_space_vec;
-      })
-      .await
-  }
-
-  async fn get_radarr_downloads(&mut self) -> Result<DownloadsResponse> {
-    info!("Fetching Radarr downloads");
-    let event = RadarrEvent::GetDownloads;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), DownloadsResponse>(request_props, |queue_response, mut app| {
-        app
-          .data
-          .radarr_data
-          .downloads
-          .set_items(queue_response.records);
-      })
-      .await
-  }
-
-  async fn get_radarr_host_config(&mut self) -> Result<HostConfig> {
-    info!("Fetching Radarr host config");
-    let event = RadarrEvent::GetHostConfig;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), HostConfig>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_radarr_indexers(&mut self) -> Result<Vec<Indexer>> {
-    info!("Fetching Radarr indexers");
-    let event = RadarrEvent::GetIndexers;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Indexer>>(request_props, |indexers, mut app| {
-        app.data.radarr_data.indexers.set_items(indexers);
-      })
-      .await
-  }
-
-  async fn get_all_radarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
-    info!("Fetching Radarr indexer settings");
-    let event = RadarrEvent::GetAllIndexerSettings;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), IndexerSettings>(request_props, |indexer_settings, mut app| {
-        if app.data.radarr_data.indexer_settings.is_none() {
-          app.data.radarr_data.indexer_settings = Some(indexer_settings);
-        } else {
-          debug!("Indexer Settings are being modified. Ignoring update...");
-        }
-      })
-      .await
-  }
-
-  async fn get_radarr_healthcheck(&mut self) -> Result<()> {
-    info!("Performing Radarr health check");
-    let event = RadarrEvent::HealthCheck;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_radarr_logs(&mut self, events: u64) -> Result<LogResponse> {
-    info!("Fetching Radarr logs");
-    let event = RadarrEvent::GetLogs(events);
-
-    let params = format!("pageSize={}&sortDirection=descending&sortKey=time", events);
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
-      .await;
-
-    self
-      .handle_request::<(), LogResponse>(request_props, |log_response, mut app| {
-        let mut logs = log_response.records;
-        logs.reverse();
-
-        let log_lines = logs
-          .into_iter()
-          .map(|log| {
-            if log.exception.is_some() {
-              HorizontallyScrollableText::from(format!(
-                "{}|{}|{}|{}|{}",
-                log.time,
-                log.level.to_uppercase(),
-                log.logger.as_ref().unwrap(),
-                log.exception_type.as_ref().unwrap(),
-                log.exception.as_ref().unwrap()
-              ))
-            } else {
-              HorizontallyScrollableText::from(format!(
-                "{}|{}|{}|{}",
-                log.time,
-                log.level.to_uppercase(),
-                log.logger.as_ref().unwrap(),
-                log.message.as_ref().unwrap()
-              ))
-            }
-          })
-          .collect();
-
-        app.data.radarr_data.logs.set_items(log_lines);
-        app.data.radarr_data.logs.scroll_to_bottom();
-      })
-      .await
-  }
-
-  async fn get_movie_details(&mut self, movie_id: i64) -> Result<Movie> {
-    info!("Fetching Radarr movie details");
-    let event = RadarrEvent::GetMovieDetails(movie_id);
-
-    info!("Fetching movie details for movie with ID: {movie_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{movie_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), Movie>(request_props, |movie_response, mut app| {
-        let Movie {
-          id,
-          title,
-          year,
-          overview,
-          path,
-          studio,
-          has_file,
-          quality_profile_id,
-          size_on_disk,
-          genres,
-          runtime,
-          certification,
-          ratings,
-          movie_file,
-          collection,
-          ..
-        } = movie_response;
-        let (hours, minutes) = convert_runtime(runtime);
-        let size = convert_to_gb(size_on_disk);
-        let quality_profile = app
-          .data
-          .radarr_data
-          .quality_profile_map
-          .get_by_left(&quality_profile_id)
-          .unwrap_or(&"".to_owned())
-          .to_owned();
-        let imdb_rating = if let Some(rating) = ratings.imdb {
-          if let Some(value) = rating.value.as_f64() {
-            format!("{:.1}", value)
-          } else {
-            String::new()
-          }
-        } else {
-          String::new()
-        };
-
-        let tmdb_rating = if let Some(rating) = ratings.tmdb {
-          if let Some(value) = rating.value.as_f64() {
-            format!("{}%", (value * 10f64).ceil())
-          } else {
-            String::new()
-          }
-        } else {
-          String::new()
-        };
-
-        let rotten_tomatoes_rating = if let Some(rating) = ratings.rotten_tomatoes {
-          if let Some(value) = rating.value.as_u64() {
-            format!("{}%", value)
-          } else {
-            String::new()
-          }
-        } else {
-          String::new()
-        };
-
-        let status = get_movie_status(has_file, &app.data.radarr_data.downloads.items, id);
-        let collection = collection.unwrap_or_default();
-
-        let mut movie_details_modal = MovieDetailsModal {
-          movie_details: ScrollableText::with_string(formatdoc!(
-            "Title: {title}
-            Year: {year}
-            Runtime: {hours}h {minutes}m
-            Rating: {}
-            Collection: {}
-            Status: {status}
-            Description: {overview}
-            TMDB: {tmdb_rating}
-            IMDB: {imdb_rating}
-            Rotten Tomatoes: {rotten_tomatoes_rating}
-            Quality Profile: {quality_profile}
-            Size: {size:.2} GB
-            Path: {path}
-            Studio: {studio}
-            Genres: {}",
-            certification.unwrap_or_default(),
-            collection
-              .title
-              .as_ref()
-              .unwrap_or(&String::new())
-              .to_owned(),
-            genres.join(", ")
-          )),
-          ..MovieDetailsModal::default()
-        };
-
-        if let Some(file) = movie_file {
-          movie_details_modal.file_details = formatdoc!(
-            "Relative Path: {}
-              Absolute Path: {}
-              Size: {size:.2} GB
-              Date Added: {}",
-            file.relative_path,
-            file.path,
-            file.date_added
-          );
-
-          if let Some(media_info) = file.media_info {
-            movie_details_modal.audio_details = formatdoc!(
-              "Bitrate: {}
-              Channels: {:.1}
-              Codec: {}
-              Languages: {}
-              Stream Count: {}",
-              media_info.audio_bitrate,
-              media_info.audio_channels.as_f64().unwrap(),
-              media_info.audio_codec.unwrap_or_default(),
-              media_info.audio_languages.unwrap_or_default(),
-              media_info.audio_stream_count
-            );
-
-            movie_details_modal.video_details = formatdoc!(
-              "Bit Depth: {}
-              Bitrate: {}
-              Codec: {}
-              FPS: {}
-              Resolution: {}
-              Scan Type: {}
-              Runtime: {}",
-              media_info.video_bit_depth,
-              media_info.video_bitrate,
-              media_info.video_codec,
-              media_info.video_fps.as_f64().unwrap(),
-              media_info.resolution,
-              media_info.scan_type,
-              media_info.run_time
-            );
-          }
-        }
-
-        app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
-      })
-      .await
-  }
-
-  async fn get_movie_history(&mut self, movie_id: i64) -> Result<Vec<MovieHistoryItem>> {
-    info!("Fetching Radarr movie history");
-    let event = RadarrEvent::GetMovieHistory(movie_id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("movieId={movie_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<MovieHistoryItem>>(request_props, |movie_history_vec, mut app| {
-        let mut reversed_movie_history_vec = movie_history_vec.to_vec();
-        reversed_movie_history_vec.reverse();
-
-        if app.data.radarr_data.movie_details_modal.is_none() {
-          app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default())
-        }
-
-        app
-          .data
-          .radarr_data
-          .movie_details_modal
-          .as_mut()
-          .unwrap()
-          .movie_history
-          .set_items(reversed_movie_history_vec)
-      })
-      .await
-  }
-
-  async fn get_movies(&mut self) -> Result<Vec<Movie>> {
-    info!("Fetching Radarr library");
-    let event = RadarrEvent::GetMovies;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Movie>>(request_props, |mut movie_vec, mut app| {
-        if !matches!(
-          app.get_current_route(),
-          Route::Radarr(ActiveRadarrBlock::MoviesSortPrompt, _)
-        ) {
-          movie_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app.data.radarr_data.movies.set_items(movie_vec);
-          app.data.radarr_data.movies.apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_radarr_quality_profiles(&mut self) -> Result<Vec<QualityProfile>> {
-    info!("Fetching Radarr quality profiles");
-    let event = RadarrEvent::GetQualityProfiles;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<QualityProfile>>(request_props, |quality_profiles, mut app| {
-        app.data.radarr_data.quality_profile_map = quality_profiles
-          .into_iter()
-          .map(|profile| (profile.id, profile.name))
-          .collect();
-      })
-      .await
-  }
-
-  async fn get_queued_radarr_events(&mut self) -> Result<Vec<QueueEvent>> {
-    info!("Fetching Radarr queued events");
-    let event = RadarrEvent::GetQueuedEvents;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<QueueEvent>>(request_props, |queued_events_vec, mut app| {
-        app
-          .data
-          .radarr_data
-          .queued_events
-          .set_items(queued_events_vec);
-      })
-      .await
-  }
-
-  async fn get_movie_releases(&mut self, movie_id: i64) -> Result<Vec<RadarrRelease>> {
-    info!("Fetching releases for movie with ID: {movie_id}");
-    let event = RadarrEvent::GetReleases(movie_id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("movieId={movie_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<RadarrRelease>>(request_props, |release_vec, mut app| {
-        if app.data.radarr_data.movie_details_modal.is_none() {
-          app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
-        }
-
-        app
-          .data
-          .radarr_data
-          .movie_details_modal
-          .as_mut()
-          .unwrap()
-          .movie_releases
-          .set_items(release_vec);
-      })
-      .await
-  }
-
-  async fn get_radarr_root_folders(&mut self) -> Result<Vec<RootFolder>> {
-    info!("Fetching Radarr root folders");
-    let event = RadarrEvent::GetRootFolders;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<RootFolder>>(request_props, |root_folders, mut app| {
-        app.data.radarr_data.root_folders.set_items(root_folders);
-      })
-      .await
-  }
-
-  async fn get_radarr_security_config(&mut self) -> Result<SecurityConfig> {
-    info!("Fetching Radarr security config");
-    let event = RadarrEvent::GetSecurityConfig;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), SecurityConfig>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_radarr_status(&mut self) -> Result<SystemStatus> {
-    info!("Fetching Radarr system status");
-    let event = RadarrEvent::GetStatus;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), SystemStatus>(request_props, |system_status, mut app| {
-        app.data.radarr_data.version = system_status.version;
-        app.data.radarr_data.start_time = system_status.start_time;
-      })
-      .await
-  }
-
-  async fn get_radarr_tags(&mut self) -> Result<Vec<Tag>> {
-    info!("Fetching Radarr tags");
-    let event = RadarrEvent::GetTags;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Tag>>(request_props, |tags_vec, mut app| {
-        app.data.radarr_data.tags_map = tags_vec
-          .into_iter()
-          .map(|tag| (tag.id, tag.label))
-          .collect();
-      })
-      .await
-  }
-
-  async fn get_radarr_tasks(&mut self) -> Result<Vec<RadarrTask>> {
-    info!("Fetching Radarr tasks");
-    let event = RadarrEvent::GetTasks;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<RadarrTask>>(request_props, |tasks_vec, mut app| {
-        app.data.radarr_data.tasks.set_items(tasks_vec);
-      })
-      .await
-  }
-
-  async fn get_radarr_updates(&mut self) -> Result<Vec<Update>> {
-    info!("Fetching Radarr updates");
-    let event = RadarrEvent::GetUpdates;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Update>>(request_props, |updates_vec, mut app| {
-        let latest_installed = if updates_vec
-          .iter()
-          .any(|update| update.latest && update.installed_on.is_some())
-        {
-          "already".to_owned()
-        } else {
-          "not".to_owned()
-        };
-        let updates = updates_vec
-          .into_iter()
-          .map(|update| {
-            let install_status = if update.installed_on.is_some() {
-              if update.installed {
-                "(Currently Installed)".to_owned()
-              } else {
-                "(Previously Installed)".to_owned()
-              }
-            } else {
-              String::new()
-            };
-            let vec_to_bullet_points = |vec: Vec<String>| {
-              vec
-                .iter()
-                .map(|change| format!("  * {change}"))
-                .collect::<Vec<String>>()
-                .join("\n")
-            };
-
-            let mut update_info = formatdoc!(
-              "{} - {} {install_status}
-              {}",
-              update.version,
-              update.release_date,
-              "-".repeat(200)
-            );
-
-            if let Some(new_changes) = update.changes.new {
-              let changes = vec_to_bullet_points(new_changes);
-              update_info = formatdoc!(
-                "{update_info}
-              New:
-              {changes}"
-              )
-            }
-
-            if let Some(fixes) = update.changes.fixed {
-              let fixes = vec_to_bullet_points(fixes);
-              update_info = formatdoc!(
-                "{update_info}
-              Fixed:
-              {fixes}"
-              );
-            }
-
-            update_info
-          })
-          .reduce(|version_1, version_2| format!("{version_1}\n\n\n{version_2}"))
-          .unwrap();
-
-        app.data.radarr_data.updates = ScrollableText::with_string(formatdoc!(
-          "The latest version of Radarr is {latest_installed} installed
-          
-          {updates}"
-        ));
-      })
-      .await
-  }
-
-  async fn search_movie(&mut self, query: String) -> Result<Vec<AddMovieSearchResult>> {
-    info!("Searching for specific Radarr movie");
-    let event = RadarrEvent::SearchNewMovie(String::new());
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("term={}", encode(&query))),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<AddMovieSearchResult>>(request_props, |movie_vec, mut app| {
-        if movie_vec.is_empty() {
-          app.pop_and_push_navigation_stack(ActiveRadarrBlock::AddMovieEmptySearchResults.into());
-        } else if let Some(add_searched_movies) = app.data.radarr_data.add_searched_movies.as_mut()
-        {
-          add_searched_movies.set_items(movie_vec);
-        } else {
-          let mut add_searched_movies = StatefulTable::default();
-          add_searched_movies.set_items(movie_vec);
-          app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
-        }
-      })
-      .await
-  }
-
-  async fn start_radarr_task(&mut self, task_name: RadarrTaskName) -> Result<Value> {
-    let event = RadarrEvent::StartTask(task_name);
-
-    info!("Starting Radarr task: {task_name}");
-
-    let body = CommandBody {
-      name: task_name.to_string(),
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn test_radarr_indexer(&mut self, indexer_id: i64) -> Result<Value> {
-    let detail_event = RadarrEvent::GetIndexers;
-    let event = RadarrEvent::TestIndexer(indexer_id);
-    info!("Testing Radarr indexer with ID: {indexer_id}");
-
-    info!("Fetching indexer details for indexer with ID: {indexer_id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{indexer_id}")),
-        None,
-      )
-      .await;
-
-    let mut test_body: Value = Value::default();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
-        test_body = detailed_indexer_body;
-      })
-      .await?;
-
-    info!("Testing indexer");
-
-    let mut request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(test_body), None, None)
-      .await;
-    request_props.ignore_status_code = true;
-
-    self
-      .handle_request::<Value, Value>(request_props, |test_results, mut app| {
-        if test_results.as_object().is_none() {
-          app.data.radarr_data.indexer_test_errors = Some(
-            test_results.as_array().unwrap()[0]
-              .get("errorMessage")
-              .unwrap()
-              .to_string(),
-          );
-        } else {
-          app.data.radarr_data.indexer_test_errors = Some(String::new());
-        };
-      })
-      .await
-  }
-
-  async fn test_all_radarr_indexers(&mut self) -> Result<Vec<IndexerTestResult>> {
-    info!("Testing all Radarr indexers");
-    let event = RadarrEvent::TestAllIndexers;
-
-    let mut request_props = self
-      .request_props_from(event, RequestMethod::Post, None, None, None)
-      .await;
-    request_props.ignore_status_code = true;
-
-    self
-      .handle_request::<(), Vec<IndexerTestResult>>(request_props, |test_results, mut app| {
-        let mut test_all_indexer_results = StatefulTable::default();
-        let indexers = app.data.radarr_data.indexers.items.clone();
-        let modal_test_results = test_results
-          .iter()
-          .map(|result| {
-            let name = indexers
-              .iter()
-              .filter(|&indexer| indexer.id == result.id)
-              .map(|indexer| indexer.name.clone())
-              .nth(0)
-              .unwrap_or_default();
-            let validation_failures = result
-              .validation_failures
-              .iter()
-              .map(|failure| {
-                format!(
-                  "Failure for field '{}': {}",
-                  failure.property_name, failure.error_message
-                )
-              })
-              .collect::<Vec<String>>()
-              .join(", ");
-
-            IndexerTestResultModalItem {
-              name: name.unwrap_or_default(),
-              is_valid: result.is_valid,
-              validation_failures: validation_failures.into(),
-            }
-          })
-          .collect();
-        test_all_indexer_results.set_items(modal_test_results);
-        app.data.radarr_data.indexer_test_all_results = Some(test_all_indexer_results);
-      })
-      .await
-  }
-
-  async fn trigger_automatic_movie_search(&mut self, movie_id: i64) -> Result<Value> {
-    let event = RadarrEvent::TriggerAutomaticSearch(movie_id);
-    info!("Searching indexers for movie with ID: {movie_id}");
-    let body = MovieCommandBody {
-      name: "MoviesSearch".to_owned(),
-      movie_ids: vec![movie_id],
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<MovieCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_all_movies(&mut self) -> Result<Value> {
-    info!("Updating all movies");
-    let event = RadarrEvent::UpdateAllMovies;
-    let body = MovieCommandBody {
-      name: "RefreshMovie".to_owned(),
-      movie_ids: Vec::new(),
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<MovieCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_and_scan_movie(&mut self, movie_id: i64) -> Result<Value> {
-    let event = RadarrEvent::UpdateAndScan(movie_id);
-    info!("Updating and scanning movie with ID: {movie_id}");
-    let body = MovieCommandBody {
-      name: "RefreshMovie".to_owned(),
-      movie_ids: vec![movie_id],
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<MovieCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_collections(&mut self) -> Result<Value> {
-    info!("Updating collections");
-    let event = RadarrEvent::UpdateCollections;
-    let body = CommandBody {
-      name: "RefreshCollections".to_owned(),
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_radarr_downloads(&mut self) -> Result<Value> {
-    info!("Updating Radarr downloads");
-    let event = RadarrEvent::UpdateDownloads;
-    let body = CommandBody {
-      name: "RefreshMonitoredDownloads".to_owned(),
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn extract_and_add_radarr_tag_ids_vec(&mut self, edit_tags: &str) -> Vec<i64> {
-    let missing_tags_vec = {
-      let tags_map = &self.app.lock().await.data.radarr_data.tags_map;
-      edit_tags
-        .split(',')
-        .filter(|&tag| {
-          !tag.is_empty() && tags_map.get_by_right(tag.to_lowercase().trim()).is_none()
-        })
-        .collect::<Vec<&str>>()
-    };
-
-    for tag in missing_tags_vec {
-      self
-        .add_radarr_tag(tag.trim().to_owned())
-        .await
-        .expect("Unable to add tag");
-    }
-
-    let app = self.app.lock().await;
-    edit_tags
-      .split(',')
-      .filter(|tag| !tag.is_empty())
-      .map(|tag| {
-        *app
-          .data
-          .radarr_data
-          .tags_map
-          .get_by_right(tag.to_lowercase().trim())
-          .unwrap()
-      })
-      .collect()
-  }
-}
-
-fn get_movie_status(has_file: bool, downloads_vec: &[DownloadRecord], movie_id: i64) -> String {
-  if !has_file {
-    if let Some(download) = downloads_vec
-      .iter()
-      .find(|&download| download.movie_id == movie_id)
-    {
-      if download.status == "downloading" {
-        return "Downloading".to_owned();
-      }
-
-      if download.status == "completed" {
-        return "Awaiting Import".to_owned();
-      }
-    }
-
-    return "Missing".to_owned();
-  }
-
-  "Downloaded".to_owned()
-}
diff --git a/src/network/radarr_network/blocklist/mod.rs b/src/network/radarr_network/blocklist/mod.rs
new file mode 100644
index 0000000..477b658
--- /dev/null
+++ b/src/network/radarr_network/blocklist/mod.rs
@@ -0,0 +1,93 @@
+use crate::models::radarr_models::BlocklistResponse;
+use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+use crate::models::Route;
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::{json, Value};
+
+#[cfg(test)]
+#[path = "radarr_blocklist_network_tests.rs"]
+mod radarr_blocklist_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn clear_radarr_blocklist(&mut self) -> Result<()> {
+    info!("Clearing Radarr blocklist");
+    let event = RadarrEvent::ClearBlocklist;
+
+    let ids = self
+      .app
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .blocklist
+      .items
+      .iter()
+      .map(|item| item.id)
+      .collect::<Vec<i64>>();
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        Some(json!({"ids": ids})),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn delete_radarr_blocklist_item(
+    &mut self,
+    blocklist_item_id: i64,
+  ) -> Result<()> {
+    let event = RadarrEvent::DeleteBlocklistItem(blocklist_item_id);
+
+    info!("Deleting Radarr blocklist item for item with id: {blocklist_item_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{blocklist_item_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_blocklist(
+    &mut self,
+  ) -> Result<BlocklistResponse> {
+    info!("Fetching Radarr blocklist");
+    let event = RadarrEvent::GetBlocklist;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), BlocklistResponse>(request_props, |blocklist_resp, mut app| {
+        if !matches!(
+          app.get_current_route(),
+          Route::Radarr(ActiveRadarrBlock::BlocklistSortPrompt, _)
+        ) {
+          let mut blocklist_vec = blocklist_resp.records;
+          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app.data.radarr_data.blocklist.set_items(blocklist_vec);
+          app.data.radarr_data.blocklist.apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+}
diff --git a/src/network/radarr_network/blocklist/radarr_blocklist_network_tests.rs b/src/network/radarr_network/blocklist/radarr_blocklist_network_tests.rs
new file mode 100644
index 0000000..86e8885
--- /dev/null
+++ b/src/network/radarr_network/blocklist/radarr_blocklist_network_tests.rs
@@ -0,0 +1,354 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::BlocklistItem;
+  use crate::models::radarr_models::BlocklistItemMovie;
+  use crate::models::radarr_models::BlocklistResponse;
+  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+  use crate::models::stateful_table::SortOption;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::blocklist_item;
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::radarr_network::RadarrSerdeable;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_clear_radarr_blocklist_event() {
+    let blocklist_items = vec![
+      BlocklistItem {
+        id: 1,
+        ..blocklist_item()
+      },
+      BlocklistItem {
+        id: 2,
+        ..blocklist_item()
+      },
+      BlocklistItem {
+        id: 3,
+        ..blocklist_item()
+      },
+    ];
+    let expected_request_json = json!({ "ids": [1, 2, 3]});
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      Some(expected_request_json),
+      None,
+      None,
+      RadarrEvent::ClearBlocklist,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .blocklist
+      .set_items(blocklist_items);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::ClearBlocklist)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_radarr_blocklist_item_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      RadarrEvent::DeleteBlocklistItem(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DeleteBlocklistItem(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_radarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
+    let blocklist_json = json!({"records": [{
+        "id": 123,
+        "movieId": 1007,
+        "sourceTitle": "z movie",
+        "languages": [{"id": 1, "name": "English"}],
+        "quality": {"quality": {"name": "HD - 1080p"}},
+        "customFormats": [{"id": 1, "name": "English"}],
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "DrunkenSlug (Prowlarr)",
+        "message": "test message",
+        "movie": {
+          "id": 1007,
+          "title": "z movie",
+          "tmdbId": 1234,
+          "originalLanguage": {"id": 1, "name": "English"},
+          "sizeOnDisk": 3543348019i64,
+          "status": "Downloaded",
+          "overview": "Blah blah blah",
+          "path": "/nfs/movies",
+          "studio": "21st Century Alex",
+          "genres": ["cool", "family", "fun"],
+          "year": 2023,
+          "monitored": true,
+          "hasFile": true,
+          "runtime": 120,
+          "qualityProfileId": 2222,
+          "minimumAvailability": "announced",
+          "certification": "R",
+          "tags": [1],
+          "ratings": {
+            "imdb": {"value": 9.9},
+            "tmdb": {"value": 9.9},
+            "rottenTomatoes": {"value": 9.9}
+          },
+        },
+      }, {
+        "id": 456,
+        "movieId": 2001,
+        "sourceTitle": "A Movie",
+        "languages": [{"id": 1, "name": "English"}],
+        "quality": {"quality": {"name": "HD - 1080p"}},
+        "customFormats": [{"id": 1, "name": "English"}],
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "DrunkenSlug (Prowlarr)",
+        "message": "test message",
+        "movie": {
+          "id": 2001,
+          "title": "A Movie",
+          "tmdbId": 1234,
+          "originalLanguage": {"id": 1, "name": "English"},
+          "sizeOnDisk": 3543348019i64,
+          "status": "Downloaded",
+          "overview": "Blah blah blah",
+          "path": "/nfs/movies",
+          "studio": "21st Century Alex",
+          "genres": ["cool", "family", "fun"],
+          "year": 2023,
+          "monitored": true,
+          "hasFile": true,
+          "runtime": 120,
+          "qualityProfileId": 2222,
+          "minimumAvailability": "announced",
+          "certification": "R",
+          "tags": [1],
+          "ratings": {
+            "imdb": {"value": 9.9},
+            "tmdb": {"value": 9.9},
+            "rottenTomatoes": {"value": 9.9}
+          },
+        },
+    }]});
+    let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
+    let mut expected_blocklist = vec![
+      BlocklistItem {
+        id: 123,
+        movie_id: 1007,
+        source_title: "z movie".into(),
+        movie: BlocklistItemMovie {
+          title: "z movie".into(),
+        },
+        ..blocklist_item()
+      },
+      BlocklistItem {
+        id: 456,
+        movie_id: 2001,
+        source_title: "A Movie".into(),
+        movie: BlocklistItemMovie {
+          title: "A Movie".into(),
+        },
+        ..blocklist_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(blocklist_json),
+      None,
+      RadarrEvent::GetBlocklist,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.blocklist.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
+        a.source_title
+          .to_lowercase()
+          .cmp(&b.source_title.to_lowercase())
+      };
+      expected_blocklist.sort_by(cmp_fn);
+
+      let blocklist_sort_option = SortOption {
+        name: "Source Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .blocklist
+        .sorting(vec![blocklist_sort_option]);
+    }
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::BlocklistResponse(blocklist) = network
+      .handle_radarr_event(RadarrEvent::GetBlocklist)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.blocklist.items,
+        expected_blocklist
+      );
+      assert!(app_arc.lock().await.data.radarr_data.blocklist.sort_asc);
+      assert_eq!(blocklist, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_blocklist_event_no_op_when_user_is_selecting_sort_options() {
+    let blocklist_json = json!({"records": [{
+        "id": 123,
+        "movieId": 1007,
+        "sourceTitle": "z movie",
+        "languages": [{"id": 1, "name": "English"}],
+        "quality": {"quality": {"name": "HD - 1080p"}},
+        "customFormats": [{"id": 1, "name": "English"}],
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "DrunkenSlug (Prowlarr)",
+        "message": "test message",
+        "movie": {
+          "id": 1007,
+          "title": "z movie",
+          "tmdbId": 1234,
+          "originalLanguage": {"id": 1, "name": "English"},
+          "sizeOnDisk": 3543348019i64,
+          "status": "Downloaded",
+          "overview": "Blah blah blah",
+          "path": "/nfs/movies",
+          "studio": "21st Century Alex",
+          "genres": ["cool", "family", "fun"],
+          "year": 2023,
+          "monitored": true,
+          "hasFile": true,
+          "runtime": 120,
+          "qualityProfileId": 2222,
+          "minimumAvailability": "announced",
+          "certification": "R",
+          "tags": [1],
+          "ratings": {
+            "imdb": {"value": 9.9},
+            "tmdb": {"value": 9.9},
+            "rottenTomatoes": {"value": 9.9}
+          },
+        },
+      }, {
+        "id": 456,
+        "movieId": 2001,
+        "sourceTitle": "A Movie",
+        "languages": [{"id": 1, "name": "English"}],
+        "quality": {"quality": {"name": "HD - 1080p"}},
+        "customFormats": [{"id": 1, "name": "English"}],
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "DrunkenSlug (Prowlarr)",
+        "message": "test message",
+        "movie": {
+          "id": 2001,
+          "title": "A Movie",
+          "tmdbId": 1234,
+          "originalLanguage": {"id": 1, "name": "English"},
+          "sizeOnDisk": 3543348019i64,
+          "status": "Downloaded",
+          "overview": "Blah blah blah",
+          "path": "/nfs/movies",
+          "studio": "21st Century Alex",
+          "genres": ["cool", "family", "fun"],
+          "year": 2023,
+          "monitored": true,
+          "hasFile": true,
+          "runtime": 120,
+          "qualityProfileId": 2222,
+          "minimumAvailability": "announced",
+          "certification": "R",
+          "tags": [1],
+          "ratings": {
+            "imdb": {"value": 9.9},
+            "tmdb": {"value": 9.9},
+            "rottenTomatoes": {"value": 9.9}
+          },
+        },
+    }]});
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(blocklist_json),
+      None,
+      RadarrEvent::GetBlocklist,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.blocklist.sort_asc = true;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveRadarrBlock::BlocklistSortPrompt.into());
+    let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
+      a.source_title
+        .to_lowercase()
+        .cmp(&b.source_title.to_lowercase())
+    };
+    let blocklist_sort_option = SortOption {
+      name: "Source Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .blocklist
+      .sorting(vec![blocklist_sort_option]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetBlocklist)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .blocklist
+      .items
+      .is_empty());
+    assert!(app_arc.lock().await.data.radarr_data.blocklist.sort_asc);
+  }
+}
diff --git a/src/network/radarr_network/collections/mod.rs b/src/network/radarr_network/collections/mod.rs
new file mode 100644
index 0000000..6003098
--- /dev/null
+++ b/src/network/radarr_network/collections/mod.rs
@@ -0,0 +1,154 @@
+use crate::models::radarr_models::{Collection, EditCollectionParams};
+use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+use crate::models::servarr_models::CommandBody;
+use crate::models::Route;
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info};
+use serde_json::{json, Value};
+
+#[cfg(test)]
+#[path = "radarr_collections_network_tests.rs"]
+mod radarr_collections_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn edit_collection(
+    &mut self,
+    edit_collection_params: EditCollectionParams,
+  ) -> Result<()> {
+    info!("Editing Radarr collection");
+    let detail_event = RadarrEvent::GetCollections;
+    let event = RadarrEvent::EditCollection(EditCollectionParams::default());
+    info!("Fetching collection details");
+    let collection_id = edit_collection_params.collection_id;
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{collection_id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_collection_body, _| {
+        response = detailed_collection_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing edit collection body");
+
+    let mut detailed_collection_body: Value = serde_json::from_str(&response)?;
+    let (monitored, minimum_availability, quality_profile_id, root_folder_path, search_on_add) = {
+      let monitored = edit_collection_params.monitored.unwrap_or_else(|| {
+        detailed_collection_body["monitored"]
+          .as_bool()
+          .expect("Unable to deserialize 'monitored' bool")
+      });
+      let minimum_availability = edit_collection_params
+        .minimum_availability
+        .unwrap_or_else(|| {
+          serde_json::from_value(detailed_collection_body["minimumAvailability"].clone())
+            .expect("Unable to deserialize 'minimumAvailability'")
+        })
+        .to_string();
+      let quality_profile_id = edit_collection_params
+        .quality_profile_id
+        .unwrap_or_else(|| {
+          detailed_collection_body["qualityProfileId"]
+            .as_i64()
+            .expect("Unable to deserialize 'qualityProfileId'")
+        });
+      let root_folder_path = edit_collection_params.root_folder_path.unwrap_or_else(|| {
+        detailed_collection_body["rootFolderPath"]
+          .as_str()
+          .expect("Unable to deserialize 'rootFolderPath'")
+          .to_owned()
+      });
+      let search_on_add = edit_collection_params.search_on_add.unwrap_or_else(|| {
+        detailed_collection_body["searchOnAdd"]
+          .as_bool()
+          .expect("Unable to deserialize 'searchOnAdd'")
+      });
+
+      (
+        monitored,
+        minimum_availability,
+        quality_profile_id,
+        root_folder_path,
+        search_on_add,
+      )
+    };
+
+    *detailed_collection_body.get_mut("monitored").unwrap() = json!(monitored);
+    *detailed_collection_body
+      .get_mut("minimumAvailability")
+      .unwrap() = json!(minimum_availability);
+    *detailed_collection_body
+      .get_mut("qualityProfileId")
+      .unwrap() = json!(quality_profile_id);
+    *detailed_collection_body.get_mut("rootFolderPath").unwrap() = json!(root_folder_path);
+    *detailed_collection_body.get_mut("searchOnAdd").unwrap() = json!(search_on_add);
+
+    debug!("Edit collection body: {detailed_collection_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Put,
+        Some(detailed_collection_body),
+        Some(format!("/{collection_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_collections(
+    &mut self,
+  ) -> Result<Vec<Collection>> {
+    info!("Fetching Radarr collections");
+    let event = RadarrEvent::GetCollections;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Collection>>(request_props, |mut collections_vec, mut app| {
+        if !matches!(
+          app.get_current_route(),
+          Route::Radarr(ActiveRadarrBlock::CollectionsSortPrompt, _)
+        ) {
+          collections_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app.data.radarr_data.collections.set_items(collections_vec);
+          app.data.radarr_data.collections.apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn update_collections(&mut self) -> Result<Value> {
+    info!("Updating collections");
+    let event = RadarrEvent::UpdateCollections;
+    let body = CommandBody {
+      name: "RefreshCollections".to_owned(),
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/radarr_network/collections/radarr_collections_network_tests.rs b/src/network/radarr_network/collections/radarr_collections_network_tests.rs
new file mode 100644
index 0000000..9c9b95f
--- /dev/null
+++ b/src/network/radarr_network/collections/radarr_collections_network_tests.rs
@@ -0,0 +1,443 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::{
+    Collection, EditCollectionParams, MinimumAvailability, RadarrSerdeable,
+  };
+  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+  use crate::models::stateful_table::SortOption;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::collection;
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use mockito::Matcher;
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_edit_collection_event() {
+    let detailed_collection_body = json!({
+      "id": 123,
+      "title": "Test Collection",
+      "rootFolderPath": "/nfs/movies",
+      "searchOnAdd": true,
+      "monitored": true,
+      "minimumAvailability": "released",
+      "overview": "Collection blah blah blah",
+      "qualityProfileId": 2222,
+      "movies": [
+        {
+          "title": "Test",
+          "overview": "Collection blah blah blah",
+          "year": 2023,
+          "runtime": 120,
+          "tmdbId": 1234,
+          "genres": ["cool", "family", "fun"],
+          "ratings": {
+            "imdb": {
+              "value": 9.9
+            },
+            "tmdb": {
+              "value": 9.9
+            },
+            "rottenTomatoes": {
+              "value": 9.9
+            }
+          }
+        }
+      ]
+    });
+    let mut expected_body = detailed_collection_body.clone();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+    *expected_body.get_mut("minimumAvailability").unwrap() = json!("announced");
+    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("rootFolderPath").unwrap() = json!("/nfs/Test Path");
+    *expected_body.get_mut("searchOnAdd").unwrap() = json!(false);
+    let edit_collection_params = EditCollectionParams {
+      collection_id: 123,
+      monitored: Some(false),
+      minimum_availability: Some(MinimumAvailability::Announced),
+      quality_profile_id: Some(1111),
+      root_folder_path: Some("/nfs/Test Path".to_owned()),
+      search_on_add: Some(false),
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(detailed_collection_body),
+      None,
+      RadarrEvent::GetCollections,
+      Some("/123"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/123",
+          RadarrEvent::EditCollection(edit_collection_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditCollection(edit_collection_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_collection_event_defaults_to_previous_values_when_no_params_are_provided(
+  ) {
+    let detailed_collection_body = json!({
+      "id": 123,
+      "title": "Test Collection",
+      "rootFolderPath": "/nfs/movies",
+      "searchOnAdd": true,
+      "monitored": true,
+      "minimumAvailability": "released",
+      "overview": "Collection blah blah blah",
+      "qualityProfileId": 2222,
+      "movies": [
+        {
+          "title": "Test",
+          "overview": "Collection blah blah blah",
+          "year": 2023,
+          "runtime": 120,
+          "tmdbId": 1234,
+          "genres": ["cool", "family", "fun"],
+          "ratings": {
+            "imdb": {
+              "value": 9.9
+            },
+            "tmdb": {
+              "value": 9.9
+            },
+            "rottenTomatoes": {
+              "value": 9.9
+            }
+          }
+        }
+      ]
+    });
+    let mut expected_body = detailed_collection_body.clone();
+    *expected_body.get_mut("monitored").unwrap() = json!(true);
+    *expected_body.get_mut("minimumAvailability").unwrap() = json!("released");
+    *expected_body.get_mut("qualityProfileId").unwrap() = json!(2222);
+    *expected_body.get_mut("rootFolderPath").unwrap() = json!("/nfs/movies");
+    *expected_body.get_mut("searchOnAdd").unwrap() = json!(true);
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(detailed_collection_body),
+      None,
+      RadarrEvent::GetCollections,
+      Some("/123"),
+      None,
+    )
+    .await;
+    let edit_collection_params = EditCollectionParams {
+      collection_id: 123,
+      ..EditCollectionParams::default()
+    };
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/123",
+          RadarrEvent::EditCollection(edit_collection_params).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    let edit_collection_params = EditCollectionParams {
+      collection_id: 123,
+      ..EditCollectionParams::default()
+    };
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditCollection(edit_collection_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_collections_event(#[values(true, false)] use_custom_sorting: bool) {
+    let collections_json = json!([{
+      "id": 123,
+      "title": "z Collection",
+      "rootFolderPath": "/nfs/movies",
+      "searchOnAdd": true,
+      "monitored": true,
+      "minimumAvailability": "released",
+      "overview": "Collection blah blah blah",
+      "qualityProfileId": 2222,
+      "movies": [{
+        "title": "Test",
+        "overview": "Collection blah blah blah",
+        "year": 2023,
+        "runtime": 120,
+        "tmdbId": 1234,
+        "genres": ["cool", "family", "fun"],
+        "ratings": {
+          "imdb": {
+            "value": 9.9
+          },
+          "tmdb": {
+            "value": 9.9
+          },
+          "rottenTomatoes": {
+            "value": 9.9
+          }
+        }
+      }],
+    },
+    {
+      "id": 456,
+      "title": "A Collection",
+      "rootFolderPath": "/nfs/movies",
+      "searchOnAdd": true,
+      "monitored": true,
+      "minimumAvailability": "released",
+      "overview": "Collection blah blah blah",
+      "qualityProfileId": 2222,
+      "movies": [{
+        "title": "Test",
+        "overview": "Collection blah blah blah",
+        "year": 2023,
+        "runtime": 120,
+        "tmdbId": 1234,
+        "genres": ["cool", "family", "fun"],
+        "ratings": {
+          "imdb": {
+            "value": 9.9
+          },
+          "tmdb": {
+            "value": 9.9
+          },
+          "rottenTomatoes": {
+            "value": 9.9
+          }
+        }
+      }],
+    }]);
+    let response: Vec<Collection> = serde_json::from_value(collections_json.clone()).unwrap();
+    let mut expected_collections = vec![
+      Collection {
+        id: 123,
+        title: "z Collection".into(),
+        ..collection()
+      },
+      Collection {
+        id: 456,
+        title: "A Collection".into(),
+        ..collection()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(collections_json),
+      None,
+      RadarrEvent::GetCollections,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.collections.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &Collection, b: &Collection| {
+        a.title
+          .text
+          .to_lowercase()
+          .cmp(&b.title.text.to_lowercase())
+      };
+      expected_collections.sort_by(cmp_fn);
+
+      let collection_sort_option = SortOption {
+        name: "Collection",
+        cmp_fn: Some(cmp_fn),
+      };
+      app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .collections
+        .sorting(vec![collection_sort_option]);
+    }
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Collections(collections) = network
+      .handle_radarr_event(RadarrEvent::GetCollections)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.collections.items,
+        expected_collections
+      );
+      assert!(app_arc.lock().await.data.radarr_data.collections.sort_asc);
+      assert_eq!(collections, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_collections_event_no_op_when_user_is_selecting_sort_options() {
+    let collections_json = json!([{
+      "id": 123,
+      "title": "z Collection",
+      "rootFolderPath": "/nfs/movies",
+      "searchOnAdd": true,
+      "monitored": true,
+      "minimumAvailability": "released",
+      "overview": "Collection blah blah blah",
+      "qualityProfileId": 2222,
+      "movies": [{
+        "title": "Test",
+        "overview": "Collection blah blah blah",
+        "year": 2023,
+        "runtime": 120,
+        "tmdbId": 1234,
+        "genres": ["cool", "family", "fun"],
+        "ratings": {
+          "imdb": {
+            "value": 9.9
+          },
+          "tmdb": {
+            "value": 9.9
+          },
+          "rottenTomatoes": {
+            "value": 9.9
+          }
+        }
+      }],
+    },
+    {
+      "id": 456,
+      "title": "A Collection",
+      "rootFolderPath": "/nfs/movies",
+      "searchOnAdd": true,
+      "monitored": true,
+      "minimumAvailability": "released",
+      "overview": "Collection blah blah blah",
+      "qualityProfileId": 2222,
+      "movies": [{
+        "title": "Test",
+        "overview": "Collection blah blah blah",
+        "year": 2023,
+        "runtime": 120,
+        "tmdbId": 1234,
+        "genres": ["cool", "family", "fun"],
+        "ratings": {
+          "imdb": {
+            "value": 9.9
+          },
+          "tmdb": {
+            "value": 9.9
+          },
+          "rottenTomatoes": {
+            "value": 9.9
+          }
+        }
+      }],
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(collections_json),
+      None,
+      RadarrEvent::GetCollections,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.collections.sort_asc = true;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveRadarrBlock::CollectionsSortPrompt.into());
+    let cmp_fn = |a: &Collection, b: &Collection| {
+      a.title
+        .text
+        .to_lowercase()
+        .cmp(&b.title.text.to_lowercase())
+    };
+    let collection_sort_option = SortOption {
+      name: "Collection",
+      cmp_fn: Some(cmp_fn),
+    };
+    app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .collections
+      .sorting(vec![collection_sort_option]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetCollections)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .collections
+      .items
+      .is_empty());
+    assert!(app_arc.lock().await.data.radarr_data.collections.sort_asc);
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_collections_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshCollections"
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::UpdateCollections,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::UpdateCollections)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/radarr_network/downloads/mod.rs b/src/network/radarr_network/downloads/mod.rs
new file mode 100644
index 0000000..1200099
--- /dev/null
+++ b/src/network/radarr_network/downloads/mod.rs
@@ -0,0 +1,81 @@
+use crate::models::radarr_models::DownloadsResponse;
+use crate::models::servarr_models::CommandBody;
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "radarr_downloads_network_tests.rs"]
+mod radarr_downloads_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn delete_radarr_download(
+    &mut self,
+    download_id: i64,
+  ) -> Result<()> {
+    let event = RadarrEvent::DeleteDownload(download_id);
+    info!("Deleting Radarr download for download with id: {download_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{download_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_downloads(
+    &mut self,
+    count: u64,
+  ) -> Result<DownloadsResponse> {
+    info!("Fetching Radarr downloads");
+    let event = RadarrEvent::GetDownloads(count);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("pageSize={count}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), DownloadsResponse>(request_props, |queue_response, mut app| {
+        app
+          .data
+          .radarr_data
+          .downloads
+          .set_items(queue_response.records);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn update_radarr_downloads(
+    &mut self,
+  ) -> Result<Value> {
+    info!("Updating Radarr downloads");
+    let event = RadarrEvent::UpdateDownloads;
+    let body = CommandBody {
+      name: "RefreshMonitoredDownloads".to_owned(),
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/radarr_network/downloads/radarr_downloads_network_tests.rs b/src/network/radarr_network/downloads/radarr_downloads_network_tests.rs
new file mode 100644
index 0000000..b5e5d18
--- /dev/null
+++ b/src/network/radarr_network/downloads/radarr_downloads_network_tests.rs
@@ -0,0 +1,100 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::{DownloadsResponse, RadarrSerdeable};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::downloads_response;
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_delete_radarr_download_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      RadarrEvent::DeleteDownload(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DeleteDownload(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_downloads_event() {
+    let downloads_response_json = json!({
+      "records": [{
+        "title": "Test Download Title",
+        "status": "downloading",
+        "id": 1,
+        "movieId": 1,
+        "size": 3543348019u64,
+        "sizeleft": 1771674009,
+        "outputPath": "/nfs/movies/Test",
+        "indexer": "kickass torrents",
+        "downloadClient": "transmission",
+      }]
+    });
+    let response: DownloadsResponse =
+      serde_json::from_value(downloads_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(downloads_response_json),
+      None,
+      RadarrEvent::GetDownloads(500),
+      None,
+      Some("pageSize=500"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::DownloadsResponse(downloads) = network
+      .handle_radarr_event(RadarrEvent::GetDownloads(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      pretty_assertions::assert_eq!(
+        app_arc.lock().await.data.radarr_data.downloads.items,
+        downloads_response().records
+      );
+      pretty_assertions::assert_eq!(downloads, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_radarr_downloads_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshMonitoredDownloads"
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::UpdateDownloads,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::UpdateDownloads)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/radarr_network/indexers/mod.rs b/src/network/radarr_network/indexers/mod.rs
new file mode 100644
index 0000000..b06d5f5
--- /dev/null
+++ b/src/network/radarr_network/indexers/mod.rs
@@ -0,0 +1,396 @@
+use crate::models::radarr_models::IndexerSettings;
+use crate::models::servarr_data::modals::IndexerTestResultModalItem;
+use crate::models::servarr_models::{EditIndexerParams, Indexer, IndexerTestResult};
+use crate::models::stateful_table::StatefulTable;
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info};
+use serde_json::{json, Value};
+
+#[cfg(test)]
+#[path = "radarr_indexers_network_tests.rs"]
+mod radarr_indexers_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn delete_radarr_indexer(
+    &mut self,
+    indexer_id: i64,
+  ) -> Result<()> {
+    let event = RadarrEvent::DeleteIndexer(indexer_id);
+    info!("Deleting Radarr indexer for indexer with id: {indexer_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{indexer_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn edit_all_radarr_indexer_settings(
+    &mut self,
+    params: IndexerSettings,
+  ) -> Result<Value> {
+    info!("Updating Radarr indexer settings");
+    let event = RadarrEvent::EditAllIndexerSettings(IndexerSettings::default());
+
+    debug!("Indexer settings body: {params:?}");
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Put, Some(params), None, None)
+      .await;
+
+    self
+      .handle_request::<IndexerSettings, Value>(request_props, |_, _| {})
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn edit_radarr_indexer(
+    &mut self,
+    mut edit_indexer_params: EditIndexerParams,
+  ) -> Result<()> {
+    let detail_event = RadarrEvent::GetIndexers;
+    let event = RadarrEvent::EditIndexer(EditIndexerParams::default());
+    let id = edit_indexer_params.indexer_id;
+    if let Some(tag_input_str) = edit_indexer_params.tag_input_string.as_ref() {
+      let tag_ids_vec = self.extract_and_add_radarr_tag_ids_vec(tag_input_str).await;
+      edit_indexer_params.tags = Some(tag_ids_vec);
+    }
+    info!("Updating Radarr indexer with ID: {id}");
+
+    info!("Fetching indexer details for indexer with ID: {id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
+        response = detailed_indexer_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing edit indexer body");
+
+    let mut detailed_indexer_body: Value = serde_json::from_str(&response)?;
+
+    let (
+      name,
+      enable_rss,
+      enable_automatic_search,
+      enable_interactive_search,
+      url,
+      api_key,
+      seed_ratio,
+      tags,
+      priority,
+    ) = {
+      let priority = detailed_indexer_body["priority"]
+        .as_i64()
+        .expect("Unable to deserialize 'priority'");
+      let seed_ratio_field_option = detailed_indexer_body["fields"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .find(|field| field["name"] == "seedCriteria.seedRatio");
+      let name = edit_indexer_params.name.unwrap_or(
+        detailed_indexer_body["name"]
+          .as_str()
+          .expect("Unable to deserialize 'name'")
+          .to_owned(),
+      );
+      let enable_rss = edit_indexer_params.enable_rss.unwrap_or(
+        detailed_indexer_body["enableRss"]
+          .as_bool()
+          .expect("Unable to deserialize 'enableRss'"),
+      );
+      let enable_automatic_search = edit_indexer_params.enable_automatic_search.unwrap_or(
+        detailed_indexer_body["enableAutomaticSearch"]
+          .as_bool()
+          .expect("Unable to deserialize 'enableAutomaticSearch"),
+      );
+      let enable_interactive_search = edit_indexer_params.enable_interactive_search.unwrap_or(
+        detailed_indexer_body["enableInteractiveSearch"]
+          .as_bool()
+          .expect("Unable to deserialize 'enableInteractiveSearch'"),
+      );
+      let url = edit_indexer_params.url.unwrap_or(
+        detailed_indexer_body["fields"]
+          .as_array()
+          .expect("Unable to deserialize 'fields'")
+          .iter()
+          .find(|field| field["name"] == "baseUrl")
+          .expect("Field 'baseUrl' was not found in the 'fields' array")
+          .get("value")
+          .unwrap_or(&json!(""))
+          .as_str()
+          .expect("Unable to deserialize 'baseUrl value'")
+          .to_owned(),
+      );
+      let api_key = edit_indexer_params.api_key.unwrap_or(
+        detailed_indexer_body["fields"]
+          .as_array()
+          .expect("Unable to deserialize 'fields'")
+          .iter()
+          .find(|field| field["name"] == "apiKey")
+          .expect("Field 'apiKey' was not found in the 'fields' array")
+          .get("value")
+          .unwrap_or(&json!(""))
+          .as_str()
+          .expect("Unable to deserialize 'apiKey value'")
+          .to_owned(),
+      );
+      let seed_ratio = edit_indexer_params.seed_ratio.unwrap_or_else(|| {
+        if let Some(seed_ratio_field) = seed_ratio_field_option {
+          return seed_ratio_field
+            .get("value")
+            .unwrap_or(&json!(""))
+            .as_str()
+            .expect("Unable to deserialize 'seedCriteria.seedRatio value'")
+            .to_owned();
+        }
+
+        String::new()
+      });
+      let tags = if edit_indexer_params.clear_tags {
+        vec![]
+      } else {
+        edit_indexer_params.tags.unwrap_or(
+          detailed_indexer_body["tags"]
+            .as_array()
+            .expect("Unable to deserialize 'tags'")
+            .iter()
+            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
+            .collect(),
+        )
+      };
+      let priority = edit_indexer_params.priority.unwrap_or(priority);
+
+      (
+        name,
+        enable_rss,
+        enable_automatic_search,
+        enable_interactive_search,
+        url,
+        api_key,
+        seed_ratio,
+        tags,
+        priority,
+      )
+    };
+
+    *detailed_indexer_body.get_mut("name").unwrap() = json!(name);
+    *detailed_indexer_body.get_mut("priority").unwrap() = json!(priority);
+    *detailed_indexer_body.get_mut("enableRss").unwrap() = json!(enable_rss);
+    *detailed_indexer_body
+      .get_mut("enableAutomaticSearch")
+      .unwrap() = json!(enable_automatic_search);
+    *detailed_indexer_body
+      .get_mut("enableInteractiveSearch")
+      .unwrap() = json!(enable_interactive_search);
+    *detailed_indexer_body
+      .get_mut("fields")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|field| field["name"] == "baseUrl")
+      .unwrap()
+      .get_mut("value")
+      .unwrap() = json!(url);
+    *detailed_indexer_body
+      .get_mut("fields")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|field| field["name"] == "apiKey")
+      .unwrap()
+      .get_mut("value")
+      .unwrap() = json!(api_key);
+    *detailed_indexer_body.get_mut("tags").unwrap() = json!(tags);
+    let seed_ratio_field_option = detailed_indexer_body
+      .get_mut("fields")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|field| field["name"] == "seedCriteria.seedRatio");
+    if let Some(seed_ratio_field) = seed_ratio_field_option {
+      seed_ratio_field
+        .as_object_mut()
+        .unwrap()
+        .insert("value".to_string(), json!(seed_ratio));
+    }
+
+    debug!("Edit indexer body: {detailed_indexer_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Put,
+        Some(detailed_indexer_body),
+        Some(format!("/{id}")),
+        Some("forceSave=true".to_owned()),
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_indexers(
+    &mut self,
+  ) -> Result<Vec<Indexer>> {
+    info!("Fetching Radarr indexers");
+    let event = RadarrEvent::GetIndexers;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Indexer>>(request_props, |indexers, mut app| {
+        app.data.radarr_data.indexers.set_items(indexers);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_all_radarr_indexer_settings(
+    &mut self,
+  ) -> Result<IndexerSettings> {
+    info!("Fetching Radarr indexer settings");
+    let event = RadarrEvent::GetAllIndexerSettings;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), IndexerSettings>(request_props, |indexer_settings, mut app| {
+        if app.data.radarr_data.indexer_settings.is_none() {
+          app.data.radarr_data.indexer_settings = Some(indexer_settings);
+        } else {
+          debug!("Indexer Settings are being modified. Ignoring update...");
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn test_radarr_indexer(
+    &mut self,
+    indexer_id: i64,
+  ) -> Result<Value> {
+    let detail_event = RadarrEvent::GetIndexers;
+    let event = RadarrEvent::TestIndexer(indexer_id);
+    info!("Testing Radarr indexer with ID: {indexer_id}");
+
+    info!("Fetching indexer details for indexer with ID: {indexer_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{indexer_id}")),
+        None,
+      )
+      .await;
+
+    let mut test_body: Value = Value::default();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
+        test_body = detailed_indexer_body;
+      })
+      .await?;
+
+    info!("Testing indexer");
+
+    let mut request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(test_body), None, None)
+      .await;
+    request_props.ignore_status_code = true;
+
+    self
+      .handle_request::<Value, Value>(request_props, |test_results, mut app| {
+        if test_results.as_object().is_none() {
+          app.data.radarr_data.indexer_test_errors = Some(
+            test_results.as_array().unwrap()[0]
+              .get("errorMessage")
+              .unwrap()
+              .to_string(),
+          );
+        } else {
+          app.data.radarr_data.indexer_test_errors = Some(String::new());
+        };
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn test_all_radarr_indexers(
+    &mut self,
+  ) -> Result<Vec<IndexerTestResult>> {
+    info!("Testing all Radarr indexers");
+    let event = RadarrEvent::TestAllIndexers;
+
+    let mut request_props = self
+      .request_props_from(event, RequestMethod::Post, None, None, None)
+      .await;
+    request_props.ignore_status_code = true;
+
+    self
+      .handle_request::<(), Vec<IndexerTestResult>>(request_props, |test_results, mut app| {
+        let mut test_all_indexer_results = StatefulTable::default();
+        let indexers = app.data.radarr_data.indexers.items.clone();
+        let modal_test_results = test_results
+          .iter()
+          .map(|result| {
+            let name = indexers
+              .iter()
+              .filter(|&indexer| indexer.id == result.id)
+              .map(|indexer| indexer.name.clone())
+              .nth(0)
+              .unwrap_or_default();
+            let validation_failures = result
+              .validation_failures
+              .iter()
+              .map(|failure| {
+                format!(
+                  "Failure for field '{}': {}",
+                  failure.property_name, failure.error_message
+                )
+              })
+              .collect::<Vec<String>>()
+              .join(", ");
+
+            IndexerTestResultModalItem {
+              name: name.unwrap_or_default(),
+              is_valid: result.is_valid,
+              validation_failures: validation_failures.into(),
+            }
+          })
+          .collect();
+        test_all_indexer_results.set_items(modal_test_results);
+        app.data.radarr_data.indexer_test_all_results = Some(test_all_indexer_results);
+      })
+      .await
+  }
+}
diff --git a/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs b/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs
new file mode 100644
index 0000000..675931b
--- /dev/null
+++ b/src/network/radarr_network/indexers/radarr_indexers_network_tests.rs
@@ -0,0 +1,980 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::{IndexerSettings, RadarrSerdeable};
+  use crate::models::servarr_data::modals::IndexerTestResultModalItem;
+  use crate::models::servarr_models::{EditIndexerParams, Indexer, IndexerTestResult};
+  use crate::models::HorizontallyScrollableText;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::{
+    indexer, indexer_settings,
+  };
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use bimap::BiMap;
+  use mockito::Matcher;
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_delete_radarr_indexer_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      RadarrEvent::DeleteIndexer(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DeleteIndexer(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_all_radarr_indexer_settings_event() {
+    let indexer_settings_json = json!({
+        "minimumAge": 0,
+        "maximumSize": 0,
+        "retention": 0,
+        "rssSyncInterval": 60,
+        "preferIndexerFlags": false,
+        "availabilityDelay": 0,
+        "allowHardcodedSubs": true,
+        "whitelistedHardcodedSubs": "",
+        "id": 1
+    });
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Put,
+      Some(indexer_settings_json),
+      None,
+      None,
+      RadarrEvent::EditAllIndexerSettings(indexer_settings()),
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditAllIndexerSettings(indexer_settings()))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_radarr_indexer_event() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.3",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_radarr_indexer_event_does_not_overwrite_tags_vec_if_tag_input_string_is_none(
+  ) {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.3",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tags: Some(vec![1, 2]),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_radarr_indexer_event_does_not_add_seed_ratio_when_seed_ratio_field_is_none_in_details(
+  ) {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_radarr_indexer_event_populates_the_seed_ratio_value_when_seed_ratio_field_is_present_in_details(
+  ) {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.3",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_radarr_indexer_event_defaults_to_previous_values() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      ..EditIndexerParams::default()
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json.clone()),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(indexer_details_json))
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_radarr_indexer_event_clears_tags_when_clear_tags_is_true() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let expected_edit_indexer_body = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      clear_tags: true,
+      ..EditIndexerParams::default()
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_edit_indexer_body))
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_indexers_event() {
+    let indexers_response_json = json!([{
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "supportsRss": true,
+        "supportsSearch": true,
+        "protocol": "torrent",
+        "priority": 25,
+        "downloadClientId": 0,
+        "name": "Test Indexer",
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "implementationName": "Torznab",
+        "implementation": "Torznab",
+        "configContract": "TorznabSettings",
+        "tags": [1],
+        "id": 1
+    }]);
+    let response: Vec<Indexer> = serde_json::from_value(indexers_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexers_response_json),
+      None,
+      RadarrEvent::GetIndexers,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Indexers(indexers) = network
+      .handle_radarr_event(RadarrEvent::GetIndexers)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.indexers.items,
+        vec![indexer()]
+      );
+      assert_eq!(indexers, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_all_indexer_settings_event() {
+    let indexer_settings_response_json = json!({
+        "minimumAge": 0,
+        "maximumSize": 0,
+        "retention": 0,
+        "rssSyncInterval": 60,
+        "preferIndexerFlags": false,
+        "availabilityDelay": 0,
+        "allowHardcodedSubs": true,
+        "whitelistedHardcodedSubs": "",
+        "id": 1
+    });
+    let response: IndexerSettings =
+      serde_json::from_value(indexer_settings_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_settings_response_json),
+      None,
+      RadarrEvent::GetAllIndexerSettings,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::IndexerSettings(settings) = network
+      .handle_radarr_event(RadarrEvent::GetAllIndexerSettings)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.indexer_settings,
+        Some(indexer_settings())
+      );
+      assert_eq!(settings, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_all_indexer_settings_event_no_op_if_already_present() {
+    let indexer_settings_response_json = json!({
+        "minimumAge": 0,
+        "maximumSize": 0,
+        "retention": 0,
+        "rssSyncInterval": 60,
+        "preferIndexerFlags": false,
+        "availabilityDelay": 0,
+        "allowHardcodedSubs": true,
+        "whitelistedHardcodedSubs": "",
+        "id": 1
+    });
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_settings_response_json),
+      None,
+      RadarrEvent::GetAllIndexerSettings,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetAllIndexerSettings)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert_eq!(
+      app_arc.lock().await.data.radarr_data.indexer_settings,
+      Some(IndexerSettings::default())
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_test_radarr_indexer_event_error() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let response_json = json!([
+    {
+        "isWarning": false,
+        "propertyName": "",
+        "errorMessage": "test failure",
+        "severity": "error"
+    }]);
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json.clone()),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_test_server = server
+      .mock(
+        "POST",
+        format!("/api/v3{}", RadarrEvent::TestIndexer(1).resource()).as_str(),
+      )
+      .with_status(400)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(indexer_details_json.clone()))
+      .with_body(response_json.to_string())
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Value(value) = network
+      .handle_radarr_event(RadarrEvent::TestIndexer(1))
+      .await
+      .unwrap()
+    {
+      async_details_server.assert_async().await;
+      async_test_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.indexer_test_errors,
+        Some("\"test failure\"".to_owned())
+      );
+      assert_eq!(value, response_json)
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_test_radarr_indexer_event_success() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json.clone()),
+      None,
+      RadarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_test_server = server
+      .mock(
+        "POST",
+        format!("/api/v3{}", RadarrEvent::TestIndexer(1).resource()).as_str(),
+      )
+      .with_status(200)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(indexer_details_json.clone()))
+      .with_body("{}")
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Value(value) = network
+      .handle_radarr_event(RadarrEvent::TestIndexer(1))
+      .await
+      .unwrap()
+    {
+      async_details_server.assert_async().await;
+      async_test_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.indexer_test_errors,
+        Some(String::new())
+      );
+      assert_eq!(value, json!({}));
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_test_all_radarr_indexers_event() {
+    let indexers = vec![
+      Indexer {
+        id: 1,
+        name: Some("Test 1".to_owned()),
+        ..Indexer::default()
+      },
+      Indexer {
+        id: 2,
+        name: Some("Test 2".to_owned()),
+        ..Indexer::default()
+      },
+    ];
+    let indexer_test_results_modal_items = vec![
+			IndexerTestResultModalItem {
+				name: "Test 1".to_owned(),
+				is_valid: true,
+				validation_failures: HorizontallyScrollableText::default(),
+			},
+			IndexerTestResultModalItem {
+				name: "Test 2".to_owned(),
+				is_valid: false,
+				validation_failures: "Failure for field 'test field 1': test error message, Failure for field 'test field 2': test error message 2".into(),
+			},
+		];
+    let response_json = json!([
+    {
+      "id": 1,
+      "isValid": true,
+      "validationFailures": []
+    },
+    {
+      "id": 2,
+      "isValid": false,
+      "validationFailures": [
+          {
+              "propertyName": "test field 1",
+              "errorMessage": "test error message",
+              "severity": "error"
+          },
+          {
+              "propertyName": "test field 2",
+              "errorMessage": "test error message 2",
+              "severity": "error"
+          },
+      ]
+    }]);
+    let response: Vec<IndexerTestResult> = serde_json::from_value(response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      None,
+      Some(response_json),
+      Some(400),
+      RadarrEvent::TestAllIndexers,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .indexers
+      .set_items(indexers);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::IndexerTestResults(results) = network
+      .handle_radarr_event(RadarrEvent::TestAllIndexers)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .indexer_test_all_results
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .radarr_data
+          .indexer_test_all_results
+          .as_ref()
+          .unwrap()
+          .items,
+        indexer_test_results_modal_items
+      );
+      assert_eq!(results, response);
+    }
+  }
+}
diff --git a/src/network/radarr_network/library/mod.rs b/src/network/radarr_network/library/mod.rs
new file mode 100644
index 0000000..b71b338
--- /dev/null
+++ b/src/network/radarr_network/library/mod.rs
@@ -0,0 +1,675 @@
+use crate::models::radarr_models::{
+  AddMovieBody, AddMovieSearchResult, Credit, CreditType, DeleteMovieParams, DownloadRecord,
+  EditMovieParams, Movie, MovieCommandBody, MovieHistoryItem, RadarrRelease,
+  RadarrReleaseDownloadBody,
+};
+use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
+use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+use crate::models::stateful_table::StatefulTable;
+use crate::models::{Route, ScrollableText};
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use crate::utils::{convert_runtime, convert_to_gb};
+use anyhow::Result;
+use indoc::formatdoc;
+use log::{debug, info, warn};
+use serde_json::{json, Value};
+use urlencoding::encode;
+
+#[cfg(test)]
+#[path = "radarr_library_network_tests.rs"]
+mod radarr_library_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn add_movie(
+    &mut self,
+    mut add_movie_body: AddMovieBody,
+  ) -> Result<Value> {
+    info!("Adding new movie to Radarr");
+    let event = RadarrEvent::AddMovie(AddMovieBody::default());
+    if let Some(tag_input_str) = add_movie_body.tag_input_string.as_ref() {
+      let tag_ids_vec = self.extract_and_add_radarr_tag_ids_vec(tag_input_str).await;
+      add_movie_body.tags = tag_ids_vec;
+    }
+
+    debug!("Add movie body: {add_movie_body:?}");
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(add_movie_body), None, None)
+      .await;
+
+    self
+      .handle_request::<AddMovieBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn delete_movie(
+    &mut self,
+    delete_movie_params: DeleteMovieParams,
+  ) -> Result<()> {
+    let event = RadarrEvent::DeleteMovie(DeleteMovieParams::default());
+    let DeleteMovieParams {
+      id,
+      delete_movie_files,
+      add_list_exclusion,
+    } = delete_movie_params;
+    info!("Deleting Radarr movie with ID: {id} with deleteFiles={delete_movie_files} and addImportExclusion={add_list_exclusion}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{id}")),
+        Some(format!(
+          "deleteFiles={delete_movie_files}&addImportExclusion={add_list_exclusion}"
+        )),
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn download_radarr_release(
+    &mut self,
+    params: RadarrReleaseDownloadBody,
+  ) -> Result<Value> {
+    let event = RadarrEvent::DownloadRelease(RadarrReleaseDownloadBody::default());
+    info!("Downloading Radarr release with params: {params:?}");
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(params), None, None)
+      .await;
+
+    self
+      .handle_request::<RadarrReleaseDownloadBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn edit_movie(
+    &mut self,
+    mut edit_movie_params: EditMovieParams,
+  ) -> Result<()> {
+    info!("Editing Radarr movie");
+    let movie_id = edit_movie_params.movie_id;
+    let detail_event = RadarrEvent::GetMovieDetails(movie_id);
+    let event = RadarrEvent::EditMovie(EditMovieParams::default());
+    if let Some(tag_input_str) = edit_movie_params.tag_input_string.as_ref() {
+      let tag_ids_vec = self.extract_and_add_radarr_tag_ids_vec(tag_input_str).await;
+      edit_movie_params.tags = Some(tag_ids_vec);
+    }
+
+    info!("Fetching movie details for movie with ID: {movie_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{movie_id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_movie_body, _| {
+        response = detailed_movie_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing edit movie body");
+
+    let mut detailed_movie_body: Value = serde_json::from_str(&response)?;
+    let (monitored, minimum_availability, quality_profile_id, root_folder_path, tags) = {
+      let monitored = edit_movie_params.monitored.unwrap_or(
+        detailed_movie_body["monitored"]
+          .as_bool()
+          .expect("Unable to deserialize 'monitored'"),
+      );
+      let minimum_availability = edit_movie_params
+        .minimum_availability
+        .unwrap_or_else(|| {
+          serde_json::from_value(detailed_movie_body["minimumAvailability"].clone())
+            .expect("Unable to deserialize 'minimumAvailability'")
+        })
+        .to_string();
+      let quality_profile_id = edit_movie_params.quality_profile_id.unwrap_or_else(|| {
+        detailed_movie_body["qualityProfileId"]
+          .as_i64()
+          .expect("Unable to deserialize 'qualityProfileId'")
+      });
+      let root_folder_path = edit_movie_params.root_folder_path.unwrap_or_else(|| {
+        detailed_movie_body["path"]
+          .as_str()
+          .expect("Unable to deserialize 'path'")
+          .to_owned()
+      });
+      let tags = if edit_movie_params.clear_tags {
+        vec![]
+      } else {
+        edit_movie_params.tags.unwrap_or(
+          detailed_movie_body["tags"]
+            .as_array()
+            .expect("Unable to deserialize 'tags'")
+            .iter()
+            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
+            .collect(),
+        )
+      };
+
+      (
+        monitored,
+        minimum_availability,
+        quality_profile_id,
+        root_folder_path,
+        tags,
+      )
+    };
+
+    *detailed_movie_body.get_mut("monitored").unwrap() = json!(monitored);
+    *detailed_movie_body.get_mut("minimumAvailability").unwrap() = json!(minimum_availability);
+    *detailed_movie_body.get_mut("qualityProfileId").unwrap() = json!(quality_profile_id);
+    *detailed_movie_body.get_mut("path").unwrap() = json!(root_folder_path);
+    *detailed_movie_body.get_mut("tags").unwrap() = json!(tags);
+
+    debug!("Edit movie body: {detailed_movie_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Put,
+        Some(detailed_movie_body),
+        Some(format!("/{movie_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_credits(
+    &mut self,
+    movie_id: i64,
+  ) -> Result<Vec<Credit>> {
+    info!("Fetching Radarr movie credits");
+    let event = RadarrEvent::GetMovieCredits(movie_id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("movieId={movie_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<Credit>>(request_props, |credit_vec, mut app| {
+        let cast_vec: Vec<Credit> = credit_vec
+          .iter()
+          .filter(|&credit| credit.credit_type == CreditType::Cast)
+          .cloned()
+          .collect();
+        let crew_vec: Vec<Credit> = credit_vec
+          .iter()
+          .filter(|&credit| credit.credit_type == CreditType::Crew)
+          .cloned()
+          .collect();
+
+        if app.data.radarr_data.movie_details_modal.is_none() {
+          app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
+        }
+
+        app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_cast
+          .set_items(cast_vec);
+        app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_crew
+          .set_items(crew_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_movies(&mut self) -> Result<Vec<Movie>> {
+    info!("Fetching Radarr library");
+    let event = RadarrEvent::GetMovies;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Movie>>(request_props, |mut movie_vec, mut app| {
+        if !matches!(
+          app.get_current_route(),
+          Route::Radarr(ActiveRadarrBlock::MoviesSortPrompt, _)
+        ) {
+          movie_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app.data.radarr_data.movies.set_items(movie_vec);
+          app.data.radarr_data.movies.apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_movie_details(
+    &mut self,
+    movie_id: i64,
+  ) -> Result<Movie> {
+    info!("Fetching Radarr movie details");
+    let event = RadarrEvent::GetMovieDetails(movie_id);
+
+    info!("Fetching movie details for movie with ID: {movie_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{movie_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), Movie>(request_props, |movie_response, mut app| {
+        let Movie {
+          id,
+          title,
+          year,
+          overview,
+          path,
+          studio,
+          has_file,
+          quality_profile_id,
+          size_on_disk,
+          genres,
+          runtime,
+          certification,
+          ratings,
+          movie_file,
+          collection,
+          ..
+        } = movie_response;
+        let (hours, minutes) = convert_runtime(runtime);
+        let size = convert_to_gb(size_on_disk);
+        let studio = studio.clone().unwrap_or_default();
+        let quality_profile = app
+          .data
+          .radarr_data
+          .quality_profile_map
+          .get_by_left(&quality_profile_id)
+          .unwrap_or(&"".to_owned())
+          .to_owned();
+        let imdb_rating = if let Some(rating) = ratings.imdb {
+          if let Some(value) = rating.value.as_f64() {
+            format!("{value:.1}")
+          } else {
+            String::new()
+          }
+        } else {
+          String::new()
+        };
+
+        let tmdb_rating = if let Some(rating) = ratings.tmdb {
+          if let Some(value) = rating.value.as_f64() {
+            format!("{}%", (value * 10f64).ceil())
+          } else {
+            String::new()
+          }
+        } else {
+          String::new()
+        };
+
+        let rotten_tomatoes_rating = if let Some(rating) = ratings.rotten_tomatoes {
+          if let Some(value) = rating.value.as_u64() {
+            format!("{value}%")
+          } else {
+            String::new()
+          }
+        } else {
+          String::new()
+        };
+
+        let status = get_movie_status(has_file, &app.data.radarr_data.downloads.items, id);
+        let collection = collection.unwrap_or_default();
+
+        let mut movie_details_modal = MovieDetailsModal {
+          movie_details: ScrollableText::with_string(formatdoc!(
+            "Title: {title}
+            Year: {year}
+            Runtime: {hours}h {minutes}m
+            Rating: {}
+            Collection: {}
+            Status: {status}
+            Description: {overview}
+            TMDB: {tmdb_rating}
+            IMDB: {imdb_rating}
+            Rotten Tomatoes: {rotten_tomatoes_rating}
+            Quality Profile: {quality_profile}
+            Size: {size:.2} GB
+            Path: {path}
+            Studio: {studio}
+            Genres: {}",
+            certification.unwrap_or_default(),
+            collection
+              .title
+              .as_ref()
+              .unwrap_or(&String::new())
+              .to_owned(),
+            genres.join(", ")
+          )),
+          ..MovieDetailsModal::default()
+        };
+
+        if let Some(file) = movie_file {
+          movie_details_modal.file_details = formatdoc!(
+            "Relative Path: {}
+              Absolute Path: {}
+              Size: {size:.2} GB
+              Date Added: {}",
+            file.relative_path,
+            file.path,
+            file.date_added
+          );
+
+          if let Some(media_info) = file.media_info {
+            movie_details_modal.audio_details = formatdoc!(
+              "Bitrate: {}
+              Channels: {:.1}
+              Codec: {}
+              Languages: {}
+              Stream Count: {}",
+              media_info.audio_bitrate,
+              media_info.audio_channels.as_f64().unwrap(),
+              media_info.audio_codec.unwrap_or_default(),
+              media_info.audio_languages.unwrap_or_default(),
+              media_info.audio_stream_count
+            );
+
+            movie_details_modal.video_details = formatdoc!(
+              "Bit Depth: {}
+              Bitrate: {}
+              Codec: {}
+              FPS: {}
+              Resolution: {}
+              Scan Type: {}
+              Runtime: {}",
+              media_info.video_bit_depth,
+              media_info.video_bitrate,
+              media_info.video_codec.unwrap_or_default(),
+              media_info.video_fps.as_f64().unwrap(),
+              media_info.resolution,
+              media_info.scan_type,
+              media_info.run_time
+            );
+          }
+        }
+
+        app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_movie_history(
+    &mut self,
+    movie_id: i64,
+  ) -> Result<Vec<MovieHistoryItem>> {
+    info!("Fetching Radarr movie history");
+    let event = RadarrEvent::GetMovieHistory(movie_id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("movieId={movie_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<MovieHistoryItem>>(request_props, |movie_history_vec, mut app| {
+        let mut reversed_movie_history_vec = movie_history_vec.to_vec();
+        reversed_movie_history_vec.reverse();
+
+        if app.data.radarr_data.movie_details_modal.is_none() {
+          app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default())
+        }
+
+        app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_history
+          .set_items(reversed_movie_history_vec)
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_movie_releases(
+    &mut self,
+    movie_id: i64,
+  ) -> Result<Vec<RadarrRelease>> {
+    info!("Fetching releases for movie with ID: {movie_id}");
+    let event = RadarrEvent::GetReleases(movie_id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("movieId={movie_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<RadarrRelease>>(request_props, |release_vec, mut app| {
+        if app.data.radarr_data.movie_details_modal.is_none() {
+          app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
+        }
+
+        app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_releases
+          .set_items(release_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn search_movie(
+    &mut self,
+    query: String,
+  ) -> Result<Vec<AddMovieSearchResult>> {
+    info!("Searching for specific Radarr movie");
+    let event = RadarrEvent::SearchNewMovie(String::new());
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("term={}", encode(&query))),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<AddMovieSearchResult>>(request_props, |movie_vec, mut app| {
+        if movie_vec.is_empty() {
+          app.pop_and_push_navigation_stack(ActiveRadarrBlock::AddMovieEmptySearchResults.into());
+        } else if let Some(add_searched_movies) = app.data.radarr_data.add_searched_movies.as_mut()
+        {
+          add_searched_movies.set_items(movie_vec);
+        } else {
+          let mut add_searched_movies = StatefulTable::default();
+          add_searched_movies.set_items(movie_vec);
+          app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network) async fn toggle_movie_monitoring(&mut self, movie_id: i64) -> Result<()> {
+    let event = RadarrEvent::ToggleMovieMonitoring(movie_id);
+
+    let detail_event = RadarrEvent::GetMovieDetails(movie_id);
+    info!("Toggling movie monitoring for movie with ID: {movie_id}");
+    info!("Fetching movie details for movie with ID: {movie_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{movie_id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_movie_body, _| {
+        response = detailed_movie_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing toggle movie monitoring body");
+
+    match serde_json::from_str::<Value>(&response) {
+      Ok(mut detailed_movie_body) => {
+        let monitored = detailed_movie_body
+          .get("monitored")
+          .unwrap()
+          .as_bool()
+          .unwrap();
+
+        *detailed_movie_body.get_mut("monitored").unwrap() = json!(!monitored);
+
+        debug!("Toggle movie monitoring body: {detailed_movie_body:?}");
+
+        let request_props = self
+          .request_props_from(
+            event,
+            RequestMethod::Put,
+            Some(detailed_movie_body),
+            Some(format!("/{movie_id}")),
+            None,
+          )
+          .await;
+
+        self
+          .handle_request::<Value, ()>(request_props, |_, _| ())
+          .await
+      }
+      Err(_) => {
+        warn!("Request for detailed movie body was interrupted");
+        Ok(())
+      }
+    }
+  }
+
+  pub(in crate::network) async fn trigger_automatic_movie_search(
+    &mut self,
+    movie_id: i64,
+  ) -> Result<Value> {
+    let event = RadarrEvent::TriggerAutomaticSearch(movie_id);
+    info!("Searching indexers for movie with ID: {movie_id}");
+    let body = MovieCommandBody {
+      name: "MoviesSearch".to_owned(),
+      movie_ids: vec![movie_id],
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<MovieCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network) async fn update_all_movies(&mut self) -> Result<Value> {
+    info!("Updating all movies");
+    let event = RadarrEvent::UpdateAllMovies;
+    let body = MovieCommandBody {
+      name: "RefreshMovie".to_owned(),
+      movie_ids: Vec::new(),
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<MovieCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network) async fn update_and_scan_movie(&mut self, movie_id: i64) -> Result<Value> {
+    let event = RadarrEvent::UpdateAndScan(movie_id);
+    info!("Updating and scanning movie with ID: {movie_id}");
+    let body = MovieCommandBody {
+      name: "RefreshMovie".to_owned(),
+      movie_ids: vec![movie_id],
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<MovieCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
+
+pub(in crate::network::radarr_network::library) fn get_movie_status(
+  has_file: bool,
+  downloads_vec: &[DownloadRecord],
+  movie_id: i64,
+) -> String {
+  if !has_file {
+    if let Some(download) = downloads_vec
+      .iter()
+      .find(|&download| download.movie_id == movie_id)
+    {
+      if download.status == "downloading" {
+        return "Downloading".to_owned();
+      }
+
+      if download.status == "completed" {
+        return "Awaiting Import".to_owned();
+      }
+    }
+
+    return "Missing".to_owned();
+  }
+
+  "Downloaded".to_owned()
+}
diff --git a/src/network/radarr_network/library/radarr_library_network_tests.rs b/src/network/radarr_network/library/radarr_library_network_tests.rs
new file mode 100644
index 0000000..3199972
--- /dev/null
+++ b/src/network/radarr_network/library/radarr_library_network_tests.rs
@@ -0,0 +1,1235 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::{
+    AddMovieBody, AddMovieOptions, Credit, DeleteMovieParams, DownloadRecord, EditMovieParams,
+    MinimumAvailability, Movie, MovieHistoryItem, RadarrReleaseDownloadBody,
+  };
+  use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
+  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
+  use crate::models::stateful_table::SortOption;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::library::get_movie_status;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::MOVIE_JSON;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::{
+    add_movie_search_result, cast_credit, crew_credit, movie, movie_history_item, release,
+  };
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::radarr_network::RadarrSerdeable;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use bimap::BiMap;
+  use indoc::formatdoc;
+  use mockito::Matcher;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::{json, Value};
+  use std::slice;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_add_movie_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "tmdbId": 1234,
+        "title": "Test",
+        "rootFolderPath": "/nfs2",
+        "minimumAvailability": "announced",
+        "monitored": true,
+        "qualityProfileId": 2222,
+        "tags": [1, 2],
+        "addOptions": {
+          "monitor": "movieOnly",
+          "searchForMovie": true
+        }
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::AddMovie(AddMovieBody::default()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let add_movie_body = AddMovieBody {
+      tmdb_id: 1234,
+      title: "Test".to_owned(),
+      root_folder_path: "/nfs2".to_owned(),
+      minimum_availability: "announced".to_owned(),
+      monitored: true,
+      quality_profile_id: 2222,
+      tags: vec![1, 2],
+      tag_input_string: Some("usenet, testing".into()),
+      add_options: AddMovieOptions {
+        monitor: "movieOnly".to_owned(),
+        search_for_movie: true,
+      },
+    };
+
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::AddMovie(add_movie_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_add_movie_event_does_not_overwrite_tags_field_if_tag_input_string_is_none() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "tmdbId": 1234,
+        "title": "Test",
+        "rootFolderPath": "/nfs2",
+        "minimumAvailability": "announced",
+        "monitored": true,
+        "qualityProfileId": 2222,
+        "tags": [1, 2],
+        "addOptions": {
+          "monitor": "movieOnly",
+          "searchForMovie": true
+        }
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::AddMovie(AddMovieBody::default()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let add_movie_body = AddMovieBody {
+      tmdb_id: 1234,
+      title: "Test".to_owned(),
+      root_folder_path: "/nfs2".to_owned(),
+      minimum_availability: "announced".to_owned(),
+      monitored: true,
+      quality_profile_id: 2222,
+      tags: vec![1, 2],
+      tag_input_string: None,
+      add_options: AddMovieOptions {
+        monitor: "movieOnly".to_owned(),
+        search_for_movie: true,
+      },
+    };
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::AddMovie(add_movie_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_movie_event() {
+    let delete_movie_params = DeleteMovieParams {
+      id: 1,
+      delete_movie_files: true,
+      add_list_exclusion: true,
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      RadarrEvent::DeleteMovie(delete_movie_params.clone()),
+      Some("/1"),
+      Some("deleteFiles=true&addImportExclusion=true"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DeleteMovie(delete_movie_params))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_download_radarr_release_event() {
+    let expected_body = RadarrReleaseDownloadBody {
+      guid: "1234".to_owned(),
+      indexer_id: 2,
+      movie_id: 1,
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "guid": "1234",
+        "indexerId": 2,
+        "movieId": 1
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::DownloadRelease(expected_body.clone()),
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DownloadRelease(expected_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_movie_event() {
+    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+    *expected_body.get_mut("minimumAvailability").unwrap() = json!("announced");
+    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
+    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
+    let edit_movie_params = EditMovieParams {
+      movie_id: 1,
+      monitored: Some(false),
+      minimum_availability: Some(MinimumAvailability::Announced),
+      quality_profile_id: Some(1111),
+      root_folder_path: Some("/nfs/Test Path".to_owned()),
+      tag_input_string: Some("usenet, testing".into()),
+      ..EditMovieParams::default()
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_movie_event_does_not_overwrite_tags_vec_if_tag_input_string_is_none() {
+    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+    *expected_body.get_mut("minimumAvailability").unwrap() = json!("announced");
+    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
+    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
+    let edit_movie_params = EditMovieParams {
+      movie_id: 1,
+      monitored: Some(false),
+      minimum_availability: Some(MinimumAvailability::Announced),
+      quality_profile_id: Some(1111),
+      root_folder_path: Some("/nfs/Test Path".to_owned()),
+      tags: Some(vec![1, 2]),
+      ..EditMovieParams::default()
+    };
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_movie_event_defaults_to_previous_values() {
+    let expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let edit_movie_params = EditMovieParams {
+      movie_id: 1,
+      ..EditMovieParams::default()
+    };
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_movie_event_uses_provided_parameters_returns_empty_tags_vec_when_clear_tags_is_true(
+  ) {
+    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    *expected_body.get_mut("tags").unwrap() = json!([]);
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let edit_movie_params = EditMovieParams {
+      movie_id: 1,
+      clear_tags: true,
+      ..EditMovieParams::default()
+    };
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_credits_event() {
+    let credits_json = json!([
+        {
+          "personName": "Madison Clarke",
+          "character": "Johnny Blaze",
+          "type": "cast",
+        },
+        {
+          "personName": "Alex Clarke",
+          "department": "Music",
+          "job": "Composition",
+          "type": "crew",
+        }
+    ]);
+    let response: Vec<Credit> = serde_json::from_value(credits_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(credits_json),
+      None,
+      RadarrEvent::GetMovieCredits(1),
+      None,
+      Some("movieId=1"),
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Credits(credits) = network
+      .handle_radarr_event(RadarrEvent::GetMovieCredits(1))
+      .await
+      .unwrap()
+    {
+      let app = app_arc.lock().await;
+      let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
+
+      async_server.assert_async().await;
+      assert_eq!(movie_details_modal.movie_cast.items, vec![cast_credit()]);
+      assert_eq!(movie_details_modal.movie_crew.items, vec![crew_credit()]);
+      assert_eq!(credits, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_credits_event_empty_movie_details_modal() {
+    let credits_json = json!([
+        {
+          "personName": "Madison Clarke",
+          "character": "Johnny Blaze",
+          "type": "cast",
+        },
+        {
+          "personName": "Alex Clarke",
+          "department": "Music",
+          "job": "Composition",
+          "type": "crew",
+        }
+    ]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(credits_json),
+      None,
+      RadarrEvent::GetMovieCredits(1),
+      None,
+      Some("movieId=1"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetMovieCredits(1))
+      .await
+      .is_ok());
+
+    let app = app_arc.lock().await;
+    let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
+
+    async_server.assert_async().await;
+    assert_eq!(movie_details_modal.movie_cast.items, vec![cast_credit()]);
+    assert_eq!(movie_details_modal.movie_crew.items, vec![crew_credit()]);
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_movies_event(#[values(true, false)] use_custom_sorting: bool) {
+    let mut movie_1: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    let mut movie_2: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    *movie_1.get_mut("id").unwrap() = json!(1);
+    *movie_1.get_mut("title").unwrap() = json!("z test");
+    *movie_2.get_mut("id").unwrap() = json!(2);
+    *movie_2.get_mut("title").unwrap() = json!("A test");
+    let expected_movies = vec![
+      Movie {
+        id: 1,
+        title: "z test".into(),
+        ..movie()
+      },
+      Movie {
+        id: 2,
+        title: "A test".into(),
+        ..movie()
+      },
+    ];
+    let mut expected_sorted_movies = vec![
+      Movie {
+        id: 1,
+        title: "z test".into(),
+        ..movie()
+      },
+      Movie {
+        id: 2,
+        title: "A test".into(),
+        ..movie()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([movie_1, movie_2])),
+      None,
+      RadarrEvent::GetMovies,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.movies.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &Movie, b: &Movie| {
+        a.title
+          .text
+          .to_lowercase()
+          .cmp(&b.title.text.to_lowercase())
+      };
+      expected_sorted_movies.sort_by(cmp_fn);
+      let title_sort_option = SortOption {
+        name: "Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .movies
+        .sorting(vec![title_sort_option]);
+    }
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Movies(movies) = network
+      .handle_radarr_event(RadarrEvent::GetMovies)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.movies.items,
+        expected_sorted_movies
+      );
+      assert!(app_arc.lock().await.data.radarr_data.movies.sort_asc);
+      assert_eq!(movies, expected_movies);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movies_event_no_op_while_user_is_selecting_sort_options() {
+    let mut movie_1: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    let mut movie_2: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    *movie_1.get_mut("id").unwrap() = json!(1);
+    *movie_1.get_mut("title").unwrap() = json!("z test");
+    *movie_2.get_mut("id").unwrap() = json!(2);
+    *movie_2.get_mut("title").unwrap() = json!("A test");
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([movie_1, movie_2])),
+      None,
+      RadarrEvent::GetMovies,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveRadarrBlock::MoviesSortPrompt.into());
+    app_arc.lock().await.data.radarr_data.movies.sort_asc = true;
+    let cmp_fn = |a: &Movie, b: &Movie| {
+      a.title
+        .text
+        .to_lowercase()
+        .cmp(&b.title.text.to_lowercase())
+    };
+    let title_sort_option = SortOption {
+      name: "Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .movies
+      .sorting(vec![title_sort_option]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetMovies)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .movies
+      .items
+      .is_empty());
+    assert!(app_arc.lock().await.data.radarr_data.movies.sort_asc);
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_details_event() {
+    let response: Movie = serde_json::from_str(MOVIE_JSON).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.quality_profile_map =
+      BiMap::from_iter([(2222, "HD - 1080p".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Movie(movie) = network
+      .handle_radarr_event(RadarrEvent::GetMovieDetails(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .movie_details_modal
+        .is_some());
+      assert_eq!(movie, response);
+
+      let app = app_arc.lock().await;
+      let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
+      assert_str_eq!(
+        movie_details_modal.movie_details.get_text(),
+        formatdoc!(
+          "Title: Test
+          Year: 2023
+          Runtime: 2h 0m
+          Rating: R
+          Collection: Test Collection
+          Status: Downloaded
+          Description: Blah blah blah
+          TMDB: 99%
+          IMDB: 9.9
+          Rotten Tomatoes: 
+          Quality Profile: HD - 1080p
+          Size: 3.30 GB
+          Path: /nfs/movies
+          Studio: 21st Century Alex
+          Genres: cool, family, fun"
+        )
+      );
+      assert_str_eq!(
+        movie_details_modal.file_details,
+        formatdoc!(
+          "Relative Path: Test.mkv
+        Absolute Path: /nfs/movies/Test.mkv
+        Size: 3.30 GB
+        Date Added: 2022-12-30 07:37:56 UTC"
+        )
+      );
+      assert_str_eq!(
+        movie_details_modal.audio_details,
+        formatdoc!(
+          "Bitrate: 0
+        Channels: 7.1
+        Codec: AAC
+        Languages: eng
+        Stream Count: 1"
+        )
+      );
+      assert_str_eq!(
+        movie_details_modal.video_details,
+        formatdoc!(
+          "Bit Depth: 10
+        Bitrate: 0
+        Codec: x265
+        FPS: 23.976
+        Resolution: 1920x804
+        Scan Type: Progressive
+        Runtime: 2:00:00"
+        )
+      );
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_details_event_empty_options_give_correct_defaults() {
+    let movie_json_with_missing_fields = json!({
+      "id": 1,
+      "title": "Test",
+      "originalLanguage": {
+        "id": 1,
+        "name": "English"
+      },
+      "sizeOnDisk": 0,
+      "status": "Downloaded",
+      "overview": "Blah blah blah",
+      "path": "/nfs/movies",
+      "studio": "21st Century Alex",
+      "genres": ["cool", "family", "fun"],
+      "year": 2023,
+      "monitored": true,
+      "hasFile": false,
+      "runtime": 120,
+      "tmdbId": 1234,
+      "qualityProfileId": 2222,
+      "tags": [1],
+      "minimumAvailability": "released",
+      "ratings": {}
+    });
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(movie_json_with_missing_fields),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.quality_profile_map =
+      BiMap::from_iter([(2222, "HD - 1080p".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetMovieDetails(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .movie_details_modal
+      .is_some());
+
+    let app = app_arc.lock().await;
+    let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
+    assert_str_eq!(
+      movie_details_modal.movie_details.get_text(),
+      formatdoc!(
+        "Title: Test
+          Year: 2023
+          Runtime: 2h 0m
+          Rating: 
+          Collection: 
+          Status: Missing
+          Description: Blah blah blah
+          TMDB: 
+          IMDB: 
+          Rotten Tomatoes: 
+          Quality Profile: HD - 1080p
+          Size: 0.00 GB
+          Path: /nfs/movies
+          Studio: 21st Century Alex
+          Genres: cool, family, fun"
+      )
+    );
+    assert!(movie_details_modal.file_details.is_empty());
+    assert!(movie_details_modal.audio_details.is_empty());
+    assert!(movie_details_modal.video_details.is_empty());
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_history_event() {
+    let movie_history_item_json = json!([{
+      "sourceTitle": "Test",
+      "quality": { "quality": { "name": "HD - 1080p" }},
+      "languages": [ { "id": 1, "name": "English" } ],
+      "date": "2022-12-30T07:37:56Z",
+      "eventType": "grabbed"
+    }]);
+    let response: Vec<MovieHistoryItem> =
+      serde_json::from_value(movie_history_item_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(movie_history_item_json),
+      None,
+      RadarrEvent::GetMovieHistory(1),
+      None,
+      Some("movieId=1"),
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::MovieHistoryItems(history) = network
+      .handle_radarr_event(RadarrEvent::GetMovieHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_ref()
+          .unwrap()
+          .movie_history
+          .items,
+        vec![movie_history_item()]
+      );
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_history_event_empty_movie_details_modal() {
+    let movie_history_item_json = json!([{
+      "sourceTitle": "Test",
+      "quality": { "quality": { "name": "HD - 1080p" }},
+      "languages": [ { "id": 1, "name": "English" } ],
+      "date": "2022-12-30T07:37:56Z",
+      "eventType": "grabbed"
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(movie_history_item_json),
+      None,
+      RadarrEvent::GetMovieHistory(1),
+      None,
+      Some("movieId=1"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetMovieHistory(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert_eq!(
+      app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .movie_details_modal
+        .as_ref()
+        .unwrap()
+        .movie_history
+        .items,
+      vec![movie_history_item()]
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_releases_event() {
+    let release_json = json!([{
+      "guid": "1234",
+      "protocol": "torrent",
+      "age": 1,
+      "title": "Test Release",
+      "indexer": "kickass torrents",
+      "indexerId": 2,
+      "size": 1234,
+      "rejected": true,
+      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+      "seeders": 2,
+      "leechers": 1,
+      "languages": [ { "id": 1, "name": "English" } ],
+      "quality": { "quality": { "name": "HD - 1080p" }}
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(release_json),
+      None,
+      RadarrEvent::GetReleases(1),
+      None,
+      Some("movieId=1"),
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Releases(releases_vec) = network
+      .handle_radarr_event(RadarrEvent::GetReleases(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_ref()
+          .unwrap()
+          .movie_releases
+          .items,
+        vec![release()]
+      );
+      assert_eq!(releases_vec, vec![release()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_movie_releases_event_empty_movie_details_modal() {
+    let release_json = json!([{
+      "guid": "1234",
+      "protocol": "torrent",
+      "age": 1,
+      "title": "Test Release",
+      "indexer": "kickass torrents",
+      "indexerId": 2,
+      "size": 1234,
+      "rejected": true,
+      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+      "seeders": 2,
+      "leechers": 1,
+      "languages": [ { "id": 1, "name": "English" } ],
+      "quality": { "quality": { "name": "HD - 1080p" }}
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(release_json),
+      None,
+      RadarrEvent::GetReleases(1),
+      None,
+      Some("movieId=1"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::GetReleases(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert_eq!(
+      app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .movie_details_modal
+        .as_ref()
+        .unwrap()
+        .movie_releases
+        .items,
+      vec![release()]
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_search_new_movie_event() {
+    let add_movie_search_result_json = json!([{
+      "tmdbId": 1234,
+      "title": "Test",
+      "originalLanguage": { "id": 1, "name": "English" },
+      "status": "released",
+      "overview": "New movie blah blah blah",
+      "genres": ["cool", "family", "fun"],
+      "year": 2023,
+      "runtime": 120,
+      "ratings": {
+        "imdb": {
+          "value": 9.9
+        },
+        "tmdb": {
+          "value": 9.9
+        },
+        "rottenTomatoes": {
+          "value": 9.9
+        }
+      }
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(add_movie_search_result_json),
+      None,
+      RadarrEvent::SearchNewMovie("test term".into()),
+      None,
+      Some("term=test%20term"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::AddMovieSearchResults(add_movie_search_results) = network
+      .handle_radarr_event(RadarrEvent::SearchNewMovie("test term".into()))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .add_searched_movies
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .radarr_data
+          .add_searched_movies
+          .as_ref()
+          .unwrap()
+          .items,
+        vec![add_movie_search_result()]
+      );
+      assert_eq!(add_movie_search_results, vec![add_movie_search_result()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_search_new_movie_event_no_results() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([])),
+      None,
+      RadarrEvent::SearchNewMovie("test term".into()),
+      None,
+      Some("term=test%20term"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::SearchNewMovie("test term".into()))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .radarr_data
+      .add_searched_movies
+      .is_none());
+    assert_eq!(
+      app_arc.lock().await.get_current_route(),
+      ActiveRadarrBlock::AddMovieEmptySearchResults.into()
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_toggle_movie_monitoring_event() {
+    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
+      None,
+      RadarrEvent::GetMovieDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_toggle_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          RadarrEvent::ToggleMovieMonitoring(1).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    {
+      let mut app = app_arc.lock().await;
+      app.data.radarr_data.movies.set_items(vec![movie()]);
+    }
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::ToggleMovieMonitoring(1))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_toggle_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_trigger_automatic_movie_search_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "MoviesSearch",
+        "movieIds": [ 1 ]
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::TriggerAutomaticSearch(1),
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::TriggerAutomaticSearch(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_all_movies_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshMovie",
+        "movieIds": []
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::UpdateAllMovies,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::UpdateAllMovies)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_and_scan_movie_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshMovie",
+        "movieIds": [ 1 ]
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::UpdateAndScan(1),
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::UpdateAndScan(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[test]
+  fn test_get_movie_status_downloaded() {
+    assert_str_eq!(get_movie_status(true, &[], 0), "Downloaded");
+  }
+
+  #[test]
+  fn test_get_movie_status_missing() {
+    let download_record = DownloadRecord {
+      movie_id: 1,
+      ..DownloadRecord::default()
+    };
+
+    assert_str_eq!(
+      get_movie_status(false, slice::from_ref(&download_record), 0),
+      "Missing"
+    );
+
+    assert_str_eq!(get_movie_status(false, &[download_record], 1), "Missing");
+  }
+
+  #[test]
+  fn test_get_movie_status_downloading() {
+    assert_str_eq!(
+      get_movie_status(
+        false,
+        &[DownloadRecord {
+          movie_id: 1,
+          status: "downloading".to_owned(),
+          ..DownloadRecord::default()
+        }],
+        1
+      ),
+      "Downloading"
+    );
+  }
+
+  #[test]
+  fn test_get_movie_status_awaiting_import() {
+    assert_str_eq!(
+      get_movie_status(
+        false,
+        &[DownloadRecord {
+          movie_id: 1,
+          status: "completed".to_owned(),
+          ..DownloadRecord::default()
+        }],
+        1
+      ),
+      "Awaiting Import"
+    );
+  }
+}
diff --git a/src/network/radarr_network/mod.rs b/src/network/radarr_network/mod.rs
new file mode 100644
index 0000000..14e5511
--- /dev/null
+++ b/src/network/radarr_network/mod.rs
@@ -0,0 +1,420 @@
+use anyhow::Result;
+use std::fmt::Debug;
+
+use log::info;
+use serde_json::{json, Value};
+
+use crate::models::radarr_models::{
+  AddMovieBody, DeleteMovieParams, EditCollectionParams, EditMovieParams, IndexerSettings,
+  RadarrReleaseDownloadBody, RadarrSerdeable, RadarrTaskName,
+};
+use crate::models::servarr_models::{AddRootFolderBody, EditIndexerParams, QualityProfile, Tag};
+use crate::network::{Network, NetworkEvent, RequestMethod};
+
+use super::NetworkResource;
+
+mod blocklist;
+mod collections;
+mod downloads;
+mod indexers;
+mod library;
+mod root_folders;
+mod system;
+
+#[cfg(test)]
+#[path = "radarr_network_tests.rs"]
+mod radarr_network_tests;
+
+#[cfg(test)]
+#[path = "radarr_network_test_utils.rs"]
+mod radarr_network_test_utils;
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum RadarrEvent {
+  AddMovie(AddMovieBody),
+  AddRootFolder(AddRootFolderBody),
+  AddTag(String),
+  ClearBlocklist,
+  DeleteBlocklistItem(i64),
+  DeleteDownload(i64),
+  DeleteIndexer(i64),
+  DeleteMovie(DeleteMovieParams),
+  DeleteRootFolder(i64),
+  DeleteTag(i64),
+  DownloadRelease(RadarrReleaseDownloadBody),
+  EditAllIndexerSettings(IndexerSettings),
+  EditCollection(EditCollectionParams),
+  EditIndexer(EditIndexerParams),
+  EditMovie(EditMovieParams),
+  GetBlocklist,
+  GetCollections,
+  GetDownloads(u64),
+  GetHostConfig,
+  GetIndexers,
+  GetAllIndexerSettings,
+  GetLogs(u64),
+  GetMovieCredits(i64),
+  GetMovieDetails(i64),
+  GetMovieHistory(i64),
+  GetMovies,
+  GetDiskSpace,
+  GetQualityProfiles,
+  GetQueuedEvents,
+  GetReleases(i64),
+  GetRootFolders,
+  GetSecurityConfig,
+  GetStatus,
+  GetTags,
+  GetTasks,
+  GetUpdates,
+  HealthCheck,
+  SearchNewMovie(String),
+  StartTask(RadarrTaskName),
+  TestIndexer(i64),
+  TestAllIndexers,
+  ToggleMovieMonitoring(i64),
+  TriggerAutomaticSearch(i64),
+  UpdateAllMovies,
+  UpdateAndScan(i64),
+  UpdateCollections,
+  UpdateDownloads,
+}
+
+impl NetworkResource for RadarrEvent {
+  fn resource(&self) -> &'static str {
+    match &self {
+      RadarrEvent::ClearBlocklist => "/blocklist/bulk",
+      RadarrEvent::DeleteBlocklistItem(_) => "/blocklist",
+      RadarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
+      RadarrEvent::GetCollections | RadarrEvent::EditCollection(_) => "/collection",
+      RadarrEvent::GetDownloads(_) | RadarrEvent::DeleteDownload(_) => "/queue",
+      RadarrEvent::GetHostConfig | RadarrEvent::GetSecurityConfig => "/config/host",
+      RadarrEvent::GetIndexers | RadarrEvent::EditIndexer(_) | RadarrEvent::DeleteIndexer(_) => {
+        "/indexer"
+      }
+      RadarrEvent::GetAllIndexerSettings | RadarrEvent::EditAllIndexerSettings(_) => {
+        "/config/indexer"
+      }
+      RadarrEvent::GetLogs(_) => "/log",
+      RadarrEvent::AddMovie(_)
+      | RadarrEvent::EditMovie(_)
+      | RadarrEvent::GetMovies
+      | RadarrEvent::GetMovieDetails(_)
+      | RadarrEvent::DeleteMovie(_)
+      | RadarrEvent::ToggleMovieMonitoring(_) => "/movie",
+      RadarrEvent::SearchNewMovie(_) => "/movie/lookup",
+      RadarrEvent::GetMovieCredits(_) => "/credit",
+      RadarrEvent::GetMovieHistory(_) => "/history/movie",
+      RadarrEvent::GetDiskSpace => "/diskspace",
+      RadarrEvent::GetQualityProfiles => "/qualityprofile",
+      RadarrEvent::GetReleases(_) | RadarrEvent::DownloadRelease(_) => "/release",
+      RadarrEvent::AddRootFolder(_)
+      | RadarrEvent::GetRootFolders
+      | RadarrEvent::DeleteRootFolder(_) => "/rootfolder",
+      RadarrEvent::GetStatus => "/system/status",
+      RadarrEvent::GetTags | RadarrEvent::AddTag(_) | RadarrEvent::DeleteTag(_) => "/tag",
+      RadarrEvent::GetTasks => "/system/task",
+      RadarrEvent::GetUpdates => "/update",
+      RadarrEvent::TestIndexer(_) => "/indexer/test",
+      RadarrEvent::TestAllIndexers => "/indexer/testall",
+      RadarrEvent::StartTask(_)
+      | RadarrEvent::GetQueuedEvents
+      | RadarrEvent::TriggerAutomaticSearch(_)
+      | RadarrEvent::UpdateAndScan(_)
+      | RadarrEvent::UpdateAllMovies
+      | RadarrEvent::UpdateDownloads
+      | RadarrEvent::UpdateCollections => "/command",
+      RadarrEvent::HealthCheck => "/health",
+    }
+  }
+}
+
+impl From<RadarrEvent> for NetworkEvent {
+  fn from(radarr_event: RadarrEvent) -> Self {
+    NetworkEvent::Radarr(radarr_event)
+  }
+}
+
+impl Network<'_, '_> {
+  pub async fn handle_radarr_event(
+    &mut self,
+    radarr_event: RadarrEvent,
+  ) -> Result<RadarrSerdeable> {
+    match radarr_event {
+      RadarrEvent::AddMovie(body) => self.add_movie(body).await.map(RadarrSerdeable::from),
+      RadarrEvent::AddRootFolder(path) => self
+        .add_radarr_root_folder(path)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::AddTag(tag) => self.add_radarr_tag(tag).await.map(RadarrSerdeable::from),
+      RadarrEvent::ClearBlocklist => self
+        .clear_radarr_blocklist()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
+        .delete_radarr_blocklist_item(blocklist_item_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::DeleteDownload(download_id) => self
+        .delete_radarr_download(download_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::DeleteIndexer(indexer_id) => self
+        .delete_radarr_indexer(indexer_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::DeleteMovie(params) => {
+        self.delete_movie(params).await.map(RadarrSerdeable::from)
+      }
+      RadarrEvent::DeleteRootFolder(root_folder_id) => self
+        .delete_radarr_root_folder(root_folder_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::DeleteTag(tag_id) => self
+        .delete_radarr_tag(tag_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::DownloadRelease(params) => self
+        .download_radarr_release(params)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::EditAllIndexerSettings(params) => self
+        .edit_all_radarr_indexer_settings(params)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::EditCollection(params) => self
+        .edit_collection(params)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::EditIndexer(params) => self
+        .edit_radarr_indexer(params)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::EditMovie(params) => self.edit_movie(params).await.map(RadarrSerdeable::from),
+      RadarrEvent::GetAllIndexerSettings => self
+        .get_all_radarr_indexer_settings()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetBlocklist => self.get_radarr_blocklist().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetCollections => self.get_collections().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetDownloads(count) => self
+        .get_radarr_downloads(count)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetHostConfig => self
+        .get_radarr_host_config()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetIndexers => self.get_radarr_indexers().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetLogs(events) => self
+        .get_radarr_logs(events)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetMovieCredits(movie_id) => {
+        self.get_credits(movie_id).await.map(RadarrSerdeable::from)
+      }
+      RadarrEvent::GetMovieDetails(movie_id) => self
+        .get_movie_details(movie_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetMovieHistory(movie_id) => self
+        .get_movie_history(movie_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetMovies => self.get_movies().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetDiskSpace => self.get_radarr_diskspace().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetQualityProfiles => self
+        .get_radarr_quality_profiles()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetQueuedEvents => self
+        .get_queued_radarr_events()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetReleases(movie_id) => self
+        .get_movie_releases(movie_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetRootFolders => self
+        .get_radarr_root_folders()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetSecurityConfig => self
+        .get_radarr_security_config()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::GetStatus => self.get_radarr_status().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetTags => self.get_radarr_tags().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetTasks => self.get_radarr_tasks().await.map(RadarrSerdeable::from),
+      RadarrEvent::GetUpdates => self.get_radarr_updates().await.map(RadarrSerdeable::from),
+      RadarrEvent::HealthCheck => self
+        .get_radarr_healthcheck()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::SearchNewMovie(query) => {
+        self.search_movie(query).await.map(RadarrSerdeable::from)
+      }
+      RadarrEvent::StartTask(task_name) => self
+        .start_radarr_task(task_name)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::TestIndexer(indexer_id) => self
+        .test_radarr_indexer(indexer_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::TestAllIndexers => self
+        .test_all_radarr_indexers()
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::ToggleMovieMonitoring(movie_id) => self
+        .toggle_movie_monitoring(movie_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::TriggerAutomaticSearch(movie_id) => self
+        .trigger_automatic_movie_search(movie_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::UpdateAllMovies => self.update_all_movies().await.map(RadarrSerdeable::from),
+      RadarrEvent::UpdateAndScan(movie_id) => self
+        .update_and_scan_movie(movie_id)
+        .await
+        .map(RadarrSerdeable::from),
+      RadarrEvent::UpdateCollections => self.update_collections().await.map(RadarrSerdeable::from),
+      RadarrEvent::UpdateDownloads => self
+        .update_radarr_downloads()
+        .await
+        .map(RadarrSerdeable::from),
+    }
+  }
+
+  pub(in crate::network::radarr_network) async fn add_radarr_tag(
+    &mut self,
+    tag: String,
+  ) -> Result<Tag> {
+    info!("Adding a new Radarr tag");
+    let event = RadarrEvent::AddTag(String::new());
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        Some(json!({ "label": tag })),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, Tag>(request_props, |tag, mut app| {
+        app.data.radarr_data.tags_map.insert(tag.id, tag.label);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn delete_radarr_tag(
+    &mut self,
+    id: i64,
+  ) -> Result<()> {
+    info!("Deleting Radarr tag with id: {id}");
+    let event = RadarrEvent::DeleteTag(id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  async fn get_radarr_healthcheck(&mut self) -> Result<()> {
+    info!("Performing Radarr health check");
+    let event = RadarrEvent::HealthCheck;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  async fn get_radarr_quality_profiles(&mut self) -> Result<Vec<QualityProfile>> {
+    info!("Fetching Radarr quality profiles");
+    let event = RadarrEvent::GetQualityProfiles;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<QualityProfile>>(request_props, |quality_profiles, mut app| {
+        app.data.radarr_data.quality_profile_map = quality_profiles
+          .into_iter()
+          .map(|profile| (profile.id, profile.name))
+          .collect();
+      })
+      .await
+  }
+
+  async fn get_radarr_tags(&mut self) -> Result<Vec<Tag>> {
+    info!("Fetching Radarr tags");
+    let event = RadarrEvent::GetTags;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Tag>>(request_props, |tags_vec, mut app| {
+        app.data.radarr_data.tags_map = tags_vec
+          .into_iter()
+          .map(|tag| (tag.id, tag.label))
+          .collect();
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn extract_and_add_radarr_tag_ids_vec(
+    &mut self,
+    edit_tags: &str,
+  ) -> Vec<i64> {
+    let missing_tags_vec = {
+      let tags_map = &self.app.lock().await.data.radarr_data.tags_map;
+      edit_tags
+        .split(',')
+        .filter(|&tag| {
+          !tag.is_empty() && tags_map.get_by_right(tag.to_lowercase().trim()).is_none()
+        })
+        .collect::<Vec<&str>>()
+    };
+
+    for tag in missing_tags_vec {
+      self
+        .add_radarr_tag(tag.trim().to_owned())
+        .await
+        .expect("Unable to add tag");
+    }
+
+    let app = self.app.lock().await;
+    edit_tags
+      .split(',')
+      .filter(|tag| !tag.is_empty())
+      .map(|tag| {
+        *app
+          .data
+          .radarr_data
+          .tags_map
+          .get_by_right(tag.to_lowercase().trim())
+          .unwrap()
+      })
+      .collect()
+  }
+}
diff --git a/src/network/radarr_network/radarr_network_test_utils.rs b/src/network/radarr_network/radarr_network_test_utils.rs
new file mode 100644
index 0000000..54fb205
--- /dev/null
+++ b/src/network/radarr_network/radarr_network_test_utils.rs
@@ -0,0 +1,381 @@
+#[cfg(test)]
+pub(in crate::network::radarr_network) mod test_utils {
+  use crate::models::radarr_models::{
+    AddMovieSearchResult, BlocklistItem, BlocklistItemMovie, Collection, CollectionMovie, Credit,
+    CreditType, DownloadRecord, DownloadsResponse, IndexerSettings, MediaInfo, MinimumAvailability,
+    Movie, MovieCollection, MovieFile, MovieHistoryItem, RadarrRelease, Rating, RatingsList,
+  };
+  use crate::models::servarr_models::{
+    Indexer, IndexerField, Language, Quality, QualityWrapper, RootFolder,
+  };
+  use crate::models::HorizontallyScrollableText;
+  use chrono::DateTime;
+  use serde_json::{json, Number};
+
+  pub const MOVIE_JSON: &str = r#"{
+        "id": 1,
+        "title": "Test",
+        "tmdbId": 1234,
+        "originalLanguage": {
+          "id": 1,
+          "name": "English"
+        },
+        "sizeOnDisk": 3543348019,
+        "status": "Downloaded",
+        "overview": "Blah blah blah",
+        "path": "/nfs/movies",
+        "studio": "21st Century Alex",
+        "genres": ["cool", "family", "fun"],
+        "year": 2023,
+        "monitored": true,
+        "hasFile": true,
+        "runtime": 120,
+        "qualityProfileId": 2222,
+        "minimumAvailability": "announced",
+        "certification": "R",
+        "tags": [1],
+        "ratings": {
+          "imdb": {
+            "value": 9.9
+          },
+          "tmdb": {
+            "value": 9.9
+          },
+          "rottenTomatoes": {
+            "value": 9.9
+          }
+        },
+        "movieFile": {
+          "relativePath": "Test.mkv",
+          "path": "/nfs/movies/Test.mkv",
+          "dateAdded": "2022-12-30T07:37:56Z",
+          "mediaInfo": {
+            "audioBitrate": 0,
+            "audioChannels": 7.1,
+            "audioCodec": "AAC",
+            "audioLanguages": "eng",
+            "audioStreamCount": 1,
+            "videoBitDepth": 10,
+            "videoBitrate": 0,
+            "videoCodec": "x265",
+            "videoFps": 23.976,
+            "resolution": "1920x804",
+            "runTime": "2:00:00",
+            "scanType": "Progressive"
+          }
+        },
+        "collection": {
+          "id": 123,
+          "title": "Test Collection",
+          "rootFolderPath": "/nfs/movies",
+          "searchOnAdd": true,
+          "monitored": true,
+          "minimumAvailability": "released",
+          "overview": "Collection blah blah blah",
+          "qualityProfileId": 2222,
+          "movies": [
+            {
+              "title": "Test",
+              "overview": "Collection blah blah blah",
+              "year": 2023,
+              "runtime": 120,
+              "tmdbId": 1234,
+              "genres": ["cool", "family", "fun"],
+              "ratings": {
+                "imdb": {
+                  "value": 9.9
+                },
+                "tmdb": {
+                  "value": 9.9
+                },
+                "rottenTomatoes": {
+                  "value": 9.9
+                }
+              }
+            }
+          ]
+        }
+      }"#;
+
+  pub fn language() -> Language {
+    Language {
+      id: 1,
+      name: "English".to_owned(),
+    }
+  }
+
+  pub fn genres() -> Vec<String> {
+    vec!["cool".to_owned(), "family".to_owned(), "fun".to_owned()]
+  }
+
+  pub fn rating() -> Rating {
+    Rating {
+      value: Number::from_f64(9.9).unwrap(),
+    }
+  }
+
+  pub fn ratings_list() -> RatingsList {
+    RatingsList {
+      imdb: Some(rating()),
+      tmdb: Some(rating()),
+      rotten_tomatoes: Some(rating()),
+    }
+  }
+
+  pub fn media_info() -> MediaInfo {
+    MediaInfo {
+      audio_bitrate: 0,
+      audio_channels: Number::from_f64(7.1).unwrap(),
+      audio_codec: Some("AAC".to_owned()),
+      audio_languages: Some("eng".to_owned()),
+      audio_stream_count: 1,
+      video_bit_depth: 10,
+      video_bitrate: 0,
+      video_codec: Some("x265".to_owned()),
+      video_fps: Number::from_f64(23.976).unwrap(),
+      resolution: "1920x804".to_owned(),
+      run_time: "2:00:00".to_owned(),
+      scan_type: "Progressive".to_owned(),
+    }
+  }
+
+  pub fn movie_file() -> MovieFile {
+    MovieFile {
+      relative_path: "Test.mkv".to_owned(),
+      path: "/nfs/movies/Test.mkv".to_owned(),
+      date_added: DateTime::from(DateTime::parse_from_rfc3339("2022-12-30T07:37:56Z").unwrap()),
+      media_info: Some(media_info()),
+    }
+  }
+
+  pub fn collection_movie() -> CollectionMovie {
+    CollectionMovie {
+      title: "Test".to_owned().into(),
+      overview: "Collection blah blah blah".to_owned(),
+      year: 2023,
+      runtime: 120,
+      tmdb_id: 1234,
+      genres: genres(),
+      ratings: ratings_list(),
+    }
+  }
+
+  pub fn blocklist_item() -> BlocklistItem {
+    BlocklistItem {
+      id: 1,
+      movie_id: 1,
+      source_title: "z movie".to_owned(),
+      languages: vec![language()],
+      quality: quality_wrapper(),
+      custom_formats: Some(vec![language()]),
+      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
+      protocol: "usenet".to_owned(),
+      indexer: "DrunkenSlug (Prowlarr)".to_owned(),
+      message: "test message".to_owned(),
+      movie: blocklist_item_movie(),
+    }
+  }
+
+  pub fn blocklist_item_movie() -> BlocklistItemMovie {
+    BlocklistItemMovie {
+      title: "Test".into(),
+    }
+  }
+
+  pub fn collection() -> Collection {
+    Collection {
+      id: 123,
+      title: "Test Collection".to_owned().into(),
+      root_folder_path: Some("/nfs/movies".to_owned()),
+      search_on_add: true,
+      monitored: true,
+      minimum_availability: MinimumAvailability::Released,
+      overview: Some("Collection blah blah blah".to_owned()),
+      quality_profile_id: 2222,
+      movies: Some(vec![collection_movie()]),
+    }
+  }
+
+  pub fn movie() -> Movie {
+    Movie {
+      id: 1,
+      title: "Test".to_owned().into(),
+      original_language: language(),
+      size_on_disk: 3543348019,
+      status: "Downloaded".to_owned(),
+      overview: "Blah blah blah".to_owned(),
+      path: "/nfs/movies".to_owned(),
+      studio: Some("21st Century Alex".to_owned()),
+      genres: genres(),
+      year: 2023,
+      monitored: true,
+      has_file: true,
+      runtime: 120,
+      tmdb_id: 1234,
+      quality_profile_id: 2222,
+      minimum_availability: MinimumAvailability::Announced,
+      certification: Some("R".to_owned()),
+      tags: vec![Number::from(1)],
+      ratings: ratings_list(),
+      movie_file: Some(movie_file()),
+      collection: Some(movie_collection()),
+    }
+  }
+
+  pub fn movie_collection() -> MovieCollection {
+    MovieCollection {
+      title: Some("Test Collection".to_owned()),
+    }
+  }
+
+  pub fn rejections() -> Vec<String> {
+    vec![
+      "Unknown quality profile".to_owned(),
+      "Release is already mapped".to_owned(),
+    ]
+  }
+
+  pub fn quality() -> Quality {
+    Quality {
+      name: "HD - 1080p".to_owned(),
+    }
+  }
+
+  pub fn quality_wrapper() -> QualityWrapper {
+    QualityWrapper { quality: quality() }
+  }
+
+  pub fn release() -> RadarrRelease {
+    RadarrRelease {
+      guid: "1234".to_owned(),
+      protocol: "torrent".to_owned(),
+      age: 1,
+      title: HorizontallyScrollableText::from("Test Release"),
+      indexer: "kickass torrents".to_owned(),
+      indexer_id: 2,
+      size: 1234,
+      rejected: true,
+      rejections: Some(rejections()),
+      seeders: Some(Number::from(2)),
+      leechers: Some(Number::from(1)),
+      languages: Some(vec![language()]),
+      quality: quality_wrapper(),
+    }
+  }
+
+  pub fn add_movie_search_result() -> AddMovieSearchResult {
+    AddMovieSearchResult {
+      tmdb_id: 1234,
+      title: HorizontallyScrollableText::from("Test"),
+      original_language: language(),
+      status: "released".to_owned(),
+      overview: "New movie blah blah blah".to_owned(),
+      genres: genres(),
+      year: 2023,
+      runtime: 120,
+      ratings: ratings_list(),
+    }
+  }
+
+  pub fn movie_history_item() -> MovieHistoryItem {
+    MovieHistoryItem {
+      source_title: HorizontallyScrollableText::from("Test"),
+      quality: quality_wrapper(),
+      languages: vec![language()],
+      date: DateTime::from(DateTime::parse_from_rfc3339("2022-12-30T07:37:56Z").unwrap()),
+      event_type: "grabbed".to_owned(),
+    }
+  }
+
+  pub fn download_record() -> DownloadRecord {
+    DownloadRecord {
+      title: "Test Download Title".to_owned(),
+      status: "downloading".to_owned(),
+      id: 1,
+      movie_id: 1,
+      size: 3543348019,
+      sizeleft: 1771674009,
+      output_path: Some(HorizontallyScrollableText::from("/nfs/movies/Test")),
+      indexer: "kickass torrents".to_owned(),
+      download_client: "transmission".to_owned(),
+    }
+  }
+
+  pub fn downloads_response() -> DownloadsResponse {
+    DownloadsResponse {
+      records: vec![download_record()],
+    }
+  }
+
+  pub fn root_folder() -> RootFolder {
+    RootFolder {
+      id: 1,
+      path: "/nfs".to_owned(),
+      accessible: true,
+      free_space: 219902325555200,
+      unmapped_folders: None,
+    }
+  }
+
+  pub fn cast_credit() -> Credit {
+    Credit {
+      person_name: "Madison Clarke".to_owned(),
+      character: Some("Johnny Blaze".to_owned()),
+      department: None,
+      job: None,
+      credit_type: CreditType::Cast,
+    }
+  }
+
+  pub fn crew_credit() -> Credit {
+    Credit {
+      person_name: "Alex Clarke".to_owned(),
+      character: None,
+      department: Some("Music".to_owned()),
+      job: Some("Composition".to_owned()),
+      credit_type: CreditType::Crew,
+    }
+  }
+
+  pub fn indexer() -> Indexer {
+    Indexer {
+      enable_rss: true,
+      enable_automatic_search: true,
+      enable_interactive_search: true,
+      supports_rss: true,
+      supports_search: true,
+      protocol: "torrent".to_owned(),
+      priority: 25,
+      download_client_id: 0,
+      name: Some("Test Indexer".to_owned()),
+      implementation_name: Some("Torznab".to_owned()),
+      implementation: Some("Torznab".to_owned()),
+      config_contract: Some("TorznabSettings".to_owned()),
+      tags: vec![Number::from(1)],
+      id: 1,
+      fields: Some(vec![
+        IndexerField {
+          name: Some("baseUrl".to_owned()),
+          value: Some(json!("https://test.com")),
+        },
+        IndexerField {
+          name: Some("apiKey".to_owned()),
+          value: Some(json!("")),
+        },
+        IndexerField {
+          name: Some("seedCriteria.seedRatio".to_owned()),
+          value: Some(json!("1.2")),
+        },
+      ]),
+    }
+  }
+
+  pub fn indexer_settings() -> IndexerSettings {
+    IndexerSettings {
+      rss_sync_interval: 60,
+      allow_hardcoded_subs: true,
+      id: 1,
+      ..IndexerSettings::default()
+    }
+  }
+}
diff --git a/src/network/radarr_network/radarr_network_tests.rs b/src/network/radarr_network/radarr_network_tests.rs
new file mode 100644
index 0000000..a0cba2f
--- /dev/null
+++ b/src/network/radarr_network/radarr_network_tests.rs
@@ -0,0 +1,363 @@
+#[cfg(test)]
+mod test {
+  use super::super::*;
+  use crate::models::radarr_models::{
+    EditCollectionParams, EditMovieParams, IndexerSettings, RadarrTaskName,
+  };
+  use crate::models::servarr_data::radarr::modals::EditMovieModal;
+  use crate::models::servarr_models::EditIndexerParams;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::App;
+  use bimap::BiMap;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::json;
+  use std::sync::Arc;
+  use tokio::sync::Mutex;
+  use tokio_util::sync::CancellationToken;
+
+  #[rstest]
+  fn test_resource_movie(
+    #[values(
+      RadarrEvent::AddMovie(AddMovieBody::default()),
+      RadarrEvent::EditMovie(EditMovieParams::default()),
+      RadarrEvent::GetMovies,
+      RadarrEvent::GetMovieDetails(0),
+      RadarrEvent::DeleteMovie(DeleteMovieParams::default()),
+      RadarrEvent::ToggleMovieMonitoring(0)
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/movie");
+  }
+
+  #[rstest]
+  fn test_resource_collection(
+    #[values(
+      RadarrEvent::GetCollections,
+      RadarrEvent::EditCollection(EditCollectionParams::default())
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/collection");
+  }
+
+  #[rstest]
+  fn test_resource_indexer(
+    #[values(
+      RadarrEvent::GetIndexers,
+      RadarrEvent::DeleteIndexer(0),
+      RadarrEvent::EditIndexer(EditIndexerParams::default())
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/indexer");
+  }
+
+  #[rstest]
+  fn test_resource_all_indexer_settings(
+    #[values(
+      RadarrEvent::GetAllIndexerSettings,
+      RadarrEvent::EditAllIndexerSettings(IndexerSettings::default())
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/config/indexer");
+  }
+
+  #[rstest]
+  fn test_resource_root_folder(
+    #[values(
+      RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
+      RadarrEvent::GetRootFolders,
+      RadarrEvent::DeleteRootFolder(0)
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/rootfolder");
+  }
+
+  #[rstest]
+  fn test_resource_tag(
+    #[values(
+      RadarrEvent::AddTag(String::new()),
+      RadarrEvent::GetTags,
+      RadarrEvent::DeleteTag(0)
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/tag");
+  }
+
+  #[rstest]
+  fn test_resource_release(
+    #[values(
+      RadarrEvent::GetReleases(0),
+      RadarrEvent::DownloadRelease(RadarrReleaseDownloadBody::default())
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/release");
+  }
+
+  #[rstest]
+  fn test_resource_queue(
+    #[values(RadarrEvent::GetDownloads(0), RadarrEvent::DeleteDownload(0))] event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/queue");
+  }
+
+  #[rstest]
+  fn test_resource_host_config(
+    #[values(RadarrEvent::GetHostConfig, RadarrEvent::GetSecurityConfig)] event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/config/host");
+  }
+
+  #[rstest]
+  fn test_resource_command(
+    #[values(
+      RadarrEvent::StartTask(RadarrTaskName::default()),
+      RadarrEvent::GetQueuedEvents,
+      RadarrEvent::TriggerAutomaticSearch(0),
+      RadarrEvent::UpdateAndScan(0),
+      RadarrEvent::UpdateAllMovies,
+      RadarrEvent::UpdateDownloads,
+      RadarrEvent::UpdateCollections
+    )]
+    event: RadarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/command");
+  }
+
+  #[rstest]
+  #[case(RadarrEvent::ClearBlocklist, "/blocklist/bulk")]
+  #[case(RadarrEvent::DeleteBlocklistItem(1), "/blocklist")]
+  #[case(RadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
+  #[case(RadarrEvent::GetLogs(500), "/log")]
+  #[case(RadarrEvent::SearchNewMovie(String::new()), "/movie/lookup")]
+  #[case(RadarrEvent::GetMovieCredits(0), "/credit")]
+  #[case(RadarrEvent::GetMovieHistory(0), "/history/movie")]
+  #[case(RadarrEvent::GetDiskSpace, "/diskspace")]
+  #[case(RadarrEvent::GetQualityProfiles, "/qualityprofile")]
+  #[case(RadarrEvent::GetStatus, "/system/status")]
+  #[case(RadarrEvent::GetTasks, "/system/task")]
+  #[case(RadarrEvent::GetUpdates, "/update")]
+  #[case(RadarrEvent::TestIndexer(0), "/indexer/test")]
+  #[case(RadarrEvent::TestAllIndexers, "/indexer/testall")]
+  #[case(RadarrEvent::HealthCheck, "/health")]
+  fn test_resource(#[case] event: RadarrEvent, #[case] expected_uri: String) {
+    assert_str_eq!(event.resource(), expected_uri);
+  }
+
+  #[test]
+  fn test_from_radarr_event() {
+    assert_eq!(
+      NetworkEvent::Radarr(RadarrEvent::HealthCheck),
+      NetworkEvent::from(RadarrEvent::HealthCheck)
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_healthcheck_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      None,
+      None,
+      RadarrEvent::HealthCheck,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    let _ = network.handle_radarr_event(RadarrEvent::HealthCheck).await;
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_quality_profiles_event() {
+    let quality_profile_json = json!([{
+      "id": 2222,
+      "name": "HD - 1080p"
+    }]);
+    let response: Vec<QualityProfile> =
+      serde_json::from_value(quality_profile_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(quality_profile_json),
+      None,
+      RadarrEvent::GetQualityProfiles,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::QualityProfiles(quality_profiles) = network
+      .handle_radarr_event(RadarrEvent::GetQualityProfiles)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.quality_profile_map,
+        BiMap::from_iter([(2222i64, "HD - 1080p".to_owned())])
+      );
+      assert_eq!(quality_profiles, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_tags_event() {
+    let tags_json = json!([{
+      "id": 2222,
+      "label": "usenet"
+    }]);
+    let response: Vec<Tag> = serde_json::from_value(tags_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(tags_json),
+      None,
+      RadarrEvent::GetTags,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Tags(tags) = network
+      .handle_radarr_event(RadarrEvent::GetTags)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.tags_map,
+        BiMap::from_iter([(2222i64, "usenet".to_owned())])
+      );
+      assert_eq!(tags, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_add_radarr_tag() {
+    let tag_json = json!({ "id": 3, "label": "testing" });
+    let response: Tag = serde_json::from_value(tag_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({ "label": "testing" })),
+      Some(tag_json),
+      None,
+      RadarrEvent::AddTag(String::new()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.radarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Tag(tag) = network
+      .handle_radarr_event(RadarrEvent::AddTag("testing".to_owned()))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.tags_map,
+        BiMap::from_iter([
+          (1, "usenet".to_owned()),
+          (2, "test".to_owned()),
+          (3, "testing".to_owned())
+        ])
+      );
+      assert_eq!(tag, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_radarr_tag_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      RadarrEvent::DeleteTag(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DeleteTag(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_extract_and_add_radarr_tag_ids_vec() {
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
+    let tags = "    test,HI ,, usenet ";
+    {
+      let mut app = app_arc.lock().await;
+      app.data.radarr_data.tags_map = BiMap::from_iter([
+        (1, "usenet".to_owned()),
+        (2, "test".to_owned()),
+        (3, "hi".to_owned()),
+      ]);
+    }
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert_eq!(
+      network.extract_and_add_radarr_tag_ids_vec(tags).await,
+      vec![2, 3, 1]
+    );
+  }
+
+  #[tokio::test]
+  async fn test_extract_and_add_radarr_tag_ids_vec_add_missing_tags_first() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({ "label": "TESTING" })),
+      Some(json!({ "id": 3, "label": "testing" })),
+      None,
+      RadarrEvent::GetTags,
+      None,
+      None,
+    )
+    .await;
+    let tags = "usenet, test, TESTING";
+    {
+      let mut app = app_arc.lock().await;
+      app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
+        tags: tags.into(),
+        ..EditMovieModal::default()
+      });
+      app.data.radarr_data.tags_map =
+        BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
+    }
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    let tag_ids_vec = network.extract_and_add_radarr_tag_ids_vec(tags).await;
+
+    async_server.assert_async().await;
+    assert_eq!(tag_ids_vec, vec![1, 2, 3]);
+    assert_eq!(
+      app_arc.lock().await.data.radarr_data.tags_map,
+      BiMap::from_iter([
+        (1, "usenet".to_owned()),
+        (2, "test".to_owned()),
+        (3, "testing".to_owned())
+      ])
+    );
+  }
+}
diff --git a/src/network/radarr_network/root_folders/mod.rs b/src/network/radarr_network/root_folders/mod.rs
new file mode 100644
index 0000000..90f7e50
--- /dev/null
+++ b/src/network/radarr_network/root_folders/mod.rs
@@ -0,0 +1,75 @@
+use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info};
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "radarr_root_folders_network_tests.rs"]
+mod radarr_root_folders_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn add_radarr_root_folder(
+    &mut self,
+    add_root_folder_body: AddRootFolderBody,
+  ) -> Result<Value> {
+    info!("Adding new root folder to Radarr");
+    let event = RadarrEvent::AddRootFolder(AddRootFolderBody::default());
+
+    debug!("Add root folder body: {add_root_folder_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        Some(add_root_folder_body),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<AddRootFolderBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn delete_radarr_root_folder(
+    &mut self,
+    root_folder_id: i64,
+  ) -> Result<()> {
+    let event = RadarrEvent::DeleteRootFolder(root_folder_id);
+    info!("Deleting Radarr root folder for folder with id: {root_folder_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{root_folder_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_root_folders(
+    &mut self,
+  ) -> Result<Vec<RootFolder>> {
+    info!("Fetching Radarr root folders");
+    let event = RadarrEvent::GetRootFolders;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<RootFolder>>(request_props, |root_folders, mut app| {
+        app.data.radarr_data.root_folders.set_items(root_folders);
+      })
+      .await
+  }
+}
diff --git a/src/network/radarr_network/root_folders/radarr_root_folders_network_tests.rs b/src/network/radarr_network/root_folders/radarr_root_folders_network_tests.rs
new file mode 100644
index 0000000..abc806c
--- /dev/null
+++ b/src/network/radarr_network/root_folders/radarr_root_folders_network_tests.rs
@@ -0,0 +1,97 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::RadarrSerdeable;
+  use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::radarr_network_test_utils::test_utils::root_folder;
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_add_radarr_root_folder_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "path": "/nfs/test"
+      })),
+      Some(json!({})),
+      None,
+      RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
+      None,
+      None,
+    )
+    .await;
+    let add_root_folder_body = AddRootFolderBody {
+      path: "/nfs/test".to_owned(),
+    };
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::AddRootFolder(add_root_folder_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_radarr_root_folder_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      RadarrEvent::DeleteRootFolder(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_radarr_event(RadarrEvent::DeleteRootFolder(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_root_folders_event() {
+    let root_folder_json = json!([{
+      "id": 1,
+      "path": "/nfs",
+      "accessible": true,
+      "freeSpace": 219902325555200u64,
+    }]);
+    let response: Vec<RootFolder> = serde_json::from_value(root_folder_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(root_folder_json),
+      None,
+      RadarrEvent::GetRootFolders,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::RootFolders(root_folders) = network
+      .handle_radarr_event(RadarrEvent::GetRootFolders)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.root_folders.items,
+        vec![root_folder()]
+      );
+      assert_eq!(root_folders, response);
+    }
+  }
+}
diff --git a/src/network/radarr_network/system/mod.rs b/src/network/radarr_network/system/mod.rs
new file mode 100644
index 0000000..1dde56e
--- /dev/null
+++ b/src/network/radarr_network/system/mod.rs
@@ -0,0 +1,268 @@
+use crate::models::radarr_models::{RadarrTask, RadarrTaskName, SystemStatus};
+use crate::models::servarr_models::{
+  CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
+};
+use crate::models::{HorizontallyScrollableText, Scrollable, ScrollableText};
+use crate::network::radarr_network::RadarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use indoc::formatdoc;
+use log::info;
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "radarr_system_network_tests.rs"]
+mod radarr_system_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::radarr_network) async fn get_radarr_diskspace(
+    &mut self,
+  ) -> Result<Vec<DiskSpace>> {
+    info!("Fetching Radarr disk space");
+    let event = RadarrEvent::GetDiskSpace;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<DiskSpace>>(request_props, |disk_space_vec, mut app| {
+        app.data.radarr_data.disk_space_vec = disk_space_vec;
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_host_config(
+    &mut self,
+  ) -> Result<HostConfig> {
+    info!("Fetching Radarr host config");
+    let event = RadarrEvent::GetHostConfig;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), HostConfig>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_logs(
+    &mut self,
+    events: u64,
+  ) -> Result<LogResponse> {
+    info!("Fetching Radarr logs");
+    let event = RadarrEvent::GetLogs(events);
+
+    let params = format!("pageSize={events}&sortDirection=descending&sortKey=time");
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
+      .await;
+
+    self
+      .handle_request::<(), LogResponse>(request_props, |log_response, mut app| {
+        let mut logs = log_response.records;
+        logs.reverse();
+
+        let log_lines = logs
+          .into_iter()
+          .map(|log| {
+            if log.exception.is_some() {
+              HorizontallyScrollableText::from(format!(
+                "{}|{}|{}|{}|{}",
+                log.time,
+                log.level.to_uppercase(),
+                log.logger.as_ref().unwrap(),
+                log.exception_type.as_ref().unwrap(),
+                log.exception.as_ref().unwrap()
+              ))
+            } else {
+              HorizontallyScrollableText::from(format!(
+                "{}|{}|{}|{}",
+                log.time,
+                log.level.to_uppercase(),
+                log.logger.as_ref().unwrap(),
+                log.message.as_ref().unwrap()
+              ))
+            }
+          })
+          .collect();
+
+        app.data.radarr_data.logs.set_items(log_lines);
+        app.data.radarr_data.logs.scroll_to_bottom();
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_queued_radarr_events(
+    &mut self,
+  ) -> Result<Vec<QueueEvent>> {
+    info!("Fetching Radarr queued events");
+    let event = RadarrEvent::GetQueuedEvents;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<QueueEvent>>(request_props, |queued_events_vec, mut app| {
+        app
+          .data
+          .radarr_data
+          .queued_events
+          .set_items(queued_events_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_security_config(
+    &mut self,
+  ) -> Result<SecurityConfig> {
+    info!("Fetching Radarr security config");
+    let event = RadarrEvent::GetSecurityConfig;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), SecurityConfig>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_status(
+    &mut self,
+  ) -> Result<SystemStatus> {
+    info!("Fetching Radarr system status");
+    let event = RadarrEvent::GetStatus;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), SystemStatus>(request_props, |system_status, mut app| {
+        app.data.radarr_data.version = system_status.version;
+        app.data.radarr_data.start_time = system_status.start_time;
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_updates(
+    &mut self,
+  ) -> Result<Vec<Update>> {
+    info!("Fetching Radarr updates");
+    let event = RadarrEvent::GetUpdates;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Update>>(request_props, |updates_vec, mut app| {
+        let latest_installed = if updates_vec
+          .iter()
+          .any(|update| update.latest && update.installed_on.is_some())
+        {
+          "already".to_owned()
+        } else {
+          "not".to_owned()
+        };
+        let updates = updates_vec
+          .into_iter()
+          .map(|update| {
+            let install_status = if update.installed_on.is_some() {
+              if update.installed {
+                "(Currently Installed)".to_owned()
+              } else {
+                "(Previously Installed)".to_owned()
+              }
+            } else {
+              String::new()
+            };
+            let vec_to_bullet_points = |vec: Vec<String>| {
+              vec
+                .iter()
+                .map(|change| format!("  * {change}"))
+                .collect::<Vec<String>>()
+                .join("\n")
+            };
+
+            let mut update_info = formatdoc!(
+              "{} - {} {install_status}
+              {}",
+              update.version,
+              update.release_date,
+              "-".repeat(200)
+            );
+
+            if let Some(new_changes) = update.changes.new {
+              let changes = vec_to_bullet_points(new_changes);
+              update_info = formatdoc!(
+                "{update_info}
+              New:
+              {changes}"
+              )
+            }
+
+            if let Some(fixes) = update.changes.fixed {
+              let fixes = vec_to_bullet_points(fixes);
+              update_info = formatdoc!(
+                "{update_info}
+              Fixed:
+              {fixes}"
+              );
+            }
+
+            update_info
+          })
+          .reduce(|version_1, version_2| format!("{version_1}\n\n\n{version_2}"))
+          .unwrap();
+
+        app.data.radarr_data.updates = ScrollableText::with_string(formatdoc!(
+          "The latest version of Radarr is {latest_installed} installed
+          
+          {updates}"
+        ));
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn get_radarr_tasks(
+    &mut self,
+  ) -> Result<Vec<RadarrTask>> {
+    info!("Fetching Radarr tasks");
+    let event = RadarrEvent::GetTasks;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<RadarrTask>>(request_props, |tasks_vec, mut app| {
+        app.data.radarr_data.tasks.set_items(tasks_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::radarr_network) async fn start_radarr_task(
+    &mut self,
+    task_name: RadarrTaskName,
+  ) -> Result<Value> {
+    let event = RadarrEvent::StartTask(task_name);
+
+    info!("Starting Radarr task: {task_name}");
+
+    let body = CommandBody {
+      name: task_name.to_string(),
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/radarr_network/system/radarr_system_network_tests.rs b/src/network/radarr_network/system/radarr_system_network_tests.rs
new file mode 100644
index 0000000..e7b28d0
--- /dev/null
+++ b/src/network/radarr_network/system/radarr_system_network_tests.rs
@@ -0,0 +1,477 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::radarr_models::{RadarrSerdeable, RadarrTask, RadarrTaskName, SystemStatus};
+  use crate::models::servarr_models::{
+    DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
+  };
+  use crate::models::{HorizontallyScrollableText, ScrollableText};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::radarr_network::RadarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use chrono::DateTime;
+  use indoc::formatdoc;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_diskspace_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([
+        {
+          "freeSpace": 1111,
+          "totalSpace": 2222,
+        },
+        {
+          "freeSpace": 3333,
+          "totalSpace": 4444
+        }
+      ])),
+      None,
+      RadarrEvent::GetDiskSpace,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    let disk_space_vec = vec![
+      DiskSpace {
+        free_space: 1111,
+        total_space: 2222,
+      },
+      DiskSpace {
+        free_space: 3333,
+        total_space: 4444,
+      },
+    ];
+
+    if let RadarrSerdeable::DiskSpaces(disk_space) = network
+      .handle_radarr_event(RadarrEvent::GetDiskSpace)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.disk_space_vec,
+        disk_space_vec
+      );
+      assert_eq!(disk_space, disk_space_vec);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_host_config_event() {
+    let host_config_response = json!({
+      "bindAddress": "*",
+      "port": 7878,
+      "urlBase": "some.test.site/radarr",
+      "instanceName": "Radarr",
+      "applicationUrl": "https://some.test.site:7878/radarr",
+      "enableSsl": true,
+      "sslPort": 9898,
+      "sslCertPath": "/app/radarr.pfx",
+      "sslCertPassword": "test"
+    });
+    let response: HostConfig = serde_json::from_value(host_config_response.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(host_config_response),
+      None,
+      RadarrEvent::GetHostConfig,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::HostConfig(host_config) = network
+      .handle_radarr_event(RadarrEvent::GetHostConfig)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(host_config, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_logs_event() {
+    let expected_logs = vec![
+      HorizontallyScrollableText::from(
+        "2023-05-20 21:29:16 UTC|FATAL|RadarrError|Some.Big.Bad.Exception|test exception",
+      ),
+      HorizontallyScrollableText::from("2023-05-20 21:29:16 UTC|INFO|TestLogger|test message"),
+    ];
+    let logs_response_json = json!({
+      "page": 1,
+      "pageSize": 500,
+      "sortKey": "time",
+      "sortDirection": "descending",
+      "totalRecords": 2,
+      "records": [
+          {
+              "time": "2023-05-20T21:29:16Z",
+              "level": "info",
+              "logger": "TestLogger",
+              "message": "test message",
+              "id": 1
+          },
+          {
+              "time": "2023-05-20T21:29:16Z",
+              "level": "fatal",
+              "logger": "RadarrError",
+              "exception": "test exception",
+              "exceptionType": "Some.Big.Bad.Exception",
+              "id": 2
+          }
+        ]
+    });
+    let response: LogResponse = serde_json::from_value(logs_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(logs_response_json),
+      None,
+      RadarrEvent::GetLogs(500),
+      None,
+      Some("pageSize=500&sortDirection=descending&sortKey=time"),
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::LogResponse(logs) = network
+      .handle_radarr_event(RadarrEvent::GetLogs(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.logs.items,
+        expected_logs
+      );
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .radarr_data
+        .logs
+        .current_selection()
+        .text
+        .contains("INFO"));
+      assert_eq!(logs, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_queued_radarr_events_event() {
+    let queued_events_json = json!([{
+        "name": "RefreshMonitoredDownloads",
+        "commandName": "Refresh Monitored Downloads",
+        "status": "completed",
+        "queued": "2023-05-20T21:29:16Z",
+        "started": "2023-05-20T21:29:16Z",
+        "ended": "2023-05-20T21:29:16Z",
+        "duration": "00:00:00.5111547",
+        "trigger": "scheduled",
+    }]);
+    let response: Vec<QueueEvent> = serde_json::from_value(queued_events_json.clone()).unwrap();
+    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
+    let expected_event = QueueEvent {
+      name: "RefreshMonitoredDownloads".to_owned(),
+      command_name: "Refresh Monitored Downloads".to_owned(),
+      status: "completed".to_owned(),
+      queued: timestamp,
+      started: Some(timestamp),
+      ended: Some(timestamp),
+      duration: Some("00:00:00.5111547".to_owned()),
+      trigger: "scheduled".to_owned(),
+    };
+
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(queued_events_json),
+      None,
+      RadarrEvent::GetQueuedEvents,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::QueueEvents(events) = network
+      .handle_radarr_event(RadarrEvent::GetQueuedEvents)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.queued_events.items,
+        vec![expected_event]
+      );
+      assert_eq!(events, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_security_config_event() {
+    let security_config_response = json!({
+      "authenticationMethod": "forms",
+      "authenticationRequired": "disabledForLocalAddresses",
+      "username": "test",
+      "password": "some password",
+      "apiKey": "someApiKey12345",
+      "certificateValidation": "disabledForLocalAddresses",
+    });
+    let response: SecurityConfig =
+      serde_json::from_value(security_config_response.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(security_config_response),
+      None,
+      RadarrEvent::GetSecurityConfig,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::SecurityConfig(security_config) = network
+      .handle_radarr_event(RadarrEvent::GetSecurityConfig)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(security_config, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_status_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!({
+        "version": "v1",
+        "startTime": "2023-02-25T20:16:43Z"
+      })),
+      None,
+      RadarrEvent::GetStatus,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    let date_time = DateTime::from(DateTime::parse_from_rfc3339("2023-02-25T20:16:43Z").unwrap());
+
+    if let RadarrSerdeable::SystemStatus(status) = network
+      .handle_radarr_event(RadarrEvent::GetStatus)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_str_eq!(app_arc.lock().await.data.radarr_data.version, "v1");
+      assert_eq!(app_arc.lock().await.data.radarr_data.start_time, date_time);
+      assert_eq!(
+        status,
+        SystemStatus {
+          version: "v1".to_owned(),
+          start_time: date_time
+        }
+      );
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_updates_event() {
+    let updates_json = json!([{
+      "version": "4.3.2.1",
+      "releaseDate": "2023-04-15T02:02:53Z",
+      "installed": true,
+      "installedOn": "2023-04-15T02:02:53Z",
+      "latest": true,
+      "changes": {
+        "new": [
+          "Cool new thing"
+        ],
+        "fixed": [
+          "Some bugs killed"
+        ]
+      },
+    },
+      {
+        "version": "3.2.1.0",
+        "releaseDate": "2023-04-15T02:02:53Z",
+        "installed": false,
+        "installedOn": "2023-04-15T02:02:53Z",
+        "latest": false,
+        "changes": {
+          "new": [
+            "Cool new thing (old)",
+            "Other cool new thing (old)"
+            ],
+        },
+    },
+    {
+      "version": "2.1.0",
+      "releaseDate": "2023-04-15T02:02:53Z",
+      "installed": false,
+      "latest": false,
+      "changes": {
+        "fixed": [
+          "Killed bug 1",
+          "Fixed bug 2"
+        ]
+      },
+    }]);
+    let response: Vec<Update> = serde_json::from_value(updates_json.clone()).unwrap();
+    let line_break = "-".repeat(200);
+    let expected_text = ScrollableText::with_string(formatdoc!(
+      "
+    The latest version of Radarr is already installed
+
+    4.3.2.1 - 2023-04-15 02:02:53 UTC (Currently Installed)
+    {line_break}
+    New:
+      * Cool new thing
+    Fixed:
+      * Some bugs killed
+    
+    
+    3.2.1.0 - 2023-04-15 02:02:53 UTC (Previously Installed)
+    {line_break}
+    New:
+      * Cool new thing (old)
+      * Other cool new thing (old)
+    
+    
+    2.1.0 - 2023-04-15 02:02:53 UTC 
+    {line_break}
+    Fixed:
+      * Killed bug 1
+      * Fixed bug 2"
+    ));
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(updates_json),
+      None,
+      RadarrEvent::GetUpdates,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Updates(updates) = network
+      .handle_radarr_event(RadarrEvent::GetUpdates)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_str_eq!(
+        app_arc.lock().await.data.radarr_data.updates.get_text(),
+        expected_text.get_text()
+      );
+      assert_eq!(updates, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_radarr_tasks_event() {
+    let tasks_json = json!([{
+        "name": "Application Check Update",
+        "taskName": "ApplicationCheckUpdate",
+        "interval": 360,
+        "lastExecution": "2023-05-20T21:29:16Z",
+        "nextExecution": "2023-05-20T21:29:16Z",
+        "lastDuration": "00:00:00.5111547",
+    },
+    {
+        "name": "Backup",
+        "taskName": "Backup",
+        "interval": 10080,
+        "lastExecution": "2023-05-20T21:29:16Z",
+        "nextExecution": "2023-05-20T21:29:16Z",
+        "lastDuration": "00:00:00.5111547",
+    }]);
+    let response: Vec<RadarrTask> = serde_json::from_value(tasks_json.clone()).unwrap();
+    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
+    let expected_tasks = vec![
+      RadarrTask {
+        name: "Application Check Update".to_owned(),
+        task_name: RadarrTaskName::ApplicationCheckUpdate,
+        interval: 360,
+        last_execution: timestamp,
+        next_execution: timestamp,
+        last_duration: "00:00:00.5111547".to_owned(),
+      },
+      RadarrTask {
+        name: "Backup".to_owned(),
+        task_name: RadarrTaskName::Backup,
+        interval: 10080,
+        last_execution: timestamp,
+        next_execution: timestamp,
+        last_duration: "00:00:00.5111547".to_owned(),
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(tasks_json),
+      None,
+      RadarrEvent::GetTasks,
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Tasks(tasks) = network
+      .handle_radarr_event(RadarrEvent::GetTasks)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.radarr_data.tasks.items,
+        expected_tasks
+      );
+      assert_eq!(tasks, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_start_radarr_task_event() {
+    let response = json!({ "test": "test"});
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "ApplicationCheckUpdate"
+      })),
+      Some(response.clone()),
+      None,
+      RadarrEvent::StartTask(RadarrTaskName::ApplicationCheckUpdate),
+      None,
+      None,
+    )
+    .await;
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let RadarrSerdeable::Value(value) = network
+      .handle_radarr_event(RadarrEvent::StartTask(
+        RadarrTaskName::ApplicationCheckUpdate,
+      ))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(value, response);
+    }
+  }
+}
diff --git a/src/network/radarr_network_tests.rs b/src/network/radarr_network_tests.rs
deleted file mode 100644
index 1019192..0000000
--- a/src/network/radarr_network_tests.rs
+++ /dev/null
@@ -1,4258 +0,0 @@
-#[cfg(test)]
-mod test {
-  use std::sync::Arc;
-
-  use bimap::BiMap;
-  use chrono::DateTime;
-  use mockito::Matcher;
-  use pretty_assertions::{assert_eq, assert_str_eq};
-  use reqwest::Client;
-  use rstest::rstest;
-  use serde_json::{json, Number, Value};
-  use tokio::sync::Mutex;
-  use tokio_util::sync::CancellationToken;
-
-  use super::super::*;
-  use crate::models::radarr_models::{
-    AddMovieOptions, BlocklistItem, BlocklistItemMovie, CollectionMovie, EditCollectionParams,
-    EditMovieParams, IndexerSettings, MediaInfo, MinimumAvailability, MovieCollection, MovieFile,
-    RadarrTaskName, Rating, RatingsList,
-  };
-  use crate::models::servarr_data::radarr::modals::EditMovieModal;
-  use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
-  use crate::models::servarr_models::{
-    EditIndexerParams, HostConfig, IndexerField, Language, Quality, QualityWrapper,
-  };
-  use crate::models::stateful_table::SortOption;
-  use crate::models::HorizontallyScrollableText;
-  use crate::network::network_tests::test_utils::mock_servarr_api;
-  use crate::App;
-
-  const MOVIE_JSON: &str = r#"{
-        "id": 1,
-        "title": "Test",
-        "tmdbId": 1234,
-        "originalLanguage": {
-          "id": 1,
-          "name": "English"
-        },
-        "sizeOnDisk": 3543348019,
-        "status": "Downloaded",
-        "overview": "Blah blah blah",
-        "path": "/nfs/movies",
-        "studio": "21st Century Alex",
-        "genres": ["cool", "family", "fun"],
-        "year": 2023,
-        "monitored": true,
-        "hasFile": true,
-        "runtime": 120,
-        "qualityProfileId": 2222,
-        "minimumAvailability": "announced",
-        "certification": "R",
-        "tags": [1],
-        "ratings": {
-          "imdb": {
-            "value": 9.9
-          },
-          "tmdb": {
-            "value": 9.9
-          },
-          "rottenTomatoes": {
-            "value": 9.9
-          }
-        },
-        "movieFile": {
-          "relativePath": "Test.mkv",
-          "path": "/nfs/movies/Test.mkv",
-          "dateAdded": "2022-12-30T07:37:56Z",
-          "mediaInfo": {
-            "audioBitrate": 0,
-            "audioChannels": 7.1,
-            "audioCodec": "AAC",
-            "audioLanguages": "eng",
-            "audioStreamCount": 1,
-            "videoBitDepth": 10,
-            "videoBitrate": 0,
-            "videoCodec": "x265",
-            "videoFps": 23.976,
-            "resolution": "1920x804",
-            "runTime": "2:00:00",
-            "scanType": "Progressive"
-          }
-        },
-        "collection": {
-          "id": 123,
-          "title": "Test Collection",
-          "rootFolderPath": "/nfs/movies",
-          "searchOnAdd": true,
-          "monitored": true,
-          "minimumAvailability": "released",
-          "overview": "Collection blah blah blah",
-          "qualityProfileId": 2222,
-          "movies": [
-            {
-              "title": "Test",
-              "overview": "Collection blah blah blah",
-              "year": 2023,
-              "runtime": 120,
-              "tmdbId": 1234,
-              "genres": ["cool", "family", "fun"],
-              "ratings": {
-                "imdb": {
-                  "value": 9.9
-                },
-                "tmdb": {
-                  "value": 9.9
-                },
-                "rottenTomatoes": {
-                  "value": 9.9
-                }
-              }
-            }
-          ]
-        }
-      }"#;
-
-  #[rstest]
-  fn test_resource_movie(
-    #[values(
-      RadarrEvent::AddMovie(AddMovieBody::default()),
-      RadarrEvent::EditMovie(EditMovieParams::default()),
-      RadarrEvent::GetMovies,
-      RadarrEvent::GetMovieDetails(0),
-      RadarrEvent::DeleteMovie(DeleteMovieParams::default())
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/movie");
-  }
-
-  #[rstest]
-  fn test_resource_collection(
-    #[values(
-      RadarrEvent::GetCollections,
-      RadarrEvent::EditCollection(EditCollectionParams::default())
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/collection");
-  }
-
-  #[rstest]
-  fn test_resource_indexer(
-    #[values(
-      RadarrEvent::GetIndexers,
-      RadarrEvent::DeleteIndexer(0),
-      RadarrEvent::EditIndexer(EditIndexerParams::default())
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/indexer");
-  }
-
-  #[rstest]
-  fn test_resource_all_indexer_settings(
-    #[values(
-      RadarrEvent::GetAllIndexerSettings,
-      RadarrEvent::EditAllIndexerSettings(IndexerSettings::default())
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/config/indexer");
-  }
-
-  #[rstest]
-  fn test_resource_root_folder(
-    #[values(
-      RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
-      RadarrEvent::GetRootFolders,
-      RadarrEvent::DeleteRootFolder(0)
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/rootfolder");
-  }
-
-  #[rstest]
-  fn test_resource_tag(
-    #[values(
-      RadarrEvent::AddTag(String::new()),
-      RadarrEvent::GetTags,
-      RadarrEvent::DeleteTag(0)
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/tag");
-  }
-
-  #[rstest]
-  fn test_resource_release(
-    #[values(
-      RadarrEvent::GetReleases(0),
-      RadarrEvent::DownloadRelease(RadarrReleaseDownloadBody::default())
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/release");
-  }
-
-  #[rstest]
-  fn test_resource_queue(
-    #[values(RadarrEvent::GetDownloads, RadarrEvent::DeleteDownload(0))] event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/queue");
-  }
-
-  #[rstest]
-  fn test_resource_host_config(
-    #[values(RadarrEvent::GetHostConfig, RadarrEvent::GetSecurityConfig)] event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/config/host");
-  }
-
-  #[rstest]
-  fn test_resource_command(
-    #[values(
-      RadarrEvent::StartTask(RadarrTaskName::default()),
-      RadarrEvent::GetQueuedEvents,
-      RadarrEvent::TriggerAutomaticSearch(0),
-      RadarrEvent::UpdateAndScan(0),
-      RadarrEvent::UpdateAllMovies,
-      RadarrEvent::UpdateDownloads,
-      RadarrEvent::UpdateCollections
-    )]
-    event: RadarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/command");
-  }
-
-  #[rstest]
-  #[case(RadarrEvent::ClearBlocklist, "/blocklist/bulk")]
-  #[case(RadarrEvent::DeleteBlocklistItem(1), "/blocklist")]
-  #[case(RadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
-  #[case(RadarrEvent::GetLogs(500), "/log")]
-  #[case(RadarrEvent::SearchNewMovie(String::new()), "/movie/lookup")]
-  #[case(RadarrEvent::GetMovieCredits(0), "/credit")]
-  #[case(RadarrEvent::GetMovieHistory(0), "/history/movie")]
-  #[case(RadarrEvent::GetDiskSpace, "/diskspace")]
-  #[case(RadarrEvent::GetQualityProfiles, "/qualityprofile")]
-  #[case(RadarrEvent::GetStatus, "/system/status")]
-  #[case(RadarrEvent::GetTasks, "/system/task")]
-  #[case(RadarrEvent::GetUpdates, "/update")]
-  #[case(RadarrEvent::TestIndexer(0), "/indexer/test")]
-  #[case(RadarrEvent::TestAllIndexers, "/indexer/testall")]
-  #[case(RadarrEvent::HealthCheck, "/health")]
-  fn test_resource(#[case] event: RadarrEvent, #[case] expected_uri: String) {
-    assert_str_eq!(event.resource(), expected_uri);
-  }
-
-  #[test]
-  fn test_from_radarr_event() {
-    assert_eq!(
-      NetworkEvent::Radarr(RadarrEvent::HealthCheck),
-      NetworkEvent::from(RadarrEvent::HealthCheck)
-    );
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_healthcheck_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      None,
-      None,
-      RadarrEvent::HealthCheck,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    let _ = network.handle_radarr_event(RadarrEvent::HealthCheck).await;
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_diskspace_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([
-        {
-          "freeSpace": 1111,
-          "totalSpace": 2222,
-        },
-        {
-          "freeSpace": 3333,
-          "totalSpace": 4444
-        }
-      ])),
-      None,
-      RadarrEvent::GetDiskSpace,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-    let disk_space_vec = vec![
-      DiskSpace {
-        free_space: 1111,
-        total_space: 2222,
-      },
-      DiskSpace {
-        free_space: 3333,
-        total_space: 4444,
-      },
-    ];
-
-    if let RadarrSerdeable::DiskSpaces(disk_space) = network
-      .handle_radarr_event(RadarrEvent::GetDiskSpace)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.disk_space_vec,
-        disk_space_vec
-      );
-      assert_eq!(disk_space, disk_space_vec);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_status_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!({
-        "version": "v1",
-        "startTime": "2023-02-25T20:16:43Z"
-      })),
-      None,
-      RadarrEvent::GetStatus,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-    let date_time = DateTime::from(DateTime::parse_from_rfc3339("2023-02-25T20:16:43Z").unwrap());
-
-    if let RadarrSerdeable::SystemStatus(status) = network
-      .handle_radarr_event(RadarrEvent::GetStatus)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_str_eq!(app_arc.lock().await.data.radarr_data.version, "v1");
-      assert_eq!(app_arc.lock().await.data.radarr_data.start_time, date_time);
-      assert_eq!(
-        status,
-        SystemStatus {
-          version: "v1".to_owned(),
-          start_time: date_time
-        }
-      );
-    }
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_movies_event(#[values(true, false)] use_custom_sorting: bool) {
-    let mut movie_1: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    let mut movie_2: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    *movie_1.get_mut("id").unwrap() = json!(1);
-    *movie_1.get_mut("title").unwrap() = json!("z test");
-    *movie_2.get_mut("id").unwrap() = json!(2);
-    *movie_2.get_mut("title").unwrap() = json!("A test");
-    let expected_movies = vec![
-      Movie {
-        id: 1,
-        title: "z test".into(),
-        ..movie()
-      },
-      Movie {
-        id: 2,
-        title: "A test".into(),
-        ..movie()
-      },
-    ];
-    let mut expected_sorted_movies = vec![
-      Movie {
-        id: 1,
-        title: "z test".into(),
-        ..movie()
-      },
-      Movie {
-        id: 2,
-        title: "A test".into(),
-        ..movie()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([movie_1, movie_2])),
-      None,
-      RadarrEvent::GetMovies,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.movies.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &Movie, b: &Movie| {
-        a.title
-          .text
-          .to_lowercase()
-          .cmp(&b.title.text.to_lowercase())
-      };
-      expected_sorted_movies.sort_by(cmp_fn);
-      let title_sort_option = SortOption {
-        name: "Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .movies
-        .sorting(vec![title_sort_option]);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Movies(movies) = network
-      .handle_radarr_event(RadarrEvent::GetMovies)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.movies.items,
-        expected_sorted_movies
-      );
-      assert!(app_arc.lock().await.data.radarr_data.movies.sort_asc);
-      assert_eq!(movies, expected_movies);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movies_event_no_op_while_user_is_selecting_sort_options() {
-    let mut movie_1: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    let mut movie_2: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    *movie_1.get_mut("id").unwrap() = json!(1);
-    *movie_1.get_mut("title").unwrap() = json!("z test");
-    *movie_2.get_mut("id").unwrap() = json!(2);
-    *movie_2.get_mut("title").unwrap() = json!("A test");
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([movie_1, movie_2])),
-      None,
-      RadarrEvent::GetMovies,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveRadarrBlock::MoviesSortPrompt.into());
-    app_arc.lock().await.data.radarr_data.movies.sort_asc = true;
-    let cmp_fn = |a: &Movie, b: &Movie| {
-      a.title
-        .text
-        .to_lowercase()
-        .cmp(&b.title.text.to_lowercase())
-    };
-    let title_sort_option = SortOption {
-      name: "Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .movies
-      .sorting(vec![title_sort_option]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetMovies)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .movies
-      .items
-      .is_empty());
-    assert!(app_arc.lock().await.data.radarr_data.movies.sort_asc);
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_releases_event() {
-    let release_json = json!([{
-      "guid": "1234",
-      "protocol": "torrent",
-      "age": 1,
-      "title": "Test Release",
-      "indexer": "kickass torrents",
-      "indexerId": 2,
-      "size": 1234,
-      "rejected": true,
-      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-      "seeders": 2,
-      "leechers": 1,
-      "languages": [ { "id": 1, "name": "English" } ],
-      "quality": { "quality": { "name": "HD - 1080p" }}
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(release_json),
-      None,
-      RadarrEvent::GetReleases(1),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Releases(releases_vec) = network
-      .handle_radarr_event(RadarrEvent::GetReleases(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .radarr_data
-          .movie_details_modal
-          .as_ref()
-          .unwrap()
-          .movie_releases
-          .items,
-        vec![release()]
-      );
-      assert_eq!(releases_vec, vec![release()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_releases_event_empty_movie_details_modal() {
-    let release_json = json!([{
-      "guid": "1234",
-      "protocol": "torrent",
-      "age": 1,
-      "title": "Test Release",
-      "indexer": "kickass torrents",
-      "indexerId": 2,
-      "size": 1234,
-      "rejected": true,
-      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-      "seeders": 2,
-      "leechers": 1,
-      "languages": [ { "id": 1, "name": "English" } ],
-      "quality": { "quality": { "name": "HD - 1080p" }}
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(release_json),
-      None,
-      RadarrEvent::GetReleases(1),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetReleases(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert_eq!(
-      app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .movie_details_modal
-        .as_ref()
-        .unwrap()
-        .movie_releases
-        .items,
-      vec![release()]
-    );
-  }
-
-  #[tokio::test]
-  async fn test_handle_search_new_movie_event() {
-    let add_movie_search_result_json = json!([{
-      "tmdbId": 1234,
-      "title": "Test",
-      "originalLanguage": { "id": 1, "name": "English" },
-      "status": "released",
-      "overview": "New movie blah blah blah",
-      "genres": ["cool", "family", "fun"],
-      "year": 2023,
-      "runtime": 120,
-      "ratings": {
-        "imdb": {
-          "value": 9.9
-        },
-        "tmdb": {
-          "value": 9.9
-        },
-        "rottenTomatoes": {
-          "value": 9.9
-        }
-      }
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(add_movie_search_result_json),
-      None,
-      RadarrEvent::SearchNewMovie("test term".into()),
-      None,
-      Some("term=test%20term"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::AddMovieSearchResults(add_movie_search_results) = network
-      .handle_radarr_event(RadarrEvent::SearchNewMovie("test term".into()))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .add_searched_movies
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .radarr_data
-          .add_searched_movies
-          .as_ref()
-          .unwrap()
-          .items,
-        vec![add_movie_search_result()]
-      );
-      assert_eq!(add_movie_search_results, vec![add_movie_search_result()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_start_radarr_task_event() {
-    let response = json!({ "test": "test"});
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "ApplicationCheckUpdate"
-      })),
-      Some(response.clone()),
-      None,
-      RadarrEvent::StartTask(RadarrTaskName::ApplicationCheckUpdate),
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Value(value) = network
-      .handle_radarr_event(RadarrEvent::StartTask(
-        RadarrTaskName::ApplicationCheckUpdate,
-      ))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(value, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_search_new_movie_event_no_results() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([])),
-      None,
-      RadarrEvent::SearchNewMovie("test term".into()),
-      None,
-      Some("term=test%20term"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::SearchNewMovie("test term".into()))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .add_searched_movies
-      .is_none());
-    assert_eq!(
-      app_arc.lock().await.get_current_route(),
-      ActiveRadarrBlock::AddMovieEmptySearchResults.into()
-    );
-  }
-
-  #[tokio::test]
-  async fn test_handle_test_radarr_indexer_event_error() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let response_json = json!([
-    {
-        "isWarning": false,
-        "propertyName": "",
-        "errorMessage": "test failure",
-        "severity": "error"
-    }]);
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_test_server = server
-      .mock(
-        "POST",
-        format!("/api/v3{}", RadarrEvent::TestIndexer(1).resource()).as_str(),
-      )
-      .with_status(400)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json.clone()))
-      .with_body(response_json.to_string())
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Value(value) = network
-      .handle_radarr_event(RadarrEvent::TestIndexer(1))
-      .await
-      .unwrap()
-    {
-      async_details_server.assert_async().await;
-      async_test_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.indexer_test_errors,
-        Some("\"test failure\"".to_owned())
-      );
-      assert_eq!(value, response_json)
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_test_radarr_indexer_event_success() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_test_server = server
-      .mock(
-        "POST",
-        format!("/api/v3{}", RadarrEvent::TestIndexer(1).resource()).as_str(),
-      )
-      .with_status(200)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json.clone()))
-      .with_body("{}")
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Value(value) = network
-      .handle_radarr_event(RadarrEvent::TestIndexer(1))
-      .await
-      .unwrap()
-    {
-      async_details_server.assert_async().await;
-      async_test_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.indexer_test_errors,
-        Some(String::new())
-      );
-      assert_eq!(value, json!({}));
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_test_all_radarr_indexers_event() {
-    let indexers = vec![
-      Indexer {
-        id: 1,
-        name: Some("Test 1".to_owned()),
-        ..Indexer::default()
-      },
-      Indexer {
-        id: 2,
-        name: Some("Test 2".to_owned()),
-        ..Indexer::default()
-      },
-    ];
-    let indexer_test_results_modal_items = vec![
-			IndexerTestResultModalItem {
-				name: "Test 1".to_owned(),
-				is_valid: true,
-				validation_failures: HorizontallyScrollableText::default(),
-			},
-			IndexerTestResultModalItem {
-				name: "Test 2".to_owned(),
-				is_valid: false,
-				validation_failures: "Failure for field 'test field 1': test error message, Failure for field 'test field 2': test error message 2".into(),
-			},
-		];
-    let response_json = json!([
-    {
-      "id": 1,
-      "isValid": true,
-      "validationFailures": []
-    },
-    {
-      "id": 2,
-      "isValid": false,
-      "validationFailures": [
-          {
-              "propertyName": "test field 1",
-              "errorMessage": "test error message",
-              "severity": "error"
-          },
-          {
-              "propertyName": "test field 2",
-              "errorMessage": "test error message 2",
-              "severity": "error"
-          },
-      ]
-    }]);
-    let response: Vec<IndexerTestResult> = serde_json::from_value(response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      None,
-      Some(response_json),
-      Some(400),
-      RadarrEvent::TestAllIndexers,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .indexers
-      .set_items(indexers);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::IndexerTestResults(results) = network
-      .handle_radarr_event(RadarrEvent::TestAllIndexers)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .indexer_test_all_results
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .radarr_data
-          .indexer_test_all_results
-          .as_ref()
-          .unwrap()
-          .items,
-        indexer_test_results_modal_items
-      );
-      assert_eq!(results, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_trigger_automatic_movie_search_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "MoviesSearch",
-        "movieIds": [ 1 ]
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::TriggerAutomaticSearch(1),
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::TriggerAutomaticSearch(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_and_scan_movie_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshMovie",
-        "movieIds": [ 1 ]
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::UpdateAndScan(1),
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::UpdateAndScan(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_all_movies_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshMovie",
-        "movieIds": []
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::UpdateAllMovies,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::UpdateAllMovies)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_radarr_downloads_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshMonitoredDownloads"
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::UpdateDownloads,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::UpdateDownloads)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_collections_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshCollections"
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::UpdateCollections,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::UpdateCollections)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movie_details_event() {
-    let response: Movie = serde_json::from_str(MOVIE_JSON).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
-      None,
-      RadarrEvent::GetMovieDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.quality_profile_map =
-      BiMap::from_iter([(2222, "HD - 1080p".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Movie(movie) = network
-      .handle_radarr_event(RadarrEvent::GetMovieDetails(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .movie_details_modal
-        .is_some());
-      assert_eq!(movie, response);
-
-      let app = app_arc.lock().await;
-      let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
-      assert_str_eq!(
-        movie_details_modal.movie_details.get_text(),
-        formatdoc!(
-          "Title: Test
-          Year: 2023
-          Runtime: 2h 0m
-          Rating: R
-          Collection: Test Collection
-          Status: Downloaded
-          Description: Blah blah blah
-          TMDB: 99%
-          IMDB: 9.9
-          Rotten Tomatoes: 
-          Quality Profile: HD - 1080p
-          Size: 3.30 GB
-          Path: /nfs/movies
-          Studio: 21st Century Alex
-          Genres: cool, family, fun"
-        )
-      );
-      assert_str_eq!(
-        movie_details_modal.file_details,
-        formatdoc!(
-          "Relative Path: Test.mkv
-        Absolute Path: /nfs/movies/Test.mkv
-        Size: 3.30 GB
-        Date Added: 2022-12-30 07:37:56 UTC"
-        )
-      );
-      assert_str_eq!(
-        movie_details_modal.audio_details,
-        formatdoc!(
-          "Bitrate: 0
-        Channels: 7.1
-        Codec: AAC
-        Languages: eng
-        Stream Count: 1"
-        )
-      );
-      assert_str_eq!(
-        movie_details_modal.video_details,
-        formatdoc!(
-          "Bit Depth: 10
-        Bitrate: 0
-        Codec: x265
-        FPS: 23.976
-        Resolution: 1920x804
-        Scan Type: Progressive
-        Runtime: 2:00:00"
-        )
-      );
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movie_details_event_empty_options_give_correct_defaults() {
-    let movie_json_with_missing_fields = json!({
-      "id": 1,
-      "title": "Test",
-      "originalLanguage": {
-        "id": 1,
-        "name": "English"
-      },
-      "sizeOnDisk": 0,
-      "status": "Downloaded",
-      "overview": "Blah blah blah",
-      "path": "/nfs/movies",
-      "studio": "21st Century Alex",
-      "genres": ["cool", "family", "fun"],
-      "year": 2023,
-      "monitored": true,
-      "hasFile": false,
-      "runtime": 120,
-      "tmdbId": 1234,
-      "qualityProfileId": 2222,
-      "tags": [1],
-      "minimumAvailability": "released",
-      "ratings": {}
-    });
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(movie_json_with_missing_fields),
-      None,
-      RadarrEvent::GetMovieDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.quality_profile_map =
-      BiMap::from_iter([(2222, "HD - 1080p".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetMovieDetails(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .movie_details_modal
-      .is_some());
-
-    let app = app_arc.lock().await;
-    let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
-    assert_str_eq!(
-      movie_details_modal.movie_details.get_text(),
-      formatdoc!(
-        "Title: Test
-          Year: 2023
-          Runtime: 2h 0m
-          Rating: 
-          Collection: 
-          Status: Missing
-          Description: Blah blah blah
-          TMDB: 
-          IMDB: 
-          Rotten Tomatoes: 
-          Quality Profile: HD - 1080p
-          Size: 0.00 GB
-          Path: /nfs/movies
-          Studio: 21st Century Alex
-          Genres: cool, family, fun"
-      )
-    );
-    assert!(movie_details_modal.file_details.is_empty());
-    assert!(movie_details_modal.audio_details.is_empty());
-    assert!(movie_details_modal.video_details.is_empty());
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movie_history_event() {
-    let movie_history_item_json = json!([{
-      "sourceTitle": "Test",
-      "quality": { "quality": { "name": "HD - 1080p" }},
-      "languages": [ { "id": 1, "name": "English" } ],
-      "date": "2022-12-30T07:37:56Z",
-      "eventType": "grabbed"
-    }]);
-    let response: Vec<MovieHistoryItem> =
-      serde_json::from_value(movie_history_item_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(movie_history_item_json),
-      None,
-      RadarrEvent::GetMovieHistory(1),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::MovieHistoryItems(history) = network
-      .handle_radarr_event(RadarrEvent::GetMovieHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .radarr_data
-          .movie_details_modal
-          .as_ref()
-          .unwrap()
-          .movie_history
-          .items,
-        vec![movie_history_item()]
-      );
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movie_history_event_empty_movie_details_modal() {
-    let movie_history_item_json = json!([{
-      "sourceTitle": "Test",
-      "quality": { "quality": { "name": "HD - 1080p" }},
-      "languages": [ { "id": 1, "name": "English" } ],
-      "date": "2022-12-30T07:37:56Z",
-      "eventType": "grabbed"
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(movie_history_item_json),
-      None,
-      RadarrEvent::GetMovieHistory(1),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetMovieHistory(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert_eq!(
-      app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .movie_details_modal
-        .as_ref()
-        .unwrap()
-        .movie_history
-        .items,
-      vec![movie_history_item()]
-    );
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_radarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
-    let blocklist_json = json!({"records": [{
-        "id": 123,
-        "movieId": 1007,
-        "sourceTitle": "z movie",
-        "languages": [{"id": 1, "name": "English"}],
-        "quality": {"quality": {"name": "HD - 1080p"}},
-        "customFormats": [{"id": 1, "name": "English"}],
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "DrunkenSlug (Prowlarr)",
-        "message": "test message",
-        "movie": {
-          "id": 1007,
-          "title": "z movie",
-          "tmdbId": 1234,
-          "originalLanguage": {"id": 1, "name": "English"},
-          "sizeOnDisk": 3543348019i64,
-          "status": "Downloaded",
-          "overview": "Blah blah blah",
-          "path": "/nfs/movies",
-          "studio": "21st Century Alex",
-          "genres": ["cool", "family", "fun"],
-          "year": 2023,
-          "monitored": true,
-          "hasFile": true,
-          "runtime": 120,
-          "qualityProfileId": 2222,
-          "minimumAvailability": "announced",
-          "certification": "R",
-          "tags": [1],
-          "ratings": {
-            "imdb": {"value": 9.9},
-            "tmdb": {"value": 9.9},
-            "rottenTomatoes": {"value": 9.9}
-          },
-        },
-      }, {
-        "id": 456,
-        "movieId": 2001,
-        "sourceTitle": "A Movie",
-        "languages": [{"id": 1, "name": "English"}],
-        "quality": {"quality": {"name": "HD - 1080p"}},
-        "customFormats": [{"id": 1, "name": "English"}],
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "DrunkenSlug (Prowlarr)",
-        "message": "test message",
-        "movie": {
-          "id": 2001,
-          "title": "A Movie",
-          "tmdbId": 1234,
-          "originalLanguage": {"id": 1, "name": "English"},
-          "sizeOnDisk": 3543348019i64,
-          "status": "Downloaded",
-          "overview": "Blah blah blah",
-          "path": "/nfs/movies",
-          "studio": "21st Century Alex",
-          "genres": ["cool", "family", "fun"],
-          "year": 2023,
-          "monitored": true,
-          "hasFile": true,
-          "runtime": 120,
-          "qualityProfileId": 2222,
-          "minimumAvailability": "announced",
-          "certification": "R",
-          "tags": [1],
-          "ratings": {
-            "imdb": {"value": 9.9},
-            "tmdb": {"value": 9.9},
-            "rottenTomatoes": {"value": 9.9}
-          },
-        },
-    }]});
-    let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
-    let mut expected_blocklist = vec![
-      BlocklistItem {
-        id: 123,
-        movie_id: 1007,
-        source_title: "z movie".into(),
-        movie: BlocklistItemMovie {
-          title: "z movie".into(),
-        },
-        ..blocklist_item()
-      },
-      BlocklistItem {
-        id: 456,
-        movie_id: 2001,
-        source_title: "A Movie".into(),
-        movie: BlocklistItemMovie {
-          title: "A Movie".into(),
-        },
-        ..blocklist_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(blocklist_json),
-      None,
-      RadarrEvent::GetBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.blocklist.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
-        a.source_title
-          .to_lowercase()
-          .cmp(&b.source_title.to_lowercase())
-      };
-      expected_blocklist.sort_by(cmp_fn);
-
-      let blocklist_sort_option = SortOption {
-        name: "Source Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .blocklist
-        .sorting(vec![blocklist_sort_option]);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::BlocklistResponse(blocklist) = network
-      .handle_radarr_event(RadarrEvent::GetBlocklist)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.blocklist.items,
-        expected_blocklist
-      );
-      assert!(app_arc.lock().await.data.radarr_data.blocklist.sort_asc);
-      assert_eq!(blocklist, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_blocklist_event_no_op_when_user_is_selecting_sort_options() {
-    let blocklist_json = json!({"records": [{
-        "id": 123,
-        "movieId": 1007,
-        "sourceTitle": "z movie",
-        "languages": [{"id": 1, "name": "English"}],
-        "quality": {"quality": {"name": "HD - 1080p"}},
-        "customFormats": [{"id": 1, "name": "English"}],
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "DrunkenSlug (Prowlarr)",
-        "message": "test message",
-        "movie": {
-          "id": 1007,
-          "title": "z movie",
-          "tmdbId": 1234,
-          "originalLanguage": {"id": 1, "name": "English"},
-          "sizeOnDisk": 3543348019i64,
-          "status": "Downloaded",
-          "overview": "Blah blah blah",
-          "path": "/nfs/movies",
-          "studio": "21st Century Alex",
-          "genres": ["cool", "family", "fun"],
-          "year": 2023,
-          "monitored": true,
-          "hasFile": true,
-          "runtime": 120,
-          "qualityProfileId": 2222,
-          "minimumAvailability": "announced",
-          "certification": "R",
-          "tags": [1],
-          "ratings": {
-            "imdb": {"value": 9.9},
-            "tmdb": {"value": 9.9},
-            "rottenTomatoes": {"value": 9.9}
-          },
-        },
-      }, {
-        "id": 456,
-        "movieId": 2001,
-        "sourceTitle": "A Movie",
-        "languages": [{"id": 1, "name": "English"}],
-        "quality": {"quality": {"name": "HD - 1080p"}},
-        "customFormats": [{"id": 1, "name": "English"}],
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "DrunkenSlug (Prowlarr)",
-        "message": "test message",
-        "movie": {
-          "id": 2001,
-          "title": "A Movie",
-          "tmdbId": 1234,
-          "originalLanguage": {"id": 1, "name": "English"},
-          "sizeOnDisk": 3543348019i64,
-          "status": "Downloaded",
-          "overview": "Blah blah blah",
-          "path": "/nfs/movies",
-          "studio": "21st Century Alex",
-          "genres": ["cool", "family", "fun"],
-          "year": 2023,
-          "monitored": true,
-          "hasFile": true,
-          "runtime": 120,
-          "qualityProfileId": 2222,
-          "minimumAvailability": "announced",
-          "certification": "R",
-          "tags": [1],
-          "ratings": {
-            "imdb": {"value": 9.9},
-            "tmdb": {"value": 9.9},
-            "rottenTomatoes": {"value": 9.9}
-          },
-        },
-    }]});
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(blocklist_json),
-      None,
-      RadarrEvent::GetBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.blocklist.sort_asc = true;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveRadarrBlock::BlocklistSortPrompt.into());
-    let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
-      a.source_title
-        .to_lowercase()
-        .cmp(&b.source_title.to_lowercase())
-    };
-    let blocklist_sort_option = SortOption {
-      name: "Source Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .blocklist
-      .sorting(vec![blocklist_sort_option]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetBlocklist)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .blocklist
-      .items
-      .is_empty());
-    assert!(app_arc.lock().await.data.radarr_data.blocklist.sort_asc);
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_collections_event(#[values(true, false)] use_custom_sorting: bool) {
-    let collections_json = json!([{
-      "id": 123,
-      "title": "z Collection",
-      "rootFolderPath": "/nfs/movies",
-      "searchOnAdd": true,
-      "monitored": true,
-      "minimumAvailability": "released",
-      "overview": "Collection blah blah blah",
-      "qualityProfileId": 2222,
-      "movies": [{
-        "title": "Test",
-        "overview": "Collection blah blah blah",
-        "year": 2023,
-        "runtime": 120,
-        "tmdbId": 1234,
-        "genres": ["cool", "family", "fun"],
-        "ratings": {
-          "imdb": {
-            "value": 9.9
-          },
-          "tmdb": {
-            "value": 9.9
-          },
-          "rottenTomatoes": {
-            "value": 9.9
-          }
-        }
-      }],
-    },
-    {
-      "id": 456,
-      "title": "A Collection",
-      "rootFolderPath": "/nfs/movies",
-      "searchOnAdd": true,
-      "monitored": true,
-      "minimumAvailability": "released",
-      "overview": "Collection blah blah blah",
-      "qualityProfileId": 2222,
-      "movies": [{
-        "title": "Test",
-        "overview": "Collection blah blah blah",
-        "year": 2023,
-        "runtime": 120,
-        "tmdbId": 1234,
-        "genres": ["cool", "family", "fun"],
-        "ratings": {
-          "imdb": {
-            "value": 9.9
-          },
-          "tmdb": {
-            "value": 9.9
-          },
-          "rottenTomatoes": {
-            "value": 9.9
-          }
-        }
-      }],
-    }]);
-    let response: Vec<Collection> = serde_json::from_value(collections_json.clone()).unwrap();
-    let mut expected_collections = vec![
-      Collection {
-        id: 123,
-        title: "z Collection".into(),
-        ..collection()
-      },
-      Collection {
-        id: 456,
-        title: "A Collection".into(),
-        ..collection()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(collections_json),
-      None,
-      RadarrEvent::GetCollections,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.collections.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &Collection, b: &Collection| {
-        a.title
-          .text
-          .to_lowercase()
-          .cmp(&b.title.text.to_lowercase())
-      };
-      expected_collections.sort_by(cmp_fn);
-
-      let collection_sort_option = SortOption {
-        name: "Collection",
-        cmp_fn: Some(cmp_fn),
-      };
-      app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .collections
-        .sorting(vec![collection_sort_option]);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Collections(collections) = network
-      .handle_radarr_event(RadarrEvent::GetCollections)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.collections.items,
-        expected_collections
-      );
-      assert!(app_arc.lock().await.data.radarr_data.collections.sort_asc);
-      assert_eq!(collections, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_collections_event_no_op_when_user_is_selecting_sort_options() {
-    let collections_json = json!([{
-      "id": 123,
-      "title": "z Collection",
-      "rootFolderPath": "/nfs/movies",
-      "searchOnAdd": true,
-      "monitored": true,
-      "minimumAvailability": "released",
-      "overview": "Collection blah blah blah",
-      "qualityProfileId": 2222,
-      "movies": [{
-        "title": "Test",
-        "overview": "Collection blah blah blah",
-        "year": 2023,
-        "runtime": 120,
-        "tmdbId": 1234,
-        "genres": ["cool", "family", "fun"],
-        "ratings": {
-          "imdb": {
-            "value": 9.9
-          },
-          "tmdb": {
-            "value": 9.9
-          },
-          "rottenTomatoes": {
-            "value": 9.9
-          }
-        }
-      }],
-    },
-    {
-      "id": 456,
-      "title": "A Collection",
-      "rootFolderPath": "/nfs/movies",
-      "searchOnAdd": true,
-      "monitored": true,
-      "minimumAvailability": "released",
-      "overview": "Collection blah blah blah",
-      "qualityProfileId": 2222,
-      "movies": [{
-        "title": "Test",
-        "overview": "Collection blah blah blah",
-        "year": 2023,
-        "runtime": 120,
-        "tmdbId": 1234,
-        "genres": ["cool", "family", "fun"],
-        "ratings": {
-          "imdb": {
-            "value": 9.9
-          },
-          "tmdb": {
-            "value": 9.9
-          },
-          "rottenTomatoes": {
-            "value": 9.9
-          }
-        }
-      }],
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(collections_json),
-      None,
-      RadarrEvent::GetCollections,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.collections.sort_asc = true;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveRadarrBlock::CollectionsSortPrompt.into());
-    let cmp_fn = |a: &Collection, b: &Collection| {
-      a.title
-        .text
-        .to_lowercase()
-        .cmp(&b.title.text.to_lowercase())
-    };
-    let collection_sort_option = SortOption {
-      name: "Collection",
-      cmp_fn: Some(cmp_fn),
-    };
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .collections
-      .sorting(vec![collection_sort_option]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetCollections)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .collections
-      .items
-      .is_empty());
-    assert!(app_arc.lock().await.data.radarr_data.collections.sort_asc);
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_downloads_event() {
-    let downloads_response_json = json!({
-      "records": [{
-        "title": "Test Download Title",
-        "status": "downloading",
-        "id": 1,
-        "movieId": 1,
-        "size": 3543348019u64,
-        "sizeleft": 1771674009,
-        "outputPath": "/nfs/movies/Test",
-        "indexer": "kickass torrents",
-        "downloadClient": "transmission",
-      }]
-    });
-    let response: DownloadsResponse =
-      serde_json::from_value(downloads_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(downloads_response_json),
-      None,
-      RadarrEvent::GetDownloads,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::DownloadsResponse(downloads) = network
-      .handle_radarr_event(RadarrEvent::GetDownloads)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.downloads.items,
-        downloads_response().records
-      );
-      assert_eq!(downloads, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_host_config_event() {
-    let host_config_response = json!({
-      "bindAddress": "*",
-      "port": 7878,
-      "urlBase": "some.test.site/radarr",
-      "instanceName": "Radarr",
-      "applicationUrl": "https://some.test.site:7878/radarr",
-      "enableSsl": true,
-      "sslPort": 9898,
-      "sslCertPath": "/app/radarr.pfx",
-      "sslCertPassword": "test"
-    });
-    let response: HostConfig = serde_json::from_value(host_config_response.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(host_config_response),
-      None,
-      RadarrEvent::GetHostConfig,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::HostConfig(host_config) = network
-      .handle_radarr_event(RadarrEvent::GetHostConfig)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(host_config, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_indexers_event() {
-    let indexers_response_json = json!([{
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "supportsRss": true,
-        "supportsSearch": true,
-        "protocol": "torrent",
-        "priority": 25,
-        "downloadClientId": 0,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "implementationName": "Torznab",
-        "implementation": "Torznab",
-        "configContract": "TorznabSettings",
-        "tags": [1],
-        "id": 1
-    }]);
-    let response: Vec<Indexer> = serde_json::from_value(indexers_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexers_response_json),
-      None,
-      RadarrEvent::GetIndexers,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Indexers(indexers) = network
-      .handle_radarr_event(RadarrEvent::GetIndexers)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.indexers.items,
-        vec![indexer()]
-      );
-      assert_eq!(indexers, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_all_indexer_settings_event() {
-    let indexer_settings_response_json = json!({
-        "minimumAge": 0,
-        "maximumSize": 0,
-        "retention": 0,
-        "rssSyncInterval": 60,
-        "preferIndexerFlags": false,
-        "availabilityDelay": 0,
-        "allowHardcodedSubs": true,
-        "whitelistedHardcodedSubs": "",
-        "id": 1
-    });
-    let response: IndexerSettings =
-      serde_json::from_value(indexer_settings_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_settings_response_json),
-      None,
-      RadarrEvent::GetAllIndexerSettings,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::IndexerSettings(settings) = network
-      .handle_radarr_event(RadarrEvent::GetAllIndexerSettings)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.indexer_settings,
-        Some(indexer_settings())
-      );
-      assert_eq!(settings, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_all_indexer_settings_event_no_op_if_already_present() {
-    let indexer_settings_response_json = json!({
-        "minimumAge": 0,
-        "maximumSize": 0,
-        "retention": 0,
-        "rssSyncInterval": 60,
-        "preferIndexerFlags": false,
-        "availabilityDelay": 0,
-        "allowHardcodedSubs": true,
-        "whitelistedHardcodedSubs": "",
-        "id": 1
-    });
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_settings_response_json),
-      None,
-      RadarrEvent::GetAllIndexerSettings,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetAllIndexerSettings)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert_eq!(
-      app_arc.lock().await.data.radarr_data.indexer_settings,
-      Some(IndexerSettings::default())
-    );
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_queued_radarr_events_event() {
-    let queued_events_json = json!([{
-        "name": "RefreshMonitoredDownloads",
-        "commandName": "Refresh Monitored Downloads",
-        "status": "completed",
-        "queued": "2023-05-20T21:29:16Z",
-        "started": "2023-05-20T21:29:16Z",
-        "ended": "2023-05-20T21:29:16Z",
-        "duration": "00:00:00.5111547",
-        "trigger": "scheduled",
-    }]);
-    let response: Vec<QueueEvent> = serde_json::from_value(queued_events_json.clone()).unwrap();
-    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
-    let expected_event = QueueEvent {
-      name: "RefreshMonitoredDownloads".to_owned(),
-      command_name: "Refresh Monitored Downloads".to_owned(),
-      status: "completed".to_owned(),
-      queued: timestamp,
-      started: Some(timestamp),
-      ended: Some(timestamp),
-      duration: Some("00:00:00.5111547".to_owned()),
-      trigger: "scheduled".to_owned(),
-    };
-
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(queued_events_json),
-      None,
-      RadarrEvent::GetQueuedEvents,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::QueueEvents(events) = network
-      .handle_radarr_event(RadarrEvent::GetQueuedEvents)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.queued_events.items,
-        vec![expected_event]
-      );
-      assert_eq!(events, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_logs_event() {
-    let expected_logs = vec![
-      HorizontallyScrollableText::from(
-        "2023-05-20 21:29:16 UTC|FATAL|RadarrError|Some.Big.Bad.Exception|test exception",
-      ),
-      HorizontallyScrollableText::from("2023-05-20 21:29:16 UTC|INFO|TestLogger|test message"),
-    ];
-    let logs_response_json = json!({
-      "page": 1,
-      "pageSize": 500,
-      "sortKey": "time",
-      "sortDirection": "descending",
-      "totalRecords": 2,
-      "records": [
-          {
-              "time": "2023-05-20T21:29:16Z",
-              "level": "info",
-              "logger": "TestLogger",
-              "message": "test message",
-              "id": 1
-          },
-          {
-              "time": "2023-05-20T21:29:16Z",
-              "level": "fatal",
-              "logger": "RadarrError",
-              "exception": "test exception",
-              "exceptionType": "Some.Big.Bad.Exception",
-              "id": 2
-          }
-        ]
-    });
-    let response: LogResponse = serde_json::from_value(logs_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(logs_response_json),
-      None,
-      RadarrEvent::GetLogs(500),
-      None,
-      Some("pageSize=500&sortDirection=descending&sortKey=time"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::LogResponse(logs) = network
-      .handle_radarr_event(RadarrEvent::GetLogs(500))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.logs.items,
-        expected_logs
-      );
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .logs
-        .current_selection()
-        .text
-        .contains("INFO"));
-      assert_eq!(logs, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_quality_profiles_event() {
-    let quality_profile_json = json!([{
-      "id": 2222,
-      "name": "HD - 1080p"
-    }]);
-    let response: Vec<QualityProfile> =
-      serde_json::from_value(quality_profile_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(quality_profile_json),
-      None,
-      RadarrEvent::GetQualityProfiles,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::QualityProfiles(quality_profiles) = network
-      .handle_radarr_event(RadarrEvent::GetQualityProfiles)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.quality_profile_map,
-        BiMap::from_iter([(2222i64, "HD - 1080p".to_owned())])
-      );
-      assert_eq!(quality_profiles, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_tags_event() {
-    let tags_json = json!([{
-      "id": 2222,
-      "label": "usenet"
-    }]);
-    let response: Vec<Tag> = serde_json::from_value(tags_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(tags_json),
-      None,
-      RadarrEvent::GetTags,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Tags(tags) = network
-      .handle_radarr_event(RadarrEvent::GetTags)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.tags_map,
-        BiMap::from_iter([(2222i64, "usenet".to_owned())])
-      );
-      assert_eq!(tags, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_tasks_event() {
-    let tasks_json = json!([{
-        "name": "Application Check Update",
-        "taskName": "ApplicationCheckUpdate",
-        "interval": 360,
-        "lastExecution": "2023-05-20T21:29:16Z",
-        "nextExecution": "2023-05-20T21:29:16Z",
-        "lastDuration": "00:00:00.5111547",
-    },
-    {
-        "name": "Backup",
-        "taskName": "Backup",
-        "interval": 10080,
-        "lastExecution": "2023-05-20T21:29:16Z",
-        "nextExecution": "2023-05-20T21:29:16Z",
-        "lastDuration": "00:00:00.5111547",
-    }]);
-    let response: Vec<RadarrTask> = serde_json::from_value(tasks_json.clone()).unwrap();
-    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
-    let expected_tasks = vec![
-      RadarrTask {
-        name: "Application Check Update".to_owned(),
-        task_name: RadarrTaskName::ApplicationCheckUpdate,
-        interval: 360,
-        last_execution: timestamp,
-        next_execution: timestamp,
-        last_duration: "00:00:00.5111547".to_owned(),
-      },
-      RadarrTask {
-        name: "Backup".to_owned(),
-        task_name: RadarrTaskName::Backup,
-        interval: 10080,
-        last_execution: timestamp,
-        next_execution: timestamp,
-        last_duration: "00:00:00.5111547".to_owned(),
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(tasks_json),
-      None,
-      RadarrEvent::GetTasks,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Tasks(tasks) = network
-      .handle_radarr_event(RadarrEvent::GetTasks)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.tasks.items,
-        expected_tasks
-      );
-      assert_eq!(tasks, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_updates_event() {
-    let updates_json = json!([{
-      "version": "4.3.2.1",
-      "releaseDate": "2023-04-15T02:02:53Z",
-      "installed": true,
-      "installedOn": "2023-04-15T02:02:53Z",
-      "latest": true,
-      "changes": {
-        "new": [
-          "Cool new thing"
-        ],
-        "fixed": [
-          "Some bugs killed"
-        ]
-      },
-    },
-      {
-        "version": "3.2.1.0",
-        "releaseDate": "2023-04-15T02:02:53Z",
-        "installed": false,
-        "installedOn": "2023-04-15T02:02:53Z",
-        "latest": false,
-        "changes": {
-          "new": [
-            "Cool new thing (old)",
-            "Other cool new thing (old)"
-            ],
-        },
-    },
-    {
-      "version": "2.1.0",
-      "releaseDate": "2023-04-15T02:02:53Z",
-      "installed": false,
-      "latest": false,
-      "changes": {
-        "fixed": [
-          "Killed bug 1",
-          "Fixed bug 2"
-        ]
-      },
-    }]);
-    let response: Vec<Update> = serde_json::from_value(updates_json.clone()).unwrap();
-    let line_break = "-".repeat(200);
-    let expected_text = ScrollableText::with_string(formatdoc!(
-      "
-    The latest version of Radarr is already installed
-
-    4.3.2.1 - 2023-04-15 02:02:53 UTC (Currently Installed)
-    {line_break}
-    New:
-      * Cool new thing
-    Fixed:
-      * Some bugs killed
-    
-    
-    3.2.1.0 - 2023-04-15 02:02:53 UTC (Previously Installed)
-    {line_break}
-    New:
-      * Cool new thing (old)
-      * Other cool new thing (old)
-    
-    
-    2.1.0 - 2023-04-15 02:02:53 UTC 
-    {line_break}
-    Fixed:
-      * Killed bug 1
-      * Fixed bug 2"
-    ));
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(updates_json),
-      None,
-      RadarrEvent::GetUpdates,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Updates(updates) = network
-      .handle_radarr_event(RadarrEvent::GetUpdates)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_str_eq!(
-        app_arc.lock().await.data.radarr_data.updates.get_text(),
-        expected_text.get_text()
-      );
-      assert_eq!(updates, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_radarr_tag() {
-    let tag_json = json!({ "id": 3, "label": "testing" });
-    let response: Tag = serde_json::from_value(tag_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({ "label": "testing" })),
-      Some(tag_json),
-      None,
-      RadarrEvent::AddTag(String::new()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Tag(tag) = network
-      .handle_radarr_event(RadarrEvent::AddTag("testing".to_owned()))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.tags_map,
-        BiMap::from_iter([
-          (1, "usenet".to_owned()),
-          (2, "test".to_owned()),
-          (3, "testing".to_owned())
-        ])
-      );
-      assert_eq!(tag, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_radarr_tag_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteTag(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteTag(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_root_folders_event() {
-    let root_folder_json = json!([{
-      "id": 1,
-      "path": "/nfs",
-      "accessible": true,
-      "freeSpace": 219902325555200u64,
-    }]);
-    let response: Vec<RootFolder> = serde_json::from_value(root_folder_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(root_folder_json),
-      None,
-      RadarrEvent::GetRootFolders,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::RootFolders(root_folders) = network
-      .handle_radarr_event(RadarrEvent::GetRootFolders)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.radarr_data.root_folders.items,
-        vec![root_folder()]
-      );
-      assert_eq!(root_folders, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_radarr_security_config_event() {
-    let security_config_response = json!({
-      "authenticationMethod": "forms",
-      "authenticationRequired": "disabledForLocalAddresses",
-      "username": "test",
-      "password": "some password",
-      "apiKey": "someApiKey12345",
-      "certificateValidation": "disabledForLocalAddresses",
-    });
-    let response: SecurityConfig =
-      serde_json::from_value(security_config_response.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(security_config_response),
-      None,
-      RadarrEvent::GetSecurityConfig,
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::SecurityConfig(security_config) = network
-      .handle_radarr_event(RadarrEvent::GetSecurityConfig)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(security_config, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movie_credits_event() {
-    let credits_json = json!([
-        {
-          "personName": "Madison Clarke",
-          "character": "Johnny Blaze",
-          "type": "cast",
-        },
-        {
-          "personName": "Alex Clarke",
-          "department": "Music",
-          "job": "Composition",
-          "type": "crew",
-        }
-    ]);
-    let response: Vec<Credit> = serde_json::from_value(credits_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(credits_json),
-      None,
-      RadarrEvent::GetMovieCredits(1),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::Credits(credits) = network
-      .handle_radarr_event(RadarrEvent::GetMovieCredits(1))
-      .await
-      .unwrap()
-    {
-      let app = app_arc.lock().await;
-      let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
-
-      async_server.assert_async().await;
-      assert_eq!(movie_details_modal.movie_cast.items, vec![cast_credit()]);
-      assert_eq!(movie_details_modal.movie_crew.items, vec![crew_credit()]);
-      assert_eq!(credits, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_movie_credits_event_empty_movie_details_modal() {
-    let credits_json = json!([
-        {
-          "personName": "Madison Clarke",
-          "character": "Johnny Blaze",
-          "type": "cast",
-        },
-        {
-          "personName": "Alex Clarke",
-          "department": "Music",
-          "job": "Composition",
-          "type": "crew",
-        }
-    ]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(credits_json),
-      None,
-      RadarrEvent::GetMovieCredits(1),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::GetMovieCredits(1))
-      .await
-      .is_ok());
-
-    let app = app_arc.lock().await;
-    let movie_details_modal = app.data.radarr_data.movie_details_modal.as_ref().unwrap();
-
-    async_server.assert_async().await;
-    assert_eq!(movie_details_modal.movie_cast.items, vec![cast_credit()]);
-    assert_eq!(movie_details_modal.movie_crew.items, vec![crew_credit()]);
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_movie_event() {
-    let delete_movie_params = DeleteMovieParams {
-      id: 1,
-      delete_movie_files: true,
-      add_list_exclusion: true,
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteMovie(delete_movie_params.clone()),
-      Some("/1"),
-      Some("deleteFiles=true&addImportExclusion=true"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteMovie(delete_movie_params))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_clear_radarr_blocklist_event() {
-    let blocklist_items = vec![
-      BlocklistItem {
-        id: 1,
-        ..blocklist_item()
-      },
-      BlocklistItem {
-        id: 2,
-        ..blocklist_item()
-      },
-      BlocklistItem {
-        id: 3,
-        ..blocklist_item()
-      },
-    ];
-    let expected_request_json = json!({ "ids": [1, 2, 3]});
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      Some(expected_request_json),
-      None,
-      None,
-      RadarrEvent::ClearBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .blocklist
-      .set_items(blocklist_items);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::ClearBlocklist)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_radarr_blocklist_item_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteBlocklistItem(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteBlocklistItem(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_radarr_download_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteDownload(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteDownload(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_radarr_indexer_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteIndexer(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteIndexer(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_radarr_root_folder_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteRootFolder(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteRootFolder(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_movie_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "tmdbId": 1234,
-        "title": "Test",
-        "rootFolderPath": "/nfs2",
-        "minimumAvailability": "announced",
-        "monitored": true,
-        "qualityProfileId": 2222,
-        "tags": [1, 2],
-        "addOptions": {
-          "monitor": "movieOnly",
-          "searchForMovie": true
-        }
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::AddMovie(AddMovieBody::default()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let add_movie_body = AddMovieBody {
-      tmdb_id: 1234,
-      title: "Test".to_owned(),
-      root_folder_path: "/nfs2".to_owned(),
-      minimum_availability: "announced".to_owned(),
-      monitored: true,
-      quality_profile_id: 2222,
-      tags: vec![1, 2],
-      tag_input_string: Some("usenet, testing".into()),
-      add_options: AddMovieOptions {
-        monitor: "movieOnly".to_owned(),
-        search_for_movie: true,
-      },
-    };
-
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::AddMovie(add_movie_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_movie_event_does_not_overwrite_tags_field_if_tag_input_string_is_none() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "tmdbId": 1234,
-        "title": "Test",
-        "rootFolderPath": "/nfs2",
-        "minimumAvailability": "announced",
-        "monitored": true,
-        "qualityProfileId": 2222,
-        "tags": [1, 2],
-        "addOptions": {
-          "monitor": "movieOnly",
-          "searchForMovie": true
-        }
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::AddMovie(AddMovieBody::default()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let add_movie_body = AddMovieBody {
-      tmdb_id: 1234,
-      title: "Test".to_owned(),
-      root_folder_path: "/nfs2".to_owned(),
-      minimum_availability: "announced".to_owned(),
-      monitored: true,
-      quality_profile_id: 2222,
-      tags: vec![1, 2],
-      tag_input_string: None,
-      add_options: AddMovieOptions {
-        monitor: "movieOnly".to_owned(),
-        search_for_movie: true,
-      },
-    };
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::AddMovie(add_movie_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_radarr_root_folder_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "path": "/nfs/test"
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
-      None,
-      None,
-    )
-    .await;
-    let add_root_folder_body = AddRootFolderBody {
-      path: "/nfs/test".to_owned(),
-    };
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::AddRootFolder(add_root_folder_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_all_radarr_indexer_settings_event() {
-    let indexer_settings_json = json!({
-        "minimumAge": 0,
-        "maximumSize": 0,
-        "retention": 0,
-        "rssSyncInterval": 60,
-        "preferIndexerFlags": false,
-        "availabilityDelay": 0,
-        "allowHardcodedSubs": true,
-        "whitelistedHardcodedSubs": "",
-        "id": 1
-    });
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Put,
-      Some(indexer_settings_json),
-      None,
-      None,
-      RadarrEvent::EditAllIndexerSettings(indexer_settings()),
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditAllIndexerSettings(indexer_settings()))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_collection_event() {
-    let detailed_collection_body = json!({
-      "id": 123,
-      "title": "Test Collection",
-      "rootFolderPath": "/nfs/movies",
-      "searchOnAdd": true,
-      "monitored": true,
-      "minimumAvailability": "released",
-      "overview": "Collection blah blah blah",
-      "qualityProfileId": 2222,
-      "movies": [
-        {
-          "title": "Test",
-          "overview": "Collection blah blah blah",
-          "year": 2023,
-          "runtime": 120,
-          "tmdbId": 1234,
-          "genres": ["cool", "family", "fun"],
-          "ratings": {
-            "imdb": {
-              "value": 9.9
-            },
-            "tmdb": {
-              "value": 9.9
-            },
-            "rottenTomatoes": {
-              "value": 9.9
-            }
-          }
-        }
-      ]
-    });
-    let mut expected_body = detailed_collection_body.clone();
-    *expected_body.get_mut("monitored").unwrap() = json!(false);
-    *expected_body.get_mut("minimumAvailability").unwrap() = json!("announced");
-    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("rootFolderPath").unwrap() = json!("/nfs/Test Path");
-    *expected_body.get_mut("searchOnAdd").unwrap() = json!(false);
-    let edit_collection_params = EditCollectionParams {
-      collection_id: 123,
-      monitored: Some(false),
-      minimum_availability: Some(MinimumAvailability::Announced),
-      quality_profile_id: Some(1111),
-      root_folder_path: Some("/nfs/Test Path".to_owned()),
-      search_on_add: Some(false),
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(detailed_collection_body),
-      None,
-      RadarrEvent::GetCollections,
-      Some("/123"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/123",
-          RadarrEvent::EditCollection(edit_collection_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditCollection(edit_collection_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_collection_event_defaults_to_previous_values_when_no_params_are_provided(
-  ) {
-    let detailed_collection_body = json!({
-      "id": 123,
-      "title": "Test Collection",
-      "rootFolderPath": "/nfs/movies",
-      "searchOnAdd": true,
-      "monitored": true,
-      "minimumAvailability": "released",
-      "overview": "Collection blah blah blah",
-      "qualityProfileId": 2222,
-      "movies": [
-        {
-          "title": "Test",
-          "overview": "Collection blah blah blah",
-          "year": 2023,
-          "runtime": 120,
-          "tmdbId": 1234,
-          "genres": ["cool", "family", "fun"],
-          "ratings": {
-            "imdb": {
-              "value": 9.9
-            },
-            "tmdb": {
-              "value": 9.9
-            },
-            "rottenTomatoes": {
-              "value": 9.9
-            }
-          }
-        }
-      ]
-    });
-    let mut expected_body = detailed_collection_body.clone();
-    *expected_body.get_mut("monitored").unwrap() = json!(true);
-    *expected_body.get_mut("minimumAvailability").unwrap() = json!("released");
-    *expected_body.get_mut("qualityProfileId").unwrap() = json!(2222);
-    *expected_body.get_mut("rootFolderPath").unwrap() = json!("/nfs/movies");
-    *expected_body.get_mut("searchOnAdd").unwrap() = json!(true);
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(detailed_collection_body),
-      None,
-      RadarrEvent::GetCollections,
-      Some("/123"),
-      None,
-    )
-    .await;
-    let edit_collection_params = EditCollectionParams {
-      collection_id: 123,
-      ..EditCollectionParams::default()
-    };
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/123",
-          RadarrEvent::EditCollection(edit_collection_params).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    let edit_collection_params = EditCollectionParams {
-      collection_id: 123,
-      ..EditCollectionParams::default()
-    };
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditCollection(edit_collection_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_radarr_indexer_event() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.3",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_radarr_indexer_event_does_not_overwrite_tags_vec_if_tag_input_string_is_none(
-  ) {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.3",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tags: Some(vec![1, 2]),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_radarr_indexer_event_does_not_add_seed_ratio_when_seed_ratio_field_is_none_in_details(
-  ) {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_radarr_indexer_event_populates_the_seed_ratio_value_when_seed_ratio_field_is_present_in_details(
-  ) {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.3",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_radarr_indexer_event_defaults_to_previous_values() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      ..EditIndexerParams::default()
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json))
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_radarr_indexer_event_clears_tags_when_clear_tags_is_true() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let expected_edit_indexer_body = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      clear_tags: true,
-      ..EditIndexerParams::default()
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      RadarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          RadarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_edit_indexer_body))
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_movie_event() {
-    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    *expected_body.get_mut("monitored").unwrap() = json!(false);
-    *expected_body.get_mut("minimumAvailability").unwrap() = json!("announced");
-    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
-    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
-    let edit_movie_params = EditMovieParams {
-      movie_id: 1,
-      monitored: Some(false),
-      minimum_availability: Some(MinimumAvailability::Announced),
-      quality_profile_id: Some(1111),
-      root_folder_path: Some("/nfs/Test Path".to_owned()),
-      tag_input_string: Some("usenet, testing".into()),
-      ..EditMovieParams::default()
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
-      None,
-      RadarrEvent::GetMovieDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_movie_event_does_not_overwrite_tags_vec_if_tag_input_string_is_none() {
-    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    *expected_body.get_mut("monitored").unwrap() = json!(false);
-    *expected_body.get_mut("minimumAvailability").unwrap() = json!("announced");
-    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
-    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
-    let edit_movie_params = EditMovieParams {
-      movie_id: 1,
-      monitored: Some(false),
-      minimum_availability: Some(MinimumAvailability::Announced),
-      quality_profile_id: Some(1111),
-      root_folder_path: Some("/nfs/Test Path".to_owned()),
-      tags: Some(vec![1, 2]),
-      ..EditMovieParams::default()
-    };
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
-      None,
-      RadarrEvent::GetMovieDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.radarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_movie_event_defaults_to_previous_values() {
-    let expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
-      None,
-      RadarrEvent::GetMovieDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let edit_movie_params = EditMovieParams {
-      movie_id: 1,
-      ..EditMovieParams::default()
-    };
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_movie_event_uses_provided_parameters_returns_empty_tags_vec_when_clear_tags_is_true(
-  ) {
-    let mut expected_body: Value = serde_json::from_str(MOVIE_JSON).unwrap();
-    *expected_body.get_mut("tags").unwrap() = json!([]);
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(MOVIE_JSON).unwrap()),
-      None,
-      RadarrEvent::GetMovieDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let edit_movie_params = EditMovieParams {
-      movie_id: 1,
-      clear_tags: true,
-      ..EditMovieParams::default()
-    };
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          RadarrEvent::EditMovie(edit_movie_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditMovie(edit_movie_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_download_radarr_release_event() {
-    let expected_body = RadarrReleaseDownloadBody {
-      guid: "1234".to_owned(),
-      indexer_id: 2,
-      movie_id: 1,
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "guid": "1234",
-        "indexerId": 2,
-        "movieId": 1
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::DownloadRelease(expected_body.clone()),
-      None,
-      None,
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DownloadRelease(expected_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_extract_and_add_radarr_tag_ids_vec() {
-    let app_arc = Arc::new(Mutex::new(App::test_default()));
-    let tags = "    test,HI ,, usenet ";
-    {
-      let mut app = app_arc.lock().await;
-      app.data.radarr_data.tags_map = BiMap::from_iter([
-        (1, "usenet".to_owned()),
-        (2, "test".to_owned()),
-        (3, "hi".to_owned()),
-      ]);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert_eq!(
-      network.extract_and_add_radarr_tag_ids_vec(tags).await,
-      vec![2, 3, 1]
-    );
-  }
-
-  #[tokio::test]
-  async fn test_extract_and_add_radarr_tag_ids_vec_add_missing_tags_first() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({ "label": "TESTING" })),
-      Some(json!({ "id": 3, "label": "testing" })),
-      None,
-      RadarrEvent::GetTags,
-      None,
-      None,
-    )
-    .await;
-    let tags = "usenet, test, TESTING";
-    {
-      let mut app = app_arc.lock().await;
-      app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
-        tags: tags.into(),
-        ..EditMovieModal::default()
-      });
-      app.data.radarr_data.tags_map =
-        BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    let tag_ids_vec = network.extract_and_add_radarr_tag_ids_vec(tags).await;
-
-    async_server.assert_async().await;
-    assert_eq!(tag_ids_vec, vec![1, 2, 3]);
-    assert_eq!(
-      app_arc.lock().await.data.radarr_data.tags_map,
-      BiMap::from_iter([
-        (1, "usenet".to_owned()),
-        (2, "test".to_owned()),
-        (3, "testing".to_owned())
-      ])
-    );
-  }
-
-  #[test]
-  fn test_get_movie_status_downloaded() {
-    assert_str_eq!(get_movie_status(true, &[], 0), "Downloaded");
-  }
-
-  #[test]
-  fn test_get_movie_status_missing() {
-    let download_record = DownloadRecord {
-      movie_id: 1,
-      ..DownloadRecord::default()
-    };
-
-    assert_str_eq!(
-      get_movie_status(false, &[download_record.clone()], 0),
-      "Missing"
-    );
-
-    assert_str_eq!(get_movie_status(false, &[download_record], 1), "Missing");
-  }
-
-  #[test]
-  fn test_get_movie_status_downloading() {
-    assert_str_eq!(
-      get_movie_status(
-        false,
-        &[DownloadRecord {
-          movie_id: 1,
-          status: "downloading".to_owned(),
-          ..DownloadRecord::default()
-        }],
-        1
-      ),
-      "Downloading"
-    );
-  }
-
-  #[test]
-  fn test_get_movie_status_awaiting_import() {
-    assert_str_eq!(
-      get_movie_status(
-        false,
-        &[DownloadRecord {
-          movie_id: 1,
-          status: "completed".to_owned(),
-          ..DownloadRecord::default()
-        }],
-        1
-      ),
-      "Awaiting Import"
-    );
-  }
-
-  fn language() -> Language {
-    Language {
-      id: 1,
-      name: "English".to_owned(),
-    }
-  }
-
-  fn genres() -> Vec<String> {
-    vec!["cool".to_owned(), "family".to_owned(), "fun".to_owned()]
-  }
-
-  fn rating() -> Rating {
-    Rating {
-      value: Number::from_f64(9.9).unwrap(),
-    }
-  }
-
-  fn ratings_list() -> RatingsList {
-    RatingsList {
-      imdb: Some(rating()),
-      tmdb: Some(rating()),
-      rotten_tomatoes: Some(rating()),
-    }
-  }
-
-  fn media_info() -> MediaInfo {
-    MediaInfo {
-      audio_bitrate: 0,
-      audio_channels: Number::from_f64(7.1).unwrap(),
-      audio_codec: Some("AAC".to_owned()),
-      audio_languages: Some("eng".to_owned()),
-      audio_stream_count: 1,
-      video_bit_depth: 10,
-      video_bitrate: 0,
-      video_codec: "x265".to_owned(),
-      video_fps: Number::from_f64(23.976).unwrap(),
-      resolution: "1920x804".to_owned(),
-      run_time: "2:00:00".to_owned(),
-      scan_type: "Progressive".to_owned(),
-    }
-  }
-
-  fn movie_file() -> MovieFile {
-    MovieFile {
-      relative_path: "Test.mkv".to_owned(),
-      path: "/nfs/movies/Test.mkv".to_owned(),
-      date_added: DateTime::from(DateTime::parse_from_rfc3339("2022-12-30T07:37:56Z").unwrap()),
-      media_info: Some(media_info()),
-    }
-  }
-
-  fn collection_movie() -> CollectionMovie {
-    CollectionMovie {
-      title: "Test".to_owned().into(),
-      overview: "Collection blah blah blah".to_owned(),
-      year: 2023,
-      runtime: 120,
-      tmdb_id: 1234,
-      genres: genres(),
-      ratings: ratings_list(),
-    }
-  }
-
-  fn blocklist_item() -> BlocklistItem {
-    BlocklistItem {
-      id: 1,
-      movie_id: 1,
-      source_title: "z movie".to_owned(),
-      languages: vec![language()],
-      quality: quality_wrapper(),
-      custom_formats: Some(vec![language()]),
-      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
-      protocol: "usenet".to_owned(),
-      indexer: "DrunkenSlug (Prowlarr)".to_owned(),
-      message: "test message".to_owned(),
-      movie: blocklist_item_movie(),
-    }
-  }
-
-  fn blocklist_item_movie() -> BlocklistItemMovie {
-    BlocklistItemMovie {
-      title: "Test".into(),
-    }
-  }
-
-  fn collection() -> Collection {
-    Collection {
-      id: 123,
-      title: "Test Collection".to_owned().into(),
-      root_folder_path: Some("/nfs/movies".to_owned()),
-      search_on_add: true,
-      monitored: true,
-      minimum_availability: MinimumAvailability::Released,
-      overview: Some("Collection blah blah blah".to_owned()),
-      quality_profile_id: 2222,
-      movies: Some(vec![collection_movie()]),
-    }
-  }
-
-  fn movie() -> Movie {
-    Movie {
-      id: 1,
-      title: "Test".to_owned().into(),
-      original_language: language(),
-      size_on_disk: 3543348019,
-      status: "Downloaded".to_owned(),
-      overview: "Blah blah blah".to_owned(),
-      path: "/nfs/movies".to_owned(),
-      studio: "21st Century Alex".to_owned(),
-      genres: genres(),
-      year: 2023,
-      monitored: true,
-      has_file: true,
-      runtime: 120,
-      tmdb_id: 1234,
-      quality_profile_id: 2222,
-      minimum_availability: MinimumAvailability::Announced,
-      certification: Some("R".to_owned()),
-      tags: vec![Number::from(1)],
-      ratings: ratings_list(),
-      movie_file: Some(movie_file()),
-      collection: Some(movie_collection()),
-    }
-  }
-
-  fn movie_collection() -> MovieCollection {
-    MovieCollection {
-      title: Some("Test Collection".to_owned()),
-    }
-  }
-
-  fn rejections() -> Vec<String> {
-    vec![
-      "Unknown quality profile".to_owned(),
-      "Release is already mapped".to_owned(),
-    ]
-  }
-
-  fn quality() -> Quality {
-    Quality {
-      name: "HD - 1080p".to_owned(),
-    }
-  }
-
-  fn quality_wrapper() -> QualityWrapper {
-    QualityWrapper { quality: quality() }
-  }
-
-  fn release() -> RadarrRelease {
-    RadarrRelease {
-      guid: "1234".to_owned(),
-      protocol: "torrent".to_owned(),
-      age: 1,
-      title: HorizontallyScrollableText::from("Test Release"),
-      indexer: "kickass torrents".to_owned(),
-      indexer_id: 2,
-      size: 1234,
-      rejected: true,
-      rejections: Some(rejections()),
-      seeders: Some(Number::from(2)),
-      leechers: Some(Number::from(1)),
-      languages: Some(vec![language()]),
-      quality: quality_wrapper(),
-    }
-  }
-
-  fn add_movie_search_result() -> AddMovieSearchResult {
-    AddMovieSearchResult {
-      tmdb_id: 1234,
-      title: HorizontallyScrollableText::from("Test"),
-      original_language: language(),
-      status: "released".to_owned(),
-      overview: "New movie blah blah blah".to_owned(),
-      genres: genres(),
-      year: 2023,
-      runtime: 120,
-      ratings: ratings_list(),
-    }
-  }
-
-  fn movie_history_item() -> MovieHistoryItem {
-    MovieHistoryItem {
-      source_title: HorizontallyScrollableText::from("Test"),
-      quality: quality_wrapper(),
-      languages: vec![language()],
-      date: DateTime::from(DateTime::parse_from_rfc3339("2022-12-30T07:37:56Z").unwrap()),
-      event_type: "grabbed".to_owned(),
-    }
-  }
-
-  fn download_record() -> DownloadRecord {
-    DownloadRecord {
-      title: "Test Download Title".to_owned(),
-      status: "downloading".to_owned(),
-      id: 1,
-      movie_id: 1,
-      size: 3543348019,
-      sizeleft: 1771674009,
-      output_path: Some(HorizontallyScrollableText::from("/nfs/movies/Test")),
-      indexer: "kickass torrents".to_owned(),
-      download_client: "transmission".to_owned(),
-    }
-  }
-
-  fn downloads_response() -> DownloadsResponse {
-    DownloadsResponse {
-      records: vec![download_record()],
-    }
-  }
-
-  fn root_folder() -> RootFolder {
-    RootFolder {
-      id: 1,
-      path: "/nfs".to_owned(),
-      accessible: true,
-      free_space: 219902325555200,
-      unmapped_folders: None,
-    }
-  }
-
-  fn cast_credit() -> Credit {
-    Credit {
-      person_name: "Madison Clarke".to_owned(),
-      character: Some("Johnny Blaze".to_owned()),
-      department: None,
-      job: None,
-      credit_type: CreditType::Cast,
-    }
-  }
-
-  fn crew_credit() -> Credit {
-    Credit {
-      person_name: "Alex Clarke".to_owned(),
-      character: None,
-      department: Some("Music".to_owned()),
-      job: Some("Composition".to_owned()),
-      credit_type: CreditType::Crew,
-    }
-  }
-
-  fn indexer() -> Indexer {
-    Indexer {
-      enable_rss: true,
-      enable_automatic_search: true,
-      enable_interactive_search: true,
-      supports_rss: true,
-      supports_search: true,
-      protocol: "torrent".to_owned(),
-      priority: 25,
-      download_client_id: 0,
-      name: Some("Test Indexer".to_owned()),
-      implementation_name: Some("Torznab".to_owned()),
-      implementation: Some("Torznab".to_owned()),
-      config_contract: Some("TorznabSettings".to_owned()),
-      tags: vec![Number::from(1)],
-      id: 1,
-      fields: Some(vec![
-        IndexerField {
-          name: Some("baseUrl".to_owned()),
-          value: Some(json!("https://test.com")),
-        },
-        IndexerField {
-          name: Some("apiKey".to_owned()),
-          value: Some(json!("")),
-        },
-        IndexerField {
-          name: Some("seedCriteria.seedRatio".to_owned()),
-          value: Some(json!("1.2")),
-        },
-      ]),
-    }
-  }
-
-  fn indexer_settings() -> IndexerSettings {
-    IndexerSettings {
-      rss_sync_interval: 60,
-      allow_hardcoded_subs: true,
-      id: 1,
-      ..IndexerSettings::default()
-    }
-  }
-}
diff --git a/src/network/sonarr_network.rs b/src/network/sonarr_network.rs
deleted file mode 100644
index df5e1dd..0000000
--- a/src/network/sonarr_network.rs
+++ /dev/null
@@ -1,2347 +0,0 @@
-use anyhow::Result;
-use indoc::formatdoc;
-use log::{debug, info, warn};
-use serde_json::{json, Number, Value};
-use urlencoding::encode;
-
-use super::{Network, NetworkEvent, NetworkResource};
-use crate::models::sonarr_models::{DownloadStatus, MonitorEpisodeBody};
-use crate::{
-  models::{
-    radarr_models::IndexerTestResult,
-    servarr_data::{
-      modals::IndexerTestResultModalItem,
-      sonarr::{
-        modals::{EpisodeDetailsModal, SeasonDetailsModal},
-        sonarr_data::ActiveSonarrBlock,
-      },
-    },
-    servarr_models::{
-      AddRootFolderBody, CommandBody, DiskSpace, EditIndexerParams, HostConfig, Indexer, Language,
-      LogResponse, QualityProfile, QueueEvent, RootFolder, SecurityConfig, Tag, Update,
-    },
-    sonarr_models::{
-      AddSeriesBody, AddSeriesSearchResult, BlocklistItem, BlocklistResponse, DeleteSeriesParams,
-      DownloadRecord, DownloadsResponse, EditSeriesParams, Episode, EpisodeFile, IndexerSettings,
-      Series, SonarrCommandBody, SonarrHistoryItem, SonarrHistoryWrapper, SonarrRelease,
-      SonarrReleaseDownloadBody, SonarrSerdeable, SonarrTask, SonarrTaskName, SystemStatus,
-    },
-    stateful_table::StatefulTable,
-    HorizontallyScrollableText, Route, Scrollable, ScrollableText,
-  },
-  network::RequestMethod,
-  utils::convert_to_gb,
-};
-#[cfg(test)]
-#[path = "sonarr_network_tests.rs"]
-mod sonarr_network_tests;
-
-#[derive(Debug, Eq, PartialEq, Clone)]
-pub enum SonarrEvent {
-  AddRootFolder(AddRootFolderBody),
-  AddSeries(AddSeriesBody),
-  AddTag(String),
-  ClearBlocklist,
-  DeleteBlocklistItem(i64),
-  DeleteDownload(i64),
-  DeleteEpisodeFile(i64),
-  DeleteIndexer(i64),
-  DeleteRootFolder(i64),
-  DeleteSeries(DeleteSeriesParams),
-  DeleteTag(i64),
-  DownloadRelease(SonarrReleaseDownloadBody),
-  EditAllIndexerSettings(IndexerSettings),
-  EditIndexer(EditIndexerParams),
-  EditSeries(EditSeriesParams),
-  GetAllIndexerSettings,
-  GetBlocklist,
-  GetDownloads,
-  GetHistory(u64),
-  GetHostConfig,
-  GetIndexers,
-  GetEpisodeDetails(i64),
-  GetEpisodes(i64),
-  GetEpisodeFiles(i64),
-  GetEpisodeHistory(i64),
-  GetLanguageProfiles,
-  GetLogs(u64),
-  GetDiskSpace,
-  GetQualityProfiles,
-  GetQueuedEvents,
-  GetRootFolders,
-  GetEpisodeReleases(i64),
-  GetSeasonHistory((i64, i64)),
-  GetSeasonReleases((i64, i64)),
-  GetSecurityConfig,
-  GetSeriesDetails(i64),
-  GetSeriesHistory(i64),
-  GetStatus,
-  GetUpdates,
-  GetTags,
-  GetTasks,
-  HealthCheck,
-  ListSeries,
-  MarkHistoryItemAsFailed(i64),
-  SearchNewSeries(String),
-  StartTask(SonarrTaskName),
-  TestIndexer(i64),
-  TestAllIndexers,
-  ToggleSeasonMonitoring((i64, i64)),
-  ToggleEpisodeMonitoring(i64),
-  TriggerAutomaticEpisodeSearch(i64),
-  TriggerAutomaticSeasonSearch((i64, i64)),
-  TriggerAutomaticSeriesSearch(i64),
-  UpdateAllSeries,
-  UpdateAndScanSeries(i64),
-  UpdateDownloads,
-}
-
-impl NetworkResource for SonarrEvent {
-  fn resource(&self) -> &'static str {
-    match &self {
-      SonarrEvent::AddTag(_) | SonarrEvent::DeleteTag(_) | SonarrEvent::GetTags => "/tag",
-      SonarrEvent::ClearBlocklist => "/blocklist/bulk",
-      SonarrEvent::DownloadRelease(_) => "/release",
-      SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
-      SonarrEvent::GetAllIndexerSettings | SonarrEvent::EditAllIndexerSettings(_) => {
-        "/config/indexer"
-      }
-      SonarrEvent::GetEpisodeFiles(_) | SonarrEvent::DeleteEpisodeFile(_) => "/episodefile",
-      SonarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
-      SonarrEvent::GetDownloads | SonarrEvent::DeleteDownload(_) => "/queue",
-      SonarrEvent::GetEpisodes(_) | SonarrEvent::GetEpisodeDetails(_) => "/episode",
-      SonarrEvent::GetHistory(_) | SonarrEvent::GetEpisodeHistory(_) => "/history",
-      SonarrEvent::GetHostConfig | SonarrEvent::GetSecurityConfig => "/config/host",
-      SonarrEvent::GetIndexers | SonarrEvent::DeleteIndexer(_) | SonarrEvent::EditIndexer(_) => {
-        "/indexer"
-      }
-      SonarrEvent::GetLanguageProfiles => "/language",
-      SonarrEvent::GetLogs(_) => "/log",
-      SonarrEvent::GetDiskSpace => "/diskspace",
-      SonarrEvent::GetQualityProfiles => "/qualityprofile",
-      SonarrEvent::GetQueuedEvents
-      | SonarrEvent::StartTask(_)
-      | SonarrEvent::TriggerAutomaticSeriesSearch(_)
-      | SonarrEvent::TriggerAutomaticSeasonSearch(_)
-      | SonarrEvent::TriggerAutomaticEpisodeSearch(_)
-      | SonarrEvent::UpdateAllSeries
-      | SonarrEvent::UpdateAndScanSeries(_)
-      | SonarrEvent::UpdateDownloads => "/command",
-      SonarrEvent::GetRootFolders
-      | SonarrEvent::DeleteRootFolder(_)
-      | SonarrEvent::AddRootFolder(_) => "/rootfolder",
-      SonarrEvent::GetSeasonReleases(_) | SonarrEvent::GetEpisodeReleases(_) => "/release",
-      SonarrEvent::GetSeriesHistory(_) | SonarrEvent::GetSeasonHistory(_) => "/history/series",
-      SonarrEvent::GetStatus => "/system/status",
-      SonarrEvent::GetTasks => "/system/task",
-      SonarrEvent::GetUpdates => "/update",
-      SonarrEvent::HealthCheck => "/health",
-      SonarrEvent::AddSeries(_)
-      | SonarrEvent::ListSeries
-      | SonarrEvent::GetSeriesDetails(_)
-      | SonarrEvent::DeleteSeries(_)
-      | SonarrEvent::EditSeries(_)
-      | SonarrEvent::ToggleSeasonMonitoring(_) => "/series",
-      SonarrEvent::SearchNewSeries(_) => "/series/lookup",
-      SonarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed",
-      SonarrEvent::TestIndexer(_) => "/indexer/test",
-      SonarrEvent::TestAllIndexers => "/indexer/testall",
-      SonarrEvent::ToggleEpisodeMonitoring(_) => "/episode/monitor",
-    }
-  }
-}
-
-impl From<SonarrEvent> for NetworkEvent {
-  fn from(sonarr_event: SonarrEvent) -> Self {
-    NetworkEvent::Sonarr(sonarr_event)
-  }
-}
-
-impl Network<'_, '_> {
-  pub async fn handle_sonarr_event(
-    &mut self,
-    sonarr_event: SonarrEvent,
-  ) -> Result<SonarrSerdeable> {
-    match sonarr_event {
-      SonarrEvent::AddRootFolder(path) => self
-        .add_sonarr_root_folder(path)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::AddSeries(body) => self
-        .add_sonarr_series(body)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::AddTag(tag) => self.add_sonarr_tag(tag).await.map(SonarrSerdeable::from),
-      SonarrEvent::ClearBlocklist => self
-        .clear_sonarr_blocklist()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetAllIndexerSettings => self
-        .get_all_sonarr_indexer_settings()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
-        .delete_sonarr_blocklist_item(blocklist_item_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DeleteDownload(download_id) => self
-        .delete_sonarr_download(download_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DeleteEpisodeFile(episode_file_id) => self
-        .delete_sonarr_episode_file(episode_file_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DeleteIndexer(indexer_id) => self
-        .delete_sonarr_indexer(indexer_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DeleteRootFolder(root_folder_id) => self
-        .delete_sonarr_root_folder(root_folder_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DeleteSeries(params) => {
-        self.delete_series(params).await.map(SonarrSerdeable::from)
-      }
-      SonarrEvent::DeleteTag(tag_id) => self
-        .delete_sonarr_tag(tag_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::DownloadRelease(sonarr_release_download_body) => self
-        .download_sonarr_release(sonarr_release_download_body)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::EditAllIndexerSettings(params) => self
-        .edit_all_sonarr_indexer_settings(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::EditIndexer(params) => self
-        .edit_sonarr_indexer(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::EditSeries(params) => self
-        .edit_sonarr_series(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetBlocklist => self.get_sonarr_blocklist().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetDownloads => self.get_sonarr_downloads().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetEpisodes(series_id) => self
-        .get_episodes(series_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetEpisodeFiles(series_id) => self
-        .get_episode_files(series_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetEpisodeDetails(episode_id) => self
-        .get_episode_details(episode_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetEpisodeHistory(episode_id) => self
-        .get_sonarr_episode_history(episode_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetHistory(events) => self
-        .get_sonarr_history(events)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetHostConfig => self
-        .get_sonarr_host_config()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetIndexers => self.get_sonarr_indexers().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetLanguageProfiles => self
-        .get_sonarr_language_profiles()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetLogs(events) => self
-        .get_sonarr_logs(events)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetDiskSpace => self.get_sonarr_diskspace().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetQualityProfiles => self
-        .get_sonarr_quality_profiles()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetQueuedEvents => self
-        .get_queued_sonarr_events()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetRootFolders => self
-        .get_sonarr_root_folders()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetEpisodeReleases(params) => self
-        .get_episode_releases(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetSeasonHistory(params) => self
-        .get_sonarr_season_history(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetSeasonReleases(params) => self
-        .get_season_releases(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetSecurityConfig => self
-        .get_sonarr_security_config()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetSeriesDetails(series_id) => self
-        .get_series_details(series_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetSeriesHistory(series_id) => self
-        .get_sonarr_series_history(series_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::GetStatus => self.get_sonarr_status().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetTags => self.get_sonarr_tags().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetTasks => self.get_sonarr_tasks().await.map(SonarrSerdeable::from),
-      SonarrEvent::GetUpdates => self.get_sonarr_updates().await.map(SonarrSerdeable::from),
-      SonarrEvent::HealthCheck => self
-        .get_sonarr_healthcheck()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::ListSeries => self.list_series().await.map(SonarrSerdeable::from),
-      SonarrEvent::MarkHistoryItemAsFailed(history_item_id) => self
-        .mark_sonarr_history_item_as_failed(history_item_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::SearchNewSeries(query) => self
-        .search_sonarr_series(query)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::StartTask(task_name) => self
-        .start_sonarr_task(task_name)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::TestIndexer(indexer_id) => self
-        .test_sonarr_indexer(indexer_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::TestAllIndexers => self
-        .test_all_sonarr_indexers()
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::ToggleEpisodeMonitoring(episode_id) => self
-        .toggle_sonarr_episode_monitoring(episode_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::ToggleSeasonMonitoring(params) => self
-        .toggle_sonarr_season_monitoring(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::TriggerAutomaticSeasonSearch(params) => self
-        .trigger_automatic_season_search(params)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::TriggerAutomaticSeriesSearch(series_id) => self
-        .trigger_automatic_series_search(series_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::TriggerAutomaticEpisodeSearch(episode_id) => self
-        .trigger_automatic_episode_search(episode_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::UpdateAllSeries => self.update_all_series().await.map(SonarrSerdeable::from),
-      SonarrEvent::UpdateAndScanSeries(series_id) => self
-        .update_and_scan_series(series_id)
-        .await
-        .map(SonarrSerdeable::from),
-      SonarrEvent::UpdateDownloads => self
-        .update_sonarr_downloads()
-        .await
-        .map(SonarrSerdeable::from),
-    }
-  }
-
-  async fn add_sonarr_root_folder(
-    &mut self,
-    add_root_folder_body: AddRootFolderBody,
-  ) -> Result<Value> {
-    info!("Adding new root folder to Sonarr");
-    let event = SonarrEvent::AddRootFolder(AddRootFolderBody::default());
-
-    debug!("Add root folder body: {add_root_folder_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        Some(add_root_folder_body),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<AddRootFolderBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn add_sonarr_series(&mut self, mut add_series_body: AddSeriesBody) -> Result<Value> {
-    info!("Adding new series to Sonarr");
-    let event = SonarrEvent::AddSeries(AddSeriesBody::default());
-    if let Some(tag_input_str) = add_series_body.tag_input_string.as_ref() {
-      let tag_ids_vec = self.extract_and_add_sonarr_tag_ids_vec(tag_input_str).await;
-      add_series_body.tags = tag_ids_vec;
-    }
-
-    debug!("Add series body: {add_series_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        Some(add_series_body),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<AddSeriesBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn add_sonarr_tag(&mut self, tag: String) -> Result<Tag> {
-    info!("Adding a new Sonarr tag");
-    let event = SonarrEvent::AddTag(String::new());
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        Some(json!({ "label": tag })),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, Tag>(request_props, |tag, mut app| {
-        app.data.sonarr_data.tags_map.insert(tag.id, tag.label);
-      })
-      .await
-  }
-
-  async fn clear_sonarr_blocklist(&mut self) -> Result<()> {
-    info!("Clearing Sonarr blocklist");
-    let event = SonarrEvent::ClearBlocklist;
-
-    let ids = self
-      .app
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .blocklist
-      .items
-      .iter()
-      .map(|item| item.id)
-      .collect::<Vec<i64>>();
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        Some(json!({"ids": ids})),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_sonarr_blocklist_item(&mut self, blocklist_item_id: i64) -> Result<()> {
-    let event = SonarrEvent::DeleteBlocklistItem(blocklist_item_id);
-    info!("Deleting Sonarr blocklist item for item with id: {blocklist_item_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{blocklist_item_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_sonarr_episode_file(&mut self, episode_file_id: i64) -> Result<()> {
-    let event = SonarrEvent::DeleteEpisodeFile(episode_file_id);
-    info!("Deleting Sonarr episode file for episode file with id: {episode_file_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{episode_file_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_sonarr_download(&mut self, download_id: i64) -> Result<()> {
-    let event = SonarrEvent::DeleteDownload(download_id);
-    info!("Deleting Sonarr download for download with id: {download_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{download_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_sonarr_indexer(&mut self, indexer_id: i64) -> Result<()> {
-    let event = SonarrEvent::DeleteIndexer(indexer_id);
-    info!("Deleting Sonarr indexer for indexer with id: {indexer_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{indexer_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_sonarr_root_folder(&mut self, root_folder_id: i64) -> Result<()> {
-    let event = SonarrEvent::DeleteRootFolder(root_folder_id);
-    info!("Deleting Sonarr root folder for folder with id: {root_folder_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{root_folder_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_series(&mut self, delete_series_params: DeleteSeriesParams) -> Result<()> {
-    let event = SonarrEvent::DeleteSeries(DeleteSeriesParams::default());
-    let DeleteSeriesParams {
-      id,
-      delete_series_files,
-      add_list_exclusion,
-    } = delete_series_params;
-
-    info!("Deleting Sonarr series with ID: {id} with deleteFiles={delete_series_files} and addImportExclusion={add_list_exclusion}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{id}")),
-        Some(format!(
-          "deleteFiles={delete_series_files}&addImportExclusion={add_list_exclusion}"
-        )),
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn delete_sonarr_tag(&mut self, id: i64) -> Result<()> {
-    info!("Deleting Sonarr tag with id: {id}");
-    let event = SonarrEvent::DeleteTag(id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Delete,
-        None::<()>,
-        Some(format!("/{id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn download_sonarr_release(
-    &mut self,
-    sonarr_release_download_body: SonarrReleaseDownloadBody,
-  ) -> Result<Value> {
-    let event = SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody::default());
-    info!("Downloading Sonarr release with params: {sonarr_release_download_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        Some(sonarr_release_download_body),
-        None,
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<SonarrReleaseDownloadBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn edit_all_sonarr_indexer_settings(&mut self, params: IndexerSettings) -> Result<Value> {
-    info!("Updating Sonarr indexer settings");
-    let event = SonarrEvent::EditAllIndexerSettings(IndexerSettings::default());
-    debug!("Indexer settings body: {params:?}");
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Put, Some(params), None, None)
-      .await;
-
-    self
-      .handle_request::<IndexerSettings, Value>(request_props, |_, _| {})
-      .await
-  }
-
-  async fn edit_sonarr_indexer(
-    &mut self,
-    mut edit_indexer_params: EditIndexerParams,
-  ) -> Result<()> {
-    if let Some(tag_input_str) = edit_indexer_params.tag_input_string.as_ref() {
-      let tag_ids_vec = self.extract_and_add_sonarr_tag_ids_vec(tag_input_str).await;
-      edit_indexer_params.tags = Some(tag_ids_vec);
-    }
-    let detail_event = SonarrEvent::GetIndexers;
-    let event = SonarrEvent::EditIndexer(EditIndexerParams::default());
-    let id = edit_indexer_params.indexer_id;
-    info!("Updating Sonarr indexer with ID: {id}");
-    info!("Fetching indexer details for indexer with ID: {id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{id}")),
-        None,
-      )
-      .await;
-
-    let mut response = String::new();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
-        response = detailed_indexer_body.to_string()
-      })
-      .await?;
-
-    info!("Constructing edit indexer body");
-
-    let mut detailed_indexer_body: Value = serde_json::from_str(&response)?;
-
-    let (
-      name,
-      enable_rss,
-      enable_automatic_search,
-      enable_interactive_search,
-      url,
-      api_key,
-      seed_ratio,
-      tags,
-      priority,
-    ) = {
-      let priority = detailed_indexer_body["priority"]
-        .as_i64()
-        .expect("Unable to deserialize 'priority'");
-      let seed_ratio_field_option = detailed_indexer_body["fields"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .find(|field| field["name"] == "seedCriteria.seedRatio");
-      let name = edit_indexer_params.name.unwrap_or(
-        detailed_indexer_body["name"]
-          .as_str()
-          .expect("Unable to deserialize 'name'")
-          .to_owned(),
-      );
-      let enable_rss = edit_indexer_params.enable_rss.unwrap_or(
-        detailed_indexer_body["enableRss"]
-          .as_bool()
-          .expect("Unable to deserialize 'enableRss'"),
-      );
-      let enable_automatic_search = edit_indexer_params.enable_automatic_search.unwrap_or(
-        detailed_indexer_body["enableAutomaticSearch"]
-          .as_bool()
-          .expect("Unable to deserialize 'enableAutomaticSearch"),
-      );
-      let enable_interactive_search = edit_indexer_params.enable_interactive_search.unwrap_or(
-        detailed_indexer_body["enableInteractiveSearch"]
-          .as_bool()
-          .expect("Unable to deserialize 'enableInteractiveSearch'"),
-      );
-      let url = edit_indexer_params.url.unwrap_or(
-        detailed_indexer_body["fields"]
-          .as_array()
-          .expect("Unable to deserialize 'fields'")
-          .iter()
-          .find(|field| field["name"] == "baseUrl")
-          .expect("Field 'baseUrl' was not found in the 'fields' array")
-          .get("value")
-          .unwrap_or(&json!(""))
-          .as_str()
-          .expect("Unable to deserialize 'baseUrl value'")
-          .to_owned(),
-      );
-      let api_key = edit_indexer_params.api_key.unwrap_or(
-        detailed_indexer_body["fields"]
-          .as_array()
-          .expect("Unable to deserialize 'fields'")
-          .iter()
-          .find(|field| field["name"] == "apiKey")
-          .expect("Field 'apiKey' was not found in the 'fields' array")
-          .get("value")
-          .unwrap_or(&json!(""))
-          .as_str()
-          .expect("Unable to deserialize 'apiKey value'")
-          .to_owned(),
-      );
-      let seed_ratio = edit_indexer_params.seed_ratio.unwrap_or_else(|| {
-        if let Some(seed_ratio_field) = seed_ratio_field_option {
-          return seed_ratio_field
-            .get("value")
-            .unwrap_or(&json!(""))
-            .as_str()
-            .expect("Unable to deserialize 'seedCriteria.seedRatio value'")
-            .to_owned();
-        }
-
-        String::new()
-      });
-      let tags = if edit_indexer_params.clear_tags {
-        vec![]
-      } else {
-        edit_indexer_params.tags.unwrap_or(
-          detailed_indexer_body["tags"]
-            .as_array()
-            .expect("Unable to deserialize 'tags'")
-            .iter()
-            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
-            .collect(),
-        )
-      };
-      let priority = edit_indexer_params.priority.unwrap_or(priority);
-
-      (
-        name,
-        enable_rss,
-        enable_automatic_search,
-        enable_interactive_search,
-        url,
-        api_key,
-        seed_ratio,
-        tags,
-        priority,
-      )
-    };
-
-    *detailed_indexer_body.get_mut("name").unwrap() = json!(name);
-    *detailed_indexer_body.get_mut("priority").unwrap() = json!(priority);
-    *detailed_indexer_body.get_mut("enableRss").unwrap() = json!(enable_rss);
-    *detailed_indexer_body
-      .get_mut("enableAutomaticSearch")
-      .unwrap() = json!(enable_automatic_search);
-    *detailed_indexer_body
-      .get_mut("enableInteractiveSearch")
-      .unwrap() = json!(enable_interactive_search);
-    *detailed_indexer_body
-      .get_mut("fields")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|field| field["name"] == "baseUrl")
-      .unwrap()
-      .get_mut("value")
-      .unwrap() = json!(url);
-    *detailed_indexer_body
-      .get_mut("fields")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|field| field["name"] == "apiKey")
-      .unwrap()
-      .get_mut("value")
-      .unwrap() = json!(api_key);
-    *detailed_indexer_body.get_mut("tags").unwrap() = json!(tags);
-    let seed_ratio_field_option = detailed_indexer_body
-      .get_mut("fields")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|field| field["name"] == "seedCriteria.seedRatio");
-    if let Some(seed_ratio_field) = seed_ratio_field_option {
-      seed_ratio_field
-        .as_object_mut()
-        .unwrap()
-        .insert("value".to_string(), json!(seed_ratio));
-    }
-
-    debug!("Edit indexer body: {detailed_indexer_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Put,
-        Some(detailed_indexer_body),
-        Some(format!("/{id}")),
-        Some("forceSave=true".to_owned()),
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn edit_sonarr_series(&mut self, mut edit_series_params: EditSeriesParams) -> Result<()> {
-    info!("Editing Sonarr series");
-    if let Some(tag_input_str) = edit_series_params.tag_input_string.as_ref() {
-      let tag_ids_vec = self.extract_and_add_sonarr_tag_ids_vec(tag_input_str).await;
-      edit_series_params.tags = Some(tag_ids_vec);
-    }
-    let series_id = edit_series_params.series_id;
-    let detail_event = SonarrEvent::GetSeriesDetails(series_id);
-    let event = SonarrEvent::EditSeries(EditSeriesParams::default());
-    info!("Fetching series details for series with ID: {series_id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{series_id}")),
-        None,
-      )
-      .await;
-
-    let mut response = String::new();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
-        response = detailed_series_body.to_string()
-      })
-      .await?;
-
-    info!("Constructing edit series body");
-
-    let mut detailed_series_body: Value = serde_json::from_str(&response)?;
-    let (
-      monitored,
-      use_season_folders,
-      series_type,
-      quality_profile_id,
-      language_profile_id,
-      root_folder_path,
-      tags,
-    ) = {
-      let monitored = edit_series_params.monitored.unwrap_or(
-        detailed_series_body["monitored"]
-          .as_bool()
-          .expect("Unable to deserialize 'monitored'"),
-      );
-      let use_season_folders = edit_series_params.use_season_folders.unwrap_or(
-        detailed_series_body["seasonFolder"]
-          .as_bool()
-          .expect("Unable to deserialize 'season_folder'"),
-      );
-      let series_type = edit_series_params
-        .series_type
-        .unwrap_or_else(|| {
-          serde_json::from_value(detailed_series_body["seriesType"].clone())
-            .expect("Unable to deserialize 'seriesType'")
-        })
-        .to_string();
-      let quality_profile_id = edit_series_params.quality_profile_id.unwrap_or_else(|| {
-        detailed_series_body["qualityProfileId"]
-          .as_i64()
-          .expect("Unable to deserialize 'qualityProfileId'")
-      });
-      let language_profile_id = edit_series_params.language_profile_id.unwrap_or_else(|| {
-        detailed_series_body["languageProfileId"]
-          .as_i64()
-          .expect("Unable to deserialize 'languageProfileId'")
-      });
-      let root_folder_path = edit_series_params.root_folder_path.unwrap_or_else(|| {
-        detailed_series_body["path"]
-          .as_str()
-          .expect("Unable to deserialize 'path'")
-          .to_owned()
-      });
-      let tags = if edit_series_params.clear_tags {
-        vec![]
-      } else {
-        edit_series_params.tags.unwrap_or(
-          detailed_series_body["tags"]
-            .as_array()
-            .expect("Unable to deserialize 'tags'")
-            .iter()
-            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
-            .collect(),
-        )
-      };
-
-      (
-        monitored,
-        use_season_folders,
-        series_type,
-        quality_profile_id,
-        language_profile_id,
-        root_folder_path,
-        tags,
-      )
-    };
-
-    *detailed_series_body.get_mut("monitored").unwrap() = json!(monitored);
-    *detailed_series_body.get_mut("seasonFolder").unwrap() = json!(use_season_folders);
-    *detailed_series_body.get_mut("seriesType").unwrap() = json!(series_type);
-    *detailed_series_body.get_mut("qualityProfileId").unwrap() = json!(quality_profile_id);
-    *detailed_series_body.get_mut("languageProfileId").unwrap() = json!(language_profile_id);
-    *detailed_series_body.get_mut("path").unwrap() = json!(root_folder_path);
-    *detailed_series_body.get_mut("tags").unwrap() = json!(tags);
-
-    debug!("Edit series body: {detailed_series_body:?}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Put,
-        Some(detailed_series_body),
-        Some(format!("/{series_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<Value, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn toggle_sonarr_season_monitoring(
-    &mut self,
-    series_id_season_number_tuple: (i64, i64),
-  ) -> Result<()> {
-    let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple);
-    let (series_id, season_number) = series_id_season_number_tuple;
-
-    let detail_event = SonarrEvent::GetSeriesDetails(series_id);
-    info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
-    info!("Fetching series details for series with ID: {series_id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{series_id}")),
-        None,
-      )
-      .await;
-
-    let mut response = String::new();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
-        response = detailed_series_body.to_string()
-      })
-      .await?;
-
-    info!("Constructing toggle season monitoring body");
-
-    match serde_json::from_str::<Value>(&response) {
-      Ok(mut detailed_series_body) => {
-        let monitored = detailed_series_body
-          .get("seasons")
-          .unwrap()
-          .as_array()
-          .unwrap()
-          .iter()
-          .find(|season| season["seasonNumber"] == season_number)
-          .unwrap()
-          .get("monitored")
-          .unwrap()
-          .as_bool()
-          .unwrap();
-
-        *detailed_series_body
-          .get_mut("seasons")
-          .unwrap()
-          .as_array_mut()
-          .unwrap()
-          .iter_mut()
-          .find(|season| season["seasonNumber"] == season_number)
-          .unwrap()
-          .get_mut("monitored")
-          .unwrap() = json!(!monitored);
-
-        debug!("Toggle season monitoring body: {detailed_series_body:?}");
-
-        let request_props = self
-          .request_props_from(
-            event,
-            RequestMethod::Put,
-            Some(detailed_series_body),
-            Some(format!("/{series_id}")),
-            None,
-          )
-          .await;
-
-        self
-          .handle_request::<Value, ()>(request_props, |_, _| ())
-          .await
-      }
-      Err(_) => {
-        warn!("Request for detailed series body was interrupted");
-        Ok(())
-      }
-    }
-  }
-
-  async fn get_all_sonarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
-    info!("Fetching Sonarr indexer settings");
-    let event = SonarrEvent::GetAllIndexerSettings;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), IndexerSettings>(request_props, |indexer_settings, mut app| {
-        if app.data.sonarr_data.indexer_settings.is_none() {
-          app.data.sonarr_data.indexer_settings = Some(indexer_settings);
-        } else {
-          debug!("Indexer Settings are being modified. Ignoring update...");
-        }
-      })
-      .await
-  }
-
-  async fn get_sonarr_healthcheck(&mut self) -> Result<()> {
-    info!("Performing Sonarr health check");
-    let event = SonarrEvent::HealthCheck;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_sonarr_blocklist(&mut self) -> Result<BlocklistResponse> {
-    info!("Fetching Sonarr blocklist");
-    let event = SonarrEvent::GetBlocklist;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), BlocklistResponse>(request_props, |blocklist_resp, mut app| {
-        if !matches!(
-          app.get_current_route(),
-          Route::Sonarr(ActiveSonarrBlock::BlocklistSortPrompt, _)
-        ) {
-          let mut blocklist_vec: Vec<BlocklistItem> = blocklist_resp
-            .records
-            .into_iter()
-            .map(|item| {
-              if let Some(series) = app
-                .data
-                .sonarr_data
-                .series
-                .items
-                .iter()
-                .find(|it| it.id == item.series_id)
-              {
-                BlocklistItem {
-                  series_title: Some(series.title.text.clone()),
-                  ..item
-                }
-              } else {
-                item
-              }
-            })
-            .collect();
-          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app.data.sonarr_data.blocklist.set_items(blocklist_vec);
-          app.data.sonarr_data.blocklist.apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_sonarr_downloads(&mut self) -> Result<DownloadsResponse> {
-    info!("Fetching Sonarr downloads");
-    let event = SonarrEvent::GetDownloads;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), DownloadsResponse>(request_props, |queue_response, mut app| {
-        app
-          .data
-          .sonarr_data
-          .downloads
-          .set_items(queue_response.records);
-      })
-      .await
-  }
-
-  async fn get_episodes(&mut self, series_id: i64) -> Result<Vec<Episode>> {
-    let event = SonarrEvent::GetEpisodes(series_id);
-    info!("Fetching episodes for Sonarr series with ID: {series_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("seriesId={series_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<Episode>>(request_props, |mut episode_vec, mut app| {
-        episode_vec.sort_by(|a, b| a.id.cmp(&b.id));
-        if !matches!(
-          app.get_current_route(),
-          Route::Sonarr(ActiveSonarrBlock::EpisodesSortPrompt, _)
-        ) {
-          if app.data.sonarr_data.season_details_modal.is_none() {
-            app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-          }
-
-          let season_episodes_vec = if !app.data.sonarr_data.seasons.is_empty() {
-            let season_number = app
-              .data
-              .sonarr_data
-              .seasons
-              .current_selection()
-              .season_number;
-
-            episode_vec
-              .into_iter()
-              .filter(|episode| episode.season_number == season_number)
-              .collect()
-          } else {
-            episode_vec
-          };
-
-          app
-            .data
-            .sonarr_data
-            .season_details_modal
-            .as_mut()
-            .unwrap()
-            .episodes
-            .set_items(season_episodes_vec);
-          app
-            .data
-            .sonarr_data
-            .season_details_modal
-            .as_mut()
-            .unwrap()
-            .episodes
-            .apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_episode_files(&mut self, series_id: i64) -> Result<Vec<EpisodeFile>> {
-    let event = SonarrEvent::GetEpisodeFiles(series_id);
-    info!("Fetching episodes files for Sonarr series with ID: {series_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("seriesId={series_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<EpisodeFile>>(request_props, |episode_file_vec, mut app| {
-        if app.data.sonarr_data.season_details_modal.is_none() {
-          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-        }
-
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_files
-          .set_items(episode_file_vec);
-      })
-      .await
-  }
-
-  async fn get_sonarr_episode_history(&mut self, episode_id: i64) -> Result<SonarrHistoryWrapper> {
-    info!("Fetching Sonarr history for episode with ID: {episode_id}");
-    let event = SonarrEvent::GetEpisodeHistory(episode_id);
-
-    let params =
-      format!("episodeId={episode_id}&pageSize=1000&sortDirection=descending&sortKey=date");
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
-      .await;
-
-    self
-      .handle_request::<(), SonarrHistoryWrapper>(request_props, |history_response, mut app| {
-        if app.data.sonarr_data.season_details_modal.is_none() {
-          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-        }
-
-        if app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .is_none()
-        {
-          app
-            .data
-            .sonarr_data
-            .season_details_modal
-            .as_mut()
-            .unwrap()
-            .episode_details_modal = Some(EpisodeDetailsModal::default());
-        }
-
-        let mut history_vec = history_response.records;
-        history_vec.sort_by(|a, b| a.id.cmp(&b.id));
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_history
-          .set_items(history_vec);
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_history
-          .apply_sorting_toggle(false);
-      })
-      .await
-  }
-
-  async fn get_episode_details(&mut self, episode_id: i64) -> Result<Episode> {
-    info!("Fetching Sonarr episode details");
-    let event = SonarrEvent::GetEpisodeDetails(episode_id);
-
-    info!("Fetching episode details for episode with ID: {episode_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{episode_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), Episode>(request_props, |episode_response, mut app| {
-        if app.cli_mode {
-          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-        }
-
-        if app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .expect("Season details modal is empty")
-          .episode_details_modal
-          .is_none()
-        {
-          app
-            .data
-            .sonarr_data
-            .season_details_modal
-            .as_mut()
-            .unwrap()
-            .episode_details_modal = Some(EpisodeDetailsModal::default());
-        }
-
-        let Episode {
-          id,
-          title,
-          air_date_utc,
-          overview,
-          has_file,
-          season_number,
-          episode_number,
-          episode_file,
-          ..
-        } = episode_response;
-        let status = get_episode_status(has_file, &app.data.sonarr_data.downloads.items, id);
-        let air_date = if let Some(air_date) = air_date_utc {
-          format!("{air_date}")
-        } else {
-          String::new()
-        };
-        let episode_details_modal = app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_details_modal
-          .as_mut()
-          .unwrap();
-        episode_details_modal.episode_details = ScrollableText::with_string(formatdoc!(
-          "
-            Title: {}
-            Season: {season_number}
-            Episode Number: {episode_number}
-            Air Date: {air_date}
-            Status: {status}
-            Description: {}",
-          title,
-          overview.unwrap_or_default(),
-        ));
-        if let Some(file) = episode_file {
-          let size = convert_to_gb(file.size);
-          episode_details_modal.file_details = formatdoc!(
-            "
-            Relative Path: {}
-            Absolute Path: {}
-            Size: {size:.2} GB
-            Language: {}
-            Date Added: {}",
-            file.relative_path,
-            file.path,
-            file.languages.first().unwrap_or(&Language::default()).name,
-            file.date_added,
-          );
-
-          if let Some(media_info) = file.media_info {
-            episode_details_modal.audio_details = formatdoc!(
-              "
-              Bitrate: {}
-              Channels: {:.1}
-              Codec: {}
-              Languages: {}
-              Stream Count: {}",
-              media_info.audio_bitrate,
-              media_info.audio_channels.as_f64().unwrap(),
-              media_info.audio_codec.unwrap_or_default(),
-              media_info.audio_languages.unwrap_or_default(),
-              media_info.audio_stream_count
-            );
-
-            episode_details_modal.video_details = formatdoc!(
-              "
-              Bit Depth: {}
-              Bitrate: {}
-              Codec: {}
-              FPS: {}
-              Resolution: {}
-              Scan Type: {}
-              Runtime: {}
-              Subtitles: {}",
-              media_info.video_bit_depth,
-              media_info.video_bitrate,
-              media_info.video_codec,
-              media_info.video_fps.as_f64().unwrap(),
-              media_info.resolution,
-              media_info.scan_type,
-              media_info.run_time,
-              media_info.subtitles.unwrap_or_default()
-            );
-          }
-        };
-      })
-      .await
-  }
-
-  async fn get_sonarr_host_config(&mut self) -> Result<HostConfig> {
-    info!("Fetching Sonarr host config");
-    let event = SonarrEvent::GetHostConfig;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), HostConfig>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_sonarr_history(&mut self, events: u64) -> Result<SonarrHistoryWrapper> {
-    info!("Fetching all Sonarr history events");
-    let event = SonarrEvent::GetHistory(events);
-
-    let params = format!("pageSize={}&sortDirection=descending&sortKey=date", events);
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
-      .await;
-
-    self
-      .handle_request::<(), SonarrHistoryWrapper>(request_props, |history_response, mut app| {
-        if !matches!(
-          app.get_current_route(),
-          Route::Sonarr(ActiveSonarrBlock::HistorySortPrompt, _)
-        ) {
-          let mut history_vec = history_response.records;
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app.data.sonarr_data.history.set_items(history_vec);
-          app.data.sonarr_data.history.apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_sonarr_indexers(&mut self) -> Result<Vec<Indexer>> {
-    info!("Fetching Sonarr indexers");
-    let event = SonarrEvent::GetIndexers;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Indexer>>(request_props, |indexers, mut app| {
-        app.data.sonarr_data.indexers.set_items(indexers);
-      })
-      .await
-  }
-
-  async fn get_sonarr_language_profiles(&mut self) -> Result<Vec<Language>> {
-    info!("Fetching Sonarr language profiles");
-    let event = SonarrEvent::GetLanguageProfiles;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Language>>(request_props, |language_profiles_vec, mut app| {
-        app.data.sonarr_data.language_profiles_map = language_profiles_vec
-          .into_iter()
-          .map(|language| (language.id, language.name))
-          .collect();
-      })
-      .await
-  }
-
-  async fn get_sonarr_logs(&mut self, events: u64) -> Result<LogResponse> {
-    info!("Fetching Sonarr logs");
-    let event = SonarrEvent::GetLogs(events);
-
-    let params = format!("pageSize={}&sortDirection=descending&sortKey=time", events);
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
-      .await;
-
-    self
-      .handle_request::<(), LogResponse>(request_props, |log_response, mut app| {
-        let mut logs = log_response.records;
-        logs.reverse();
-
-        let log_lines = logs
-          .into_iter()
-          .map(|log| {
-            if log.exception.is_some() {
-              HorizontallyScrollableText::from(format!(
-                "{}|{}|{}|{}|{}",
-                log.time,
-                log.level.to_uppercase(),
-                log.logger.as_ref().unwrap(),
-                log.exception_type.as_ref().unwrap(),
-                log.exception.as_ref().unwrap()
-              ))
-            } else {
-              HorizontallyScrollableText::from(format!(
-                "{}|{}|{}|{}",
-                log.time,
-                log.level.to_uppercase(),
-                log.logger.as_ref().unwrap(),
-                log.message.as_ref().unwrap()
-              ))
-            }
-          })
-          .collect();
-
-        app.data.sonarr_data.logs.set_items(log_lines);
-        app.data.sonarr_data.logs.scroll_to_bottom();
-      })
-      .await
-  }
-
-  async fn get_sonarr_diskspace(&mut self) -> Result<Vec<DiskSpace>> {
-    info!("Fetching Sonarr disk space");
-    let event = SonarrEvent::GetDiskSpace;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<DiskSpace>>(request_props, |disk_space_vec, mut app| {
-        app.data.sonarr_data.disk_space_vec = disk_space_vec;
-      })
-      .await
-  }
-
-  async fn get_sonarr_quality_profiles(&mut self) -> Result<Vec<QualityProfile>> {
-    info!("Fetching Sonarr quality profiles");
-    let event = SonarrEvent::GetQualityProfiles;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<QualityProfile>>(request_props, |quality_profiles, mut app| {
-        app.data.sonarr_data.quality_profile_map = quality_profiles
-          .into_iter()
-          .map(|profile| (profile.id, profile.name))
-          .collect();
-      })
-      .await
-  }
-
-  async fn get_queued_sonarr_events(&mut self) -> Result<Vec<QueueEvent>> {
-    info!("Fetching Sonarr queued events");
-    let event = SonarrEvent::GetQueuedEvents;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<QueueEvent>>(request_props, |queued_events_vec, mut app| {
-        app
-          .data
-          .sonarr_data
-          .queued_events
-          .set_items(queued_events_vec);
-      })
-      .await
-  }
-
-  async fn get_sonarr_root_folders(&mut self) -> Result<Vec<RootFolder>> {
-    info!("Fetching Sonarr root folders");
-    let event = SonarrEvent::GetRootFolders;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<RootFolder>>(request_props, |root_folders, mut app| {
-        app.data.sonarr_data.root_folders.set_items(root_folders);
-      })
-      .await
-  }
-
-  async fn get_episode_releases(&mut self, episode_id: i64) -> Result<Vec<SonarrRelease>> {
-    let event = SonarrEvent::GetEpisodeReleases(episode_id);
-    info!("Fetching releases for episode with ID: {episode_id}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("episodeId={episode_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<SonarrRelease>>(request_props, |release_vec, mut app| {
-        if app.data.sonarr_data.season_details_modal.is_none() {
-          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-        }
-
-        if app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_details_modal
-          .is_none()
-        {
-          app
-            .data
-            .sonarr_data
-            .season_details_modal
-            .as_mut()
-            .unwrap()
-            .episode_details_modal = Some(EpisodeDetailsModal::default());
-        }
-
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_details_modal
-          .as_mut()
-          .unwrap()
-          .episode_releases
-          .set_items(release_vec);
-      })
-      .await
-  }
-
-  async fn get_season_releases(
-    &mut self,
-    series_season_id_tuple: (i64, i64),
-  ) -> Result<Vec<SonarrRelease>> {
-    let event = SonarrEvent::GetSeasonReleases(series_season_id_tuple);
-    let (series_id, season_number) = series_season_id_tuple;
-    info!("Fetching releases for series with ID: {series_id} and season number: {season_number}");
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!(
-          "seriesId={}&seasonNumber={}",
-          series_id, season_number
-        )),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<SonarrRelease>>(request_props, |release_vec, mut app| {
-        if app.data.sonarr_data.season_details_modal.is_none() {
-          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-        }
-
-        let season_releases_vec = release_vec
-          .into_iter()
-          .filter(|release| release.full_season)
-          .collect();
-
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .season_releases
-          .set_items(season_releases_vec);
-      })
-      .await
-  }
-
-  async fn get_sonarr_season_history(
-    &mut self,
-    series_season_id_tuple: (i64, i64),
-  ) -> Result<Vec<SonarrHistoryItem>> {
-    let event = SonarrEvent::GetSeasonHistory(series_season_id_tuple);
-    let (series_id, season_number) = series_season_id_tuple;
-    info!("Fetching history for series with ID: {series_id} and season number: {season_number}");
-
-    let params = format!("seriesId={series_id}&seasonNumber={season_number}",);
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
-      .await;
-
-    self
-      .handle_request::<(), Vec<SonarrHistoryItem>>(request_props, |history_items, mut app| {
-        if app.data.sonarr_data.season_details_modal.is_none() {
-          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
-        }
-
-        let mut history_vec = history_items;
-        history_vec.sort_by(|a, b| a.id.cmp(&b.id));
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .season_history
-          .set_items(history_vec);
-        app
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_mut()
-          .unwrap()
-          .season_history
-          .apply_sorting_toggle(false);
-      })
-      .await
-  }
-
-  async fn get_sonarr_security_config(&mut self) -> Result<SecurityConfig> {
-    info!("Fetching Sonarr security config");
-    let event = SonarrEvent::GetSecurityConfig;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), SecurityConfig>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_series_details(&mut self, series_id: i64) -> Result<Series> {
-    info!("Fetching details for Sonarr series with ID: {series_id}");
-    let event = SonarrEvent::GetSeriesDetails(series_id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{series_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), Series>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn get_sonarr_series_history(&mut self, series_id: i64) -> Result<Vec<SonarrHistoryItem>> {
-    info!("Fetching Sonarr series history for series with ID: {series_id}");
-    let event = SonarrEvent::GetSeriesHistory(series_id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("seriesId={series_id}")),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<SonarrHistoryItem>>(request_props, |mut history_vec, mut app| {
-        if app.data.sonarr_data.series_history.is_none() {
-          app.data.sonarr_data.series_history = Some(StatefulTable::default());
-        }
-
-        if !matches!(
-          app.get_current_route(),
-          Route::Sonarr(ActiveSonarrBlock::SeriesHistorySortPrompt, _)
-        ) {
-          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app
-            .data
-            .sonarr_data
-            .series_history
-            .as_mut()
-            .unwrap()
-            .set_items(history_vec);
-          app
-            .data
-            .sonarr_data
-            .series_history
-            .as_mut()
-            .unwrap()
-            .apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn list_series(&mut self) -> Result<Vec<Series>> {
-    info!("Fetching Sonarr library");
-    let event = SonarrEvent::ListSeries;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Series>>(request_props, |mut series_vec, mut app| {
-        if !matches!(
-          app.get_current_route(),
-          Route::Sonarr(ActiveSonarrBlock::SeriesSortPrompt, _)
-        ) {
-          series_vec.sort_by(|a, b| a.id.cmp(&b.id));
-          app.data.sonarr_data.series.set_items(series_vec);
-          app.data.sonarr_data.series.apply_sorting_toggle(false);
-        }
-      })
-      .await
-  }
-
-  async fn get_sonarr_status(&mut self) -> Result<SystemStatus> {
-    info!("Fetching Sonarr system status");
-    let event = SonarrEvent::GetStatus;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), SystemStatus>(request_props, |system_status, mut app| {
-        app.data.sonarr_data.version = system_status.version;
-        app.data.sonarr_data.start_time = system_status.start_time;
-      })
-      .await
-  }
-
-  async fn get_sonarr_tags(&mut self) -> Result<Vec<Tag>> {
-    info!("Fetching Sonarr tags");
-    let event = SonarrEvent::GetTags;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Tag>>(request_props, |tags_vec, mut app| {
-        app.data.sonarr_data.tags_map = tags_vec
-          .into_iter()
-          .map(|tag| (tag.id, tag.label))
-          .collect();
-      })
-      .await
-  }
-
-  async fn get_sonarr_tasks(&mut self) -> Result<Vec<SonarrTask>> {
-    info!("Fetching Sonarr tasks");
-    let event = SonarrEvent::GetTasks;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<SonarrTask>>(request_props, |tasks_vec, mut app| {
-        app.data.sonarr_data.tasks.set_items(tasks_vec);
-      })
-      .await
-  }
-
-  async fn get_sonarr_updates(&mut self) -> Result<Vec<Update>> {
-    info!("Fetching Sonarr updates");
-    let event = SonarrEvent::GetUpdates;
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
-      .await;
-
-    self
-      .handle_request::<(), Vec<Update>>(request_props, |updates_vec, mut app| {
-        let latest_installed = if updates_vec
-          .iter()
-          .any(|update| update.latest && update.installed_on.is_some())
-        {
-          "already".to_owned()
-        } else {
-          "not".to_owned()
-        };
-        let updates = updates_vec
-          .into_iter()
-          .map(|update| {
-            let install_status = if update.installed_on.is_some() {
-              if update.installed {
-                "(Currently Installed)".to_owned()
-              } else {
-                "(Previously Installed)".to_owned()
-              }
-            } else {
-              String::new()
-            };
-            let vec_to_bullet_points = |vec: Vec<String>| {
-              vec
-                .iter()
-                .map(|change| format!("  * {change}"))
-                .collect::<Vec<String>>()
-                .join("\n")
-            };
-
-            let mut update_info = formatdoc!(
-              "{} - {} {install_status}
-              {}",
-              update.version,
-              update.release_date,
-              "-".repeat(200)
-            );
-
-            if let Some(new_changes) = update.changes.new {
-              let changes = vec_to_bullet_points(new_changes);
-              update_info = formatdoc!(
-                "{update_info}
-              New:
-              {changes}"
-              )
-            }
-
-            if let Some(fixes) = update.changes.fixed {
-              let fixes = vec_to_bullet_points(fixes);
-              update_info = formatdoc!(
-                "{update_info}
-              Fixed:
-              {fixes}"
-              );
-            }
-
-            update_info
-          })
-          .reduce(|version_1, version_2| format!("{version_1}\n\n\n{version_2}"))
-          .unwrap();
-
-        app.data.sonarr_data.updates = ScrollableText::with_string(formatdoc!(
-          "The latest version of Sonarr is {latest_installed} installed
-          
-          {updates}"
-        ));
-      })
-      .await
-  }
-
-  async fn mark_sonarr_history_item_as_failed(&mut self, history_item_id: i64) -> Result<Value> {
-    info!("Marking the Sonarr history item with ID: {history_item_id} as 'failed'");
-    let event = SonarrEvent::MarkHistoryItemAsFailed(history_item_id);
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Post,
-        None,
-        Some(format!("/{history_item_id}")),
-        None,
-      )
-      .await;
-
-    self
-      .handle_request::<(), Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn search_sonarr_series(&mut self, query: String) -> Result<Vec<AddSeriesSearchResult>> {
-    info!("Searching for specific Sonarr series");
-    let event = SonarrEvent::SearchNewSeries(String::new());
-
-    let request_props = self
-      .request_props_from(
-        event,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        Some(format!("term={}", encode(&query))),
-      )
-      .await;
-
-    self
-      .handle_request::<(), Vec<AddSeriesSearchResult>>(request_props, |series_vec, mut app| {
-        if series_vec.is_empty() {
-          app.pop_and_push_navigation_stack(ActiveSonarrBlock::AddSeriesEmptySearchResults.into());
-        } else if let Some(add_searched_seriess) = app.data.sonarr_data.add_searched_series.as_mut()
-        {
-          add_searched_seriess.set_items(series_vec);
-        } else {
-          let mut add_searched_seriess = StatefulTable::default();
-          add_searched_seriess.set_items(series_vec);
-          app.data.sonarr_data.add_searched_series = Some(add_searched_seriess);
-        }
-      })
-      .await
-  }
-
-  async fn start_sonarr_task(&mut self, task: SonarrTaskName) -> Result<Value> {
-    let event = SonarrEvent::StartTask(task);
-    let task_name = task.to_string();
-    info!("Starting Sonarr task: {task_name}");
-
-    let body = CommandBody { name: task_name };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn test_sonarr_indexer(&mut self, indexer_id: i64) -> Result<Value> {
-    let detail_event = SonarrEvent::GetIndexers;
-    let event = SonarrEvent::TestIndexer(indexer_id);
-    info!("Testing Sonarr indexer with ID: {indexer_id}");
-
-    info!("Fetching indexer details for indexer with ID: {indexer_id}");
-
-    let request_props = self
-      .request_props_from(
-        detail_event,
-        RequestMethod::Get,
-        None::<()>,
-        Some(format!("/{indexer_id}")),
-        None,
-      )
-      .await;
-
-    let mut test_body: Value = Value::default();
-
-    self
-      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
-        test_body = detailed_indexer_body;
-      })
-      .await?;
-
-    info!("Testing indexer");
-
-    let mut request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(test_body), None, None)
-      .await;
-    request_props.ignore_status_code = true;
-
-    self
-      .handle_request::<Value, Value>(request_props, |test_results, mut app| {
-        if test_results.as_object().is_none() {
-          app.data.sonarr_data.indexer_test_errors = Some(
-            test_results.as_array().unwrap()[0]
-              .get("errorMessage")
-              .unwrap()
-              .to_string(),
-          );
-        } else {
-          app.data.sonarr_data.indexer_test_errors = Some(String::new());
-        };
-      })
-      .await
-  }
-
-  async fn test_all_sonarr_indexers(&mut self) -> Result<Vec<IndexerTestResult>> {
-    info!("Testing all Sonarr indexers");
-    let event = SonarrEvent::TestAllIndexers;
-
-    let mut request_props = self
-      .request_props_from(event, RequestMethod::Post, None, None, None)
-      .await;
-    request_props.ignore_status_code = true;
-
-    self
-      .handle_request::<(), Vec<IndexerTestResult>>(request_props, |test_results, mut app| {
-        let mut test_all_indexer_results = StatefulTable::default();
-        let indexers = app.data.sonarr_data.indexers.items.clone();
-        let modal_test_results = test_results
-          .iter()
-          .map(|result| {
-            let name = indexers
-              .iter()
-              .filter(|&indexer| indexer.id == result.id)
-              .map(|indexer| indexer.name.clone())
-              .nth(0)
-              .unwrap_or_default();
-            let validation_failures = result
-              .validation_failures
-              .iter()
-              .map(|failure| {
-                format!(
-                  "Failure for field '{}': {}",
-                  failure.property_name, failure.error_message
-                )
-              })
-              .collect::<Vec<String>>()
-              .join(", ");
-
-            IndexerTestResultModalItem {
-              name: name.unwrap_or_default(),
-              is_valid: result.is_valid,
-              validation_failures: validation_failures.into(),
-            }
-          })
-          .collect();
-        test_all_indexer_results.set_items(modal_test_results);
-        app.data.sonarr_data.indexer_test_all_results = Some(test_all_indexer_results);
-      })
-      .await
-  }
-
-  async fn toggle_sonarr_episode_monitoring(&mut self, episode_id: i64) -> Result<()> {
-    let event = SonarrEvent::ToggleEpisodeMonitoring(episode_id);
-    let detail_event = SonarrEvent::GetEpisodeDetails(0);
-
-    let monitored = {
-      info!("Fetching episode details for episode id: {episode_id}");
-      let request_props = self
-        .request_props_from(
-          detail_event,
-          RequestMethod::Get,
-          None::<()>,
-          Some(format!("/{episode_id}")),
-          None,
-        )
-        .await;
-
-      let mut monitored = false;
-
-      self
-        .handle_request::<(), Value>(request_props, |detailed_episode_body, _| {
-          monitored = detailed_episode_body
-            .get("monitored")
-            .unwrap()
-            .as_bool()
-            .unwrap();
-        })
-        .await?;
-
-      monitored
-    };
-
-    info!("Toggling monitoring for episode id: {episode_id}");
-
-    let body = MonitorEpisodeBody {
-      episode_ids: vec![episode_id],
-      monitored: !monitored,
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Put, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<MonitorEpisodeBody, ()>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn trigger_automatic_series_search(&mut self, series_id: i64) -> Result<Value> {
-    let event = SonarrEvent::TriggerAutomaticSeriesSearch(series_id);
-    info!("Searching indexers for series with ID: {series_id}");
-
-    let body = SonarrCommandBody {
-      name: "SeriesSearch".to_owned(),
-      series_id: Some(series_id),
-      ..SonarrCommandBody::default()
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn trigger_automatic_season_search(
-    &mut self,
-    series_season_id_tuple: (i64, i64),
-  ) -> Result<Value> {
-    let event = SonarrEvent::TriggerAutomaticSeasonSearch(series_season_id_tuple);
-    let (series_id, season_number) = series_season_id_tuple;
-    info!("Searching indexers for series with ID: {series_id} and season number: {season_number}");
-
-    let body = SonarrCommandBody {
-      name: "SeasonSearch".to_owned(),
-      season_number: Some(season_number),
-      series_id: Some(series_id),
-      ..SonarrCommandBody::default()
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn trigger_automatic_episode_search(&mut self, episode_id: i64) -> Result<Value> {
-    let event = SonarrEvent::TriggerAutomaticEpisodeSearch(episode_id);
-    info!("Searching indexers for episode with ID: {episode_id}");
-
-    let body = SonarrCommandBody {
-      name: "EpisodeSearch".to_owned(),
-      episode_ids: Some(vec![episode_id]),
-      ..SonarrCommandBody::default()
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_all_series(&mut self) -> Result<Value> {
-    info!("Updating all series");
-    let event = SonarrEvent::UpdateAllSeries;
-    let body = SonarrCommandBody {
-      name: "RefreshSeries".to_owned(),
-      ..SonarrCommandBody::default()
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_and_scan_series(&mut self, series_id: i64) -> Result<Value> {
-    let event = SonarrEvent::UpdateAndScanSeries(series_id);
-    info!("Updating and scanning series with ID: {series_id}");
-    let body = SonarrCommandBody {
-      name: "RefreshSeries".to_owned(),
-      series_id: Some(series_id),
-      ..SonarrCommandBody::default()
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn update_sonarr_downloads(&mut self) -> Result<Value> {
-    info!("Updating Sonarr downloads");
-    let event = SonarrEvent::UpdateDownloads;
-    let body = CommandBody {
-      name: "RefreshMonitoredDownloads".to_owned(),
-    };
-
-    let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
-      .await;
-
-    self
-      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
-      .await
-  }
-
-  async fn extract_and_add_sonarr_tag_ids_vec(&mut self, edit_tags: &str) -> Vec<i64> {
-    let missing_tags_vec = {
-      let tags_map = &self.app.lock().await.data.sonarr_data.tags_map;
-      edit_tags
-        .split(',')
-        .filter(|&tag| {
-          !tag.is_empty() && tags_map.get_by_right(tag.to_lowercase().trim()).is_none()
-        })
-        .collect::<Vec<&str>>()
-    };
-
-    for tag in missing_tags_vec {
-      self
-        .add_sonarr_tag(tag.trim().to_owned())
-        .await
-        .expect("Unable to add tag");
-    }
-
-    let app = self.app.lock().await;
-    edit_tags
-      .split(',')
-      .filter(|tag| !tag.is_empty())
-      .map(|tag| {
-        *app
-          .data
-          .sonarr_data
-          .tags_map
-          .get_by_right(tag.to_lowercase().trim())
-          .unwrap()
-      })
-      .collect()
-  }
-}
-
-fn get_episode_status(has_file: bool, downloads_vec: &[DownloadRecord], episode_id: i64) -> String {
-  if !has_file {
-    let default_episode_id = Number::from(-1i64);
-    if let Some(download) = downloads_vec.iter().find(|&download| {
-      download
-        .episode_id
-        .as_ref()
-        .unwrap_or(&default_episode_id)
-        .as_i64()
-        .unwrap()
-        == episode_id
-    }) {
-      if download.status == DownloadStatus::Downloading {
-        return "Downloading".to_owned();
-      }
-
-      if download.status == DownloadStatus::Completed {
-        return "Awaiting Import".to_owned();
-      }
-    }
-
-    return "Missing".to_owned();
-  }
-
-  "Downloaded".to_owned()
-}
diff --git a/src/network/sonarr_network/blocklist/mod.rs b/src/network/sonarr_network/blocklist/mod.rs
new file mode 100644
index 0000000..648b853
--- /dev/null
+++ b/src/network/sonarr_network/blocklist/mod.rs
@@ -0,0 +1,112 @@
+use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+use crate::models::sonarr_models::{BlocklistItem, BlocklistResponse};
+use crate::models::Route;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::{json, Value};
+
+#[cfg(test)]
+#[path = "sonarr_blocklist_network_tests.rs"]
+mod sonarr_blocklist_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn clear_sonarr_blocklist(&mut self) -> Result<()> {
+    info!("Clearing Sonarr blocklist");
+    let event = SonarrEvent::ClearBlocklist;
+
+    let ids = self
+      .app
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .blocklist
+      .items
+      .iter()
+      .map(|item| item.id)
+      .collect::<Vec<i64>>();
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        Some(json!({"ids": ids})),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn delete_sonarr_blocklist_item(
+    &mut self,
+    blocklist_item_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteBlocklistItem(blocklist_item_id);
+    info!("Deleting Sonarr blocklist item for item with id: {blocklist_item_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{blocklist_item_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_blocklist(
+    &mut self,
+  ) -> Result<BlocklistResponse> {
+    info!("Fetching Sonarr blocklist");
+    let event = SonarrEvent::GetBlocklist;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), BlocklistResponse>(request_props, |blocklist_resp, mut app| {
+        if !matches!(
+          app.get_current_route(),
+          Route::Sonarr(ActiveSonarrBlock::BlocklistSortPrompt, _)
+        ) {
+          let mut blocklist_vec: Vec<BlocklistItem> = blocklist_resp
+            .records
+            .into_iter()
+            .map(|item| {
+              if let Some(series) = app
+                .data
+                .sonarr_data
+                .series
+                .items
+                .iter()
+                .find(|it| it.id == item.series_id)
+              {
+                BlocklistItem {
+                  series_title: Some(series.title.text.clone()),
+                  ..item
+                }
+              } else {
+                item
+              }
+            })
+            .collect();
+          blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app.data.sonarr_data.blocklist.set_items(blocklist_vec);
+          app.data.sonarr_data.blocklist.apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/blocklist/sonarr_blocklist_network_tests.rs b/src/network/sonarr_network/blocklist/sonarr_blocklist_network_tests.rs
new file mode 100644
index 0000000..75ec0c8
--- /dev/null
+++ b/src/network/sonarr_network/blocklist/sonarr_blocklist_network_tests.rs
@@ -0,0 +1,270 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use crate::models::sonarr_models::{BlocklistItem, BlocklistResponse, Series, SonarrSerdeable};
+  use crate::models::stateful_table::SortOption;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    blocklist_item, series,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::{json, Number};
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_clear_sonarr_blocklist_event() {
+    let blocklist_items = vec![
+      BlocklistItem {
+        id: 1,
+        ..blocklist_item()
+      },
+      BlocklistItem {
+        id: 2,
+        ..blocklist_item()
+      },
+      BlocklistItem {
+        id: 3,
+        ..blocklist_item()
+      },
+    ];
+    let expected_request_json = json!({ "ids": [1, 2, 3]});
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      Some(expected_request_json),
+      None,
+      None,
+      SonarrEvent::ClearBlocklist,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .blocklist
+      .set_items(blocklist_items);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::ClearBlocklist)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_blocklist_item_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteBlocklistItem(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .blocklist
+      .set_items(vec![blocklist_item()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteBlocklistItem(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_sonarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
+    let blocklist_json = json!({"records": [{
+        "seriesId": 1007,
+        "episodeIds": [42020],
+        "sourceTitle": "z series",
+        "languages": [{ "id": 1, "name": "English" }],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "NZBgeek (Prowlarr)",
+        "message": "test message",
+        "id": 123
+    },
+    {
+        "seriesId": 2001,
+        "episodeIds": [42018],
+        "sourceTitle": "A Series",
+        "languages": [{ "id": 1, "name": "English" }],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "NZBgeek (Prowlarr)",
+        "message": "test message",
+        "id": 456
+    }]});
+    let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
+    let mut expected_blocklist = vec![
+      BlocklistItem {
+        id: 123,
+        series_id: 1007,
+        series_title: Some("Z Series".into()),
+        source_title: "z series".into(),
+        episode_ids: vec![Number::from(42020)],
+        ..blocklist_item()
+      },
+      BlocklistItem {
+        id: 456,
+        series_id: 2001,
+        source_title: "A Series".into(),
+        episode_ids: vec![Number::from(42018)],
+        ..blocklist_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(blocklist_json),
+      None,
+      SonarrEvent::GetBlocklist,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1007,
+        title: "Z Series".into(),
+        ..series()
+      }]);
+    app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
+        a.source_title
+          .to_lowercase()
+          .cmp(&b.source_title.to_lowercase())
+      };
+      expected_blocklist.sort_by(cmp_fn);
+
+      let blocklist_sort_option = SortOption {
+        name: "Source Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .blocklist
+        .sorting(vec![blocklist_sort_option]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::BlocklistResponse(blocklist) = network
+      .handle_sonarr_event(SonarrEvent::GetBlocklist)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.blocklist.items,
+        expected_blocklist
+      );
+      assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
+      assert_eq!(blocklist, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_blocklist_event_no_op_when_user_is_selecting_sort_options() {
+    let blocklist_json = json!({"records": [{
+        "seriesId": 1007,
+        "episodeIds": [42020],
+        "sourceTitle": "z series",
+        "languages": [{ "id": 1, "name": "English" }],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "NZBgeek (Prowlarr)",
+        "message": "test message",
+        "id": 123
+    },
+    {
+        "seriesId": 2001,
+        "episodeIds": [42018],
+        "sourceTitle": "A Series",
+        "languages": [{ "id": 1, "name": "English" }],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+        "date": "2024-02-10T07:28:45Z",
+        "protocol": "usenet",
+        "indexer": "NZBgeek (Prowlarr)",
+        "message": "test message",
+        "id": 456
+    }]});
+    let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(blocklist_json),
+      None,
+      SonarrEvent::GetBlocklist,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::BlocklistSortPrompt.into());
+    let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
+      a.source_title
+        .to_lowercase()
+        .cmp(&b.source_title.to_lowercase())
+    };
+    let blocklist_sort_option = SortOption {
+      name: "Source Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .blocklist
+      .sorting(vec![blocklist_sort_option]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::BlocklistResponse(blocklist) = network
+      .handle_sonarr_event(SonarrEvent::GetBlocklist)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc.lock().await.data.sonarr_data.blocklist.is_empty());
+      assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
+      assert_eq!(blocklist, response);
+    }
+  }
+}
diff --git a/src/network/sonarr_network/downloads/mod.rs b/src/network/sonarr_network/downloads/mod.rs
new file mode 100644
index 0000000..2d78edc
--- /dev/null
+++ b/src/network/sonarr_network/downloads/mod.rs
@@ -0,0 +1,81 @@
+use crate::models::servarr_models::CommandBody;
+use crate::models::sonarr_models::DownloadsResponse;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "sonarr_downloads_network_tests.rs"]
+mod sonarr_downloads_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn delete_sonarr_download(
+    &mut self,
+    download_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteDownload(download_id);
+    info!("Deleting Sonarr download for download with id: {download_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{download_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_downloads(
+    &mut self,
+    count: u64,
+  ) -> Result<DownloadsResponse> {
+    info!("Fetching Sonarr downloads");
+    let event = SonarrEvent::GetDownloads(count);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("pageSize={count}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), DownloadsResponse>(request_props, |queue_response, mut app| {
+        app
+          .data
+          .sonarr_data
+          .downloads
+          .set_items(queue_response.records);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn update_sonarr_downloads(
+    &mut self,
+  ) -> Result<Value> {
+    info!("Updating Sonarr downloads");
+    let event = SonarrEvent::UpdateDownloads;
+    let body = CommandBody {
+      name: "RefreshMonitoredDownloads".to_owned(),
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/downloads/sonarr_downloads_network_tests.rs b/src/network/sonarr_network/downloads/sonarr_downloads_network_tests.rs
new file mode 100644
index 0000000..4500b45
--- /dev/null
+++ b/src/network/sonarr_network/downloads/sonarr_downloads_network_tests.rs
@@ -0,0 +1,113 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::sonarr_models::{DownloadsResponse, SonarrSerdeable};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    download_record, downloads_response,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_download_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteDownload(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .downloads
+      .set_items(vec![download_record()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteDownload(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_downloads_event() {
+    let downloads_response_json = json!({
+      "records": [{
+        "title": "Test Download Title",
+        "status": "downloading",
+        "id": 1,
+        "episodeId": 1,
+        "size": 3543348019f64,
+        "sizeleft": 1771674009f64,
+        "outputPath": "/nfs/tv/Test show/season 1/",
+        "indexer": "kickass torrents",
+        "downloadClient": "transmission",
+      }]
+    });
+    let response: DownloadsResponse =
+      serde_json::from_value(downloads_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(downloads_response_json),
+      None,
+      SonarrEvent::GetDownloads(500),
+      None,
+      Some("pageSize=500"),
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::DownloadsResponse(downloads) = network
+      .handle_sonarr_event(SonarrEvent::GetDownloads(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.downloads.items,
+        downloads_response().records
+      );
+      assert_eq!(downloads, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_sonarr_downloads_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshMonitoredDownloads"
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::UpdateDownloads,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::UpdateDownloads)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/sonarr_network/history/mod.rs b/src/network/sonarr_network/history/mod.rs
new file mode 100644
index 0000000..20e1fff
--- /dev/null
+++ b/src/network/sonarr_network/history/mod.rs
@@ -0,0 +1,63 @@
+use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+use crate::models::sonarr_models::SonarrHistoryWrapper;
+use crate::models::Route;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "sonarr_history_network_tests.rs"]
+mod sonarr_history_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn get_sonarr_history(
+    &mut self,
+    events: u64,
+  ) -> Result<SonarrHistoryWrapper> {
+    info!("Fetching all Sonarr history events");
+    let event = SonarrEvent::GetHistory(events);
+
+    let params = format!("pageSize={events}&sortDirection=descending&sortKey=date");
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
+      .await;
+
+    self
+      .handle_request::<(), SonarrHistoryWrapper>(request_props, |history_response, mut app| {
+        if !matches!(
+          app.get_current_route(),
+          Route::Sonarr(ActiveSonarrBlock::HistorySortPrompt, _)
+        ) {
+          let mut history_vec = history_response.records;
+          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app.data.sonarr_data.history.set_items(history_vec);
+          app.data.sonarr_data.history.apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn mark_sonarr_history_item_as_failed(
+    &mut self,
+    history_item_id: i64,
+  ) -> Result<Value> {
+    info!("Marking the Sonarr history item with ID: {history_item_id} as 'failed'");
+    let event = SonarrEvent::MarkHistoryItemAsFailed(history_item_id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        None,
+        Some(format!("/{history_item_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/history/sonarr_history_network_tests.rs b/src/network/sonarr_network/history/sonarr_history_network_tests.rs
new file mode 100644
index 0000000..aa5476f
--- /dev/null
+++ b/src/network/sonarr_network/history/sonarr_history_network_tests.rs
@@ -0,0 +1,210 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use crate::models::sonarr_models::{SonarrHistoryItem, SonarrHistoryWrapper, SonarrSerdeable};
+  use crate::models::stateful_table::SortOption;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::history_item;
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_sonarr_history_event(#[values(true, false)] use_custom_sorting: bool) {
+    let history_json = json!({"records": [{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]});
+    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
+    let mut expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetHistory(500),
+      None,
+      Some("pageSize=500&sortDirection=descending&sortKey=date"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.history.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
+        a.source_title
+          .text
+          .to_lowercase()
+          .cmp(&b.source_title.text.to_lowercase())
+      };
+      expected_history_items.sort_by(cmp_fn);
+
+      let history_sort_option = SortOption {
+        name: "Source Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .history
+        .sorting(vec![history_sort_option]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
+      .handle_sonarr_event(SonarrEvent::GetHistory(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.history.items,
+        expected_history_items
+      );
+      assert!(app_arc.lock().await.data.sonarr_data.history.sort_asc);
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_history_event_no_op_when_user_is_selecting_sort_options() {
+    let history_json = json!({"records": [{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]});
+    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetHistory(500),
+      None,
+      Some("pageSize=500&sortDirection=descending&sortKey=date"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.history.sort_asc = true;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::HistorySortPrompt.into());
+    let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
+      a.source_title
+        .text
+        .to_lowercase()
+        .cmp(&b.source_title.text.to_lowercase())
+    };
+    let history_sort_option = SortOption {
+      name: "Source Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .history
+      .sorting(vec![history_sort_option]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
+      .handle_sonarr_event(SonarrEvent::GetHistory(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc.lock().await.data.sonarr_data.history.is_empty());
+      assert!(app_arc.lock().await.data.sonarr_data.history.sort_asc);
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_mark_sonarr_history_item_as_failed_event() {
+    let expected_history_item_id = 1;
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      None,
+      Some(json!({})),
+      None,
+      SonarrEvent::MarkHistoryItemAsFailed(expected_history_item_id),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::MarkHistoryItemAsFailed(
+        expected_history_item_id
+      ))
+      .await
+      .is_ok());
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/sonarr_network/indexers/mod.rs b/src/network/sonarr_network/indexers/mod.rs
new file mode 100644
index 0000000..ed19639
--- /dev/null
+++ b/src/network/sonarr_network/indexers/mod.rs
@@ -0,0 +1,394 @@
+use crate::models::servarr_data::modals::IndexerTestResultModalItem;
+use crate::models::servarr_models::{EditIndexerParams, Indexer, IndexerTestResult};
+use crate::models::sonarr_models::IndexerSettings;
+use crate::models::stateful_table::StatefulTable;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info};
+use serde_json::{json, Value};
+
+#[cfg(test)]
+#[path = "sonarr_indexers_network_tests.rs"]
+mod sonarr_indexers_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn delete_sonarr_indexer(
+    &mut self,
+    indexer_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteIndexer(indexer_id);
+    info!("Deleting Sonarr indexer for indexer with id: {indexer_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{indexer_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn edit_all_sonarr_indexer_settings(
+    &mut self,
+    params: IndexerSettings,
+  ) -> Result<Value> {
+    info!("Updating Sonarr indexer settings");
+    let event = SonarrEvent::EditAllIndexerSettings(IndexerSettings::default());
+    debug!("Indexer settings body: {params:?}");
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Put, Some(params), None, None)
+      .await;
+
+    self
+      .handle_request::<IndexerSettings, Value>(request_props, |_, _| {})
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn edit_sonarr_indexer(
+    &mut self,
+    mut edit_indexer_params: EditIndexerParams,
+  ) -> Result<()> {
+    if let Some(tag_input_str) = edit_indexer_params.tag_input_string.as_ref() {
+      let tag_ids_vec = self.extract_and_add_sonarr_tag_ids_vec(tag_input_str).await;
+      edit_indexer_params.tags = Some(tag_ids_vec);
+    }
+    let detail_event = SonarrEvent::GetIndexers;
+    let event = SonarrEvent::EditIndexer(EditIndexerParams::default());
+    let id = edit_indexer_params.indexer_id;
+    info!("Updating Sonarr indexer with ID: {id}");
+    info!("Fetching indexer details for indexer with ID: {id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
+        response = detailed_indexer_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing edit indexer body");
+
+    let mut detailed_indexer_body: Value = serde_json::from_str(&response)?;
+
+    let (
+      name,
+      enable_rss,
+      enable_automatic_search,
+      enable_interactive_search,
+      url,
+      api_key,
+      seed_ratio,
+      tags,
+      priority,
+    ) = {
+      let priority = detailed_indexer_body["priority"]
+        .as_i64()
+        .expect("Unable to deserialize 'priority'");
+      let seed_ratio_field_option = detailed_indexer_body["fields"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .find(|field| field["name"] == "seedCriteria.seedRatio");
+      let name = edit_indexer_params.name.unwrap_or(
+        detailed_indexer_body["name"]
+          .as_str()
+          .expect("Unable to deserialize 'name'")
+          .to_owned(),
+      );
+      let enable_rss = edit_indexer_params.enable_rss.unwrap_or(
+        detailed_indexer_body["enableRss"]
+          .as_bool()
+          .expect("Unable to deserialize 'enableRss'"),
+      );
+      let enable_automatic_search = edit_indexer_params.enable_automatic_search.unwrap_or(
+        detailed_indexer_body["enableAutomaticSearch"]
+          .as_bool()
+          .expect("Unable to deserialize 'enableAutomaticSearch"),
+      );
+      let enable_interactive_search = edit_indexer_params.enable_interactive_search.unwrap_or(
+        detailed_indexer_body["enableInteractiveSearch"]
+          .as_bool()
+          .expect("Unable to deserialize 'enableInteractiveSearch'"),
+      );
+      let url = edit_indexer_params.url.unwrap_or(
+        detailed_indexer_body["fields"]
+          .as_array()
+          .expect("Unable to deserialize 'fields'")
+          .iter()
+          .find(|field| field["name"] == "baseUrl")
+          .expect("Field 'baseUrl' was not found in the 'fields' array")
+          .get("value")
+          .unwrap_or(&json!(""))
+          .as_str()
+          .expect("Unable to deserialize 'baseUrl value'")
+          .to_owned(),
+      );
+      let api_key = edit_indexer_params.api_key.unwrap_or(
+        detailed_indexer_body["fields"]
+          .as_array()
+          .expect("Unable to deserialize 'fields'")
+          .iter()
+          .find(|field| field["name"] == "apiKey")
+          .expect("Field 'apiKey' was not found in the 'fields' array")
+          .get("value")
+          .unwrap_or(&json!(""))
+          .as_str()
+          .expect("Unable to deserialize 'apiKey value'")
+          .to_owned(),
+      );
+      let seed_ratio = edit_indexer_params.seed_ratio.unwrap_or_else(|| {
+        if let Some(seed_ratio_field) = seed_ratio_field_option {
+          return seed_ratio_field
+            .get("value")
+            .unwrap_or(&json!(""))
+            .as_str()
+            .expect("Unable to deserialize 'seedCriteria.seedRatio value'")
+            .to_owned();
+        }
+
+        String::new()
+      });
+      let tags = if edit_indexer_params.clear_tags {
+        vec![]
+      } else {
+        edit_indexer_params.tags.unwrap_or(
+          detailed_indexer_body["tags"]
+            .as_array()
+            .expect("Unable to deserialize 'tags'")
+            .iter()
+            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
+            .collect(),
+        )
+      };
+      let priority = edit_indexer_params.priority.unwrap_or(priority);
+
+      (
+        name,
+        enable_rss,
+        enable_automatic_search,
+        enable_interactive_search,
+        url,
+        api_key,
+        seed_ratio,
+        tags,
+        priority,
+      )
+    };
+
+    *detailed_indexer_body.get_mut("name").unwrap() = json!(name);
+    *detailed_indexer_body.get_mut("priority").unwrap() = json!(priority);
+    *detailed_indexer_body.get_mut("enableRss").unwrap() = json!(enable_rss);
+    *detailed_indexer_body
+      .get_mut("enableAutomaticSearch")
+      .unwrap() = json!(enable_automatic_search);
+    *detailed_indexer_body
+      .get_mut("enableInteractiveSearch")
+      .unwrap() = json!(enable_interactive_search);
+    *detailed_indexer_body
+      .get_mut("fields")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|field| field["name"] == "baseUrl")
+      .unwrap()
+      .get_mut("value")
+      .unwrap() = json!(url);
+    *detailed_indexer_body
+      .get_mut("fields")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|field| field["name"] == "apiKey")
+      .unwrap()
+      .get_mut("value")
+      .unwrap() = json!(api_key);
+    *detailed_indexer_body.get_mut("tags").unwrap() = json!(tags);
+    let seed_ratio_field_option = detailed_indexer_body
+      .get_mut("fields")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|field| field["name"] == "seedCriteria.seedRatio");
+    if let Some(seed_ratio_field) = seed_ratio_field_option {
+      seed_ratio_field
+        .as_object_mut()
+        .unwrap()
+        .insert("value".to_string(), json!(seed_ratio));
+    }
+
+    debug!("Edit indexer body: {detailed_indexer_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Put,
+        Some(detailed_indexer_body),
+        Some(format!("/{id}")),
+        Some("forceSave=true".to_owned()),
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_all_sonarr_indexer_settings(
+    &mut self,
+  ) -> Result<IndexerSettings> {
+    info!("Fetching Sonarr indexer settings");
+    let event = SonarrEvent::GetAllIndexerSettings;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), IndexerSettings>(request_props, |indexer_settings, mut app| {
+        if app.data.sonarr_data.indexer_settings.is_none() {
+          app.data.sonarr_data.indexer_settings = Some(indexer_settings);
+        } else {
+          debug!("Indexer Settings are being modified. Ignoring update...");
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_indexers(
+    &mut self,
+  ) -> Result<Vec<Indexer>> {
+    info!("Fetching Sonarr indexers");
+    let event = SonarrEvent::GetIndexers;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Indexer>>(request_props, |indexers, mut app| {
+        app.data.sonarr_data.indexers.set_items(indexers);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn test_sonarr_indexer(
+    &mut self,
+    indexer_id: i64,
+  ) -> Result<Value> {
+    let detail_event = SonarrEvent::GetIndexers;
+    let event = SonarrEvent::TestIndexer(indexer_id);
+    info!("Testing Sonarr indexer with ID: {indexer_id}");
+
+    info!("Fetching indexer details for indexer with ID: {indexer_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{indexer_id}")),
+        None,
+      )
+      .await;
+
+    let mut test_body: Value = Value::default();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_indexer_body, _| {
+        test_body = detailed_indexer_body;
+      })
+      .await?;
+
+    info!("Testing indexer");
+
+    let mut request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(test_body), None, None)
+      .await;
+    request_props.ignore_status_code = true;
+
+    self
+      .handle_request::<Value, Value>(request_props, |test_results, mut app| {
+        if test_results.as_object().is_none() {
+          app.data.sonarr_data.indexer_test_errors = Some(
+            test_results.as_array().unwrap()[0]
+              .get("errorMessage")
+              .unwrap()
+              .to_string(),
+          );
+        } else {
+          app.data.sonarr_data.indexer_test_errors = Some(String::new());
+        };
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn test_all_sonarr_indexers(
+    &mut self,
+  ) -> Result<Vec<IndexerTestResult>> {
+    info!("Testing all Sonarr indexers");
+    let event = SonarrEvent::TestAllIndexers;
+
+    let mut request_props = self
+      .request_props_from(event, RequestMethod::Post, None, None, None)
+      .await;
+    request_props.ignore_status_code = true;
+
+    self
+      .handle_request::<(), Vec<IndexerTestResult>>(request_props, |test_results, mut app| {
+        let mut test_all_indexer_results = StatefulTable::default();
+        let indexers = app.data.sonarr_data.indexers.items.clone();
+        let modal_test_results = test_results
+          .iter()
+          .map(|result| {
+            let name = indexers
+              .iter()
+              .filter(|&indexer| indexer.id == result.id)
+              .map(|indexer| indexer.name.clone())
+              .nth(0)
+              .unwrap_or_default();
+            let validation_failures = result
+              .validation_failures
+              .iter()
+              .map(|failure| {
+                format!(
+                  "Failure for field '{}': {}",
+                  failure.property_name, failure.error_message
+                )
+              })
+              .collect::<Vec<String>>()
+              .join(", ");
+
+            IndexerTestResultModalItem {
+              name: name.unwrap_or_default(),
+              is_valid: result.is_valid,
+              validation_failures: validation_failures.into(),
+            }
+          })
+          .collect();
+        test_all_indexer_results.set_items(modal_test_results);
+        app.data.sonarr_data.indexer_test_all_results = Some(test_all_indexer_results);
+      })
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/indexers/sonarr_indexers_network_tests.rs b/src/network/sonarr_network/indexers/sonarr_indexers_network_tests.rs
new file mode 100644
index 0000000..4a4ed73
--- /dev/null
+++ b/src/network/sonarr_network/indexers/sonarr_indexers_network_tests.rs
@@ -0,0 +1,930 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::modals::IndexerTestResultModalItem;
+  use crate::models::servarr_models::{EditIndexerParams, Indexer, IndexerTestResult};
+  use crate::models::sonarr_models::SonarrSerdeable;
+  use crate::models::HorizontallyScrollableText;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    indexer, indexer_settings,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use bimap::BiMap;
+  use mockito::Matcher;
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_indexer_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteIndexer(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .indexers
+      .set_items(vec![indexer()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteIndexer(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_all_indexer_settings_event() {
+    let indexer_settings_json = json!({
+        "id": 1,
+        "minimumAge": 1,
+        "maximumSize": 12345,
+        "retention": 1,
+        "rssSyncInterval": 60
+    });
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Put,
+      Some(indexer_settings_json),
+      None,
+      None,
+      SonarrEvent::EditAllIndexerSettings(indexer_settings()),
+      None,
+      None,
+    )
+    .await;
+
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditAllIndexerSettings(indexer_settings()))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_sonarr_indexer_event() {
+    let expected_edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.3",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_sonarr_indexer_event_does_not_overwrite_tags_vec_if_tag_input_string_is_none(
+  ) {
+    let expected_edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tags: Some(vec![1, 2]),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.3",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_sonarr_indexer_event_does_not_add_seed_ratio_when_seed_ratio_field_is_none_in_details(
+  ) {
+    let expected_edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_sonarr_indexer_event_populates_the_seed_ratio_value_when_seed_ratio_field_is_present_in_details(
+  ) {
+    let expected_edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      name: Some("Test Update".to_owned()),
+      enable_rss: Some(false),
+      enable_automatic_search: Some(false),
+      enable_interactive_search: Some(false),
+      url: Some("https://localhost:9696/1/".to_owned()),
+      api_key: Some("test1234".to_owned()),
+      seed_ratio: Some("1.3".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      priority: Some(0),
+      ..EditIndexerParams::default()
+    };
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let expected_indexer_edit_body_json = json!({
+        "enableRss": false,
+        "enableAutomaticSearch": false,
+        "enableInteractiveSearch": false,
+        "name": "Test Update",
+        "priority": 0,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://localhost:9696/1/",
+            },
+            {
+                "name": "apiKey",
+                "value": "test1234",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.3",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_indexer_edit_body_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_sonarr_indexer_event_defaults_to_previous_values() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      ..EditIndexerParams::default()
+    };
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json.clone()),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          SonarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(indexer_details_json))
+      .create_async()
+      .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_sonarr_indexer_event_clears_tags_when_clear_tags_is_true() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1, 2],
+        "id": 1
+    });
+    let expected_edit_indexer_body = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "priority": 1,
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [],
+        "id": 1
+    });
+    let edit_indexer_params = EditIndexerParams {
+      indexer_id: 1,
+      clear_tags: true,
+      ..EditIndexerParams::default()
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1?forceSave=true",
+          SonarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_edit_indexer_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditIndexer(edit_indexer_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_indexers_event() {
+    let indexers_response_json = json!([{
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "supportsRss": true,
+        "supportsSearch": true,
+        "protocol": "torrent",
+        "priority": 25,
+        "downloadClientId": 0,
+        "name": "Test Indexer",
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "implementationName": "Torznab",
+        "implementation": "Torznab",
+        "configContract": "TorznabSettings",
+        "tags": [1],
+        "id": 1
+    }]);
+    let response: Vec<Indexer> = serde_json::from_value(indexers_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexers_response_json),
+      None,
+      SonarrEvent::GetIndexers,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Indexers(indexers) = network
+      .handle_sonarr_event(SonarrEvent::GetIndexers)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.indexers.items,
+        vec![indexer()]
+      );
+      assert_eq!(indexers, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_test_sonarr_indexer_event_error() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let response_json = json!([
+    {
+        "isWarning": false,
+        "propertyName": "",
+        "errorMessage": "test failure",
+        "severity": "error"
+    }]);
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json.clone()),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_test_server = server
+      .mock(
+        "POST",
+        format!("/api/v3{}", SonarrEvent::TestIndexer(1).resource()).as_str(),
+      )
+      .with_status(400)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(indexer_details_json.clone()))
+      .with_body(response_json.to_string())
+      .create_async()
+      .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .indexers
+      .set_items(vec![indexer()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Value(value) = network
+      .handle_sonarr_event(SonarrEvent::TestIndexer(1))
+      .await
+      .unwrap()
+    {
+      async_details_server.assert_async().await;
+      async_test_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.indexer_test_errors,
+        Some("\"test failure\"".to_owned())
+      );
+      assert_eq!(value, response_json)
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_test_sonarr_indexer_event_success() {
+    let indexer_details_json = json!({
+        "enableRss": true,
+        "enableAutomaticSearch": true,
+        "enableInteractiveSearch": true,
+        "name": "Test Indexer",
+        "fields": [
+            {
+                "name": "baseUrl",
+                "value": "https://test.com",
+            },
+            {
+                "name": "apiKey",
+                "value": "",
+            },
+            {
+                "name": "seedCriteria.seedRatio",
+                "value": "1.2",
+            },
+        ],
+        "tags": [1],
+        "id": 1
+    });
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(indexer_details_json.clone()),
+      None,
+      SonarrEvent::GetIndexers,
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_test_server = server
+      .mock(
+        "POST",
+        format!("/api/v3{}", SonarrEvent::TestIndexer(1).resource()).as_str(),
+      )
+      .with_status(200)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(indexer_details_json.clone()))
+      .with_body("{}")
+      .create_async()
+      .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .indexers
+      .set_items(vec![indexer()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Value(value) = network
+      .handle_sonarr_event(SonarrEvent::TestIndexer(1))
+      .await
+      .unwrap()
+    {
+      async_details_server.assert_async().await;
+      async_test_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.indexer_test_errors,
+        Some(String::new())
+      );
+      assert_eq!(value, json!({}));
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_test_all_sonarr_indexers_event() {
+    let indexers = vec![
+      Indexer {
+        id: 1,
+        name: Some("Test 1".to_owned()),
+        ..Indexer::default()
+      },
+      Indexer {
+        id: 2,
+        name: Some("Test 2".to_owned()),
+        ..Indexer::default()
+      },
+    ];
+    let indexer_test_results_modal_items = vec![
+			IndexerTestResultModalItem {
+				name: "Test 1".to_owned(),
+				is_valid: true,
+				validation_failures: HorizontallyScrollableText::default(),
+			},
+			IndexerTestResultModalItem {
+				name: "Test 2".to_owned(),
+				is_valid: false,
+				validation_failures: "Failure for field 'test field 1': test error message, Failure for field 'test field 2': test error message 2".into(),
+			},
+		];
+    let response_json = json!([
+    {
+      "id": 1,
+      "isValid": true,
+      "validationFailures": []
+    },
+    {
+      "id": 2,
+      "isValid": false,
+      "validationFailures": [
+          {
+              "propertyName": "test field 1",
+              "errorMessage": "test error message",
+              "severity": "error"
+          },
+          {
+              "propertyName": "test field 2",
+              "errorMessage": "test error message 2",
+              "severity": "error"
+          },
+      ]
+    }]);
+    let response: Vec<IndexerTestResult> = serde_json::from_value(response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      None,
+      Some(response_json),
+      Some(400),
+      SonarrEvent::TestAllIndexers,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .indexers
+      .set_items(indexers);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::IndexerTestResults(results) = network
+      .handle_sonarr_event(SonarrEvent::TestAllIndexers)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .indexer_test_all_results
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .indexer_test_all_results
+          .as_ref()
+          .unwrap()
+          .items,
+        indexer_test_results_modal_items
+      );
+      assert_eq!(results, response);
+    }
+  }
+}
diff --git a/src/network/sonarr_network/library/episodes/mod.rs b/src/network/sonarr_network/library/episodes/mod.rs
new file mode 100644
index 0000000..80c4557
--- /dev/null
+++ b/src/network/sonarr_network/library/episodes/mod.rs
@@ -0,0 +1,498 @@
+use crate::models::servarr_data::sonarr::modals::{EpisodeDetailsModal, SeasonDetailsModal};
+use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+use crate::models::servarr_models::Language;
+use crate::models::sonarr_models::{
+  DownloadRecord, DownloadStatus, Episode, EpisodeFile, MonitorEpisodeBody, SonarrCommandBody,
+  SonarrHistoryWrapper, SonarrRelease,
+};
+use crate::models::{Route, ScrollableText};
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use crate::utils::convert_to_gb;
+use anyhow::Result;
+use indoc::formatdoc;
+use log::info;
+use serde_json::{Number, Value};
+
+#[cfg(test)]
+#[path = "sonarr_episodes_network_tests.rs"]
+mod sonarr_episodes_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn delete_sonarr_episode_file(
+    &mut self,
+    episode_file_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteEpisodeFile(episode_file_id);
+    info!("Deleting Sonarr episode file for episode file with id: {episode_file_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{episode_file_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_episodes(
+    &mut self,
+    series_id: i64,
+  ) -> Result<Vec<Episode>> {
+    let event = SonarrEvent::GetEpisodes(series_id);
+    info!("Fetching episodes for Sonarr series with ID: {series_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("seriesId={series_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<Episode>>(request_props, |mut episode_vec, mut app| {
+        episode_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        if !matches!(
+          app.get_current_route(),
+          Route::Sonarr(ActiveSonarrBlock::EpisodesSortPrompt, _)
+        ) {
+          if app.data.sonarr_data.season_details_modal.is_none() {
+            app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+          }
+
+          let season_episodes_vec = if !app.data.sonarr_data.seasons.is_empty() {
+            let season_number = app
+              .data
+              .sonarr_data
+              .seasons
+              .current_selection()
+              .season_number;
+
+            episode_vec
+              .into_iter()
+              .filter(|episode| episode.season_number == season_number)
+              .collect()
+          } else {
+            episode_vec
+          };
+
+          app
+            .data
+            .sonarr_data
+            .season_details_modal
+            .as_mut()
+            .unwrap()
+            .episodes
+            .set_items(season_episodes_vec);
+          app
+            .data
+            .sonarr_data
+            .season_details_modal
+            .as_mut()
+            .unwrap()
+            .episodes
+            .apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_episode_files(
+    &mut self,
+    series_id: i64,
+  ) -> Result<Vec<EpisodeFile>> {
+    let event = SonarrEvent::GetEpisodeFiles(series_id);
+    info!("Fetching episodes files for Sonarr series with ID: {series_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("seriesId={series_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<EpisodeFile>>(request_props, |episode_file_vec, mut app| {
+        if app.data.sonarr_data.season_details_modal.is_none() {
+          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+        }
+
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_files
+          .set_items(episode_file_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_episode_history(
+    &mut self,
+    episode_id: i64,
+  ) -> Result<SonarrHistoryWrapper> {
+    info!("Fetching Sonarr history for episode with ID: {episode_id}");
+    let event = SonarrEvent::GetEpisodeHistory(episode_id);
+
+    let params =
+      format!("episodeId={episode_id}&pageSize=1000&sortDirection=descending&sortKey=date");
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
+      .await;
+
+    self
+      .handle_request::<(), SonarrHistoryWrapper>(request_props, |history_response, mut app| {
+        if app.data.sonarr_data.season_details_modal.is_none() {
+          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+        }
+
+        if app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .is_none()
+        {
+          app
+            .data
+            .sonarr_data
+            .season_details_modal
+            .as_mut()
+            .unwrap()
+            .episode_details_modal = Some(EpisodeDetailsModal::default());
+        }
+
+        let mut history_vec = history_response.records;
+        history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_history
+          .set_items(history_vec);
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_history
+          .apply_sorting_toggle(false);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_episode_details(
+    &mut self,
+    episode_id: i64,
+  ) -> Result<Episode> {
+    info!("Fetching Sonarr episode details");
+    let event = SonarrEvent::GetEpisodeDetails(episode_id);
+
+    info!("Fetching episode details for episode with ID: {episode_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{episode_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), Episode>(request_props, |episode_response, mut app| {
+        if app.cli_mode {
+          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+        }
+
+        if app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .expect("Season details modal is empty")
+          .episode_details_modal
+          .is_none()
+        {
+          app
+            .data
+            .sonarr_data
+            .season_details_modal
+            .as_mut()
+            .unwrap()
+            .episode_details_modal = Some(EpisodeDetailsModal::default());
+        }
+
+        let Episode {
+          id,
+          title,
+          air_date_utc,
+          overview,
+          has_file,
+          season_number,
+          episode_number,
+          episode_file,
+          ..
+        } = episode_response;
+        let status = get_episode_status(has_file, &app.data.sonarr_data.downloads.items, id);
+        let air_date = if let Some(air_date) = air_date_utc {
+          format!("{air_date}")
+        } else {
+          String::new()
+        };
+        let episode_details_modal = app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_details_modal
+          .as_mut()
+          .unwrap();
+        episode_details_modal.episode_details = ScrollableText::with_string(formatdoc!(
+          "
+            Title: {}
+            Season: {season_number}
+            Episode Number: {episode_number}
+            Air Date: {air_date}
+            Status: {status}
+            Description: {}",
+          title,
+          overview.unwrap_or_default(),
+        ));
+        if let Some(file) = episode_file {
+          let size = convert_to_gb(file.size);
+          episode_details_modal.file_details = formatdoc!(
+            "
+            Relative Path: {}
+            Absolute Path: {}
+            Size: {size:.2} GB
+            Language: {}
+            Date Added: {}",
+            file.relative_path,
+            file.path,
+            file.languages.first().unwrap_or(&Language::default()).name,
+            file.date_added,
+          );
+
+          if let Some(media_info) = file.media_info {
+            episode_details_modal.audio_details = formatdoc!(
+              "
+              Bitrate: {}
+              Channels: {:.1}
+              Codec: {}
+              Languages: {}
+              Stream Count: {}",
+              media_info.audio_bitrate,
+              media_info.audio_channels.as_f64().unwrap(),
+              media_info.audio_codec.unwrap_or_default(),
+              media_info.audio_languages.unwrap_or_default(),
+              media_info.audio_stream_count
+            );
+
+            episode_details_modal.video_details = formatdoc!(
+              "
+              Bit Depth: {}
+              Bitrate: {}
+              Codec: {}
+              FPS: {}
+              Resolution: {}
+              Scan Type: {}
+              Runtime: {}
+              Subtitles: {}",
+              media_info.video_bit_depth,
+              media_info.video_bitrate,
+              media_info.video_codec.unwrap_or_default(),
+              media_info.video_fps.as_f64().unwrap(),
+              media_info.resolution,
+              media_info.scan_type,
+              media_info.run_time,
+              media_info.subtitles.unwrap_or_default()
+            );
+          }
+        };
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_episode_releases(
+    &mut self,
+    episode_id: i64,
+  ) -> Result<Vec<SonarrRelease>> {
+    let event = SonarrEvent::GetEpisodeReleases(episode_id);
+    info!("Fetching releases for episode with ID: {episode_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("episodeId={episode_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<SonarrRelease>>(request_props, |release_vec, mut app| {
+        if app.data.sonarr_data.season_details_modal.is_none() {
+          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+        }
+
+        if app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_details_modal
+          .is_none()
+        {
+          app
+            .data
+            .sonarr_data
+            .season_details_modal
+            .as_mut()
+            .unwrap()
+            .episode_details_modal = Some(EpisodeDetailsModal::default());
+        }
+
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_details_modal
+          .as_mut()
+          .unwrap()
+          .episode_releases
+          .set_items(release_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn toggle_sonarr_episode_monitoring(
+    &mut self,
+    episode_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::ToggleEpisodeMonitoring(episode_id);
+    let detail_event = SonarrEvent::GetEpisodeDetails(0);
+
+    let monitored = {
+      info!("Fetching episode details for episode id: {episode_id}");
+      let request_props = self
+        .request_props_from(
+          detail_event,
+          RequestMethod::Get,
+          None::<()>,
+          Some(format!("/{episode_id}")),
+          None,
+        )
+        .await;
+
+      let mut monitored = false;
+
+      self
+        .handle_request::<(), Value>(request_props, |detailed_episode_body, _| {
+          monitored = detailed_episode_body
+            .get("monitored")
+            .unwrap()
+            .as_bool()
+            .unwrap();
+        })
+        .await?;
+
+      monitored
+    };
+
+    info!("Toggling monitoring for episode id: {episode_id}");
+
+    let body = MonitorEpisodeBody {
+      episode_ids: vec![episode_id],
+      monitored: !monitored,
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Put, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<MonitorEpisodeBody, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn trigger_automatic_episode_search(
+    &mut self,
+    episode_id: i64,
+  ) -> Result<Value> {
+    let event = SonarrEvent::TriggerAutomaticEpisodeSearch(episode_id);
+    info!("Searching indexers for episode with ID: {episode_id}");
+
+    let body = SonarrCommandBody {
+      name: "EpisodeSearch".to_owned(),
+      episode_ids: Some(vec![episode_id]),
+      ..SonarrCommandBody::default()
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
+
+fn get_episode_status(has_file: bool, downloads_vec: &[DownloadRecord], episode_id: i64) -> String {
+  if !has_file {
+    let default_episode_id = Number::from(-1i64);
+    if let Some(download) = downloads_vec.iter().find(|&download| {
+      download
+        .episode_id
+        .as_ref()
+        .unwrap_or(&default_episode_id)
+        .as_i64()
+        .unwrap()
+        == episode_id
+    }) {
+      if download.status == DownloadStatus::Downloading {
+        return "Downloading".to_owned();
+      }
+
+      if download.status == DownloadStatus::Completed {
+        return "Awaiting Import".to_owned();
+      }
+    }
+
+    return "Missing".to_owned();
+  }
+
+  "Downloaded".to_owned()
+}
diff --git a/src/network/sonarr_network/library/episodes/sonarr_episodes_network_tests.rs b/src/network/sonarr_network/library/episodes/sonarr_episodes_network_tests.rs
new file mode 100644
index 0000000..83a5d2a
--- /dev/null
+++ b/src/network/sonarr_network/library/episodes/sonarr_episodes_network_tests.rs
@@ -0,0 +1,1377 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::sonarr::modals::{EpisodeDetailsModal, SeasonDetailsModal};
+  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use crate::models::sonarr_models::{
+    DownloadRecord, DownloadStatus, Episode, MonitorEpisodeBody, Season, Series, SonarrHistoryItem,
+    SonarrHistoryWrapper, SonarrSerdeable,
+  };
+  use crate::models::stateful_table::SortOption;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::library::episodes::get_episode_status;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    episode, episode_file, history_item, release, EPISODE_JSON,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use indoc::formatdoc;
+  use mockito::Matcher;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::{json, Number};
+  use std::slice;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_episode_file_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteEpisodeFile(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.season_details_modal =
+      Some(SeasonDetailsModal::default());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteEpisodeFile(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_episodes_event(#[values(true, false)] use_custom_sorting: bool) {
+    let episode_1 = Episode {
+      title: "z test".to_owned(),
+      episode_file: None,
+      ..episode()
+    };
+    let episode_2 = Episode {
+      id: 2,
+      title: "A test".to_owned(),
+      episode_file_id: 2,
+      season_number: 2,
+      episode_number: 2,
+      episode_file: None,
+      ..episode()
+    };
+    let episode_3 = Episode {
+      id: 3,
+      title: "A test".to_owned(),
+      episode_file_id: 3,
+      season_number: 1,
+      episode_number: 2,
+      episode_file: None,
+      ..episode()
+    };
+    let expected_episodes = vec![episode_1.clone(), episode_2.clone(), episode_3.clone()];
+    let mut expected_sorted_episodes = vec![episode_1.clone(), episode_3.clone()];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([episode_1, episode_2, episode_3])),
+      None,
+      SonarrEvent::GetEpisodes(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &Episode, b: &Episode| a.title.to_lowercase().cmp(&b.title.to_lowercase());
+      expected_sorted_episodes.sort_by(cmp_fn);
+      let title_sort_option = SortOption {
+        name: "Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      season_details_modal
+        .episodes
+        .sorting(vec![title_sort_option]);
+    }
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .seasons
+      .set_items(vec![Season {
+        season_number: 1,
+        ..Season::default()
+      }]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episodes(episodes) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episodes
+          .items,
+        expected_sorted_episodes
+      );
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episodes
+          .sort_asc
+      );
+      assert_eq!(episodes, expected_episodes);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episodes_event_empty_seasons_table_returns_all_episodes_by_default() {
+    let episode_1 = Episode {
+      title: "z test".to_owned(),
+      episode_file: None,
+      ..episode()
+    };
+    let episode_2 = Episode {
+      id: 2,
+      title: "A test".to_owned(),
+      episode_file_id: 2,
+      season_number: 2,
+      episode_number: 2,
+      episode_file: None,
+      ..episode()
+    };
+    let episode_3 = Episode {
+      id: 3,
+      title: "A test".to_owned(),
+      episode_file_id: 3,
+      season_number: 1,
+      episode_number: 2,
+      episode_file: None,
+      ..episode()
+    };
+    let expected_episodes = vec![episode_1.clone(), episode_2.clone(), episode_3.clone()];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([episode_1, episode_2, episode_3])),
+      None,
+      SonarrEvent::GetEpisodes(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.sort_asc = true;
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episodes(episodes) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episodes
+          .items,
+        expected_episodes
+      );
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episodes
+          .sort_asc
+      );
+      assert_eq!(episodes, expected_episodes);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episodes_event_empty_season_details_modal() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([episode()])),
+      None,
+      SonarrEvent::GetEpisodes(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episodes(episodes) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episodes
+          .items,
+        vec![episode()]
+      );
+      assert_eq!(episodes, vec![episode()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episodes_event_no_op_while_user_is_selecting_sort_options_on_table() {
+    let episodes_json = json!([
+      {
+          "id": 2,
+          "seriesId": 1,
+          "tvdbId": 1234,
+          "episodeFileId": 2,
+          "seasonNumber": 2,
+          "episodeNumber": 2,
+          "title": "Something cool",
+          "airDateUtc": "2024-02-10T07:28:45Z",
+          "overview": "Okay so this one time at band camp...",
+          "hasFile": true,
+          "monitored": true
+      },
+      {
+          "id": 1,
+          "seriesId": 1,
+          "tvdbId": 1234,
+          "episodeFileId": 1,
+          "seasonNumber": 1,
+          "episodeNumber": 1,
+          "title": "Something cool",
+          "airDateUtc": "2024-02-10T07:28:45Z",
+          "overview": "Okay so this one time at band camp...",
+          "hasFile": true,
+          "monitored": true
+      }
+    ]);
+    let episode_1 = Episode {
+      episode_file: None,
+      ..episode()
+    };
+    let episode_2 = Episode {
+      id: 2,
+      episode_file_id: 2,
+      season_number: 2,
+      episode_number: 2,
+      episode_file: None,
+      ..episode()
+    };
+    let mut expected_episodes = vec![episode_2.clone(), episode_1.clone()];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(episodes_json),
+      None,
+      SonarrEvent::GetEpisodes(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::EpisodesSortPrompt.into());
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.sort_asc = true;
+    let cmp_fn = |a: &Episode, b: &Episode| a.title.to_lowercase().cmp(&b.title.to_lowercase());
+    expected_episodes.sort_by(cmp_fn);
+    let title_sort_option = SortOption {
+      name: "Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    season_details_modal
+      .episodes
+      .sorting(vec![title_sort_option]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episodes(episodes) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .episodes
+        .is_empty());
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episodes
+          .sort_asc
+      );
+      assert_eq!(episodes, expected_episodes);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_files_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([episode_file()])),
+      None,
+      SonarrEvent::GetEpisodeFiles(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.season_details_modal =
+      Some(SeasonDetailsModal::default());
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::EpisodeFiles(episode_files) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeFiles(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_files
+          .items,
+        vec![episode_file()]
+      );
+      assert_eq!(episode_files, vec![episode_file()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_files_event_empty_season_details_modal() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([episode_file()])),
+      None,
+      SonarrEvent::GetEpisodeFiles(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::EpisodeFiles(episode_files) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeFiles(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .season_details_modal
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_files
+          .items,
+        vec![episode_file()]
+      );
+      assert_eq!(episode_files, vec![episode_file()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_episode_history_event() {
+    let history_json = json!({"records": [{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]});
+    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
+    let expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetEpisodeHistory(1),
+      None,
+      Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.season_details_modal =
+      Some(SeasonDetailsModal::default());
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .season_details_modal
+      .as_mut()
+      .unwrap()
+      .episodes
+      .set_items(vec![episode()]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .season_details_modal
+      .as_mut()
+      .unwrap()
+      .episode_details_modal = Some(EpisodeDetailsModal::default());
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .season_details_modal
+      .as_mut()
+      .unwrap()
+      .episode_details_modal
+      .as_mut()
+      .unwrap()
+      .episode_history
+      .sort_asc = true;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_history
+          .items,
+        expected_history_items
+      );
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_history
+          .sort_asc
+      );
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_episode_history_event_empty_episode_details_modal() {
+    let history_json = json!({"records": [{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]});
+    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
+    let expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetEpisodeHistory(1),
+      None,
+      Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.season_details_modal =
+      Some(SeasonDetailsModal::default());
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .season_details_modal
+      .as_mut()
+      .unwrap()
+      .episodes
+      .set_items(vec![episode()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_history
+          .items,
+        expected_history_items
+      );
+      assert!(
+        !app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_history
+          .sort_asc
+      );
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_episode_history_event_empty_season_details_modal() {
+    let history_json = json!({"records": [{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]});
+    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
+    let expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetEpisodeHistory(1),
+      None,
+      Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_history
+          .items,
+        expected_history_items
+      );
+      assert!(
+        !app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_history
+          .sort_asc
+      );
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_details_event() {
+    let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
+      None,
+      SonarrEvent::GetEpisodeDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut episode_details_modal = EpisodeDetailsModal::default();
+    episode_details_modal.episode_details_tabs.next();
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.set_items(vec![episode()]);
+    season_details_modal.episode_details_modal = Some(episode_details_modal);
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episode(episode) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .episode_details_modal
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_tabs
+          .get_active_route(),
+        ActiveSonarrBlock::EpisodeHistory.into()
+      );
+      assert_eq!(episode, response);
+
+      let app = app_arc.lock().await;
+      let episode_details_modal = app
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .episode_details_modal
+        .as_ref()
+        .unwrap();
+      assert_str_eq!(
+        episode_details_modal.episode_details.get_text(),
+        formatdoc!(
+          "Title: Something cool
+          Season: 1
+          Episode Number: 1
+          Air Date: 2024-02-10 07:28:45 UTC
+          Status: Downloaded
+          Description: Okay so this one time at band camp..."
+        )
+      );
+      assert_str_eq!(
+        episode_details_modal.file_details,
+        formatdoc!(
+          "Relative Path: /season 1/episode 1.mkv
+          Absolute Path: /nfs/tv/series/season 1/episode 1.mkv
+          Size: 3.30 GB
+          Language: English
+          Date Added: 2024-02-10 07:28:45 UTC"
+        )
+      );
+      assert_str_eq!(
+        episode_details_modal.audio_details,
+        formatdoc!(
+          "Bitrate: 0
+          Channels: 7.1
+          Codec: AAC
+          Languages: eng
+          Stream Count: 1"
+        )
+      );
+      assert_str_eq!(
+        episode_details_modal.video_details,
+        formatdoc!(
+          "Bit Depth: 10
+          Bitrate: 0
+          Codec: x265
+          FPS: 23.976
+          Resolution: 1920x1080
+          Scan Type: Progressive
+          Runtime: 23:51
+          Subtitles: English"
+        )
+      );
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_details_event_empty_episode_details_modal() {
+    let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
+      None,
+      SonarrEvent::GetEpisodeDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.set_items(vec![episode()]);
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episode(episode) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .episode_details_modal
+        .is_some());
+      assert_eq!(episode, response);
+
+      let app = app_arc.lock().await;
+      let episode_details_modal = app
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .episode_details_modal
+        .as_ref()
+        .unwrap();
+      assert_str_eq!(
+        episode_details_modal.episode_details.get_text(),
+        formatdoc!(
+          "Title: Something cool
+          Season: 1
+          Episode Number: 1
+          Air Date: 2024-02-10 07:28:45 UTC
+          Status: Downloaded
+          Description: Okay so this one time at band camp..."
+        )
+      );
+      assert_str_eq!(
+        episode_details_modal.file_details,
+        formatdoc!(
+          "Relative Path: /season 1/episode 1.mkv
+          Absolute Path: /nfs/tv/series/season 1/episode 1.mkv
+          Size: 3.30 GB
+          Language: English
+          Date Added: 2024-02-10 07:28:45 UTC"
+        )
+      );
+      assert_str_eq!(
+        episode_details_modal.audio_details,
+        formatdoc!(
+          "Bitrate: 0
+          Channels: 7.1
+          Codec: AAC
+          Languages: eng
+          Stream Count: 1"
+        )
+      );
+      assert_str_eq!(
+        episode_details_modal.video_details,
+        formatdoc!(
+          "Bit Depth: 10
+          Bitrate: 0
+          Codec: x265
+          FPS: 23.976
+          Resolution: 1920x1080
+          Scan Type: Progressive
+          Runtime: 23:51
+          Subtitles: English"
+        )
+      );
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_details_event_season_details_modal_not_required_in_cli_mode() {
+    let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
+      None,
+      SonarrEvent::GetEpisodeDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.cli_mode = true;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Episode(episode) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(episode, response);
+    }
+  }
+
+  #[tokio::test]
+  #[should_panic(expected = "Season details modal is empty")]
+  async fn test_handle_get_episode_details_event_requires_season_details_modal_to_be_some_when_in_tui_mode(
+  ) {
+    let (_async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
+      None,
+      SonarrEvent::GetEpisodeDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
+      .await
+      .unwrap();
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_releases_event() {
+    let release_json = json!([{
+      "guid": "1234",
+      "protocol": "torrent",
+      "age": 1,
+      "title": "Test Release",
+      "indexer": "kickass torrents",
+      "indexerId": 2,
+      "size": 1234,
+      "rejected": true,
+      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+      "seeders": 2,
+      "leechers": 1,
+      "languages": [ { "id": 1, "name": "English" } ],
+      "quality": { "quality": { "name": "Bluray-1080p" }}
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(release_json),
+      None,
+      SonarrEvent::GetEpisodeReleases(1),
+      None,
+      Some("episodeId=1"),
+    )
+    .await;
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.set_items(vec![episode()]);
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .season_details_modal
+      .as_mut()
+      .unwrap()
+      .episode_details_modal = Some(EpisodeDetailsModal::default());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Releases(releases_vec) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeReleases(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_releases
+          .items,
+        vec![release()]
+      );
+      assert_eq!(releases_vec, vec![release()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_episode_releases_event_empty_episode_details_modal() {
+    let release_json = json!([{
+      "guid": "1234",
+      "protocol": "torrent",
+      "age": 1,
+      "title": "Test Release",
+      "indexer": "kickass torrents",
+      "indexerId": 2,
+      "size": 1234,
+      "rejected": true,
+      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+      "seeders": 2,
+      "leechers": 1,
+      "languages": [ { "id": 1, "name": "English" } ],
+      "quality": { "quality": { "name": "Bluray-1080p" }}
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(release_json),
+      None,
+      SonarrEvent::GetEpisodeReleases(1),
+      None,
+      Some("episodeId=1"),
+    )
+    .await;
+    let mut season_details_modal = SeasonDetailsModal::default();
+    season_details_modal.episodes.set_items(vec![episode()]);
+    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Releases(releases_vec) = network
+      .handle_sonarr_event(SonarrEvent::GetEpisodeReleases(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_details_modal
+          .as_ref()
+          .unwrap()
+          .episode_releases
+          .items,
+        vec![release()]
+      );
+      assert_eq!(releases_vec, vec![release()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_toggle_episode_monitoring_event() {
+    let expected_body = MonitorEpisodeBody {
+      episode_ids: vec![2],
+      monitored: false,
+    };
+    let body = Episode { id: 2, ..episode() };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!(body)),
+      None,
+      SonarrEvent::GetEpisodeDetails(2),
+      Some("/2"),
+      None,
+    )
+    .await;
+    let async_toggle_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}",
+          SonarrEvent::ToggleEpisodeMonitoring(2).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(json!(expected_body)))
+      .create_async()
+      .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::ToggleEpisodeMonitoring(2))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_toggle_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_trigger_automatic_episode_search_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "EpisodeSearch",
+        "episodeIds": [ 1 ]
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::TriggerAutomaticEpisodeSearch(1),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::TriggerAutomaticEpisodeSearch(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[test]
+  fn test_get_episode_status_downloaded() {
+    assert_str_eq!(get_episode_status(true, &[], 0), "Downloaded");
+  }
+
+  #[test]
+  fn test_get_episode_status_missing() {
+    let download_record = DownloadRecord {
+      episode_id: Some(Number::from(1i64)),
+      ..DownloadRecord::default()
+    };
+
+    assert_str_eq!(
+      get_episode_status(false, slice::from_ref(&download_record), 0),
+      "Missing"
+    );
+
+    assert_str_eq!(get_episode_status(false, &[download_record], 1), "Missing");
+  }
+
+  #[test]
+  fn test_get_episode_status_missing_if_episode_id_is_missing() {
+    let download_record = DownloadRecord::default();
+
+    assert_str_eq!(
+      get_episode_status(false, slice::from_ref(&download_record), 0),
+      "Missing"
+    );
+
+    assert_str_eq!(get_episode_status(false, &[download_record], 1), "Missing");
+  }
+
+  #[test]
+  fn test_get_episode_status_downloading() {
+    assert_str_eq!(
+      get_episode_status(
+        false,
+        &[DownloadRecord {
+          episode_id: Some(Number::from(1i64)),
+          status: DownloadStatus::Downloading,
+          ..DownloadRecord::default()
+        }],
+        1
+      ),
+      "Downloading"
+    );
+  }
+
+  #[test]
+  fn test_get_episode_status_awaiting_import() {
+    assert_str_eq!(
+      get_episode_status(
+        false,
+        &[DownloadRecord {
+          episode_id: Some(Number::from(1i64)),
+          status: DownloadStatus::Completed,
+          ..DownloadRecord::default()
+        }],
+        1
+      ),
+      "Awaiting Import"
+    );
+  }
+}
diff --git a/src/network/sonarr_network/library/mod.rs b/src/network/sonarr_network/library/mod.rs
new file mode 100644
index 0000000..15c4a2c
--- /dev/null
+++ b/src/network/sonarr_network/library/mod.rs
@@ -0,0 +1,38 @@
+use crate::models::sonarr_models::SonarrReleaseDownloadBody;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::Value;
+
+mod episodes;
+mod seasons;
+mod series;
+
+#[cfg(test)]
+#[path = "sonarr_library_network_tests.rs"]
+mod sonarr_library_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn download_sonarr_release(
+    &mut self,
+    sonarr_release_download_body: SonarrReleaseDownloadBody,
+  ) -> Result<Value> {
+    let event = SonarrEvent::DownloadRelease(SonarrReleaseDownloadBody::default());
+    info!("Downloading Sonarr release with params: {sonarr_release_download_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        Some(sonarr_release_download_body),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<SonarrReleaseDownloadBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/library/seasons/mod.rs b/src/network/sonarr_network/library/seasons/mod.rs
new file mode 100644
index 0000000..5f0695f
--- /dev/null
+++ b/src/network/sonarr_network/library/seasons/mod.rs
@@ -0,0 +1,199 @@
+use crate::models::servarr_data::sonarr::modals::SeasonDetailsModal;
+use crate::models::sonarr_models::{SonarrCommandBody, SonarrHistoryItem, SonarrRelease};
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info, warn};
+use serde_json::{json, Value};
+
+#[cfg(test)]
+#[path = "sonarr_seasons_network_tests.rs"]
+mod sonarr_seasons_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn toggle_sonarr_season_monitoring(
+    &mut self,
+    series_id_season_number_tuple: (i64, i64),
+  ) -> Result<()> {
+    let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple);
+    let (series_id, season_number) = series_id_season_number_tuple;
+
+    let detail_event = SonarrEvent::GetSeriesDetails(series_id);
+    info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
+    info!("Fetching series details for series with ID: {series_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{series_id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
+        response = detailed_series_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing toggle season monitoring body");
+
+    match serde_json::from_str::<Value>(&response) {
+      Ok(mut detailed_series_body) => {
+        let monitored = detailed_series_body
+          .get("seasons")
+          .unwrap()
+          .as_array()
+          .unwrap()
+          .iter()
+          .find(|season| season["seasonNumber"] == season_number)
+          .unwrap()
+          .get("monitored")
+          .unwrap()
+          .as_bool()
+          .unwrap();
+
+        *detailed_series_body
+          .get_mut("seasons")
+          .unwrap()
+          .as_array_mut()
+          .unwrap()
+          .iter_mut()
+          .find(|season| season["seasonNumber"] == season_number)
+          .unwrap()
+          .get_mut("monitored")
+          .unwrap() = json!(!monitored);
+
+        debug!("Toggle season monitoring body: {detailed_series_body:?}");
+
+        let request_props = self
+          .request_props_from(
+            event,
+            RequestMethod::Put,
+            Some(detailed_series_body),
+            Some(format!("/{series_id}")),
+            None,
+          )
+          .await;
+
+        self
+          .handle_request::<Value, ()>(request_props, |_, _| ())
+          .await
+      }
+      Err(_) => {
+        warn!("Request for detailed series body was interrupted");
+        Ok(())
+      }
+    }
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_season_releases(
+    &mut self,
+    series_season_id_tuple: (i64, i64),
+  ) -> Result<Vec<SonarrRelease>> {
+    let event = SonarrEvent::GetSeasonReleases(series_season_id_tuple);
+    let (series_id, season_number) = series_season_id_tuple;
+    info!("Fetching releases for series with ID: {series_id} and season number: {season_number}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("seriesId={series_id}&seasonNumber={season_number}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<SonarrRelease>>(request_props, |release_vec, mut app| {
+        if app.data.sonarr_data.season_details_modal.is_none() {
+          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+        }
+
+        let season_releases_vec = release_vec
+          .into_iter()
+          .filter(|release| release.full_season)
+          .collect();
+
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .season_releases
+          .set_items(season_releases_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_season_history(
+    &mut self,
+    series_season_id_tuple: (i64, i64),
+  ) -> Result<Vec<SonarrHistoryItem>> {
+    let event = SonarrEvent::GetSeasonHistory(series_season_id_tuple);
+    let (series_id, season_number) = series_season_id_tuple;
+    info!("Fetching history for series with ID: {series_id} and season number: {season_number}");
+
+    let params = format!("seriesId={series_id}&seasonNumber={season_number}",);
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
+      .await;
+
+    self
+      .handle_request::<(), Vec<SonarrHistoryItem>>(request_props, |history_items, mut app| {
+        if app.data.sonarr_data.season_details_modal.is_none() {
+          app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
+        }
+
+        let mut history_vec = history_items;
+        history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .season_history
+          .set_items(history_vec);
+        app
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_mut()
+          .unwrap()
+          .season_history
+          .apply_sorting_toggle(false);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn trigger_automatic_season_search(
+    &mut self,
+    series_season_id_tuple: (i64, i64),
+  ) -> Result<Value> {
+    let event = SonarrEvent::TriggerAutomaticSeasonSearch(series_season_id_tuple);
+    let (series_id, season_number) = series_season_id_tuple;
+    info!("Searching indexers for series with ID: {series_id} and season number: {season_number}");
+
+    let body = SonarrCommandBody {
+      name: "SeasonSearch".to_owned(),
+      season_number: Some(season_number),
+      series_id: Some(series_id),
+      ..SonarrCommandBody::default()
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/library/seasons/sonarr_seasons_network_tests.rs b/src/network/sonarr_network/library/seasons/sonarr_seasons_network_tests.rs
new file mode 100644
index 0000000..23d8de6
--- /dev/null
+++ b/src/network/sonarr_network/library/seasons/sonarr_seasons_network_tests.rs
@@ -0,0 +1,515 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::sonarr::modals::SeasonDetailsModal;
+  use crate::models::sonarr_models::{SonarrHistoryItem, SonarrRelease, SonarrSerdeable};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    history_item, release, season, series, SERIES_JSON,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use mockito::Matcher;
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::{json, Value};
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_toggle_season_monitoring_event() {
+    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *expected_body
+      .get_mut("seasons")
+      .unwrap()
+      .as_array_mut()
+      .unwrap()
+      .iter_mut()
+      .find(|season| season["seasonNumber"] == 1)
+      .unwrap()
+      .get_mut("monitored")
+      .unwrap() = json!(false);
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_toggle_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          SonarrEvent::ToggleSeasonMonitoring((1, 1)).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    {
+      let mut app = app_arc.lock().await;
+      app.data.sonarr_data.series.set_items(vec![series()]);
+      app.data.sonarr_data.seasons.set_items(vec![season()]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring((1, 1)))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_toggle_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_season_releases_event() {
+    let release_json = json!([
+      {
+        "guid": "1234",
+        "protocol": "torrent",
+        "age": 1,
+        "title": "Test Release",
+        "indexer": "kickass torrents",
+        "indexerId": 2,
+        "size": 1234,
+        "rejected": true,
+        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+        "seeders": 2,
+        "leechers": 1,
+        "languages": [ { "id": 1, "name": "English" } ],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+        "fullSeason": true
+      },
+      {
+        "guid": "4567",
+        "protocol": "torrent",
+        "age": 1,
+        "title": "Test Release",
+        "indexer": "kickass torrents",
+        "indexerId": 2,
+        "size": 1234,
+        "rejected": true,
+        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+        "seeders": 2,
+        "leechers": 1,
+        "languages": [ { "id": 1, "name": "English" } ],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+      }
+    ]);
+    let expected_filtered_sonarr_release = SonarrRelease {
+      full_season: true,
+      ..release()
+    };
+    let expected_raw_sonarr_releases = vec![
+      SonarrRelease {
+        full_season: true,
+        ..release()
+      },
+      SonarrRelease {
+        guid: "4567".to_owned(),
+        ..release()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(release_json),
+      None,
+      SonarrEvent::GetSeasonReleases((1, 1)),
+      None,
+      Some("seriesId=1&seasonNumber=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .seasons
+      .set_items(vec![season()]);
+    app_arc.lock().await.data.sonarr_data.season_details_modal =
+      Some(SeasonDetailsModal::default());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Releases(releases_vec) = network
+      .handle_sonarr_event(SonarrEvent::GetSeasonReleases((1, 1)))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .season_releases
+          .items,
+        vec![expected_filtered_sonarr_release]
+      );
+      assert_eq!(releases_vec, expected_raw_sonarr_releases);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_season_releases_event_empty_season_details_modal() {
+    let release_json = json!([
+      {
+        "guid": "1234",
+        "protocol": "torrent",
+        "age": 1,
+        "title": "Test Release",
+        "indexer": "kickass torrents",
+        "indexerId": 2,
+        "size": 1234,
+        "rejected": true,
+        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+        "seeders": 2,
+        "leechers": 1,
+        "languages": [ { "id": 1, "name": "English" } ],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+        "fullSeason": true
+      },
+      {
+        "guid": "4567",
+        "protocol": "usenet",
+        "age": 1,
+        "title": "Test Release",
+        "indexer": "kickass torrents",
+        "indexerId": 2,
+        "size": 1234,
+        "rejected": true,
+        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
+        "seeders": 2,
+        "leechers": 1,
+        "languages": [ { "id": 1, "name": "English" } ],
+        "quality": { "quality": { "name": "Bluray-1080p" }},
+      }
+    ]);
+    let expected_sonarr_release = SonarrRelease {
+      full_season: true,
+      ..release()
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(release_json),
+      None,
+      SonarrEvent::GetSeasonReleases((1, 1)),
+      None,
+      Some("seriesId=1&seasonNumber=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .seasons
+      .set_items(vec![season()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::GetSeasonReleases((1, 1)))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert_eq!(
+      app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .season_details_modal
+        .as_ref()
+        .unwrap()
+        .season_releases
+        .items,
+      vec![expected_sonarr_release]
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_season_history_event() {
+    let history_json = json!([{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]);
+    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
+    let expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetSeasonHistory((1, 1)),
+      None,
+      Some("seriesId=1&seasonNumber=1"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.season_details_modal =
+      Some(SeasonDetailsModal::default());
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .seasons
+      .set_items(vec![season()]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .season_details_modal
+      .as_mut()
+      .unwrap()
+      .season_history
+      .sort_asc = true;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryItems(history) = network
+      .handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .season_history
+          .items,
+        expected_history_items
+      );
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .season_history
+          .sort_asc
+      );
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_season_history_event_empty_season_details_modal() {
+    let history_json = json!([{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]);
+    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
+    let expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetSeasonHistory((1, 1)),
+      None,
+      Some("seriesId=1&seasonNumber=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .seasons
+      .set_items(vec![season()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryItems(history) = network
+      .handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .season_details_modal
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .season_history
+          .items,
+        expected_history_items
+      );
+      assert!(
+        !app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .season_details_modal
+          .as_ref()
+          .unwrap()
+          .season_history
+          .sort_asc
+      );
+      assert_eq!(history, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_trigger_automatic_season_search_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "SeasonSearch",
+        "seriesId": 1,
+        "seasonNumber": 1
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::TriggerAutomaticSeasonSearch((1, 1)),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::TriggerAutomaticSeasonSearch((1, 1)))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/sonarr_network/library/series/mod.rs b/src/network/sonarr_network/library/series/mod.rs
new file mode 100644
index 0000000..a9bbf7f
--- /dev/null
+++ b/src/network/sonarr_network/library/series/mod.rs
@@ -0,0 +1,450 @@
+use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+use crate::models::sonarr_models::{
+  AddSeriesBody, AddSeriesSearchResult, DeleteSeriesParams, EditSeriesParams, Series,
+  SonarrCommandBody, SonarrHistoryItem,
+};
+use crate::models::stateful_table::StatefulTable;
+use crate::models::Route;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info, warn};
+use serde_json::{json, Value};
+use urlencoding::encode;
+
+#[cfg(test)]
+#[path = "sonarr_series_network_tests.rs"]
+mod sonarr_series_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn add_sonarr_series(
+    &mut self,
+    mut add_series_body: AddSeriesBody,
+  ) -> anyhow::Result<Value> {
+    info!("Adding new series to Sonarr");
+    let event = SonarrEvent::AddSeries(AddSeriesBody::default());
+    if let Some(tag_input_str) = add_series_body.tag_input_string.as_ref() {
+      let tag_ids_vec = self.extract_and_add_sonarr_tag_ids_vec(tag_input_str).await;
+      add_series_body.tags = tag_ids_vec;
+    }
+
+    debug!("Add series body: {add_series_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        Some(add_series_body),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<AddSeriesBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn delete_series(
+    &mut self,
+    delete_series_params: DeleteSeriesParams,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteSeries(DeleteSeriesParams::default());
+    let DeleteSeriesParams {
+      id,
+      delete_series_files,
+      add_list_exclusion,
+    } = delete_series_params;
+
+    info!("Deleting Sonarr series with ID: {id} with deleteFiles={delete_series_files} and addImportExclusion={add_list_exclusion}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{id}")),
+        Some(format!(
+          "deleteFiles={delete_series_files}&addImportExclusion={add_list_exclusion}"
+        )),
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn edit_sonarr_series(
+    &mut self,
+    mut edit_series_params: EditSeriesParams,
+  ) -> Result<()> {
+    info!("Editing Sonarr series");
+    if let Some(tag_input_str) = edit_series_params.tag_input_string.as_ref() {
+      let tag_ids_vec = self.extract_and_add_sonarr_tag_ids_vec(tag_input_str).await;
+      edit_series_params.tags = Some(tag_ids_vec);
+    }
+    let series_id = edit_series_params.series_id;
+    let detail_event = SonarrEvent::GetSeriesDetails(series_id);
+    let event = SonarrEvent::EditSeries(EditSeriesParams::default());
+    info!("Fetching series details for series with ID: {series_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{series_id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
+        response = detailed_series_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing edit series body");
+
+    let mut detailed_series_body: Value = serde_json::from_str(&response)?;
+    let (
+      monitored,
+      use_season_folders,
+      series_type,
+      quality_profile_id,
+      language_profile_id,
+      root_folder_path,
+      tags,
+    ) = {
+      let monitored = edit_series_params.monitored.unwrap_or(
+        detailed_series_body["monitored"]
+          .as_bool()
+          .expect("Unable to deserialize 'monitored'"),
+      );
+      let use_season_folders = edit_series_params.use_season_folders.unwrap_or(
+        detailed_series_body["seasonFolder"]
+          .as_bool()
+          .expect("Unable to deserialize 'season_folder'"),
+      );
+      let series_type = edit_series_params
+        .series_type
+        .unwrap_or_else(|| {
+          serde_json::from_value(detailed_series_body["seriesType"].clone())
+            .expect("Unable to deserialize 'seriesType'")
+        })
+        .to_string();
+      let quality_profile_id = edit_series_params.quality_profile_id.unwrap_or_else(|| {
+        detailed_series_body["qualityProfileId"]
+          .as_i64()
+          .expect("Unable to deserialize 'qualityProfileId'")
+      });
+      let language_profile_id = edit_series_params.language_profile_id.unwrap_or_else(|| {
+        detailed_series_body["languageProfileId"]
+          .as_i64()
+          .expect("Unable to deserialize 'languageProfileId'")
+      });
+      let root_folder_path = edit_series_params.root_folder_path.unwrap_or_else(|| {
+        detailed_series_body["path"]
+          .as_str()
+          .expect("Unable to deserialize 'path'")
+          .to_owned()
+      });
+      let tags = if edit_series_params.clear_tags {
+        vec![]
+      } else {
+        edit_series_params.tags.unwrap_or(
+          detailed_series_body["tags"]
+            .as_array()
+            .expect("Unable to deserialize 'tags'")
+            .iter()
+            .map(|item| item.as_i64().expect("Unable to deserialize tag ID"))
+            .collect(),
+        )
+      };
+
+      (
+        monitored,
+        use_season_folders,
+        series_type,
+        quality_profile_id,
+        language_profile_id,
+        root_folder_path,
+        tags,
+      )
+    };
+
+    *detailed_series_body.get_mut("monitored").unwrap() = json!(monitored);
+    *detailed_series_body.get_mut("seasonFolder").unwrap() = json!(use_season_folders);
+    *detailed_series_body.get_mut("seriesType").unwrap() = json!(series_type);
+    *detailed_series_body.get_mut("qualityProfileId").unwrap() = json!(quality_profile_id);
+    *detailed_series_body.get_mut("languageProfileId").unwrap() = json!(language_profile_id);
+    *detailed_series_body.get_mut("path").unwrap() = json!(root_folder_path);
+    *detailed_series_body.get_mut("tags").unwrap() = json!(tags);
+
+    debug!("Edit series body: {detailed_series_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Put,
+        Some(detailed_series_body),
+        Some(format!("/{series_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn toggle_sonarr_series_monitoring(
+    &mut self,
+    series_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::ToggleSeriesMonitoring(series_id);
+
+    let detail_event = SonarrEvent::GetSeriesDetails(series_id);
+    info!("Toggling series monitoring for series with ID: {series_id}");
+    info!("Fetching series details for series with ID: {series_id}");
+
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{series_id}")),
+        None,
+      )
+      .await;
+
+    let mut response = String::new();
+
+    self
+      .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
+        response = detailed_series_body.to_string()
+      })
+      .await?;
+
+    info!("Constructing toggle series monitoring body");
+
+    match serde_json::from_str::<Value>(&response) {
+      Ok(mut detailed_series_body) => {
+        let monitored = detailed_series_body
+          .get("monitored")
+          .unwrap()
+          .as_bool()
+          .unwrap();
+
+        *detailed_series_body.get_mut("monitored").unwrap() = json!(!monitored);
+
+        debug!("Toggle series monitoring body: {detailed_series_body:?}");
+
+        let request_props = self
+          .request_props_from(
+            event,
+            RequestMethod::Put,
+            Some(detailed_series_body),
+            Some(format!("/{series_id}")),
+            None,
+          )
+          .await;
+
+        self
+          .handle_request::<Value, ()>(request_props, |_, _| ())
+          .await
+      }
+      Err(_) => {
+        warn!("Request for detailed series body was interrupted");
+        Ok(())
+      }
+    }
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_series_details(
+    &mut self,
+    series_id: i64,
+  ) -> Result<Series> {
+    info!("Fetching details for Sonarr series with ID: {series_id}");
+    let event = SonarrEvent::GetSeriesDetails(series_id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{series_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), Series>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_series_history(
+    &mut self,
+    series_id: i64,
+  ) -> Result<Vec<SonarrHistoryItem>> {
+    info!("Fetching Sonarr series history for series with ID: {series_id}");
+    let event = SonarrEvent::GetSeriesHistory(series_id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("seriesId={series_id}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<SonarrHistoryItem>>(request_props, |mut history_vec, mut app| {
+        if app.data.sonarr_data.series_history.is_none() {
+          app.data.sonarr_data.series_history = Some(StatefulTable::default());
+        }
+
+        if !matches!(
+          app.get_current_route(),
+          Route::Sonarr(ActiveSonarrBlock::SeriesHistorySortPrompt, _)
+        ) {
+          history_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app
+            .data
+            .sonarr_data
+            .series_history
+            .as_mut()
+            .unwrap()
+            .set_items(history_vec);
+          app
+            .data
+            .sonarr_data
+            .series_history
+            .as_mut()
+            .unwrap()
+            .apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn list_series(&mut self) -> Result<Vec<Series>> {
+    info!("Fetching Sonarr library");
+    let event = SonarrEvent::ListSeries;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Series>>(request_props, |mut series_vec, mut app| {
+        if !matches!(
+          app.get_current_route(),
+          Route::Sonarr(ActiveSonarrBlock::SeriesSortPrompt, _)
+        ) {
+          series_vec.sort_by(|a, b| a.id.cmp(&b.id));
+          app.data.sonarr_data.series.set_items(series_vec);
+          app.data.sonarr_data.series.apply_sorting_toggle(false);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn search_sonarr_series(
+    &mut self,
+    query: String,
+  ) -> Result<Vec<AddSeriesSearchResult>> {
+    info!("Searching for specific Sonarr series");
+    let event = SonarrEvent::SearchNewSeries(String::new());
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("term={}", encode(&query))),
+      )
+      .await;
+
+    self
+      .handle_request::<(), Vec<AddSeriesSearchResult>>(request_props, |series_vec, mut app| {
+        if series_vec.is_empty() {
+          app.pop_and_push_navigation_stack(ActiveSonarrBlock::AddSeriesEmptySearchResults.into());
+        } else if let Some(add_searched_seriess) = app.data.sonarr_data.add_searched_series.as_mut()
+        {
+          add_searched_seriess.set_items(series_vec);
+        } else {
+          let mut add_searched_seriess = StatefulTable::default();
+          add_searched_seriess.set_items(series_vec);
+          app.data.sonarr_data.add_searched_series = Some(add_searched_seriess);
+        }
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn trigger_automatic_series_search(
+    &mut self,
+    series_id: i64,
+  ) -> Result<Value> {
+    let event = SonarrEvent::TriggerAutomaticSeriesSearch(series_id);
+    info!("Searching indexers for series with ID: {series_id}");
+
+    let body = SonarrCommandBody {
+      name: "SeriesSearch".to_owned(),
+      series_id: Some(series_id),
+      ..SonarrCommandBody::default()
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn update_all_series(&mut self) -> Result<Value> {
+    info!("Updating all series");
+    let event = SonarrEvent::UpdateAllSeries;
+    let body = SonarrCommandBody {
+      name: "RefreshSeries".to_owned(),
+      ..SonarrCommandBody::default()
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn update_and_scan_series(
+    &mut self,
+    series_id: i64,
+  ) -> Result<Value> {
+    let event = SonarrEvent::UpdateAndScanSeries(series_id);
+    info!("Updating and scanning series with ID: {series_id}");
+    let body = SonarrCommandBody {
+      name: "RefreshSeries".to_owned(),
+      series_id: Some(series_id),
+      ..SonarrCommandBody::default()
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<SonarrCommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/library/series/sonarr_series_network_tests.rs b/src/network/sonarr_network/library/series/sonarr_series_network_tests.rs
new file mode 100644
index 0000000..de74cfe
--- /dev/null
+++ b/src/network/sonarr_network/library/series/sonarr_series_network_tests.rs
@@ -0,0 +1,1106 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
+  use crate::models::sonarr_models::{
+    AddSeriesBody, AddSeriesOptions, DeleteSeriesParams, EditSeriesParams, Series, SeriesType,
+    SonarrHistoryItem, SonarrSerdeable,
+  };
+  use crate::models::stateful_table::{SortOption, StatefulTable};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    add_series_search_result, history_item, season, series, SERIES_JSON,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, NetworkResource, RequestMethod};
+  use bimap::BiMap;
+  use mockito::Matcher;
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::{json, Value};
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_add_sonarr_series_event() {
+    let expected_add_series_body = AddSeriesBody {
+      tvdb_id: 1234,
+      title: "Test".to_owned(),
+      monitored: true,
+      root_folder_path: "/nfs2".to_owned(),
+      quality_profile_id: 2222,
+      language_profile_id: 2222,
+      series_type: "standard".to_owned(),
+      season_folder: true,
+      tags: Vec::new(),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      add_options: AddSeriesOptions {
+        monitor: "all".to_owned(),
+        search_for_cutoff_unmet_episodes: true,
+        search_for_missing_episodes: true,
+      },
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "tvdbId": 1234,
+        "title": "Test",
+        "monitored": true,
+        "rootFolderPath": "/nfs2",
+        "qualityProfileId": 2222,
+        "languageProfileId": 2222,
+        "seriesType": "standard",
+        "seasonFolder": true,
+        "tags": [1, 2],
+        "addOptions": {
+          "monitor": "all",
+          "searchForCutoffUnmetEpisodes": true,
+          "searchForMissingEpisodes": true
+        }
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::AddSeries(expected_add_series_body.clone()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::AddSeries(expected_add_series_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_add_sonarr_series_event_does_not_overwrite_tags_vec_when_tag_input_string_is_none(
+  ) {
+    let expected_add_series_body = AddSeriesBody {
+      tvdb_id: 1234,
+      title: "Test".to_owned(),
+      monitored: true,
+      root_folder_path: "/nfs2".to_owned(),
+      quality_profile_id: 2222,
+      language_profile_id: 2222,
+      series_type: "standard".to_owned(),
+      season_folder: true,
+      tags: vec![1, 2],
+      tag_input_string: None,
+      add_options: AddSeriesOptions {
+        monitor: "all".to_owned(),
+        search_for_cutoff_unmet_episodes: true,
+        search_for_missing_episodes: true,
+      },
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "tvdbId": 1234,
+        "title": "Test",
+        "monitored": true,
+        "rootFolderPath": "/nfs2",
+        "qualityProfileId": 2222,
+        "languageProfileId": 2222,
+        "seriesType": "standard",
+        "seasonFolder": true,
+        "tags": [1, 2],
+        "addOptions": {
+          "monitor": "all",
+          "searchForCutoffUnmetEpisodes": true,
+          "searchForMissingEpisodes": true
+        }
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::AddSeries(expected_add_series_body.clone()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::AddSeries(expected_add_series_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_series_event() {
+    let delete_series_params = DeleteSeriesParams {
+      id: 1,
+      delete_series_files: true,
+      add_list_exclusion: true,
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteSeries(delete_series_params.clone()),
+      Some("/1"),
+      Some("deleteFiles=true&addImportExclusion=true"),
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteSeries(delete_series_params))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_series_event() {
+    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+    *expected_body.get_mut("seasonFolder").unwrap() = json!(false);
+    *expected_body.get_mut("seriesType").unwrap() = json!("standard");
+    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("languageProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
+    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
+    let edit_series_params = EditSeriesParams {
+      series_id: 1,
+      monitored: Some(false),
+      use_season_folders: Some(false),
+      series_type: Some(SeriesType::Standard),
+      quality_profile_id: Some(1111),
+      language_profile_id: Some(1111),
+      root_folder_path: Some("/nfs/Test Path".to_owned()),
+      tag_input_string: Some("usenet, testing".to_owned()),
+      ..EditSeriesParams::default()
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_series_event_does_not_overwrite_tag_ids_vec_when_tag_input_string_is_none(
+  ) {
+    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+    *expected_body.get_mut("seasonFolder").unwrap() = json!(false);
+    *expected_body.get_mut("seriesType").unwrap() = json!("standard");
+    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("languageProfileId").unwrap() = json!(1111);
+    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
+    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
+    let edit_series_params = EditSeriesParams {
+      series_id: 1,
+      monitored: Some(false),
+      use_season_folders: Some(false),
+      series_type: Some(SeriesType::Standard),
+      quality_profile_id: Some(1111),
+      language_profile_id: Some(1111),
+      root_folder_path: Some("/nfs/Test Path".to_owned()),
+      tags: Some(vec![1, 2]),
+      ..EditSeriesParams::default()
+    };
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_series_event_defaults_to_previous_values() {
+    let edit_series_params = EditSeriesParams {
+      series_id: 1,
+      ..EditSeriesParams::default()
+    };
+    let expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_edit_series_event_returns_empty_tags_vec_when_clear_tags_is_true() {
+    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *expected_body.get_mut("tags").unwrap() = json!([]);
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let edit_series_params = EditSeriesParams {
+      series_id: 1,
+      clear_tags: true,
+      ..EditSeriesParams::default()
+    };
+    let async_edit_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_edit_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_toggle_series_monitoring_event() {
+    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *expected_body.get_mut("monitored").unwrap() = json!(false);
+
+    let (async_details_server, app_arc, mut server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    let async_toggle_server = server
+      .mock(
+        "PUT",
+        format!(
+          "/api/v3{}/1",
+          SonarrEvent::ToggleSeriesMonitoring(1).resource()
+        )
+        .as_str(),
+      )
+      .with_status(202)
+      .match_header("X-Api-Key", "test1234")
+      .match_body(Matcher::Json(expected_body))
+      .create_async()
+      .await;
+    {
+      let mut app = app_arc.lock().await;
+      app.data.sonarr_data.series.set_items(vec![series()]);
+      app.data.sonarr_data.seasons.set_items(vec![season()]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::ToggleSeriesMonitoring(1))
+      .await
+      .is_ok());
+
+    async_details_server.assert_async().await;
+    async_toggle_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_series_details_event() {
+    let expected_series: Series = serde_json::from_str(SERIES_JSON).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(serde_json::from_str(SERIES_JSON).unwrap()),
+      None,
+      SonarrEvent::GetSeriesDetails(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Series(series) = network
+      .handle_sonarr_event(SonarrEvent::GetSeriesDetails(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(series, expected_series);
+    }
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_get_sonarr_series_history_event(
+    #[values(true, false)] use_custom_sorting: bool,
+  ) {
+    let history_json = json!([{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]);
+    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
+    let mut expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetSeriesHistory(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    let mut series_history_table = StatefulTable {
+      sort_asc: true,
+      ..StatefulTable::default()
+    };
+    if use_custom_sorting {
+      let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
+        a.source_title
+          .text
+          .to_lowercase()
+          .cmp(&b.source_title.text.to_lowercase())
+      };
+      expected_history_items.sort_by(cmp_fn);
+
+      let history_sort_option = SortOption {
+        name: "Source Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      series_history_table.sorting(vec![history_sort_option]);
+    }
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc.lock().await.data.sonarr_data.series_history = Some(series_history_table);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
+      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .series_history
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .series_history
+          .as_ref()
+          .unwrap()
+          .items,
+        expected_history_items
+      );
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .series_history
+          .as_ref()
+          .unwrap()
+          .sort_asc
+      );
+      assert_eq!(history_items, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_series_history_event_empty_series_history_table() {
+    let history_json = json!([{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]);
+    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
+    let expected_history_items = vec![
+      SonarrHistoryItem {
+        id: 123,
+        episode_id: 1007,
+        source_title: "z episode".into(),
+        ..history_item()
+      },
+      SonarrHistoryItem {
+        id: 456,
+        episode_id: 2001,
+        source_title: "A Episode".into(),
+        ..history_item()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetSeriesHistory(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
+      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .series_history
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .series_history
+          .as_ref()
+          .unwrap()
+          .items,
+        expected_history_items
+      );
+      assert!(
+        !app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .series_history
+          .as_ref()
+          .unwrap()
+          .sort_asc
+      );
+      assert_eq!(history_items, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_series_history_event_no_op_when_user_is_selecting_sort_options() {
+    let history_json = json!([{
+      "id": 123,
+      "sourceTitle": "z episode",
+      "episodeId": 1007,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    },
+    {
+      "id": 456,
+      "sourceTitle": "A Episode",
+      "episodeId": 2001,
+      "quality": { "quality": { "name": "Bluray-1080p" } },
+      "languages": [{ "id": 1, "name": "English" }],
+      "date": "2024-02-10T07:28:45Z",
+      "eventType": "grabbed",
+      "data": {
+        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
+        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
+      }
+    }]);
+    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(history_json),
+      None,
+      SonarrEvent::GetSeriesHistory(1),
+      None,
+      Some("seriesId=1"),
+    )
+    .await;
+    let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
+      a.source_title
+        .text
+        .to_lowercase()
+        .cmp(&b.source_title.text.to_lowercase())
+    };
+    let history_sort_option = SortOption {
+      name: "Source Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    let mut series_history_table = StatefulTable {
+      sort_asc: true,
+      ..StatefulTable::default()
+    };
+    series_history_table.sorting(vec![history_sort_option]);
+    app_arc.lock().await.data.sonarr_data.series_history = Some(series_history_table);
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::SeriesHistorySortPrompt.into());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
+      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .series_history
+        .is_some());
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .series_history
+        .as_ref()
+        .unwrap()
+        .is_empty());
+      assert!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .series_history
+          .as_ref()
+          .unwrap()
+          .sort_asc
+      );
+      assert_eq!(history_items, response);
+    }
+  }
+
+  #[rstest]
+  #[tokio::test]
+  async fn test_handle_list_series_event(#[values(true, false)] use_custom_sorting: bool) {
+    let mut series_1: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    let mut series_2: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *series_1.get_mut("id").unwrap() = json!(1);
+    *series_1.get_mut("title").unwrap() = json!("z test");
+    *series_2.get_mut("id").unwrap() = json!(2);
+    *series_2.get_mut("title").unwrap() = json!("A test");
+    let expected_series = vec![
+      Series {
+        id: 1,
+        title: "z test".into(),
+        ..series()
+      },
+      Series {
+        id: 2,
+        title: "A test".into(),
+        ..series()
+      },
+    ];
+    let mut expected_sorted_series = vec![
+      Series {
+        id: 1,
+        title: "z test".into(),
+        ..series()
+      },
+      Series {
+        id: 2,
+        title: "A test".into(),
+        ..series()
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([series_1, series_2])),
+      None,
+      SonarrEvent::ListSeries,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.series.sort_asc = true;
+    if use_custom_sorting {
+      let cmp_fn = |a: &Series, b: &Series| {
+        a.title
+          .text
+          .to_lowercase()
+          .cmp(&b.title.text.to_lowercase())
+      };
+      expected_sorted_series.sort_by(cmp_fn);
+      let title_sort_option = SortOption {
+        name: "Title",
+        cmp_fn: Some(cmp_fn),
+      };
+      app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .series
+        .sorting(vec![title_sort_option]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SeriesVec(series) = network
+      .handle_sonarr_event(SonarrEvent::ListSeries)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.series.items,
+        expected_sorted_series
+      );
+      assert!(app_arc.lock().await.data.sonarr_data.series.sort_asc);
+      assert_eq!(series, expected_series);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_list_series_event_no_op_while_user_is_selecting_sort_options() {
+    let mut series_1: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    let mut series_2: Value = serde_json::from_str(SERIES_JSON).unwrap();
+    *series_1.get_mut("id").unwrap() = json!(1);
+    *series_1.get_mut("title").unwrap() = json!("z test");
+    *series_2.get_mut("id").unwrap() = json!(2);
+    *series_2.get_mut("title").unwrap() = json!("A test");
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([series_1, series_2])),
+      None,
+      SonarrEvent::ListSeries,
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .push_navigation_stack(ActiveSonarrBlock::SeriesSortPrompt.into());
+    app_arc.lock().await.data.sonarr_data.series.sort_asc = true;
+    let cmp_fn = |a: &Series, b: &Series| {
+      a.title
+        .text
+        .to_lowercase()
+        .cmp(&b.title.text.to_lowercase())
+    };
+    let title_sort_option = SortOption {
+      name: "Title",
+      cmp_fn: Some(cmp_fn),
+    };
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .sorting(vec![title_sort_option]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::ListSeries)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .items
+      .is_empty());
+    assert!(app_arc.lock().await.data.sonarr_data.series.sort_asc);
+  }
+
+  #[tokio::test]
+  async fn test_handle_search_new_series_event() {
+    let add_series_search_result_json = json!([{
+      "tvdbId": 1234,
+      "title": "Test",
+      "status": "continuing",
+      "ended": false,
+      "overview": "New series blah blah blah",
+      "genres": ["cool", "family", "fun"],
+      "year": 2023,
+      "network": "Prime Video",
+      "runtime": 60,
+      "ratings": { "votes": 406744, "value": 8.4 },
+      "statistics": { "seasonCount": 3 }
+    }]);
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(add_series_search_result_json),
+      None,
+      SonarrEvent::SearchNewSeries("test term".into()),
+      None,
+      Some("term=test%20term"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::AddSeriesSearchResults(add_series_search_results) = network
+      .handle_sonarr_event(SonarrEvent::SearchNewSeries("test term".into()))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .add_searched_series
+        .is_some());
+      assert_eq!(
+        app_arc
+          .lock()
+          .await
+          .data
+          .sonarr_data
+          .add_searched_series
+          .as_ref()
+          .unwrap()
+          .items,
+        vec![add_series_search_result()]
+      );
+      assert_eq!(add_series_search_results, vec![add_series_search_result()]);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_search_new_series_event_no_results() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([])),
+      None,
+      SonarrEvent::SearchNewSeries("test term".into()),
+      None,
+      Some("term=test%20term"),
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::SearchNewSeries("test term".into()))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .add_searched_series
+      .is_none());
+    assert_eq!(
+      app_arc.lock().await.get_current_route(),
+      ActiveSonarrBlock::AddSeriesEmptySearchResults.into()
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_trigger_automatic_series_search_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "SeriesSearch",
+        "seriesId": 1
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::TriggerAutomaticSeriesSearch(1),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_all_series_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshSeries",
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::UpdateAllSeries,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::UpdateAllSeries)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_and_scan_series_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshSeries",
+        "seriesId": 1,
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::UpdateAndScanSeries(1),
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .series
+      .set_items(vec![series()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::UpdateAndScanSeries(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/sonarr_network/library/sonarr_library_network_tests.rs b/src/network/sonarr_network/library/sonarr_library_network_tests.rs
new file mode 100644
index 0000000..7e036a3
--- /dev/null
+++ b/src/network/sonarr_network/library/sonarr_library_network_tests.rs
@@ -0,0 +1,43 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::sonarr_models::SonarrReleaseDownloadBody;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_download_sonarr_release_event_uses_provided_params() {
+    let params = SonarrReleaseDownloadBody {
+      guid: "1234".to_owned(),
+      indexer_id: 2,
+      series_id: Some(1),
+      ..SonarrReleaseDownloadBody::default()
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "guid": "1234",
+        "indexerId": 2,
+        "seriesId": 1,
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::DownloadRelease(params.clone()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DownloadRelease(params))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}
diff --git a/src/network/sonarr_network/mod.rs b/src/network/sonarr_network/mod.rs
new file mode 100644
index 0000000..f97fce5
--- /dev/null
+++ b/src/network/sonarr_network/mod.rs
@@ -0,0 +1,503 @@
+use anyhow::Result;
+use log::info;
+use serde_json::{json, Value};
+
+use super::{Network, NetworkEvent, NetworkResource};
+use crate::{
+  models::{
+    servarr_models::{AddRootFolderBody, EditIndexerParams, Language, QualityProfile, Tag},
+    sonarr_models::{
+      AddSeriesBody, DeleteSeriesParams, EditSeriesParams, IndexerSettings,
+      SonarrReleaseDownloadBody, SonarrSerdeable, SonarrTaskName,
+    },
+  },
+  network::RequestMethod,
+};
+#[cfg(test)]
+#[path = "sonarr_network_tests.rs"]
+mod sonarr_network_tests;
+
+#[cfg(test)]
+#[path = "sonarr_network_test_utils.rs"]
+mod sonarr_network_test_utils;
+
+mod blocklist;
+mod downloads;
+mod history;
+mod indexers;
+mod library;
+mod root_folders;
+mod system;
+
+#[derive(Debug, Eq, PartialEq, Clone)]
+pub enum SonarrEvent {
+  AddRootFolder(AddRootFolderBody),
+  AddSeries(AddSeriesBody),
+  AddTag(String),
+  ClearBlocklist,
+  DeleteBlocklistItem(i64),
+  DeleteDownload(i64),
+  DeleteEpisodeFile(i64),
+  DeleteIndexer(i64),
+  DeleteRootFolder(i64),
+  DeleteSeries(DeleteSeriesParams),
+  DeleteTag(i64),
+  DownloadRelease(SonarrReleaseDownloadBody),
+  EditAllIndexerSettings(IndexerSettings),
+  EditIndexer(EditIndexerParams),
+  EditSeries(EditSeriesParams),
+  GetAllIndexerSettings,
+  GetBlocklist,
+  GetDownloads(u64),
+  GetHistory(u64),
+  GetHostConfig,
+  GetIndexers,
+  GetEpisodeDetails(i64),
+  GetEpisodes(i64),
+  GetEpisodeFiles(i64),
+  GetEpisodeHistory(i64),
+  GetLanguageProfiles,
+  GetLogs(u64),
+  GetDiskSpace,
+  GetQualityProfiles,
+  GetQueuedEvents,
+  GetRootFolders,
+  GetEpisodeReleases(i64),
+  GetSeasonHistory((i64, i64)),
+  GetSeasonReleases((i64, i64)),
+  GetSecurityConfig,
+  GetSeriesDetails(i64),
+  GetSeriesHistory(i64),
+  GetStatus,
+  GetUpdates,
+  GetTags,
+  GetTasks,
+  HealthCheck,
+  ListSeries,
+  MarkHistoryItemAsFailed(i64),
+  SearchNewSeries(String),
+  StartTask(SonarrTaskName),
+  TestIndexer(i64),
+  TestAllIndexers,
+  ToggleSeasonMonitoring((i64, i64)),
+  ToggleSeriesMonitoring(i64),
+  ToggleEpisodeMonitoring(i64),
+  TriggerAutomaticEpisodeSearch(i64),
+  TriggerAutomaticSeasonSearch((i64, i64)),
+  TriggerAutomaticSeriesSearch(i64),
+  UpdateAllSeries,
+  UpdateAndScanSeries(i64),
+  UpdateDownloads,
+}
+
+impl NetworkResource for SonarrEvent {
+  fn resource(&self) -> &'static str {
+    match &self {
+      SonarrEvent::AddTag(_) | SonarrEvent::DeleteTag(_) | SonarrEvent::GetTags => "/tag",
+      SonarrEvent::ClearBlocklist => "/blocklist/bulk",
+      SonarrEvent::DownloadRelease(_) => "/release",
+      SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
+      SonarrEvent::GetAllIndexerSettings | SonarrEvent::EditAllIndexerSettings(_) => {
+        "/config/indexer"
+      }
+      SonarrEvent::GetEpisodeFiles(_) | SonarrEvent::DeleteEpisodeFile(_) => "/episodefile",
+      SonarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
+      SonarrEvent::GetDownloads(_) | SonarrEvent::DeleteDownload(_) => "/queue",
+      SonarrEvent::GetEpisodes(_) | SonarrEvent::GetEpisodeDetails(_) => "/episode",
+      SonarrEvent::GetHistory(_) | SonarrEvent::GetEpisodeHistory(_) => "/history",
+      SonarrEvent::GetHostConfig | SonarrEvent::GetSecurityConfig => "/config/host",
+      SonarrEvent::GetIndexers | SonarrEvent::DeleteIndexer(_) | SonarrEvent::EditIndexer(_) => {
+        "/indexer"
+      }
+      SonarrEvent::GetLanguageProfiles => "/language",
+      SonarrEvent::GetLogs(_) => "/log",
+      SonarrEvent::GetDiskSpace => "/diskspace",
+      SonarrEvent::GetQualityProfiles => "/qualityprofile",
+      SonarrEvent::GetQueuedEvents
+      | SonarrEvent::StartTask(_)
+      | SonarrEvent::TriggerAutomaticSeriesSearch(_)
+      | SonarrEvent::TriggerAutomaticSeasonSearch(_)
+      | SonarrEvent::TriggerAutomaticEpisodeSearch(_)
+      | SonarrEvent::UpdateAllSeries
+      | SonarrEvent::UpdateAndScanSeries(_)
+      | SonarrEvent::UpdateDownloads => "/command",
+      SonarrEvent::GetRootFolders
+      | SonarrEvent::DeleteRootFolder(_)
+      | SonarrEvent::AddRootFolder(_) => "/rootfolder",
+      SonarrEvent::GetSeasonReleases(_) | SonarrEvent::GetEpisodeReleases(_) => "/release",
+      SonarrEvent::GetSeriesHistory(_) | SonarrEvent::GetSeasonHistory(_) => "/history/series",
+      SonarrEvent::GetStatus => "/system/status",
+      SonarrEvent::GetTasks => "/system/task",
+      SonarrEvent::GetUpdates => "/update",
+      SonarrEvent::HealthCheck => "/health",
+      SonarrEvent::AddSeries(_)
+      | SonarrEvent::ListSeries
+      | SonarrEvent::GetSeriesDetails(_)
+      | SonarrEvent::DeleteSeries(_)
+      | SonarrEvent::EditSeries(_)
+      | SonarrEvent::ToggleSeasonMonitoring(_)
+      | SonarrEvent::ToggleSeriesMonitoring(_) => "/series",
+      SonarrEvent::SearchNewSeries(_) => "/series/lookup",
+      SonarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed",
+      SonarrEvent::TestIndexer(_) => "/indexer/test",
+      SonarrEvent::TestAllIndexers => "/indexer/testall",
+      SonarrEvent::ToggleEpisodeMonitoring(_) => "/episode/monitor",
+    }
+  }
+}
+
+impl From<SonarrEvent> for NetworkEvent {
+  fn from(sonarr_event: SonarrEvent) -> Self {
+    NetworkEvent::Sonarr(sonarr_event)
+  }
+}
+
+impl Network<'_, '_> {
+  pub async fn handle_sonarr_event(
+    &mut self,
+    sonarr_event: SonarrEvent,
+  ) -> Result<SonarrSerdeable> {
+    match sonarr_event {
+      SonarrEvent::AddRootFolder(path) => self
+        .add_sonarr_root_folder(path)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::AddSeries(body) => self
+        .add_sonarr_series(body)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::AddTag(tag) => self.add_sonarr_tag(tag).await.map(SonarrSerdeable::from),
+      SonarrEvent::ClearBlocklist => self
+        .clear_sonarr_blocklist()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetAllIndexerSettings => self
+        .get_all_sonarr_indexer_settings()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
+        .delete_sonarr_blocklist_item(blocklist_item_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DeleteDownload(download_id) => self
+        .delete_sonarr_download(download_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DeleteEpisodeFile(episode_file_id) => self
+        .delete_sonarr_episode_file(episode_file_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DeleteIndexer(indexer_id) => self
+        .delete_sonarr_indexer(indexer_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DeleteRootFolder(root_folder_id) => self
+        .delete_sonarr_root_folder(root_folder_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DeleteSeries(params) => {
+        self.delete_series(params).await.map(SonarrSerdeable::from)
+      }
+      SonarrEvent::DeleteTag(tag_id) => self
+        .delete_sonarr_tag(tag_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::DownloadRelease(sonarr_release_download_body) => self
+        .download_sonarr_release(sonarr_release_download_body)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::EditAllIndexerSettings(params) => self
+        .edit_all_sonarr_indexer_settings(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::EditIndexer(params) => self
+        .edit_sonarr_indexer(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::EditSeries(params) => self
+        .edit_sonarr_series(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetBlocklist => self.get_sonarr_blocklist().await.map(SonarrSerdeable::from),
+      SonarrEvent::GetDownloads(count) => self
+        .get_sonarr_downloads(count)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetEpisodes(series_id) => self
+        .get_episodes(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetEpisodeFiles(series_id) => self
+        .get_episode_files(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetEpisodeDetails(episode_id) => self
+        .get_episode_details(episode_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetEpisodeHistory(episode_id) => self
+        .get_sonarr_episode_history(episode_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetHistory(events) => self
+        .get_sonarr_history(events)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetHostConfig => self
+        .get_sonarr_host_config()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetIndexers => self.get_sonarr_indexers().await.map(SonarrSerdeable::from),
+      SonarrEvent::GetLanguageProfiles => self
+        .get_sonarr_language_profiles()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetLogs(events) => self
+        .get_sonarr_logs(events)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetDiskSpace => self.get_sonarr_diskspace().await.map(SonarrSerdeable::from),
+      SonarrEvent::GetQualityProfiles => self
+        .get_sonarr_quality_profiles()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetQueuedEvents => self
+        .get_queued_sonarr_events()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetRootFolders => self
+        .get_sonarr_root_folders()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetEpisodeReleases(params) => self
+        .get_episode_releases(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetSeasonHistory(params) => self
+        .get_sonarr_season_history(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetSeasonReleases(params) => self
+        .get_season_releases(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetSecurityConfig => self
+        .get_sonarr_security_config()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetSeriesDetails(series_id) => self
+        .get_series_details(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetSeriesHistory(series_id) => self
+        .get_sonarr_series_history(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::GetStatus => self.get_sonarr_status().await.map(SonarrSerdeable::from),
+      SonarrEvent::GetTags => self.get_sonarr_tags().await.map(SonarrSerdeable::from),
+      SonarrEvent::GetTasks => self.get_sonarr_tasks().await.map(SonarrSerdeable::from),
+      SonarrEvent::GetUpdates => self.get_sonarr_updates().await.map(SonarrSerdeable::from),
+      SonarrEvent::HealthCheck => self
+        .get_sonarr_healthcheck()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::ListSeries => self.list_series().await.map(SonarrSerdeable::from),
+      SonarrEvent::MarkHistoryItemAsFailed(history_item_id) => self
+        .mark_sonarr_history_item_as_failed(history_item_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::SearchNewSeries(query) => self
+        .search_sonarr_series(query)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::StartTask(task_name) => self
+        .start_sonarr_task(task_name)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::TestIndexer(indexer_id) => self
+        .test_sonarr_indexer(indexer_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::TestAllIndexers => self
+        .test_all_sonarr_indexers()
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::ToggleEpisodeMonitoring(episode_id) => self
+        .toggle_sonarr_episode_monitoring(episode_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::ToggleSeasonMonitoring(params) => self
+        .toggle_sonarr_season_monitoring(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::ToggleSeriesMonitoring(series_id) => self
+        .toggle_sonarr_series_monitoring(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::TriggerAutomaticSeasonSearch(params) => self
+        .trigger_automatic_season_search(params)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::TriggerAutomaticSeriesSearch(series_id) => self
+        .trigger_automatic_series_search(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::TriggerAutomaticEpisodeSearch(episode_id) => self
+        .trigger_automatic_episode_search(episode_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::UpdateAllSeries => self.update_all_series().await.map(SonarrSerdeable::from),
+      SonarrEvent::UpdateAndScanSeries(series_id) => self
+        .update_and_scan_series(series_id)
+        .await
+        .map(SonarrSerdeable::from),
+      SonarrEvent::UpdateDownloads => self
+        .update_sonarr_downloads()
+        .await
+        .map(SonarrSerdeable::from),
+    }
+  }
+
+  async fn add_sonarr_tag(&mut self, tag: String) -> Result<Tag> {
+    info!("Adding a new Sonarr tag");
+    let event = SonarrEvent::AddTag(String::new());
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        Some(json!({ "label": tag })),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<Value, Tag>(request_props, |tag, mut app| {
+        app.data.sonarr_data.tags_map.insert(tag.id, tag.label);
+      })
+      .await
+  }
+
+  async fn delete_sonarr_tag(&mut self, id: i64) -> Result<()> {
+    info!("Deleting Sonarr tag with id: {id}");
+    let event = SonarrEvent::DeleteTag(id);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  async fn get_sonarr_healthcheck(&mut self) -> Result<()> {
+    info!("Performing Sonarr health check");
+    let event = SonarrEvent::HealthCheck;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  async fn get_sonarr_language_profiles(&mut self) -> Result<Vec<Language>> {
+    info!("Fetching Sonarr language profiles");
+    let event = SonarrEvent::GetLanguageProfiles;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Language>>(request_props, |language_profiles_vec, mut app| {
+        app.data.sonarr_data.language_profiles_map = language_profiles_vec
+          .into_iter()
+          .map(|language| (language.id, language.name))
+          .collect();
+      })
+      .await
+  }
+
+  async fn get_sonarr_quality_profiles(&mut self) -> Result<Vec<QualityProfile>> {
+    info!("Fetching Sonarr quality profiles");
+    let event = SonarrEvent::GetQualityProfiles;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<QualityProfile>>(request_props, |quality_profiles, mut app| {
+        app.data.sonarr_data.quality_profile_map = quality_profiles
+          .into_iter()
+          .map(|profile| (profile.id, profile.name))
+          .collect();
+      })
+      .await
+  }
+
+  async fn get_sonarr_tags(&mut self) -> Result<Vec<Tag>> {
+    info!("Fetching Sonarr tags");
+    let event = SonarrEvent::GetTags;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Tag>>(request_props, |tags_vec, mut app| {
+        app.data.sonarr_data.tags_map = tags_vec
+          .into_iter()
+          .map(|tag| (tag.id, tag.label))
+          .collect();
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn extract_and_add_sonarr_tag_ids_vec(
+    &mut self,
+    edit_tags: &str,
+  ) -> Vec<i64> {
+    let missing_tags_vec = {
+      let tags_map = &self.app.lock().await.data.sonarr_data.tags_map;
+      edit_tags
+        .split(',')
+        .filter(|&tag| {
+          !tag.is_empty() && tags_map.get_by_right(tag.to_lowercase().trim()).is_none()
+        })
+        .collect::<Vec<&str>>()
+    };
+
+    for tag in missing_tags_vec {
+      self
+        .add_sonarr_tag(tag.trim().to_owned())
+        .await
+        .expect("Unable to add tag");
+    }
+
+    let app = self.app.lock().await;
+    edit_tags
+      .split(',')
+      .filter(|tag| !tag.is_empty())
+      .map(|tag| {
+        *app
+          .data
+          .sonarr_data
+          .tags_map
+          .get_by_right(tag.to_lowercase().trim())
+          .unwrap()
+      })
+      .collect()
+  }
+}
diff --git a/src/network/sonarr_network/root_folders/mod.rs b/src/network/sonarr_network/root_folders/mod.rs
new file mode 100644
index 0000000..277b76e
--- /dev/null
+++ b/src/network/sonarr_network/root_folders/mod.rs
@@ -0,0 +1,75 @@
+use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::{debug, info};
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "sonarr_root_folders_network_tests.rs"]
+mod sonarr_root_folders_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn add_sonarr_root_folder(
+    &mut self,
+    add_root_folder_body: AddRootFolderBody,
+  ) -> Result<Value> {
+    info!("Adding new root folder to Sonarr");
+    let event = SonarrEvent::AddRootFolder(AddRootFolderBody::default());
+
+    debug!("Add root folder body: {add_root_folder_body:?}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Post,
+        Some(add_root_folder_body),
+        None,
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<AddRootFolderBody, Value>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn delete_sonarr_root_folder(
+    &mut self,
+    root_folder_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteRootFolder(root_folder_id);
+    info!("Deleting Sonarr root folder for folder with id: {root_folder_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{root_folder_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_root_folders(
+    &mut self,
+  ) -> Result<Vec<RootFolder>> {
+    info!("Fetching Sonarr root folders");
+    let event = SonarrEvent::GetRootFolders;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<RootFolder>>(request_props, |root_folders, mut app| {
+        app.data.sonarr_data.root_folders.set_items(root_folders);
+      })
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/root_folders/sonarr_root_folders_network_tests.rs b/src/network/sonarr_network/root_folders/sonarr_root_folders_network_tests.rs
new file mode 100644
index 0000000..b2a79e3
--- /dev/null
+++ b/src/network/sonarr_network/root_folders/sonarr_root_folders_network_tests.rs
@@ -0,0 +1,107 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
+  use crate::models::sonarr_models::SonarrSerdeable;
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::root_folder;
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_add_sonarr_root_folder_event() {
+    let expected_add_root_folder_body = AddRootFolderBody {
+      path: "/nfs/test".to_owned(),
+    };
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "path": "/nfs/test"
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::AddRootFolder(expected_add_root_folder_body.clone()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::AddRootFolder(expected_add_root_folder_body))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+    assert!(app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .edit_root_folder
+      .is_none());
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_root_folder_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteRootFolder(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteRootFolder(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_root_folders_event() {
+    let root_folder_json = json!([{
+      "id": 1,
+      "path": "/nfs",
+      "accessible": true,
+      "freeSpace": 219902325555200u64,
+    }]);
+    let response: Vec<RootFolder> = serde_json::from_value(root_folder_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(root_folder_json),
+      None,
+      SonarrEvent::GetRootFolders,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::RootFolders(root_folders) = network
+      .handle_sonarr_event(SonarrEvent::GetRootFolders)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.root_folders.items,
+        vec![root_folder()]
+      );
+      assert_eq!(root_folders, response);
+    }
+  }
+}
diff --git a/src/network/sonarr_network/sonarr_network_test_utils.rs b/src/network/sonarr_network/sonarr_network_test_utils.rs
new file mode 100644
index 0000000..d3e0d4b
--- /dev/null
+++ b/src/network/sonarr_network/sonarr_network_test_utils.rs
@@ -0,0 +1,395 @@
+#[cfg(test)]
+pub(in crate::network::sonarr_network) mod test_utils {
+  use crate::models::servarr_models::{
+    Indexer, IndexerField, Language, Quality, QualityWrapper, RootFolder,
+  };
+  use crate::models::sonarr_models::{
+    AddSeriesSearchResult, AddSeriesSearchResultStatistics, BlocklistItem, DownloadRecord,
+    DownloadStatus, DownloadsResponse, Episode, EpisodeFile, IndexerSettings, MediaInfo, Rating,
+    Season, SeasonStatistics, Series, SeriesStatistics, SeriesStatus, SeriesType,
+    SonarrHistoryData, SonarrHistoryEventType, SonarrHistoryItem, SonarrRelease,
+  };
+  use crate::models::HorizontallyScrollableText;
+  use chrono::DateTime;
+  use serde_json::{json, Number};
+
+  pub const SERIES_JSON: &str = r#"{
+        "title": "Test",
+        "status": "continuing",
+        "ended": false,
+        "overview": "Blah blah blah",
+        "network": "HBO",
+        "seasons": [
+            {
+                "seasonNumber": 1,
+                "monitored": true,
+                "statistics": {
+                    "previousAiring": "2022-10-24T01:00:00Z",
+                    "episodeFileCount": 10,
+                    "episodeCount": 10,
+                    "totalEpisodeCount": 10,
+                    "sizeOnDisk": 36708563419,
+                    "percentOfEpisodes": 100.0
+                }
+            }
+        ],
+        "year": 2022,
+        "path": "/nfs/tv/Test",
+        "qualityProfileId": 6,
+        "languageProfileId": 1,
+        "seasonFolder": true,
+        "monitored": true,
+        "runtime": 63,
+        "tvdbId": 371572,
+        "seriesType": "standard",
+        "certification": "TV-MA",
+        "genres": ["cool", "family", "fun"],
+        "tags": [3],
+        "ratings": {"votes": 406744, "value": 8.4},
+        "statistics": {
+            "seasonCount": 2,
+            "episodeFileCount": 18,
+            "episodeCount": 18,
+            "totalEpisodeCount": 50,
+            "sizeOnDisk": 63894022699,
+            "percentOfEpisodes": 100.0
+        },
+        "id": 1
+    }
+"#;
+
+  pub const EPISODE_JSON: &str = r#"{
+    "seriesId": 1,
+    "tvdbId": 1234,
+    "episodeFileId": 1,
+    "seasonNumber": 1,
+    "episodeNumber": 1,
+    "title": "Something cool",
+    "airDateUtc": "2024-02-10T07:28:45Z",
+    "overview": "Okay so this one time at band camp...",
+    "episodeFile": {
+        "id": 1,
+        "relativePath": "/season 1/episode 1.mkv",
+        "path": "/nfs/tv/series/season 1/episode 1.mkv",
+        "size": 3543348019,
+        "dateAdded": "2024-02-10T07:28:45Z",
+        "languages": [{ "id": 1, "name": "English" }],
+        "quality": { "quality": { "name": "Bluray-1080p" } },
+        "mediaInfo": {
+            "audioBitrate": 0,
+            "audioChannels": 7.1,
+            "audioCodec": "AAC",
+            "audioLanguages": "eng",
+            "audioStreamCount": 1,
+            "videoBitDepth": 10,
+            "videoBitrate": 0,
+            "videoCodec": "x265",
+            "videoFps": 23.976,
+            "resolution": "1920x1080",
+            "runTime": "23:51",
+            "scanType": "Progressive",
+            "subtitles": "English"
+        }
+    },
+    "hasFile": true,
+    "monitored": true,
+    "id": 1
+  }"#;
+
+  pub fn add_series_search_result() -> AddSeriesSearchResult {
+    AddSeriesSearchResult {
+      tvdb_id: 1234,
+      title: HorizontallyScrollableText::from("Test"),
+      status: Some("continuing".to_owned()),
+      ended: false,
+      overview: Some("New series blah blah blah".to_owned()),
+      genres: genres(),
+      year: 2023,
+      network: Some("Prime Video".to_owned()),
+      runtime: 60,
+      ratings: Some(rating()),
+      statistics: Some(add_series_search_result_statistics()),
+    }
+  }
+
+  pub fn add_series_search_result_statistics() -> AddSeriesSearchResultStatistics {
+    AddSeriesSearchResultStatistics { season_count: 3 }
+  }
+
+  pub fn blocklist_item() -> BlocklistItem {
+    BlocklistItem {
+      id: 1,
+      series_id: 1,
+      series_title: None,
+      episode_ids: vec![Number::from(1)],
+      source_title: "Test Source Title".to_owned(),
+      languages: vec![language()],
+      quality: quality_wrapper(),
+      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
+      protocol: "usenet".to_owned(),
+      indexer: "NZBgeek (Prowlarr)".to_owned(),
+      message: "test message".to_owned(),
+    }
+  }
+
+  pub fn download_record() -> DownloadRecord {
+    DownloadRecord {
+      title: "Test Download Title".to_owned(),
+      status: DownloadStatus::Downloading,
+      id: 1,
+      episode_id: Some(Number::from(1i64)),
+      size: 3543348019f64,
+      sizeleft: 1771674009f64,
+      output_path: Some(HorizontallyScrollableText::from(
+        "/nfs/tv/Test show/season 1/",
+      )),
+      indexer: "kickass torrents".to_owned(),
+      download_client: Some("transmission".to_owned()),
+    }
+  }
+
+  pub fn downloads_response() -> DownloadsResponse {
+    DownloadsResponse {
+      records: vec![download_record()],
+    }
+  }
+
+  pub fn episode() -> Episode {
+    Episode {
+      id: 1,
+      series_id: 1,
+      tvdb_id: 1234,
+      episode_file_id: 1,
+      season_number: 1,
+      episode_number: 1,
+      title: "Something cool".to_owned(),
+      air_date_utc: Some(DateTime::from(
+        DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap(),
+      )),
+      overview: Some("Okay so this one time at band camp...".to_owned()),
+      has_file: true,
+      monitored: true,
+      episode_file: Some(episode_file()),
+    }
+  }
+
+  pub fn episode_file() -> EpisodeFile {
+    EpisodeFile {
+      id: 1,
+      relative_path: "/season 1/episode 1.mkv".to_owned(),
+      path: "/nfs/tv/series/season 1/episode 1.mkv".to_owned(),
+      size: 3543348019,
+      quality: quality_wrapper(),
+      languages: vec![language()],
+      date_added: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
+      media_info: Some(media_info()),
+    }
+  }
+
+  pub fn genres() -> Vec<String> {
+    vec!["cool".to_owned(), "family".to_owned(), "fun".to_owned()]
+  }
+
+  pub fn history_data() -> SonarrHistoryData {
+    SonarrHistoryData {
+      dropped_path: Some("/nfs/nzbget/completed/series/Coolness/something.cool.mkv".to_owned()),
+      imported_path: Some(
+        "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv".to_owned(),
+      ),
+      ..SonarrHistoryData::default()
+    }
+  }
+
+  pub fn history_item() -> SonarrHistoryItem {
+    SonarrHistoryItem {
+      id: 1,
+      source_title: "Test source".into(),
+      episode_id: 1,
+      quality: quality_wrapper(),
+      languages: vec![language()],
+      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
+      event_type: SonarrHistoryEventType::Grabbed,
+      data: history_data(),
+    }
+  }
+
+  pub fn indexer() -> Indexer {
+    Indexer {
+      enable_rss: true,
+      enable_automatic_search: true,
+      enable_interactive_search: true,
+      supports_rss: true,
+      supports_search: true,
+      protocol: "torrent".to_owned(),
+      priority: 25,
+      download_client_id: 0,
+      name: Some("Test Indexer".to_owned()),
+      implementation_name: Some("Torznab".to_owned()),
+      implementation: Some("Torznab".to_owned()),
+      config_contract: Some("TorznabSettings".to_owned()),
+      tags: vec![Number::from(1)],
+      id: 1,
+      fields: Some(vec![
+        IndexerField {
+          name: Some("baseUrl".to_owned()),
+          value: Some(json!("https://test.com")),
+        },
+        IndexerField {
+          name: Some("apiKey".to_owned()),
+          value: Some(json!("")),
+        },
+        IndexerField {
+          name: Some("seedCriteria.seedRatio".to_owned()),
+          value: Some(json!("1.2")),
+        },
+      ]),
+    }
+  }
+
+  pub fn indexer_settings() -> IndexerSettings {
+    IndexerSettings {
+      id: 1,
+      minimum_age: 1,
+      retention: 1,
+      maximum_size: 12345,
+      rss_sync_interval: 60,
+    }
+  }
+
+  pub fn language() -> Language {
+    Language {
+      id: 1,
+      name: "English".to_owned(),
+    }
+  }
+
+  pub fn media_info() -> MediaInfo {
+    MediaInfo {
+      audio_bitrate: 0,
+      audio_channels: Number::from_f64(7.1).unwrap(),
+      audio_codec: Some("AAC".to_owned()),
+      audio_languages: Some("eng".to_owned()),
+      audio_stream_count: 1,
+      video_bit_depth: 10,
+      video_bitrate: 0,
+      video_codec: Some("x265".to_owned()),
+      video_fps: Number::from_f64(23.976).unwrap(),
+      resolution: "1920x1080".to_owned(),
+      run_time: "23:51".to_owned(),
+      scan_type: "Progressive".to_owned(),
+      subtitles: Some("English".to_owned()),
+    }
+  }
+  pub fn quality() -> Quality {
+    Quality {
+      name: "Bluray-1080p".to_owned(),
+    }
+  }
+
+  pub fn quality_wrapper() -> QualityWrapper {
+    QualityWrapper { quality: quality() }
+  }
+
+  pub fn rating() -> Rating {
+    Rating {
+      votes: 406744,
+      value: 8.4,
+    }
+  }
+
+  pub fn season() -> Season {
+    Season {
+      title: None,
+      season_number: 1,
+      monitored: true,
+      statistics: Some(season_statistics()),
+    }
+  }
+
+  pub fn season_statistics() -> SeasonStatistics {
+    SeasonStatistics {
+      previous_airing: Some(DateTime::from(
+        DateTime::parse_from_rfc3339("2022-10-24T01:00:00Z").unwrap(),
+      )),
+      next_airing: None,
+      episode_file_count: 10,
+      episode_count: 10,
+      total_episode_count: 10,
+      size_on_disk: 36708563419,
+      percent_of_episodes: 100.0,
+    }
+  }
+
+  pub fn series() -> Series {
+    Series {
+      title: "Test".to_owned().into(),
+      status: SeriesStatus::Continuing,
+      ended: false,
+      overview: Some("Blah blah blah".to_owned()),
+      network: Some("HBO".to_owned()),
+      seasons: Some(vec![season()]),
+      year: 2022,
+      path: "/nfs/tv/Test".to_owned(),
+      quality_profile_id: 6,
+      language_profile_id: 1,
+      season_folder: true,
+      monitored: true,
+      runtime: 63,
+      tvdb_id: 371572,
+      series_type: SeriesType::Standard,
+      certification: Some("TV-MA".to_owned()),
+      genres: vec!["cool".to_owned(), "family".to_owned(), "fun".to_owned()],
+      tags: vec![Number::from(3)],
+      ratings: rating(),
+      statistics: Some(series_statistics()),
+      id: 1,
+    }
+  }
+
+  pub fn series_statistics() -> SeriesStatistics {
+    SeriesStatistics {
+      season_count: 2,
+      episode_file_count: 18,
+      episode_count: 18,
+      total_episode_count: 50,
+      size_on_disk: 63894022699,
+      percent_of_episodes: 100.0,
+    }
+  }
+
+  pub fn rejections() -> Vec<String> {
+    vec![
+      "Unknown quality profile".to_owned(),
+      "Release is already mapped".to_owned(),
+    ]
+  }
+
+  pub fn release() -> SonarrRelease {
+    SonarrRelease {
+      guid: "1234".to_owned(),
+      protocol: "torrent".to_owned(),
+      age: 1,
+      title: HorizontallyScrollableText::from("Test Release"),
+      indexer: "kickass torrents".to_owned(),
+      indexer_id: 2,
+      size: 1234,
+      rejected: true,
+      rejections: Some(rejections()),
+      seeders: Some(Number::from(2)),
+      leechers: Some(Number::from(1)),
+      languages: Some(vec![language()]),
+      quality: quality_wrapper(),
+      full_season: false,
+    }
+  }
+
+  pub fn root_folder() -> RootFolder {
+    RootFolder {
+      id: 1,
+      path: "/nfs".to_owned(),
+      accessible: true,
+      free_space: 219902325555200,
+      unmapped_folders: None,
+    }
+  }
+}
diff --git a/src/network/sonarr_network/sonarr_network_tests.rs b/src/network/sonarr_network/sonarr_network_tests.rs
new file mode 100644
index 0000000..23e5d26
--- /dev/null
+++ b/src/network/sonarr_network/sonarr_network_tests.rs
@@ -0,0 +1,434 @@
+#[cfg(test)]
+mod test {
+  use crate::app::App;
+  use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
+  use crate::models::servarr_models::{
+    AddRootFolderBody, EditIndexerParams, Language, QualityProfile, Tag,
+  };
+  use crate::models::sonarr_models::{
+    AddSeriesBody, EditSeriesParams, IndexerSettings, SonarrTaskName,
+  };
+  use crate::models::sonarr_models::{DeleteSeriesParams, SonarrSerdeable};
+  use crate::network::{
+    network_tests::test_utils::mock_servarr_api, sonarr_network::SonarrEvent, Network,
+    NetworkEvent, NetworkResource, RequestMethod,
+  };
+  use bimap::BiMap;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::Client;
+  use rstest::rstest;
+  use serde_json::json;
+  use std::sync::Arc;
+  use tokio::sync::Mutex;
+  use tokio_util::sync::CancellationToken;
+
+  #[rstest]
+  fn test_resource_all_indexer_settings(
+    #[values(
+      SonarrEvent::GetAllIndexerSettings,
+      SonarrEvent::EditAllIndexerSettings(IndexerSettings::default())
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/config/indexer");
+  }
+
+  #[rstest]
+  fn test_resource_episode(
+    #[values(SonarrEvent::GetEpisodes(0), SonarrEvent::GetEpisodeDetails(0))] event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/episode");
+  }
+
+  #[rstest]
+  fn test_resource_series(
+    #[values(
+      SonarrEvent::AddSeries(AddSeriesBody::default()),
+      SonarrEvent::ListSeries,
+      SonarrEvent::GetSeriesDetails(0),
+      SonarrEvent::DeleteSeries(DeleteSeriesParams::default()),
+      SonarrEvent::EditSeries(EditSeriesParams::default()),
+      SonarrEvent::ToggleSeasonMonitoring((0, 0)),
+      SonarrEvent::ToggleSeriesMonitoring(0),
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/series");
+  }
+
+  #[rstest]
+  fn test_resource_tag(
+    #[values(
+      SonarrEvent::AddTag(String::new()),
+      SonarrEvent::DeleteTag(0),
+      SonarrEvent::GetTags
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/tag");
+  }
+
+  #[rstest]
+  fn test_resource_host_config(
+    #[values(SonarrEvent::GetHostConfig, SonarrEvent::GetSecurityConfig)] event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/config/host");
+  }
+
+  #[rstest]
+  fn test_resource_command(
+    #[values(
+      SonarrEvent::GetQueuedEvents,
+      SonarrEvent::StartTask(SonarrTaskName::default()),
+      SonarrEvent::TriggerAutomaticEpisodeSearch(0),
+      SonarrEvent::TriggerAutomaticSeasonSearch((0, 0)),
+      SonarrEvent::TriggerAutomaticSeriesSearch(0),
+      SonarrEvent::UpdateAllSeries,
+      SonarrEvent::UpdateAndScanSeries(0),
+      SonarrEvent::UpdateDownloads
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/command");
+  }
+
+  #[rstest]
+  fn test_resource_indexer(
+    #[values(
+      SonarrEvent::GetIndexers,
+      SonarrEvent::DeleteIndexer(0),
+      SonarrEvent::EditIndexer(EditIndexerParams::default())
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/indexer");
+  }
+
+  #[rstest]
+  fn test_resource_history(
+    #[values(SonarrEvent::GetHistory(0), SonarrEvent::GetEpisodeHistory(0))] event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/history");
+  }
+
+  #[rstest]
+  fn test_resource_series_history(
+    #[values(
+      SonarrEvent::GetSeriesHistory(0),
+      SonarrEvent::GetSeasonHistory((0, 0))
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/history/series");
+  }
+
+  #[rstest]
+  fn test_resource_queue(
+    #[values(SonarrEvent::GetDownloads(0), SonarrEvent::DeleteDownload(0))] event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/queue");
+  }
+
+  #[rstest]
+  fn test_resource_root_folder(
+    #[values(
+      SonarrEvent::GetRootFolders,
+      SonarrEvent::DeleteRootFolder(0),
+      SonarrEvent::AddRootFolder(AddRootFolderBody::default())
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/rootfolder");
+  }
+
+  #[rstest]
+  fn test_resource_release(
+    #[values(
+      SonarrEvent::GetSeasonReleases((0, 0)),
+      SonarrEvent::GetEpisodeReleases(0)
+    )]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/release");
+  }
+
+  #[rstest]
+  fn test_resource_episode_file(
+    #[values(SonarrEvent::GetEpisodeFiles(0), SonarrEvent::DeleteEpisodeFile(0))]
+    event: SonarrEvent,
+  ) {
+    assert_str_eq!(event.resource(), "/episodefile");
+  }
+
+  #[rstest]
+  #[case(SonarrEvent::ClearBlocklist, "/blocklist/bulk")]
+  #[case(SonarrEvent::DeleteBlocklistItem(0), "/blocklist")]
+  #[case(SonarrEvent::HealthCheck, "/health")]
+  #[case(SonarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
+  #[case(SonarrEvent::GetDiskSpace, "/diskspace")]
+  #[case(SonarrEvent::GetLanguageProfiles, "/language")]
+  #[case(SonarrEvent::GetLogs(500), "/log")]
+  #[case(SonarrEvent::GetQualityProfiles, "/qualityprofile")]
+  #[case(SonarrEvent::GetStatus, "/system/status")]
+  #[case(SonarrEvent::GetTasks, "/system/task")]
+  #[case(SonarrEvent::GetUpdates, "/update")]
+  #[case(SonarrEvent::MarkHistoryItemAsFailed(0), "/history/failed")]
+  #[case(SonarrEvent::SearchNewSeries(String::new()), "/series/lookup")]
+  #[case(SonarrEvent::TestIndexer(0), "/indexer/test")]
+  #[case(SonarrEvent::TestAllIndexers, "/indexer/testall")]
+  #[case(SonarrEvent::ToggleEpisodeMonitoring(0), "/episode/monitor")]
+  fn test_resource(#[case] event: SonarrEvent, #[case] expected_uri: String) {
+    assert_str_eq!(event.resource(), expected_uri);
+  }
+
+  #[test]
+  fn test_from_sonarr_event() {
+    assert_eq!(
+      NetworkEvent::Sonarr(SonarrEvent::HealthCheck),
+      NetworkEvent::from(SonarrEvent::HealthCheck)
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_add_sonarr_tag() {
+    let tag_json = json!({ "id": 3, "label": "testing" });
+    let response: Tag = serde_json::from_value(tag_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({ "label": "testing" })),
+      Some(tag_json),
+      None,
+      SonarrEvent::AddTag(String::new()),
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.data.sonarr_data.tags_map =
+      BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Tag(tag) = network
+      .handle_sonarr_event(SonarrEvent::AddTag("testing".to_owned()))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.tags_map,
+        BiMap::from_iter([
+          (1, "usenet".to_owned()),
+          (2, "test".to_owned()),
+          (3, "testing".to_owned())
+        ])
+      );
+      assert_eq!(tag, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_tag_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteTag(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteTag(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_healthcheck_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      None,
+      None,
+      SonarrEvent::HealthCheck,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    let _ = network.handle_sonarr_event(SonarrEvent::HealthCheck).await;
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_language_profiles_event() {
+    let language_profiles_json = json!([{
+      "id": 2222,
+      "name": "English"
+    }]);
+    let response: Vec<Language> = serde_json::from_value(language_profiles_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(language_profiles_json),
+      None,
+      SonarrEvent::GetLanguageProfiles,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::LanguageProfiles(language_profiles) = network
+      .handle_sonarr_event(SonarrEvent::GetLanguageProfiles)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.language_profiles_map,
+        BiMap::from_iter([(2222i64, "English".to_owned())])
+      );
+      assert_eq!(language_profiles, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_quality_profiles_event() {
+    let quality_profile_json = json!([{
+      "id": 2222,
+      "name": "HD - 1080p"
+    }]);
+    let response: Vec<QualityProfile> =
+      serde_json::from_value(quality_profile_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(quality_profile_json),
+      None,
+      SonarrEvent::GetQualityProfiles,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::QualityProfiles(quality_profiles) = network
+      .handle_sonarr_event(SonarrEvent::GetQualityProfiles)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.quality_profile_map,
+        BiMap::from_iter([(2222i64, "HD - 1080p".to_owned())])
+      );
+      assert_eq!(quality_profiles, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_tags_event() {
+    let tags_json = json!([{
+      "id": 2222,
+      "label": "usenet"
+    }]);
+    let response: Vec<Tag> = serde_json::from_value(tags_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(tags_json),
+      None,
+      SonarrEvent::GetTags,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Tags(tags) = network
+      .handle_sonarr_event(SonarrEvent::GetTags)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.tags_map,
+        BiMap::from_iter([(2222i64, "usenet".to_owned())])
+      );
+      assert_eq!(tags, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_extract_and_add_sonarr_tag_ids_vec() {
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
+    let tags = "    test,HI ,, usenet ";
+    {
+      let mut app = app_arc.lock().await;
+      app.data.sonarr_data.tags_map = BiMap::from_iter([
+        (1, "usenet".to_owned()),
+        (2, "test".to_owned()),
+        (3, "hi".to_owned()),
+      ]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert_eq!(
+      network.extract_and_add_sonarr_tag_ids_vec(tags).await,
+      vec![2, 3, 1]
+    );
+  }
+
+  #[tokio::test]
+  async fn test_extract_and_add_sonarr_tag_ids_vec_add_missing_tags_first() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({ "label": "TESTING" })),
+      Some(json!({ "id": 3, "label": "testing" })),
+      None,
+      SonarrEvent::GetTags,
+      None,
+      None,
+    )
+    .await;
+    let tags = "usenet, test, TESTING";
+    {
+      let mut app = app_arc.lock().await;
+      app.data.sonarr_data.add_series_modal = Some(AddSeriesModal {
+        tags: tags.into(),
+        ..AddSeriesModal::default()
+      });
+      app.data.sonarr_data.tags_map =
+        BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
+    }
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    let tag_ids_vec = network.extract_and_add_sonarr_tag_ids_vec(tags).await;
+
+    async_server.assert_async().await;
+    assert_eq!(tag_ids_vec, vec![1, 2, 3]);
+    assert_eq!(
+      app_arc.lock().await.data.sonarr_data.tags_map,
+      BiMap::from_iter([
+        (1, "usenet".to_owned()),
+        (2, "test".to_owned()),
+        (3, "testing".to_owned())
+      ])
+    );
+  }
+}
diff --git a/src/network/sonarr_network/system/mod.rs b/src/network/sonarr_network/system/mod.rs
new file mode 100644
index 0000000..63798f2
--- /dev/null
+++ b/src/network/sonarr_network/system/mod.rs
@@ -0,0 +1,266 @@
+use crate::models::servarr_models::{
+  CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
+};
+use crate::models::sonarr_models::{SonarrTask, SonarrTaskName, SystemStatus};
+use crate::models::{HorizontallyScrollableText, Scrollable, ScrollableText};
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use indoc::formatdoc;
+use log::info;
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "sonarr_system_network_tests.rs"]
+mod sonarr_system_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn get_sonarr_host_config(
+    &mut self,
+  ) -> Result<HostConfig> {
+    info!("Fetching Sonarr host config");
+    let event = SonarrEvent::GetHostConfig;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), HostConfig>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_logs(
+    &mut self,
+    events: u64,
+  ) -> Result<LogResponse> {
+    info!("Fetching Sonarr logs");
+    let event = SonarrEvent::GetLogs(events);
+
+    let params = format!("pageSize={events}&sortDirection=descending&sortKey=time");
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, Some(params))
+      .await;
+
+    self
+      .handle_request::<(), LogResponse>(request_props, |log_response, mut app| {
+        let mut logs = log_response.records;
+        logs.reverse();
+
+        let log_lines = logs
+          .into_iter()
+          .map(|log| {
+            if log.exception.is_some() {
+              HorizontallyScrollableText::from(format!(
+                "{}|{}|{}|{}|{}",
+                log.time,
+                log.level.to_uppercase(),
+                log.logger.as_ref().unwrap(),
+                log.exception_type.as_ref().unwrap(),
+                log.exception.as_ref().unwrap()
+              ))
+            } else {
+              HorizontallyScrollableText::from(format!(
+                "{}|{}|{}|{}",
+                log.time,
+                log.level.to_uppercase(),
+                log.logger.as_ref().unwrap(),
+                log.message.as_ref().unwrap()
+              ))
+            }
+          })
+          .collect();
+
+        app.data.sonarr_data.logs.set_items(log_lines);
+        app.data.sonarr_data.logs.scroll_to_bottom();
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_diskspace(
+    &mut self,
+  ) -> Result<Vec<DiskSpace>> {
+    info!("Fetching Sonarr disk space");
+    let event = SonarrEvent::GetDiskSpace;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<DiskSpace>>(request_props, |disk_space_vec, mut app| {
+        app.data.sonarr_data.disk_space_vec = disk_space_vec;
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_queued_sonarr_events(
+    &mut self,
+  ) -> Result<Vec<QueueEvent>> {
+    info!("Fetching Sonarr queued events");
+    let event = SonarrEvent::GetQueuedEvents;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<QueueEvent>>(request_props, |queued_events_vec, mut app| {
+        app
+          .data
+          .sonarr_data
+          .queued_events
+          .set_items(queued_events_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_security_config(
+    &mut self,
+  ) -> Result<SecurityConfig> {
+    info!("Fetching Sonarr security config");
+    let event = SonarrEvent::GetSecurityConfig;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), SecurityConfig>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_status(
+    &mut self,
+  ) -> Result<SystemStatus> {
+    info!("Fetching Sonarr system status");
+    let event = SonarrEvent::GetStatus;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), SystemStatus>(request_props, |system_status, mut app| {
+        app.data.sonarr_data.version = system_status.version;
+        app.data.sonarr_data.start_time = system_status.start_time;
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_tasks(
+    &mut self,
+  ) -> Result<Vec<SonarrTask>> {
+    info!("Fetching Sonarr tasks");
+    let event = SonarrEvent::GetTasks;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<SonarrTask>>(request_props, |tasks_vec, mut app| {
+        app.data.sonarr_data.tasks.set_items(tasks_vec);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_updates(
+    &mut self,
+  ) -> Result<Vec<Update>> {
+    info!("Fetching Sonarr updates");
+    let event = SonarrEvent::GetUpdates;
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Get, None::<()>, None, None)
+      .await;
+
+    self
+      .handle_request::<(), Vec<Update>>(request_props, |updates_vec, mut app| {
+        let latest_installed = if updates_vec
+          .iter()
+          .any(|update| update.latest && update.installed_on.is_some())
+        {
+          "already".to_owned()
+        } else {
+          "not".to_owned()
+        };
+        let updates = updates_vec
+          .into_iter()
+          .map(|update| {
+            let install_status = if update.installed_on.is_some() {
+              if update.installed {
+                "(Currently Installed)".to_owned()
+              } else {
+                "(Previously Installed)".to_owned()
+              }
+            } else {
+              String::new()
+            };
+            let vec_to_bullet_points = |vec: Vec<String>| {
+              vec
+                .iter()
+                .map(|change| format!("  * {change}"))
+                .collect::<Vec<String>>()
+                .join("\n")
+            };
+
+            let mut update_info = formatdoc!(
+              "{} - {} {install_status}
+              {}",
+              update.version,
+              update.release_date,
+              "-".repeat(200)
+            );
+
+            if let Some(new_changes) = update.changes.new {
+              let changes = vec_to_bullet_points(new_changes);
+              update_info = formatdoc!(
+                "{update_info}
+              New:
+              {changes}"
+              )
+            }
+
+            if let Some(fixes) = update.changes.fixed {
+              let fixes = vec_to_bullet_points(fixes);
+              update_info = formatdoc!(
+                "{update_info}
+              Fixed:
+              {fixes}"
+              );
+            }
+
+            update_info
+          })
+          .reduce(|version_1, version_2| format!("{version_1}\n\n\n{version_2}"))
+          .unwrap();
+
+        app.data.sonarr_data.updates = ScrollableText::with_string(formatdoc!(
+          "The latest version of Sonarr is {latest_installed} installed
+          
+          {updates}"
+        ));
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn start_sonarr_task(
+    &mut self,
+    task: SonarrTaskName,
+  ) -> Result<Value> {
+    let event = SonarrEvent::StartTask(task);
+    let task_name = task.to_string();
+    info!("Starting Sonarr task: {task_name}");
+
+    let body = CommandBody { name: task_name };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}
diff --git a/src/network/sonarr_network/system/sonarr_system_network_tests.rs b/src/network/sonarr_network/system/sonarr_system_network_tests.rs
new file mode 100644
index 0000000..4ee3f37
--- /dev/null
+++ b/src/network/sonarr_network/system/sonarr_system_network_tests.rs
@@ -0,0 +1,492 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::servarr_models::{
+    DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
+  };
+  use crate::models::sonarr_models::{SonarrSerdeable, SonarrTask, SonarrTaskName, SystemStatus};
+  use crate::models::{HorizontallyScrollableText, ScrollableText};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use chrono::DateTime;
+  use indoc::formatdoc;
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_host_config_event() {
+    let host_config_response = json!({
+      "bindAddress": "*",
+      "port": 7878,
+      "urlBase": "some.test.site/sonarr",
+      "instanceName": "Sonarr",
+      "applicationUrl": "https://some.test.site:7878/sonarr",
+      "enableSsl": true,
+      "sslPort": 9898,
+      "sslCertPath": "/app/sonarr.pfx",
+      "sslCertPassword": "test"
+    });
+    let response: HostConfig = serde_json::from_value(host_config_response.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(host_config_response),
+      None,
+      SonarrEvent::GetHostConfig,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::HostConfig(host_config) = network
+      .handle_sonarr_event(SonarrEvent::GetHostConfig)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(host_config, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_logs_event() {
+    let expected_logs = vec![
+      HorizontallyScrollableText::from(
+        "2023-05-20 21:29:16 UTC|FATAL|SonarrError|Some.Big.Bad.Exception|test exception",
+      ),
+      HorizontallyScrollableText::from("2023-05-20 21:29:16 UTC|INFO|TestLogger|test message"),
+    ];
+    let logs_response_json = json!({
+      "page": 1,
+      "pageSize": 500,
+      "sortKey": "time",
+      "sortDirection": "descending",
+      "totalRecords": 2,
+      "records": [
+          {
+              "time": "2023-05-20T21:29:16Z",
+              "level": "info",
+              "logger": "TestLogger",
+              "message": "test message",
+              "id": 1
+          },
+          {
+              "time": "2023-05-20T21:29:16Z",
+              "level": "fatal",
+              "logger": "SonarrError",
+              "exception": "test exception",
+              "exceptionType": "Some.Big.Bad.Exception",
+              "id": 2
+          }
+        ]
+    });
+    let response: LogResponse = serde_json::from_value(logs_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(logs_response_json),
+      None,
+      SonarrEvent::GetLogs(500),
+      None,
+      Some("pageSize=500&sortDirection=descending&sortKey=time"),
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::LogResponse(logs) = network
+      .handle_sonarr_event(SonarrEvent::GetLogs(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.logs.items,
+        expected_logs
+      );
+      assert!(app_arc
+        .lock()
+        .await
+        .data
+        .sonarr_data
+        .logs
+        .current_selection()
+        .text
+        .contains("INFO"));
+      assert_eq!(logs, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_diskspace_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!([
+        {
+          "freeSpace": 1111,
+          "totalSpace": 2222,
+        },
+        {
+          "freeSpace": 3333,
+          "totalSpace": 4444
+        }
+      ])),
+      None,
+      SonarrEvent::GetDiskSpace,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    let disk_space_vec = vec![
+      DiskSpace {
+        free_space: 1111,
+        total_space: 2222,
+      },
+      DiskSpace {
+        free_space: 3333,
+        total_space: 4444,
+      },
+    ];
+
+    if let SonarrSerdeable::DiskSpaces(disk_space) = network
+      .handle_sonarr_event(SonarrEvent::GetDiskSpace)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.disk_space_vec,
+        disk_space_vec
+      );
+      assert_eq!(disk_space, disk_space_vec);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_queued_sonarr_events_event() {
+    let queued_events_json = json!([{
+        "name": "RefreshMonitoredDownloads",
+        "commandName": "Refresh Monitored Downloads",
+        "status": "completed",
+        "queued": "2023-05-20T21:29:16Z",
+        "started": "2023-05-20T21:29:16Z",
+        "ended": "2023-05-20T21:29:16Z",
+        "duration": "00:00:00.5111547",
+        "trigger": "scheduled",
+    }]);
+    let response: Vec<QueueEvent> = serde_json::from_value(queued_events_json.clone()).unwrap();
+    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
+    let expected_event = QueueEvent {
+      name: "RefreshMonitoredDownloads".to_owned(),
+      command_name: "Refresh Monitored Downloads".to_owned(),
+      status: "completed".to_owned(),
+      queued: timestamp,
+      started: Some(timestamp),
+      ended: Some(timestamp),
+      duration: Some("00:00:00.5111547".to_owned()),
+      trigger: "scheduled".to_owned(),
+    };
+
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(queued_events_json),
+      None,
+      SonarrEvent::GetQueuedEvents,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::QueueEvents(events) = network
+      .handle_sonarr_event(SonarrEvent::GetQueuedEvents)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.queued_events.items,
+        vec![expected_event]
+      );
+      assert_eq!(events, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_security_config_event() {
+    let security_config_response = json!({
+      "authenticationMethod": "forms",
+      "authenticationRequired": "disabledForLocalAddresses",
+      "username": "test",
+      "password": "some password",
+      "apiKey": "someApiKey12345",
+      "certificateValidation": "disabledForLocalAddresses",
+    });
+    let response: SecurityConfig =
+      serde_json::from_value(security_config_response.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(security_config_response),
+      None,
+      SonarrEvent::GetSecurityConfig,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::SecurityConfig(security_config) = network
+      .handle_sonarr_event(SonarrEvent::GetSecurityConfig)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(security_config, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_status_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(json!({
+        "version": "v1",
+        "startTime": "2023-02-25T20:16:43Z"
+      })),
+      None,
+      SonarrEvent::GetStatus,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+    let date_time = DateTime::from(DateTime::parse_from_rfc3339("2023-02-25T20:16:43Z").unwrap());
+
+    if let SonarrSerdeable::SystemStatus(status) = network
+      .handle_sonarr_event(SonarrEvent::GetStatus)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_str_eq!(app_arc.lock().await.data.sonarr_data.version, "v1");
+      assert_eq!(app_arc.lock().await.data.sonarr_data.start_time, date_time);
+      assert_eq!(
+        status,
+        SystemStatus {
+          version: "v1".to_owned(),
+          start_time: date_time
+        }
+      );
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_tasks_event() {
+    let tasks_json = json!([{
+        "name": "Application Update Check",
+        "taskName": "ApplicationUpdateCheck",
+        "interval": 360,
+        "lastExecution": "2023-05-20T21:29:16Z",
+        "nextExecution": "2023-05-20T21:29:16Z",
+    },
+    {
+        "name": "Backup",
+        "taskName": "Backup",
+        "interval": 10080,
+        "lastExecution": "2023-05-20T21:29:16Z",
+        "nextExecution": "2023-05-20T21:29:16Z",
+    }]);
+    let response: Vec<SonarrTask> = serde_json::from_value(tasks_json.clone()).unwrap();
+    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
+    let expected_tasks = vec![
+      SonarrTask {
+        name: "Application Update Check".to_owned(),
+        task_name: SonarrTaskName::ApplicationUpdateCheck,
+        interval: 360,
+        last_execution: timestamp,
+        next_execution: timestamp,
+      },
+      SonarrTask {
+        name: "Backup".to_owned(),
+        task_name: SonarrTaskName::Backup,
+        interval: 10080,
+        last_execution: timestamp,
+        next_execution: timestamp,
+      },
+    ];
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(tasks_json),
+      None,
+      SonarrEvent::GetTasks,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Tasks(tasks) = network
+      .handle_sonarr_event(SonarrEvent::GetTasks)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.tasks.items,
+        expected_tasks
+      );
+      assert_eq!(tasks, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_updates_event() {
+    let updates_json = json!([{
+      "version": "4.3.2.1",
+      "releaseDate": "2023-04-15T02:02:53Z",
+      "installed": true,
+      "installedOn": "2023-04-15T02:02:53Z",
+      "latest": true,
+      "changes": {
+        "new": [
+          "Cool new thing"
+        ],
+        "fixed": [
+          "Some bugs killed"
+        ]
+      },
+    },
+      {
+        "version": "3.2.1.0",
+        "releaseDate": "2023-04-15T02:02:53Z",
+        "installed": false,
+        "installedOn": "2023-04-15T02:02:53Z",
+        "latest": false,
+        "changes": {
+          "new": [
+            "Cool new thing (old)",
+            "Other cool new thing (old)"
+            ],
+        },
+    },
+    {
+      "version": "2.1.0",
+      "releaseDate": "2023-04-15T02:02:53Z",
+      "installed": false,
+      "latest": false,
+      "changes": {
+        "fixed": [
+          "Killed bug 1",
+          "Fixed bug 2"
+        ]
+      },
+    }]);
+    let response: Vec<Update> = serde_json::from_value(updates_json.clone()).unwrap();
+    let line_break = "-".repeat(200);
+    let expected_text = ScrollableText::with_string(formatdoc!(
+      "
+    The latest version of Sonarr is already installed
+
+    4.3.2.1 - 2023-04-15 02:02:53 UTC (Currently Installed)
+    {line_break}
+    New:
+      * Cool new thing
+    Fixed:
+      * Some bugs killed
+    
+    
+    3.2.1.0 - 2023-04-15 02:02:53 UTC (Previously Installed)
+    {line_break}
+    New:
+      * Cool new thing (old)
+      * Other cool new thing (old)
+    
+    
+    2.1.0 - 2023-04-15 02:02:53 UTC 
+    {line_break}
+    Fixed:
+      * Killed bug 1
+      * Fixed bug 2"
+    ));
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(updates_json),
+      None,
+      SonarrEvent::GetUpdates,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Updates(updates) = network
+      .handle_sonarr_event(SonarrEvent::GetUpdates)
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_str_eq!(
+        app_arc.lock().await.data.sonarr_data.updates.get_text(),
+        expected_text.get_text()
+      );
+      assert_eq!(updates, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_start_sonarr_task_event() {
+    let response = json!({ "test": "test"});
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "ApplicationUpdateCheck"
+      })),
+      Some(response.clone()),
+      None,
+      SonarrEvent::StartTask(SonarrTaskName::ApplicationUpdateCheck),
+      None,
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .tasks
+      .set_items(vec![SonarrTask {
+        task_name: SonarrTaskName::default(),
+        ..SonarrTask::default()
+      }]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::Value(value) = network
+      .handle_sonarr_event(SonarrEvent::StartTask(
+        SonarrTaskName::ApplicationUpdateCheck,
+      ))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(value, response);
+    }
+  }
+}
diff --git a/src/network/sonarr_network_tests.rs b/src/network/sonarr_network_tests.rs
deleted file mode 100644
index 0b8e680..0000000
--- a/src/network/sonarr_network_tests.rs
+++ /dev/null
@@ -1,5793 +0,0 @@
-#[cfg(test)]
-mod test {
-  use std::sync::Arc;
-
-  use bimap::BiMap;
-  use chrono::DateTime;
-  use indoc::formatdoc;
-  use mockito::Matcher;
-  use pretty_assertions::{assert_eq, assert_str_eq};
-  use reqwest::Client;
-  use rstest::rstest;
-  use serde_json::json;
-  use serde_json::{Number, Value};
-  use tokio::sync::Mutex;
-  use tokio_util::sync::CancellationToken;
-
-  use crate::models::sonarr_models::{
-    AddSeriesBody, AddSeriesOptions, AddSeriesSearchResult, AddSeriesSearchResultStatistics,
-    DownloadStatus, EditSeriesParams, IndexerSettings, MonitorEpisodeBody, SonarrHistoryEventType,
-  };
-
-  use crate::app::App;
-  use crate::models::radarr_models::IndexerTestResult;
-  use crate::models::servarr_data::modals::IndexerTestResultModalItem;
-  use crate::models::servarr_data::sonarr::modals::{
-    AddSeriesModal, EpisodeDetailsModal, SeasonDetailsModal,
-  };
-  use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
-  use crate::models::servarr_models::{
-    AddRootFolderBody, DiskSpace, EditIndexerParams, HostConfig, Indexer, IndexerField, Language,
-    LogResponse, Quality, QualityProfile, QualityWrapper, QueueEvent, RootFolder, SecurityConfig,
-    Tag, Update,
-  };
-  use crate::models::sonarr_models::{
-    BlocklistItem, DeleteSeriesParams, DownloadRecord, DownloadsResponse, Episode, EpisodeFile,
-    MediaInfo, SonarrRelease, SonarrReleaseDownloadBody, SonarrTaskName,
-  };
-  use crate::models::sonarr_models::{
-    BlocklistResponse, SonarrHistoryData, SonarrHistoryItem, SonarrHistoryWrapper,
-  };
-  use crate::models::sonarr_models::{SonarrTask, SystemStatus};
-  use crate::models::stateful_table::StatefulTable;
-  use crate::models::{sonarr_models::SonarrSerdeable, stateful_table::SortOption};
-  use crate::models::{HorizontallyScrollableText, ScrollableText};
-
-  use crate::network::sonarr_network::get_episode_status;
-  use crate::{
-    models::sonarr_models::{
-      Rating, Season, SeasonStatistics, Series, SeriesStatistics, SeriesStatus, SeriesType,
-    },
-    network::{
-      network_tests::test_utils::mock_servarr_api, sonarr_network::SonarrEvent, Network,
-      NetworkEvent, NetworkResource, RequestMethod,
-    },
-  };
-
-  const SERIES_JSON: &str = r#"{
-        "title": "Test",
-        "status": "continuing",
-        "ended": false,
-        "overview": "Blah blah blah",
-        "network": "HBO",
-        "seasons": [
-            {
-                "seasonNumber": 1,
-                "monitored": true,
-                "statistics": {
-                    "previousAiring": "2022-10-24T01:00:00Z",
-                    "episodeFileCount": 10,
-                    "episodeCount": 10,
-                    "totalEpisodeCount": 10,
-                    "sizeOnDisk": 36708563419,
-                    "percentOfEpisodes": 100.0
-                }
-            }
-        ],
-        "year": 2022,
-        "path": "/nfs/tv/Test",
-        "qualityProfileId": 6,
-        "languageProfileId": 1,
-        "seasonFolder": true,
-        "monitored": true,
-        "runtime": 63,
-        "tvdbId": 371572,
-        "seriesType": "standard",
-        "certification": "TV-MA",
-        "genres": ["cool", "family", "fun"],
-        "tags": [3],
-        "ratings": {"votes": 406744, "value": 8.4},
-        "statistics": {
-            "seasonCount": 2,
-            "episodeFileCount": 18,
-            "episodeCount": 18,
-            "totalEpisodeCount": 50,
-            "sizeOnDisk": 63894022699,
-            "percentOfEpisodes": 100.0
-        },
-        "id": 1
-    }
-"#;
-  const EPISODE_JSON: &str = r#"{
-    "seriesId": 1,
-    "tvdbId": 1234,
-    "episodeFileId": 1,
-    "seasonNumber": 1,
-    "episodeNumber": 1,
-    "title": "Something cool",
-    "airDateUtc": "2024-02-10T07:28:45Z",
-    "overview": "Okay so this one time at band camp...",
-    "episodeFile": {
-        "id": 1,
-        "relativePath": "/season 1/episode 1.mkv",
-        "path": "/nfs/tv/series/season 1/episode 1.mkv",
-        "size": 3543348019,
-        "dateAdded": "2024-02-10T07:28:45Z",
-        "languages": [{ "id": 1, "name": "English" }],
-        "quality": { "quality": { "name": "Bluray-1080p" } },
-        "mediaInfo": {
-            "audioBitrate": 0,
-            "audioChannels": 7.1,
-            "audioCodec": "AAC",
-            "audioLanguages": "eng",
-            "audioStreamCount": 1,
-            "videoBitDepth": 10,
-            "videoBitrate": 0,
-            "videoCodec": "x265",
-            "videoFps": 23.976,
-            "resolution": "1920x1080",
-            "runTime": "23:51",
-            "scanType": "Progressive",
-            "subtitles": "English"
-        }
-    },
-    "hasFile": true,
-    "monitored": true,
-    "id": 1
-  }"#;
-
-  #[rstest]
-  fn test_resource_all_indexer_settings(
-    #[values(
-      SonarrEvent::GetAllIndexerSettings,
-      SonarrEvent::EditAllIndexerSettings(IndexerSettings::default())
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/config/indexer");
-  }
-
-  #[rstest]
-  fn test_resource_episode(
-    #[values(SonarrEvent::GetEpisodes(0), SonarrEvent::GetEpisodeDetails(0))] event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/episode");
-  }
-
-  #[rstest]
-  fn test_resource_series(
-    #[values(
-      SonarrEvent::AddSeries(AddSeriesBody::default()),
-      SonarrEvent::ListSeries,
-      SonarrEvent::GetSeriesDetails(0),
-      SonarrEvent::DeleteSeries(DeleteSeriesParams::default()),
-      SonarrEvent::EditSeries(EditSeriesParams::default()),
-      SonarrEvent::ToggleSeasonMonitoring((0, 0))
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/series");
-  }
-
-  #[rstest]
-  fn test_resource_tag(
-    #[values(
-      SonarrEvent::AddTag(String::new()),
-      SonarrEvent::DeleteTag(0),
-      SonarrEvent::GetTags
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/tag");
-  }
-
-  #[rstest]
-  fn test_resource_host_config(
-    #[values(SonarrEvent::GetHostConfig, SonarrEvent::GetSecurityConfig)] event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/config/host");
-  }
-
-  #[rstest]
-  fn test_resource_command(
-    #[values(
-      SonarrEvent::GetQueuedEvents,
-      SonarrEvent::StartTask(SonarrTaskName::default()),
-      SonarrEvent::TriggerAutomaticEpisodeSearch(0),
-      SonarrEvent::TriggerAutomaticSeasonSearch((0, 0)),
-      SonarrEvent::TriggerAutomaticSeriesSearch(0),
-      SonarrEvent::UpdateAllSeries,
-      SonarrEvent::UpdateAndScanSeries(0),
-      SonarrEvent::UpdateDownloads
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/command");
-  }
-
-  #[rstest]
-  fn test_resource_indexer(
-    #[values(
-      SonarrEvent::GetIndexers,
-      SonarrEvent::DeleteIndexer(0),
-      SonarrEvent::EditIndexer(EditIndexerParams::default())
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/indexer");
-  }
-
-  #[rstest]
-  fn test_resource_history(
-    #[values(SonarrEvent::GetHistory(0), SonarrEvent::GetEpisodeHistory(0))] event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/history");
-  }
-
-  #[rstest]
-  fn test_resource_series_history(
-    #[values(
-      SonarrEvent::GetSeriesHistory(0),
-      SonarrEvent::GetSeasonHistory((0, 0))
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/history/series");
-  }
-
-  #[rstest]
-  fn test_resource_queue(
-    #[values(SonarrEvent::GetDownloads, SonarrEvent::DeleteDownload(0))] event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/queue");
-  }
-
-  #[rstest]
-  fn test_resource_root_folder(
-    #[values(
-      SonarrEvent::GetRootFolders,
-      SonarrEvent::DeleteRootFolder(0),
-      SonarrEvent::AddRootFolder(AddRootFolderBody::default())
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/rootfolder");
-  }
-
-  #[rstest]
-  fn test_resource_release(
-    #[values(
-      SonarrEvent::GetSeasonReleases((0, 0)),
-      SonarrEvent::GetEpisodeReleases(0)
-    )]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/release");
-  }
-
-  #[rstest]
-  fn test_resource_episode_file(
-    #[values(SonarrEvent::GetEpisodeFiles(0), SonarrEvent::DeleteEpisodeFile(0))]
-    event: SonarrEvent,
-  ) {
-    assert_str_eq!(event.resource(), "/episodefile");
-  }
-
-  #[rstest]
-  #[case(SonarrEvent::ClearBlocklist, "/blocklist/bulk")]
-  #[case(SonarrEvent::DeleteBlocklistItem(0), "/blocklist")]
-  #[case(SonarrEvent::HealthCheck, "/health")]
-  #[case(SonarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
-  #[case(SonarrEvent::GetDiskSpace, "/diskspace")]
-  #[case(SonarrEvent::GetLanguageProfiles, "/language")]
-  #[case(SonarrEvent::GetLogs(500), "/log")]
-  #[case(SonarrEvent::GetQualityProfiles, "/qualityprofile")]
-  #[case(SonarrEvent::GetStatus, "/system/status")]
-  #[case(SonarrEvent::GetTasks, "/system/task")]
-  #[case(SonarrEvent::GetUpdates, "/update")]
-  #[case(SonarrEvent::MarkHistoryItemAsFailed(0), "/history/failed")]
-  #[case(SonarrEvent::SearchNewSeries(String::new()), "/series/lookup")]
-  #[case(SonarrEvent::TestIndexer(0), "/indexer/test")]
-  #[case(SonarrEvent::TestAllIndexers, "/indexer/testall")]
-  #[case(SonarrEvent::ToggleEpisodeMonitoring(0), "/episode/monitor")]
-  fn test_resource(#[case] event: SonarrEvent, #[case] expected_uri: String) {
-    assert_str_eq!(event.resource(), expected_uri);
-  }
-
-  #[test]
-  fn test_from_sonarr_event() {
-    assert_eq!(
-      NetworkEvent::Sonarr(SonarrEvent::HealthCheck),
-      NetworkEvent::from(SonarrEvent::HealthCheck)
-    );
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_sonarr_root_folder_event() {
-    let expected_add_root_folder_body = AddRootFolderBody {
-      path: "/nfs/test".to_owned(),
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "path": "/nfs/test"
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::AddRootFolder(expected_add_root_folder_body.clone()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::AddRootFolder(expected_add_root_folder_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .edit_root_folder
-      .is_none());
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_sonarr_series_event() {
-    let expected_add_series_body = AddSeriesBody {
-      tvdb_id: 1234,
-      title: "Test".to_owned(),
-      monitored: true,
-      root_folder_path: "/nfs2".to_owned(),
-      quality_profile_id: 2222,
-      language_profile_id: 2222,
-      series_type: "standard".to_owned(),
-      season_folder: true,
-      tags: Vec::new(),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      add_options: AddSeriesOptions {
-        monitor: "all".to_owned(),
-        search_for_cutoff_unmet_episodes: true,
-        search_for_missing_episodes: true,
-      },
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "tvdbId": 1234,
-        "title": "Test",
-        "monitored": true,
-        "rootFolderPath": "/nfs2",
-        "qualityProfileId": 2222,
-        "languageProfileId": 2222,
-        "seriesType": "standard",
-        "seasonFolder": true,
-        "tags": [1, 2],
-        "addOptions": {
-          "monitor": "all",
-          "searchForCutoffUnmetEpisodes": true,
-          "searchForMissingEpisodes": true
-        }
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::AddSeries(expected_add_series_body.clone()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::AddSeries(expected_add_series_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_sonarr_series_event_does_not_overwrite_tags_vec_when_tag_input_string_is_none(
-  ) {
-    let expected_add_series_body = AddSeriesBody {
-      tvdb_id: 1234,
-      title: "Test".to_owned(),
-      monitored: true,
-      root_folder_path: "/nfs2".to_owned(),
-      quality_profile_id: 2222,
-      language_profile_id: 2222,
-      series_type: "standard".to_owned(),
-      season_folder: true,
-      tags: vec![1, 2],
-      tag_input_string: None,
-      add_options: AddSeriesOptions {
-        monitor: "all".to_owned(),
-        search_for_cutoff_unmet_episodes: true,
-        search_for_missing_episodes: true,
-      },
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "tvdbId": 1234,
-        "title": "Test",
-        "monitored": true,
-        "rootFolderPath": "/nfs2",
-        "qualityProfileId": 2222,
-        "languageProfileId": 2222,
-        "seriesType": "standard",
-        "seasonFolder": true,
-        "tags": [1, 2],
-        "addOptions": {
-          "monitor": "all",
-          "searchForCutoffUnmetEpisodes": true,
-          "searchForMissingEpisodes": true
-        }
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::AddSeries(expected_add_series_body.clone()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::AddSeries(expected_add_series_body))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_sonarr_tag() {
-    let tag_json = json!({ "id": 3, "label": "testing" });
-    let response: Tag = serde_json::from_value(tag_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({ "label": "testing" })),
-      Some(tag_json),
-      None,
-      SonarrEvent::AddTag(String::new()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Tag(tag) = network
-      .handle_sonarr_event(SonarrEvent::AddTag("testing".to_owned()))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.tags_map,
-        BiMap::from_iter([
-          (1, "usenet".to_owned()),
-          (2, "test".to_owned()),
-          (3, "testing".to_owned())
-        ])
-      );
-      assert_eq!(tag, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_clear_radarr_blocklist_event() {
-    let blocklist_items = vec![
-      BlocklistItem {
-        id: 1,
-        ..blocklist_item()
-      },
-      BlocklistItem {
-        id: 2,
-        ..blocklist_item()
-      },
-      BlocklistItem {
-        id: 3,
-        ..blocklist_item()
-      },
-    ];
-    let expected_request_json = json!({ "ids": [1, 2, 3]});
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      Some(expected_request_json),
-      None,
-      None,
-      SonarrEvent::ClearBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .blocklist
-      .set_items(blocklist_items);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ClearBlocklist)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_blocklist_item_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteBlocklistItem(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .blocklist
-      .set_items(vec![blocklist_item()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteBlocklistItem(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_episode_file_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteEpisodeFile(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.season_details_modal =
-      Some(SeasonDetailsModal::default());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteEpisodeFile(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_download_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteDownload(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .downloads
-      .set_items(vec![download_record()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteDownload(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_indexer_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteIndexer(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .indexers
-      .set_items(vec![indexer()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteIndexer(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_root_folder_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteRootFolder(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteRootFolder(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_series_event() {
-    let delete_series_params = DeleteSeriesParams {
-      id: 1,
-      delete_series_files: true,
-      add_list_exclusion: true,
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteSeries(delete_series_params.clone()),
-      Some("/1"),
-      Some("deleteFiles=true&addImportExclusion=true"),
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteSeries(delete_series_params))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_tag_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteTag(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteTag(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_download_sonarr_release_event_uses_provided_params() {
-    let params = SonarrReleaseDownloadBody {
-      guid: "1234".to_owned(),
-      indexer_id: 2,
-      series_id: Some(1),
-      ..SonarrReleaseDownloadBody::default()
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "guid": "1234",
-        "indexerId": 2,
-        "seriesId": 1,
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::DownloadRelease(params.clone()),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DownloadRelease(params))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_all_indexer_settings_event() {
-    let indexer_settings_json = json!({
-        "id": 1,
-        "minimumAge": 1,
-        "maximumSize": 12345,
-        "retention": 1,
-        "rssSyncInterval": 60
-    });
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Put,
-      Some(indexer_settings_json),
-      None,
-      None,
-      SonarrEvent::EditAllIndexerSettings(indexer_settings()),
-      None,
-      None,
-    )
-    .await;
-
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditAllIndexerSettings(indexer_settings()))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_sonarr_indexer_event() {
-    let expected_edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.3",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_sonarr_indexer_event_does_not_overwrite_tags_vec_if_tag_input_string_is_none(
-  ) {
-    let expected_edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tags: Some(vec![1, 2]),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.3",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_sonarr_indexer_event_does_not_add_seed_ratio_when_seed_ratio_field_is_none_in_details(
-  ) {
-    let expected_edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_sonarr_indexer_event_populates_the_seed_ratio_value_when_seed_ratio_field_is_present_in_details(
-  ) {
-    let expected_edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      name: Some("Test Update".to_owned()),
-      enable_rss: Some(false),
-      enable_automatic_search: Some(false),
-      enable_interactive_search: Some(false),
-      url: Some("https://localhost:9696/1/".to_owned()),
-      api_key: Some("test1234".to_owned()),
-      seed_ratio: Some("1.3".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      priority: Some(0),
-      ..EditIndexerParams::default()
-    };
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let expected_indexer_edit_body_json = json!({
-        "enableRss": false,
-        "enableAutomaticSearch": false,
-        "enableInteractiveSearch": false,
-        "name": "Test Update",
-        "priority": 0,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://localhost:9696/1/",
-            },
-            {
-                "name": "apiKey",
-                "value": "test1234",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.3",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          SonarrEvent::EditIndexer(expected_edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_indexer_edit_body_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditIndexer(expected_edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_sonarr_indexer_event_defaults_to_previous_values() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      ..EditIndexerParams::default()
-    };
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          SonarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json))
-      .create_async()
-      .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_sonarr_indexer_event_clears_tags_when_clear_tags_is_true() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1, 2],
-        "id": 1
-    });
-    let expected_edit_indexer_body = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "priority": 1,
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [],
-        "id": 1
-    });
-    let edit_indexer_params = EditIndexerParams {
-      indexer_id: 1,
-      clear_tags: true,
-      ..EditIndexerParams::default()
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1?forceSave=true",
-          SonarrEvent::EditIndexer(edit_indexer_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_edit_indexer_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditIndexer(edit_indexer_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_series_event() {
-    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *expected_body.get_mut("monitored").unwrap() = json!(false);
-    *expected_body.get_mut("seasonFolder").unwrap() = json!(false);
-    *expected_body.get_mut("seriesType").unwrap() = json!("standard");
-    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("languageProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
-    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
-    let edit_series_params = EditSeriesParams {
-      series_id: 1,
-      monitored: Some(false),
-      use_season_folders: Some(false),
-      series_type: Some(SeriesType::Standard),
-      quality_profile_id: Some(1111),
-      language_profile_id: Some(1111),
-      root_folder_path: Some("/nfs/Test Path".to_owned()),
-      tag_input_string: Some("usenet, testing".to_owned()),
-      ..EditSeriesParams::default()
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(SERIES_JSON).unwrap()),
-      None,
-      SonarrEvent::GetSeriesDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_series_event_does_not_overwrite_tag_ids_vec_when_tag_input_string_is_none(
-  ) {
-    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *expected_body.get_mut("monitored").unwrap() = json!(false);
-    *expected_body.get_mut("seasonFolder").unwrap() = json!(false);
-    *expected_body.get_mut("seriesType").unwrap() = json!("standard");
-    *expected_body.get_mut("qualityProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("languageProfileId").unwrap() = json!(1111);
-    *expected_body.get_mut("path").unwrap() = json!("/nfs/Test Path");
-    *expected_body.get_mut("tags").unwrap() = json!([1, 2]);
-    let edit_series_params = EditSeriesParams {
-      series_id: 1,
-      monitored: Some(false),
-      use_season_folders: Some(false),
-      series_type: Some(SeriesType::Standard),
-      quality_profile_id: Some(1111),
-      language_profile_id: Some(1111),
-      root_folder_path: Some("/nfs/Test Path".to_owned()),
-      tags: Some(vec![1, 2]),
-      ..EditSeriesParams::default()
-    };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(SERIES_JSON).unwrap()),
-      None,
-      SonarrEvent::GetSeriesDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.data.sonarr_data.tags_map =
-      BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_series_event_defaults_to_previous_values() {
-    let edit_series_params = EditSeriesParams {
-      series_id: 1,
-      ..EditSeriesParams::default()
-    };
-    let expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(SERIES_JSON).unwrap()),
-      None,
-      SonarrEvent::GetSeriesDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_series_event_returns_empty_tags_vec_when_clear_tags_is_true() {
-    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *expected_body.get_mut("tags").unwrap() = json!([]);
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(SERIES_JSON).unwrap()),
-      None,
-      SonarrEvent::GetSeriesDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let edit_series_params = EditSeriesParams {
-      series_id: 1,
-      clear_tags: true,
-      ..EditSeriesParams::default()
-    };
-    let async_edit_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          SonarrEvent::EditSeries(edit_series_params.clone()).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::EditSeries(edit_series_params))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_edit_server.assert_async().await;
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_sonarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
-    let blocklist_json = json!({"records": [{
-        "seriesId": 1007,
-        "episodeIds": [42020],
-        "sourceTitle": "z series",
-        "languages": [{ "id": 1, "name": "English" }],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "NZBgeek (Prowlarr)",
-        "message": "test message",
-        "id": 123
-    },
-    {
-        "seriesId": 2001,
-        "episodeIds": [42018],
-        "sourceTitle": "A Series",
-        "languages": [{ "id": 1, "name": "English" }],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "NZBgeek (Prowlarr)",
-        "message": "test message",
-        "id": 456
-    }]});
-    let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
-    let mut expected_blocklist = vec![
-      BlocklistItem {
-        id: 123,
-        series_id: 1007,
-        series_title: Some("Z Series".into()),
-        source_title: "z series".into(),
-        episode_ids: vec![Number::from(42020)],
-        ..blocklist_item()
-      },
-      BlocklistItem {
-        id: 456,
-        series_id: 2001,
-        source_title: "A Series".into(),
-        episode_ids: vec![Number::from(42018)],
-        ..blocklist_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(blocklist_json),
-      None,
-      SonarrEvent::GetBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1007,
-        title: "Z Series".into(),
-        ..series()
-      }]);
-    app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
-        a.source_title
-          .to_lowercase()
-          .cmp(&b.source_title.to_lowercase())
-      };
-      expected_blocklist.sort_by(cmp_fn);
-
-      let blocklist_sort_option = SortOption {
-        name: "Source Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .blocklist
-        .sorting(vec![blocklist_sort_option]);
-    }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::BlocklistResponse(blocklist) = network
-      .handle_sonarr_event(SonarrEvent::GetBlocklist)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.blocklist.items,
-        expected_blocklist
-      );
-      assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
-      assert_eq!(blocklist, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_blocklist_event_no_op_when_user_is_selecting_sort_options() {
-    let blocklist_json = json!({"records": [{
-        "seriesId": 1007,
-        "episodeIds": [42020],
-        "sourceTitle": "z series",
-        "languages": [{ "id": 1, "name": "English" }],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "NZBgeek (Prowlarr)",
-        "message": "test message",
-        "id": 123
-    },
-    {
-        "seriesId": 2001,
-        "episodeIds": [42018],
-        "sourceTitle": "A Series",
-        "languages": [{ "id": 1, "name": "English" }],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-        "date": "2024-02-10T07:28:45Z",
-        "protocol": "usenet",
-        "indexer": "NZBgeek (Prowlarr)",
-        "message": "test message",
-        "id": 456
-    }]});
-    let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(blocklist_json),
-      None,
-      SonarrEvent::GetBlocklist,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::BlocklistSortPrompt.into());
-    let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
-      a.source_title
-        .to_lowercase()
-        .cmp(&b.source_title.to_lowercase())
-    };
-    let blocklist_sort_option = SortOption {
-      name: "Source Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .blocklist
-      .sorting(vec![blocklist_sort_option]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::BlocklistResponse(blocklist) = network
-      .handle_sonarr_event(SonarrEvent::GetBlocklist)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc.lock().await.data.sonarr_data.blocklist.is_empty());
-      assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
-      assert_eq!(blocklist, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_downloads_event() {
-    let downloads_response_json = json!({
-      "records": [{
-        "title": "Test Download Title",
-        "status": "downloading",
-        "id": 1,
-        "episodeId": 1,
-        "size": 3543348019f64,
-        "sizeleft": 1771674009f64,
-        "outputPath": "/nfs/tv/Test show/season 1/",
-        "indexer": "kickass torrents",
-        "downloadClient": "transmission",
-      }]
-    });
-    let response: DownloadsResponse =
-      serde_json::from_value(downloads_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(downloads_response_json),
-      None,
-      SonarrEvent::GetDownloads,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::DownloadsResponse(downloads) = network
-      .handle_sonarr_event(SonarrEvent::GetDownloads)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.downloads.items,
-        downloads_response().records
-      );
-      assert_eq!(downloads, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_diskspace_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([
-        {
-          "freeSpace": 1111,
-          "totalSpace": 2222,
-        },
-        {
-          "freeSpace": 3333,
-          "totalSpace": 4444
-        }
-      ])),
-      None,
-      SonarrEvent::GetDiskSpace,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-    let disk_space_vec = vec![
-      DiskSpace {
-        free_space: 1111,
-        total_space: 2222,
-      },
-      DiskSpace {
-        free_space: 3333,
-        total_space: 4444,
-      },
-    ];
-
-    if let SonarrSerdeable::DiskSpaces(disk_space) = network
-      .handle_sonarr_event(SonarrEvent::GetDiskSpace)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.disk_space_vec,
-        disk_space_vec
-      );
-      assert_eq!(disk_space, disk_space_vec);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_healthcheck_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      None,
-      None,
-      SonarrEvent::HealthCheck,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    let _ = network.handle_sonarr_event(SonarrEvent::HealthCheck).await;
-
-    async_server.assert_async().await;
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_episodes_event(#[values(true, false)] use_custom_sorting: bool) {
-    let episode_1 = Episode {
-      title: "z test".to_owned(),
-      episode_file: None,
-      ..episode()
-    };
-    let episode_2 = Episode {
-      id: 2,
-      title: "A test".to_owned(),
-      episode_file_id: 2,
-      season_number: 2,
-      episode_number: 2,
-      episode_file: None,
-      ..episode()
-    };
-    let episode_3 = Episode {
-      id: 3,
-      title: "A test".to_owned(),
-      episode_file_id: 3,
-      season_number: 1,
-      episode_number: 2,
-      episode_file: None,
-      ..episode()
-    };
-    let expected_episodes = vec![episode_1.clone(), episode_2.clone(), episode_3.clone()];
-    let mut expected_sorted_episodes = vec![episode_1.clone(), episode_3.clone()];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([episode_1, episode_2, episode_3])),
-      None,
-      SonarrEvent::GetEpisodes(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &Episode, b: &Episode| a.title.to_lowercase().cmp(&b.title.to_lowercase());
-      expected_sorted_episodes.sort_by(cmp_fn);
-      let title_sort_option = SortOption {
-        name: "Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      season_details_modal
-        .episodes
-        .sorting(vec![title_sort_option]);
-    }
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1,
-        ..Series::default()
-      }]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .seasons
-      .set_items(vec![Season {
-        season_number: 1,
-        ..Season::default()
-      }]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episodes(episodes) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episodes
-          .items,
-        expected_sorted_episodes
-      );
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episodes
-          .sort_asc
-      );
-      assert_eq!(episodes, expected_episodes);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episodes_event_empty_seasons_table_returns_all_episodes_by_default() {
-    let episode_1 = Episode {
-      title: "z test".to_owned(),
-      episode_file: None,
-      ..episode()
-    };
-    let episode_2 = Episode {
-      id: 2,
-      title: "A test".to_owned(),
-      episode_file_id: 2,
-      season_number: 2,
-      episode_number: 2,
-      episode_file: None,
-      ..episode()
-    };
-    let episode_3 = Episode {
-      id: 3,
-      title: "A test".to_owned(),
-      episode_file_id: 3,
-      season_number: 1,
-      episode_number: 2,
-      episode_file: None,
-      ..episode()
-    };
-    let expected_episodes = vec![episode_1.clone(), episode_2.clone(), episode_3.clone()];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([episode_1, episode_2, episode_3])),
-      None,
-      SonarrEvent::GetEpisodes(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.sort_asc = true;
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1,
-        ..Series::default()
-      }]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episodes(episodes) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episodes
-          .items,
-        expected_episodes
-      );
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episodes
-          .sort_asc
-      );
-      assert_eq!(episodes, expected_episodes);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episodes_event_empty_season_details_modal() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([episode()])),
-      None,
-      SonarrEvent::GetEpisodes(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1,
-        ..Series::default()
-      }]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episodes(episodes) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episodes
-          .items,
-        vec![episode()]
-      );
-      assert_eq!(episodes, vec![episode()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episodes_event_no_op_while_user_is_selecting_sort_options_on_table() {
-    let episodes_json = json!([
-      {
-          "id": 2,
-          "seriesId": 1,
-          "tvdbId": 1234,
-          "episodeFileId": 2,
-          "seasonNumber": 2,
-          "episodeNumber": 2,
-          "title": "Something cool",
-          "airDateUtc": "2024-02-10T07:28:45Z",
-          "overview": "Okay so this one time at band camp...",
-          "hasFile": true,
-          "monitored": true
-      },
-      {
-          "id": 1,
-          "seriesId": 1,
-          "tvdbId": 1234,
-          "episodeFileId": 1,
-          "seasonNumber": 1,
-          "episodeNumber": 1,
-          "title": "Something cool",
-          "airDateUtc": "2024-02-10T07:28:45Z",
-          "overview": "Okay so this one time at band camp...",
-          "hasFile": true,
-          "monitored": true
-      }
-    ]);
-    let episode_1 = Episode {
-      episode_file: None,
-      ..episode()
-    };
-    let episode_2 = Episode {
-      id: 2,
-      episode_file_id: 2,
-      season_number: 2,
-      episode_number: 2,
-      episode_file: None,
-      ..episode()
-    };
-    let mut expected_episodes = vec![episode_2.clone(), episode_1.clone()];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(episodes_json),
-      None,
-      SonarrEvent::GetEpisodes(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::EpisodesSortPrompt.into());
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.sort_asc = true;
-    let cmp_fn = |a: &Episode, b: &Episode| a.title.to_lowercase().cmp(&b.title.to_lowercase());
-    expected_episodes.sort_by(cmp_fn);
-    let title_sort_option = SortOption {
-      name: "Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    season_details_modal
-      .episodes
-      .sorting(vec![title_sort_option]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1,
-        ..Series::default()
-      }]);
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episodes(episodes) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodes(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .episodes
-        .is_empty());
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episodes
-          .sort_asc
-      );
-      assert_eq!(episodes, expected_episodes);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_files_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([episode_file()])),
-      None,
-      SonarrEvent::GetEpisodeFiles(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.season_details_modal =
-      Some(SeasonDetailsModal::default());
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1,
-        ..Series::default()
-      }]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::EpisodeFiles(episode_files) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeFiles(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_files
-          .items,
-        vec![episode_file()]
-      );
-      assert_eq!(episode_files, vec![episode_file()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_files_event_empty_season_details_modal() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([episode_file()])),
-      None,
-      SonarrEvent::GetEpisodeFiles(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![Series {
-        id: 1,
-        ..Series::default()
-      }]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::EpisodeFiles(episode_files) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeFiles(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .season_details_modal
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_files
-          .items,
-        vec![episode_file()]
-      );
-      assert_eq!(episode_files, vec![episode_file()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_host_config_event() {
-    let host_config_response = json!({
-      "bindAddress": "*",
-      "port": 7878,
-      "urlBase": "some.test.site/sonarr",
-      "instanceName": "Sonarr",
-      "applicationUrl": "https://some.test.site:7878/sonarr",
-      "enableSsl": true,
-      "sslPort": 9898,
-      "sslCertPath": "/app/sonarr.pfx",
-      "sslCertPassword": "test"
-    });
-    let response: HostConfig = serde_json::from_value(host_config_response.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(host_config_response),
-      None,
-      SonarrEvent::GetHostConfig,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::HostConfig(host_config) = network
-      .handle_sonarr_event(SonarrEvent::GetHostConfig)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(host_config, response);
-    }
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_sonarr_history_event(#[values(true, false)] use_custom_sorting: bool) {
-    let history_json = json!({"records": [{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]});
-    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
-    let mut expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetHistory(500),
-      None,
-      Some("pageSize=500&sortDirection=descending&sortKey=date"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.history.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
-        a.source_title
-          .text
-          .to_lowercase()
-          .cmp(&b.source_title.text.to_lowercase())
-      };
-      expected_history_items.sort_by(cmp_fn);
-
-      let history_sort_option = SortOption {
-        name: "Source Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .history
-        .sorting(vec![history_sort_option]);
-    }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
-      .handle_sonarr_event(SonarrEvent::GetHistory(500))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.history.items,
-        expected_history_items
-      );
-      assert!(app_arc.lock().await.data.sonarr_data.history.sort_asc);
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_history_event_no_op_when_user_is_selecting_sort_options() {
-    let history_json = json!({"records": [{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]});
-    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetHistory(500),
-      None,
-      Some("pageSize=500&sortDirection=descending&sortKey=date"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.history.sort_asc = true;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::HistorySortPrompt.into());
-    let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
-      a.source_title
-        .text
-        .to_lowercase()
-        .cmp(&b.source_title.text.to_lowercase())
-    };
-    let history_sort_option = SortOption {
-      name: "Source Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .history
-      .sorting(vec![history_sort_option]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
-      .handle_sonarr_event(SonarrEvent::GetHistory(500))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc.lock().await.data.sonarr_data.history.is_empty());
-      assert!(app_arc.lock().await.data.sonarr_data.history.sort_asc);
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_indexers_event() {
-    let indexers_response_json = json!([{
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "supportsRss": true,
-        "supportsSearch": true,
-        "protocol": "torrent",
-        "priority": 25,
-        "downloadClientId": 0,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "implementationName": "Torznab",
-        "implementation": "Torznab",
-        "configContract": "TorznabSettings",
-        "tags": [1],
-        "id": 1
-    }]);
-    let response: Vec<Indexer> = serde_json::from_value(indexers_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexers_response_json),
-      None,
-      SonarrEvent::GetIndexers,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Indexers(indexers) = network
-      .handle_sonarr_event(SonarrEvent::GetIndexers)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.indexers.items,
-        vec![indexer()]
-      );
-      assert_eq!(indexers, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_details_event() {
-    let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
-      None,
-      SonarrEvent::GetEpisodeDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut episode_details_modal = EpisodeDetailsModal::default();
-    episode_details_modal.episode_details_tabs.next();
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.set_items(vec![episode()]);
-    season_details_modal.episode_details_modal = Some(episode_details_modal);
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episode(episode) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .episode_details_modal
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_tabs
-          .get_active_route(),
-        ActiveSonarrBlock::EpisodeHistory.into()
-      );
-      assert_eq!(episode, response);
-
-      let app = app_arc.lock().await;
-      let episode_details_modal = app
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .episode_details_modal
-        .as_ref()
-        .unwrap();
-      assert_str_eq!(
-        episode_details_modal.episode_details.get_text(),
-        formatdoc!(
-          "Title: Something cool
-          Season: 1
-          Episode Number: 1
-          Air Date: 2024-02-10 07:28:45 UTC
-          Status: Downloaded
-          Description: Okay so this one time at band camp..."
-        )
-      );
-      assert_str_eq!(
-        episode_details_modal.file_details,
-        formatdoc!(
-          "Relative Path: /season 1/episode 1.mkv
-          Absolute Path: /nfs/tv/series/season 1/episode 1.mkv
-          Size: 3.30 GB
-          Language: English
-          Date Added: 2024-02-10 07:28:45 UTC"
-        )
-      );
-      assert_str_eq!(
-        episode_details_modal.audio_details,
-        formatdoc!(
-          "Bitrate: 0
-          Channels: 7.1
-          Codec: AAC
-          Languages: eng
-          Stream Count: 1"
-        )
-      );
-      assert_str_eq!(
-        episode_details_modal.video_details,
-        formatdoc!(
-          "Bit Depth: 10
-          Bitrate: 0
-          Codec: x265
-          FPS: 23.976
-          Resolution: 1920x1080
-          Scan Type: Progressive
-          Runtime: 23:51
-          Subtitles: English"
-        )
-      );
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_details_event_empty_episode_details_modal() {
-    let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
-      None,
-      SonarrEvent::GetEpisodeDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.set_items(vec![episode()]);
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episode(episode) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .episode_details_modal
-        .is_some());
-      assert_eq!(episode, response);
-
-      let app = app_arc.lock().await;
-      let episode_details_modal = app
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .episode_details_modal
-        .as_ref()
-        .unwrap();
-      assert_str_eq!(
-        episode_details_modal.episode_details.get_text(),
-        formatdoc!(
-          "Title: Something cool
-          Season: 1
-          Episode Number: 1
-          Air Date: 2024-02-10 07:28:45 UTC
-          Status: Downloaded
-          Description: Okay so this one time at band camp..."
-        )
-      );
-      assert_str_eq!(
-        episode_details_modal.file_details,
-        formatdoc!(
-          "Relative Path: /season 1/episode 1.mkv
-          Absolute Path: /nfs/tv/series/season 1/episode 1.mkv
-          Size: 3.30 GB
-          Language: English
-          Date Added: 2024-02-10 07:28:45 UTC"
-        )
-      );
-      assert_str_eq!(
-        episode_details_modal.audio_details,
-        formatdoc!(
-          "Bitrate: 0
-          Channels: 7.1
-          Codec: AAC
-          Languages: eng
-          Stream Count: 1"
-        )
-      );
-      assert_str_eq!(
-        episode_details_modal.video_details,
-        formatdoc!(
-          "Bit Depth: 10
-          Bitrate: 0
-          Codec: x265
-          FPS: 23.976
-          Resolution: 1920x1080
-          Scan Type: Progressive
-          Runtime: 23:51
-          Subtitles: English"
-        )
-      );
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_episode_history_event() {
-    let history_json = json!({"records": [{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]});
-    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetEpisodeHistory(1),
-      None,
-      Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.season_details_modal =
-      Some(SeasonDetailsModal::default());
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_mut()
-      .unwrap()
-      .episodes
-      .set_items(vec![episode()]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_mut()
-      .unwrap()
-      .episode_details_modal = Some(EpisodeDetailsModal::default());
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_mut()
-      .unwrap()
-      .episode_details_modal
-      .as_mut()
-      .unwrap()
-      .episode_history
-      .sort_asc = true;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_history
-          .items,
-        expected_history_items
-      );
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_history
-          .sort_asc
-      );
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_episode_history_event_empty_episode_details_modal() {
-    let history_json = json!({"records": [{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]});
-    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetEpisodeHistory(1),
-      None,
-      Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.season_details_modal =
-      Some(SeasonDetailsModal::default());
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_mut()
-      .unwrap()
-      .episodes
-      .set_items(vec![episode()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_history
-          .items,
-        expected_history_items
-      );
-      assert!(
-        !app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_history
-          .sort_asc
-      );
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_episode_history_event_empty_season_details_modal() {
-    let history_json = json!({"records": [{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]});
-    let response: SonarrHistoryWrapper = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetEpisodeHistory(1),
-      None,
-      Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_history
-          .items,
-        expected_history_items
-      );
-      assert!(
-        !app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_history
-          .sort_asc
-      );
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_details_event_season_details_modal_not_required_in_cli_mode() {
-    let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
-      None,
-      SonarrEvent::GetEpisodeDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.cli_mode = true;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Episode(episode) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(episode, response);
-    }
-  }
-
-  #[tokio::test]
-  #[should_panic(expected = "Season details modal is empty")]
-  async fn test_handle_get_episode_details_event_requires_season_details_modal_to_be_some_when_in_tui_mode(
-  ) {
-    let (_async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(EPISODE_JSON).unwrap()),
-      None,
-      SonarrEvent::GetEpisodeDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
-      .await
-      .unwrap();
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_language_profiles_event() {
-    let language_profiles_json = json!([{
-      "id": 2222,
-      "name": "English"
-    }]);
-    let response: Vec<Language> = serde_json::from_value(language_profiles_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(language_profiles_json),
-      None,
-      SonarrEvent::GetLanguageProfiles,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::LanguageProfiles(language_profiles) = network
-      .handle_sonarr_event(SonarrEvent::GetLanguageProfiles)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.language_profiles_map,
-        BiMap::from_iter([(2222i64, "English".to_owned())])
-      );
-      assert_eq!(language_profiles, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_logs_event() {
-    let expected_logs = vec![
-      HorizontallyScrollableText::from(
-        "2023-05-20 21:29:16 UTC|FATAL|SonarrError|Some.Big.Bad.Exception|test exception",
-      ),
-      HorizontallyScrollableText::from("2023-05-20 21:29:16 UTC|INFO|TestLogger|test message"),
-    ];
-    let logs_response_json = json!({
-      "page": 1,
-      "pageSize": 500,
-      "sortKey": "time",
-      "sortDirection": "descending",
-      "totalRecords": 2,
-      "records": [
-          {
-              "time": "2023-05-20T21:29:16Z",
-              "level": "info",
-              "logger": "TestLogger",
-              "message": "test message",
-              "id": 1
-          },
-          {
-              "time": "2023-05-20T21:29:16Z",
-              "level": "fatal",
-              "logger": "SonarrError",
-              "exception": "test exception",
-              "exceptionType": "Some.Big.Bad.Exception",
-              "id": 2
-          }
-        ]
-    });
-    let response: LogResponse = serde_json::from_value(logs_response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(logs_response_json),
-      None,
-      SonarrEvent::GetLogs(500),
-      None,
-      Some("pageSize=500&sortDirection=descending&sortKey=time"),
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::LogResponse(logs) = network
-      .handle_sonarr_event(SonarrEvent::GetLogs(500))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.logs.items,
-        expected_logs
-      );
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .logs
-        .current_selection()
-        .text
-        .contains("INFO"));
-      assert_eq!(logs, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_quality_profiles_event() {
-    let quality_profile_json = json!([{
-      "id": 2222,
-      "name": "HD - 1080p"
-    }]);
-    let response: Vec<QualityProfile> =
-      serde_json::from_value(quality_profile_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(quality_profile_json),
-      None,
-      SonarrEvent::GetQualityProfiles,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::QualityProfiles(quality_profiles) = network
-      .handle_sonarr_event(SonarrEvent::GetQualityProfiles)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.quality_profile_map,
-        BiMap::from_iter([(2222i64, "HD - 1080p".to_owned())])
-      );
-      assert_eq!(quality_profiles, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_queued_sonarr_events_event() {
-    let queued_events_json = json!([{
-        "name": "RefreshMonitoredDownloads",
-        "commandName": "Refresh Monitored Downloads",
-        "status": "completed",
-        "queued": "2023-05-20T21:29:16Z",
-        "started": "2023-05-20T21:29:16Z",
-        "ended": "2023-05-20T21:29:16Z",
-        "duration": "00:00:00.5111547",
-        "trigger": "scheduled",
-    }]);
-    let response: Vec<QueueEvent> = serde_json::from_value(queued_events_json.clone()).unwrap();
-    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
-    let expected_event = QueueEvent {
-      name: "RefreshMonitoredDownloads".to_owned(),
-      command_name: "Refresh Monitored Downloads".to_owned(),
-      status: "completed".to_owned(),
-      queued: timestamp,
-      started: Some(timestamp),
-      ended: Some(timestamp),
-      duration: Some("00:00:00.5111547".to_owned()),
-      trigger: "scheduled".to_owned(),
-    };
-
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(queued_events_json),
-      None,
-      SonarrEvent::GetQueuedEvents,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::QueueEvents(events) = network
-      .handle_sonarr_event(SonarrEvent::GetQueuedEvents)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.queued_events.items,
-        vec![expected_event]
-      );
-      assert_eq!(events, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_root_folders_event() {
-    let root_folder_json = json!([{
-      "id": 1,
-      "path": "/nfs",
-      "accessible": true,
-      "freeSpace": 219902325555200u64,
-    }]);
-    let response: Vec<RootFolder> = serde_json::from_value(root_folder_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(root_folder_json),
-      None,
-      SonarrEvent::GetRootFolders,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::RootFolders(root_folders) = network
-      .handle_sonarr_event(SonarrEvent::GetRootFolders)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.root_folders.items,
-        vec![root_folder()]
-      );
-      assert_eq!(root_folders, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_releases_event() {
-    let release_json = json!([{
-      "guid": "1234",
-      "protocol": "torrent",
-      "age": 1,
-      "title": "Test Release",
-      "indexer": "kickass torrents",
-      "indexerId": 2,
-      "size": 1234,
-      "rejected": true,
-      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-      "seeders": 2,
-      "leechers": 1,
-      "languages": [ { "id": 1, "name": "English" } ],
-      "quality": { "quality": { "name": "Bluray-1080p" }}
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(release_json),
-      None,
-      SonarrEvent::GetEpisodeReleases(1),
-      None,
-      Some("episodeId=1"),
-    )
-    .await;
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.set_items(vec![episode()]);
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_mut()
-      .unwrap()
-      .episode_details_modal = Some(EpisodeDetailsModal::default());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Releases(releases_vec) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeReleases(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_releases
-          .items,
-        vec![release()]
-      );
-      assert_eq!(releases_vec, vec![release()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_episode_releases_event_empty_episode_details_modal() {
-    let release_json = json!([{
-      "guid": "1234",
-      "protocol": "torrent",
-      "age": 1,
-      "title": "Test Release",
-      "indexer": "kickass torrents",
-      "indexerId": 2,
-      "size": 1234,
-      "rejected": true,
-      "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-      "seeders": 2,
-      "leechers": 1,
-      "languages": [ { "id": 1, "name": "English" } ],
-      "quality": { "quality": { "name": "Bluray-1080p" }}
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(release_json),
-      None,
-      SonarrEvent::GetEpisodeReleases(1),
-      None,
-      Some("episodeId=1"),
-    )
-    .await;
-    let mut season_details_modal = SeasonDetailsModal::default();
-    season_details_modal.episodes.set_items(vec![episode()]);
-    app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Releases(releases_vec) = network
-      .handle_sonarr_event(SonarrEvent::GetEpisodeReleases(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_details_modal
-          .as_ref()
-          .unwrap()
-          .episode_releases
-          .items,
-        vec![release()]
-      );
-      assert_eq!(releases_vec, vec![release()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_season_history_event() {
-    let history_json = json!([{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]);
-    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetSeasonHistory((1, 1)),
-      None,
-      Some("seriesId=1&seasonNumber=1"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.season_details_modal =
-      Some(SeasonDetailsModal::default());
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .seasons
-      .set_items(vec![season()]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_mut()
-      .unwrap()
-      .season_history
-      .sort_asc = true;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryItems(history) = network
-      .handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .season_history
-          .items,
-        expected_history_items
-      );
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .season_history
-          .sort_asc
-      );
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_season_history_event_empty_season_details_modal() {
-    let history_json = json!([{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]);
-    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetSeasonHistory((1, 1)),
-      None,
-      Some("seriesId=1&seasonNumber=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .seasons
-      .set_items(vec![season()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryItems(history) = network
-      .handle_sonarr_event(SonarrEvent::GetSeasonHistory((1, 1)))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .season_details_modal
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .season_history
-          .items,
-        expected_history_items
-      );
-      assert!(
-        !app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .season_history
-          .sort_asc
-      );
-      assert_eq!(history, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_season_releases_event() {
-    let release_json = json!([
-      {
-        "guid": "1234",
-        "protocol": "torrent",
-        "age": 1,
-        "title": "Test Release",
-        "indexer": "kickass torrents",
-        "indexerId": 2,
-        "size": 1234,
-        "rejected": true,
-        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-        "seeders": 2,
-        "leechers": 1,
-        "languages": [ { "id": 1, "name": "English" } ],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-        "fullSeason": true
-      },
-      {
-        "guid": "4567",
-        "protocol": "torrent",
-        "age": 1,
-        "title": "Test Release",
-        "indexer": "kickass torrents",
-        "indexerId": 2,
-        "size": 1234,
-        "rejected": true,
-        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-        "seeders": 2,
-        "leechers": 1,
-        "languages": [ { "id": 1, "name": "English" } ],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-      }
-    ]);
-    let expected_filtered_sonarr_release = SonarrRelease {
-      full_season: true,
-      ..release()
-    };
-    let expected_raw_sonarr_releases = vec![
-      SonarrRelease {
-        full_season: true,
-        ..release()
-      },
-      SonarrRelease {
-        guid: "4567".to_owned(),
-        ..release()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(release_json),
-      None,
-      SonarrEvent::GetSeasonReleases((1, 1)),
-      None,
-      Some("seriesId=1&seasonNumber=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .seasons
-      .set_items(vec![season()]);
-    app_arc.lock().await.data.sonarr_data.season_details_modal =
-      Some(SeasonDetailsModal::default());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Releases(releases_vec) = network
-      .handle_sonarr_event(SonarrEvent::GetSeasonReleases((1, 1)))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .season_details_modal
-          .as_ref()
-          .unwrap()
-          .season_releases
-          .items,
-        vec![expected_filtered_sonarr_release]
-      );
-      assert_eq!(releases_vec, expected_raw_sonarr_releases);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_season_releases_event_empty_season_details_modal() {
-    let release_json = json!([
-      {
-        "guid": "1234",
-        "protocol": "torrent",
-        "age": 1,
-        "title": "Test Release",
-        "indexer": "kickass torrents",
-        "indexerId": 2,
-        "size": 1234,
-        "rejected": true,
-        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-        "seeders": 2,
-        "leechers": 1,
-        "languages": [ { "id": 1, "name": "English" } ],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-        "fullSeason": true
-      },
-      {
-        "guid": "4567",
-        "protocol": "usenet",
-        "age": 1,
-        "title": "Test Release",
-        "indexer": "kickass torrents",
-        "indexerId": 2,
-        "size": 1234,
-        "rejected": true,
-        "rejections": [ "Unknown quality profile", "Release is already mapped" ],
-        "seeders": 2,
-        "leechers": 1,
-        "languages": [ { "id": 1, "name": "English" } ],
-        "quality": { "quality": { "name": "Bluray-1080p" }},
-      }
-    ]);
-    let expected_sonarr_release = SonarrRelease {
-      full_season: true,
-      ..release()
-    };
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(release_json),
-      None,
-      SonarrEvent::GetSeasonReleases((1, 1)),
-      None,
-      Some("seriesId=1&seasonNumber=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .seasons
-      .set_items(vec![season()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::GetSeasonReleases((1, 1)))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert_eq!(
-      app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .season_releases
-        .items,
-      vec![expected_sonarr_release]
-    );
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_list_series_event(#[values(true, false)] use_custom_sorting: bool) {
-    let mut series_1: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    let mut series_2: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *series_1.get_mut("id").unwrap() = json!(1);
-    *series_1.get_mut("title").unwrap() = json!("z test");
-    *series_2.get_mut("id").unwrap() = json!(2);
-    *series_2.get_mut("title").unwrap() = json!("A test");
-    let expected_series = vec![
-      Series {
-        id: 1,
-        title: "z test".into(),
-        ..series()
-      },
-      Series {
-        id: 2,
-        title: "A test".into(),
-        ..series()
-      },
-    ];
-    let mut expected_sorted_series = vec![
-      Series {
-        id: 1,
-        title: "z test".into(),
-        ..series()
-      },
-      Series {
-        id: 2,
-        title: "A test".into(),
-        ..series()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([series_1, series_2])),
-      None,
-      SonarrEvent::ListSeries,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.series.sort_asc = true;
-    if use_custom_sorting {
-      let cmp_fn = |a: &Series, b: &Series| {
-        a.title
-          .text
-          .to_lowercase()
-          .cmp(&b.title.text.to_lowercase())
-      };
-      expected_sorted_series.sort_by(cmp_fn);
-      let title_sort_option = SortOption {
-        name: "Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .series
-        .sorting(vec![title_sort_option]);
-    }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SeriesVec(series) = network
-      .handle_sonarr_event(SonarrEvent::ListSeries)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.series.items,
-        expected_sorted_series
-      );
-      assert!(app_arc.lock().await.data.sonarr_data.series.sort_asc);
-      assert_eq!(series, expected_series);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_series_details_event() {
-    let expected_series: Series = serde_json::from_str(SERIES_JSON).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(SERIES_JSON).unwrap()),
-      None,
-      SonarrEvent::GetSeriesDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Series(series) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesDetails(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(series, expected_series);
-    }
-  }
-
-  #[rstest]
-  #[tokio::test]
-  async fn test_handle_get_sonarr_series_history_event(
-    #[values(true, false)] use_custom_sorting: bool,
-  ) {
-    let history_json = json!([{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]);
-    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
-    let mut expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetSeriesHistory(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    let mut series_history_table = StatefulTable {
-      sort_asc: true,
-      ..StatefulTable::default()
-    };
-    if use_custom_sorting {
-      let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
-        a.source_title
-          .text
-          .to_lowercase()
-          .cmp(&b.source_title.text.to_lowercase())
-      };
-      expected_history_items.sort_by(cmp_fn);
-
-      let history_sort_option = SortOption {
-        name: "Source Title",
-        cmp_fn: Some(cmp_fn),
-      };
-      series_history_table.sorting(vec![history_sort_option]);
-    }
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc.lock().await.data.sonarr_data.series_history = Some(series_history_table);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .series_history
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .items,
-        expected_history_items
-      );
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .sort_asc
-      );
-      assert_eq!(history_items, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_series_history_event_empty_series_history_table() {
-    let history_json = json!([{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]);
-    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetSeriesHistory(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .series_history
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .items,
-        expected_history_items
-      );
-      assert!(
-        !app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .sort_asc
-      );
-      assert_eq!(history_items, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_series_history_event_no_op_when_user_is_selecting_sort_options() {
-    let history_json = json!([{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]);
-    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetSeriesHistory(1),
-      None,
-      Some("seriesId=1"),
-    )
-    .await;
-    let cmp_fn = |a: &SonarrHistoryItem, b: &SonarrHistoryItem| {
-      a.source_title
-        .text
-        .to_lowercase()
-        .cmp(&b.source_title.text.to_lowercase())
-    };
-    let history_sort_option = SortOption {
-      name: "Source Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    let mut series_history_table = StatefulTable {
-      sort_asc: true,
-      ..StatefulTable::default()
-    };
-    series_history_table.sorting(vec![history_sort_option]);
-    app_arc.lock().await.data.sonarr_data.series_history = Some(series_history_table);
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::SeriesHistorySortPrompt.into());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .series_history
-        .is_some());
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .series_history
-        .as_ref()
-        .unwrap()
-        .is_empty());
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .sort_asc
-      );
-      assert_eq!(history_items, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_series_event_no_op_while_user_is_selecting_sort_options() {
-    let mut series_1: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    let mut series_2: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *series_1.get_mut("id").unwrap() = json!(1);
-    *series_1.get_mut("title").unwrap() = json!("z test");
-    *series_2.get_mut("id").unwrap() = json!(2);
-    *series_2.get_mut("title").unwrap() = json!("A test");
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([series_1, series_2])),
-      None,
-      SonarrEvent::ListSeries,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .push_navigation_stack(ActiveSonarrBlock::SeriesSortPrompt.into());
-    app_arc.lock().await.data.sonarr_data.series.sort_asc = true;
-    let cmp_fn = |a: &Series, b: &Series| {
-      a.title
-        .text
-        .to_lowercase()
-        .cmp(&b.title.text.to_lowercase())
-    };
-    let title_sort_option = SortOption {
-      name: "Title",
-      cmp_fn: Some(cmp_fn),
-    };
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .sorting(vec![title_sort_option]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ListSeries)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .items
-      .is_empty());
-    assert!(app_arc.lock().await.data.sonarr_data.series.sort_asc);
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_security_config_event() {
-    let security_config_response = json!({
-      "authenticationMethod": "forms",
-      "authenticationRequired": "disabledForLocalAddresses",
-      "username": "test",
-      "password": "some password",
-      "apiKey": "someApiKey12345",
-      "certificateValidation": "disabledForLocalAddresses",
-    });
-    let response: SecurityConfig =
-      serde_json::from_value(security_config_response.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(security_config_response),
-      None,
-      SonarrEvent::GetSecurityConfig,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SecurityConfig(security_config) = network
-      .handle_sonarr_event(SonarrEvent::GetSecurityConfig)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(security_config, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_status_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!({
-        "version": "v1",
-        "startTime": "2023-02-25T20:16:43Z"
-      })),
-      None,
-      SonarrEvent::GetStatus,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-    let date_time = DateTime::from(DateTime::parse_from_rfc3339("2023-02-25T20:16:43Z").unwrap());
-
-    if let SonarrSerdeable::SystemStatus(status) = network
-      .handle_sonarr_event(SonarrEvent::GetStatus)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_str_eq!(app_arc.lock().await.data.sonarr_data.version, "v1");
-      assert_eq!(app_arc.lock().await.data.sonarr_data.start_time, date_time);
-      assert_eq!(
-        status,
-        SystemStatus {
-          version: "v1".to_owned(),
-          start_time: date_time
-        }
-      );
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_tags_event() {
-    let tags_json = json!([{
-      "id": 2222,
-      "label": "usenet"
-    }]);
-    let response: Vec<Tag> = serde_json::from_value(tags_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(tags_json),
-      None,
-      SonarrEvent::GetTags,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Tags(tags) = network
-      .handle_sonarr_event(SonarrEvent::GetTags)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.tags_map,
-        BiMap::from_iter([(2222i64, "usenet".to_owned())])
-      );
-      assert_eq!(tags, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_tasks_event() {
-    let tasks_json = json!([{
-        "name": "Application Update Check",
-        "taskName": "ApplicationUpdateCheck",
-        "interval": 360,
-        "lastExecution": "2023-05-20T21:29:16Z",
-        "nextExecution": "2023-05-20T21:29:16Z",
-    },
-    {
-        "name": "Backup",
-        "taskName": "Backup",
-        "interval": 10080,
-        "lastExecution": "2023-05-20T21:29:16Z",
-        "nextExecution": "2023-05-20T21:29:16Z",
-    }]);
-    let response: Vec<SonarrTask> = serde_json::from_value(tasks_json.clone()).unwrap();
-    let timestamp = DateTime::from(DateTime::parse_from_rfc3339("2023-05-20T21:29:16Z").unwrap());
-    let expected_tasks = vec![
-      SonarrTask {
-        name: "Application Update Check".to_owned(),
-        task_name: SonarrTaskName::ApplicationUpdateCheck,
-        interval: 360,
-        last_execution: timestamp,
-        next_execution: timestamp,
-      },
-      SonarrTask {
-        name: "Backup".to_owned(),
-        task_name: SonarrTaskName::Backup,
-        interval: 10080,
-        last_execution: timestamp,
-        next_execution: timestamp,
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(tasks_json),
-      None,
-      SonarrEvent::GetTasks,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Tasks(tasks) = network
-      .handle_sonarr_event(SonarrEvent::GetTasks)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.tasks.items,
-        expected_tasks
-      );
-      assert_eq!(tasks, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_updates_event() {
-    let updates_json = json!([{
-      "version": "4.3.2.1",
-      "releaseDate": "2023-04-15T02:02:53Z",
-      "installed": true,
-      "installedOn": "2023-04-15T02:02:53Z",
-      "latest": true,
-      "changes": {
-        "new": [
-          "Cool new thing"
-        ],
-        "fixed": [
-          "Some bugs killed"
-        ]
-      },
-    },
-      {
-        "version": "3.2.1.0",
-        "releaseDate": "2023-04-15T02:02:53Z",
-        "installed": false,
-        "installedOn": "2023-04-15T02:02:53Z",
-        "latest": false,
-        "changes": {
-          "new": [
-            "Cool new thing (old)",
-            "Other cool new thing (old)"
-            ],
-        },
-    },
-    {
-      "version": "2.1.0",
-      "releaseDate": "2023-04-15T02:02:53Z",
-      "installed": false,
-      "latest": false,
-      "changes": {
-        "fixed": [
-          "Killed bug 1",
-          "Fixed bug 2"
-        ]
-      },
-    }]);
-    let response: Vec<Update> = serde_json::from_value(updates_json.clone()).unwrap();
-    let line_break = "-".repeat(200);
-    let expected_text = ScrollableText::with_string(formatdoc!(
-      "
-    The latest version of Sonarr is already installed
-
-    4.3.2.1 - 2023-04-15 02:02:53 UTC (Currently Installed)
-    {line_break}
-    New:
-      * Cool new thing
-    Fixed:
-      * Some bugs killed
-    
-    
-    3.2.1.0 - 2023-04-15 02:02:53 UTC (Previously Installed)
-    {line_break}
-    New:
-      * Cool new thing (old)
-      * Other cool new thing (old)
-    
-    
-    2.1.0 - 2023-04-15 02:02:53 UTC 
-    {line_break}
-    Fixed:
-      * Killed bug 1
-      * Fixed bug 2"
-    ));
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(updates_json),
-      None,
-      SonarrEvent::GetUpdates,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Updates(updates) = network
-      .handle_sonarr_event(SonarrEvent::GetUpdates)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_str_eq!(
-        app_arc.lock().await.data.sonarr_data.updates.get_text(),
-        expected_text.get_text()
-      );
-      assert_eq!(updates, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_mark_sonarr_history_item_as_failed_event() {
-    let expected_history_item_id = 1;
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      None,
-      Some(json!({})),
-      None,
-      SonarrEvent::MarkHistoryItemAsFailed(expected_history_item_id),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::MarkHistoryItemAsFailed(
-        expected_history_item_id
-      ))
-      .await
-      .is_ok());
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_search_new_series_event() {
-    let add_series_search_result_json = json!([{
-      "tvdbId": 1234,
-      "title": "Test",
-      "status": "continuing",
-      "ended": false,
-      "overview": "New series blah blah blah",
-      "genres": ["cool", "family", "fun"],
-      "year": 2023,
-      "network": "Prime Video",
-      "runtime": 60,
-      "ratings": { "votes": 406744, "value": 8.4 },
-      "statistics": { "seasonCount": 3 }
-    }]);
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(add_series_search_result_json),
-      None,
-      SonarrEvent::SearchNewSeries("test term".into()),
-      None,
-      Some("term=test%20term"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::AddSeriesSearchResults(add_series_search_results) = network
-      .handle_sonarr_event(SonarrEvent::SearchNewSeries("test term".into()))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .add_searched_series
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .add_searched_series
-          .as_ref()
-          .unwrap()
-          .items,
-        vec![add_series_search_result()]
-      );
-      assert_eq!(add_series_search_results, vec![add_series_search_result()]);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_search_new_series_event_no_results() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!([])),
-      None,
-      SonarrEvent::SearchNewSeries("test term".into()),
-      None,
-      Some("term=test%20term"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::SearchNewSeries("test term".into()))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .add_searched_series
-      .is_none());
-    assert_eq!(
-      app_arc.lock().await.get_current_route(),
-      ActiveSonarrBlock::AddSeriesEmptySearchResults.into()
-    );
-  }
-
-  #[tokio::test]
-  async fn test_handle_start_sonarr_task_event() {
-    let response = json!({ "test": "test"});
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "ApplicationUpdateCheck"
-      })),
-      Some(response.clone()),
-      None,
-      SonarrEvent::StartTask(SonarrTaskName::ApplicationUpdateCheck),
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .tasks
-      .set_items(vec![SonarrTask {
-        task_name: SonarrTaskName::default(),
-        ..SonarrTask::default()
-      }]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Value(value) = network
-      .handle_sonarr_event(SonarrEvent::StartTask(
-        SonarrTaskName::ApplicationUpdateCheck,
-      ))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(value, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_test_sonarr_indexer_event_error() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let response_json = json!([
-    {
-        "isWarning": false,
-        "propertyName": "",
-        "errorMessage": "test failure",
-        "severity": "error"
-    }]);
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_test_server = server
-      .mock(
-        "POST",
-        format!("/api/v3{}", SonarrEvent::TestIndexer(1).resource()).as_str(),
-      )
-      .with_status(400)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json.clone()))
-      .with_body(response_json.to_string())
-      .create_async()
-      .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .indexers
-      .set_items(vec![indexer()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Value(value) = network
-      .handle_sonarr_event(SonarrEvent::TestIndexer(1))
-      .await
-      .unwrap()
-    {
-      async_details_server.assert_async().await;
-      async_test_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.indexer_test_errors,
-        Some("\"test failure\"".to_owned())
-      );
-      assert_eq!(value, response_json)
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_test_sonarr_indexer_event_success() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_test_server = server
-      .mock(
-        "POST",
-        format!("/api/v3{}", SonarrEvent::TestIndexer(1).resource()).as_str(),
-      )
-      .with_status(200)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json.clone()))
-      .with_body("{}")
-      .create_async()
-      .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .indexers
-      .set_items(vec![indexer()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Value(value) = network
-      .handle_sonarr_event(SonarrEvent::TestIndexer(1))
-      .await
-      .unwrap()
-    {
-      async_details_server.assert_async().await;
-      async_test_server.assert_async().await;
-      assert_eq!(
-        app_arc.lock().await.data.sonarr_data.indexer_test_errors,
-        Some(String::new())
-      );
-      assert_eq!(value, json!({}));
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_test_all_sonarr_indexers_event() {
-    let indexers = vec![
-      Indexer {
-        id: 1,
-        name: Some("Test 1".to_owned()),
-        ..Indexer::default()
-      },
-      Indexer {
-        id: 2,
-        name: Some("Test 2".to_owned()),
-        ..Indexer::default()
-      },
-    ];
-    let indexer_test_results_modal_items = vec![
-			IndexerTestResultModalItem {
-				name: "Test 1".to_owned(),
-				is_valid: true,
-				validation_failures: HorizontallyScrollableText::default(),
-			},
-			IndexerTestResultModalItem {
-				name: "Test 2".to_owned(),
-				is_valid: false,
-				validation_failures: "Failure for field 'test field 1': test error message, Failure for field 'test field 2': test error message 2".into(),
-			},
-		];
-    let response_json = json!([
-    {
-      "id": 1,
-      "isValid": true,
-      "validationFailures": []
-    },
-    {
-      "id": 2,
-      "isValid": false,
-      "validationFailures": [
-          {
-              "propertyName": "test field 1",
-              "errorMessage": "test error message",
-              "severity": "error"
-          },
-          {
-              "propertyName": "test field 2",
-              "errorMessage": "test error message 2",
-              "severity": "error"
-          },
-      ]
-    }]);
-    let response: Vec<IndexerTestResult> = serde_json::from_value(response_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      None,
-      Some(response_json),
-      Some(400),
-      SonarrEvent::TestAllIndexers,
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .indexers
-      .set_items(indexers);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::IndexerTestResults(results) = network
-      .handle_sonarr_event(SonarrEvent::TestAllIndexers)
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .indexer_test_all_results
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .indexer_test_all_results
-          .as_ref()
-          .unwrap()
-          .items,
-        indexer_test_results_modal_items
-      );
-      assert_eq!(results, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_toggle_episode_monitoring_event() {
-    let expected_body = MonitorEpisodeBody {
-      episode_ids: vec![2],
-      monitored: false,
-    };
-    let body = Episode { id: 2, ..episode() };
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(json!(body)),
-      None,
-      SonarrEvent::GetEpisodeDetails(2),
-      Some("/2"),
-      None,
-    )
-    .await;
-    let async_toggle_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}",
-          SonarrEvent::ToggleEpisodeMonitoring(2).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(json!(expected_body)))
-      .create_async()
-      .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ToggleEpisodeMonitoring(2))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_toggle_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_toggle_season_monitoring_event() {
-    let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *expected_body
-      .get_mut("seasons")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|season| season["seasonNumber"] == 1)
-      .unwrap()
-      .get_mut("monitored")
-      .unwrap() = json!(false);
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(serde_json::from_str(SERIES_JSON).unwrap()),
-      None,
-      SonarrEvent::GetSeriesDetails(1),
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_toggle_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/1",
-          SonarrEvent::ToggleSeasonMonitoring((1, 1)).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    {
-      let mut app = app_arc.lock().await;
-      app.data.sonarr_data.series.set_items(vec![series()]);
-      app.data.sonarr_data.seasons.set_items(vec![season()]);
-    }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring((1, 1)))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_toggle_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_trigger_automatic_episode_search_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "EpisodeSearch",
-        "episodeIds": [ 1 ]
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::TriggerAutomaticEpisodeSearch(1),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::TriggerAutomaticEpisodeSearch(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_trigger_automatic_season_search_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "SeasonSearch",
-        "seriesId": 1,
-        "seasonNumber": 1
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::TriggerAutomaticSeasonSearch((1, 1)),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::TriggerAutomaticSeasonSearch((1, 1)))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_trigger_automatic_series_search_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "SeriesSearch",
-        "seriesId": 1
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::TriggerAutomaticSeriesSearch(1),
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_all_series_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshSeries",
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::UpdateAllSeries,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::UpdateAllSeries)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_and_scan_series_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshSeries",
-        "seriesId": 1,
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::UpdateAndScanSeries(1),
-      None,
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::UpdateAndScanSeries(1))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_update_sonarr_downloads_event() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "name": "RefreshMonitoredDownloads"
-      })),
-      Some(json!({})),
-      None,
-      SonarrEvent::UpdateDownloads,
-      None,
-      None,
-    )
-    .await;
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::UpdateDownloads)
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_extract_and_add_sonarr_tag_ids_vec() {
-    let app_arc = Arc::new(Mutex::new(App::test_default()));
-    let tags = "    test,HI ,, usenet ";
-    {
-      let mut app = app_arc.lock().await;
-      app.data.sonarr_data.tags_map = BiMap::from_iter([
-        (1, "usenet".to_owned()),
-        (2, "test".to_owned()),
-        (3, "hi".to_owned()),
-      ]);
-    }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert_eq!(
-      network.extract_and_add_sonarr_tag_ids_vec(tags).await,
-      vec![2, 3, 1]
-    );
-  }
-
-  #[tokio::test]
-  async fn test_extract_and_add_sonarr_tag_ids_vec_add_missing_tags_first() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({ "label": "TESTING" })),
-      Some(json!({ "id": 3, "label": "testing" })),
-      None,
-      SonarrEvent::GetTags,
-      None,
-      None,
-    )
-    .await;
-    let tags = "usenet, test, TESTING";
-    {
-      let mut app = app_arc.lock().await;
-      app.data.sonarr_data.add_series_modal = Some(AddSeriesModal {
-        tags: tags.into(),
-        ..AddSeriesModal::default()
-      });
-      app.data.sonarr_data.tags_map =
-        BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
-    }
-    app_arc.lock().await.server_tabs.next();
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    let tag_ids_vec = network.extract_and_add_sonarr_tag_ids_vec(tags).await;
-
-    async_server.assert_async().await;
-    assert_eq!(tag_ids_vec, vec![1, 2, 3]);
-    assert_eq!(
-      app_arc.lock().await.data.sonarr_data.tags_map,
-      BiMap::from_iter([
-        (1, "usenet".to_owned()),
-        (2, "test".to_owned()),
-        (3, "testing".to_owned())
-      ])
-    );
-  }
-
-  #[test]
-  fn test_get_episode_status_downloaded() {
-    assert_str_eq!(get_episode_status(true, &[], 0), "Downloaded");
-  }
-
-  #[test]
-  fn test_get_episode_status_missing() {
-    let download_record = DownloadRecord {
-      episode_id: Some(Number::from(1i64)),
-      ..DownloadRecord::default()
-    };
-
-    assert_str_eq!(
-      get_episode_status(false, &[download_record.clone()], 0),
-      "Missing"
-    );
-
-    assert_str_eq!(get_episode_status(false, &[download_record], 1), "Missing");
-  }
-
-  #[test]
-  fn test_get_episode_status_missing_if_episode_id_is_missing() {
-    let download_record = DownloadRecord::default();
-
-    assert_str_eq!(
-      get_episode_status(false, &[download_record.clone()], 0),
-      "Missing"
-    );
-
-    assert_str_eq!(get_episode_status(false, &[download_record], 1), "Missing");
-  }
-
-  #[test]
-  fn test_get_episode_status_downloading() {
-    assert_str_eq!(
-      get_episode_status(
-        false,
-        &[DownloadRecord {
-          episode_id: Some(Number::from(1i64)),
-          status: DownloadStatus::Downloading,
-          ..DownloadRecord::default()
-        }],
-        1
-      ),
-      "Downloading"
-    );
-  }
-
-  #[test]
-  fn test_get_episode_status_awaiting_import() {
-    assert_str_eq!(
-      get_episode_status(
-        false,
-        &[DownloadRecord {
-          episode_id: Some(Number::from(1i64)),
-          status: DownloadStatus::Completed,
-          ..DownloadRecord::default()
-        }],
-        1
-      ),
-      "Awaiting Import"
-    );
-  }
-
-  fn add_series_search_result() -> AddSeriesSearchResult {
-    AddSeriesSearchResult {
-      tvdb_id: 1234,
-      title: HorizontallyScrollableText::from("Test"),
-      status: Some("continuing".to_owned()),
-      ended: false,
-      overview: Some("New series blah blah blah".to_owned()),
-      genres: genres(),
-      year: 2023,
-      network: Some("Prime Video".to_owned()),
-      runtime: 60,
-      ratings: Some(rating()),
-      statistics: Some(add_series_search_result_statistics()),
-    }
-  }
-
-  fn add_series_search_result_statistics() -> AddSeriesSearchResultStatistics {
-    AddSeriesSearchResultStatistics { season_count: 3 }
-  }
-
-  fn blocklist_item() -> BlocklistItem {
-    BlocklistItem {
-      id: 1,
-      series_id: 1,
-      series_title: None,
-      episode_ids: vec![Number::from(1)],
-      source_title: "Test Source Title".to_owned(),
-      languages: vec![language()],
-      quality: quality_wrapper(),
-      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
-      protocol: "usenet".to_owned(),
-      indexer: "NZBgeek (Prowlarr)".to_owned(),
-      message: "test message".to_owned(),
-    }
-  }
-
-  fn download_record() -> DownloadRecord {
-    DownloadRecord {
-      title: "Test Download Title".to_owned(),
-      status: DownloadStatus::Downloading,
-      id: 1,
-      episode_id: Some(Number::from(1i64)),
-      size: 3543348019f64,
-      sizeleft: 1771674009f64,
-      output_path: Some(HorizontallyScrollableText::from(
-        "/nfs/tv/Test show/season 1/",
-      )),
-      indexer: "kickass torrents".to_owned(),
-      download_client: Some("transmission".to_owned()),
-    }
-  }
-
-  fn downloads_response() -> DownloadsResponse {
-    DownloadsResponse {
-      records: vec![download_record()],
-    }
-  }
-
-  fn episode() -> Episode {
-    Episode {
-      id: 1,
-      series_id: 1,
-      tvdb_id: 1234,
-      episode_file_id: 1,
-      season_number: 1,
-      episode_number: 1,
-      title: "Something cool".to_owned(),
-      air_date_utc: Some(DateTime::from(
-        DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap(),
-      )),
-      overview: Some("Okay so this one time at band camp...".to_owned()),
-      has_file: true,
-      monitored: true,
-      episode_file: Some(episode_file()),
-    }
-  }
-
-  fn episode_file() -> EpisodeFile {
-    EpisodeFile {
-      id: 1,
-      relative_path: "/season 1/episode 1.mkv".to_owned(),
-      path: "/nfs/tv/series/season 1/episode 1.mkv".to_owned(),
-      size: 3543348019,
-      quality: quality_wrapper(),
-      languages: vec![language()],
-      date_added: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
-      media_info: Some(media_info()),
-    }
-  }
-
-  fn genres() -> Vec<String> {
-    vec!["cool".to_owned(), "family".to_owned(), "fun".to_owned()]
-  }
-
-  fn history_data() -> SonarrHistoryData {
-    SonarrHistoryData {
-      dropped_path: Some("/nfs/nzbget/completed/series/Coolness/something.cool.mkv".to_owned()),
-      imported_path: Some(
-        "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv".to_owned(),
-      ),
-      ..SonarrHistoryData::default()
-    }
-  }
-
-  fn history_item() -> SonarrHistoryItem {
-    SonarrHistoryItem {
-      id: 1,
-      source_title: "Test source".into(),
-      episode_id: 1,
-      quality: quality_wrapper(),
-      languages: vec![language()],
-      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
-      event_type: SonarrHistoryEventType::Grabbed,
-      data: history_data(),
-    }
-  }
-
-  fn indexer() -> Indexer {
-    Indexer {
-      enable_rss: true,
-      enable_automatic_search: true,
-      enable_interactive_search: true,
-      supports_rss: true,
-      supports_search: true,
-      protocol: "torrent".to_owned(),
-      priority: 25,
-      download_client_id: 0,
-      name: Some("Test Indexer".to_owned()),
-      implementation_name: Some("Torznab".to_owned()),
-      implementation: Some("Torznab".to_owned()),
-      config_contract: Some("TorznabSettings".to_owned()),
-      tags: vec![Number::from(1)],
-      id: 1,
-      fields: Some(vec![
-        IndexerField {
-          name: Some("baseUrl".to_owned()),
-          value: Some(json!("https://test.com")),
-        },
-        IndexerField {
-          name: Some("apiKey".to_owned()),
-          value: Some(json!("")),
-        },
-        IndexerField {
-          name: Some("seedCriteria.seedRatio".to_owned()),
-          value: Some(json!("1.2")),
-        },
-      ]),
-    }
-  }
-
-  fn indexer_settings() -> IndexerSettings {
-    IndexerSettings {
-      id: 1,
-      minimum_age: 1,
-      retention: 1,
-      maximum_size: 12345,
-      rss_sync_interval: 60,
-    }
-  }
-
-  fn language() -> Language {
-    Language {
-      id: 1,
-      name: "English".to_owned(),
-    }
-  }
-
-  fn media_info() -> MediaInfo {
-    MediaInfo {
-      audio_bitrate: 0,
-      audio_channels: Number::from_f64(7.1).unwrap(),
-      audio_codec: Some("AAC".to_owned()),
-      audio_languages: Some("eng".to_owned()),
-      audio_stream_count: 1,
-      video_bit_depth: 10,
-      video_bitrate: 0,
-      video_codec: "x265".to_owned(),
-      video_fps: Number::from_f64(23.976).unwrap(),
-      resolution: "1920x1080".to_owned(),
-      run_time: "23:51".to_owned(),
-      scan_type: "Progressive".to_owned(),
-      subtitles: Some("English".to_owned()),
-    }
-  }
-  fn quality() -> Quality {
-    Quality {
-      name: "Bluray-1080p".to_owned(),
-    }
-  }
-
-  fn quality_wrapper() -> QualityWrapper {
-    QualityWrapper { quality: quality() }
-  }
-
-  fn rating() -> Rating {
-    Rating {
-      votes: 406744,
-      value: 8.4,
-    }
-  }
-
-  fn season() -> Season {
-    Season {
-      title: None,
-      season_number: 1,
-      monitored: true,
-      statistics: season_statistics(),
-    }
-  }
-
-  fn season_statistics() -> SeasonStatistics {
-    SeasonStatistics {
-      previous_airing: Some(DateTime::from(
-        DateTime::parse_from_rfc3339("2022-10-24T01:00:00Z").unwrap(),
-      )),
-      next_airing: None,
-      episode_file_count: 10,
-      episode_count: 10,
-      total_episode_count: 10,
-      size_on_disk: 36708563419,
-      percent_of_episodes: 100.0,
-    }
-  }
-
-  fn series() -> Series {
-    Series {
-      title: "Test".to_owned().into(),
-      status: SeriesStatus::Continuing,
-      ended: false,
-      overview: Some("Blah blah blah".to_owned()),
-      network: Some("HBO".to_owned()),
-      seasons: Some(vec![season()]),
-      year: 2022,
-      path: "/nfs/tv/Test".to_owned(),
-      quality_profile_id: 6,
-      language_profile_id: 1,
-      season_folder: true,
-      monitored: true,
-      runtime: 63,
-      tvdb_id: 371572,
-      series_type: SeriesType::Standard,
-      certification: Some("TV-MA".to_owned()),
-      genres: vec!["cool".to_owned(), "family".to_owned(), "fun".to_owned()],
-      tags: vec![Number::from(3)],
-      ratings: rating(),
-      statistics: Some(series_statistics()),
-      id: 1,
-    }
-  }
-
-  fn series_statistics() -> SeriesStatistics {
-    SeriesStatistics {
-      season_count: 2,
-      episode_file_count: 18,
-      episode_count: 18,
-      total_episode_count: 50,
-      size_on_disk: 63894022699,
-      percent_of_episodes: 100.0,
-    }
-  }
-
-  fn rejections() -> Vec<String> {
-    vec![
-      "Unknown quality profile".to_owned(),
-      "Release is already mapped".to_owned(),
-    ]
-  }
-
-  fn release() -> SonarrRelease {
-    SonarrRelease {
-      guid: "1234".to_owned(),
-      protocol: "torrent".to_owned(),
-      age: 1,
-      title: HorizontallyScrollableText::from("Test Release"),
-      indexer: "kickass torrents".to_owned(),
-      indexer_id: 2,
-      size: 1234,
-      rejected: true,
-      rejections: Some(rejections()),
-      seeders: Some(Number::from(2)),
-      leechers: Some(Number::from(1)),
-      languages: Some(vec![language()]),
-      quality: quality_wrapper(),
-      full_season: false,
-    }
-  }
-
-  fn root_folder() -> RootFolder {
-    RootFolder {
-      id: 1,
-      path: "/nfs".to_owned(),
-      accessible: true,
-      free_space: 219902325555200,
-      unmapped_folders: None,
-    }
-  }
-}
diff --git a/src/ui/builtin_themes.rs b/src/ui/builtin_themes.rs
new file mode 100644
index 0000000..19c4113
--- /dev/null
+++ b/src/ui/builtin_themes.rs
@@ -0,0 +1,148 @@
+use crate::ui::theme::{Background, Style, Theme, ThemeDefinition};
+use ratatui::style::Color;
+use std::str::FromStr;
+
+#[cfg(test)]
+#[path = "builtin_themes_tests.rs"]
+mod builtin_themes_tests;
+
+pub(in crate::ui) fn watermelon_dark_theme() -> Theme {
+  Theme {
+    background: Some(Background {
+      enabled: Some(false),
+      color: Some(Color::from_str("#233237").unwrap()),
+    }),
+    default: Some(Style {
+      color: Some(Color::from_str("#00FF00").unwrap()),
+    }),
+    downloaded: Some(Style {
+      color: Some(Color::from_str("#80ffbf").unwrap()),
+    }),
+    failure: Some(Style {
+      color: Some(Color::from_str("#ff8080").unwrap()),
+    }),
+    missing: Some(Style {
+      color: Some(Color::from_str("#ff8080").unwrap()),
+    }),
+    primary: Some(Style {
+      color: Some(Color::from_str("#ff19d9").unwrap()),
+    }),
+    secondary: Some(Style {
+      color: Some(Color::from_str("#8c19ff").unwrap()),
+    }),
+    ..Theme::default()
+  }
+}
+
+pub(in crate::ui) fn dracula_theme() -> Theme {
+  Theme {
+    background: Some(Background {
+      enabled: Some(true),
+      color: Some(Color::from_str("#232326").unwrap()),
+    }),
+    default: Some(Style {
+      color: Some(Color::from_str("#f8f8f2").unwrap()),
+    }),
+    downloaded: Some(Style {
+      color: Some(Color::from_str("#50fa7b").unwrap()),
+    }),
+    downloading: Some(Style {
+      color: Some(Color::from_str("#f1fa8c").unwrap()),
+    }),
+    failure: Some(Style {
+      color: Some(Color::from_str("#ff5555").unwrap()),
+    }),
+    missing: Some(Style {
+      color: Some(Color::from_str("#ffb86c").unwrap()),
+    }),
+    primary: Some(Style {
+      color: Some(Color::from_str("#ff79c6").unwrap()),
+    }),
+    secondary: Some(Style {
+      color: Some(Color::from_str("#ff79c6").unwrap()),
+    }),
+    unmonitored_missing: Some(Style {
+      color: Some(Color::from_str("#6272a4").unwrap()),
+    }),
+    help: Some(Style {
+      color: Some(Color::from_str("#6272a4").unwrap()),
+    }),
+    success: Some(Style {
+      color: Some(Color::from_str("#50fa7b").unwrap()),
+    }),
+    warning: Some(Style {
+      color: Some(Color::from_str("#f1fa8c").unwrap()),
+    }),
+    unreleased: Some(Style {
+      color: Some(Color::from_str("#f8f8f2").unwrap()),
+    }),
+    ..Theme::default()
+  }
+}
+
+pub(in crate::ui) fn eldritch_theme() -> Theme {
+  Theme {
+    background: Some(Background {
+      enabled: Some(true),
+      color: Some(Color::from_str("#212337").unwrap()),
+    }),
+    default: Some(Style {
+      color: Some(Color::from_str("#ebfafa").unwrap()),
+    }),
+    downloaded: Some(Style {
+      color: Some(Color::from_str("#37f499").unwrap()),
+    }),
+    downloading: Some(Style {
+      color: Some(Color::from_str("#f7c67f").unwrap()),
+    }),
+    failure: Some(Style {
+      color: Some(Color::from_str("#f16c75").unwrap()),
+    }),
+    missing: Some(Style {
+      color: Some(Color::from_str("#f7c67f").unwrap()),
+    }),
+    unmonitored_missing: Some(Style {
+      color: Some(Color::from_str("#7081d0").unwrap()),
+    }),
+    help: Some(Style {
+      color: Some(Color::from_str("#7081d0").unwrap()),
+    }),
+    primary: Some(Style {
+      color: Some(Color::from_str("#f265b5").unwrap()),
+    }),
+    secondary: Some(Style {
+      color: Some(Color::from_str("#04d1f9").unwrap()),
+    }),
+    success: Some(Style {
+      color: Some(Color::from_str("#37f499").unwrap()),
+    }),
+    warning: Some(Style {
+      color: Some(Color::from_str("#f1fc79").unwrap()),
+    }),
+    unreleased: Some(Style {
+      color: Some(Color::from_str("#ebfafa").unwrap()),
+    }),
+    ..Theme::default()
+  }
+}
+
+pub fn get_builtin_themes() -> Vec<ThemeDefinition> {
+  vec![
+    ThemeDefinition {
+      name: "default".to_owned(),
+      theme: Theme::default(),
+    },
+    ThemeDefinition {
+      name: "watermelon-dark".to_owned(),
+      theme: watermelon_dark_theme(),
+    },
+    ThemeDefinition {
+      name: "dracula".to_owned(),
+      theme: dracula_theme(),
+    },
+    ThemeDefinition {
+      name: "eldritch".to_owned(),
+      theme: eldritch_theme(),
+    },
+  ]
+}
diff --git a/src/ui/builtin_themes_tests.rs b/src/ui/builtin_themes_tests.rs
new file mode 100644
index 0000000..d1decef
--- /dev/null
+++ b/src/ui/builtin_themes_tests.rs
@@ -0,0 +1,143 @@
+#[cfg(test)]
+mod test {
+  use crate::ui::builtin_themes::get_builtin_themes;
+  use crate::ui::theme::{Background, Style, Theme, ThemeDefinition};
+  use pretty_assertions::assert_eq;
+  use ratatui::prelude::Color;
+  use std::str::FromStr;
+
+  #[test]
+  fn test_builtin_themes() {
+    let watermelon_dark = Theme {
+      background: Some(Background {
+        enabled: Some(false),
+        color: Some(Color::from_str("#233237").unwrap()),
+      }),
+      default: Some(Style {
+        color: Some(Color::from_str("#00FF00").unwrap()),
+      }),
+      downloaded: Some(Style {
+        color: Some(Color::from_str("#80ffbf").unwrap()),
+      }),
+      failure: Some(Style {
+        color: Some(Color::from_str("#ff8080").unwrap()),
+      }),
+      missing: Some(Style {
+        color: Some(Color::from_str("#ff8080").unwrap()),
+      }),
+      primary: Some(Style {
+        color: Some(Color::from_str("#ff19d9").unwrap()),
+      }),
+      secondary: Some(Style {
+        color: Some(Color::from_str("#8c19ff").unwrap()),
+      }),
+      ..Theme::default()
+    };
+    let dracula = Theme {
+      background: Some(Background {
+        enabled: Some(true),
+        color: Some(Color::from_str("#232326").unwrap()),
+      }),
+      default: Some(Style {
+        color: Some(Color::from_str("#f8f8f2").unwrap()),
+      }),
+      downloaded: Some(Style {
+        color: Some(Color::from_str("#50fa7b").unwrap()),
+      }),
+      downloading: Some(Style {
+        color: Some(Color::from_str("#f1fa8c").unwrap()),
+      }),
+      failure: Some(Style {
+        color: Some(Color::from_str("#ff5555").unwrap()),
+      }),
+      missing: Some(Style {
+        color: Some(Color::from_str("#ffb86c").unwrap()),
+      }),
+      primary: Some(Style {
+        color: Some(Color::from_str("#ff79c6").unwrap()),
+      }),
+      secondary: Some(Style {
+        color: Some(Color::from_str("#ff79c6").unwrap()),
+      }),
+      unmonitored_missing: Some(Style {
+        color: Some(Color::from_str("#6272a4").unwrap()),
+      }),
+      help: Some(Style {
+        color: Some(Color::from_str("#6272a4").unwrap()),
+      }),
+      success: Some(Style {
+        color: Some(Color::from_str("#50fa7b").unwrap()),
+      }),
+      warning: Some(Style {
+        color: Some(Color::from_str("#f1fa8c").unwrap()),
+      }),
+      unreleased: Some(Style {
+        color: Some(Color::from_str("#f8f8f2").unwrap()),
+      }),
+      ..Theme::default()
+    };
+    let eldritch = Theme {
+      background: Some(Background {
+        enabled: Some(true),
+        color: Some(Color::from_str("#212337").unwrap()),
+      }),
+      default: Some(Style {
+        color: Some(Color::from_str("#ebfafa").unwrap()),
+      }),
+      downloaded: Some(Style {
+        color: Some(Color::from_str("#37f499").unwrap()),
+      }),
+      downloading: Some(Style {
+        color: Some(Color::from_str("#f7c67f").unwrap()),
+      }),
+      failure: Some(Style {
+        color: Some(Color::from_str("#f16c75").unwrap()),
+      }),
+      missing: Some(Style {
+        color: Some(Color::from_str("#f7c67f").unwrap()),
+      }),
+      unmonitored_missing: Some(Style {
+        color: Some(Color::from_str("#7081d0").unwrap()),
+      }),
+      help: Some(Style {
+        color: Some(Color::from_str("#7081d0").unwrap()),
+      }),
+      primary: Some(Style {
+        color: Some(Color::from_str("#f265b5").unwrap()),
+      }),
+      secondary: Some(Style {
+        color: Some(Color::from_str("#04d1f9").unwrap()),
+      }),
+      success: Some(Style {
+        color: Some(Color::from_str("#37f499").unwrap()),
+      }),
+      warning: Some(Style {
+        color: Some(Color::from_str("#f1fc79").unwrap()),
+      }),
+      unreleased: Some(Style {
+        color: Some(Color::from_str("#ebfafa").unwrap()),
+      }),
+      ..Theme::default()
+    };
+    let expected_themes = vec![
+      ThemeDefinition {
+        name: "default".to_owned(),
+        theme: Theme::default(),
+      },
+      ThemeDefinition {
+        name: "watermelon-dark".to_owned(),
+        theme: watermelon_dark,
+      },
+      ThemeDefinition {
+        name: "dracula".to_owned(),
+        theme: dracula,
+      },
+      ThemeDefinition {
+        name: "eldritch".to_owned(),
+        theme: eldritch,
+      },
+    ];
+
+    assert_eq!(expected_themes, get_builtin_themes());
+  }
+}
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index aa5d0ae..78a89f2 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -1,33 +1,43 @@
+use std::cell::Cell;
 use std::sync::atomic::Ordering;
 
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Text};
-use ratatui::widgets::Clear;
 use ratatui::widgets::Paragraph;
 use ratatui::widgets::Tabs;
 use ratatui::widgets::Wrap;
+use ratatui::widgets::{Clear, Row};
 use ratatui::Frame;
 use sonarr_ui::SonarrUi;
 use utils::layout_block;
 
 use crate::app::App;
+use crate::models::servarr_models::KeybindingItem;
 use crate::models::{HorizontallyScrollableText, Route, TabState};
 use crate::ui::radarr_ui::RadarrUi;
 use crate::ui::styles::ManagarrStyle;
+use crate::ui::theme::Theme;
 use crate::ui::utils::{
   background_block, borderless_block, centered_rect, logo_block, title_block, title_block_centered,
+  unstyled_title_block,
 };
 use crate::ui::widgets::input_box::InputBox;
+use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::Size;
 
+mod builtin_themes;
 mod radarr_ui;
 mod sonarr_ui;
 mod styles;
+pub mod theme;
 mod utils;
 mod widgets;
 
 static HIGHLIGHT_SYMBOL: &str = "=> ";
+thread_local! {
+  pub static THEME: Cell<Theme> = Cell::new(Theme::default());
+}
 
 pub trait DrawUi {
   fn accepts(route: Route) -> bool;
@@ -71,6 +81,10 @@ pub fn ui(f: &mut Frame<'_>, app: &mut App<'_>) {
     }
     _ => (),
   }
+
+  if app.keymapping_table.is_some() {
+    draw_help_popup(f, app);
+  }
 }
 
 fn draw_header_row(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
@@ -80,7 +94,7 @@ fn draw_header_row(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     .flex(Flex::SpaceBetween)
     .margin(1)
     .areas(area);
-  let help_text = Text::from(app.server_tabs.get_active_tab_help().help());
+  let help_text = Text::from("<?> to open help".help());
 
   let titles = app
     .server_tabs
@@ -100,7 +114,9 @@ fn draw_header_row(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 }
 
 fn draw_error(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let block = title_block("Error | <esc> to close").failure().bold();
+  let block = unstyled_title_block("Error | <esc> to close")
+    .failure()
+    .bold();
 
   app.error.scroll_left_or_reset(
     area.width as usize,
@@ -128,9 +144,37 @@ pub fn draw_popup(
   popup_fn(f, app, popup_area);
 }
 
+pub fn draw_help_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
+  let (percent_x, percent_y) = Size::LongNarrowTable.to_percent();
+  let table_area = centered_rect(percent_x, percent_y, f.area());
+  let keymap_row_mapping = |keymap: &KeybindingItem| {
+    Row::new(vec![
+      ratatui::widgets::Cell::from(keymap.key.clone()),
+      ratatui::widgets::Cell::from(keymap.alt_key.clone()),
+      ratatui::widgets::Cell::from(keymap.desc.clone()),
+    ])
+    .primary()
+  };
+  let keymapping_table = ManagarrTable::new(
+    Some(app.keymapping_table.as_mut().unwrap()),
+    keymap_row_mapping,
+  )
+  .block(title_block("Keybindings"))
+  .loading(app.is_loading)
+  .headers(["Key", "Alt Key", "Description"])
+  .constraints([
+    Constraint::Ratio(1, 3),
+    Constraint::Ratio(1, 3),
+    Constraint::Ratio(1, 3),
+  ]);
+  f.render_widget(Clear, table_area);
+  f.render_widget(background_block(), table_area);
+  f.render_widget(keymapping_table, table_area);
+}
+
 fn draw_tabs(f: &mut Frame<'_>, area: Rect, title: &str, tab_state: &TabState) -> Rect {
   if title.is_empty() {
-    f.render_widget(layout_block(), area);
+    f.render_widget(layout_block().default(), area);
   } else {
     f.render_widget(title_block(title), area);
   }
@@ -138,8 +182,6 @@ fn draw_tabs(f: &mut Frame<'_>, area: Rect, title: &str, tab_state: &TabState) -
   let [header_area, content_area] = Layout::vertical([Constraint::Length(1), Constraint::Fill(0)])
     .margin(1)
     .areas(area);
-  let [tabs_area, help_area] =
-    Layout::horizontal([Constraint::Percentage(45), Constraint::Fill(0)]).areas(header_area);
 
   let titles = tab_state
     .tabs
@@ -149,12 +191,8 @@ fn draw_tabs(f: &mut Frame<'_>, area: Rect, title: &str, tab_state: &TabState) -
     .block(borderless_block())
     .highlight_style(Style::new().secondary())
     .select(tab_state.index);
-  let help = Paragraph::new(Text::from(tab_state.get_active_tab_help().help()))
-    .block(borderless_block())
-    .right_aligned();
 
-  f.render_widget(tabs, tabs_area);
-  f.render_widget(help, help_area);
+  f.render_widget(tabs, header_area);
 
   content_area
 }
diff --git a/src/ui/radarr_ui/blocklist/mod.rs b/src/ui/radarr_ui/blocklist/mod.rs
index b6b2b57..c6b30f0 100644
--- a/src/ui/radarr_ui/blocklist/mod.rs
+++ b/src/ui/radarr_ui/blocklist/mod.rs
@@ -82,11 +82,6 @@ fn draw_blocklist_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     } else {
       app.data.radarr_data.blocklist.current_selection().clone()
     };
-    let blocklist_table_footer = app
-      .data
-      .radarr_data
-      .main_tabs
-      .get_active_tab_contextual_help();
 
     let blocklist_row_mapping = |blocklist_item: &BlocklistItem| {
       let BlocklistItem {
@@ -136,7 +131,6 @@ fn draw_blocklist_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     )
     .block(layout_block_top_border())
     .loading(app.is_loading)
-    .footer(blocklist_table_footer)
     .sorting(active_radarr_block == ActiveRadarrBlock::BlocklistSortPrompt)
     .headers([
       "Movie Title",
diff --git a/src/ui/radarr_ui/collections/collection_details_ui.rs b/src/ui/radarr_ui/collections/collection_details_ui.rs
index cdd434f..34118f4 100644
--- a/src/ui/radarr_ui/collections/collection_details_ui.rs
+++ b/src/ui/radarr_ui/collections/collection_details_ui.rs
@@ -4,8 +4,6 @@ use ratatui::text::{Line, Text};
 use ratatui::widgets::{Cell, Paragraph, Row, Wrap};
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
-use crate::app::radarr::radarr_context_clues::COLLECTION_DETAILS_CONTEXT_CLUES;
 use crate::app::App;
 use crate::models::radarr_models::CollectionMovie;
 use crate::models::servarr_data::radarr::radarr_data::{
@@ -33,7 +31,7 @@ impl DrawUi for CollectionDetailsUi {
     if let Route::Radarr(active_radarr_block, context_option) = route {
       if let Some(context) = context_option {
         return COLLECTION_DETAILS_BLOCKS.contains(&active_radarr_block)
-          && context == ActiveRadarrBlock::CollectionDetails;
+          || context == ActiveRadarrBlock::CollectionDetails;
       }
 
       return COLLECTION_DETAILS_BLOCKS.contains(&active_radarr_block);
@@ -144,10 +142,6 @@ pub fn draw_collection_details(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
     "No"
   };
   let minimum_availability = collection_selection.minimum_availability.to_display_str();
-  let help_footer = format!(
-    "<↑↓> scroll table | {}",
-    build_context_clue_string(&COLLECTION_DETAILS_CONTEXT_CLUES)
-  );
 
   let collection_description = Text::from(vec![
     Line::from(vec![
@@ -191,7 +185,6 @@ pub fn draw_collection_details(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
   .block(layout_block_top_border_with_title(title_style("Movies")))
   .loading(app.is_loading)
   .footer_alignment(Alignment::Center)
-  .footer(Some(help_footer))
   .headers([
     "✔",
     "Title",
@@ -220,11 +213,10 @@ fn draw_movie_overview(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   let title_block = title_block("Overview");
   f.render_widget(title_block, area);
 
-  let [paragraph_area, help_area] =
-    Layout::vertical([Constraint::Percentage(95), Constraint::Length(1)])
-      .flex(Flex::SpaceBetween)
-      .margin(1)
-      .areas(area);
+  let [paragraph_area] = Layout::vertical([Constraint::Percentage(95)])
+    .flex(Flex::SpaceBetween)
+    .margin(1)
+    .areas(area);
   let overview = Text::from(
     app
       .data
@@ -235,15 +227,10 @@ fn draw_movie_overview(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       .overview,
   )
   .default();
-  let help_text = Text::from(build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES).help());
 
   let paragraph = Paragraph::new(overview)
     .block(borderless_block())
     .wrap(Wrap { trim: false });
-  let help_paragraph = Paragraph::new(help_text)
-    .block(borderless_block())
-    .centered();
 
   f.render_widget(paragraph, paragraph_area);
-  f.render_widget(help_paragraph, help_area);
 }
diff --git a/src/ui/radarr_ui/collections/collection_details_ui_tests.rs b/src/ui/radarr_ui/collections/collection_details_ui_tests.rs
index b52d666..871c688 100644
--- a/src/ui/radarr_ui/collections/collection_details_ui_tests.rs
+++ b/src/ui/radarr_ui/collections/collection_details_ui_tests.rs
@@ -25,5 +25,12 @@ mod tests {
       )
         .into()
     ));
+    assert!(CollectionDetailsUi::accepts(
+      (
+        ActiveRadarrBlock::AddMoviePrompt,
+        Some(ActiveRadarrBlock::CollectionDetails)
+      )
+        .into()
+    ));
   }
 }
diff --git a/src/ui/radarr_ui/collections/edit_collection_ui.rs b/src/ui/radarr_ui/collections/edit_collection_ui.rs
index 54bab3a..407eb23 100644
--- a/src/ui/radarr_ui/collections/edit_collection_ui.rs
+++ b/src/ui/radarr_ui/collections/edit_collection_ui.rs
@@ -1,10 +1,8 @@
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::{ListItem, Paragraph};
+use ratatui::widgets::ListItem;
 use ratatui::Frame;
 use std::sync::atomic::Ordering;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::radarr::modals::EditCollectionModal;
 use crate::models::servarr_data::radarr::radarr_data::{
@@ -88,6 +86,7 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
     .clone()
     .unwrap_or_default();
   let title = format!("Edit - {collection_title}");
+  f.render_widget(title_block_centered(&title), area);
   let yes_no_value = app.data.radarr_data.prompt_confirm;
   let selected_block = app.data.radarr_data.selected_block.get_active_block();
   let highlight_yes_no = selected_block == ActiveRadarrBlock::EditCollectionConfirmPrompt;
@@ -101,7 +100,7 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
   let selected_minimum_availability = minimum_availability_list.current_selection();
   let selected_quality_profile = quality_profile_list.current_selection();
 
-  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, root_folder_area, search_on_add_area, _, buttons_area, help_area] =
+  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, root_folder_area, search_on_add_area, _, buttons_area] =
     Layout::vertical([
       Constraint::Length(6),
       Constraint::Length(3),
@@ -111,7 +110,6 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
       Constraint::Length(3),
       Constraint::Fill(1),
       Constraint::Length(3),
-      Constraint::Length(1),
     ])
     .margin(1)
     .areas(area);
@@ -119,8 +117,6 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
       .areas(buttons_area);
 
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
   let prompt_paragraph = layout_paragraph_borderless(&collection_overview);
   let monitored_checkbox = Checkbox::new("Monitored")
     .highlighted(selected_block == ActiveRadarrBlock::EditCollectionToggleMonitored)
@@ -155,7 +151,6 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
     .title("Cancel")
     .selected(!yes_no_value && highlight_yes_no);
 
-  f.render_widget(title_block_centered(&title), area);
   f.render_widget(prompt_paragraph, paragraph_area);
   f.render_widget(monitored_checkbox, monitored_area);
   f.render_widget(min_availability_drop_down_button, min_availability_area);
@@ -163,7 +158,6 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
   f.render_widget(search_on_add_checkbox, search_on_add_area);
   f.render_widget(save_button, save_area);
   f.render_widget(cancel_button, cancel_area);
-  f.render_widget(help_paragraph, help_area);
 }
 
 fn draw_edit_collection_select_minimum_availability_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
diff --git a/src/ui/radarr_ui/collections/mod.rs b/src/ui/radarr_ui/collections/mod.rs
index 37269f6..90034e7 100644
--- a/src/ui/radarr_ui/collections/mod.rs
+++ b/src/ui/radarr_ui/collections/mod.rs
@@ -66,11 +66,6 @@ pub(super) fn draw_collections(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
     };
     let quality_profile_map = &app.data.radarr_data.quality_profile_map;
     let content = Some(&mut app.data.radarr_data.collections);
-    let collections_table_footer = app
-      .data
-      .radarr_data
-      .main_tabs
-      .get_active_tab_contextual_help();
     let collection_row_mapping = |collection: &Collection| {
       let number_of_movies = collection.movies.as_ref().unwrap_or(&Vec::new()).len();
       collection.title.scroll_left_or_reset(
@@ -112,7 +107,6 @@ pub(super) fn draw_collections(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
           || app.data.radarr_data.movies.is_empty()
           || app.data.radarr_data.quality_profile_map.is_empty(),
       )
-      .footer(collections_table_footer)
       .block(layout_block_top_border())
       .sorting(active_radarr_block == ActiveRadarrBlock::CollectionsSortPrompt)
       .searching(active_radarr_block == ActiveRadarrBlock::SearchCollection)
diff --git a/src/ui/radarr_ui/downloads/mod.rs b/src/ui/radarr_ui/downloads/mod.rs
index d247ff8..6f27f39 100644
--- a/src/ui/radarr_ui/downloads/mod.rs
+++ b/src/ui/radarr_ui/downloads/mod.rs
@@ -72,11 +72,6 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   } else {
     app.data.radarr_data.downloads.current_selection().clone()
   };
-  let downloads_table_footer = app
-    .data
-    .radarr_data
-    .main_tabs
-    .get_active_tab_contextual_help();
 
   let downloads_row_mapping = |download_record: &DownloadRecord| {
     let DownloadRecord {
@@ -125,7 +120,6 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   )
   .block(layout_block_top_border())
   .loading(app.is_loading)
-  .footer(downloads_table_footer)
   .headers([
     "Title",
     "Percent Complete",
diff --git a/src/ui/radarr_ui/indexers/edit_indexer_ui.rs b/src/ui/radarr_ui/indexers/edit_indexer_ui.rs
index 68724e2..85fc58a 100644
--- a/src/ui/radarr_ui/indexers/edit_indexer_ui.rs
+++ b/src/ui/radarr_ui/indexers/edit_indexer_ui.rs
@@ -1,6 +1,5 @@
 use std::sync::atomic::Ordering;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::models::Route;
@@ -14,8 +13,6 @@ use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::popup::Size;
 use crate::ui::{draw_popup, DrawUi};
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::Paragraph;
 use ratatui::Frame;
 
 #[cfg(test)]
@@ -45,21 +42,15 @@ fn draw_edit_indexer_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   let highlight_yes_no = selected_block == ActiveRadarrBlock::EditIndexerConfirmPrompt;
   let edit_indexer_modal_option = &app.data.radarr_data.edit_indexer_modal;
   let protocol = &app.data.radarr_data.indexers.current_selection().protocol;
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
 
   if edit_indexer_modal_option.is_some() {
+    f.render_widget(block, area);
     let edit_indexer_modal = edit_indexer_modal_option.as_ref().unwrap();
 
-    let [_, settings_area, _, buttons_area, help_area] = Layout::vertical([
-      Constraint::Fill(1),
-      Constraint::Length(18),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-      Constraint::Length(1),
-    ])
-    .margin(1)
-    .areas(area);
+    let [settings_area, buttons_area] =
+      Layout::vertical([Constraint::Fill(1), Constraint::Length(3)])
+        .margin(1)
+        .areas(area);
     let [left_side_area, right_side_area] =
       Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)])
         .margin(1)
@@ -163,13 +154,11 @@ fn draw_edit_indexer_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         .title("Cancel")
         .selected(!yes_no_value && highlight_yes_no);
 
-      f.render_widget(block, area);
       f.render_widget(rss_checkbox, rss_area);
       f.render_widget(auto_search_checkbox, auto_search_area);
       f.render_widget(interactive_search_checkbox, interactive_search_area);
       f.render_widget(save_button, save_area);
       f.render_widget(cancel_button, cancel_area);
-      f.render_widget(help_paragraph, help_area);
     }
   } else {
     f.render_widget(LoadingBlock::new(app.is_loading, block), area);
diff --git a/src/ui/radarr_ui/indexers/indexer_settings_ui.rs b/src/ui/radarr_ui/indexers/indexer_settings_ui.rs
index 3dd1972..1aa709c 100644
--- a/src/ui/radarr_ui/indexers/indexer_settings_ui.rs
+++ b/src/ui/radarr_ui/indexers/indexer_settings_ui.rs
@@ -1,11 +1,8 @@
 use std::sync::atomic::Ordering;
 
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::Paragraph;
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
@@ -52,21 +49,15 @@ fn draw_edit_indexer_settings_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area:
   let selected_block = app.data.radarr_data.selected_block.get_active_block();
   let highlight_yes_no = selected_block == ActiveRadarrBlock::IndexerSettingsConfirmPrompt;
   let indexer_settings_option = &app.data.radarr_data.indexer_settings;
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
 
   if indexer_settings_option.is_some() {
+    f.render_widget(block, area);
     let indexer_settings = indexer_settings_option.as_ref().unwrap();
 
-    let [_, settings_area, _, buttons_area, help_area] = Layout::vertical([
-      Constraint::Fill(1),
-      Constraint::Length(15),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-      Constraint::Length(1),
-    ])
-    .margin(1)
-    .areas(area);
+    let [settings_area, buttons_area] =
+      Layout::vertical([Constraint::Fill(1), Constraint::Length(3)])
+        .margin(1)
+        .areas(area);
     let [left_side_area, right_side_area] =
       Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)])
         .margin(1)
@@ -162,12 +153,10 @@ fn draw_edit_indexer_settings_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area:
       .title("Cancel")
       .selected(!yes_no_value && highlight_yes_no);
 
-    f.render_widget(block, area);
     f.render_widget(prefer_indexer_flags_checkbox, prefer_flags_area);
     f.render_widget(allow_hardcoded_subs_checkbox, allow_hardcoded_subs_area);
     f.render_widget(save_button, save_area);
     f.render_widget(cancel_button, cancel_area);
-    f.render_widget(help_paragraph, help_area);
   } else {
     f.render_widget(LoadingBlock::new(app.is_loading, block), area);
   }
diff --git a/src/ui/radarr_ui/indexers/mod.rs b/src/ui/radarr_ui/indexers/mod.rs
index 93aad8a..d1864a6 100644
--- a/src/ui/radarr_ui/indexers/mod.rs
+++ b/src/ui/radarr_ui/indexers/mod.rs
@@ -132,6 +132,7 @@ fn draw_indexers(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let rss = bool_to_text(*enable_rss);
     let automatic_search = bool_to_text(*enable_automatic_search);
     let interactive_search = bool_to_text(*enable_interactive_search);
+    let empty_tag = String::new();
     let tags: String = tags
       .iter()
       .map(|tag_id| {
@@ -140,7 +141,7 @@ fn draw_indexers(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           .radarr_data
           .tags_map
           .get_by_left(&tag_id.as_i64().unwrap())
-          .unwrap()
+          .unwrap_or(&empty_tag)
           .clone()
       })
       .collect::<Vec<String>>()
@@ -156,17 +157,11 @@ fn draw_indexers(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     ])
     .primary()
   };
-  let indexers_table_footer = app
-    .data
-    .radarr_data
-    .main_tabs
-    .get_active_tab_contextual_help();
   let indexers_table = ManagarrTable::new(
     Some(&mut app.data.radarr_data.indexers),
     indexers_row_mapping,
   )
   .block(layout_block_top_border())
-  .footer(indexers_table_footer)
   .loading(app.is_loading)
   .headers([
     "Indexer",
diff --git a/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs b/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs
index f7adc0d..e2b70aa 100644
--- a/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs
+++ b/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs
@@ -1,10 +1,9 @@
-use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::modals::IndexerTestResultModalItem;
 use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
 use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{borderless_block, get_width_from_percentage, title_block};
+use crate::ui::utils::{get_width_from_percentage, title_block};
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::Size;
 use crate::ui::{draw_popup, DrawUi};
@@ -43,10 +42,6 @@ fn draw_test_all_indexers_test_results(f: &mut Frame<'_>, app: &mut App<'_>, are
       IndexerTestResultModalItem::default()
     };
   f.render_widget(block, area);
-  let help_footer = format!(
-    "<↑↓> scroll | {}",
-    build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES)
-  );
   let test_results_row_mapping = |result: &IndexerTestResultModalItem| {
     result.validation_failures.scroll_left_or_reset(
       get_width_from_percentage(area, 86),
@@ -71,9 +66,7 @@ fn draw_test_all_indexers_test_results(f: &mut Frame<'_>, app: &mut App<'_>, are
     app.data.radarr_data.indexer_test_all_results.as_mut(),
     test_results_row_mapping,
   )
-  .block(borderless_block())
   .loading(is_loading)
-  .footer(Some(help_footer))
   .footer_alignment(Alignment::Center)
   .margin(1)
   .headers(["Indexer", "Pass/Fail", "Failure Messages"])
diff --git a/src/ui/radarr_ui/library/add_movie_ui.rs b/src/ui/radarr_ui/library/add_movie_ui.rs
index a7e4608..f981e52 100644
--- a/src/ui/radarr_ui/library/add_movie_ui.rs
+++ b/src/ui/radarr_ui/library/add_movie_ui.rs
@@ -1,14 +1,9 @@
 use std::sync::atomic::Ordering;
 
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::{Cell, ListItem, Paragraph, Row};
+use ratatui::widgets::{Cell, ListItem, Row};
 use ratatui::Frame;
 
-use crate::app::context_clues::{
-  build_context_clue_string, BARE_POPUP_CONTEXT_CLUES, CONFIRMATION_PROMPT_CONTEXT_CLUES,
-};
-use crate::app::radarr::radarr_context_clues::ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES;
 use crate::models::radarr_models::AddMovieSearchResult;
 use crate::models::servarr_data::radarr::modals::AddMovieModal;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
@@ -16,8 +11,7 @@ use crate::models::Route;
 use crate::ui::radarr_ui::collections::CollectionsUi;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
-  borderless_block, get_width_from_percentage, layout_block, layout_paragraph_borderless,
-  title_block_centered,
+  get_width_from_percentage, layout_block, layout_paragraph_borderless, title_block_centered,
 };
 use crate::ui::widgets::button::Button;
 use crate::ui::widgets::input_box::InputBox;
@@ -83,13 +77,10 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       AddMovieSearchResult::default()
     };
 
-  let [search_box_area, results_area, help_area] = Layout::vertical([
-    Constraint::Length(3),
-    Constraint::Fill(0),
-    Constraint::Length(3),
-  ])
-  .margin(1)
-  .areas(area);
+  let [search_box_area, results_area] =
+    Layout::vertical([Constraint::Length(3), Constraint::Fill(0)])
+      .margin(1)
+      .areas(area);
   let block_content = &app.data.radarr_data.add_movie_search.as_ref().unwrap().text;
   let offset = app
     .data
@@ -164,27 +155,17 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         let search_box = InputBox::new(block_content)
           .offset(offset)
           .block(title_block_centered("Add Movie"));
-        let help_text = Text::from(build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES).help());
-        let help_paragraph = Paragraph::new(help_text)
-          .block(borderless_block())
-          .centered();
 
         search_box.show_cursor(f, search_box_area);
-        f.render_widget(layout_block(), results_area);
+        f.render_widget(layout_block().default(), results_area);
         f.render_widget(search_box, search_box_area);
-        f.render_widget(help_paragraph, help_area);
       }
       ActiveRadarrBlock::AddMovieEmptySearchResults => {
-        let help_text = Text::from(build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES).help());
-        let help_paragraph = Paragraph::new(help_text)
-          .block(borderless_block())
-          .centered();
         let error_message = Message::new("No movies found matching your query!");
         let error_message_popup = Popup::new(error_message).size(Size::Message);
 
-        f.render_widget(layout_block(), results_area);
+        f.render_widget(layout_block().default(), results_area);
         f.render_widget(error_message_popup, f.area());
-        f.render_widget(help_paragraph, help_area);
       }
       ActiveRadarrBlock::AddMovieSearchResults
       | ActiveRadarrBlock::AddMoviePrompt
@@ -194,17 +175,12 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       | ActiveRadarrBlock::AddMovieSelectRootFolder
       | ActiveRadarrBlock::AddMovieAlreadyInLibrary
       | ActiveRadarrBlock::AddMovieTagsInput => {
-        let help_text =
-          Text::from(build_context_clue_string(&ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES).help());
-        let help_paragraph = Paragraph::new(help_text)
-          .block(borderless_block())
-          .centered();
         let search_results_table = ManagarrTable::new(
           app.data.radarr_data.add_searched_movies.as_mut(),
           search_results_row_mapping,
         )
         .loading(is_loading)
-        .block(layout_block())
+        .block(layout_block().default())
         .headers([
           "✔",
           "Title",
@@ -225,7 +201,6 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         ]);
 
         f.render_widget(search_results_table, results_area);
-        f.render_widget(help_paragraph, help_area);
       }
       _ => (),
     }
@@ -322,7 +297,7 @@ fn draw_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 
   f.render_widget(title_block_centered(&title), area);
 
-  let [paragraph_area, root_folder_area, monitor_area, min_availability_area, quality_profile_area, tags_area, _, buttons_area, help_area] =
+  let [paragraph_area, root_folder_area, monitor_area, min_availability_area, quality_profile_area, tags_area, _, buttons_area] =
     Layout::vertical([
       Constraint::Length(6),
       Constraint::Length(3),
@@ -332,16 +307,12 @@ fn draw_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       Constraint::Length(3),
       Constraint::Fill(1),
       Constraint::Length(3),
-      Constraint::Length(1),
     ])
     .margin(1)
     .areas(area);
 
   let prompt_paragraph = layout_paragraph_borderless(&prompt);
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
   f.render_widget(prompt_paragraph, paragraph_area);
-  f.render_widget(help_paragraph, help_area);
 
   let [add_area, cancel_area] =
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
diff --git a/src/ui/radarr_ui/library/edit_movie_ui.rs b/src/ui/radarr_ui/library/edit_movie_ui.rs
index 18fc10c..bc2a8c6 100644
--- a/src/ui/radarr_ui/library/edit_movie_ui.rs
+++ b/src/ui/radarr_ui/library/edit_movie_ui.rs
@@ -2,11 +2,9 @@ use std::sync::atomic::Ordering;
 
 use ratatui::layout::{Constraint, Rect};
 use ratatui::prelude::Layout;
-use ratatui::text::Text;
-use ratatui::widgets::{ListItem, Paragraph};
+use ratatui::widgets::ListItem;
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::radarr::modals::EditMovieModal;
 use crate::models::servarr_data::radarr::radarr_data::{
@@ -80,6 +78,7 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
     .overview
     .clone();
   let title = format!("Edit - {movie_title}");
+  f.render_widget(title_block_centered(&title), area);
   let yes_no_value = app.data.radarr_data.prompt_confirm;
   let selected_block = app.data.radarr_data.selected_block.get_active_block();
   let highlight_yes_no = selected_block == ActiveRadarrBlock::EditMovieConfirmPrompt;
@@ -93,7 +92,7 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
   let selected_minimum_availability = minimum_availability_list.current_selection();
   let selected_quality_profile = quality_profile_list.current_selection();
 
-  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, path_area, tags_area, _, buttons_area, help_area] =
+  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, path_area, tags_area, _, buttons_area] =
     Layout::vertical([
       Constraint::Length(6),
       Constraint::Length(3),
@@ -103,7 +102,6 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
       Constraint::Length(3),
       Constraint::Fill(1),
       Constraint::Length(3),
-      Constraint::Length(1),
     ])
     .margin(1)
     .areas(area);
@@ -111,8 +109,6 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
       .areas(buttons_area);
 
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
   let prompt_paragraph = layout_paragraph_borderless(&movie_overview);
   let monitored_checkbox = Checkbox::new("Monitored")
     .checked(monitored.unwrap_or_default())
@@ -157,14 +153,12 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
     .title("Cancel")
     .selected(!yes_no_value && highlight_yes_no);
 
-  f.render_widget(title_block_centered(&title), area);
   f.render_widget(prompt_paragraph, paragraph_area);
   f.render_widget(monitored_checkbox, monitored_area);
   f.render_widget(min_availability_drop_down_button, min_availability_area);
   f.render_widget(quality_profile_drop_down_button, quality_profile_area);
   f.render_widget(save_button, save_area);
   f.render_widget(cancel_button, cancel_area);
-  f.render_widget(help_paragraph, help_area);
 }
 
 fn draw_edit_movie_select_minimum_availability_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
diff --git a/src/ui/radarr_ui/library/mod.rs b/src/ui/radarr_ui/library/mod.rs
index 3afc071..c683fd0 100644
--- a/src/ui/radarr_ui/library/mod.rs
+++ b/src/ui/radarr_ui/library/mod.rs
@@ -44,25 +44,32 @@ impl DrawUi for LibraryUi {
 
   fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let route = app.get_current_route();
-    draw_library(f, app, area);
-
-    match route {
-      _ if MovieDetailsUi::accepts(route) => MovieDetailsUi::draw(f, app, area),
-      _ if AddMovieUi::accepts(route) => AddMovieUi::draw(f, app, area),
-      _ if EditMovieUi::accepts(route) => EditMovieUi::draw(f, app, area),
-      _ if DeleteMovieUi::accepts(route) => DeleteMovieUi::draw(f, app, area),
-      Route::Radarr(ActiveRadarrBlock::UpdateAllMoviesPrompt, _) => {
-        let confirmation_prompt = ConfirmationPrompt::new()
-          .title("Update All Movies")
-          .prompt("Do you want to update info and scan your disks for all of your movies?")
-          .yes_no_value(app.data.radarr_data.prompt_confirm);
-
-        f.render_widget(
-          Popup::new(confirmation_prompt).size(Size::MediumPrompt),
-          f.area(),
-        );
+    if let Route::Radarr(_, context_option) = route {
+      if context_option.is_some() && AddMovieUi::accepts(route) {
+        AddMovieUi::draw(f, app, area);
+        return;
+      }
+
+      draw_library(f, app, area);
+
+      match route {
+        _ if MovieDetailsUi::accepts(route) => MovieDetailsUi::draw(f, app, area),
+        _ if AddMovieUi::accepts(route) => AddMovieUi::draw(f, app, area),
+        _ if EditMovieUi::accepts(route) => EditMovieUi::draw(f, app, area),
+        _ if DeleteMovieUi::accepts(route) => DeleteMovieUi::draw(f, app, area),
+        Route::Radarr(ActiveRadarrBlock::UpdateAllMoviesPrompt, _) => {
+          let confirmation_prompt = ConfirmationPrompt::new()
+            .title("Update All Movies")
+            .prompt("Do you want to update info and scan your disks for all of your movies?")
+            .yes_no_value(app.data.radarr_data.prompt_confirm);
+
+          f.render_widget(
+            Popup::new(confirmation_prompt).size(Size::MediumPrompt),
+            f.area(),
+          );
+        }
+        _ => (),
       }
-      _ => (),
     }
   }
 }
@@ -78,11 +85,6 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let tags_map = &app.data.radarr_data.tags_map;
     let downloads_vec = &app.data.radarr_data.downloads.items;
     let content = Some(&mut app.data.radarr_data.movies);
-    let help_footer = app
-      .data
-      .radarr_data
-      .main_tabs
-      .get_active_tab_contextual_help();
 
     let library_table_row_mapping = |movie: &Movie| {
       movie.title.scroll_left_or_reset(
@@ -91,6 +93,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         app.tick_count % app.ticks_until_scroll == 0,
       );
       let monitored = if movie.monitored { "🏷" } else { "" };
+      let studio = movie.studio.clone().unwrap_or_default();
       let (hours, minutes) = convert_runtime(movie.runtime);
       let file_size: f64 = convert_to_gb(movie.size_on_disk);
       let certification = movie.certification.clone().unwrap_or_default();
@@ -98,6 +101,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         .get_by_left(&movie.quality_profile_id)
         .unwrap()
         .to_owned();
+      let empty_tag = String::new();
       let tags = if !movie.tags.is_empty() {
         movie
           .tags
@@ -105,7 +109,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           .map(|tag_id| {
             tags_map
               .get_by_left(&tag_id.as_i64().unwrap())
-              .unwrap()
+              .unwrap_or(&empty_tag)
               .clone()
           })
           .collect::<Vec<String>>()
@@ -120,7 +124,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         Row::new(vec![
           Cell::from(movie.title.to_string()),
           Cell::from(movie.year.to_string()),
-          Cell::from(movie.studio.to_string()),
+          Cell::from(studio),
           Cell::from(format!("{hours}h {minutes}m")),
           Cell::from(certification),
           Cell::from(movie.original_language.name.to_owned()),
@@ -134,7 +138,6 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let library_table = ManagarrTable::new(content, library_table_row_mapping)
       .block(layout_block_top_border())
       .loading(app.is_loading)
-      .footer(help_footer)
       .sorting(active_radarr_block == ActiveRadarrBlock::MoviesSortPrompt)
       .searching(active_radarr_block == ActiveRadarrBlock::SearchMovie)
       .search_produced_empty_results(active_radarr_block == ActiveRadarrBlock::SearchMovieError)
diff --git a/src/ui/radarr_ui/library/movie_details_ui.rs b/src/ui/radarr_ui/library/movie_details_ui.rs
index b9dd2af..d7291c0 100644
--- a/src/ui/radarr_ui/library/movie_details_ui.rs
+++ b/src/ui/radarr_ui/library/movie_details_ui.rs
@@ -5,6 +5,7 @@ use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Cell, Paragraph, Row, Wrap};
 use ratatui::Frame;
+use serde_json::Number;
 
 use crate::app::App;
 use crate::models::radarr_models::{Credit, MovieHistoryItem, RadarrRelease};
@@ -256,20 +257,14 @@ fn draw_movie_history(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         Cell::from(quality.quality.name.to_owned()),
         Cell::from(date.to_string()),
       ])
-      .success()
+      .primary()
     };
-    let help_footer = app
-      .data
-      .radarr_data
-      .movie_info_tabs
-      .get_active_tab_contextual_help();
     let history_table = ManagarrTable::new(
       Some(&mut movie_details_modal.movie_history),
       history_row_mapping,
     )
     .block(layout_block_top_border())
     .loading(app.is_loading)
-    .footer(help_footer)
     .headers(["Source Title", "Event Type", "Languages", "Quality", "Date"])
     .constraints([
       Constraint::Percentage(34),
@@ -297,17 +292,11 @@ fn draw_movie_cast(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           Cell::from(person_name.to_owned()),
           Cell::from(character.clone().unwrap_or_default()),
         ])
-        .success()
+        .primary()
       };
       let content = Some(&mut movie_details_modal.movie_cast);
-      let help_footer = app
-        .data
-        .radarr_data
-        .movie_info_tabs
-        .get_active_tab_contextual_help();
       let cast_table = ManagarrTable::new(content, cast_row_mapping)
         .block(layout_block_top_border())
-        .footer(help_footer)
         .loading(app.is_loading)
         .headers(["Cast Member", "Character"])
         .constraints([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]);
@@ -340,20 +329,14 @@ fn draw_movie_crew(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           Cell::from(job.clone().unwrap_or_default()),
           Cell::from(department.clone().unwrap_or_default()),
         ])
-        .success()
+        .primary()
       };
       let content = Some(&mut movie_details_modal.movie_crew);
-      let help_footer = app
-        .data
-        .radarr_data
-        .movie_info_tabs
-        .get_active_tab_contextual_help();
       let crew_table = ManagarrTable::new(content, crew_row_mapping)
         .block(layout_block_top_border())
         .loading(app.is_loading)
         .headers(["Crew Member", "Job", "Department"])
-        .constraints(iter::repeat(Constraint::Ratio(1, 3)).take(3))
-        .footer(help_footer);
+        .constraints(iter::repeat_n(Constraint::Ratio(1, 3), 3));
 
       f.render_widget(crew_table, area);
     }
@@ -382,11 +365,6 @@ fn draw_movie_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     };
     let current_route = app.get_current_route();
     let mut default_movie_details_modal = MovieDetailsModal::default();
-    let help_footer = app
-      .data
-      .radarr_data
-      .movie_info_tabs
-      .get_active_tab_contextual_help();
     let content = Some(
       &mut app
         .data
@@ -422,8 +400,16 @@ fn draw_movie_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       let peers = if seeders.is_none() || leechers.is_none() {
         Text::from("")
       } else {
-        let seeders = seeders.clone().unwrap().as_u64().unwrap();
-        let leechers = leechers.clone().unwrap().as_u64().unwrap();
+        let seeders = seeders
+          .clone()
+          .unwrap_or(Number::from(0u64))
+          .as_u64()
+          .unwrap();
+        let leechers = leechers
+          .clone()
+          .unwrap_or(Number::from(0u64))
+          .as_u64()
+          .unwrap();
 
         decorate_peer_style(
           seeders,
@@ -455,7 +441,6 @@ fn draw_movie_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let releases_table = ManagarrTable::new(content, releases_row_mapping)
       .block(layout_block_top_border())
       .loading(app.is_loading || is_empty)
-      .footer(help_footer)
       .sorting(active_radarr_block == ActiveRadarrBlock::ManualSearchSortPrompt)
       .headers([
         "Source", "Age", "⛔", "Title", "Indexer", "Size", "Peers", "Language", "Quality",
diff --git a/src/ui/radarr_ui/mod.rs b/src/ui/radarr_ui/mod.rs
index 18a9f11..5e18a70 100644
--- a/src/ui/radarr_ui/mod.rs
+++ b/src/ui/radarr_ui/mod.rs
@@ -92,9 +92,11 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     ];
 
     constraints.append(
-      &mut iter::repeat(Constraint::Length(1))
-        .take(disk_space_vec.len() + root_folders.items.len() + 1)
-        .collect(),
+      &mut iter::repeat_n(
+        Constraint::Length(1),
+        disk_space_vec.len() + root_folders.items.len() + 1,
+      )
+      .collect(),
     );
 
     let stat_item_areas = Layout::vertical(constraints).margin(1).split(area);
@@ -175,13 +177,10 @@ fn draw_downloads_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
 
     let max_items = ((((area.height as f32 / 2.0).floor() * 2.0) as i32) / 2) - 1;
     let items = cmp::min(downloads_vec.len(), max_items.unsigned_abs() as usize);
-    let download_item_areas = Layout::vertical(
-      iter::repeat(Constraint::Length(2))
-        .take(items)
-        .collect::<Vec<Constraint>>(),
-    )
-    .margin(1)
-    .split(area);
+    let download_item_areas =
+      Layout::vertical(iter::repeat_n(Constraint::Length(2), items).collect::<Vec<Constraint>>())
+        .margin(1)
+        .split(area);
 
     for i in 0..items {
       let DownloadRecord {
diff --git a/src/ui/radarr_ui/root_folders/mod.rs b/src/ui/radarr_ui/root_folders/mod.rs
index 52655ee..f2361e1 100644
--- a/src/ui/radarr_ui/root_folders/mod.rs
+++ b/src/ui/radarr_ui/root_folders/mod.rs
@@ -59,11 +59,6 @@ impl DrawUi for RootFoldersUi {
 }
 
 fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let help_footer = app
-    .data
-    .radarr_data
-    .main_tabs
-    .get_active_tab_contextual_help();
   let root_folders_row_mapping = |root_folders: &RootFolder| {
     let RootFolder {
       path,
@@ -94,7 +89,6 @@ fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   )
   .block(layout_block_top_border())
   .loading(app.is_loading)
-  .footer(help_footer)
   .headers(["Path", "Free Space", "Unmapped Folders"])
   .constraints([
     Constraint::Ratio(3, 5),
diff --git a/src/ui/radarr_ui/system/mod.rs b/src/ui/radarr_ui/system/mod.rs
index 6d90f65..715197f 100644
--- a/src/ui/radarr_ui/system/mod.rs
+++ b/src/ui/radarr_ui/system/mod.rs
@@ -4,7 +4,7 @@ use chrono::Utc;
 use ratatui::layout::Layout;
 use ratatui::style::Style;
 use ratatui::text::{Span, Text};
-use ratatui::widgets::{Cell, Paragraph, Row};
+use ratatui::widgets::{Cell, Row};
 use ratatui::{
   layout::{Constraint, Rect},
   widgets::ListItem,
@@ -17,9 +17,7 @@ use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
 use crate::models::servarr_models::QueueEvent;
 use crate::ui::radarr_ui::system::system_details_ui::SystemDetailsUi;
 use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{
-  convert_to_minutes_hours_days, layout_block_top_border, style_log_list_item,
-};
+use crate::ui::utils::{convert_to_minutes_hours_days, style_log_list_item};
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::selectable_list::SelectableList;
@@ -72,12 +70,8 @@ impl DrawUi for SystemUi {
 }
 
 fn draw_system_ui_layout(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let [activities_area, logs_area, help_area] = Layout::vertical([
-    Constraint::Ratio(1, 2),
-    Constraint::Ratio(1, 2),
-    Constraint::Min(2),
-  ])
-  .areas(area);
+  let [activities_area, logs_area] =
+    Layout::vertical([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]).areas(area);
 
   let [tasks_area, events_area] =
     Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]).areas(activities_area);
@@ -85,7 +79,6 @@ fn draw_system_ui_layout(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   draw_tasks(f, app, tasks_area);
   draw_queued_events(f, app, events_area);
   draw_logs(f, app, logs_area);
-  draw_help(f, app, help_area);
 }
 
 fn draw_tasks(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
@@ -188,26 +181,6 @@ fn draw_logs(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   f.render_widget(logs_box, area);
 }
 
-fn draw_help(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let help_text = Text::from(
-    format!(
-      " {}",
-      app
-        .data
-        .radarr_data
-        .main_tabs
-        .get_active_tab_contextual_help()
-        .unwrap()
-    )
-    .help(),
-  );
-  let help_paragraph = Paragraph::new(help_text)
-    .block(layout_block_top_border())
-    .left_aligned();
-
-  f.render_widget(help_paragraph, area);
-}
-
 pub(super) struct TaskProps {
   pub(super) name: String,
   pub(super) interval: String,
diff --git a/src/ui/radarr_ui/system/system_details_ui.rs b/src/ui/radarr_ui/system/system_details_ui.rs
index 4245d20..db1e538 100644
--- a/src/ui/radarr_ui/system/system_details_ui.rs
+++ b/src/ui/radarr_ui/system/system_details_ui.rs
@@ -3,8 +3,6 @@ use ratatui::text::{Span, Text};
 use ratatui::widgets::{Cell, ListItem, Paragraph, Row};
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
-use crate::app::radarr::radarr_context_clues::SYSTEM_TASKS_CONTEXT_CLUES;
 use crate::app::App;
 use crate::models::radarr_models::RadarrTask;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
@@ -59,17 +57,10 @@ impl DrawUi for SystemDetailsUi {
 
 fn draw_logs_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
   let block = title_block("Log Details");
-  let help_footer = format!(
-    "<↑↓←→> scroll | {}",
-    build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES)
-  );
 
   if app.data.radarr_data.log_details.items.is_empty() {
     let loading = LoadingBlock::new(app.is_loading, borderless_block());
-    let popup = Popup::new(loading)
-      .size(Size::Large)
-      .block(block)
-      .footer(&help_footer);
+    let popup = Popup::new(loading).size(Size::Large).block(block);
 
     f.render_widget(popup, f.area());
     return;
@@ -82,16 +73,12 @@ fn draw_logs_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
     style_log_list_item(ListItem::new(Text::from(Span::raw(log_line))), level)
   })
   .block(borderless_block());
-  let popup = Popup::new(logs_list)
-    .size(Size::Large)
-    .block(block)
-    .footer(&help_footer);
+  let popup = Popup::new(logs_list).size(Size::Large).block(block);
 
   f.render_widget(popup, f.area());
 }
 
 fn draw_tasks_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let help_footer = Some(build_context_clue_string(&SYSTEM_TASKS_CONTEXT_CLUES));
   let tasks_row_mapping = |task: &RadarrTask| {
     let task_props = extract_task_props(task);
 
@@ -105,10 +92,8 @@ fn draw_tasks_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     .primary()
   };
   let tasks_table = ManagarrTable::new(Some(&mut app.data.radarr_data.tasks), tasks_row_mapping)
-    .block(borderless_block())
     .loading(app.is_loading)
     .margin(1)
-    .footer(help_footer)
     .footer_alignment(Alignment::Center)
     .headers(TASK_TABLE_HEADERS)
     .constraints(TASK_TABLE_CONSTRAINTS);
@@ -137,10 +122,6 @@ fn draw_tasks_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 }
 
 fn draw_updates_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
-  let help_footer = format!(
-    "<↑↓> scroll | {}",
-    build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES)
-  );
   let updates = app.data.radarr_data.updates.get_text();
   let block = title_block("Updates");
 
@@ -148,18 +129,12 @@ fn draw_updates_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
     let updates_paragraph = Paragraph::new(Text::from(updates))
       .block(borderless_block())
       .scroll((app.data.radarr_data.updates.offset, 0));
-    let popup = Popup::new(updates_paragraph)
-      .size(Size::Large)
-      .block(block)
-      .footer(&help_footer);
+    let popup = Popup::new(updates_paragraph).size(Size::Large).block(block);
 
     f.render_widget(popup, f.area());
   } else {
     let loading = LoadingBlock::new(app.is_loading, borderless_block());
-    let popup = Popup::new(loading)
-      .size(Size::Large)
-      .block(block)
-      .footer(&help_footer);
+    let popup = Popup::new(loading).size(Size::Large).block(block);
 
     f.render_widget(popup, f.area());
   }
diff --git a/src/ui/sonarr_ui/blocklist/mod.rs b/src/ui/sonarr_ui/blocklist/mod.rs
index 442c98a..e1bb0f9 100644
--- a/src/ui/sonarr_ui/blocklist/mod.rs
+++ b/src/ui/sonarr_ui/blocklist/mod.rs
@@ -77,12 +77,6 @@ impl DrawUi for BlocklistUi {
 
 fn draw_blocklist_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
-    let blocklist_table_footer = app
-      .data
-      .sonarr_data
-      .main_tabs
-      .get_active_tab_contextual_help();
-
     let blocklist_row_mapping = |blocklist_item: &BlocklistItem| {
       let BlocklistItem {
         source_title,
@@ -115,7 +109,6 @@ fn draw_blocklist_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     )
     .block(layout_block_top_border())
     .loading(app.is_loading)
-    .footer(blocklist_table_footer)
     .sorting(active_sonarr_block == ActiveSonarrBlock::BlocklistSortPrompt)
     .headers([
       "Series Title",
diff --git a/src/ui/sonarr_ui/downloads/mod.rs b/src/ui/sonarr_ui/downloads/mod.rs
index ba3238f..01362b1 100644
--- a/src/ui/sonarr_ui/downloads/mod.rs
+++ b/src/ui/sonarr_ui/downloads/mod.rs
@@ -72,11 +72,6 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   } else {
     app.data.sonarr_data.downloads.current_selection().clone()
   };
-  let downloads_table_footer = app
-    .data
-    .sonarr_data
-    .main_tabs
-    .get_active_tab_contextual_help();
 
   let downloads_row_mapping = |download_record: &DownloadRecord| {
     let DownloadRecord {
@@ -130,7 +125,6 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   )
   .block(layout_block_top_border())
   .loading(app.is_loading)
-  .footer(downloads_table_footer)
   .headers([
     "Title",
     "Percent Complete",
diff --git a/src/ui/sonarr_ui/history/mod.rs b/src/ui/sonarr_ui/history/mod.rs
index 268bfdc..ea85300 100644
--- a/src/ui/sonarr_ui/history/mod.rs
+++ b/src/ui/sonarr_ui/history/mod.rs
@@ -55,12 +55,6 @@ fn draw_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     app.data.sonarr_data.history.current_selection().clone()
   };
   if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
-    let history_table_footer = app
-      .data
-      .sonarr_data
-      .main_tabs
-      .get_active_tab_contextual_help();
-
     let history_row_mapping = |history_item: &SonarrHistoryItem| {
       let SonarrHistoryItem {
         source_title,
@@ -96,7 +90,6 @@ fn draw_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       ManagarrTable::new(Some(&mut app.data.sonarr_data.history), history_row_mapping)
         .block(layout_block_top_border())
         .loading(app.is_loading)
-        .footer(history_table_footer)
         .sorting(active_sonarr_block == ActiveSonarrBlock::HistorySortPrompt)
         .searching(active_sonarr_block == ActiveSonarrBlock::SearchHistory)
         .search_produced_empty_results(active_sonarr_block == ActiveSonarrBlock::SearchHistoryError)
diff --git a/src/ui/sonarr_ui/indexers/edit_indexer_ui.rs b/src/ui/sonarr_ui/indexers/edit_indexer_ui.rs
index 2042890..58d716f 100644
--- a/src/ui/sonarr_ui/indexers/edit_indexer_ui.rs
+++ b/src/ui/sonarr_ui/indexers/edit_indexer_ui.rs
@@ -1,6 +1,5 @@
 use std::sync::atomic::Ordering;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::models::Route;
@@ -14,8 +13,6 @@ use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::popup::Size;
 use crate::ui::{draw_popup, DrawUi};
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::Paragraph;
 use ratatui::Frame;
 
 #[cfg(test)]
@@ -45,21 +42,15 @@ fn draw_edit_indexer_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   let highlight_yes_no = selected_block == ActiveSonarrBlock::EditIndexerConfirmPrompt;
   let edit_indexer_modal_option = &app.data.sonarr_data.edit_indexer_modal;
   let protocol = &app.data.sonarr_data.indexers.current_selection().protocol;
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
 
   if edit_indexer_modal_option.is_some() {
+    f.render_widget(block, area);
     let edit_indexer_modal = edit_indexer_modal_option.as_ref().unwrap();
 
-    let [_, settings_area, _, buttons_area, help_area] = Layout::vertical([
-      Constraint::Fill(1),
-      Constraint::Length(18),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-      Constraint::Length(1),
-    ])
-    .margin(1)
-    .areas(area);
+    let [settings_area, buttons_area] =
+      Layout::vertical([Constraint::Fill(1), Constraint::Length(3)])
+        .margin(1)
+        .areas(area);
     let [left_side_area, right_side_area] =
       Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)])
         .margin(1)
@@ -163,13 +154,11 @@ fn draw_edit_indexer_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         .title("Cancel")
         .selected(!yes_no_value && highlight_yes_no);
 
-      f.render_widget(block, area);
       f.render_widget(rss_checkbox, rss_area);
       f.render_widget(auto_search_checkbox, auto_search_area);
       f.render_widget(interactive_search_checkbox, interactive_search_area);
       f.render_widget(save_button, save_area);
       f.render_widget(cancel_button, cancel_area);
-      f.render_widget(help_paragraph, help_area);
     }
   } else {
     f.render_widget(LoadingBlock::new(app.is_loading, block), area);
diff --git a/src/ui/sonarr_ui/indexers/indexer_settings_ui.rs b/src/ui/sonarr_ui/indexers/indexer_settings_ui.rs
index 4d284aa..3e01503 100644
--- a/src/ui/sonarr_ui/indexers/indexer_settings_ui.rs
+++ b/src/ui/sonarr_ui/indexers/indexer_settings_ui.rs
@@ -1,9 +1,6 @@
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::Paragraph;
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::sonarr::sonarr_data::{
   ActiveSonarrBlock, INDEXER_SETTINGS_BLOCKS,
@@ -44,13 +41,12 @@ fn draw_edit_indexer_settings_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area:
   let selected_block = app.data.sonarr_data.selected_block.get_active_block();
   let highlight_yes_no = selected_block == ActiveSonarrBlock::IndexerSettingsConfirmPrompt;
   let indexer_settings_option = &app.data.sonarr_data.indexer_settings;
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
 
   if indexer_settings_option.is_some() {
+    f.render_widget(block, area);
     let indexer_settings = indexer_settings_option.as_ref().unwrap();
 
-    let [_, min_age_area, retention_area, max_size_area, rss_sync_area, _, buttons_area, help_area] =
+    let [_, min_age_area, retention_area, max_size_area, rss_sync_area, _, buttons_area] =
       Layout::vertical([
         Constraint::Fill(1),
         Constraint::Length(3),
@@ -59,7 +55,6 @@ fn draw_edit_indexer_settings_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area:
         Constraint::Length(3),
         Constraint::Fill(1),
         Constraint::Length(3),
-        Constraint::Length(1),
       ])
       .margin(1)
       .areas(area);
@@ -109,10 +104,8 @@ fn draw_edit_indexer_settings_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area:
       .title("Cancel")
       .selected(!yes_no_value && highlight_yes_no);
 
-    f.render_widget(block, area);
     f.render_widget(save_button, save_area);
     f.render_widget(cancel_button, cancel_area);
-    f.render_widget(help_paragraph, help_area);
   } else {
     f.render_widget(LoadingBlock::new(app.is_loading, block), area);
   }
diff --git a/src/ui/sonarr_ui/indexers/mod.rs b/src/ui/sonarr_ui/indexers/mod.rs
index a0f5d67..fa7e3f4 100644
--- a/src/ui/sonarr_ui/indexers/mod.rs
+++ b/src/ui/sonarr_ui/indexers/mod.rs
@@ -132,6 +132,7 @@ fn draw_indexers(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let rss = bool_to_text(*enable_rss);
     let automatic_search = bool_to_text(*enable_automatic_search);
     let interactive_search = bool_to_text(*enable_interactive_search);
+    let empty_tag = String::new();
     let tags: String = tags
       .iter()
       .map(|tag_id| {
@@ -140,7 +141,7 @@ fn draw_indexers(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           .sonarr_data
           .tags_map
           .get_by_left(&tag_id.as_i64().unwrap())
-          .unwrap()
+          .unwrap_or(&empty_tag)
           .clone()
       })
       .collect::<Vec<String>>()
@@ -156,17 +157,11 @@ fn draw_indexers(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     ])
     .primary()
   };
-  let indexers_table_footer = app
-    .data
-    .sonarr_data
-    .main_tabs
-    .get_active_tab_contextual_help();
   let indexers_table = ManagarrTable::new(
     Some(&mut app.data.sonarr_data.indexers),
     indexers_row_mapping,
   )
   .block(layout_block_top_border())
-  .footer(indexers_table_footer)
   .loading(app.is_loading)
   .headers([
     "Indexer",
diff --git a/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs b/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs
index 7bc3739..e6c5c05 100644
--- a/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs
+++ b/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs
@@ -1,10 +1,9 @@
-use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::modals::IndexerTestResultModalItem;
 use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
 use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{borderless_block, get_width_from_percentage, title_block};
+use crate::ui::utils::{get_width_from_percentage, title_block};
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::Size;
 use crate::ui::{draw_popup, DrawUi};
@@ -41,10 +40,6 @@ fn draw_test_all_indexers_test_results(f: &mut Frame<'_>, app: &mut App<'_>, are
       IndexerTestResultModalItem::default()
     };
   f.render_widget(title_block("Test All Indexers"), area);
-  let help_footer = format!(
-    "<↑↓> scroll | {}",
-    build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES)
-  );
   let test_results_row_mapping = |result: &IndexerTestResultModalItem| {
     result.validation_failures.scroll_left_or_reset(
       get_width_from_percentage(area, 86),
@@ -69,9 +64,7 @@ fn draw_test_all_indexers_test_results(f: &mut Frame<'_>, app: &mut App<'_>, are
     app.data.sonarr_data.indexer_test_all_results.as_mut(),
     test_results_row_mapping,
   )
-  .block(borderless_block())
   .loading(is_loading)
-  .footer(Some(help_footer))
   .footer_alignment(Alignment::Center)
   .margin(1)
   .headers(["Indexer", "Pass/Fail", "Failure Messages"])
diff --git a/src/ui/sonarr_ui/library/add_series_ui.rs b/src/ui/sonarr_ui/library/add_series_ui.rs
index 34384d0..2754ad7 100644
--- a/src/ui/sonarr_ui/library/add_series_ui.rs
+++ b/src/ui/sonarr_ui/library/add_series_ui.rs
@@ -1,22 +1,16 @@
 use std::sync::atomic::Ordering;
 
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::text::Text;
-use ratatui::widgets::{Cell, ListItem, Paragraph, Row};
+use ratatui::widgets::{Cell, ListItem, Row};
 use ratatui::Frame;
 
-use crate::app::context_clues::{
-  build_context_clue_string, BARE_POPUP_CONTEXT_CLUES, CONFIRMATION_PROMPT_CONTEXT_CLUES,
-};
-use crate::app::sonarr::sonarr_context_clues::ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES;
 use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ADD_SERIES_BLOCKS};
 use crate::models::sonarr_models::AddSeriesSearchResult;
 use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
-  borderless_block, get_width_from_percentage, layout_block, layout_paragraph_borderless,
-  title_block_centered,
+  get_width_from_percentage, layout_block, layout_paragraph_borderless, title_block_centered,
 };
 use crate::ui::widgets::button::Button;
 use crate::ui::widgets::checkbox::Checkbox;
@@ -78,13 +72,10 @@ fn draw_add_series_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       AddSeriesSearchResult::default()
     };
 
-  let [search_box_area, results_area, help_area] = Layout::vertical([
-    Constraint::Length(3),
-    Constraint::Fill(0),
-    Constraint::Length(3),
-  ])
-  .margin(1)
-  .areas(area);
+  let [search_box_area, results_area] =
+    Layout::vertical([Constraint::Length(3), Constraint::Fill(0)])
+      .margin(1)
+      .areas(area);
   let block_content = &app
     .data
     .sonarr_data
@@ -150,27 +141,17 @@ fn draw_add_series_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         let search_box = InputBox::new(block_content)
           .offset(offset)
           .block(title_block_centered("Add Series"));
-        let help_text = Text::from(build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES).help());
-        let help_paragraph = Paragraph::new(help_text)
-          .block(borderless_block())
-          .centered();
 
         search_box.show_cursor(f, search_box_area);
-        f.render_widget(layout_block(), results_area);
+        f.render_widget(layout_block().default(), results_area);
         f.render_widget(search_box, search_box_area);
-        f.render_widget(help_paragraph, help_area);
       }
       ActiveSonarrBlock::AddSeriesEmptySearchResults => {
-        let help_text = Text::from(build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES).help());
-        let help_paragraph = Paragraph::new(help_text)
-          .block(borderless_block())
-          .centered();
         let error_message = Message::new("No series found matching your query!");
         let error_message_popup = Popup::new(error_message).size(Size::Message);
 
-        f.render_widget(layout_block(), results_area);
+        f.render_widget(layout_block().default(), results_area);
         f.render_widget(error_message_popup, f.area());
-        f.render_widget(help_paragraph, help_area);
       }
       ActiveSonarrBlock::AddSeriesSearchResults
       | ActiveSonarrBlock::AddSeriesPrompt
@@ -181,17 +162,12 @@ fn draw_add_series_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       | ActiveSonarrBlock::AddSeriesSelectRootFolder
       | ActiveSonarrBlock::AddSeriesAlreadyInLibrary
       | ActiveSonarrBlock::AddSeriesTagsInput => {
-        let help_text =
-          Text::from(build_context_clue_string(&ADD_SERIES_SEARCH_RESULTS_CONTEXT_CLUES).help());
-        let help_paragraph = Paragraph::new(help_text)
-          .block(borderless_block())
-          .centered();
         let search_results_table = ManagarrTable::new(
           app.data.sonarr_data.add_searched_series.as_mut(),
           search_results_row_mapping,
         )
         .loading(is_loading)
-        .block(layout_block())
+        .block(layout_block().default())
         .headers([
           "✔", "Title", "Year", "Network", "Seasons", "Rating", "Genres",
         ])
@@ -206,7 +182,6 @@ fn draw_add_series_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         ]);
 
         f.render_widget(search_results_table, results_area);
-        f.render_widget(help_paragraph, help_area);
       }
       _ => (),
     }
@@ -297,7 +272,7 @@ fn draw_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 
   f.render_widget(title_block_centered(&title), area);
 
-  let [paragraph_area, root_folder_area, monitor_area, quality_profile_area, language_profile_area, series_type_area, season_folder_area, tags_area, _, buttons_area, help_area] =
+  let [paragraph_area, root_folder_area, monitor_area, quality_profile_area, language_profile_area, series_type_area, season_folder_area, tags_area, _, buttons_area] =
     Layout::vertical([
       Constraint::Length(6),
       Constraint::Length(3),
@@ -309,16 +284,12 @@ fn draw_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       Constraint::Length(3),
       Constraint::Fill(1),
       Constraint::Length(3),
-      Constraint::Length(1),
     ])
     .margin(1)
     .areas(area);
 
   let prompt_paragraph = layout_paragraph_borderless(&prompt);
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
   f.render_widget(prompt_paragraph, paragraph_area);
-  f.render_widget(help_paragraph, help_area);
 
   let [add_area, cancel_area] =
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
diff --git a/src/ui/sonarr_ui/library/edit_series_ui.rs b/src/ui/sonarr_ui/library/edit_series_ui.rs
index 0b6fee4..9307235 100644
--- a/src/ui/sonarr_ui/library/edit_series_ui.rs
+++ b/src/ui/sonarr_ui/library/edit_series_ui.rs
@@ -2,11 +2,9 @@ use std::sync::atomic::Ordering;
 
 use ratatui::layout::{Constraint, Rect};
 use ratatui::prelude::Layout;
-use ratatui::text::Text;
-use ratatui::widgets::{ListItem, Paragraph};
+use ratatui::widgets::ListItem;
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::app::App;
 use crate::models::servarr_data::sonarr::modals::EditSeriesModal;
 use crate::models::servarr_data::sonarr::sonarr_data::{
@@ -89,6 +87,8 @@ fn draw_edit_series_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, ar
     .clone()
     .unwrap_or_default();
   let title = format!("Edit - {series_title}");
+  f.render_widget(title_block_centered(&title), area);
+
   let yes_no_value = app.data.sonarr_data.prompt_confirm;
   let selected_block = app.data.sonarr_data.selected_block.get_active_block();
   let highlight_yes_no = selected_block == ActiveSonarrBlock::EditSeriesConfirmPrompt;
@@ -105,7 +105,7 @@ fn draw_edit_series_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, ar
   let selected_quality_profile = quality_profile_list.current_selection();
   let selected_language_profile = language_profile_list.current_selection();
 
-  let [paragraph_area, monitored_area, season_folder_area, quality_profile_area, language_profile_area, series_type_area, path_area, tags_area, _, buttons_area, help_area] =
+  let [paragraph_area, monitored_area, season_folder_area, quality_profile_area, language_profile_area, series_type_area, path_area, tags_area, _, buttons_area] =
     Layout::vertical([
       Constraint::Length(6),
       Constraint::Length(3),
@@ -117,7 +117,6 @@ fn draw_edit_series_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, ar
       Constraint::Length(3),
       Constraint::Fill(1),
       Constraint::Length(3),
-      Constraint::Length(1),
     ])
     .margin(1)
     .areas(area);
@@ -125,8 +124,6 @@ fn draw_edit_series_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, ar
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
       .areas(buttons_area);
 
-  let help_text = Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-  let help_paragraph = Paragraph::new(help_text).centered();
   let prompt_paragraph = layout_paragraph_borderless(&series_overview);
   let monitored_checkbox = Checkbox::new("Monitored")
     .checked(monitored.unwrap_or_default())
@@ -179,7 +176,6 @@ fn draw_edit_series_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, ar
     .title("Cancel")
     .selected(!yes_no_value && highlight_yes_no);
 
-  f.render_widget(title_block_centered(&title), area);
   f.render_widget(prompt_paragraph, paragraph_area);
   f.render_widget(monitored_checkbox, monitored_area);
   f.render_widget(season_folder_checkbox, season_folder_area);
@@ -188,7 +184,6 @@ fn draw_edit_series_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, ar
   f.render_widget(series_type_drop_down_button, series_type_area);
   f.render_widget(save_button, save_area);
   f.render_widget(cancel_button, cancel_area);
-  f.render_widget(help_paragraph, help_area);
 }
 
 fn draw_edit_series_select_series_type_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
diff --git a/src/ui/sonarr_ui/library/episode_details_ui.rs b/src/ui/sonarr_ui/library/episode_details_ui.rs
index 9d08a54..786edf7 100644
--- a/src/ui/sonarr_ui/library/episode_details_ui.rs
+++ b/src/ui/sonarr_ui/library/episode_details_ui.rs
@@ -257,9 +257,6 @@ fn draw_episode_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
             .current_selection()
             .clone()
         };
-        let episode_history_table_footer = episode_details_modal
-          .episode_details_tabs
-          .get_active_tab_contextual_help();
 
         let history_row_mapping = |history_item: &SonarrHistoryItem| {
           let SonarrHistoryItem {
@@ -306,7 +303,6 @@ fn draw_episode_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect)
           ManagarrTable::new(Some(&mut episode_history_table), history_row_mapping)
             .block(layout_block_top_border())
             .loading(app.is_loading)
-            .footer(episode_history_table_footer)
             .headers(["Source Title", "Event Type", "Language", "Quality", "Date"])
             .constraints([
               Constraint::Percentage(40),
@@ -397,9 +393,6 @@ fn draw_episode_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
             episode_details_modal.episode_releases.is_empty(),
           )
         };
-        let episode_release_table_footer = episode_details_modal
-          .episode_details_tabs
-          .get_active_tab_contextual_help();
 
         if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
           let episode_release_row_mapping = |release: &SonarrRelease| {
@@ -429,8 +422,16 @@ fn draw_episode_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
             let peers = if seeders.is_none() || leechers.is_none() {
               Text::from("")
             } else {
-              let seeders = seeders.clone().unwrap().as_u64().unwrap();
-              let leechers = leechers.clone().unwrap().as_u64().unwrap();
+              let seeders = seeders
+                .clone()
+                .unwrap_or(Number::from(0u64))
+                .as_u64()
+                .unwrap();
+              let leechers = leechers
+                .clone()
+                .unwrap_or(Number::from(0u64))
+                .as_u64()
+                .unwrap();
 
               decorate_peer_style(
                 seeders,
@@ -475,7 +476,6 @@ fn draw_episode_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           )
           .block(layout_block_top_border())
           .loading(app.is_loading || is_empty)
-          .footer(episode_release_table_footer)
           .sorting(active_sonarr_block == ActiveSonarrBlock::ManualEpisodeSearchSortPrompt)
           .headers([
             "Source", "Age", "⛔", "Title", "Indexer", "Size", "Peers", "Language", "Quality",
diff --git a/src/ui/sonarr_ui/library/library_ui_tests.rs b/src/ui/sonarr_ui/library/library_ui_tests.rs
index a3c082b..f740d39 100644
--- a/src/ui/sonarr_ui/library/library_ui_tests.rs
+++ b/src/ui/sonarr_ui/library/library_ui_tests.rs
@@ -54,20 +54,20 @@ mod tests {
     let seasons = vec![
       Season {
         monitored: false,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 1,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
       Season {
         monitored: true,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 3,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
     ];
@@ -89,20 +89,20 @@ mod tests {
     let seasons = vec![
       Season {
         monitored: true,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 1,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
       Season {
         monitored: true,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 3,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
     ];
@@ -139,20 +139,20 @@ mod tests {
     let seasons = vec![
       Season {
         monitored: false,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 1,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
       Season {
         monitored: true,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 3,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
     ];
@@ -174,20 +174,20 @@ mod tests {
     let seasons = vec![
       Season {
         monitored: true,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 1,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
       Season {
         monitored: true,
-        statistics: SeasonStatistics {
+        statistics: Some(SeasonStatistics {
           episode_file_count: 3,
           episode_count: 3,
           ..SeasonStatistics::default()
-        },
+        }),
         ..Season::default()
       },
     ];
diff --git a/src/ui/sonarr_ui/library/mod.rs b/src/ui/sonarr_ui/library/mod.rs
index a31482c..fa2d6da 100644
--- a/src/ui/sonarr_ui/library/mod.rs
+++ b/src/ui/sonarr_ui/library/mod.rs
@@ -12,6 +12,7 @@ use crate::ui::widgets::{
   confirmation_prompt::ConfirmationPrompt,
   popup::{Popup, Size},
 };
+use crate::utils::convert_to_gb;
 use crate::{
   app::App,
   models::{
@@ -89,11 +90,6 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let language_profile_map = &app.data.sonarr_data.language_profiles_map;
     let tags_map = &app.data.sonarr_data.tags_map;
     let content = Some(&mut app.data.sonarr_data.series);
-    let help_footer = app
-      .data
-      .sonarr_data
-      .main_tabs
-      .get_active_tab_contextual_help();
 
     let series_table_row_mapping = |series: &Series| {
       series.title.scroll_left_or_reset(
@@ -104,6 +100,10 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       let monitored = if series.monitored { "🏷" } else { "" };
       let certification = series.certification.clone().unwrap_or_default();
       let network = series.network.clone().unwrap_or_default();
+      let size = series
+        .statistics
+        .as_ref()
+        .map_or(0f64, |stats| convert_to_gb(stats.size_on_disk));
       let quality_profile = quality_profile_map
         .get_by_left(&series.quality_profile_id)
         .unwrap()
@@ -112,6 +112,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         .get_by_left(&series.language_profile_id)
         .unwrap()
         .to_owned();
+      let empty_tag = String::new();
       let tags = if !series.tags.is_empty() {
         series
           .tags
@@ -119,7 +120,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           .map(|tag_id| {
             tags_map
               .get_by_left(&tag_id.as_i64().unwrap())
-              .unwrap()
+              .unwrap_or(&empty_tag)
               .clone()
           })
           .collect::<Vec<String>>()
@@ -139,6 +140,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           Cell::from(series.series_type.to_display_str()),
           Cell::from(quality_profile),
           Cell::from(language_profile),
+          Cell::from(format!("{size:.2} GB")),
           Cell::from(monitored.to_owned()),
           Cell::from(tags),
         ]),
@@ -147,7 +149,6 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let series_table = ManagarrTable::new(content, series_table_row_mapping)
       .block(layout_block_top_border())
       .loading(app.is_loading)
-      .footer(help_footer)
       .sorting(active_sonarr_block == ActiveSonarrBlock::SeriesSortPrompt)
       .searching(active_sonarr_block == ActiveSonarrBlock::SearchSeries)
       .filtering(active_sonarr_block == ActiveSonarrBlock::FilterSeries)
@@ -161,19 +162,21 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         "Rating",
         "Type",
         "Quality Profile",
-        "Language Profile",
+        "Language",
+        "Size",
         "Monitored",
         "Tags",
       ])
       .constraints([
-        Constraint::Percentage(23),
+        Constraint::Percentage(20),
         Constraint::Percentage(4),
         Constraint::Percentage(14),
         Constraint::Percentage(6),
         Constraint::Percentage(6),
         Constraint::Percentage(6),
-        Constraint::Percentage(13),
-        Constraint::Percentage(10),
+        Constraint::Percentage(11),
+        Constraint::Percentage(8),
+        Constraint::Percentage(7),
         Constraint::Percentage(6),
         Constraint::Percentage(12),
       ]);
@@ -202,8 +205,19 @@ fn decorate_series_row_with_style<'a>(series: &Series, row: Row<'a>) -> Row<'a>
         return if seasons
           .iter()
           .filter(|season| season.monitored)
-          .all(|season| season.statistics.episode_file_count == season.statistics.episode_count)
-        {
+          .filter(|season| season.statistics.is_some())
+          .all(|season| {
+            season
+              .statistics
+              .as_ref()
+              .expect("Season Statistics is undefined")
+              .episode_file_count
+              == season
+                .statistics
+                .as_ref()
+                .expect("Season statistics is undefined")
+                .episode_count
+          }) {
           row.downloaded()
         } else {
           row.missing()
@@ -217,8 +231,19 @@ fn decorate_series_row_with_style<'a>(series: &Series, row: Row<'a>) -> Row<'a>
         return if seasons
           .iter()
           .filter(|season| season.monitored)
-          .all(|season| season.statistics.episode_file_count == season.statistics.episode_count)
-        {
+          .filter(|season| season.statistics.is_some())
+          .all(|season| {
+            season
+              .statistics
+              .as_ref()
+              .expect("Season Statistics is undefined")
+              .episode_file_count
+              == season
+                .statistics
+                .as_ref()
+                .expect("Season statistics is undefined")
+                .episode_count
+          }) {
           row.unreleased()
         } else {
           row.missing()
diff --git a/src/ui/sonarr_ui/library/season_details_ui.rs b/src/ui/sonarr_ui/library/season_details_ui.rs
index 5c93a78..6a8ca36 100644
--- a/src/ui/sonarr_ui/library/season_details_ui.rs
+++ b/src/ui/sonarr_ui/library/season_details_ui.rs
@@ -149,14 +149,6 @@ pub fn draw_season_details(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 
 fn draw_episodes_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
-    let help_footer = app
-      .data
-      .sonarr_data
-      .season_details_modal
-      .as_ref()
-      .expect("Season details modal is unpopulated")
-      .season_details_tabs
-      .get_active_tab_contextual_help();
     let episode_files = app
       .data
       .sonarr_data
@@ -222,7 +214,6 @@ fn draw_episodes_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let season_table = ManagarrTable::new(content, episode_row_mapping)
       .block(layout_block_top_border())
       .loading(app.is_loading)
-      .footer(help_footer)
       .searching(is_searching)
       .search_produced_empty_results(active_sonarr_block == ActiveSonarrBlock::SearchEpisodesError)
       .headers([
@@ -261,9 +252,6 @@ fn draw_season_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           .current_selection()
           .clone()
       };
-      let season_history_table_footer = season_details_modal
-        .season_details_tabs
-        .get_active_tab_contextual_help();
 
       if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
         let history_row_mapping = |history_item: &SonarrHistoryItem| {
@@ -308,7 +296,6 @@ fn draw_season_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           ManagarrTable::new(Some(&mut season_history_table), history_row_mapping)
             .block(layout_block_top_border())
             .loading(app.is_loading)
-            .footer(season_history_table_footer)
             .sorting(active_sonarr_block == ActiveSonarrBlock::SeasonHistorySortPrompt)
             .searching(active_sonarr_block == ActiveSonarrBlock::SearchSeasonHistory)
             .search_produced_empty_results(
@@ -363,9 +350,6 @@ fn draw_season_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           season_details_modal.season_releases.is_empty(),
         )
       };
-      let season_release_table_footer = season_details_modal
-        .season_details_tabs
-        .get_active_tab_contextual_help();
 
       if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
         let season_release_row_mapping = |release: &SonarrRelease| {
@@ -395,8 +379,16 @@ fn draw_season_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           let peers = if seeders.is_none() || leechers.is_none() {
             Text::from("")
           } else {
-            let seeders = seeders.clone().unwrap().as_u64().unwrap();
-            let leechers = leechers.clone().unwrap().as_u64().unwrap();
+            let seeders = seeders
+              .clone()
+              .unwrap_or(Number::from(0u64))
+              .as_u64()
+              .unwrap();
+            let leechers = leechers
+              .clone()
+              .unwrap_or(Number::from(0u64))
+              .as_u64()
+              .unwrap();
 
             decorate_peer_style(
               seeders,
@@ -436,7 +428,6 @@ fn draw_season_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           ManagarrTable::new(Some(&mut season_release_table), season_release_row_mapping)
             .block(layout_block_top_border())
             .loading(app.is_loading || is_empty)
-            .footer(season_release_table_footer)
             .sorting(active_sonarr_block == ActiveSonarrBlock::ManualSeasonSearchSortPrompt)
             .headers([
               "Source", "Age", "⛔", "Title", "Indexer", "Size", "Peers", "Language", "Quality",
diff --git a/src/ui/sonarr_ui/library/series_details_ui.rs b/src/ui/sonarr_ui/library/series_details_ui.rs
index d4965a7..b0986e4 100644
--- a/src/ui/sonarr_ui/library/series_details_ui.rs
+++ b/src/ui/sonarr_ui/library/series_details_ui.rs
@@ -229,11 +229,6 @@ pub fn draw_series_details(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 fn draw_seasons_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
     let content = Some(&mut app.data.sonarr_data.seasons);
-    let help_footer = app
-      .data
-      .sonarr_data
-      .series_info_tabs
-      .get_active_tab_contextual_help();
     let season_row_mapping = |season: &Season| {
       let Season {
         title,
@@ -247,14 +242,18 @@ fn draw_seasons_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         size_on_disk,
         next_airing,
         ..
-      } = statistics;
+      } = if let Some(stats) = statistics {
+        stats
+      } else {
+        &SeasonStatistics::default()
+      };
       let season_monitored = if season.monitored { "🏷" } else { "" };
       let size = convert_to_gb(*size_on_disk);
 
       let row = Row::new(vec![
         Cell::from(season_monitored.to_owned()),
         Cell::from(title.clone().unwrap()),
-        Cell::from(format!("{}/{}", episode_file_count, episode_count)),
+        Cell::from(format!("{episode_file_count}/{episode_count}")),
         Cell::from(format!("{size:.2} GB")),
       ]);
       if !monitored {
@@ -263,9 +262,9 @@ fn draw_seasons_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
         row.downloaded()
       } else if let Some(next_airing_utc) = next_airing.as_ref() {
         if next_airing_utc > &Utc::now() {
-          return row.unreleased();
+          row.unreleased()
         } else {
-          return row.missing();
+          row.missing()
         }
       } else {
         row.missing()
@@ -275,7 +274,6 @@ fn draw_seasons_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     let season_table = ManagarrTable::new(content, season_row_mapping)
       .block(layout_block_top_border())
       .loading(app.is_loading)
-      .footer(help_footer)
       .searching(is_searching)
       .search_produced_empty_results(active_sonarr_block == ActiveSonarrBlock::SearchSeasonError)
       .headers(["Monitored", "Season", "Episode Count", "Size on Disk"])
@@ -302,11 +300,6 @@ fn draw_series_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       } else {
         series_history.current_selection().clone()
       };
-      let series_history_table_footer = app
-        .data
-        .sonarr_data
-        .series_info_tabs
-        .get_active_tab_contextual_help();
 
       if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
         let history_row_mapping = |history_item: &SonarrHistoryItem| {
@@ -345,7 +338,6 @@ fn draw_series_history_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
           ManagarrTable::new(Some(&mut series_history_table), history_row_mapping)
             .block(layout_block_top_border())
             .loading(app.is_loading)
-            .footer(series_history_table_footer)
             .sorting(active_sonarr_block == ActiveSonarrBlock::SeriesHistorySortPrompt)
             .searching(active_sonarr_block == ActiveSonarrBlock::SearchSeriesHistory)
             .search_produced_empty_results(
diff --git a/src/ui/sonarr_ui/mod.rs b/src/ui/sonarr_ui/mod.rs
index 845daea..20d9f60 100644
--- a/src/ui/sonarr_ui/mod.rs
+++ b/src/ui/sonarr_ui/mod.rs
@@ -106,9 +106,11 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     ];
 
     constraints.append(
-      &mut iter::repeat(Constraint::Length(1))
-        .take(disk_space_vec.len() + root_folders.items.len() + 1)
-        .collect(),
+      &mut iter::repeat_n(
+        Constraint::Length(1),
+        disk_space_vec.len() + root_folders.items.len() + 1,
+      )
+      .collect(),
     );
 
     let stat_item_areas = Layout::vertical(constraints).margin(1).split(area);
@@ -189,13 +191,10 @@ fn draw_downloads_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
 
     let max_items = ((((area.height as f64 / 2.0).floor() * 2.0) as i64) / 2) - 1;
     let items = cmp::min(downloads_vec.len(), max_items.unsigned_abs() as usize);
-    let download_item_areas = Layout::vertical(
-      iter::repeat(Constraint::Length(2))
-        .take(items)
-        .collect::<Vec<Constraint>>(),
-    )
-    .margin(1)
-    .split(area);
+    let download_item_areas =
+      Layout::vertical(iter::repeat_n(Constraint::Length(2), items).collect::<Vec<Constraint>>())
+        .margin(1)
+        .split(area);
 
     for i in 0..items {
       let DownloadRecord {
diff --git a/src/ui/sonarr_ui/root_folders/mod.rs b/src/ui/sonarr_ui/root_folders/mod.rs
index a8f7495..1d2728e 100644
--- a/src/ui/sonarr_ui/root_folders/mod.rs
+++ b/src/ui/sonarr_ui/root_folders/mod.rs
@@ -59,11 +59,6 @@ impl DrawUi for RootFoldersUi {
 }
 
 fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let help_footer = app
-    .data
-    .sonarr_data
-    .main_tabs
-    .get_active_tab_contextual_help();
   let root_folders_row_mapping = |root_folders: &RootFolder| {
     let RootFolder {
       path,
@@ -94,7 +89,6 @@ fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   )
   .block(layout_block_top_border())
   .loading(app.is_loading)
-  .footer(help_footer)
   .headers(["Path", "Free Space", "Unmapped Folders"])
   .constraints([
     Constraint::Ratio(3, 5),
diff --git a/src/ui/sonarr_ui/system/mod.rs b/src/ui/sonarr_ui/system/mod.rs
index f6c3824..d4fd709 100644
--- a/src/ui/sonarr_ui/system/mod.rs
+++ b/src/ui/sonarr_ui/system/mod.rs
@@ -4,7 +4,7 @@ use chrono::Utc;
 use ratatui::layout::Layout;
 use ratatui::style::Style;
 use ratatui::text::{Span, Text};
-use ratatui::widgets::{Cell, Paragraph, Row};
+use ratatui::widgets::{Cell, Row};
 use ratatui::{
   layout::{Constraint, Rect},
   widgets::ListItem,
@@ -17,9 +17,7 @@ use crate::models::servarr_models::QueueEvent;
 use crate::models::sonarr_models::SonarrTask;
 use crate::ui::sonarr_ui::system::system_details_ui::SystemDetailsUi;
 use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{
-  convert_to_minutes_hours_days, layout_block_top_border, style_log_list_item,
-};
+use crate::ui::utils::{convert_to_minutes_hours_days, style_log_list_item};
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::selectable_list::SelectableList;
@@ -66,12 +64,8 @@ impl DrawUi for SystemUi {
 }
 
 fn draw_system_ui_layout(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let [activities_area, logs_area, help_area] = Layout::vertical([
-    Constraint::Ratio(1, 2),
-    Constraint::Ratio(1, 2),
-    Constraint::Min(2),
-  ])
-  .areas(area);
+  let [activities_area, logs_area] =
+    Layout::vertical([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]).areas(area);
 
   let [tasks_area, events_area] =
     Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)]).areas(activities_area);
@@ -79,7 +73,6 @@ fn draw_system_ui_layout(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   draw_tasks(f, app, tasks_area);
   draw_queued_events(f, app, events_area);
   draw_logs(f, app, logs_area);
-  draw_help(f, app, help_area);
 }
 
 fn draw_tasks(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
@@ -181,26 +174,6 @@ fn draw_logs(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   f.render_widget(logs_box, area);
 }
 
-fn draw_help(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let help_text = Text::from(
-    format!(
-      " {}",
-      app
-        .data
-        .sonarr_data
-        .main_tabs
-        .get_active_tab_contextual_help()
-        .unwrap()
-    )
-    .help(),
-  );
-  let help_paragraph = Paragraph::new(help_text)
-    .block(layout_block_top_border())
-    .left_aligned();
-
-  f.render_widget(help_paragraph, area);
-}
-
 pub(super) struct TaskProps {
   pub(super) name: String,
   pub(super) interval: String,
diff --git a/src/ui/sonarr_ui/system/system_details_ui.rs b/src/ui/sonarr_ui/system/system_details_ui.rs
index 72eafe2..45cad02 100644
--- a/src/ui/sonarr_ui/system/system_details_ui.rs
+++ b/src/ui/sonarr_ui/system/system_details_ui.rs
@@ -3,8 +3,6 @@ use ratatui::text::{Span, Text};
 use ratatui::widgets::{Cell, ListItem, Paragraph, Row};
 use ratatui::Frame;
 
-use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
-use crate::app::sonarr::sonarr_context_clues::SYSTEM_TASKS_CONTEXT_CLUES;
 use crate::app::App;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SYSTEM_DETAILS_BLOCKS};
 use crate::models::sonarr_models::SonarrTask;
@@ -59,17 +57,10 @@ impl DrawUi for SystemDetailsUi {
 
 fn draw_logs_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
   let block = title_block("Log Details");
-  let help_footer = format!(
-    "<↑↓←→> scroll | {}",
-    build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES)
-  );
 
   if app.data.sonarr_data.log_details.items.is_empty() {
     let loading = LoadingBlock::new(app.is_loading, borderless_block());
-    let popup = Popup::new(loading)
-      .size(Size::Large)
-      .block(block)
-      .footer(&help_footer);
+    let popup = Popup::new(loading).size(Size::Large).block(block);
 
     f.render_widget(popup, f.area());
     return;
@@ -82,16 +73,12 @@ fn draw_logs_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
     style_log_list_item(ListItem::new(Text::from(Span::raw(log_line))), level)
   })
   .block(borderless_block());
-  let popup = Popup::new(logs_list)
-    .size(Size::Large)
-    .block(block)
-    .footer(&help_footer);
+  let popup = Popup::new(logs_list).size(Size::Large).block(block);
 
   f.render_widget(popup, f.area());
 }
 
 fn draw_tasks_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let help_footer = Some(build_context_clue_string(&SYSTEM_TASKS_CONTEXT_CLUES));
   let tasks_row_mapping = |task: &SonarrTask| {
     let task_props = extract_task_props(task);
 
@@ -104,10 +91,8 @@ fn draw_tasks_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     .primary()
   };
   let tasks_table = ManagarrTable::new(Some(&mut app.data.sonarr_data.tasks), tasks_row_mapping)
-    .block(borderless_block())
     .loading(app.is_loading)
     .margin(1)
-    .footer(help_footer)
     .footer_alignment(Alignment::Center)
     .headers(TASK_TABLE_HEADERS)
     .constraints(TASK_TABLE_CONSTRAINTS);
@@ -136,10 +121,6 @@ fn draw_tasks_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 }
 
 fn draw_updates_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
-  let help_footer = format!(
-    "<↑↓> scroll | {}",
-    build_context_clue_string(&BARE_POPUP_CONTEXT_CLUES)
-  );
   let updates = app.data.sonarr_data.updates.get_text();
   let block = title_block("Updates");
 
@@ -147,18 +128,12 @@ fn draw_updates_popup(f: &mut Frame<'_>, app: &mut App<'_>) {
     let updates_paragraph = Paragraph::new(Text::from(updates))
       .block(borderless_block())
       .scroll((app.data.sonarr_data.updates.offset, 0));
-    let popup = Popup::new(updates_paragraph)
-      .size(Size::Large)
-      .block(block)
-      .footer(&help_footer);
+    let popup = Popup::new(updates_paragraph).size(Size::Large).block(block);
 
     f.render_widget(popup, f.area());
   } else {
     let loading = LoadingBlock::new(app.is_loading, borderless_block());
-    let popup = Popup::new(loading)
-      .size(Size::Large)
-      .block(block)
-      .footer(&help_footer);
+    let popup = Popup::new(loading).size(Size::Large).block(block);
 
     f.render_widget(popup, f.area());
   }
diff --git a/src/ui/styles.rs b/src/ui/styles.rs
index 86f7233..3bc4ef6 100644
--- a/src/ui/styles.rs
+++ b/src/ui/styles.rs
@@ -1,8 +1,6 @@
-use ratatui::prelude::Color;
+use crate::ui::THEME;
 use ratatui::style::{Styled, Stylize};
 
-pub const COLOR_ORANGE: Color = Color::Rgb(255, 170, 66);
-
 #[cfg(test)]
 #[path = "styles_tests.rs"]
 mod styles_tests;
@@ -42,31 +40,31 @@ where
   }
 
   fn awaiting_import(self) -> T {
-    self.fg(COLOR_ORANGE)
+    THEME.with(|theme| self.fg(theme.get().awaiting_import.unwrap().color.unwrap()))
   }
 
   fn indeterminate(self) -> T {
-    self.fg(COLOR_ORANGE)
+    THEME.with(|theme| self.fg(theme.get().indeterminate.unwrap().color.unwrap()))
   }
 
   fn default(self) -> T {
-    self.white()
+    THEME.with(|theme| self.fg(theme.get().default.unwrap().color.unwrap()))
   }
 
   fn downloaded(self) -> T {
-    self.green()
+    THEME.with(|theme| self.fg(theme.get().downloaded.unwrap().color.unwrap()))
   }
 
   fn downloading(self) -> T {
-    self.magenta()
+    THEME.with(|theme| self.fg(theme.get().downloading.unwrap().color.unwrap()))
   }
 
   fn failure(self) -> T {
-    self.red()
+    THEME.with(|theme| self.fg(theme.get().failure.unwrap().color.unwrap()))
   }
 
   fn help(self) -> T {
-    self.light_blue()
+    THEME.with(|theme| self.fg(theme.get().help.unwrap().color.unwrap()))
   }
 
   fn highlight(self) -> T {
@@ -74,38 +72,38 @@ where
   }
 
   fn missing(self) -> T {
-    self.red()
+    THEME.with(|theme| self.fg(theme.get().missing.unwrap().color.unwrap()))
   }
 
   fn primary(self) -> T {
-    self.cyan()
+    THEME.with(|theme| self.fg(theme.get().primary.unwrap().color.unwrap()))
   }
 
   fn secondary(self) -> T {
-    self.yellow()
+    THEME.with(|theme| self.fg(theme.get().secondary.unwrap().color.unwrap()))
   }
 
   fn success(self) -> T {
-    self.green()
+    THEME.with(|theme| self.fg(theme.get().success.unwrap().color.unwrap()))
   }
 
   fn system_function(self) -> T {
-    self.yellow()
+    THEME.with(|theme| self.fg(theme.get().system_function.unwrap().color.unwrap()))
   }
 
   fn unmonitored(self) -> T {
-    self.gray()
+    THEME.with(|theme| self.fg(theme.get().unmonitored.unwrap().color.unwrap()))
   }
 
   fn unmonitored_missing(self) -> T {
-    self.yellow()
+    THEME.with(|theme| self.fg(theme.get().unmonitored_missing.unwrap().color.unwrap()))
   }
 
   fn unreleased(self) -> T {
-    self.light_cyan()
+    THEME.with(|theme| self.fg(theme.get().unreleased.unwrap().color.unwrap()))
   }
 
   fn warning(self) -> T {
-    self.magenta()
+    THEME.with(|theme| self.fg(theme.get().warning.unwrap().color.unwrap()))
   }
 }
diff --git a/src/ui/styles_tests.rs b/src/ui/styles_tests.rs
index 98259ec..2ec748f 100644
--- a/src/ui/styles_tests.rs
+++ b/src/ui/styles_tests.rs
@@ -1,9 +1,9 @@
 #[cfg(test)]
 mod test {
-  use crate::ui::styles::{ManagarrStyle, COLOR_ORANGE};
+  use crate::ui::styles::ManagarrStyle;
   use pretty_assertions::assert_eq;
   use ratatui::prelude::Modifier;
-  use ratatui::style::{Style, Stylize};
+  use ratatui::style::{Color, Style, Stylize};
 
   #[test]
   fn test_new() {
@@ -14,13 +14,16 @@ mod test {
   fn test_style_awaiting_import() {
     assert_eq!(
       Style::new().awaiting_import(),
-      Style::new().fg(COLOR_ORANGE)
+      Style::new().fg(Color::Rgb(255, 170, 66))
     );
   }
 
   #[test]
   fn test_style_indeterminate() {
-    assert_eq!(Style::new().indeterminate(), Style::new().fg(COLOR_ORANGE));
+    assert_eq!(
+      Style::new().indeterminate(),
+      Style::new().fg(Color::Rgb(255, 170, 66))
+    );
   }
 
   #[test]
diff --git a/src/ui/theme.rs b/src/ui/theme.rs
new file mode 100644
index 0000000..154d66d
--- /dev/null
+++ b/src/ui/theme.rs
@@ -0,0 +1,284 @@
+use crate::ui::builtin_themes::get_builtin_themes;
+use anyhow::Result;
+use derivative::Derivative;
+use ratatui::style::Color;
+use serde::{Deserialize, Deserializer, Serialize};
+use std::str::FromStr;
+use validate_theme_derive::ValidateTheme;
+
+#[cfg(test)]
+#[path = "theme_tests.rs"]
+mod theme_tests;
+
+#[derive(Debug, Deserialize, Serialize, Clone, Copy, Derivative)]
+#[derivative(Default)]
+#[cfg_attr(test, derive(PartialEq, Eq))]
+pub struct Background {
+  #[serde(
+    deserialize_with = "deserialize_color_str",
+    serialize_with = "serialize_color_str",
+    default = "default_background_color"
+  )]
+  #[derivative(Default(value = "Some(Color::Rgb(35, 50, 55))"))]
+  pub color: Option<Color>,
+  #[derivative(Default(value = "Some(true)"))]
+  #[serde(default = "default_background_enabled")]
+  pub enabled: Option<bool>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Default, Clone, Copy)]
+#[cfg_attr(test, derive(PartialEq, Eq))]
+pub struct Style {
+  #[serde(
+    deserialize_with = "deserialize_color_str",
+    serialize_with = "serialize_color_str"
+  )]
+  pub color: Option<Color>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone, Copy, Derivative, ValidateTheme)]
+#[derivative(Default)]
+#[cfg_attr(test, derive(PartialEq, Eq))]
+pub struct Theme {
+  #[serde(default = "default_background")]
+  #[derivative(Default(
+    value = "Some(Background { color: Some(Color::Rgb(35, 50, 55)), enabled: Some(true) })"
+  ))]
+  pub background: Option<Background>,
+  #[validate]
+  #[serde(default = "default_awaiting_import_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Rgb(255, 170, 66)) })"))]
+  pub awaiting_import: Option<Style>,
+  #[validate]
+  #[serde(default = "default_indeterminate_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Rgb(255, 170, 66)) })"))]
+  pub indeterminate: Option<Style>,
+  #[validate]
+  #[serde(default = "default_default_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::White) })"))]
+  pub default: Option<Style>,
+  #[validate]
+  #[serde(default = "default_downloaded_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Green) })"))]
+  pub downloaded: Option<Style>,
+  #[validate]
+  #[serde(default = "default_downloading_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Magenta) })"))]
+  pub downloading: Option<Style>,
+  #[validate]
+  #[serde(default = "default_failure_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Red) })"))]
+  pub failure: Option<Style>,
+  #[validate]
+  #[serde(default = "default_help_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::LightBlue) })"))]
+  pub help: Option<Style>,
+  #[validate]
+  #[serde(default = "default_missing_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Red) })"))]
+  pub missing: Option<Style>,
+  #[validate]
+  #[serde(default = "default_primary_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Cyan) })"))]
+  pub primary: Option<Style>,
+  #[validate]
+  #[serde(default = "default_secondary_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Yellow) })"))]
+  pub secondary: Option<Style>,
+  #[validate]
+  #[serde(default = "default_success_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Green) })"))]
+  pub success: Option<Style>,
+  #[validate]
+  #[serde(default = "default_system_function_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Yellow) })"))]
+  pub system_function: Option<Style>,
+  #[validate]
+  #[serde(default = "default_unmonitored_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Gray) })"))]
+  pub unmonitored: Option<Style>,
+  #[validate]
+  #[serde(default = "default_unmonitored_missing_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Yellow) })"))]
+  pub unmonitored_missing: Option<Style>,
+  #[validate]
+  #[serde(default = "default_unreleased_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::LightCyan) })"))]
+  pub unreleased: Option<Style>,
+  #[validate]
+  #[serde(default = "default_warning_style")]
+  #[derivative(Default(value = "Some(Style { color: Some(Color::Magenta) })"))]
+  pub warning: Option<Style>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+#[cfg_attr(test, derive(PartialEq, Eq))]
+pub struct ThemeDefinition {
+  pub name: String,
+  #[serde(default)]
+  pub theme: Theme,
+}
+
+#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq, Eq))]
+pub struct ThemeDefinitionsWrapper {
+  pub theme_definitions: Vec<ThemeDefinition>,
+}
+
+impl Default for ThemeDefinitionsWrapper {
+  fn default() -> Self {
+    Self {
+      theme_definitions: get_builtin_themes(),
+    }
+  }
+}
+
+fn default_background_color() -> Option<Color> {
+  Some(Color::Rgb(35, 50, 55))
+}
+
+fn default_background_enabled() -> Option<bool> {
+  Some(true)
+}
+
+fn default_background() -> Option<Background> {
+  Some(Background {
+    color: default_background_color(),
+    enabled: Some(true),
+  })
+}
+
+fn default_awaiting_import_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Rgb(255, 170, 66)),
+  })
+}
+
+fn default_indeterminate_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Rgb(255, 170, 66)),
+  })
+}
+
+fn default_default_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::White),
+  })
+}
+
+fn default_downloaded_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Green),
+  })
+}
+
+fn default_downloading_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Magenta),
+  })
+}
+
+fn default_failure_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Red),
+  })
+}
+
+fn default_help_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::LightBlue),
+  })
+}
+
+fn default_missing_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Red),
+  })
+}
+
+fn default_primary_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Cyan),
+  })
+}
+
+fn default_secondary_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Yellow),
+  })
+}
+
+fn default_success_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Green),
+  })
+}
+
+fn default_system_function_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Yellow),
+  })
+}
+
+fn default_unmonitored_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Gray),
+  })
+}
+
+fn default_unmonitored_missing_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Yellow),
+  })
+}
+
+fn default_unreleased_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::LightCyan),
+  })
+}
+
+fn default_warning_style() -> Option<Style> {
+  Some(Style {
+    color: Some(Color::Magenta),
+  })
+}
+
+impl<'de> Deserialize<'de> for ThemeDefinitionsWrapper {
+  fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+  where
+    D: Deserializer<'de>,
+  {
+    let theme_definitions = Vec::<ThemeDefinition>::deserialize(deserializer)?;
+    Ok(ThemeDefinitionsWrapper { theme_definitions })
+  }
+}
+
+impl Serialize for ThemeDefinitionsWrapper {
+  fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+  where
+    S: serde::Serializer,
+  {
+    self.theme_definitions.serialize(serializer)
+  }
+}
+
+fn deserialize_color_str<'de, D>(deserializer: D) -> Result<Option<Color>, D::Error>
+where
+  D: Deserializer<'de>,
+{
+  let s: Option<String> = Option::deserialize(deserializer)?;
+  match s {
+    Some(s) => Color::from_str(&s)
+      .map_err(serde::de::Error::custom)
+      .map(Some),
+    None => Ok(None),
+  }
+}
+
+fn serialize_color_str<S>(color: &Option<Color>, serializer: S) -> Result<S::Ok, S::Error>
+where
+  S: serde::Serializer,
+{
+  serializer.serialize_str(&color.unwrap().to_string())
+}
diff --git a/src/ui/theme_tests.rs b/src/ui/theme_tests.rs
new file mode 100644
index 0000000..616d45e
--- /dev/null
+++ b/src/ui/theme_tests.rs
@@ -0,0 +1,376 @@
+mod tests {
+  use crate::ui::builtin_themes::{dracula_theme, eldritch_theme, watermelon_dark_theme};
+  use crate::ui::theme::{Background, Style, Theme, ThemeDefinition, ThemeDefinitionsWrapper};
+  use pretty_assertions::{assert_eq, assert_str_eq};
+  use ratatui::style::Color;
+
+  #[test]
+  fn test_background_default() {
+    let expected_background = Background {
+      enabled: Some(true),
+      color: Some(Color::Rgb(35, 50, 55)),
+    };
+
+    assert_eq!(Background::default(), expected_background);
+  }
+
+  #[test]
+  fn test_theme_default() {
+    let expected_theme = Theme {
+      background: Some(Background {
+        enabled: Some(true),
+        color: Some(Color::Rgb(35, 50, 55)),
+      }),
+      awaiting_import: Some(Style {
+        color: Some(Color::Rgb(255, 170, 66)),
+      }),
+      indeterminate: Some(Style {
+        color: Some(Color::Rgb(255, 170, 66)),
+      }),
+      default: Some(Style {
+        color: Some(Color::White),
+      }),
+      downloaded: Some(Style {
+        color: Some(Color::Green),
+      }),
+      downloading: Some(Style {
+        color: Some(Color::Magenta),
+      }),
+      failure: Some(Style {
+        color: Some(Color::Red),
+      }),
+      help: Some(Style {
+        color: Some(Color::LightBlue),
+      }),
+      missing: Some(Style {
+        color: Some(Color::Red),
+      }),
+      primary: Some(Style {
+        color: Some(Color::Cyan),
+      }),
+      secondary: Some(Style {
+        color: Some(Color::Yellow),
+      }),
+      success: Some(Style {
+        color: Some(Color::Green),
+      }),
+      system_function: Some(Style {
+        color: Some(Color::Yellow),
+      }),
+      unmonitored: Some(Style {
+        color: Some(Color::Gray),
+      }),
+      unmonitored_missing: Some(Style {
+        color: Some(Color::Yellow),
+      }),
+      unreleased: Some(Style {
+        color: Some(Color::LightCyan),
+      }),
+      warning: Some(Style {
+        color: Some(Color::Magenta),
+      }),
+    };
+
+    assert_eq!(Theme::default(), expected_theme);
+  }
+
+  #[test]
+  fn test_default_theme_definition() {
+    let expected_theme_definition = ThemeDefinition {
+      name: String::new(),
+      theme: Theme::default(),
+    };
+
+    assert_eq!(ThemeDefinition::default(), expected_theme_definition);
+  }
+
+  #[test]
+  fn test_deserialization_defaults_to_using_default_theme_values_when_missing() {
+    let theme_yaml = r#""#;
+    let theme: Theme = serde_yaml::from_str(theme_yaml).unwrap();
+
+    assert_eq!(theme, Theme::default());
+  }
+
+  #[test]
+  fn test_deserialization_does_not_overwrite_non_empty_fields_with_default_values() {
+    let theme_yaml = r###"
+background:
+  enabled: false
+  color: "#000000"
+awaiting_import:
+  color: "#000000"
+indeterminate:
+  color: "#000000"
+default:
+  color: "#000000"
+downloaded:
+  color: "#000000"
+downloading:
+  color: "#000000"
+failure:
+  color: "#000000"
+help:
+  color: "#000000"
+missing:
+  color: "#000000"
+primary:
+  color: "#000000"
+secondary:
+  color: "#000000"
+success:
+  color: "#000000"
+system_function:
+  color: "#000000"
+unmonitored:
+  color: "#000000"
+unmonitored_missing:
+  color: "#000000"
+unreleased:
+  color: "#000000"
+warning:
+  color: "#000000"
+"###;
+    let theme: Theme = serde_yaml::from_str(theme_yaml).unwrap();
+    let expected_theme = Theme {
+      background: Some(Background {
+        enabled: Some(false),
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      awaiting_import: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      indeterminate: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      default: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      downloaded: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      downloading: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      failure: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      help: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      missing: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      primary: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      secondary: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      success: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      system_function: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      unmonitored: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      unmonitored_missing: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      unreleased: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+      warning: Some(Style {
+        color: Some(Color::Rgb(0, 0, 0)),
+      }),
+    };
+
+    assert_eq!(theme, expected_theme);
+  }
+
+  #[test]
+  fn test_theme_definitions_wrapper_default() {
+    let theme_definitions_wrapper = ThemeDefinitionsWrapper {
+      theme_definitions: vec![
+        ThemeDefinition {
+          name: "default".to_owned(),
+          theme: Theme::default(),
+        },
+        ThemeDefinition {
+          name: "watermelon-dark".to_owned(),
+          theme: watermelon_dark_theme(),
+        },
+        ThemeDefinition {
+          name: "dracula".to_owned(),
+          theme: dracula_theme(),
+        },
+        ThemeDefinition {
+          name: "eldritch".to_owned(),
+          theme: eldritch_theme(),
+        },
+      ],
+    };
+
+    assert_eq!(
+      ThemeDefinitionsWrapper::default(),
+      theme_definitions_wrapper
+    );
+  }
+
+  #[test]
+  fn test_theme_definitions_wrapper_deserialization() {
+    let theme_definitions = r###"
+- name: test
+  theme:
+    background:
+      enabled: false
+      color: "#000000"
+    awaiting_import:
+      color: "#000000"
+    indeterminate:
+      color: "#000000"
+    default:
+      color: "#000000"
+    downloaded:
+      color: "#000000"
+    downloading:
+      color: "#000000"
+    failure:
+      color: "#000000"
+    help:
+      color: "#000000"
+    missing:
+      color: "#000000"
+    primary:
+      color: "#000000"
+    secondary:
+      color: "#000000"
+    success:
+      color: "#000000"
+    system_function:
+      color: "#000000"
+    unmonitored:
+      color: "#000000"
+    unmonitored_missing:
+      color: "#000000"
+    unreleased:
+      color: "#000000"
+    warning:
+      color: "#000000"
+"###;
+    let theme_definition_wrapper: ThemeDefinitionsWrapper =
+      serde_yaml::from_str(theme_definitions).unwrap();
+    let expected_theme_definitions = ThemeDefinitionsWrapper {
+      theme_definitions: vec![ThemeDefinition {
+        name: "test".to_owned(),
+        theme: Theme {
+          background: Some(Background {
+            enabled: Some(false),
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          awaiting_import: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          indeterminate: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          default: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          downloaded: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          downloading: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          failure: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          help: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          missing: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          primary: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          secondary: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          success: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          system_function: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          unmonitored: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          unmonitored_missing: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          unreleased: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+          warning: Some(Style {
+            color: Some(Color::Rgb(0, 0, 0)),
+          }),
+        },
+      }],
+    };
+
+    assert_eq!(theme_definition_wrapper, expected_theme_definitions);
+  }
+
+  #[test]
+  fn test_theme_definition_wrapper_serialization() {
+    let theme_definition_wrapper = ThemeDefinitionsWrapper {
+      theme_definitions: vec![ThemeDefinition::default()],
+    };
+    let expected_yaml = r###"- name: ''
+  theme:
+    background:
+      color: '#233237'
+      enabled: true
+    awaiting_import:
+      color: '#FFAA42'
+    indeterminate:
+      color: '#FFAA42'
+    default:
+      color: White
+    downloaded:
+      color: Green
+    downloading:
+      color: Magenta
+    failure:
+      color: Red
+    help:
+      color: LightBlue
+    missing:
+      color: Red
+    primary:
+      color: Cyan
+    secondary:
+      color: Yellow
+    success:
+      color: Green
+    system_function:
+      color: Yellow
+    unmonitored:
+      color: Gray
+    unmonitored_missing:
+      color: Yellow
+    unreleased:
+      color: LightCyan
+    warning:
+      color: Magenta
+"###;
+
+    let serialized_yaml = serde_yaml::to_string(&theme_definition_wrapper).unwrap();
+
+    assert_str_eq!(serialized_yaml, expected_yaml);
+  }
+}
diff --git a/src/ui/utils.rs b/src/ui/utils.rs
index 3a7aba9..88f3514 100644
--- a/src/ui/utils.rs
+++ b/src/ui/utils.rs
@@ -1,18 +1,25 @@
 use crate::ui::styles::ManagarrStyle;
+use crate::ui::THEME;
 use ratatui::layout::{Alignment, Constraint, Layout, Rect};
-use ratatui::style::{Color, Style, Stylize};
+use ratatui::style::{Style, Stylize};
 use ratatui::symbols;
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Block, BorderType, Borders, LineGauge, ListItem, Paragraph, Wrap};
 
-pub const COLOR_TEAL: Color = Color::Rgb(35, 50, 55);
-
 #[cfg(test)]
 #[path = "utils_tests.rs"]
 mod utils_tests;
 
 pub fn background_block<'a>() -> Block<'a> {
-  Block::new().white().bg(COLOR_TEAL)
+  THEME.with(|theme| {
+    let background = theme.get().background.unwrap();
+
+    if background.enabled.unwrap() {
+      Block::new().white().bg(background.color.unwrap())
+    } else {
+      Block::new().white()
+    }
+  })
 }
 
 pub fn layout_block<'a>() -> Block<'a> {
@@ -30,11 +37,11 @@ pub fn layout_block_top_border_with_title(title_span: Span<'_>) -> Block<'_> {
 }
 
 pub fn layout_block_top_border<'a>() -> Block<'a> {
-  Block::new().borders(Borders::TOP)
+  Block::new().borders(Borders::TOP).default()
 }
 
 pub fn layout_block_bottom_border<'a>() -> Block<'a> {
-  Block::new().borders(Borders::BOTTOM)
+  Block::new().borders(Borders::BOTTOM).default()
 }
 
 pub fn layout_paragraph_borderless(string: &str) -> Paragraph<'_> {
@@ -47,7 +54,7 @@ pub fn layout_paragraph_borderless(string: &str) -> Paragraph<'_> {
 }
 
 pub fn borderless_block<'a>() -> Block<'a> {
-  Block::new()
+  Block::new().default()
 }
 
 pub fn style_block_highlight(is_selected: bool) -> Style {
@@ -62,16 +69,20 @@ pub fn title_style(title: &str) -> Span<'_> {
   format!("  {title}  ").bold()
 }
 
-pub fn title_block(title: &str) -> Block<'_> {
+pub fn unstyled_title_block(title: &str) -> Block<'_> {
   layout_block_with_title(title_style(title))
 }
 
+pub fn title_block(title: &str) -> Block<'_> {
+  unstyled_title_block(title).default()
+}
+
 pub fn title_block_centered(title: &str) -> Block<'_> {
   title_block(title).title_alignment(Alignment::Center)
 }
 
 pub fn logo_block<'a>() -> Block<'a> {
-  layout_block().title(Span::styled(
+  layout_block().default().title(Span::styled(
     " Managarr - A Servarr management TUI ",
     Style::new().magenta().bold().italic(),
   ))
@@ -98,7 +109,7 @@ pub fn centered_rect(percent_x: u16, percent_y: u16, area: Rect) -> Rect {
 pub fn line_gauge_with_title(title: &str, ratio: f64) -> LineGauge<'_> {
   LineGauge::new()
     .block(Block::new().title(title))
-    .filled_style(Style::new().cyan())
+    .filled_style(Style::new().primary())
     .line_set(symbols::line::THICK)
     .ratio(ratio)
     .label(Line::from(format!("{:.0}%", ratio * 100.0)))
@@ -107,7 +118,7 @@ pub fn line_gauge_with_title(title: &str, ratio: f64) -> LineGauge<'_> {
 pub fn line_gauge_with_label(title: &str, ratio: f64) -> LineGauge<'_> {
   LineGauge::new()
     .block(Block::new())
-    .filled_style(Style::new().cyan())
+    .filled_style(Style::new().primary())
     .line_set(symbols::line::THICK)
     .ratio(ratio)
     .label(Line::from(format!("{title}: {:.0}%", ratio * 100.0)))
diff --git a/src/ui/utils_tests.rs b/src/ui/utils_tests.rs
index dfb288a..1bc077e 100644
--- a/src/ui/utils_tests.rs
+++ b/src/ui/utils_tests.rs
@@ -1,10 +1,11 @@
 #[cfg(test)]
 mod test {
+  use crate::ui::styles::ManagarrStyle;
   use crate::ui::utils::{
     borderless_block, centered_rect, convert_to_minutes_hours_days, decorate_peer_style,
     get_width_from_percentage, layout_block, layout_block_bottom_border, layout_block_top_border,
     layout_block_top_border_with_title, layout_block_with_title, logo_block, style_block_highlight,
-    style_log_list_item, title_block, title_block_centered, title_style,
+    style_log_list_item, title_block, title_block_centered, title_style, unstyled_title_block,
   };
   use pretty_assertions::{assert_eq, assert_str_eq};
   use ratatui::layout::{Alignment, Rect};
@@ -17,7 +18,7 @@ mod test {
   fn test_layout_block() {
     assert_eq!(
       layout_block(),
-      Block::default()
+      Block::new()
         .borders(Borders::ALL)
         .border_type(BorderType::Rounded)
     );
@@ -27,11 +28,11 @@ mod test {
   fn test_layout_block_with_title() {
     let title_span = Span::styled(
       "title",
-      Style::default()
+      Style::new()
         .fg(Color::DarkGray)
         .add_modifier(Modifier::BOLD),
     );
-    let expected_block = Block::default()
+    let expected_block = Block::new()
       .borders(Borders::ALL)
       .border_type(BorderType::Rounded)
       .title(title_span.clone());
@@ -43,11 +44,12 @@ mod test {
   fn test_layout_block_top_border_with_title() {
     let title_span = Span::styled(
       "title",
-      Style::default()
+      Style::new()
         .fg(Color::DarkGray)
         .add_modifier(Modifier::BOLD),
     );
-    let expected_block = Block::default()
+    let expected_block = Block::new()
+      .default()
       .borders(Borders::TOP)
       .title(title_span.clone());
 
@@ -61,7 +63,7 @@ mod test {
   fn test_layout_block_top_border() {
     assert_eq!(
       layout_block_top_border(),
-      Block::default().borders(Borders::TOP)
+      Block::new().borders(Borders::TOP).default()
     );
   }
 
@@ -69,48 +71,58 @@ mod test {
   fn test_layout_block_bottom_border() {
     assert_eq!(
       layout_block_bottom_border(),
-      Block::default().borders(Borders::BOTTOM)
+      Block::new().borders(Borders::BOTTOM).default()
     );
   }
 
   #[test]
   fn test_borderless_block() {
-    assert_eq!(borderless_block(), Block::default());
+    assert_eq!(borderless_block(), Block::new().default());
   }
 
   #[test]
   fn test_style_button_highlight_selected() {
-    let expected_style = Style::default()
-      .fg(Color::Yellow)
-      .add_modifier(Modifier::BOLD);
+    let expected_style = Style::new().fg(Color::Yellow).add_modifier(Modifier::BOLD);
 
     assert_eq!(style_block_highlight(true), expected_style);
   }
 
   #[test]
   fn test_style_button_highlight_unselected() {
-    let expected_style = Style::default()
-      .fg(Color::White)
-      .add_modifier(Modifier::BOLD);
+    let expected_style = Style::new().fg(Color::White).add_modifier(Modifier::BOLD);
 
     assert_eq!(style_block_highlight(false), expected_style);
   }
 
   #[test]
   fn test_title_style() {
-    let expected_span = Span::styled("  test  ", Style::default().add_modifier(Modifier::BOLD));
+    let expected_span = Span::styled("  test  ", Style::new().add_modifier(Modifier::BOLD));
 
     assert_eq!(title_style("test"), expected_span);
   }
 
   #[test]
-  fn test_title_block() {
-    let expected_block = Block::default()
+  fn test_unstyled_title_block() {
+    let expected_block = Block::new()
       .borders(Borders::ALL)
       .border_type(BorderType::Rounded)
       .title(Span::styled(
         "  test  ",
-        Style::default().add_modifier(Modifier::BOLD),
+        Style::new().add_modifier(Modifier::BOLD),
+      ));
+
+    assert_eq!(unstyled_title_block("test"), expected_block);
+  }
+
+  #[test]
+  fn test_title_block() {
+    let expected_block = Block::new()
+      .default()
+      .borders(Borders::ALL)
+      .border_type(BorderType::Rounded)
+      .title(Span::styled(
+        "  test  ",
+        Style::new().add_modifier(Modifier::BOLD),
       ));
 
     assert_eq!(title_block("test"), expected_block);
@@ -118,12 +130,13 @@ mod test {
 
   #[test]
   fn test_title_block_centered() {
-    let expected_block = Block::default()
+    let expected_block = Block::new()
+      .default()
       .borders(Borders::ALL)
       .border_type(BorderType::Rounded)
       .title(Span::styled(
         "  test  ",
-        Style::default().add_modifier(Modifier::BOLD),
+        Style::new().add_modifier(Modifier::BOLD),
       ))
       .title_alignment(Alignment::Center);
 
@@ -132,12 +145,13 @@ mod test {
 
   #[test]
   fn test_logo_block() {
-    let expected_block = Block::default()
+    let expected_block = Block::new()
+      .default()
       .borders(Borders::ALL)
       .border_type(BorderType::Rounded)
       .title(Span::styled(
         " Managarr - A Servarr management TUI ",
-        Style::default()
+        Style::new()
           .fg(Color::Magenta)
           .add_modifier(Modifier::BOLD)
           .add_modifier(Modifier::ITALIC),
diff --git a/src/ui/widgets/confirmation_prompt.rs b/src/ui/widgets/confirmation_prompt.rs
index 70f382b..7f926b0 100644
--- a/src/ui/widgets/confirmation_prompt.rs
+++ b/src/ui/widgets/confirmation_prompt.rs
@@ -1,4 +1,3 @@
-use crate::app::context_clues::{build_context_clue_string, CONFIRMATION_PROMPT_CONTEXT_CLUES};
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{layout_paragraph_borderless, title_block_centered};
 use crate::ui::widgets::button::Button;
@@ -6,7 +5,6 @@ use crate::ui::widgets::checkbox::Checkbox;
 use derive_setters::Setters;
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
-use ratatui::text::Text;
 use ratatui::widgets::{Paragraph, Widget};
 use std::iter;
 
@@ -40,20 +38,16 @@ impl ConfirmationPrompt<'_> {
 
   fn render_confirmation_prompt_with_checkboxes(self, area: Rect, buf: &mut Buffer) {
     title_block_centered(self.title).render(area, buf);
-    let help_text =
-      Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-    let help_paragraph = Paragraph::new(help_text).centered();
 
     if let Some(checkboxes) = self.checkboxes {
       let mut constraints = vec![
         Constraint::Length(4),
         Constraint::Fill(1),
         Constraint::Length(3),
-        Constraint::Length(1),
       ];
       constraints.splice(
         1..1,
-        iter::repeat(Constraint::Length(3)).take(checkboxes.len()),
+        iter::repeat_n(Constraint::Length(3), checkboxes.len()),
       );
       let chunks = Layout::vertical(constraints).margin(1).split(area);
       let [yes_area, no_area] =
@@ -61,7 +55,6 @@ impl ConfirmationPrompt<'_> {
           .areas(chunks[checkboxes.len() + 2]);
 
       layout_paragraph_borderless(self.prompt).render(chunks[0], buf);
-      help_paragraph.render(chunks[checkboxes.len() + 3], buf);
 
       checkboxes
         .into_iter()
@@ -83,38 +76,30 @@ impl ConfirmationPrompt<'_> {
 
   fn render_confirmation_prompt(self, area: Rect, buf: &mut Buffer) {
     title_block_centered(self.title).render(area, buf);
-    let help_text =
-      Text::from(build_context_clue_string(&CONFIRMATION_PROMPT_CONTEXT_CLUES).help());
-    let help_paragraph = Paragraph::new(help_text).centered();
 
     let [prompt_area, buttons_area] = if let Some(content_paragraph) = self.content {
-      let [prompt_area, content_area, _, buttons_area, help_area] = Layout::vertical([
+      let [prompt_area, content_area, _, buttons_area] = Layout::vertical([
         Constraint::Length(4),
         Constraint::Length(7),
         Constraint::Fill(1),
         Constraint::Length(3),
-        Constraint::Length(1),
       ])
       .margin(1)
       .areas(area);
 
       content_paragraph.render(content_area, buf);
-      help_paragraph.render(help_area, buf);
 
       [prompt_area, buttons_area]
     } else {
-      let [prompt_area, buttons_area, _, help_area] = Layout::vertical([
+      let [prompt_area, _, buttons_area] = Layout::vertical([
         Constraint::Percentage(72),
-        Constraint::Length(3),
         Constraint::Fill(0),
-        Constraint::Min(1),
+        Constraint::Length(3),
       ])
       .margin(1)
       .flex(Flex::SpaceBetween)
       .areas(area);
 
-      help_paragraph.render(help_area, buf);
-
       [prompt_area, buttons_area]
     };
 
diff --git a/src/ui/widgets/input_box_popup.rs b/src/ui/widgets/input_box_popup.rs
index 9edd27b..63849fa 100644
--- a/src/ui/widgets/input_box_popup.rs
+++ b/src/ui/widgets/input_box_popup.rs
@@ -1,8 +1,7 @@
-use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{background_block, borderless_block, centered_rect};
+use crate::ui::utils::{background_block, centered_rect};
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::widgets::{Block, Clear, Paragraph, Widget, WidgetRef};
+use ratatui::widgets::{Block, Clear, Widget, WidgetRef};
 
 use super::input_box::InputBox;
 
@@ -39,17 +38,10 @@ impl<'a> InputBoxPopup<'a> {
     Clear.render(popup_area, buf);
     background_block().render(popup_area, buf);
 
-    let [text_box_area, help_area] =
-      Layout::vertical([Constraint::Length(3), Constraint::Length(1)])
-        .margin(1)
-        .areas(popup_area);
+    let [text_box_area] = Layout::vertical([Constraint::Length(3)])
+      .margin(1)
+      .areas(popup_area);
     self.input_box.render_ref(text_box_area, buf);
-
-    let help = Paragraph::new("<esc> cancel")
-      .help()
-      .centered()
-      .block(borderless_block());
-    help.render(help_area, buf);
   }
 }
 
diff --git a/src/ui/widgets/managarr_table.rs b/src/ui/widgets/managarr_table.rs
index 1b3db85..2b5e643 100644
--- a/src/ui/widgets/managarr_table.rs
+++ b/src/ui/widgets/managarr_table.rs
@@ -3,7 +3,9 @@ use super::message::Message;
 use super::popup::Size;
 use crate::models::stateful_table::StatefulTable;
 use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{centered_rect, layout_block_top_border, title_block_centered};
+use crate::ui::utils::{
+  borderless_block, centered_rect, layout_block_top_border, title_block_centered,
+};
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::popup::Popup;
 use crate::ui::widgets::selectable_list::SelectableList;
@@ -68,7 +70,7 @@ where
       row_mapper,
       footer: None,
       footer_alignment: Alignment::Left,
-      block: Block::new(),
+      block: borderless_block(),
       margin: 0,
       is_loading: false,
       highlight_rows: true,
diff --git a/src/ui/widgets/managarr_table_tests.rs b/src/ui/widgets/managarr_table_tests.rs
index 831cd57..f4178f7 100644
--- a/src/ui/widgets/managarr_table_tests.rs
+++ b/src/ui/widgets/managarr_table_tests.rs
@@ -3,11 +3,12 @@ mod tests {
   use crate::models::stateful_list::StatefulList;
   use crate::models::stateful_table::{SortOption, StatefulTable};
   use crate::models::{HorizontallyScrollableText, Scrollable};
+  use crate::ui::utils::borderless_block;
   use crate::ui::widgets::managarr_table::ManagarrTable;
   use pretty_assertions::assert_eq;
   use ratatui::layout::{Alignment, Constraint};
   use ratatui::text::Text;
-  use ratatui::widgets::{Block, Cell, Row};
+  use ratatui::widgets::{Cell, Row};
   use std::sync::atomic::AtomicUsize;
 
   #[test]
@@ -26,7 +27,7 @@ mod tests {
     assert_eq!(managarr_table.constraints, Vec::new());
     assert_eq!(managarr_table.footer, None);
     assert_eq!(managarr_table.footer_alignment, Alignment::Left);
-    assert_eq!(managarr_table.block, Block::new());
+    assert_eq!(managarr_table.block, borderless_block());
     assert_eq!(managarr_table.margin, 0);
     assert!(!managarr_table.is_loading);
     assert!(managarr_table.highlight_rows);
@@ -62,7 +63,7 @@ mod tests {
     assert_eq!(managarr_table.constraints, Vec::new());
     assert_eq!(managarr_table.footer, None);
     assert_eq!(managarr_table.footer_alignment, Alignment::Left);
-    assert_eq!(managarr_table.block, Block::new());
+    assert_eq!(managarr_table.block, borderless_block());
     assert_eq!(managarr_table.margin, 0);
     assert!(!managarr_table.is_loading);
     assert!(managarr_table.highlight_rows);
@@ -98,7 +99,7 @@ mod tests {
     assert_eq!(managarr_table.constraints, Vec::new());
     assert_eq!(managarr_table.footer, None);
     assert_eq!(managarr_table.footer_alignment, Alignment::Left);
-    assert_eq!(managarr_table.block, Block::new());
+    assert_eq!(managarr_table.block, borderless_block());
     assert_eq!(managarr_table.margin, 0);
     assert!(!managarr_table.is_loading);
     assert!(managarr_table.highlight_rows);
@@ -131,7 +132,7 @@ mod tests {
     assert_eq!(managarr_table.constraints, Vec::new());
     assert_eq!(managarr_table.footer, None);
     assert_eq!(managarr_table.footer_alignment, Alignment::Left);
-    assert_eq!(managarr_table.block, Block::new());
+    assert_eq!(managarr_table.block, borderless_block());
     assert_eq!(managarr_table.margin, 0);
     assert!(!managarr_table.is_loading);
     assert!(managarr_table.highlight_rows);
@@ -164,7 +165,7 @@ mod tests {
     assert_eq!(managarr_table.table_headers, Vec::<String>::new());
     assert_eq!(managarr_table.footer, None);
     assert_eq!(managarr_table.footer_alignment, Alignment::Left);
-    assert_eq!(managarr_table.block, Block::new());
+    assert_eq!(managarr_table.block, borderless_block());
     assert_eq!(managarr_table.margin, 0);
     assert!(!managarr_table.is_loading);
     assert!(managarr_table.highlight_rows);
diff --git a/src/ui/widgets/popup.rs b/src/ui/widgets/popup.rs
index 7c7cddb..0534b95 100644
--- a/src/ui/widgets/popup.rs
+++ b/src/ui/widgets/popup.rs
@@ -1,9 +1,7 @@
-use crate::ui::styles::ManagarrStyle;
-use crate::ui::utils::{background_block, centered_rect, layout_block_top_border};
+use crate::ui::utils::{background_block, centered_rect};
 use ratatui::buffer::Buffer;
-use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::prelude::Text;
-use ratatui::widgets::{Block, Clear, Paragraph, Widget};
+use ratatui::layout::Rect;
+use ratatui::widgets::{Block, Clear, Widget};
 
 #[cfg(test)]
 #[path = "popup_tests.rs"]
@@ -25,6 +23,7 @@ pub enum Size {
   XLarge,
   XXLarge,
   Long,
+  LongNarrowTable,
 }
 
 impl Size {
@@ -45,6 +44,7 @@ impl Size {
       Size::XLarge => (83, 83),
       Size::XXLarge => (90, 90),
       Size::Long => (65, 75),
+      Size::LongNarrowTable => (55, 85),
     }
   }
 }
@@ -54,7 +54,6 @@ pub struct Popup<'a, T: Widget> {
   percent_x: u16,
   percent_y: u16,
   block: Option<Block<'a>>,
-  footer: Option<&'a str>,
 }
 
 impl<'a, T: Widget> Popup<'a, T> {
@@ -64,7 +63,6 @@ impl<'a, T: Widget> Popup<'a, T> {
       percent_x: 0,
       percent_y: 0,
       block: None,
-      footer: None,
     }
   }
 
@@ -86,11 +84,6 @@ impl<'a, T: Widget> Popup<'a, T> {
     self
   }
 
-  pub fn footer(mut self, footer: &'a str) -> Self {
-    self.footer = Some(footer);
-    self
-  }
-
   fn render_popup(self, area: Rect, buf: &mut Buffer) {
     let mut popup_area = centered_rect(self.percent_x, self.percent_y, area);
     let height = if popup_area.height < 3 {
@@ -109,23 +102,7 @@ impl<'a, T: Widget> Popup<'a, T> {
       block.render(popup_area, buf);
     }
 
-    let content_area = if let Some(footer) = self.footer {
-      let [content_area, help_footer_area] =
-        Layout::vertical([Constraint::Fill(0), Constraint::Length(2)])
-          .margin(1)
-          .areas(popup_area);
-
-      Paragraph::new(Text::from(format!(" {footer}").help()))
-        .block(layout_block_top_border())
-        .left_aligned()
-        .render(help_footer_area, buf);
-
-      content_area
-    } else {
-      popup_area
-    };
-
-    self.widget.render(content_area, buf);
+    self.widget.render(popup_area, buf);
   }
 }
 
diff --git a/src/ui/widgets/popup_tests.rs b/src/ui/widgets/popup_tests.rs
index 9f82a44..3c0fedb 100644
--- a/src/ui/widgets/popup_tests.rs
+++ b/src/ui/widgets/popup_tests.rs
@@ -21,6 +21,7 @@ mod tests {
     assert_eq!(Size::XLarge.to_percent(), (83, 83));
     assert_eq!(Size::XXLarge.to_percent(), (90, 90));
     assert_eq!(Size::Long.to_percent(), (65, 75));
+    assert_eq!(Size::LongNarrowTable.to_percent(), (55, 85));
   }
 
   #[test]
@@ -31,7 +32,6 @@ mod tests {
     assert_eq!(popup.percent_x, 0);
     assert_eq!(popup.percent_y, 0);
     assert_eq!(popup.block, None);
-    assert_eq!(popup.footer, None);
   }
 
   #[test]
@@ -42,7 +42,6 @@ mod tests {
     assert_eq!(popup.percent_y, 40);
     assert_eq!(popup.widget, Block::new());
     assert_eq!(popup.block, None);
-    assert_eq!(popup.footer, None);
   }
 
   #[test]
@@ -53,7 +52,6 @@ mod tests {
     assert_eq!(popup.percent_y, 50);
     assert_eq!(popup.widget, Block::new());
     assert_eq!(popup.block, None);
-    assert_eq!(popup.footer, None);
   }
 
   #[test]
@@ -64,17 +62,5 @@ mod tests {
     assert_eq!(popup.widget, Block::new());
     assert_eq!(popup.percent_x, 0);
     assert_eq!(popup.percent_y, 0);
-    assert_eq!(popup.footer, None);
-  }
-
-  #[test]
-  fn test_popup_footer() {
-    let popup = Popup::new(Block::new()).footer("footer");
-
-    assert_eq!(popup.footer, Some("footer"));
-    assert_eq!(popup.widget, Block::new());
-    assert_eq!(popup.percent_x, 0);
-    assert_eq!(popup.percent_y, 0);
-    assert_eq!(popup.block, None);
   }
 }
diff --git a/src/utils.rs b/src/utils.rs
index 4e5ade7..9e4170e 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -21,6 +21,7 @@ use tokio_util::sync::CancellationToken;
 use crate::app::{log_and_print_error, App, AppConfig};
 use crate::cli::{self, Command};
 use crate::network::Network;
+use crate::ui::theme::ThemeDefinitionsWrapper;
 
 #[cfg(test)]
 #[path = "utils_tests.rs"]
@@ -38,7 +39,7 @@ pub fn get_log_path() -> PathBuf {
   log_path.push("managarr");
 
   if let Err(e) = fs::create_dir_all(&log_path) {
-    eprintln!("Failed to create log directory: {:?}", e);
+    eprintln!("Failed to create log directory: {e:?}");
   }
 
   log_path.push("managarr.log");
@@ -95,10 +96,10 @@ pub async fn tail_logs(no_color: bool) {
     loop {
       if let Some(Ok(line)) = lines.next() {
         if no_color {
-          println!("{}", line);
+          println!("{line}");
         } else {
           let colored_line = colorize_log_line(&line, &re);
-          println!("{}", colored_line);
+          println!("{colored_line}");
         }
       }
     }
@@ -140,10 +141,31 @@ fn colorize_log_line(line: &str, re: &Regex) -> String {
 }
 
 pub(super) fn load_config(path: &str) -> Result<AppConfig> {
-  let file = File::open(path).map_err(|e| anyhow!(e))?;
-  let reader = BufReader::new(file);
-  let config = serde_yaml::from_reader(reader)?;
-  Ok(config)
+  match File::open(path).map_err(|e| anyhow!(e)) {
+    Ok(file) => {
+      let reader = BufReader::new(file);
+      let config = serde_yaml::from_reader(reader)?;
+      Ok(config)
+    }
+    Err(e) => {
+      log_and_print_error(format!("Unable to open config file: {e:?}"));
+      process::exit(1);
+    }
+  }
+}
+
+pub(super) fn load_theme_config(path: &str) -> Result<ThemeDefinitionsWrapper> {
+  match File::open(path).map_err(|e| anyhow!(e)) {
+    Ok(file) => {
+      let reader = BufReader::new(file);
+      let theme_config = serde_yaml::from_reader(reader)?;
+      Ok(theme_config)
+    }
+    Err(e) => {
+      log_and_print_error(format!("Unable to open theme file: {e:?}"));
+      process::exit(1);
+    }
+  }
 }
 
 pub(super) fn build_network_client(config: &AppConfig) -> Client {
@@ -173,7 +195,7 @@ pub(super) fn build_network_client(config: &AppConfig) -> Client {
   match client_builder.build() {
     Ok(client) => client,
     Err(e) => {
-      error!("Unable to create reqwest client: {}", e);
+      error!("Unable to create reqwest client: {e}");
       eprintln!("error: {}", e.to_string().red());
       process::exit(1);
     }
@@ -186,16 +208,14 @@ pub(super) fn create_cert(cert_path: &String, servarr_name: &str) -> Certificate
       Ok(certificate) => certificate,
       Err(_) => {
         log_and_print_error(format!(
-          "Unable to read the specified {} SSL certificate",
-          servarr_name
+          "Unable to read the specified {servarr_name} SSL certificate"
         ));
         process::exit(1);
       }
     },
     Err(_) => {
       log_and_print_error(format!(
-        "Unable to open specified {} SSL certificate",
-        servarr_name
+        "Unable to open specified {servarr_name} SSL certificate"
       ));
       process::exit(1);
     }
@@ -238,7 +258,7 @@ pub(super) async fn start_cli_with_spinner(
   match cli::handle_command(&app, command, &mut network).await {
     Ok(output) => {
       pb.finish();
-      println!("{}", output);
+      println!("{output}");
     }
     Err(e) => {
       pb.finish();
@@ -265,7 +285,7 @@ pub(super) async fn start_cli_no_spinner(
   let mut network = Network::new(&app_nw, cancellation_token, reqwest_client);
   match cli::handle_command(&app, command, &mut network).await {
     Ok(output) => {
-      println!("{}", output);
+      println!("{output}");
     }
     Err(e) => {
       eprintln!("error: {}", e.to_string().red());
@@ -284,8 +304,7 @@ pub fn select_cli_configuration(
     let trimmed_name = servarr_name.trim();
     if !app.server_tabs.select_tab_by_title(trimmed_name) {
       log_and_print_error(format!(
-        "A Servarr titled '{}' was not found in your configuration file",
-        trimmed_name
+        "A Servarr titled '{trimmed_name}' was not found in your configuration file"
       ));
       process::exit(1);
     }
diff --git a/tests/integration_test.rs b/tests/enum_display_style_derive_integration_tests.rs
similarity index 94%
rename from tests/integration_test.rs
rename to tests/enum_display_style_derive_integration_tests.rs
index 277fed7..cf6c13f 100644
--- a/tests/integration_test.rs
+++ b/tests/enum_display_style_derive_integration_tests.rs
@@ -8,7 +8,7 @@ fn test_derive_enum_display_style() {
 }
 
 #[derive(EnumDisplayStyle)]
-pub enum TestEnum {
+enum TestEnum {
   #[display_style(name = "Testing 123")]
   Test,
   Ignored,
diff --git a/tests/validate_theme_derive_integration_tests.rs b/tests/validate_theme_derive_integration_tests.rs
new file mode 100644
index 0000000..290a968
--- /dev/null
+++ b/tests/validate_theme_derive_integration_tests.rs
@@ -0,0 +1,35 @@
+use validate_theme_derive::ValidateTheme;
+
+#[test]
+fn test_validate_theme_derive() {
+  let theme = Theme {
+    name: "test".to_string(),
+    good: Some(Style {
+      color: "Green".to_owned(),
+    }),
+    bad: Some(Style {
+      color: "Red".to_owned(),
+    }),
+    ugly: Some(Style {
+      color: "Magenta".to_owned(),
+    }),
+  };
+
+  theme.validate();
+}
+
+#[allow(dead_code)]
+struct Style {
+  color: String,
+}
+
+#[allow(dead_code)]
+#[derive(ValidateTheme)]
+struct Theme {
+  pub name: String,
+  #[validate]
+  pub good: Option<Style>,
+  #[validate]
+  pub bad: Option<Style>,
+  pub ugly: Option<Style>,
+}
diff --git a/themes/README.md b/themes/README.md
new file mode 100644
index 0000000..b184618
--- /dev/null
+++ b/themes/README.md
@@ -0,0 +1,123 @@
+# Managarr Themes
+The Managarr TUI can be customized to look how you like with various themes.
+
+There are a few themes included by default with Managarr and are added to your `themes.yml`
+on first startup. You can simply add more custom themes as you wish to this file.
+
+## Table of Contents
+- [Built In Themes](#built-in-themes)
+- [Creating a Custom Theme](#creating-a-custom-theme)
+
+## Built-In Themes
+Managarr ships with a handful of built-in themes that you can either use or base your own
+custom theme off of. The following themes are included by default:
+
+### [Default](./default/README.md)
+![sonarr-library](./default/sonarr_library.png)
+
+### [Dracula](./dracula/README.md)
+![sonarr-library](./dracula/sonarr_library.png)
+
+### [Eldritch](./eldritch/README.md)
+![sonarr-library](./eldritch/sonarr_library.png)
+
+### [Watermelon Dark](./watermelon-dark/README.md)
+![sonarr-library](./watermelon-dark/sonarr_library.png)
+
+## Creating a Custom Theme
+To create a custom theme, you will need to add a new entry to the `themes.yml` file. If you decide not to add it to the
+`themes.yml` file, you can also specify a different file to load themes from using the `--themes-file` argument.
+
+Themes are customizable using hex color codes for the various elements of the TUI. The following
+is an example that shows every available customization option for a custom theme:
+
+```yaml
+- name: my-theme
+  theme:
+    background:
+      # Disable for transparent backgrounds
+      enabled: true
+      # Color of the full system background
+      color: "#233237"
+    awaiting_import:
+      # Color for items awaiting import
+      color: "#FFAA42"
+    indeterminate:
+      # Color for when item status is unknown
+      color: "#FFAA42"
+    default:
+      # Default color for text and uncolored elements
+      color: "#FFFFFF"
+    downloaded:
+      # Color for downloaded items (when monitored)
+      color: "#00FF00"
+    downloading:
+      # Color for items currently downloading
+      color: "#762671"
+    failure:
+      # Color for errors, no seeders, disabled indexers, 
+      # failed indexer test results, etc.
+      color: "#DE382B"
+    help:
+      # Color for help text like hotkeys and tooltips
+      color: "#00FFFF"
+    missing:
+      # Color for missing items
+      color: "#DE382B"
+    primary:
+      # Primary color for table/list items (without custom coloring), 
+      # selected UI elements (e.g. table/list items, current tab, etc.), 
+      # gauge bars, etc.
+      color: "#2CB5E9"
+    secondary:
+      # Color for selected tabs, Warn log events, Paragraph headers (e.g. "Name: "),
+      # and uncolored Message box contents
+      color: "#FFC706"
+    success:
+      # Color for downloaded and imported and available items, 
+      # good peer styling (more seeders than leechers), 
+      # passing indexer test results, and enabled indexers
+      color: "#39B54A"
+    system_function:
+      # Color for system functions like selected UI elements (e.g. checkboxes, yes/no prompts),
+      # or loading spinner
+      color: "#FFC706"
+    unmonitored:
+      # Color for unmonitored items
+      color: "#808080"
+    unmonitored_missing:
+      # Color for unmonitored items that are also missing
+      color: "#FFC706"
+    unreleased:
+      # Color for unreleased items
+      color: "#00FFFF"
+    warning:
+      # Color for fewer seeders than leechers
+      color: "#FF00FF"
+```
+
+**Note:** Bear in mind that while some colors may currently affect few UI elements, Managarr is still being built
+and thus these colors may affect more elements in the future.
+
+In order to activate your custom theme, you can either update your `config.yml`:
+
+```yaml
+theme: my-theme
+radarr:
+  ...
+sonarr:
+  ...
+```
+
+Or you can test out your theme via the `--theme` flag on the CLI:
+
+```shell
+managarr --theme my-theme
+```
+
+If you're developing your own theme and don't want to add it to the main `themes.yml` file, you can
+also use the `--themes-file` argument to specify a different file to load themes from:
+
+```shell
+managarr --themes-file /path/to/my/testing-themes.yml
+```
\ No newline at end of file
diff --git a/themes/default/README.md b/themes/default/README.md
new file mode 100644
index 0000000..7baffaa
--- /dev/null
+++ b/themes/default/README.md
@@ -0,0 +1,8 @@
+# Managarr Default Theme
+The [themes.yml](./themes.yml) file in this directory corresponds to the theme configuration for the default Managarr theme.
+
+## Screenshots
+
+![sonarr-library](./sonarr_library.png)
+![manual-episode-search](./manual_episode_search.png)
+![radarr-system](./radarr_system.png)
\ No newline at end of file
diff --git a/themes/default/manual_episode_search.png b/themes/default/manual_episode_search.png
new file mode 100644
index 0000000..fb6942d
Binary files /dev/null and b/themes/default/manual_episode_search.png differ
diff --git a/themes/default/radarr_system.png b/themes/default/radarr_system.png
new file mode 100644
index 0000000..4867349
Binary files /dev/null and b/themes/default/radarr_system.png differ
diff --git a/themes/default/sonarr_library.png b/themes/default/sonarr_library.png
new file mode 100644
index 0000000..bbe3ab5
Binary files /dev/null and b/themes/default/sonarr_library.png differ
diff --git a/themes/default/themes.yml b/themes/default/themes.yml
new file mode 100644
index 0000000..9e6f51c
--- /dev/null
+++ b/themes/default/themes.yml
@@ -0,0 +1,37 @@
+- name: default
+  theme:
+    background:
+      enabled: true
+      color: "#233237"
+    awaiting_import:
+      color: "#FFAA42"
+    indeterminate:
+      color: "#FFAA42"
+    default:
+      color: "#FFFFFF"
+    downloaded:
+      color: "#00FF00"
+    downloading:
+      color: "#762671"
+    failure:
+      color: "#DE382B"
+    help:
+      color: "#00FFFF"
+    missing:
+      color: "#DE382B"
+    primary:
+      color: "#2CB5E9"
+    secondary:
+      color: "#FFC706"
+    success:
+      color: "#39B54A"
+    system_function:
+      color: "#FFC706"
+    unmonitored:
+      color: "#808080"
+    unmonitored_missing:
+      color: "#FFC706"
+    unreleased:
+      color: "#00FFFF"
+    warning:
+      color: "#FF00FF"
\ No newline at end of file
diff --git a/themes/dracula/README.md b/themes/dracula/README.md
new file mode 100644
index 0000000..3639f89
--- /dev/null
+++ b/themes/dracula/README.md
@@ -0,0 +1,8 @@
+# Managarr Dracula Theme
+The [themes.yml](./themes.yml) file in this directory corresponds to the theme configuration for the Dracula Managarr theme.
+
+## Screenshots
+
+![sonarr-library](./sonarr_library.png)
+![manual-episode-search](./manual_episode_search.png)
+![radarr-system](./radarr_system.png)
\ No newline at end of file
diff --git a/themes/dracula/manual_episode_search.png b/themes/dracula/manual_episode_search.png
new file mode 100644
index 0000000..37a91c2
Binary files /dev/null and b/themes/dracula/manual_episode_search.png differ
diff --git a/themes/dracula/radarr_system.png b/themes/dracula/radarr_system.png
new file mode 100644
index 0000000..7e9c2ee
Binary files /dev/null and b/themes/dracula/radarr_system.png differ
diff --git a/themes/dracula/sonarr_library.png b/themes/dracula/sonarr_library.png
new file mode 100644
index 0000000..bf500cb
Binary files /dev/null and b/themes/dracula/sonarr_library.png differ
diff --git a/themes/dracula/themes.yml b/themes/dracula/themes.yml
new file mode 100644
index 0000000..8b05f5f
--- /dev/null
+++ b/themes/dracula/themes.yml
@@ -0,0 +1,29 @@
+- name: dracula
+  theme:
+    background:
+      enabled: true
+      color: "#232326"
+    default:
+      color: "#f8f8f2"
+    downloaded:
+      color: "#50fa7b"
+    downloading:
+      color: "#8be9fd"
+    failure:
+      color: "#ff5555"
+    missing:
+      color: "#ffb86c"
+    unmonitored-missing:
+      color: "#6272a4"
+    help:
+      color: "#6272a4"
+    primary:
+      color: "#ff79c6"
+    secondary:
+      color: "#ff79c6"
+    success:
+      color: "#50fa7b"
+    warning:
+      color: "#f1fa8c"
+    unreleased:
+      color: "#f8f8f2"
\ No newline at end of file
diff --git a/themes/eldritch/README.md b/themes/eldritch/README.md
new file mode 100644
index 0000000..a008c5f
--- /dev/null
+++ b/themes/eldritch/README.md
@@ -0,0 +1,8 @@
+# Managarr Eldritch Theme
+The [themes.yml](./themes.yml) file in this directory corresponds to the theme configuration for the Eldritch Managarr theme.
+
+## Screenshots
+
+![sonarr-library](./sonarr_library.png)
+![manual-episode-search](./manual_episode_search.png)
+![radarr-system](./radarr_system.png)
\ No newline at end of file
diff --git a/themes/eldritch/manual_episode_search.png b/themes/eldritch/manual_episode_search.png
new file mode 100644
index 0000000..3c10dd0
Binary files /dev/null and b/themes/eldritch/manual_episode_search.png differ
diff --git a/themes/eldritch/radarr_system.png b/themes/eldritch/radarr_system.png
new file mode 100644
index 0000000..2356303
Binary files /dev/null and b/themes/eldritch/radarr_system.png differ
diff --git a/themes/eldritch/sonarr_library.png b/themes/eldritch/sonarr_library.png
new file mode 100644
index 0000000..6ad9e09
Binary files /dev/null and b/themes/eldritch/sonarr_library.png differ
diff --git a/themes/eldritch/themes.yml b/themes/eldritch/themes.yml
new file mode 100644
index 0000000..aba639e
--- /dev/null
+++ b/themes/eldritch/themes.yml
@@ -0,0 +1,29 @@
+- name: eldritch
+  theme:
+    background:
+      enabled: true
+      color: "#212337"
+    default:
+      color: "#ebfafa"
+    downloaded:
+      color: "#37f499"
+    downloading:
+      color: "#f7c67f"
+    failure:
+      color: "#f16c75"
+    missing:
+      color: "#f7c67f"
+    unmonitored_missing:
+      color: "#7081d0"
+    help:
+      color: "#7081d0"
+    primary:
+      color: "#f265b5"
+    secondary:
+      color: "#04d1f9"
+    success:
+      color: "#37f499"
+    warning:
+      color: "#f1fc79"
+    unreleased:
+      color: "#ebfafa"
\ No newline at end of file
diff --git a/themes/watermelon-dark/README.md b/themes/watermelon-dark/README.md
new file mode 100644
index 0000000..824705e
--- /dev/null
+++ b/themes/watermelon-dark/README.md
@@ -0,0 +1,9 @@
+# Managarr Watermelon Dark Theme
+The [themes.yml](./themes.yml) file in this directory corresponds to the theme configuration for the Watermelon Dark Managarr 
+theme.
+
+## Screenshots
+
+![sonarr-library](./sonarr_library.png)
+![manual-episode-search](./manual_episode_search.png)
+![radarr-system](./radarr_system.png)
\ No newline at end of file
diff --git a/themes/watermelon-dark/manual_episode_search.png b/themes/watermelon-dark/manual_episode_search.png
new file mode 100644
index 0000000..1e74ff6
Binary files /dev/null and b/themes/watermelon-dark/manual_episode_search.png differ
diff --git a/themes/watermelon-dark/radarr_system.png b/themes/watermelon-dark/radarr_system.png
new file mode 100644
index 0000000..31d7847
Binary files /dev/null and b/themes/watermelon-dark/radarr_system.png differ
diff --git a/themes/watermelon-dark/sonarr_library.png b/themes/watermelon-dark/sonarr_library.png
new file mode 100644
index 0000000..f5b3c40
Binary files /dev/null and b/themes/watermelon-dark/sonarr_library.png differ
diff --git a/themes/watermelon-dark/themes.yml b/themes/watermelon-dark/themes.yml
new file mode 100644
index 0000000..dcac69a
--- /dev/null
+++ b/themes/watermelon-dark/themes.yml
@@ -0,0 +1,16 @@
+- name: watermelon-dark
+  theme:
+    background:
+      enabled: false
+    default:
+      color: "#00FF00"
+    downloaded:
+      color: "#80ffbf"
+    failure:
+      color: "#ff8080"
+    missing:
+      color: "#ff8080"
+    primary:
+      color: "#ff19d9"
+    secondary:
+      color: "#8c19ff"
\ No newline at end of file